Re: [PATCH] media: uvc_driver: add NO-MMU arch support

[Laurent Pinchart]

Hi Bob,

Thanks for the patch.

On Thursday 10 March 2011 03:44:37 Bob Liu wrote:
> UVC driver used to have partial no-mmu arch support, but it's removed by
> commit c29fcff3daafbf46d64a543c1950bbd206ad8c1c.
> 
> This patch added them back and expanded to fully support no-mmu arch, so
> that uvc cameras can be used on no-mmu platforms like Blackfin.
> 
> Signed-off-by: Bob Liu <lliubbo@xxxxxxxxx>
> ---
>  drivers/media/video/uvc/uvc_v4l2.c |   36
> ++++++++++++++++++++++++++++++++++++ drivers/media/video/v4l2-dev.c     | 
>  18 ++++++++++++++++++
>  drivers/usb/gadget/uvc_queue.c     |   15 +++++++++++++++
>  include/media/v4l2-dev.h           |    2 ++
>  4 files changed, 71 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/media/video/uvc/uvc_v4l2.c
> b/drivers/media/video/uvc/uvc_v4l2.c index 9005a8d..2413ec9 100644
> --- a/drivers/media/video/uvc/uvc_v4l2.c
> +++ b/drivers/media/video/uvc/uvc_v4l2.c
> @@ -1081,6 +1081,39 @@ static unsigned int uvc_v4l2_poll(struct file *file,
> poll_table *wait) return uvc_queue_poll(&stream->queue, file, wait);
>  }
> 
> +#ifndef CONFIG_MMU
> +static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
> +		unsigned long addr, unsigned long len, unsigned long pgoff,
> +		unsigned long flags)
> +{
> +	struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
> +	struct uvc_streaming *stream = handle->stream;
> +	struct uvc_video_queue *queue = &stream->queue;
> +	struct uvc_buffer *uninitialized_var(buffer);
> +	unsigned int i;
> +	int ret = 0;
> +
> +	mutex_lock(&queue->mutex);
> +	for (i = 0; i < queue->count; ++i) {
> +		buffer = &queue->buffer[i];
> +		if ((buffer->buf.m.offset >> PAGE_SHIFT) == pgoff)
> +			break;
> +	}
> +
> +	if (i == queue->count ||
> +		PAGE_ALIGN(len) != queue->buf_size) {
> +		ret = -EINVAL;
> +		goto done;
> +	}
> +
> +	addr = (unsigned long)queue->mem + buffer->buf.m.offset;
> +	ret = addr;
> +done:
> +	mutex_unlock(&queue->mutex);
> +	return ret;
> +}
> +#endif
> +

Could you move the core of this function to uvc_queue.c ? Something like

unsigned long uvc_queue_get_unmapped_area(struct uvc_video_queue *queue,
	unsigned long addr, unsigned long len, unsigned long pgoff,
	unsigned long flags),

static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
		unsigned long addr, unsigned long len, unsigned long pgoff,
		unsigned long flags)
{
	struct uvc_fh *handle = (struct uvc_fh *)file->private_data;
	struct uvc_streaming *stream = handle->stream;

	return uvc_queue_get_unmapped_area(queue, addr, len, pgoff, flags);
}

> diff --git a/drivers/usb/gadget/uvc_queue.c
> b/drivers/usb/gadget/uvc_queue.c index f7395ac..24378fb 100644
> --- a/drivers/usb/gadget/uvc_queue.c
> +++ b/drivers/usb/gadget/uvc_queue.c
> @@ -431,6 +431,7 @@ uvc_queue_mmap(struct uvc_video_queue *queue, struct
> vm_area_struct *vma) break;
>  	}
> 
> +#ifdef CONFIG_MMU
>  	if (i == queue->count || size != queue->buf_size) {
>  		ret = -EINVAL;
>  		goto done;
> @@ -452,6 +453,20 @@ uvc_queue_mmap(struct uvc_video_queue *queue, struct
> vm_area_struct *vma) addr += PAGE_SIZE;
>  		size -= PAGE_SIZE;
>  	}
> +#else
> +	if (i == queue->count ||
> +		PAGE_ALIGN(size) != queue->buf_size) {
> +		ret = -EINVAL;
> +		goto done;
> +	}
> +
> +	/* documentation/nommu-mmap.txt */
> +	vma->vm_flags |= VM_IO | VM_MAYSHARE;
> +
> +	addr = (unsigned long)queue->mem + buffer->buf.m.offset;
> +	vma->vm_start = addr;
> +	vma->vm_end = addr +  queue->buf_size;
> +#endif
> 
>  	vma->vm_ops = &uvc_vm_ops;
>  	vma->vm_private_data = buffer;

Note that uvc_queue.c will be replaced by videobuf2 in the (near ?) future. 
NOMMU support will thus be removed once again. If you want to keep it, you 
should add a patch to videobuf2 to implement NOMMU support there.

-- 
Regards,

Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/