From patchwork Wed Feb 25 08:39:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 5878291 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 8FDF09F693 for ; Wed, 25 Feb 2015 08:42:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD27C2035D for ; Wed, 25 Feb 2015 08:41:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD7D920383 for ; Wed, 25 Feb 2015 08:41:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127AbbBYIlp (ORCPT ); Wed, 25 Feb 2015 03:41:45 -0500 Received: from mail-pd0-f181.google.com ([209.85.192.181]:39077 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753102AbbBYIln (ORCPT ); Wed, 25 Feb 2015 03:41:43 -0500 Received: by pdjy10 with SMTP id y10so3390057pdj.6 for ; Wed, 25 Feb 2015 00:41:42 -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=wbzcK1Ta+8ISbevuUPxGmYnEy04En4dbMfA5OCdC1Es=; b=fToGdXbkHNy7er+x1LDLEauk65vq+wUTifDgmGhc3MqHK6hpFfVadQB/Ua9Yc4Wc5l vRVp2PdARghYHXwp4zuCrzOq6557a939Oh8eR3vhruNO91Vz4I6bMJLMX2MDjn9GL+ry b5cQK1Apr/NEoRc8Qavh6/vbkRu4NE4I45Qjvtj0puO9918tlpNqUoKX3EuL+cLJ8f2b 2Q1LeuNbi9owGcMHq5+l4hrOL7cGYLPw/n/O3S1Zj81GVLAyOrt/7FY+wHrrhG6YVdz0 QcBked8qZYNNAe7h+hLg34tq/l4Ri1L4VL1rBupZemPbQHvwWJjlrJ47dP7VGceve2eB 3KWg== X-Gm-Message-State: ALoCoQl9KQVMjRtaj3lv4G/kjHpu5OegW7MG3se7WO3r4kKcV3e0Kd0IvJjP9AYp1yeupeh56Aza X-Received: by 10.68.211.228 with SMTP id nf4mr3762306pbc.66.1424853702573; Wed, 25 Feb 2015 00:41:42 -0800 (PST) Received: from localhost ([167.160.116.82]) by mx.google.com with ESMTPSA id fc6sm11131505pab.6.2015.02.25.00.41.40 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Feb 2015 00:41:41 -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, Mark Salter , Hanjun Guo Subject: [PATCH v9 06/21] ACPI: fix acpi_os_ioremap for arm64 Date: Wed, 25 Feb 2015 16:39:46 +0800 Message-Id: <1424853601-6675-7-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=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 CC: Catalin Marinas Tested-by: Robert Richter Acked-by: Robert Richter Signed-off-by: Mark Salter Signed-off-by: Hanjun Guo Acked-by: Rafael J. Wysocki Reviewed-by: Grant Likely --- arch/arm64/include/asm/acpi.h | 13 +++++++++++++ include/acpi/acpi_io.h | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 8b837ab..40e0924 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -12,8 +12,21 @@ #ifndef _ASM_ACPI_H #define _ASM_ACPI_H +#include + /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI +/* ACPI table mapping after acpi_gbl_permanent_mmap is set */ +static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, + acpi_size size) +{ + if (!page_is_ram(phys >> PAGE_SHIFT)) + return ioremap(phys, size); + + return ioremap_cache(phys, size); +} +#define acpi_os_ioremap acpi_os_ioremap + #define acpi_strict 1 /* No out-of-spec workarounds on ARM64 */ extern int acpi_disabled; extern int acpi_noirq; diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h index 444671e..dd86c5f 100644 --- a/include/acpi/acpi_io.h +++ b/include/acpi/acpi_io.h @@ -3,11 +3,15 @@ #include +#include + +#ifndef acpi_os_ioremap static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, acpi_size size) { return ioremap_cache(phys, size); } +#endif void __iomem *__init_refok acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);