Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161178AbbBCVlf (ORCPT ); Tue, 3 Feb 2015 16:41:35 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:55536 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1161026AbbBCVlc (ORCPT ); Tue, 3 Feb 2015 16:41:32 -0500 From: "Rafael J. Wysocki" To: Mark Salter Cc: Hanjun Guo , Catalin Marinas , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon , Lorenzo Pieralisi , Graeme Gregory , Sudeep Holla , Jon Masters , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Randy Dunlap , Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com, Timur Tabi , Ashwin Chaugule , suravee.suthikulpanit@amd.com, Mark Langsdorf , wangyijing@huawei.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org Subject: Re: [PATCH v8 02/21] acpi: fix acpi_os_ioremap for arm64 Date: Tue, 03 Feb 2015 23:04:27 +0100 Message-ID: <8901765.mLfPOCUyAN@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1422984576.18187.82.camel@deneb.redhat.com> References: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> <2422968.Es7R0p3loO@vostro.rjw.lan> <1422984576.18187.82.camel@deneb.redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4080 Lines: 123 On Tuesday, February 03, 2015 12:29:36 PM Mark Salter wrote: > On Mon, 2015-02-02 at 23:14 +0100, Rafael J. Wysocki wrote: > > On Monday, February 02, 2015 08:45:30 PM Hanjun Guo wrote: > > > From: Mark Salter > > > > > > The acpi_os_ioremap() function may be used to map normal RAM or IO > > > regions. The current implementation simply uses ioremap_cache(). This > > > will work for some architectures, but arm64 ioremap_cache() cannot be > > > used to map IO regions which don't support caching. So for arm64, use > > > ioremap() for non-RAM regions. > > > > > > CC: Rafael J Wysocki > > > Signed-off-by: Mark Salter > > > Signed-off-by: Hanjun Guo > > > --- > > > include/acpi/acpi_io.h | 6 ++++++ > > > 1 file changed, 6 insertions(+) > > > > > > diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h > > > index 444671e..9d573db 100644 > > > --- a/include/acpi/acpi_io.h > > > +++ b/include/acpi/acpi_io.h > > > @@ -1,11 +1,17 @@ > > > #ifndef _ACPI_IO_H_ > > > #define _ACPI_IO_H_ > > > > > > +#include > > > #include > > > > > > static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, > > > acpi_size size) > > > { > > > +#ifdef CONFIG_ARM64 > > > + if (!page_is_ram(phys >> PAGE_SHIFT)) > > > + return ioremap(phys, size); > > > +#endif > > > > I don't want to see #ifdef CONFIG_ARM64 in this file. > > > > How about something like: > > From: Mark Salter > Date: Tue, 3 Feb 2015 10:51:16 -0500 > Subject: [PATCH] acpi: fix acpi_os_ioremap for arm64 > > The acpi_os_ioremap() function may be used to map normal RAM or IO > regions. The current implementation simply uses ioremap_cache(). This > will work for some architectures, but arm64 ioremap_cache() cannot be > used to map IO regions which don't support caching. So for arm64, use > ioremap() for non-RAM regions. > > CC: Rafael J Wysocki > Signed-off-by: Mark Salter > --- > arch/arm64/include/asm/acpi.h | 14 ++++++++++++++ > include/acpi/acpi_io.h | 3 +++ > 2 files changed, 17 insertions(+) > > diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h > index ea4d2b3..db82bc3 100644 > --- a/arch/arm64/include/asm/acpi.h > +++ b/arch/arm64/include/asm/acpi.h > @@ -14,6 +14,7 @@ > > #include > > +#include > #include > > /* Basic configuration for ACPI */ > @@ -100,4 +101,17 @@ static inline bool acpi_psci_use_hvc(void) { return false; } > static inline void acpi_init_cpus(void) { } > #endif /* CONFIG_ACPI */ > > +/* > + * ACPI table mapping > + */ > +static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, > + acpi_size size) > +{ > + if (!page_is_ram(phys >> PAGE_SHIFT)) > + return ioremap(phys, size); > + > + return ioremap_cache(phys, size); > +} > +#define acpi_os_ioremap acpi_os_ioremap If you want to do it this way, use __weak. You won't need the #define then. Otherwise, please use a proper CONFIG_ARCH_ symbol. > + > #endif /*_ASM_ACPI_H*/ > diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h > index 444671e..48f504a 100644 > --- a/include/acpi/acpi_io.h > +++ b/include/acpi/acpi_io.h > @@ -2,12 +2,15 @@ > #define _ACPI_IO_H_ > > #include > +#include > > +#ifndef acpi_os_ioremap > static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, > acpi_size size) > { > return ioremap_cache(phys, size); > } > +#endif > > void __iomem *__init_refok > acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- 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/