From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753091AbdIURUp (ORCPT ); Thu, 21 Sep 2017 13:20:45 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:45790 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753122AbdIURUj (ORCPT ); Thu, 21 Sep 2017 13:20:39 -0400 X-Google-Smtp-Source: AOwi7QDS5BLwOK/nH8ybVl6ZY8BpHjiWQnUN7BAtnVO2qJ74Zs4P/GzUty04FxcVp+1Ee5bfqnAOLQ== From: Hoan Tran To: Guenter Roeck , Jean Delvare Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org, Itaru Kitayama , lho@apm.com, kdinh@apm.com, patches@apm.com, Hoan Tran Subject: [PATCH 2/2] hwmon: xgene: Support PCC shared memory in IO region Date: Thu, 21 Sep 2017 10:17:10 -0700 Message-Id: <1506014230-13933-3-git-send-email-hotran@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1506014230-13933-1-git-send-email-hotran@apm.com> References: <1506014230-13933-1-git-send-email-hotran@apm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As the PCC shared memory could be in IO region which doesn't support caching, this patch simply uses ioremap() for IO region. Signed-off-by: Hoan Tran --- drivers/hwmon/xgene-hwmon.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index 5cd327e..2dac1ed 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -135,6 +136,14 @@ static u16 xgene_word_tst_and_clr(u16 *addr, u16 mask) return ret; } +static void __iomem *pcc_ioremap(phys_addr_t phys, size_t size) +{ + if (!memblock_is_memory(phys)) + return ioremap(phys, size); + + return memremap(phys, size, MEMREMAP_WB); +} + static int xgene_hwmon_pcc_rd(struct xgene_hwmon_dev *ctx, u32 *msg) { struct acpi_pcct_shared_memory *generic_comm_base = ctx->pcc_comm_addr; @@ -690,9 +699,8 @@ static int xgene_hwmon_probe(struct platform_device *pdev) */ ctx->comm_base_addr = cppc_ss->base_address; if (ctx->comm_base_addr) { - ctx->pcc_comm_addr = memremap(ctx->comm_base_addr, - cppc_ss->length, - MEMREMAP_WB); + ctx->pcc_comm_addr = pcc_ioremap(ctx->comm_base_addr, + cppc_ss->length); } else { dev_err(&pdev->dev, "Failed to get PCC comm region\n"); rc = -ENODEV; -- 1.9.1