mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-09 07:23:14 +00:00
arch/*/io.h: remove ioremap_uc in some architectures
ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension, and on ia64 with its slightly unconventional ioremap() behavior. So remove the ioremap_uc() definition in architecutures other than x86 and ia64. These architectures all have asm-generic/io.h included and will have the default ioremap_uc() definition which returns NULL. This changes the existing behaviour, while no need to worry about any breakage because in the only callsite of ioremap_uc(), code has been adjusted to eliminate the impact. Please see atyfb_setup_generic() of drivers/video/fbdev/aty/atyfb_base.c. If any new invocation of ioremap_uc() need be added, please consider using ioremap() intead or adding a ARCH specific version if necessary. Signed-off-by: Baoquan He <bhe@redhat.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Acked-by: Helge Deller <deller@gmx.de> # parisc Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de> (SuperH) Cc: linux-alpha@vger.kernel.org Cc: linux-hexagon@vger.kernel.org Cc: linux-m68k@lists.linux-m68k.org Cc: linux-mips@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-sh@vger.kernel.org Cc: sparclinux@vger.kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
4bfb53e7d3
commit
026246f114
@ -408,11 +408,12 @@ functions for details on the CPU side of things.
|
||||
ioremap_uc()
|
||||
------------
|
||||
|
||||
ioremap_uc() behaves like ioremap() except that on the x86 architecture without
|
||||
'PAT' mode, it marks memory as uncached even when the MTRR has designated
|
||||
it as cacheable, see Documentation/arch/x86/pat.rst.
|
||||
ioremap_uc() is only meaningful on old x86-32 systems with the PAT extension,
|
||||
and on ia64 with its slightly unconventional ioremap() behavior, everywhere
|
||||
elss ioremap_uc() defaults to return NULL.
|
||||
|
||||
Portable drivers should avoid the use of ioremap_uc().
|
||||
|
||||
Portable drivers should avoid the use of ioremap_uc(), use ioremap() instead.
|
||||
|
||||
ioremap_cache()
|
||||
---------------
|
||||
|
@ -308,7 +308,6 @@ static inline void __iomem *ioremap(unsigned long port, unsigned long size)
|
||||
}
|
||||
|
||||
#define ioremap_wc ioremap
|
||||
#define ioremap_uc ioremap
|
||||
|
||||
static inline void iounmap(volatile void __iomem *addr)
|
||||
{
|
||||
|
@ -174,9 +174,6 @@ static inline void writel(u32 data, volatile void __iomem *addr)
|
||||
#define _PAGE_IOREMAP (_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
|
||||
(__HEXAGON_C_DEV << 6))
|
||||
|
||||
#define ioremap_uc(addr, size) ioremap((addr), (size))
|
||||
|
||||
|
||||
#define __raw_writel writel
|
||||
|
||||
static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
|
||||
|
@ -25,7 +25,6 @@ static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)
|
||||
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
|
||||
}
|
||||
|
||||
#define ioremap_uc ioremap
|
||||
#define ioremap_wt ioremap_wt
|
||||
static inline void __iomem *ioremap_wt(unsigned long physaddr,
|
||||
unsigned long size)
|
||||
|
@ -170,7 +170,6 @@ void iounmap(const volatile void __iomem *addr);
|
||||
*/
|
||||
#define ioremap(offset, size) \
|
||||
ioremap_prot((offset), (size), _CACHE_UNCACHED)
|
||||
#define ioremap_uc ioremap
|
||||
|
||||
/*
|
||||
* ioremap_cache - map bus memory into CPU space
|
||||
|
@ -132,8 +132,6 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr)
|
||||
|
||||
#define ioremap_wc(addr, size) \
|
||||
ioremap_prot((addr), (size), _PAGE_IOREMAP)
|
||||
#define ioremap_uc(addr, size) \
|
||||
ioremap_prot((addr), (size), _PAGE_IOREMAP)
|
||||
|
||||
#define pci_iounmap pci_iounmap
|
||||
|
||||
|
@ -900,7 +900,6 @@ void __iomem *ioremap_wt(phys_addr_t address, unsigned long size);
|
||||
#endif
|
||||
|
||||
void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size);
|
||||
#define ioremap_uc(addr, size) ioremap((addr), (size))
|
||||
#define ioremap_cache(addr, size) \
|
||||
ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL))
|
||||
|
||||
|
@ -302,8 +302,6 @@ unsigned long long poke_real_address_q(unsigned long long addr,
|
||||
ioremap_prot((addr), (size), pgprot_val(PAGE_KERNEL))
|
||||
#endif /* CONFIG_MMU */
|
||||
|
||||
#define ioremap_uc ioremap
|
||||
|
||||
/*
|
||||
* Convert a physical pointer to a virtual kernel pointer for /dev/mem
|
||||
* access
|
||||
|
@ -423,7 +423,6 @@ static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
|
||||
return (void __iomem *)offset;
|
||||
}
|
||||
|
||||
#define ioremap_uc(X,Y) ioremap((X),(Y))
|
||||
#define ioremap_wc(X,Y) ioremap((X),(Y))
|
||||
#define ioremap_wt(X,Y) ioremap((X),(Y))
|
||||
static inline void __iomem *ioremap_np(unsigned long offset, unsigned long size)
|
||||
|
Loading…
Reference in New Issue
Block a user