Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753299AbbH0IVc (ORCPT ); Thu, 27 Aug 2015 04:21:32 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:35641 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751563AbbH0IV3 (ORCPT ); Thu, 27 Aug 2015 04:21:29 -0400 From: yalin wang To: catalin.marinas@arm.com, will.deacon@arm.com, Liviu.Dudau@arm.com, treding@nvidia.com, mark.rutland@arm.com, toshi.kani@hp.com, andre.przywara@arm.com, orca.chen@gmail.com, michal.simek@xilinx.com, yalin.wang2010@gmail.com, steve.capper@linaro.org, keescook@chromium.org, lauraa@codeaurora.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: ioremap: change ioremap prototype and add ioremap_cache macro Date: Thu, 27 Aug 2015 16:21:00 +0800 Message-Id: <1440663660-24244-1-git-send-email-yalin.wang2010@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3038 Lines: 74 This patch change ioremap_*() first parameter type to resource_size_t to be the same as other platforms, and add ioremap_cache macro, because some code will test if this macro is defined or not, and will generate a generric version if not defined, for example, memremap.c do like this. Signed-off-by: yalin wang --- arch/arm64/include/asm/io.h | 5 +++-- arch/arm64/mm/ioremap.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h index 44be1e0..500e09f 100644 --- a/arch/arm64/include/asm/io.h +++ b/arch/arm64/include/asm/io.h @@ -163,15 +163,16 @@ extern void __memset_io(volatile void __iomem *, int, size_t); /* * I/O memory mapping functions. */ -extern void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot); +extern void __iomem *__ioremap(resource_size_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); +extern void __iomem *ioremap_cache(resource_size_t phys_addr, size_t size); #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_wt(addr, size) __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE)) #define iounmap __iounmap +#define ioremap_cache ioremap_cache /* * io{read,write}{16,32}be() macros diff --git a/arch/arm64/mm/ioremap.c b/arch/arm64/mm/ioremap.c index 01e88c8..082e963 100644 --- a/arch/arm64/mm/ioremap.c +++ b/arch/arm64/mm/ioremap.c @@ -29,7 +29,7 @@ #include #include -static void __iomem *__ioremap_caller(phys_addr_t phys_addr, size_t size, +static void __iomem *__ioremap_caller(resource_size_t phys_addr, size_t size, pgprot_t prot, void *caller) { unsigned long last_addr; @@ -73,7 +73,7 @@ static void __iomem *__ioremap_caller(phys_addr_t phys_addr, size_t size, return (void __iomem *)(offset + addr); } -void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot) +void __iomem *__ioremap(resource_size_t phys_addr, size_t size, pgprot_t prot) { return __ioremap_caller(phys_addr, size, prot, __builtin_return_address(0)); @@ -93,7 +93,7 @@ void __iounmap(volatile void __iomem *io_addr) } EXPORT_SYMBOL(__iounmap); -void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size) +void __iomem *ioremap_cache(resource_size_t phys_addr, size_t size) { /* For normal memory we already have a cacheable mapping. */ if (pfn_valid(__phys_to_pfn(phys_addr))) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/