Commit 84d8857a authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/ioremap' into for-next/core 

* for-next/ioremap:
  arm64: Add HAVE_IOREMAP_PROT support
  arm64: mm: Convert to GENERIC_IOREMAP
  mm: ioremap: Add ioremap/iounmap_allowed()
  mm: ioremap: Setup phys_addr of struct vm_struct
  mm: ioremap: Use more sensible name in ioremap_prot()
  ARM: mm: kill unused runtime hook arch_iounmap()
parents ee8b00a9 893dea9c

Documentation/features/vm/ioremap_prot/arch-support.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    |       alpha: | TODO |

    |         arc: |  ok  |

    |         arm: | TODO |

    |       arm64: | TODO |

    |       arm64: |  ok  |

    |        csky: | TODO |

    |     hexagon: | TODO |

    |        ia64: | TODO |

arch/arm/include/asm/io.h

+1 −3
Original line number Diff line number Diff line
@@ -139,11 +139,9 @@ extern void __iomem *__arm_ioremap_caller(phys_addr_t, size_t, unsigned int, 
extern void __iomem *__arm_ioremap_pfn(unsigned long, unsigned long, size_t, unsigned int);

extern void __iomem *__arm_ioremap_exec(phys_addr_t, size_t, bool cached);

void __arm_iomem_set_ro(void __iomem *ptr, size_t size);

extern void __iounmap(volatile void __iomem *addr);



extern void __iomem * (*arch_ioremap_caller)(phys_addr_t, size_t,

	unsigned int, void *);

extern void (*arch_iounmap)(volatile void __iomem *);



/*

 * Bad read/write accesses...
@@ -380,7 +378,7 @@ 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);

void iounmap(volatile void __iomem *io_addr);

#define iounmap iounmap



void *arch_memremap_wb(phys_addr_t phys_addr, size_t size);

arch/arm/mm/ioremap.c

+1 −8
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) 
						   __builtin_return_address(0));

}



void __iounmap(volatile void __iomem *io_addr)

void iounmap(volatile void __iomem *io_addr)

{

	void *addr = (void *)(PAGE_MASK & (unsigned long)io_addr);

	struct static_vm *svm;
@@ -446,13 +446,6 @@ void __iounmap(volatile void __iomem *io_addr) 


	vunmap(addr);

}



void (*arch_iounmap)(volatile void __iomem *) = __iounmap;



void iounmap(volatile void __iomem *cookie)

{

	arch_iounmap(cookie);

}

EXPORT_SYMBOL(iounmap);



#if defined(CONFIG_PCI) || IS_ENABLED(CONFIG_PCMCIA)

arch/arm/mm/nommu.c

+1 −8
Original line number Diff line number Diff line
@@ -230,14 +230,7 @@ void *arch_memremap_wb(phys_addr_t phys_addr, size_t size) 
	return (void *)phys_addr;

}



void __iounmap(volatile void __iomem *addr)

{

}

EXPORT_SYMBOL(__iounmap);



void (*arch_iounmap)(volatile void __iomem *);



void iounmap(volatile void __iomem *addr)

void iounmap(volatile void __iomem *io_addr)

{

}

EXPORT_SYMBOL(iounmap);

arch/arm64/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ config ARM64 
	select GENERIC_CPU_VULNERABILITIES

	select GENERIC_EARLY_IOREMAP

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IOREMAP

	select GENERIC_IRQ_IPI

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW
@@ -188,6 +189,7 @@ config ARM64 
	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_GCC_PLUGINS

	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_IOREMAP_PROT

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KVM

	select HAVE_NMI