From: Arnd Bergmann <arnd@arndb.de> To: Hoan Tran <hotran@apm.com> Cc: Guenter Roeck <linux@roeck-us.net>, Jean Delvare <jdelvare@suse.com>, Jonathan Corbet <corbet@lwn.net>, Rob Herring <robh+dt@kernel.org>, Jassi Brar <jassisinghbrar@gmail.com>, Ashwin Chaugule <ashwin.chaugule@linaro.org>, Duc Dang <dhdang@apm.com>, Loc Ho <lho@apm.com>, linux-hwmon@vger.kernel.org, linux-doc@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>, linux-arm-kernel@lists.infradead.org, Devicetree List <devicetree@vger.kernel.org> Subject: [PATCH v2] hwmon: xgene: access mailbox as RAM Date: Fri, 09 Sep 2016 22:10:45 +0200 [thread overview] Message-ID: <3475893.910N1IvcYZ@wuerfel> (raw) In-Reply-To: <2852054.37zytD0HIa@wuerfel> The newly added hwmon driver fails to build in an allmodconfig kernel: ERROR: "memblock_is_memory" [drivers/hwmon/xgene-hwmon.ko] undefined! According to comments in the code, the mailbox is a shared memory region, not a set of MMIO registers, so we should use memremap() for mapping it instead of ioremap or acpi_os_ioremap, and pointer dereferences instead of readl/writel. The driver already uses plain kernel pointers, so it's a bit unusual to work with functions that operate on __iomem pointers, and this fixes that part too. I'm using READ_ONCE/WRITE_ONCE here to keep the existing behavior regarding the ordering of the accesses from the CPU, but note that there are no barriers (also unchanged from before). I'm also keeping the endianess behavior, though I'm unsure whether the message data was supposed to be in LE32 format in the first place, it's possible this was meant to be interpreted as a byte stream instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- v2: use write-back mapping instead of write-thru, minor coding style changes diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index bc78a5d10182..e5470bd49067 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c @@ -27,6 +27,7 @@ #include <linux/dma-mapping.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> +#include <linux/io.h> #include <linux/interrupt.h> #include <linux/kfifo.h> #include <linux/mailbox_controller.h> @@ -34,7 +35,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> -#include <acpi/acpi_io.h> + #include <acpi/pcc.h> /* SLIMpro message defines */ @@ -126,10 +127,10 @@ static u16 xgene_word_tst_and_clr(u16 *addr, u16 mask) { u16 ret, val; - val = readw_relaxed(addr); + val = le16_to_cpu(READ_ONCE(*addr)); ret = val & mask; val &= ~mask; - writew_relaxed(val, addr); + WRITE_ONCE(*addr, cpu_to_le16(val)); return ret; } @@ -137,7 +138,7 @@ static u16 xgene_word_tst_and_clr(u16 *addr, u16 mask) 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; - void *ptr = generic_comm_base + 1; + u32 *ptr = (void *)(generic_comm_base + 1); int rc, i; u16 val; @@ -146,21 +147,21 @@ static int xgene_hwmon_pcc_rd(struct xgene_hwmon_dev *ctx, u32 *msg) ctx->resp_pending = true; /* Write signature for subspace */ - writel_relaxed(PCC_SIGNATURE_MASK | ctx->mbox_idx, - &generic_comm_base->signature); + WRITE_ONCE(generic_comm_base->signature, + cpu_to_le32(PCC_SIGNATURE_MASK | ctx->mbox_idx)); /* Write to the shared command region */ - writew_relaxed(MSG_TYPE(msg[0]) | PCCC_GENERATE_DB_INT, - &generic_comm_base->command); + WRITE_ONCE(generic_comm_base->command, + cpu_to_le16(MSG_TYPE(msg[0]) | PCCC_GENERATE_DB_INT)); /* Flip CMD COMPLETE bit */ - val = readw_relaxed(&generic_comm_base->status); + val = le16_to_cpu(READ_ONCE(generic_comm_base->status)); val &= ~PCCS_CMD_COMPLETE; - writew_relaxed(val, &generic_comm_base->status); + WRITE_ONCE(generic_comm_base->status, cpu_to_le16(val)); /* Copy the message to the PCC comm space */ for (i = 0; i < sizeof(struct slimpro_resp_msg) / 4; i++) - writel_relaxed(msg[i], ptr + i * 4); + WRITE_ONCE(ptr[i], cpu_to_le32(msg[i])); /* Ring the doorbell */ rc = mbox_send_message(ctx->mbox_chan, msg); @@ -652,9 +653,9 @@ 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 = - acpi_os_ioremap(ctx->comm_base_addr, - cppc_ss->length); + ctx->pcc_comm_addr = memremap(ctx->comm_base_addr, + cppc_ss->length, + MEMREMAP_WB); } else { dev_err(&pdev->dev, "Failed to get PCC comm region\n"); rc = -ENODEV;
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] hwmon: xgene: access mailbox as RAM Date: Fri, 09 Sep 2016 22:10:45 +0200 [thread overview] Message-ID: <3475893.910N1IvcYZ@wuerfel> (raw) In-Reply-To: <2852054.37zytD0HIa@wuerfel> The newly added hwmon driver fails to build in an allmodconfig kernel: ERROR: "memblock_is_memory" [drivers/hwmon/xgene-hwmon.ko] undefined! According to comments in the code, the mailbox is a shared memory region, not a set of MMIO registers, so we should use memremap() for mapping it instead of ioremap or acpi_os_ioremap, and pointer dereferences instead of readl/writel. The driver already uses plain kernel pointers, so it's a bit unusual to work with functions that operate on __iomem pointers, and this fixes that part too. I'm using READ_ONCE/WRITE_ONCE here to keep the existing behavior regarding the ordering of the accesses from the CPU, but note that there are no barriers (also unchanged from before). I'm also keeping the endianess behavior, though I'm unsure whether the message data was supposed to be in LE32 format in the first place, it's possible this was meant to be interpreted as a byte stream instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- v2: use write-back mapping instead of write-thru, minor coding style changes diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index bc78a5d10182..e5470bd49067 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c @@ -27,6 +27,7 @@ #include <linux/dma-mapping.h> #include <linux/hwmon.h> #include <linux/hwmon-sysfs.h> +#include <linux/io.h> #include <linux/interrupt.h> #include <linux/kfifo.h> #include <linux/mailbox_controller.h> @@ -34,7 +35,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/platform_device.h> -#include <acpi/acpi_io.h> + #include <acpi/pcc.h> /* SLIMpro message defines */ @@ -126,10 +127,10 @@ static u16 xgene_word_tst_and_clr(u16 *addr, u16 mask) { u16 ret, val; - val = readw_relaxed(addr); + val = le16_to_cpu(READ_ONCE(*addr)); ret = val & mask; val &= ~mask; - writew_relaxed(val, addr); + WRITE_ONCE(*addr, cpu_to_le16(val)); return ret; } @@ -137,7 +138,7 @@ static u16 xgene_word_tst_and_clr(u16 *addr, u16 mask) 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; - void *ptr = generic_comm_base + 1; + u32 *ptr = (void *)(generic_comm_base + 1); int rc, i; u16 val; @@ -146,21 +147,21 @@ static int xgene_hwmon_pcc_rd(struct xgene_hwmon_dev *ctx, u32 *msg) ctx->resp_pending = true; /* Write signature for subspace */ - writel_relaxed(PCC_SIGNATURE_MASK | ctx->mbox_idx, - &generic_comm_base->signature); + WRITE_ONCE(generic_comm_base->signature, + cpu_to_le32(PCC_SIGNATURE_MASK | ctx->mbox_idx)); /* Write to the shared command region */ - writew_relaxed(MSG_TYPE(msg[0]) | PCCC_GENERATE_DB_INT, - &generic_comm_base->command); + WRITE_ONCE(generic_comm_base->command, + cpu_to_le16(MSG_TYPE(msg[0]) | PCCC_GENERATE_DB_INT)); /* Flip CMD COMPLETE bit */ - val = readw_relaxed(&generic_comm_base->status); + val = le16_to_cpu(READ_ONCE(generic_comm_base->status)); val &= ~PCCS_CMD_COMPLETE; - writew_relaxed(val, &generic_comm_base->status); + WRITE_ONCE(generic_comm_base->status, cpu_to_le16(val)); /* Copy the message to the PCC comm space */ for (i = 0; i < sizeof(struct slimpro_resp_msg) / 4; i++) - writel_relaxed(msg[i], ptr + i * 4); + WRITE_ONCE(ptr[i], cpu_to_le32(msg[i])); /* Ring the doorbell */ rc = mbox_send_message(ctx->mbox_chan, msg); @@ -652,9 +653,9 @@ 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 = - acpi_os_ioremap(ctx->comm_base_addr, - cppc_ss->length); + ctx->pcc_comm_addr = memremap(ctx->comm_base_addr, + cppc_ss->length, + MEMREMAP_WB); } else { dev_err(&pdev->dev, "Failed to get PCC comm region\n"); rc = -ENODEV;
next prev parent reply other threads:[~2016-09-09 20:10 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-07-21 20:55 [PATCH v3 0/3] hwmon: xgene: Add support for X-Gene hwmon driver Hoan Tran 2016-07-21 20:55 ` Hoan Tran 2016-07-21 20:55 ` [PATCH v3 1/3] Documentation: dtb: xgene: Add hwmon dts binding documentation Hoan Tran 2016-07-21 20:55 ` Hoan Tran 2016-07-21 22:02 ` Guenter Roeck 2016-07-21 22:02 ` Guenter Roeck 2016-07-21 20:55 ` [PATCH v3 2/3] hwmon: xgene: Add hwmon driver Hoan Tran 2016-07-21 20:55 ` Hoan Tran 2016-07-21 22:09 ` Guenter Roeck 2016-07-21 22:09 ` Guenter Roeck 2016-07-21 22:21 ` Hoan Tran 2016-07-21 22:21 ` Hoan Tran 2016-08-01 13:21 ` kbuild test robot 2016-08-01 13:21 ` kbuild test robot 2016-08-01 13:21 ` kbuild test robot 2016-08-01 16:39 ` Hoan Tran 2016-08-01 16:39 ` Hoan Tran 2016-08-01 16:39 ` Hoan Tran 2016-09-07 21:41 ` Arnd Bergmann 2016-09-07 21:41 ` Arnd Bergmann 2016-09-07 21:41 ` Arnd Bergmann 2016-09-07 22:27 ` Guenter Roeck 2016-09-07 22:27 ` Guenter Roeck 2016-09-08 8:15 ` Arnd Bergmann 2016-09-08 8:15 ` Arnd Bergmann 2016-09-08 14:55 ` Guenter Roeck 2016-09-08 14:55 ` Guenter Roeck 2016-09-08 14:59 ` Arnd Bergmann 2016-09-08 14:59 ` Arnd Bergmann 2016-09-07 22:37 ` Guenter Roeck 2016-09-07 22:37 ` Guenter Roeck 2016-09-08 8:14 ` Arnd Bergmann 2016-09-08 8:14 ` Arnd Bergmann 2016-09-08 8:14 ` Arnd Bergmann 2016-09-08 10:47 ` James Morse 2016-09-08 10:47 ` James Morse 2016-09-08 10:47 ` James Morse 2016-09-09 3:18 ` AKASHI Takahiro 2016-09-09 3:18 ` AKASHI Takahiro 2016-09-09 9:31 ` James Morse 2016-09-09 9:31 ` James Morse 2016-09-09 15:38 ` Arnd Bergmann 2016-09-09 15:38 ` Arnd Bergmann 2016-09-09 15:38 ` [PATCH] hwmon: xgene: access mailbox as RAM Arnd Bergmann 2016-09-09 15:38 ` Arnd Bergmann 2016-09-09 16:58 ` Guenter Roeck 2016-09-09 16:58 ` Guenter Roeck 2016-09-09 17:05 ` Hoan Tran 2016-09-09 17:05 ` Hoan Tran 2016-09-09 17:05 ` Hoan Tran 2016-09-09 19:24 ` Hoan Tran 2016-09-09 19:24 ` Hoan Tran 2016-09-09 19:58 ` Arnd Bergmann 2016-09-09 19:58 ` Arnd Bergmann 2016-09-09 19:58 ` Arnd Bergmann 2016-09-09 20:10 ` Arnd Bergmann [this message] 2016-09-09 20:10 ` [PATCH v2] " Arnd Bergmann 2016-09-09 20:47 ` Hoan Tran 2016-09-09 20:47 ` Hoan Tran 2016-09-09 21:56 ` Guenter Roeck 2016-09-09 21:56 ` Guenter Roeck 2016-09-09 21:56 ` Guenter Roeck 2016-09-09 20:43 ` [PATCH] " Hoan Tran 2016-09-09 20:43 ` Hoan Tran 2016-09-09 20:43 ` Hoan Tran 2016-09-09 20:50 ` Arnd Bergmann 2016-09-09 20:50 ` Arnd Bergmann 2016-09-09 20:50 ` Arnd Bergmann 2016-09-09 20:51 ` Hoan Tran 2016-09-09 20:51 ` Hoan Tran 2016-07-21 20:55 ` [PATCH v3 3/3] arm64: dts: apm: Add X-Gene SoC hwmon to device tree Hoan Tran 2016-07-21 20:55 ` Hoan Tran 2016-07-21 22:09 ` Guenter Roeck 2016-07-21 22:09 ` Guenter Roeck
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=3475893.910N1IvcYZ@wuerfel \ --to=arnd@arndb.de \ --cc=ashwin.chaugule@linaro.org \ --cc=corbet@lwn.net \ --cc=devicetree@vger.kernel.org \ --cc=dhdang@apm.com \ --cc=hotran@apm.com \ --cc=jassisinghbrar@gmail.com \ --cc=jdelvare@suse.com \ --cc=lho@apm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-hwmon@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.