| Message ID | 1527735.0V0q3NFh2C@wuerfel |
|---|---|
| State | Accepted |
| Commit | 2abd1f43c242e79c9db1050a3344cc2965eb77e3 |
| Headers | show |
Hi Arnd, On Mon, 1 Feb 2016, Arnd Bergmann wrote: > The mx3_camera driver prints DMA addresses using the "%x" format > string, which is wrong when using a 64-bit dma_addr_t definition: > > media/platform/soc_camera/mx3_camera.c: In function 'mx3_cam_dma_done': > media/platform/soc_camera/mx3_camera.c:149:125: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=] > media/platform/soc_camera/mx3_camera.c: In function 'mx3_videobuf_queue': > media/platform/soc_camera/mx3_camera.c:317:119: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=] > media/platform/soc_camera/mx3_camera.c: In function 'mx3_videobuf_release': > media/platform/soc_camera/mx3_camera.c:346:119: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=] > > This changes the code to use the special %pad format string, which > always does the right thing. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks for the patch. I'll queue it for 4.6. Guennadi > --- > Another old bug that only rarely shows up in ARM randconfigs. > > diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c > index 169ed1150226..aa39e9569b1a 100644 > --- a/drivers/media/platform/soc_camera/mx3_camera.c > +++ b/drivers/media/platform/soc_camera/mx3_camera.c > @@ -146,8 +146,8 @@ static void mx3_cam_dma_done(void *arg) > struct idmac_channel *ichannel = to_idmac_chan(chan); > struct mx3_camera_dev *mx3_cam = ichannel->client; > > - dev_dbg(chan->device->dev, "callback cookie %d, active DMA 0x%08x\n", > - desc->txd.cookie, mx3_cam->active ? sg_dma_address(&mx3_cam->active->sg) : 0); > + dev_dbg(chan->device->dev, "callback cookie %d, active DMA %pad\n", > + desc->txd.cookie, mx3_cam->active ? &sg_dma_address(&mx3_cam->active->sg) : NULL); > > spin_lock(&mx3_cam->lock); > if (mx3_cam->active) { > @@ -314,8 +314,8 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) > spin_unlock_irq(&mx3_cam->lock); > > cookie = txd->tx_submit(txd); > - dev_dbg(icd->parent, "Submitted cookie %d DMA 0x%08x\n", > - cookie, sg_dma_address(&buf->sg)); > + dev_dbg(icd->parent, "Submitted cookie %d DMA %pad\n", > + cookie, &sg_dma_address(&buf->sg)); > > if (cookie >= 0) > return; > @@ -344,8 +344,8 @@ static void mx3_videobuf_release(struct vb2_buffer *vb) > unsigned long flags; > > dev_dbg(icd->parent, > - "Release%s DMA 0x%08x, queue %sempty\n", > - mx3_cam->active == buf ? " active" : "", sg_dma_address(&buf->sg), > + "Release%s DMA %pad, queue %sempty\n", > + mx3_cam->active == buf ? " active" : "", &sg_dma_address(&buf->sg), > list_empty(&buf->queue) ? "" : "not "); > > spin_lock_irqsave(&mx3_cam->lock, flags); >
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c index 169ed1150226..aa39e9569b1a 100644 --- a/drivers/media/platform/soc_camera/mx3_camera.c +++ b/drivers/media/platform/soc_camera/mx3_camera.c @@ -146,8 +146,8 @@ static void mx3_cam_dma_done(void *arg) struct idmac_channel *ichannel = to_idmac_chan(chan); struct mx3_camera_dev *mx3_cam = ichannel->client; - dev_dbg(chan->device->dev, "callback cookie %d, active DMA 0x%08x\n", - desc->txd.cookie, mx3_cam->active ? sg_dma_address(&mx3_cam->active->sg) : 0); + dev_dbg(chan->device->dev, "callback cookie %d, active DMA %pad\n", + desc->txd.cookie, mx3_cam->active ? &sg_dma_address(&mx3_cam->active->sg) : NULL); spin_lock(&mx3_cam->lock); if (mx3_cam->active) { @@ -314,8 +314,8 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb) spin_unlock_irq(&mx3_cam->lock); cookie = txd->tx_submit(txd); - dev_dbg(icd->parent, "Submitted cookie %d DMA 0x%08x\n", - cookie, sg_dma_address(&buf->sg)); + dev_dbg(icd->parent, "Submitted cookie %d DMA %pad\n", + cookie, &sg_dma_address(&buf->sg)); if (cookie >= 0) return; @@ -344,8 +344,8 @@ static void mx3_videobuf_release(struct vb2_buffer *vb) unsigned long flags; dev_dbg(icd->parent, - "Release%s DMA 0x%08x, queue %sempty\n", - mx3_cam->active == buf ? " active" : "", sg_dma_address(&buf->sg), + "Release%s DMA %pad, queue %sempty\n", + mx3_cam->active == buf ? " active" : "", &sg_dma_address(&buf->sg), list_empty(&buf->queue) ? "" : "not "); spin_lock_irqsave(&mx3_cam->lock, flags);
The mx3_camera driver prints DMA addresses using the "%x" format string, which is wrong when using a 64-bit dma_addr_t definition: media/platform/soc_camera/mx3_camera.c: In function 'mx3_cam_dma_done': media/platform/soc_camera/mx3_camera.c:149:125: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=] media/platform/soc_camera/mx3_camera.c: In function 'mx3_videobuf_queue': media/platform/soc_camera/mx3_camera.c:317:119: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=] media/platform/soc_camera/mx3_camera.c: In function 'mx3_videobuf_release': media/platform/soc_camera/mx3_camera.c:346:119: error: format '%x' expects argument of type 'unsigned int', but argument 5 has type 'dma_addr_t {aka long long unsigned int}' [-Werror=format=] This changes the code to use the special %pad format string, which always does the right thing. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- Another old bug that only rarely shows up in ARM randconfigs.