Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1945960AbbGYCqB (ORCPT ); Fri, 24 Jul 2015 22:46:01 -0400 Received: from mga11.intel.com ([192.55.52.93]:49270 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1945927AbbGYCp6 (ORCPT ); Fri, 24 Jul 2015 22:45:58 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,542,1432623600"; d="scan'208";a="612482317" Subject: [PATCH v2 24/25] arch: remove ioremap_wt, replace with arch_memremap From: Dan Williams To: tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com Cc: linux-arch@vger.kernel.org, Tony Luck , toshi.kani@hp.com, Arnd Bergmann , linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org, Ingo Molnar , Borislav Petkov , rmk+kernel@arm.linux.org.uk, hch@lst.de, linux-arm-kernel@lists.infradead.org Date: Fri, 24 Jul 2015 22:40:15 -0400 Message-ID: <20150725024015.8664.42950.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <20150725023649.8664.59145.stgit@dwillia2-desk3.amr.corp.intel.com> References: <20150725023649.8664.59145.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-8-g92dd MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 18908 Lines: 541 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. Cc: Arnd Bergmann Cc: Russell King Cc: Tony Luck Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov Signed-off-by: Dan Williams --- 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/Kconfig | 1 + arch/frv/include/asm/io.h | 17 ++++++----------- arch/frv/mm/kmap.c | 6 ++++++ arch/m32r/include/asm/io.h | 1 - arch/m68k/Kconfig | 1 + arch/m68k/include/asm/io_mm.h | 14 ++------------ arch/m68k/include/asm/io_no.h | 12 ++++++------ arch/m68k/include/asm/raw_io.h | 4 ++++ arch/m68k/mm/kmap.c | 17 ++++++++++++++++- arch/m68k/mm/sun3kmap.c | 6 ++++++ 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 ---- 28 files changed, 49 insertions(+), 79 deletions(-) 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 989eeaa8dd84..89114571cf11 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(CACHE) 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 @@ -397,7 +396,6 @@ void __iomem *arch_memremap(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 305d1c9b3352..a03157daeb1c 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -170,7 +170,6 @@ extern void *arch_memremap(phys_addr_t phys_addr, size_t size, unsigned long fla #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 static inline void memunmap(void *addr) diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h index e998ff5d8e1a..4f5ec2bb7172 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 cached(addr) P1SEGADDR(addr) #define uncached(addr) P2SEGADDR(addr) diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig index 34aa19352dc1..b1b4000807fb 100644 --- a/arch/frv/Kconfig +++ b/arch/frv/Kconfig @@ -7,6 +7,7 @@ config FRV select HAVE_UID16 select VIRT_TO_BUS select GENERIC_IRQ_SHOW + select ARCH_HAS_MEMREMAP select HAVE_DEBUG_BUGVERBOSE select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_CPU_DEVICES diff --git a/arch/frv/include/asm/io.h b/arch/frv/include/asm/io.h index a31b63ec4930..3e908abc41cd 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 #include #include @@ -267,20 +265,17 @@ 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); -} - -static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned long size) -{ - return __ioremap(physaddr, size, IOMAP_FULL_CACHING); -} +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags); #define ioremap_wc ioremap_nocache extern void iounmap(void volatile __iomem *addr); +static inline void arch_memunmap(void *addr) +{ + iounmap((volatile void __force *) addr); +} + static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { return (void __iomem *) port; diff --git a/arch/frv/mm/kmap.c b/arch/frv/mm/kmap.c index e9217e605aa8..ba7d73383c10 100644 --- a/arch/frv/mm/kmap.c +++ b/arch/frv/mm/kmap.c @@ -34,6 +34,12 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla return (void __iomem *)physaddr; } +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags) +{ + return (void *) offset; +} +EXPORT_SYMBOL(arch_memremap); + /* * Unmap a ioremap()ed region again */ diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h index 0c3f25ee3381..9cc00dbd59ce 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 /* * IO bus memory addresses are also 1:1 with the physical address diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 2dd8f63bfbbb..693d06dc0a40 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -9,6 +9,7 @@ config M68K select GENERIC_ATOMIC64 select HAVE_UID16 select VIRT_TO_BUS + select ARCH_HAS_MEMREMAP select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS select GENERIC_CPU_DEVICES select GENERIC_IOMAP diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index f55cad529400..c91872e62dc3 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 #include #include @@ -468,16 +466,8 @@ 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); -} -static inline void __iomem *ioremap_fullcache(unsigned long physaddr, - unsigned long size) -{ - return __ioremap(physaddr, size, IOMAP_FULL_CACHING); -} + +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags); static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) { diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index ad7bd40e6742..008633ba49ce 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 #include @@ -155,13 +153,15 @@ 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) + +static inline void *arch_memremap(resource_size_t offset, size_t size, + unsigned long flags) { - return __ioremap(physaddr, size, IOMAP_WRITETHROUGH); + return (void *) offset; } -static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size) + +static inline void arch_memunmap(void *addr) { - return __ioremap(physaddr, size, IOMAP_FULL_CACHING); } #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..f6f1448407d9 100644 --- a/arch/m68k/include/asm/raw_io.h +++ b/arch/m68k/include/asm/raw_io.h @@ -25,6 +25,10 @@ extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag); extern void __iounmap(void *addr, unsigned long size); +static inline void arch_memunmap(void *addr) +{ + iounmap((void __iomem *) addr); +} /* ++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/m68k/mm/kmap.c b/arch/m68k/mm/kmap.c index 6e4955bc542b..94f334af9a63 100644 --- a/arch/m68k/mm/kmap.c +++ b/arch/m68k/mm/kmap.c @@ -14,12 +14,12 @@ #include #include #include +#include #include #include #include #include -#include #undef DEBUG @@ -223,6 +223,21 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla } EXPORT_SYMBOL(__ioremap); +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags) +{ + int mode; + + if (flags & MEMREMAP_CACHE) + mode = IOMAP_FULL_CACHING; + else if (flags & MEMREMAP_WT) + mode = IOMAP_WRITETHROUGH; + else + return NULL; + + return (void __force *) __ioremap(offset, size, mode); +} +EXPORT_SYMBOL(arch_memremap); + /* * Unmap an ioremap()ed region again */ diff --git a/arch/m68k/mm/sun3kmap.c b/arch/m68k/mm/sun3kmap.c index 3dc41158c05e..46af60b7f0c7 100644 --- a/arch/m68k/mm/sun3kmap.c +++ b/arch/m68k/mm/sun3kmap.c @@ -116,6 +116,12 @@ void __iomem *__ioremap(unsigned long phys, unsigned long size, int cache) } EXPORT_SYMBOL(__ioremap); +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags) +{ + return (void __force *) sun3_ioremap(offset, size, SUN3_PAGE_TYPE_IO); +} +EXPORT_SYMBOL(arch_memremap); + void iounmap(void __iomem *addr) { vfree((void *)(PAGE_MASK & (unsigned long)addr)); diff --git a/arch/metag/include/asm/io.h b/arch/metag/include/asm/io.h index 9890f21eadbe..d5779b0ec573 100644 --- a/arch/metag/include/asm/io.h +++ b/arch/metag/include/asm/io.h @@ -160,9 +160,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 39b6315db82e..4efa4fd023bd 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h @@ -42,7 +42,6 @@ extern void __iomem *ioremap(phys_addr_t address, unsigned long size); #define ioremap_nocache(addr, size) ioremap((addr), (size)) #define ioremap_fullcache(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 07c5b4a3903b..cc4a2ba9e228 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 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 cb5fdf3a78fc..30fd5c84680e 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 dc61de15c1f9..eece4fc730e4 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_fullcache(physaddr, size) ioremap(physaddr, size) #define mmiowb() diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index d13ac9cbdc30..bba4e8968bc7 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 #include @@ -328,7 +327,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 8d5c88bcd09b..987a58e84e2f 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 da6c8290e432..b9fdd90e89da 100644 --- a/arch/xtensa/include/asm/io.h +++ b/arch/xtensa/include/asm/io.h @@ -59,7 +59,6 @@ static inline void *arch_memremap(resource_size_t offset, size_t 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/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 2d98de535e0f..b76ec47c6810 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 f56094cfdeff..f5abd5540249 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -785,14 +785,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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/