Commit 03bd158e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

remoteproc: stm32: use correct format strings on 64-bit 



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
      |                                                                %x

Fix up all three instances to work across architectures, and enable
compile testing for this driver to ensure it builds everywhere.

Reviewed-by: default avatarArnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Acked-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Tested-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 868a11b6

drivers/remoteproc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -118,10 +118,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;

	}
@@ -627,7 +627,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);