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: 46239 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DA06E214B0 for ; Tue, 24 Mar 2015 14:04:06 +0000 (UTC) Received: by wghl18 with SMTP id l18sf32348542wgh.1 for ; Tue, 24 Mar 2015 07:04:06 -0700 (PDT) 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=d/VxtDql1WXtwEmdI30DNOThEwisfiQJrms8ZWm5Afo=; b=DQcwUal7W6eOs1NfpZozmnZizVwyVIPtmgnlc2wJlLHE74FVXoB2GbN0zixiBmhK1v smWGSvDA49pReMphX/1dWOws+xb4S/eMOIZPd9kW+UXto72vlbiPlwdMWEyiZSGo29C1 +3qNc0oIx3CKLcbYQdcjc+PRvu/mFO/tDm6Ykv7bi9Qn7M3Nspk4+RJDvgLJCkDAder6 uPeM+jDqVJNx88flMW3mjcy0HuFXuatJpVb5ZP40GervgU8kwwz7rqhhBiY7zsp6+98X s2hUmOfcyyyZo56k2mKwllYfX2240yk4rOWLEPbI8AH9OKpYDBvVm+qHiSO04SHoYwgD sUzg== X-Gm-Message-State: ALoCoQl93NW7jo8PqPAC+O9tFXpl+67VEutUa7BqaJJxqQd6G4jzGDnPDYCgAyafE7tVw6UkVerr X-Received: by 10.152.45.7 with SMTP id i7mr909406lam.9.1427205846107; Tue, 24 Mar 2015 07:04:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.3.10 with SMTP id 10ls735889lay.26.gmail; Tue, 24 Mar 2015 07:04:05 -0700 (PDT) X-Received: by 10.152.5.225 with SMTP id v1mr3860200lav.76.1427205845701; Tue, 24 Mar 2015 07:04:05 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id i19si3108154lbh.59.2015.03.24.07.04.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2015 07:04:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by labto5 with SMTP id to5so52564061lab.0 for ; Tue, 24 Mar 2015 07:04:05 -0700 (PDT) X-Received: by 10.152.5.225 with SMTP id v1mr3860192lav.76.1427205845500; Tue, 24 Mar 2015 07:04:05 -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.57.201 with SMTP id k9csp1473343lbq; Tue, 24 Mar 2015 07:04:04 -0700 (PDT) X-Received: by 10.68.246.38 with SMTP id xt6mr8136507pbc.20.1427205842771; Tue, 24 Mar 2015 07:04:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qm14si5743688pdb.120.2015.03.24.07.04.01; Tue, 24 Mar 2015 07:04:02 -0700 (PDT) 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 S1752949AbbCXODx (ORCPT + 27 others); Tue, 24 Mar 2015 10:03:53 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33634 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752926AbbCXODs (ORCPT ); Tue, 24 Mar 2015 10:03:48 -0400 Received: by pabxg6 with SMTP id xg6so213969953pab.0 for ; Tue, 24 Mar 2015 07:03:47 -0700 (PDT) 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 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 , Mark Salter , 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 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> 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.42 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 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)