Skip to contentSkip to conversation

dmaengine: ste_dma40: use proper format string for resource_size_t

PATCH Superseded Arnd Bergmann 3 participants 4 messages May 17, 2023 – May 19, 2023

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dmaengine: ste_dma40: use proper format string for resource_size_t

From: Arnd Bergmann <[email protected]>

When LPAE is set, both the dma_addr_t and resource_size_t become 64 bit wide, causing a warning about the format string:

drivers/dma/ste_dma40.c: In function 'd40_probe':
drivers/dma/ste_dma40.c:3539:23: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
3539 | dev_info(dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n",

Change both to the special %pap and %pap helpers for these types.

Fixes 5a1a3b9c19dd ("dmaengine: ste_dma40: Get LCPA SRAM from SRAM node")
---
 drivers/dma/ste_dma40.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/ste_dma40.c +2 -2
index 9ff6dd9e2fa2..dbc988cfc4bf 100644
@@ -3536,8 +3536,8 @@ static int __init d40_probe(struct platform_device *pdev)
 	}
 	base->lcpa_size = resource_size(&res_lcpa);
 	base->phy_lcpa = res_lcpa.start;
-	dev_info(dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n",
-		 (u32)base->phy_lcpa, base->lcpa_size);
+	dev_info(dev, "found LCPA SRAM at %pad, size %pa\n",
+		 &base->phy_lcpa, &base->lcpa_size);
 
 	/* We make use of ESRAM memory for this. */
 	val = readl(base->virtbase + D40_DREG_LCPA);
Signature · 1 line
2.39.2
maintainer
#1 lore raw
Quoted 10 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When LPAE is set, both the dma_addr_t and resource_size_t become 64 bit wide, causing a warning about the format string:

drivers/dma/ste_dma40.c: In function 'd40_probe':
drivers/dma/ste_dma40.c:3539:23: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
3539 | dev_info(dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n",

Change both to the special %pap and %pap helpers for these types.

Already posted [1] and applied now

[1]: https://lore.kernel.org/r/[email protected]

Signature · 6 lines
~Vinod

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#2 lore raw
Quoted 10 lines · Vinod Koul
Quoted 9 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When LPAE is set, both the dma_addr_t and resource_size_t become 64 bit wide, causing a warning about the format string:

drivers/dma/ste_dma40.c: In function 'd40_probe':
drivers/dma/ste_dma40.c:3539:23: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
3539 | dev_info(dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n",

Quoted 5 lines
Quoted 1 line

Change both to the special %pap and %pap helpers for these types.

Already posted [1] and applied now

[1]: https://lore.kernel.org/r/[email protected]

I think yours is wrong: you use %pR with a resource_size_t, but it expects a "struct resource instead".

Arnd

maintainer
#3 lore raw
Quoted 11 lines · Arnd Bergmann
Quoted 10 lines · Vinod Koul
Quoted 9 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When LPAE is set, both the dma_addr_t and resource_size_t become 64 bit wide, causing a warning about the format string:

drivers/dma/ste_dma40.c: In function 'd40_probe':
drivers/dma/ste_dma40.c:3539:23: error: format '%x' expects argument of type 'unsigned int', but argument 4 has type 'resource_size_t' {aka 'long long unsigned int'} [-Werror=format=]
3539 | dev_info(dev, "found LCPA SRAM at 0x%08x, size 0x%08x\n",

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Change both to the special %pap and %pap helpers for these types.

Already posted [1] and applied now

[1]: https://lore.kernel.org/r/[email protected]

I think yours is wrong: you use %pR with a resource_size_t, but it expects a "struct resource instead".

Right, i indeed looked up wrong format

Signature · 1 line
~Vinod