[PATCH 20/20] arch: remove ioremap_wt, optionally replace with arch_memremap
flat view
STALE4020d
From: Dan Williams <hidden>
Date: 2015-10-09 22:23:48
Also in:
linux-arch, lkml
Subsystem:
arm port, arm64 port (aarch64 architecture), documentation, framebuffer layer, generic include/asm header files, m68k architecture, microblaze architecture, nios2 architecture, s390 architecture, sparc + ultrasparc (sparc/sparc64), synopsys arc architecture, tensilica xtensa port (xtensa), the rest, uclinux (m68knommu and coldfire), x86 architecture (32-bit and 64-bit), x86 mm · Maintainers:
Russell King, Catalin Marinas, Will Deacon, Jonathan Corbet, Helge Deller, Arnd Bergmann, Geert Uytterhoeven, Michal Simek, Dinh Nguyen, Simon Schuster, Heiko Carstens, Vasily Gorbik, Alexander Gordeev, "David S. Miller", Andreas Larsson, Vineet Gupta, Chris Zankel, Max Filippov, Linus Torvalds, Greg Ungerer, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, Andy Lutomirski, Peter Zijlstra
Now that all call sites for ioremap_wt() have been converted to memremap(MEMREMAP_WT) we can now proceed with removing the implementation in the archs. This amounts to replacing the per-arch ioremap_wt() implementation with arch_memremap in the case where ioremap_wt() was actually providing "writethrough" semantics. Otherwise, ioremap_wt() support that falls back to ioremap() is simply removed. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <redacted> Cc: Tony Luck <tony.luck@intel.com> Cc: Thomas Gleixner <redacted> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Signed-off-by: Dan Williams <redacted> --- Documentation/x86/pat.txt | 2 +- arch/arc/include/asm/io.h | 1 - arch/arm/include/asm/io.h | 2 -- arch/arm64/include/asm/io.h | 1 - arch/avr32/include/asm/io.h | 1 - arch/frv/include/asm/io.h | 7 ------- arch/m32r/include/asm/io.h | 1 - arch/m68k/include/asm/io_mm.h | 7 ------- arch/m68k/include/asm/io_no.h | 6 ------ arch/m68k/include/asm/raw_io.h | 1 - arch/metag/include/asm/io.h | 3 --- arch/microblaze/include/asm/io.h | 1 - arch/mn10300/include/asm/io.h | 1 - arch/nios2/include/asm/io.h | 1 - arch/s390/include/asm/io.h | 1 - arch/sparc/include/asm/io_32.h | 1 - arch/sparc/include/asm/io_64.h | 1 - arch/tile/include/asm/io.h | 1 - arch/x86/include/asm/io.h | 2 -- arch/x86/mm/ioremap.c | 17 ----------------- arch/xtensa/include/asm/io.h | 1 - drivers/video/fbdev/Kconfig | 2 +- include/asm-generic/io.h | 8 -------- include/asm-generic/iomap.h | 4 ---- 24 files changed, 2 insertions(+), 71 deletions(-)
diff --git a/Documentation/x86/pat.txt b/Documentation/x86/pat.txt
index 73d3635f6a3f..7e0e43c648f7 100644
--- a/Documentation/x86/pat.txt
+++ b/Documentation/x86/pat.txt@@ -40,7 +40,7 @@ ioremap_wc | -- | -- | WC | | | | | memremap(MEMREMAP_WB) | WB | WB | WB | | | | | -ioremap_wt | -- | -- | WT | +memremap(MEMREMAP_WT) | -- | -- | WT | | | | | set_memory_uc | UC- | -- | -- | set_memory_wb | | | |
diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h
index 694ece8a0243..00f97a2f5fa6 100644
--- a/arch/arc/include/asm/io.h
+++ b/arch/arc/include/asm/io.h@@ -20,7 +20,6 @@ extern void iounmap(const void __iomem *addr); #define ioremap_nocache(phy, sz) ioremap(phy, sz) #define ioremap_wc(phy, sz) ioremap(phy, sz) -#define ioremap_wt(phy, sz) ioremap(phy, sz) /* Change struct page to physical address */ #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 191d0f6eeead..5616c4f4304d 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h@@ -357,7 +357,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from, * ioremap_nocache() Device n/a n/a * memremap(WB) Normal Writeback Read allocate * ioremap_wc() Normal Non-cacheable n/a - * ioremap_wt() Normal Non-cacheable n/a * * All device mappings have the following properties: * - no access speculation
@@ -394,7 +393,6 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size); void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size); #define ioremap_wc ioremap_wc -#define ioremap_wt ioremap_wc void iounmap(volatile void __iomem *iomem_cookie); #define iounmap iounmap
diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
index 51376353a722..054fb4def2c9 100644
--- a/arch/arm64/include/asm/io.h
+++ b/arch/arm64/include/asm/io.h@@ -169,7 +169,6 @@ extern void __iounmap(volatile void __iomem *addr); #define ioremap(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) #define ioremap_nocache(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) #define ioremap_wc(addr, size) __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC)) -#define ioremap_wt(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) #define iounmap __iounmap /*
diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h
index f855646e0db7..1f8ca9bde930 100644
--- a/arch/avr32/include/asm/io.h
+++ b/arch/avr32/include/asm/io.h@@ -296,7 +296,6 @@ extern void __iounmap(void __iomem *addr); __iounmap(addr) #define ioremap_wc ioremap_nocache -#define ioremap_wt ioremap_nocache #define ioremap_uc ioremap_nocache #define cached(addr) P1SEGADDR(addr)
diff --git a/arch/frv/include/asm/io.h b/arch/frv/include/asm/io.h
index 2b6ff56a2d2f..afc14a071582 100644
--- a/arch/frv/include/asm/io.h
+++ b/arch/frv/include/asm/io.h@@ -17,8 +17,6 @@ #ifdef __KERNEL__ -#define ARCH_HAS_IOREMAP_WT - #include <linux/types.h> #include <asm/virtconvert.h> #include <asm/string.h>
@@ -267,11 +265,6 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned lon return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size) -{ - return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); -} - #define ioremap_wc ioremap_nocache #define ioremap_uc ioremap_nocache
diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h
index 61b8931bc192..c458307a36ad 100644
--- a/arch/m32r/include/asm/io.h
+++ b/arch/m32r/include/asm/io.h@@ -68,7 +68,6 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) extern void iounmap(volatile void __iomem *addr); #define ioremap_nocache(off,size) ioremap(off,size) #define ioremap_wc ioremap_nocache -#define ioremap_wt ioremap_nocache #define ioremap_uc ioremap_nocache /*
diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
index 89361b7bfafc..99cca82cb10c 100644
--- a/arch/m68k/include/asm/io_mm.h
+++ b/arch/m68k/include/asm/io_mm.h@@ -20,8 +20,6 @@ #ifdef __KERNEL__ -#define ARCH_HAS_IOREMAP_WT - #include <linux/compiler.h> #include <asm/raw_io.h> #include <asm/virtconvert.h>
@@ -469,11 +467,6 @@ static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned lon return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } #define ioremap_uc ioremap_nocache -static inline void __iomem *ioremap_wt(unsigned long physaddr, - unsigned long size) -{ - return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); -} static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) { __builtin_memset((void __force *) addr, val, count);
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h
index 2690fa99dc56..b5890e593961 100644
--- a/arch/m68k/include/asm/io_no.h
+++ b/arch/m68k/include/asm/io_no.h@@ -3,8 +3,6 @@ #ifdef __KERNEL__ -#define ARCH_HAS_IOREMAP_WT - #include <asm/virtconvert.h> #include <asm-generic/iomap.h>
@@ -155,10 +153,6 @@ static inline void *ioremap_nocache(unsigned long physaddr, unsigned long size) { return __ioremap(physaddr, size, IOMAP_NOCACHE_SER); } -static inline void *ioremap_wt(unsigned long physaddr, unsigned long size) -{ - return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); -} #define iounmap(addr) do { } while(0) /*
diff --git a/arch/m68k/include/asm/raw_io.h b/arch/m68k/include/asm/raw_io.h
index 932faa35655b..9f6e5a4e531b 100644
--- a/arch/m68k/include/asm/raw_io.h
+++ b/arch/m68k/include/asm/raw_io.h@@ -25,7 +25,6 @@ extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag); extern void __iounmap(void *addr, unsigned long size); - /* ++roman: The assignments to temp. vars avoid that gcc sometimes generates * two accesses to memory, which may be undesirable for some devices. */
diff --git a/arch/metag/include/asm/io.h b/arch/metag/include/asm/io.h
index 5432949e627e..482ef3b5f5ba 100644
--- a/arch/metag/include/asm/io.h
+++ b/arch/metag/include/asm/io.h@@ -157,9 +157,6 @@ extern void __iounmap(void __iomem *addr); #define ioremap_wc(offset, size) \ __ioremap((offset), (size), _PAGE_WR_COMBINE) -#define ioremap_wt(offset, size) \ - __ioremap((offset), (size), 0) - #define iounmap(addr) \ __iounmap(addr)
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index 5e0cbf4e4204..df7ffb3d9898 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h@@ -41,7 +41,6 @@ extern void iounmap(void __iomem *addr); extern void __iomem *ioremap(phys_addr_t address, unsigned long size); #define ioremap_nocache(addr, size) ioremap((addr), (size)) #define ioremap_wc(addr, size) ioremap((addr), (size)) -#define ioremap_wt(addr, size) ioremap((addr), (size)) #endif /* CONFIG_MMU */
diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h
index 62189353d2f6..9d790fd00865 100644
--- a/arch/mn10300/include/asm/io.h
+++ b/arch/mn10300/include/asm/io.h@@ -282,7 +282,6 @@ static inline void __iomem *ioremap_nocache(unsigned long offset, unsigned long } #define ioremap_wc ioremap_nocache -#define ioremap_wt ioremap_nocache #define ioremap_uc ioremap_nocache static inline void iounmap(void __iomem *addr)
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index c5a62da22cd2..6e24d7cceb0c 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h@@ -46,7 +46,6 @@ static inline void iounmap(void __iomem *addr) } #define ioremap_wc ioremap_nocache -#define ioremap_wt ioremap_nocache /* Pages to physical address... */ #define page_to_phys(page) virt_to_phys(page_to_virt(page))
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h
index 437e9af96688..6d4bb1b4a5b1 100644
--- a/arch/s390/include/asm/io.h
+++ b/arch/s390/include/asm/io.h@@ -29,7 +29,6 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr); #define ioremap_nocache(addr, size) ioremap(addr, size) #define ioremap_wc ioremap_nocache -#define ioremap_wt ioremap_nocache static inline void __iomem *ioremap(unsigned long offset, unsigned long size) {
diff --git a/arch/sparc/include/asm/io_32.h b/arch/sparc/include/asm/io_32.h
index 57f26c398dc9..407ac14295f4 100644
--- a/arch/sparc/include/asm/io_32.h
+++ b/arch/sparc/include/asm/io_32.h@@ -129,7 +129,6 @@ static inline void sbus_memcpy_toio(volatile void __iomem *dst, void __iomem *ioremap(unsigned long offset, unsigned long size); #define ioremap_nocache(X,Y) ioremap((X),(Y)) #define ioremap_wc(X,Y) ioremap((X),(Y)) -#define ioremap_wt(X,Y) ioremap((X),(Y)) void iounmap(volatile void __iomem *addr); /* Create a virtual mapping cookie for an IO port range */
diff --git a/arch/sparc/include/asm/io_64.h b/arch/sparc/include/asm/io_64.h
index c32fa3f752c8..50d4840d9aeb 100644
--- a/arch/sparc/include/asm/io_64.h
+++ b/arch/sparc/include/asm/io_64.h@@ -402,7 +402,6 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) #define ioremap_nocache(X,Y) ioremap((X),(Y)) #define ioremap_wc(X,Y) ioremap((X),(Y)) -#define ioremap_wt(X,Y) ioremap((X),(Y)) static inline void iounmap(volatile void __iomem *addr) {
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index 5879af3568c5..8c4551ae70de 100644
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h@@ -54,7 +54,6 @@ extern void iounmap(volatile void __iomem *addr); #define ioremap_nocache(physaddr, size) ioremap(physaddr, size) #define ioremap_wc(physaddr, size) ioremap(physaddr, size) -#define ioremap_wt(physaddr, size) ioremap(physaddr, size) #define ioremap_uc(physaddr, size) ioremap(physaddr, size) #define mmiowb()
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index e643a96f7c23..746c1648dbd0 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h@@ -35,7 +35,6 @@ */ #define ARCH_HAS_IOREMAP_WC -#define ARCH_HAS_IOREMAP_WT #include <linux/string.h> #include <linux/compiler.h>
@@ -321,7 +320,6 @@ extern void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr); extern int ioremap_change_attr(unsigned long vaddr, unsigned long size, enum page_cache_mode pcm); extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size); -extern void __iomem *ioremap_wt(resource_size_t offset, unsigned long size); extern bool is_early_ioremap_ptep(pte_t *ptep);
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 4bfe8b490b9a..f442c96ca8e4 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c@@ -293,23 +293,6 @@ void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size) } EXPORT_SYMBOL(ioremap_wc); -/** - * ioremap_wt - map memory into CPU space write through - * @phys_addr: bus address of the memory - * @size: size of the resource to map - * - * This version of ioremap ensures that the memory is marked write through. - * Write through stores data into memory while keeping the cache up-to-date. - * - * Must be freed with iounmap. - */ -void __iomem *ioremap_wt(resource_size_t phys_addr, unsigned long size) -{ - return __ioremap_caller(phys_addr, size, _PAGE_CACHE_MODE_WT, - __builtin_return_address(0)); -} -EXPORT_SYMBOL(ioremap_wt); - void *arch_memremap(resource_size_t phys_addr, size_t size, unsigned long flags) {
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index 9bfbecc0fc99..aaafd90c70db 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h@@ -49,7 +49,6 @@ static inline void __iomem *ioremap_nocache(unsigned long offset, } #define ioremap_wc ioremap_nocache -#define ioremap_wt ioremap_nocache static inline void __iomem *ioremap(unsigned long offset, unsigned long size) {
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 8b1d371b5404..c1235ea427e8 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig@@ -699,7 +699,7 @@ config FB_MAC config FB_HP300 bool - depends on (FB = y) && DIO + depends on (FB = y) && DIO && ARCH_HAS_MEMREMAP select FB_CFB_IMAGEBLIT default y
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index eed3bbe88c8a..5196b8ad16fc 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h@@ -813,14 +813,6 @@ static inline void __iomem *ioremap_wc(phys_addr_t offset, size_t size) } #endif -#ifndef ioremap_wt -#define ioremap_wt ioremap_wt -static inline void __iomem *ioremap_wt(phys_addr_t offset, size_t size) -{ - return ioremap_nocache(offset, size); -} -#endif - #ifndef iounmap #define iounmap iounmap
diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h
index d8f8622fa044..1b41011643a5 100644
--- a/include/asm-generic/iomap.h
+++ b/include/asm-generic/iomap.h@@ -66,10 +66,6 @@ extern void ioport_unmap(void __iomem *); #define ioremap_wc ioremap_nocache #endif -#ifndef ARCH_HAS_IOREMAP_WT -#define ioremap_wt ioremap_nocache -#endif - #ifdef CONFIG_PCI /* Destroy a virtual mapping cookie for a PCI BAR (memory or IO) */ struct pci_dev;