| Message ID | 20190708123952.3341920-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | f62fa0ced46afc541ca617d4ea9524095a4839d7 |
| Headers | show |
| Series | habanalabs: use %pad for printing a dma_addr_t | expand |
On Mon, Jul 8, 2019 at 3:39 PM Arnd Bergmann <arnd@arndb.de> wrote: > > 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. > > Fixes: 2a51558c8c7f ("habanalabs: remove DMA mask hack for Goya") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/misc/habanalabs/goya/goya.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c > index 75294ec65257..60e509f64051 100644 > --- a/drivers/misc/habanalabs/goya/goya.c > +++ b/drivers/misc/habanalabs/goya/goya.c > @@ -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) { > -- > 2.20.0 > This patch is: Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com> Thanks! applied to -next
On Tue, Jul 9, 2019 at 9:07 AM Oded Gabbay <oded.gabbay@gmail.com> wrote: > > On Mon, Jul 8, 2019 at 3:39 PM Arnd Bergmann <arnd@arndb.de> wrote: > > > > 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. > > > > Fixes: 2a51558c8c7f ("habanalabs: remove DMA mask hack for Goya") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/misc/habanalabs/goya/goya.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c > > index 75294ec65257..60e509f64051 100644 > > --- a/drivers/misc/habanalabs/goya/goya.c > > +++ b/drivers/misc/habanalabs/goya/goya.c > > @@ -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) { > > -- > > 2.20.0 > > > > This patch is: > Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com> > > Thanks! applied to -next Sorry, meant -fixes of course.
diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c index 75294ec65257..60e509f64051 100644 --- a/drivers/misc/habanalabs/goya/goya.c +++ b/drivers/misc/habanalabs/goya/goya.c @@ -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) {
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. Fixes: 2a51558c8c7f ("habanalabs: remove DMA mask hack for Goya") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/misc/habanalabs/goya/goya.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.0