From patchwork Wed Mar 11 12:39:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 45646 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 40558214C6 for ; Wed, 11 Mar 2015 12:43:39 +0000 (UTC) Received: by widex7 with SMTP id ex7sf7008623wid.2 for ; Wed, 11 Mar 2015 05:43:38 -0700 (PDT) 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=D3lPbKdDY78+WPOfdVtRhUZX4txID5xNVeVX/T6fHNI=; b=KDIqqo+k4oLoovN07RHmmOl83LhzS5y9v4BtjONUERR7BaSh6+ucqCIS1jYqnVaZKZ Pvb4E/FYLyknpv7xRdF7scts0jRixIiW0FJPH4ERXgdqQHkJEOp2nxpVJf+1PI6MMBnC z+D70VzXVREAQinv6fVBhY7hso6zHm4o37jnnCyyXlqx2QguKXAXlPT1TLj0BpesBHxW jZOISuJ/VEeWnXDS5yzZHQsDrEY6zk9g3b84LPREjrLLSLk/wHHzTjnfct2UpZThutt3 Aj/MUiVpNNlh6DdydtFheZVQpydrrtux3ltTRlBG1VQEHcuZZ9FqOLGoN0HXePB20f+R x0YQ== X-Gm-Message-State: ALoCoQkcnDJFpH1EsMfvdEGFrkkSHhJeLoVQsEOJfPF0/6baDcCJ/xid/EtrwGJznS/t8QmtfxEz X-Received: by 10.180.87.166 with SMTP id az6mr422106wib.1.1426077818356; Wed, 11 Mar 2015 05:43:38 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.136 with SMTP id e8ls162563lam.91.gmail; Wed, 11 Mar 2015 05:43:38 -0700 (PDT) X-Received: by 10.152.3.42 with SMTP id 10mr34376994laz.84.1426077818013; Wed, 11 Mar 2015 05:43:38 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id a4si2271974lbs.98.2015.03.11.05.43.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2015 05:43:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by labhs14 with SMTP id hs14so7972703lab.5 for ; Wed, 11 Mar 2015 05:43:37 -0700 (PDT) X-Received: by 10.152.28.5 with SMTP id x5mr34007372lag.112.1426077817859; Wed, 11 Mar 2015 05:43:37 -0700 (PDT) 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 h5csp2752837lbj; Wed, 11 Mar 2015 05:43:36 -0700 (PDT) X-Received: by 10.66.100.165 with SMTP id ez5mr77316117pab.153.1426077815577; Wed, 11 Mar 2015 05:43:35 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id e4si6725293pdc.217.2015.03.11.05.43.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Mar 2015 05:43:35 -0700 (PDT) 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 1YVfxP-0004OT-Q5; Wed, 11 Mar 2015 12:41:51 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVfwp-00040D-77 for linux-arm-kernel@lists.infradead.org; Wed, 11 Mar 2015 12:41:16 +0000 Received: by pdno5 with SMTP id o5so11048241pdn.1 for ; Wed, 11 Mar 2015 05:40:53 -0700 (PDT) X-Received: by 10.70.38.227 with SMTP id j3mr45978564pdk.149.1426077653569; Wed, 11 Mar 2015 05:40:53 -0700 (PDT) Received: from localhost ([180.150.153.56]) by mx.google.com with ESMTPSA id kn4sm5927441pab.48.2015.03.11.05.40.52 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 11 Mar 2015 05:40:52 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Subject: [PATCH v10 02/21] ACPI: add arm64 to the platforms that use ioremap Date: Wed, 11 Mar 2015 20:39:28 +0800 Message-Id: <1426077587-1561-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426077587-1561-1-git-send-email-hanjun.guo@linaro.org> References: <1426077587-1561-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150311_054115_334345_617445FF X-CRM114-Status: GOOD ( 10.06 ) 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.192.179 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.179 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record Cc: Mark Rutland , Ashwin Chaugule , Lorenzo Pieralisi , Robert Richter , Arnd Bergmann , Graeme Gregory , linaro-acpi@lists.linaro.org, Marc Zyngier , Jon Masters , Timur Tabi , linux-kernel@vger.kernel.org, Al Stone , linux-acpi@vger.kernel.org, Mark Brown , Hanjun Guo , suravee.suthikulpanit@amd.com, 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+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.51 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 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 --- 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)