Commit f6bf47ab authored by Will Deacon's avatar Will Deacon
Browse files

arm64: io: Rename ioremap_prot() to __ioremap_prot() 



Rename our ioremap_prot() implementation to __ioremap_prot() and convert
all arch-internal callers over to the new function.

ioremap_prot() remains as a #define to __ioremap_prot() for
generic_access_phys() and will be subsequently extended to handle user
permissions in 'prot'.

Cc: Zeng Heng <zengheng4@huawei.com>
Cc: Jinjiang Tu <tujinjiang@huawei.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 6de23f81

arch/arm64/include/asm/io.h

+6 −5
Original line number Diff line number Diff line
@@ -264,19 +264,20 @@ __iowrite64_copy(void __iomem *to, const void *from, size_t count) 
typedef int (*ioremap_prot_hook_t)(phys_addr_t phys_addr, size_t size,

				   pgprot_t *prot);

int arm64_ioremap_prot_hook_register(const ioremap_prot_hook_t hook);

void __iomem *__ioremap_prot(phys_addr_t phys, size_t size, pgprot_t prot);



#define ioremap_prot ioremap_prot

#define ioremap_prot __ioremap_prot



#define _PAGE_IOREMAP PROT_DEVICE_nGnRE



#define ioremap_wc(addr, size)	\

	ioremap_prot((addr), (size), __pgprot(PROT_NORMAL_NC))

	__ioremap_prot((addr), (size), __pgprot(PROT_NORMAL_NC))

#define ioremap_np(addr, size)	\

	ioremap_prot((addr), (size), __pgprot(PROT_DEVICE_nGnRnE))

	__ioremap_prot((addr), (size), __pgprot(PROT_DEVICE_nGnRnE))





#define ioremap_encrypted(addr, size)	\

	ioremap_prot((addr), (size), PAGE_KERNEL)

	__ioremap_prot((addr), (size), PAGE_KERNEL)



/*

 * io{read,write}{16,32,64}be() macros
@@ -297,7 +298,7 @@ static inline void __iomem *ioremap_cache(phys_addr_t addr, size_t size) 
	if (pfn_is_map_memory(__phys_to_pfn(addr)))

		return (void __iomem *)__phys_to_virt(addr);



	return ioremap_prot(addr, size, __pgprot(PROT_NORMAL));

	return __ioremap_prot(addr, size, __pgprot(PROT_NORMAL));

}



/*

arch/arm64/kernel/acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) 
				prot = __acpi_get_writethrough_mem_attribute();

		}

	}

	return ioremap_prot(phys, size, prot);

	return __ioremap_prot(phys, size, prot);

}



/*

arch/arm64/mm/ioremap.c

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ int arm64_ioremap_prot_hook_register(ioremap_prot_hook_t hook) 
	return 0;

}



void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size,

void __iomem *__ioremap_prot(phys_addr_t phys_addr, size_t size,

			     pgprot_t pgprot)

{

	unsigned long last_addr = phys_addr + size - 1;
@@ -39,7 +39,7 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, size_t size, 


	return generic_ioremap_prot(phys_addr, size, pgprot);

}

EXPORT_SYMBOL(ioremap_prot);

EXPORT_SYMBOL(__ioremap_prot);



/*

 * Must be called after early_fixmap_init