Skip to contentSkip to conversation

fix compiler warning in drivers/media/video/video-buf.c

PATCH In review Martin Bligh 4 participants 5 messages Sep 28, 2006 – Sep 29, 2006 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix compiler warning in drivers/media/video/video-buf.c

Using a double cast to avoid compiler warnings when building for PAE. Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer.

From: Sujoy Gupta <[email protected]>

drivers/media/video/video-buf.c +6 -1
diff -aurpN -X /home/mbligh/.diff.exclude linux-2.6.18/drivers/media/video/video-buf.c 2.6.18-videobuf/drivers/media/video/video-buf.c
@@ -365,7 +365,12 @@ videobuf_iolock(struct videobuf_queue* q
 		if (NULL == fbuf)
 			return -EINVAL;
 		/* FIXME: need sanity checks for vb->boff */
-		bus   = (dma_addr_t)fbuf->base + vb->boff;
+		/*
+		 * Using a double cast to avoid compiler warnings when
+		 * building for PAE. Compiler doesn't like direct casting 
+		 * of a 32 bit ptr to 64 bit integer.
+		 */
+		bus   = (dma_addr_t)(size_t)fbuf->base + vb->boff;
 		pages = PAGE_ALIGN(vb->size) >> PAGE_SHIFT;
 		err = videobuf_dma_init_overlay(&vb->dma,PCI_DMA_FROMDEVICE,
 						bus, pages);
#1 lore raw
Quoted 5 lines · Martin Bligh

Using a double cast to avoid compiler warnings when building for PAE. Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer.

From: Sujoy Gupta <[email protected]>

I believe this is supposed to be the first line in the mail?

Quoted 1 line

Thanks,
Nish

#2 lore raw
In reply to Martin Bligh
Quoted 14 lines · On Thu, 28 Sep 2006 10:31:58 -0700 Martin Bligh <[email protected]> wrote:

Using a double cast to avoid compiler warnings when building for PAE. Compiler doesn't like direct casting of a 32 bit ptr to 64 bit integer.

...

diff -aurpN -X /home/mbligh/.diff.exclude linux-2.6.18/drivers/media/video/video-buf.c 2.6.18-videobuf/drivers/media/video/video-buf.c

drivers/media/video/video-buf.c +0 -0
@@ -365,7 +365,12 @@ videobuf_iolock(struct videobuf_queue* q
 		if (NULL == fbuf)
 			return -EINVAL;
 		/* FIXME: need sanity checks for vb->boff */

drivers/media/video/video-buf.c videobuf_iolock(struct videobuf_queue* q · line 376

Quoted 10 lines
drivers/media/video/video-buf.c +6 -1
-		bus   = (dma_addr_t)fbuf->base + vb->boff;
+		/*
+		 * Using a double cast to avoid compiler warnings when
+		 * building for PAE. Compiler doesn't like direct casting 
+		 * of a 32 bit ptr to 64 bit integer.
+		 */
+		bus   = (dma_addr_t)(size_t)fbuf->base + vb->boff;
 		pages = PAGE_ALIGN(vb->size) >> PAGE_SHIFT;
 		err = videobuf_dma_init_overlay(&vb->dma,PCI_DMA_FROMDEVICE,
 						bus, pages);

We normally cast pointers to unsigned long prior to assigning them to 64-bit values. I'll make that change.

That being said, this driver is wrong to be storing dma addresses in a void*. And indeed there is a FIXME regarding this at include/linux/videodev2.h:476, so I guess hiding this warning won't obscure any fault which wasn't already known about..

#3 lore raw

Em Qui, 2006-09-28 às 10:51 -0700, Andrew Morton escreveu:

Quoted 7 lines

On Thu, 28 Sep 2006 10:31:58 -0700
Martin Bligh <[email protected]> wrote:

That being said, this driver is wrong to be storing dma addresses in a void*. And indeed there is a FIXME regarding this at include/linux/videodev2.h:476, so I guess hiding this warning won't obscure any fault which wasn't already known about..

Yes. The original structure is:

struct v4l2_framebuffer

{
        __u32                   capability;
        __u32                   flags;
        void*                   base;
        struct v4l2_pix_format  fmt;
};

Since this is used at ioctl definition, changing this would break userspace apps. We might replace this to something like:

struct v4l2_framebuffer

{
        __u32                   capability;
        __u32                   flags;
	union {
	        void*		base_ptr; /*FOO definition to avoid breaking userpace apps */
		dma_addr_t	base;
	}
        struct v4l2_pix_format  fmt;
};

This way, base will have the expected type, and it won't break any userspace app if sizeof(void *)<=sizeof(base). I think this is true for all architectures (anyway, if it isn't, v4l is broken anyway).

What do you think?

Cheers,
Mauro.

#4 lore raw
Quoted 36 lines · Mauro Carvalho Chehab

Em Qui, 2006-09-28 às 10:51 -0700, Andrew Morton escreveu:

Quoted 8 lines

On Thu, 28 Sep 2006 10:31:58 -0700
Martin Bligh <[email protected]> wrote:

That being said, this driver is wrong to be storing dma addresses in a void*. And indeed there is a FIXME regarding this at include/linux/videodev2.h:476, so I guess hiding this warning won't obscure any fault which wasn't already known about..

Yes. The original structure is:

struct v4l2_framebuffer

{
        __u32                   capability;
        __u32                   flags;
        void*                   base;
        struct v4l2_pix_format  fmt;
};

Since this is used at ioctl definition, changing this would break userspace apps. We might replace this to something like:

struct v4l2_framebuffer

{
        __u32                   capability;
        __u32                   flags;
	union {
	        void*		base_ptr; /*FOO definition to avoid breaking userpace apps */
		dma_addr_t	base;
	}
        struct v4l2_pix_format  fmt;
};
Quoted 3 lines

This way, base will have the expected type, and it won't break any userspace app if sizeof(void *)<=sizeof(base). I think this is true for all architectures (anyway, if it isn't, v4l is broken anyway).

Won't that just make the userspace apps not work properly? Not that they do right now, but how does masking the problem help?

M.