Skip to content

Commit 665f640

Browse files
Matthew Wilcox (Oracle)akpm00
Matthew Wilcox (Oracle)
authored andcommitted
sparc32: implement the new page table range API
Add PFN_PTE_SHIFT, update_mmu_cache_range(), flush_dcache_folio() and flush_icache_pages(). Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Acked-by: Mike Rapoport (IBM) <[email protected]> Cc: "David S. Miller" <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 157efa2 commit 665f640

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

arch/sparc/include/asm/cacheflush_32.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#ifndef _SPARC_CACHEFLUSH_H
33
#define _SPARC_CACHEFLUSH_H
44

5+
#include <linux/page-flags.h>
56
#include <asm/cachetlb_32.h>
67

78
#define flush_cache_all() \
@@ -16,6 +17,7 @@
1617
sparc32_cachetlb_ops->cache_page(vma, addr)
1718
#define flush_icache_range(start, end) do { } while (0)
1819
#define flush_icache_page(vma, pg) do { } while (0)
20+
#define flush_icache_pages(vma, pg, nr) do { } while (0)
1921

2022
#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
2123
do { \
@@ -35,11 +37,15 @@
3537
#define flush_page_for_dma(addr) \
3638
sparc32_cachetlb_ops->page_for_dma(addr)
3739

38-
struct page;
3940
void sparc_flush_page_to_ram(struct page *page);
41+
void sparc_flush_folio_to_ram(struct folio *folio);
4042

4143
#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1
42-
#define flush_dcache_page(page) sparc_flush_page_to_ram(page)
44+
#define flush_dcache_folio(folio) sparc_flush_folio_to_ram(folio)
45+
static inline void flush_dcache_page(struct page *page)
46+
{
47+
flush_dcache_folio(page_folio(page));
48+
}
4349
#define flush_dcache_mmap_lock(mapping) do { } while (0)
4450
#define flush_dcache_mmap_unlock(mapping) do { } while (0)
4551

arch/sparc/include/asm/pgtable_32.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ static inline void set_pte(pte_t *ptep, pte_t pteval)
101101
srmmu_swap((unsigned long *)ptep, pte_val(pteval));
102102
}
103103

104-
#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
105-
106104
static inline int srmmu_device_memory(unsigned long x)
107105
{
108106
return ((x & 0xF0000000) != 0);
@@ -256,6 +254,7 @@ static inline pte_t pte_mkyoung(pte_t pte)
256254
return __pte(pte_val(pte) | SRMMU_REF);
257255
}
258256

257+
#define PFN_PTE_SHIFT (PAGE_SHIFT - 4)
259258
#define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot)
260259

261260
static inline unsigned long pte_pfn(pte_t pte)
@@ -268,7 +267,7 @@ static inline unsigned long pte_pfn(pte_t pte)
268267
*/
269268
return ~0UL;
270269
}
271-
return (pte_val(pte) & SRMMU_PTE_PMASK) >> (PAGE_SHIFT-4);
270+
return (pte_val(pte) & SRMMU_PTE_PMASK) >> PFN_PTE_SHIFT;
272271
}
273272

274273
#define pte_page(pte) pfn_to_page(pte_pfn(pte))
@@ -318,6 +317,7 @@ void mmu_info(struct seq_file *m);
318317
#define FAULT_CODE_USER 0x4
319318

320319
#define update_mmu_cache(vma, address, ptep) do { } while (0)
320+
#define update_mmu_cache_range(vmf, vma, address, ptep, nr) do { } while (0)
321321

322322
void srmmu_mapiorange(unsigned int bus, unsigned long xpa,
323323
unsigned long xva, unsigned int len);
@@ -422,7 +422,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
422422
({ \
423423
int __changed = !pte_same(*(__ptep), __entry); \
424424
if (__changed) { \
425-
set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry); \
425+
set_pte(__ptep, __entry); \
426426
flush_tlb_page(__vma, __address); \
427427
} \
428428
__changed; \

arch/sparc/mm/init_32.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,11 +297,20 @@ void sparc_flush_page_to_ram(struct page *page)
297297
{
298298
unsigned long vaddr = (unsigned long)page_address(page);
299299

300-
if (vaddr)
301-
__flush_page_to_ram(vaddr);
300+
__flush_page_to_ram(vaddr);
302301
}
303302
EXPORT_SYMBOL(sparc_flush_page_to_ram);
304303

304+
void sparc_flush_folio_to_ram(struct folio *folio)
305+
{
306+
unsigned long vaddr = (unsigned long)folio_address(folio);
307+
unsigned int i, nr = folio_nr_pages(folio);
308+
309+
for (i = 0; i < nr; i++)
310+
__flush_page_to_ram(vaddr + i * PAGE_SIZE);
311+
}
312+
EXPORT_SYMBOL(sparc_flush_folio_to_ram);
313+
305314
static const pgprot_t protection_map[16] = {
306315
[VM_NONE] = PAGE_NONE,
307316
[VM_READ] = PAGE_READONLY,

0 commit comments

Comments
 (0)