remoteproc: stm32: use correct format strings on 64-bit
Subsystems (2)
PATCH 1/1 remoteproc: stm32: use correct format strings on 64-bit
From: Arnd Bergmann <[email protected]>
With CONFIG_ARCH_STM32 making it into arch/arm64, a couple of format strings no longer work, since they rely on size_t being compatible with %x, or they print an 'int' using %z:
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_mem_alloc':drivers/remoteproc/stm32_rproc.c:122:22: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=] drivers/remoteproc/stm32_rproc.c:122:40: note: format string is defined here
122 | dev_dbg(dev, "map memory: %pa+%x\n", &mem->dma, mem->len);
| ~^
| |
| unsigned int
| %lx
drivers/remoteproc/stm32_rproc.c:125:30: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=]
drivers/remoteproc/stm32_rproc.c:125:65: note: format string is defined here
125 | dev_err(dev, "Unable to map memory region: %pa+%x\n",
| ~^
| |
| unsigned int
| %lx
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_get_loaded_rsc_table':
drivers/remoteproc/stm32_rproc.c:646:30: error: format '%zx' expects argument of type 'size_t', but argument 4 has type 'int' [-Werror=format=]
drivers/remoteproc/stm32_rproc.c:646:66: note: format string is defined here
646 | dev_err(dev, "Unable to map memory region: %pa+%zx\n",
| ~~^
| |
| long unsigned int
| %xFix up all three instances to work across architectures, and enable compile testing for this driver to ensure it builds everywhere.
--- drivers/remoteproc/Kconfig | 2 +- drivers/remoteproc/stm32_rproc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/remoteproc/Kconfig +1 -1
@@ -313,7 +313,7 @@ config ST_SLIM_REMOTEPROC config STM32_RPROC tristate "STM32 remoteproc support" - depends on ARCH_STM32 + depends on ARCH_STM32 || COMPILE_TEST depends on REMOTEPROC select MAILBOX help
drivers/remoteproc/stm32_rproc.c +3 -3
@@ -119,10 +119,10 @@ static int stm32_rproc_mem_alloc(struct rproc *rproc,struct device *dev = rproc->dev.parent;void *va; -dev_dbg (dev,"map memory: %pa+%x\n" , &mem->dma, mem->len); +dev_dbg (dev,"map memory: %pad+%zx\n" , &mem->dma, mem->len); va =ioremap_wc (mem->dma, mem->len);if (IS_ERR_OR_NULL (va)) { -dev_err (dev,"Unable to map memory region: %pa+%x\n" , +dev_err (dev,"Unable to map memory region: %pad+0x%zx\n" , &mem->dma, mem->len);return -ENOMEM ; }
@@ -643,7 +643,7 @@ stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) ddata->rsc_va =devm_ioremap_wc (dev, rsc_pa,RSC_TBL_SIZE );if (IS_ERR_OR_NULL (ddata->rsc_va)) { -dev_err (dev,"Unable to map memory region: %pa+%zx\n" , +dev_err (dev,"Unable to map memory region: %pa+%x\n" , &rsc_pa,RSC_TBL_SIZE ); ddata->rsc_va =NULL ;return ERR_PTR (-ENOMEM );
Signature · 1 line
2.39.2
Hi Arnd
Quoted 30 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
With
CONFIG_ARCH_STM32making it intoarch/arm64, a couple of format strings no longer work, since they rely onsize_tbeing compatible with %x, or they print an 'int' using %z:
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_mem_alloc':drivers/remoteproc/stm32_rproc.c:122:22: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=]drivers/remoteproc/stm32_rproc.c:122:40: note: format string is defined here122 | dev_dbg(dev, "map memory: %pa+%x\n", &mem->dma, mem->len); | ~^ | | | unsigned int | %lx drivers/remoteproc/stm32_rproc.c:125:30: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=] drivers/remoteproc/stm32_rproc.c:125:65: note: format string is defined here 125 | dev_err(dev, "Unable to map memory region: %pa+%x\n", | ~^ | | | unsigned int | %lx drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_get_loaded_rsc_table': drivers/remoteproc/stm32_rproc.c:646:30: error: format '%zx' expects argument of type 'size_t', but argument 4 has type 'int' [-Werror=format=] drivers/remoteproc/stm32_rproc.c:646:66: note: format string is defined here 646 | dev_err(dev, "Unable to map memory region: %pa+%zx\n", | ~~^ | | | long unsigned int | %x
Quoted 4 lines
Fix up all three instances to work across architectures, and enable compile testing for this driver to ensure it builds everywhere.
Signed-off-by Arnd Bergmann <[email protected]>
I also have it for the stm32mp2 :)
Please find a remark below , with or without that
Quoted 36 lines
--- drivers/remoteproc/Kconfig | 2 +- drivers/remoteproc/stm32_rproc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/remoteproc/Kconfig +1
-1@@ -313,7 +313,7 @@ config ST_SLIM_REMOTEPROC config STM32_RPROC tristate "STM32 remoteproc support" - depends on ARCH_STM32 + depends on ARCH_STM32 || COMPILE_TEST depends on REMOTEPROC select MAILBOX helpdrivers/remoteproc/stm32_rproc.c +2
-2@@ -119,10 +119,10 @@ static int stm32_rproc_mem_alloc(struct rproc *rproc,struct device *dev = rproc->dev.parent;void *va; -dev_dbg (dev,"map memory: %pa+%x\n" , &mem->dma, mem->len); +dev_dbg (dev,"map memory: %pad+%zx\n" , &mem->dma, mem->len); va =ioremap_wc (mem->dma, mem->len);if (IS_ERR_OR_NULL (va)) { -dev_err (dev,"Unable to map memory region: %pa+%x\n" , +dev_err (dev,"Unable to map memory region: %pad+0x%zx\n" , &mem->dma, mem->len);return -ENOMEM ; }
drivers/remoteproc/stm32_rproc.c stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) · line 647
Quoted 6 lines
drivers/remoteproc/stm32_rproc.c +1
-1@@ -643,7 +643,7 @@ stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) ddata->rsc_va =devm_ioremap_wc (dev, rsc_pa,RSC_TBL_SIZE );if (IS_ERR_OR_NULL (ddata->rsc_va)) { -dev_err (dev,"Unable to map memory region: %pa+%zx\n" , +dev_err (dev,"Unable to map memory region: %pa+%x\n" , &rsc_pa,RSC_TBL_SIZE );
What about cast the RSC_TBL_SIZE define instead to ensure to be independent from the arch and to match with the use of RSC_TBL_SIZE?
#define RSC_TBL_SIZE ((size_t)1024)
Thanks,
Arnaud
Quoted 2 lines
drivers/remoteproc/stm32_rproc.c +0
-0ddata->rsc_va =NULL ;return ERR_PTR (-ENOMEM );
Quoted 10 lines · Arnaud POULIQUEN
drivers/remoteproc/stm32_rproc.c stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) · line 647
Quoted 5 lines
drivers/remoteproc/stm32_rproc.c +1
-1ddata->rsc_va =devm_ioremap_wc (dev, rsc_pa,RSC_TBL_SIZE );if (IS_ERR_OR_NULL (ddata->rsc_va)) { -dev_err (dev,"Unable to map memory region: %pa+%zx\n" , +dev_err (dev,"Unable to map memory region: %pa+%x\n" , &rsc_pa,RSC_TBL_SIZE );What about cast the
RSC_TBL_SIZEdefine instead to ensure to be independent from the arch and to match with the use ofRSC_TBL_SIZE?#define
RSC_TBL_SIZE((size_t)1024)
I have no objection to that, but I don't see it doing anything good either, as this is a constant value that will always work.
Arnd
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 11 lines · Arnd Bergmann
Quoted 9 lines · Arnaud POULIQUEN
drivers/remoteproc/stm32_rproc.c stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) · line 647
Quoted 5 lines
drivers/remoteproc/stm32_rproc.c +1
-1ddata->rsc_va =devm_ioremap_wc (dev, rsc_pa,RSC_TBL_SIZE );if (IS_ERR_OR_NULL (ddata->rsc_va)) { -dev_err (dev,"Unable to map memory region: %pa+%zx\n" , +dev_err (dev,"Unable to map memory region: %pa+%x\n" , &rsc_pa,RSC_TBL_SIZE );What about cast the
RSC_TBL_SIZEdefine instead to ensure to be independent from the arch and to match with the use ofRSC_TBL_SIZE?
Quoted 6 lines
Quoted 1 line
#define
RSC_TBL_SIZE((size_t)1024)I have no objection to that, but I don't see it doing anything good either, as this is a constant value that will always work.
Arnd
It was just to avoid to have the constant used with different types in the code But that's nitpicking, let's keep your proposal.
Thanks,
Arnaud
Alexandre TORGUE
maintainerHi Arnd
Quoted 11 lines · Arnd Bergmann
Quoted 9 lines · Arnaud POULIQUEN
drivers/remoteproc/stm32_rproc.c stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) · line 647
Quoted 5 lines
ddata->rsc_va = devm_ioremap_wc(dev, rsc_pa, RSC_TBL_SIZE); if (IS_ERR_OR_NULL(ddata->rsc_va)) {drivers/remoteproc/stm32_rproc.c +1
-1-dev_err (dev,"Unable to map memory region: %pa+%zx\n" , +dev_err (dev,"Unable to map memory region: %pa+%x\n" , &rsc_pa,RSC_TBL_SIZE );What about cast the
RSC_TBL_SIZEdefine instead to ensure to be independent from the arch and to match with the use ofRSC_TBL_SIZE?
Quoted 6 lines
Quoted 1 line
#define
RSC_TBL_SIZE((size_t)1024)I have no objection to that, but I don't see it doing anything good either, as this is a constant value that will always work.
Arnd
The kernel robot shot me for my STM32MP25 PR due to this issue. Do I have to resend something ?
Thanks
Alex
Quoted 30 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
With
CONFIG_ARCH_STM32making it intoarch/arm64, a couple of format strings no longer work, since they rely onsize_tbeing compatible with %x, or they print an 'int' using %z:
drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_mem_alloc':drivers/remoteproc/stm32_rproc.c:122:22: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=]drivers/remoteproc/stm32_rproc.c:122:40: note: format string is defined here122 | dev_dbg(dev, "map memory: %pa+%x\n", &mem->dma, mem->len); | ~^ | | | unsigned int | %lx drivers/remoteproc/stm32_rproc.c:125:30: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'size_t' {aka 'long unsigned int'} [-Werror=format=] drivers/remoteproc/stm32_rproc.c:125:65: note: format string is defined here 125 | dev_err(dev, "Unable to map memory region: %pa+%x\n", | ~^ | | | unsigned int | %lx drivers/remoteproc/stm32_rproc.c: In function 'stm32_rproc_get_loaded_rsc_table': drivers/remoteproc/stm32_rproc.c:646:30: error: format '%zx' expects argument of type 'size_t', but argument 4 has type 'int' [-Werror=format=] drivers/remoteproc/stm32_rproc.c:646:66: note: format string is defined here 646 | dev_err(dev, "Unable to map memory region: %pa+%zx\n", | ~~^ | | | long unsigned int | %x
Quoted 4 lines
Fix up all three instances to work across architectures, and enable compile testing for this driver to ensure it builds everywhere.
Signed-off-by Arnd Bergmann <[email protected]>
Thanks.
Quoted 44 lines
--- drivers/remoteproc/Kconfig | 2 +- drivers/remoteproc/stm32_rproc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)drivers/remoteproc/Kconfig +1
-1@@ -313,7 +313,7 @@ config ST_SLIM_REMOTEPROC config STM32_RPROC tristate "STM32 remoteproc support" - depends on ARCH_STM32 + depends on ARCH_STM32 || COMPILE_TEST depends on REMOTEPROC select MAILBOX helpdrivers/remoteproc/stm32_rproc.c +3
-3@@ -119,10 +119,10 @@ static int stm32_rproc_mem_alloc(struct rproc *rproc,struct device *dev = rproc->dev.parent;void *va; -dev_dbg (dev,"map memory: %pa+%x\n" , &mem->dma, mem->len); +dev_dbg (dev,"map memory: %pad+%zx\n" , &mem->dma, mem->len); va =ioremap_wc (mem->dma, mem->len);if (IS_ERR_OR_NULL (va)) { -dev_err (dev,"Unable to map memory region: %pa+%x\n" , +dev_err (dev,"Unable to map memory region: %pad+0x%zx\n" , &mem->dma, mem->len);return -ENOMEM ; }@@ -643,7 +643,7 @@ stm32_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) ddata->rsc_va =devm_ioremap_wc (dev, rsc_pa,RSC_TBL_SIZE );if (IS_ERR_OR_NULL (ddata->rsc_va)) { -dev_err (dev,"Unable to map memory region: %pa+%zx\n" , +dev_err (dev,"Unable to map memory region: %pa+%x\n" , &rsc_pa,RSC_TBL_SIZE ); ddata->rsc_va =NULL ;return ERR_PTR (-ENOMEM );
Signature · 1 line
~Randy