Skip to contentSkip to conversation

remoteproc: qcom: use %pap format string for phys_addr_t

PATCH In review Arnd Bergmann 2 participants 2 messages Nov 6, 2017 – Nov 7, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remoteproc: qcom: use %pap format string for phys_addr_t

We cannot cast a phys_addr_t variable to a pointer on 32-bit architectures with CONFIG_PHYS_ADDR_T_64BIT set:

In file included from include/linux/kernel.h:14:0,

                 from include/linux/clk.h:16,
                 from drivers/remoteproc/qcom_q6v5_pil.c:18:
drivers/remoteproc/qcom_q6v5_pil.c: In function 'q6v5_xfer_mem_ownership':
drivers/remoteproc/qcom_q6v5_pil.c:337:10: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
          (void *)addr, (void *)(addr + size),
          ^

The correct way to print the contents is to use the %pap format string, passing the phys address by reference.

Fixes 6c5a9dc2481b ("remoteproc: qcom: Make secure world call for mem ownership switch")
---
 drivers/remoteproc/qcom_q6v5_pil.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/remoteproc/qcom_q6v5_pil.c +3 -3
index 5460f61ee21c..4576f88499cb 100644
@@ -333,9 +333,9 @@ static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm,
 	ret = qcom_scm_assign_mem(addr, ALIGN(size, SZ_4K),
 				  current_perm, &next, 1);
 	if (ret < 0) {
-		pr_err("Failed to assign memory access in range %p to %p to %s ret = %d\n",
-		       (void *)addr, (void *)(addr + size),
-		       remote_owner ? "mss" : "hlos", ret);
+		phys_addr_t end = addr + size;
+		pr_err("Failed to assign memory access in range %pap to %pap to %s ret = %d\n",
+		       &addr, &end, remote_owner ? "mss" : "hlos", ret);
 		return ret;
 	}
 
Signature · 1 line
2.9.0
#1 lore raw
Quoted 11 lines · Arnd Bergmann

We cannot cast a phys_addr_t variable to a pointer on 32-bit architectures with CONFIG_PHYS_ADDR_T_64BIT set:

In file included from include/linux/kernel.h:14:0,

                 from include/linux/clk.h:16,
                 from drivers/remoteproc/qcom_q6v5_pil.c:18:
drivers/remoteproc/qcom_q6v5_pil.c: In function 'q6v5_xfer_mem_ownership':
drivers/remoteproc/qcom_q6v5_pil.c:337:10: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]
          (void *)addr, (void *)(addr + size),
          ^
Quoted 5 lines

The correct way to print the contents is to use the %pap format string, passing the phys address by reference.

Fixes 6c5a9dc2481b ("remoteproc: qcom: Make secure world call for mem ownership switch")

Thanks Arnd! As the majority of the call sites had their own error printing I filled in the last ones and dropped this pr_err instead.

Regards,
Bjorn

Quoted 24 lines
---
 drivers/remoteproc/qcom_q6v5_pil.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/remoteproc/qcom_q6v5_pil.c +3 -3
index 5460f61ee21c..4576f88499cb 100644
@@ -333,9 +333,9 @@ static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm,
 	ret = qcom_scm_assign_mem(addr, ALIGN(size, SZ_4K),
 				  current_perm, &next, 1);
 	if (ret < 0) {
-		pr_err("Failed to assign memory access in range %p to %p to %s ret = %d\n",
-		       (void *)addr, (void *)(addr + size),
-		       remote_owner ? "mss" : "hlos", ret);
+		phys_addr_t end = addr + size;
+		pr_err("Failed to assign memory access in range %pap to %pap to %s ret = %d\n",
+		       &addr, &end, remote_owner ? "mss" : "hlos", ret);
 		return ret;
 	}
 
Signature · 1 line
2.9.0