From patchwork Tue Feb 3 17:29:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salter X-Patchwork-Id: 5770301 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8C04BBF440 for ; Tue, 3 Feb 2015 17:31:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D53B20253 for ; Tue, 3 Feb 2015 17:31:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 545C6201FB for ; Tue, 3 Feb 2015 17:31:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756035AbbBCRbI (ORCPT ); Tue, 3 Feb 2015 12:31:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48193 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752494AbbBCRbH (ORCPT ); Tue, 3 Feb 2015 12:31:07 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t13HTdxp025382 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 3 Feb 2015 12:29:40 -0500 Received: from [10.3.113.72] (ovpn-113-72.phx2.redhat.com [10.3.113.72]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t13HTacX007756; Tue, 3 Feb 2015 12:29:36 -0500 Message-ID: <1422984576.18187.82.camel@deneb.redhat.com> Subject: Re: [PATCH v8 02/21] acpi: fix acpi_os_ioremap for arm64 From: Mark Salter To: "Rafael J. Wysocki" 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 Date: Tue, 03 Feb 2015 12:29:36 -0500 In-Reply-To: <2422968.Es7R0p3loO@vostro.rjw.lan> References: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> <1422881149-8177-3-git-send-email-hanjun.guo@linaro.org> <2422968.Es7R0p3loO@vostro.rjw.lan> Organization: Red Hat, Inc Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 + #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);