Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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/20230802151406.3735276-26-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Matthew Wilcox (Oracle) and committed by
Andrew Morton
665f6402 157efa29

+23 -8
+8 -2
arch/sparc/include/asm/cacheflush_32.h
··· 2 2 #ifndef _SPARC_CACHEFLUSH_H 3 3 #define _SPARC_CACHEFLUSH_H 4 4 5 + #include <linux/page-flags.h> 5 6 #include <asm/cachetlb_32.h> 6 7 7 8 #define flush_cache_all() \ ··· 17 16 sparc32_cachetlb_ops->cache_page(vma, addr) 18 17 #define flush_icache_range(start, end) do { } while (0) 19 18 #define flush_icache_page(vma, pg) do { } while (0) 19 + #define flush_icache_pages(vma, pg, nr) do { } while (0) 20 20 21 21 #define copy_to_user_page(vma, page, vaddr, dst, src, len) \ 22 22 do { \ ··· 37 35 #define flush_page_for_dma(addr) \ 38 36 sparc32_cachetlb_ops->page_for_dma(addr) 39 37 40 - struct page; 41 38 void sparc_flush_page_to_ram(struct page *page); 39 + void sparc_flush_folio_to_ram(struct folio *folio); 42 40 43 41 #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 44 - #define flush_dcache_page(page) sparc_flush_page_to_ram(page) 42 + #define flush_dcache_folio(folio) sparc_flush_folio_to_ram(folio) 43 + static inline void flush_dcache_page(struct page *page) 44 + { 45 + flush_dcache_folio(page_folio(page)); 46 + } 45 47 #define flush_dcache_mmap_lock(mapping) do { } while (0) 46 48 #define flush_dcache_mmap_unlock(mapping) do { } while (0) 47 49
+4 -4
arch/sparc/include/asm/pgtable_32.h
··· 101 101 srmmu_swap((unsigned long *)ptep, pte_val(pteval)); 102 102 } 103 103 104 - #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) 105 - 106 104 static inline int srmmu_device_memory(unsigned long x) 107 105 { 108 106 return ((x & 0xF0000000) != 0); ··· 254 256 return __pte(pte_val(pte) | SRMMU_REF); 255 257 } 256 258 259 + #define PFN_PTE_SHIFT (PAGE_SHIFT - 4) 257 260 #define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot) 258 261 259 262 static inline unsigned long pte_pfn(pte_t pte) ··· 267 268 */ 268 269 return ~0UL; 269 270 } 270 - return (pte_val(pte) & SRMMU_PTE_PMASK) >> (PAGE_SHIFT-4); 271 + return (pte_val(pte) & SRMMU_PTE_PMASK) >> PFN_PTE_SHIFT; 271 272 } 272 273 273 274 #define pte_page(pte) pfn_to_page(pte_pfn(pte)) ··· 317 318 #define FAULT_CODE_USER 0x4 318 319 319 320 #define update_mmu_cache(vma, address, ptep) do { } while (0) 321 + #define update_mmu_cache_range(vmf, vma, address, ptep, nr) do { } while (0) 320 322 321 323 void srmmu_mapiorange(unsigned int bus, unsigned long xpa, 322 324 unsigned long xva, unsigned int len); ··· 422 422 ({ \ 423 423 int __changed = !pte_same(*(__ptep), __entry); \ 424 424 if (__changed) { \ 425 - set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry); \ 425 + set_pte(__ptep, __entry); \ 426 426 flush_tlb_page(__vma, __address); \ 427 427 } \ 428 428 __changed; \
+11 -2
arch/sparc/mm/init_32.c
··· 297 297 { 298 298 unsigned long vaddr = (unsigned long)page_address(page); 299 299 300 - if (vaddr) 301 - __flush_page_to_ram(vaddr); 300 + __flush_page_to_ram(vaddr); 302 301 } 303 302 EXPORT_SYMBOL(sparc_flush_page_to_ram); 303 + 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); 304 313 305 314 static const pgprot_t protection_map[16] = { 306 315 [VM_NONE] = PAGE_NONE,