habanalabs: use %pad for printing a dma_addr_t
Arnd Bergmann
maintainerPATCH 1/1 habanalabs: use %pad for printing a dma_addr_t
dma_addr_t might be different sizes depending on the configuration, so we cannot print it as %llx:
drivers/misc/habanalabs/goya/goya.c: In function 'goya_sw_init':drivers/misc/habanalabs/goya/goya.c:698:21: error: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'dma_addr_t' {aka 'unsigned int'} [-Werror=format=]
Use the special %pad format string. This requires passing the argument by reference.
--- drivers/misc/habanalabs/goya/goya.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/goya/goya.c +2 -2
@@ -695,8 +695,8 @@ static int goya_sw_init(struct hl_device *hdev) goto free_dma_pool; } -dev_dbg (hdev->dev,"cpu accessible memory at bus address 0x%llx\n" , - hdev->cpu_accessible_dma_address); +dev_dbg (hdev->dev,"cpu accessible memory at bus address %pad\n" , + &hdev->cpu_accessible_dma_address); hdev->cpu_accessible_dma_pool =gen_pool_create (ilog2 (32 ),-1 );if (!hdev->cpu_accessible_dma_pool) {
Signature · 1 line
2.20.0
Quoted 32 lines · Arnd Bergmann
dma_addr_tmight be different sizes depending on the configuration, so we cannot print it as %llx:
drivers/misc/habanalabs/goya/goya.c: In function 'goya_sw_init':drivers/misc/habanalabs/goya/goya.c:698:21: error: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'dma_addr_t' {aka 'unsigned int'} [-Werror=format=]Use the special %pad format string. This requires passing the argument by reference.
Fixes 2a51558c8c7f ("habanalabs: remove DMA mask hack for Goya")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/misc/habanalabs/goya/goya.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/misc/habanalabs/goya/goya.c +2
-3@@ -695,8 +695,8 @@ static int goya_sw_init(struct hl_device *hdev) goto free_dma_pool; } -dev_dbg (hdev->dev,"cpu accessible memory at bus address 0x%llx\n" , - hdev->cpu_accessible_dma_address); +dev_dbg (hdev->dev,"cpu accessible memory at bus address %pad\n" , + &hdev->cpu_accessible_dma_address); hdev->cpu_accessible_dma_pool =gen_pool_create (ilog2 (32 ),-1 );if (!hdev->cpu_accessible_dma_pool) { --
Quoted 2 lines
2.20.0
This patch is:
Thanks! applied to -next
Quoted 38 lines · Oded Gabbay
Quoted 32 lines · Arnd Bergmann
dma_addr_tmight be different sizes depending on the configuration, so we cannot print it as %llx:
drivers/misc/habanalabs/goya/goya.c: In function 'goya_sw_init':drivers/misc/habanalabs/goya/goya.c:698:21: error: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'dma_addr_t' {aka 'unsigned int'} [-Werror=format=]Use the special %pad format string. This requires passing the argument by reference.
Fixes 2a51558c8c7f ("habanalabs: remove DMA mask hack for Goya")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/misc/habanalabs/goya/goya.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/misc/habanalabs/goya/goya.c +2
-3@@ -695,8 +695,8 @@ static int goya_sw_init(struct hl_device *hdev) goto free_dma_pool; } -dev_dbg (hdev->dev,"cpu accessible memory at bus address 0x%llx\n" , - hdev->cpu_accessible_dma_address); +dev_dbg (hdev->dev,"cpu accessible memory at bus address %pad\n" , + &hdev->cpu_accessible_dma_address); hdev->cpu_accessible_dma_pool =gen_pool_create (ilog2 (32 ),-1 );if (!hdev->cpu_accessible_dma_pool) { --Quoted 2 lines
2.20.0
This patch is:
Quoted 3 lines
Reviewed-by Oded Gabbay <[email protected]>Thanks! applied to -next
Sorry, meant -fixes of course.