From patchwork Wed Feb 25 08:39:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 45011 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f197.google.com (mail-we0-f197.google.com [74.125.82.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 571F420502 for ; Wed, 25 Feb 2015 08:41:24 +0000 (UTC) Received: by wesk11 with SMTP id k11sf1682855wes.3 for ; Wed, 25 Feb 2015 00:41:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=AoodylzoyUJj37i8Rzyjl2CrEXZta0kA2KA7QakrzH4=; b=C+2nfyW5XcM8+q3LrERFuaeiv59EPhILFJOavn37EYOk9LZyFfSojwA8sZpg4tYOwe 8dDG8bH1MgXYK4/0wETCbin7F0ziiotRsRvLgySR/apaAAP7veeCVae4PdZ2PmAIIeym CFY/zshWFswoSlwE/eQA79mO2KW7AU3s7tAyPGyKCvMMOoCstq747mT+ms8kkYZNnXGh evkk7+E3UcdMAEIm2ivpaHoLIj86ZmSiHMenB3F9ZjH3XHvwBURl9Enw7ngaYg3f3l0m u7K4+thm7TfQX2qykGYbLaUkuFReb+G94XkChlXrAlQakrW1/13VO1jk6KGCgVSg310Y 1nuA== X-Gm-Message-State: ALoCoQkQ/7CYkodcKSp3owM1hEewS+TYxgkBNutwEPAh39H9yts5cbPHP5LKL/PBR5Pgg9Md1Eg/ X-Received: by 10.152.45.7 with SMTP id i7mr273733lam.9.1424853683544; Wed, 25 Feb 2015 00:41:23 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.42 with SMTP id v10ls703716laj.56.gmail; Wed, 25 Feb 2015 00:41:23 -0800 (PST) X-Received: by 10.112.56.139 with SMTP id a11mr1823373lbq.36.1424853683275; Wed, 25 Feb 2015 00:41:23 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id b5si30291940laa.156.2015.02.25.00.41.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2015 00:41:23 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by labgd6 with SMTP id gd6so2321210lab.7 for ; Wed, 25 Feb 2015 00:41:23 -0800 (PST) X-Received: by 10.152.115.136 with SMTP id jo8mr1889326lab.32.1424853682996; Wed, 25 Feb 2015 00:41:22 -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 h5csp2475211lbj; Wed, 25 Feb 2015 00:41:22 -0800 (PST) X-Received: by 10.66.141.71 with SMTP id rm7mr3588758pab.114.1424853680922; Wed, 25 Feb 2015 00:41:20 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id mp2si22229969pbc.85.2015.02.25.00.41.19; Wed, 25 Feb 2015 00:41:20 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752925AbbBYIlN (ORCPT + 28 others); Wed, 25 Feb 2015 03:41:13 -0500 Received: from mail-pd0-f182.google.com ([209.85.192.182]:36723 "EHLO mail-pd0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbbBYIlJ (ORCPT ); Wed, 25 Feb 2015 03:41:09 -0500 Received: by pdjp10 with SMTP id p10so3412200pdj.3 for ; Wed, 25 Feb 2015 00:41:09 -0800 (PST) X-Received: by 10.70.95.166 with SMTP id dl6mr3647925pdb.140.1424853668964; Wed, 25 Feb 2015 00:41:08 -0800 (PST) Received: from localhost ([167.160.116.82]) by mx.google.com with ESMTPSA id cy6sm32948663pdb.15.2015.02.25.00.41.06 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Feb 2015 00:41:08 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Cc: Lorenzo Pieralisi , Arnd Bergmann , Mark Rutland , Graeme Gregory , Sudeep Holla , Jon Masters , Marc Zyngier , Mark Brown , Robert Richter , Timur Tabi , Ashwin Chaugule , suravee.suthikulpanit@amd.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Al Stone , Hanjun Guo Subject: [PATCH v9 03/21] ACPI: add arm64 to the platforms that use ioremap Date: Wed, 25 Feb 2015 16:39:43 +0800 Message-Id: <1424853601-6675-4-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1424853601-6675-1-git-send-email-hanjun.guo@linaro.org> References: <1424853601-6675-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.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.45 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Acked-by: Robert Richter Signed-off-by: Al Stone Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Reviewed-by: Grant Likely --- 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)