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: 5878481 Return-Path: X-Original-To: patchwork-linux-arm@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 13B9F9F269 for ; Wed, 25 Feb 2015 08:44:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F7402038A for ; Wed, 25 Feb 2015 08:44:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2DFEA20384 for ; Wed, 25 Feb 2015 08:44:40 +0000 (UTC) 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 1YQXXa-0000Bz-A1; Wed, 25 Feb 2015 08:41:58 +0000 Received: from mail-pa0-f51.google.com ([209.85.220.51]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YQXX8-0008KY-3S for linux-arm-kernel@lists.infradead.org; Wed, 25 Feb 2015 08:41:31 +0000 Received: by paceu11 with SMTP id eu11so3589249pac.10 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=TGx14wit25ERyjUjDQ+b+nTaEPZ8Wo0wN4j7trXi253uyVWuOLR3HhoOKB80IeMTvu hQwllnm6qpZBMwMUugNSws9KvfzTOfoTWGHXDaKhy4J3a+gyipitVBJ/BLqLkrHpkcQa MA6wjM/8Q7V0R/zjmqg6VgcVU1Ss88B8T35y44RSSHtPuzFldlU749bJTXHvZZftG3w9 Mc5PQ0y2HB3um08+eaB0KmeNKXITspdXaAntLImhDN5HMsut4Zrpxrxe6RrlTJKK4n4p dXcaNlwLigiU1xr2gj1DOP26bYkUjwe1X2e45cOGn7qzuN2+hNZkV9M8faM1eOGceBE5 wrQw== X-Gm-Message-State: ALoCoQn4sHBUs6e+l3q2wf3d0hshMEtSxlrFc+dq3h7nFuA3FsGMFkJYziz3ZdfMP3K9V1DG0nUQ 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150225_004130_243350_E98C15E9 X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -0.7 (/) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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)