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: 5878671 Return-Path: X-Original-To: patchwork-linux-acpi@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 DBDCD9F269 for ; Wed, 25 Feb 2015 08:47:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 040302037B for ; Wed, 25 Feb 2015 08:47:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1981B20304 for ; Wed, 25 Feb 2015 08:47:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752841AbbBYIlM (ORCPT ); Wed, 25 Feb 2015 03:41:12 -0500 Received: from mail-pd0-f176.google.com ([209.85.192.176]:35597 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752833AbbBYIlJ (ORCPT ); Wed, 25 Feb 2015 03:41:09 -0500 Received: by pdbfl12 with SMTP id fl12so3418928pdb.2 for ; Wed, 25 Feb 2015 00:41:09 -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=RS8SQGg58VeGKJvUpKmZTTdxe10ZxswgvC3RhoYhAHk=; b=P08kGagma4zDeCbKpCMQlorvWfk8jaYK7zt+u/oqW0Q5PUqCmROx62je38tU8+shlF wJj8+depuRe2WFIow2W2jJRCo+dhIN6AJW/SUgg1d+nPBjOqTBnwch3h1zCumGkKoHuj vJQgK8LQOH3427fS7EiWOC6rkecrGXKOs/7pokJMuvh4TSUxEZocdcAVXTOF3QfsrW+o JRSUNd3uyxDYng+/5SKUcSvANicbR6PMzj6f8SamdNiNOKZDznPOGY3kMGyr/s9UjdA3 2sIdmVQyG781RJTPHwaQJ+qPxptsxn/hXzNj0dxoKtTWthkbHhs9UoAgPCdz13+z6Gjq eSrQ== X-Gm-Message-State: ALoCoQkDnStw8yyEL+53IOR7uD6XfHioKHgiEiPKuQMukTzDxROnq+1I8eIp8Vz7L2+davnS3NOE 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-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Tested-by: Robert Richter Acked-by: Robert Richter Signed-off-by: Al Stone Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo Acked-by: Rafael J. Wysocki 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)