Commit a308a710 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ioremap-5.5' of git://git.infradead.org/users/hch/ioremap 

Pull generic ioremap support from Christoph Hellwig:
 "This adds the remaining bits for an entirely generic ioremap and
  iounmap to lib/ioremap.c. To facilitate that, it cleans up the giant
  mess of weird ioremap variants we had with no users outside the arch
  code.

  For now just the three newest ports use the code, but there is more
  than a handful others that can be converted without too much work.

  Summary:

   - clean up various obsolete ioremap and iounmap variants

   - add a new generic ioremap implementation and switch csky, nds32 and
     riscv over to it"

* tag 'ioremap-5.5' of git://git.infradead.org/users/hch/ioremap: (21 commits)
  nds32: use generic ioremap
  csky: use generic ioremap
  csky: remove ioremap_cache
  riscv: use the generic ioremap code
  lib: provide a simple generic ioremap implementation
  sh: remove __iounmap
  nios2: remove __iounmap
  hexagon: remove __iounmap
  m68k: rename __iounmap and mark it static
  arch: rely on asm-generic/io.h for default ioremap_* definitions
  asm-generic: don't provide ioremap for CONFIG_MMU
  asm-generic: ioremap_uc should behave the same with and without MMU
  xtensa: clean up ioremap
  x86: Clean up ioremap()
  parisc: remove __ioremap
  nios2: remove __ioremap
  alpha: remove the unused __ioremap wrapper
  hexagon: clean up ioremap
  ia64: rename ioremap_nocache to ioremap_uc
  unicore32: remove ioremap_cached
  ...
parents 05bd375b eafee594

arch/alpha/include/asm/io.h

+0 −6
Original line number Diff line number Diff line
@@ -283,12 +283,6 @@ static inline void __iomem *ioremap(unsigned long port, unsigned long size) 
	return IO_CONCAT(__IO_PREFIX,ioremap) (port, size);

}



static inline void __iomem *__ioremap(unsigned long port, unsigned long size,

				      unsigned long flags)

{

	return ioremap(port, size);

}



static inline void __iomem * ioremap_nocache(unsigned long offset,

					     unsigned long size)

{

arch/arc/include/asm/io.h

+0 −4
Original line number Diff line number Diff line
@@ -34,10 +34,6 @@ static inline void ioport_unmap(void __iomem *addr) 


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)



/*

 * io{read,write}{16,32}be() macros

 */

arch/arm/include/asm/io.h

+0 −7
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ static inline void memcpy_toio(volatile void __iomem *to, const void *from, 
 */

void __iomem *ioremap(resource_size_t res_cookie, size_t size);

#define ioremap ioremap

#define ioremap_nocache ioremap



/*

 * Do not use ioremap_cache for mapping memory. Use memremap instead.
@@ -400,12 +399,6 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size); 
void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size);

#define ioremap_cache ioremap_cache



/*

 * Do not use ioremap_cached in new code. Provided for the benefit of

 * the pxa2xx-flash MTD driver only.

 */

void __iomem *ioremap_cached(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

arch/arm/mm/ioremap.c

+0 −4
Original line number Diff line number Diff line
@@ -382,15 +382,11 @@ void __iomem *ioremap(resource_size_t res_cookie, size_t size) 
EXPORT_SYMBOL(ioremap);



void __iomem *ioremap_cache(resource_size_t res_cookie, size_t size)

	__alias(ioremap_cached);



void __iomem *ioremap_cached(resource_size_t res_cookie, size_t size)

{

	return arch_ioremap_caller(res_cookie, size, MT_DEVICE_CACHED,

				   __builtin_return_address(0));

}

EXPORT_SYMBOL(ioremap_cache);

EXPORT_SYMBOL(ioremap_cached);



void __iomem *ioremap_wc(resource_size_t res_cookie, size_t size)

{

arch/arm/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static struct mem_type mem_types[] __ro_after_init = { 
		.prot_sect	= PROT_SECT_DEVICE,

		.domain		= DOMAIN_IO,

	},

	[MT_DEVICE_CACHED] = {	  /* ioremap_cached */

	[MT_DEVICE_CACHED] = {	  /* ioremap_cache */

		.prot_pte	= PROT_PTE_DEVICE | L_PTE_MT_DEV_CACHED,

		.prot_l1	= PMD_TYPE_TABLE,

		.prot_sect	= PROT_SECT_DEVICE | PMD_SECT_WB,

CRA Git | Maintained and supported by SUSTech CRA and CCSE