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: 44137 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 40A462034D for ; Mon, 2 Feb 2015 12:50:28 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id n3sf18253567wiv.0 for ; Mon, 02 Feb 2015 04:50:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=c516G9jtjCIiuAA+Zl1CWPv7wTysmclB2sKTb+ZKpeY=; b=Zn6CT1If3oH0aNniWte8J5BRhYFKKDWEPtOySTj3Rt69X8B+scO9erfHt+pKAB7QH4 uv6PEww8euDyLX5AWnF7A4eLgGLeAIlCYvy1mShppaJQfHB5jqu/L0+rOhrWXZK0lLSC rPf4Klor25hNHXMTcGK596Znpe/4kVk7UcA0dQMoAJ1r1QrdVxsFPXDWhAzsETUCBQZr upnUn+fyBw7H3sOO2s3B8B2i+vdgaoP2So2E1ych0t3+yHAld+SJqJ4rkilMUeiCm4r/ +KvX0OJ9D0E1g8Pm8MbQppvh9LU/HvX8cyAq/OfFTwu2wZDcITEEY1rcgDUU4YH7Mjyj V5ZA== X-Gm-Message-State: ALoCoQnOX52ec7yUEm0j0aAFkOCQ8R54fqg3kkjxMEoTpaFUCZzaCRtGnjntDv6naaKo8f3tHJ0m X-Received: by 10.180.37.107 with SMTP id x11mr1193983wij.5.1422881427447; Mon, 02 Feb 2015 04:50:27 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.2 with SMTP id ku2ls572494lac.64.gmail; Mon, 02 Feb 2015 04:50:27 -0800 (PST) X-Received: by 10.152.6.195 with SMTP id d3mr15320909laa.36.1422881427149; Mon, 02 Feb 2015 04:50:27 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id jb3si16868107lbc.79.2015.02.02.04.50.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 02 Feb 2015 04:50:27 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id hv19so40173615lab.13 for ; Mon, 02 Feb 2015 04:50:27 -0800 (PST) X-Received: by 10.152.5.226 with SMTP id v2mr19256042lav.34.1422881427063; Mon, 02 Feb 2015 04:50:27 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1273920lbj; Mon, 2 Feb 2015 04:50:26 -0800 (PST) X-Received: by 10.70.102.35 with SMTP id fl3mr29157584pdb.30.1422881423882; Mon, 02 Feb 2015 04:50:23 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id nu9si23304109pbb.238.2015.02.02.04.50.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Feb 2015 04:50:23 -0800 (PST) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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-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 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.47 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.220.47 listed in wl.mailspike.net] 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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)