Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c04e8e2f authored by Mark Salter's avatar Mark Salter Committed by Catalin Marinas
Browse files

arm64: allow ioremap_cache() to use existing RAM mappings 



Some drivers (ACPI notably) use ioremap_cache() to map an area which could
either be outside of kernel RAM or in an already mapped reserved area of
RAM. To avoid aliases with different caching attributes, ioremap() does
not allow RAM to be remapped. But for ioremap_cache(), the existing kernel
mapping may be used.

Signed-off-by: default avatarMark Salter <msalter@redhat.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent d0f38f91

arch/arm64/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ extern void __memset_io(volatile void __iomem *, int, size_t); 
 */

extern void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot);

extern void __iounmap(volatile void __iomem *addr);

extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);



#define PROT_DEFAULT		(PTE_TYPE_PAGE | PTE_AF | PTE_DIRTY)

#define PROT_DEVICE_nGnRE	(PROT_DEFAULT | PTE_PXN | PTE_UXN | PTE_ATTRINDX(MT_DEVICE_nGnRE))
@@ -233,7 +234,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_cached(addr, size)	__ioremap((addr), (size), __pgprot(PROT_NORMAL))

#define iounmap				__iounmap



#define PROT_SECT_DEFAULT	(PMD_TYPE_SECT | PMD_SECT_AF)

arch/arm64/mm/ioremap.c

+18 −2
Original line number Diff line number Diff line
@@ -77,8 +77,24 @@ EXPORT_SYMBOL(__ioremap); 


void __iounmap(volatile void __iomem *io_addr)

{

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

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



	vunmap(addr);

	/*

	 * We could get an address outside vmalloc range in case

	 * of ioremap_cache() reusing a RAM mapping.

	 */

	if (VMALLOC_START <= addr && addr < VMALLOC_END)

		vunmap((void *)addr);

}

EXPORT_SYMBOL(__iounmap);



void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size)

{

	/* For normal memory we already have a cacheable mapping. */

	if (pfn_valid(__phys_to_pfn(phys_addr)))

		return (void __iomem *)__phys_to_virt(phys_addr);



	return __ioremap_caller(phys_addr, size, __pgprot(PROT_NORMAL),

				__builtin_return_address(0));

}

EXPORT_SYMBOL(ioremap_cache);