From patchwork Mon Feb 2 12:45:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5761241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F30F3BF440 for ; Mon, 2 Feb 2015 12:51:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3BC6C202E6 for ; Mon, 2 Feb 2015 12:51:11 +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 C98002034E for ; Mon, 2 Feb 2015 12:51:08 +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 1YIGQr-00088q-C6; Mon, 02 Feb 2015 12:48:49 +0000 Received: from mail-pa0-f41.google.com ([209.85.220.41]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YIGQk-00081q-8O for linux-arm-kernel@lists.infradead.org; Mon, 02 Feb 2015 12:48:42 +0000 Received: by mail-pa0-f41.google.com with SMTP id kq14so82108546pab.0 for ; Mon, 02 Feb 2015 04:48:22 -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=ffOq7EElrvDIyFtqhxrhL0jwdN0X8ju6k1L1nEBa6AM=; b=E3+rXFsN7WdQxPqC85pPSga2LKnYpISpZDvXJ18jw9tLFW3EfY/hHDMlll3FLugw1b RR9C4JdD//v9eJLRLp9mP7gzKSP7T6EBPfQ1apVNttdkk0MmCnPnJNAA1vh8vZ7j52bT M/WqPh/UWnN/hBQcf3VEowkOVLNSS60thTBN17NaE3d9iImmlwh1U3iUxwc7AtY6TGG1 iaewETQdSmD9rUjBf/asUyyZhOWUh8pVjTj3/gWYdJHmgRTS1res6WyQd4v53U3yTJUn iDDMQ2rsSda+LiaVt5NCyLLrpOLCme51bKRqa/THEavJmpGGyyX6XLt/tHf8DCTWoGmc EiEA== X-Gm-Message-State: ALoCoQnu5GJGkHO0BbkLSBsJM1x5lJ1XcPCiumEgQMjXvIa08jxzni2p8+iSBjoq5MF9iPoR6oX3 X-Received: by 10.66.65.108 with SMTP id w12mr28961377pas.115.1422881302698; Mon, 02 Feb 2015 04:48:22 -0800 (PST) Received: from localhost ([180.150.157.4]) by mx.google.com with ESMTPSA id k15sm18742984pbq.47.2015.02.02.04.48.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 02 Feb 2015 04:48:21 -0800 (PST) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Olof Johansson , Arnd Bergmann , Mark Rutland , Grant Likely , Will Deacon Subject: [PATCH v8 02/21] acpi: fix acpi_os_ioremap for arm64 Date: Mon, 2 Feb 2015 20:45:30 +0800 Message-Id: <1422881149-8177-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> References: <1422881149-8177-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150202_044842_324805_6DF4FBBB X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: Mark Langsdorf , linaro-acpi@lists.linaro.org, wangyijing@huawei.com, Rob Herring , Lorenzo Pieralisi , Timur Tabi , Daniel Lezcano , linux-acpi@vger.kernel.org, Mark Salter , Charles.Garcia-Tobin@arm.com, phoenix.liyi@huawei.com, Robert Richter , Jason Cooper , Marc Zyngier , Jon Masters , Mark Brown , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Ashwin Chaugule , Graeme Gregory , Randy Dunlap , linux-kernel@vger.kernel.org, Hanjun Guo , suravee.suthikulpanit@amd.com, Sudeep Holla 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: Mark Salter The acpi_os_ioremap() function may be used to map normal RAM or IO regions. The current implementation simply uses ioremap_cache(). This will work for some architectures, but arm64 ioremap_cache() cannot be used to map IO regions which don't support caching. So for arm64, use ioremap() for non-RAM regions. CC: Rafael J Wysocki Signed-off-by: Mark Salter Signed-off-by: Hanjun Guo --- include/acpi/acpi_io.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h index 444671e..9d573db 100644 --- a/include/acpi/acpi_io.h +++ b/include/acpi/acpi_io.h @@ -1,11 +1,17 @@ #ifndef _ACPI_IO_H_ #define _ACPI_IO_H_ +#include #include static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) { +#ifdef CONFIG_ARM64 + if (!page_is_ram(phys >> PAGE_SHIFT)) + return ioremap(phys, size); +#endif + return ioremap_cache(phys, size); }