From patchwork Mon Feb 2 12:45:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5761231 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A7FB79F3CA for ; Mon, 2 Feb 2015 12:51:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5AE120351 for ; Mon, 2 Feb 2015 12:51:08 +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 77B132034B for ; Mon, 2 Feb 2015 12:51:07 +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 1YIGQl-00086M-A8; Mon, 02 Feb 2015 12:48:43 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YIGQh-000816-Tt for linux-arm-kernel@lists.infradead.org; Mon, 02 Feb 2015 12:48:40 +0000 Received: by mail-pa0-f47.google.com with SMTP id lj1so81971393pab.6 for ; Mon, 02 Feb 2015 04:48:18 -0800 (PST) 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=cIeXNlr3e992EHhUhByuQMIT8IWkty0WwpWqiea+tmg=; b=FEnccGmeZ6REaM/wjGsrtGopNV65vvobGX+ZtY2s33QCejL4I1ypmnYsmBoP6Xxl51 KaBNhpUZljpIPoXupyx/qHjmlBf1NTDOqNkWiMV7zQfMdHodic4o5M5wLp05/LTAMU13 HO2dF8gZxP1LsPgS7cmvCKxwxIl+UpyySe/FDFLRd7Rc6+L84uUVP6TxqhdehwlNXc9F EZbEI9UCZlBqnX51qKVKZwqJ6sDHVd871Ib2hs1hyCKTq5kIfmYDDTXYdpToJ2+V7rbw 2ffcLrOkYIs77LZV7wh5VaUnccA7tsax0Cyq/u6V3+w++6RAUxgnDFrF/hRQvgZPxnpP XAEQ== X-Gm-Message-State: ALoCoQnx891SMNyZBacoBt86rJuxI4v1vbjYkZ5Z8dQTNbnU+2gHIprHGZXIOyMNaNJ5pWtF//El X-Received: by 10.68.238.234 with SMTP id vn10mr28825365pbc.140.1422881298627; Mon, 02 Feb 2015 04:48:18 -0800 (PST) Received: from localhost ([180.150.157.4]) by mx.google.com with ESMTPSA id ph7sm18779068pbb.6.2015.02.02.04.48.17 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Feb 2015 04:48:17 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v8 01/21] acpi: add arm64 to the platforms that use ioremap Date: Mon, 2 Feb 2015 20:45:29 +0800 Message-Id: <1422881149-8177-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> References: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150202_044839_995488_587C842C X-CRM114-Status: GOOD ( 10.90 ) X-Spam-Score: -0.7 (/) Cc: Mark Langsdorf , linaro-acpi@lists.linaro.org, wangyijing@huawei.com, Rob Herring , Lorenzo Pieralisi , Al Stone , Timur Tabi , Daniel Lezcano , linux-acpi@vger.kernel.org, Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com, Robert Richter , Jason Cooper , Marc Zyngier , Jon Masters , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Ashwin Chaugule , Graeme Gregory , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla 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 Signed-off-by: Al Stone Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo --- 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)