From patchwork Tue Mar 24 14:02:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 6079601 Return-Path: X-Original-To: patchwork-linux-arm@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 AB38CBF90F for ; Tue, 24 Mar 2015 14:07:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BF9BB2024D for ; Tue, 24 Mar 2015 14:07:20 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3E2120225 for ; Tue, 24 Mar 2015 14:07:19 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YaPRm-0003LH-W0; Tue, 24 Mar 2015 14:04:47 +0000 Received: from mail-pa0-f45.google.com ([209.85.220.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YaPR8-00033l-NB for linux-arm-kernel@lists.infradead.org; Tue, 24 Mar 2015 14:04:07 +0000 Received: by pagv19 with SMTP id v19so51740363pag.2 for ; Tue, 24 Mar 2015 07:03:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FSfwpcgDh2lRFWqlwglRBWCTvXpNwYsYh62ggI/3prk=; b=hKNy17UAQ5bhWvPzP7k6Fak8R1x3ATwm1rr9Qr5dmuDyxYcNLx+M5zTFmbRnJugVlW iF2ovXmW30Pk7Jm6GgmcVZXEluVkATkKj0NE9PW3f7V1GpslhrAvPR9EiV0g0mqqgp1K FQMrkredRqzU7g3LnQMLpa2rDx6CaWU+q1UW3T2APes7y3dGDvjusJeqX+mBl4nDM+tV 6JbF/tA1L2QHXBcFrjW+PuF/gNVdt+PM1EOb6umXpc7k2T9zNZYL1oAx7uVtD3qbzc9J rOAyf7FCBI7MhdKWUY9cggB924TuwQaJTIPCiiM67K/mSe8Uj5rtOjzh9G6Kd8WaN0Gj +RjA== X-Gm-Message-State: ALoCoQkauwOMcupiahxTKm9ZYku54IHAUuXHyIONXMxdVxefeoFL8oY5d1K1b8qrL2kzOu5GzR1I X-Received: by 10.66.62.137 with SMTP id y9mr7774452par.87.1427205827647; Tue, 24 Mar 2015 07:03:47 -0700 (PDT) Received: from localhost ([180.150.148.224]) by mx.google.com with ESMTPSA id yt8sm4363804pab.22.2015.03.24.07.03.45 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 24 Mar 2015 07:03:46 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Subject: [patch v11 02/23] ACPI: add arm64 to the platforms that use ioremap Date: Tue, 24 Mar 2015 22:02:35 +0800 Message-Id: <1427205776-5060-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> References: <1427205776-5060-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150324_070406_804011_79748AD2 X-CRM114-Status: GOOD ( 10.05 ) X-Spam-Score: -0.7 (/) Cc: Mark Rutland , Ashwin Chaugule , Lorenzo Pieralisi , Robert Richter , Arnd Bergmann , Graeme Gregory , linaro-acpi@lists.linaro.org, Marc Zyngier , Jon Masters , Timur Tabi , Mark Salter , linux-kernel@vger.kernel.org, Al Stone , linux-acpi@vger.kernel.org, Mark Brown , Hanjun Guo , Suravee Suthikulpanit , Sudeep Holla , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 From: Graeme Gregory Now with the base changes to the arm memory mapping it is safe to convert to using ioremap to map in the tables after acpi_gbl_permanent_mmap is set. CC: Rafael J Wysocki Tested-by: Robert Richter Tested-by: Timur Tabi Acked-by: Robert Richter Acked-by: Rafael J. Wysocki Reviewed-by: Grant Likely Signed-off-by: Al Stone Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Acked-by: Catalin Marinas --- drivers/acpi/osl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index f9eeae8..39748bb 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -336,11 +336,11 @@ acpi_map_lookup_virt(void __iomem *virt, acpi_size size) return NULL; } -#ifndef CONFIG_IA64 -#define should_use_kmap(pfn) page_is_ram(pfn) -#else +#if defined(CONFIG_IA64) || defined(CONFIG_ARM64) /* ioremap will take care of cache attributes */ #define should_use_kmap(pfn) 0 +#else +#define should_use_kmap(pfn) page_is_ram(pfn) #endif static void __iomem *acpi_map(acpi_physical_address pg_off, unsigned long pg_sz)