rtl2832u_sdr: fixing v4l2-compliance issues

Antti,

Attached is a patch that fixed all but one v4l2-compliance error:

fail: v4l2-test-controls.cpp(295): returned control value out of range
fail: v4l2-test-controls.cpp(357): invalid control 00a2090c
test VIDIOC_G/S_CTRL: FAIL
fail: v4l2-test-controls.cpp(465): returned control value out of range
fail: v4l2-test-controls.cpp(573): invalid control 00a2090c
test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL

That's the BANDWIDTH control and it returned value 3200000 when the minimum was 6000000. I couldn't trace where that came from in the limited time I spent on it, I expect you can find it much quicker.

I did my testing with this tree:

http://git.linuxtv.org/hverkuil/media_tree.git/shortlog/refs/heads/sdr

which is a merge of your tree:

http://git.linuxtv.org/media-tree.git/shortlog/refs/heads/sdr

and my ongoing vb2-fixes tree:

http://git.linuxtv.org/hverkuil/media_tree.git/shortlog/refs/heads/vb2-part4

I leave it to you to process this patch further.

Regards,

Hans

Signed-off-by Hans Verkuil <[email protected]>

drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c +23 -6

index ac487cb..3013305 100644
@@ -120,6 +120,7 @@ struct rtl2832_sdr_state {
  	struct vb2_queue vb_queue;
  	struct list_head queued_bufs;
  	spinlock_t queued_bufs_lock; /* Protects queued_bufs */
+	unsigned sequence;	     /* buffer sequence counter */
 
  	/* Note if taking both locks v4l2_lock must always be locked first! */
  	struct mutex v4l2_lock;      /* Protects everything else */

@@ -415,6 +416,8 @@ static void rtl2832_sdr_urb_complete(struct urb *urb)
  		len = rtl2832_sdr_convert_stream(s, ptr, urb->transfer_buffer,
  				urb->actual_length);
  		vb2_set_plane_payload(&fbuf->vb, 0, len);
+		v4l2_get_timestamp(&fbuf->vb.v4l2_buf.timestamp);
+		fbuf->vb.v4l2_buf.sequence = s->sequence++;
  		vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE);
  	}
  skip:

@@ -611,8 +614,9 @@ static int rtl2832_sdr_queue_setup(struct vb2_queue *vq,
  	struct rtl2832_sdr_state *s = vb2_get_drv_priv(vq);
  	dev_dbg(&s->udev->dev, "%s: *nbuffers=%d\n", __func__, *nbuffers);
 
-	/* Absolute min and max number of buffers available for mmap() */
-	*nbuffers = clamp_t(unsigned int, *nbuffers, 8, 32);
+	/* Need at least 8 buffers */
+	if (vq->num_buffers + *nbuffers < 8)
+		*nbuffers = 8 - vq->num_buffers;
  	*nplanes = 1;
  	/* 2 = max 16-bit sample returned */
  	sizes[0] = PAGE_ALIGN(BULK_BUFFER_SIZE * 2);

@@ -1013,6 +1017,8 @@ static int rtl2832_sdr_start_streaming(struct vb2_queue *vq, unsigned int count)
  	if (ret)
  		goto err;
 
+	s->sequence = 0;
+
  	ret = rtl2832_sdr_submit_urbs(s);
  	if (ret)
  		goto err;

@@ -1087,6 +1093,8 @@ static int rtl2832_sdr_s_tuner(struct file *file, void *priv,
  	struct rtl2832_sdr_state *s = video_drvdata(file);
  	dev_dbg(&s->udev->dev, "%s:\n", __func__);
 
+	if (v->index > 1)
+		return -EINVAL;
  	return 0;
  }
 

@@ -1122,12 +1130,15 @@ static int rtl2832_sdr_g_frequency(struct file *file, void *priv,
  	dev_dbg(&s->udev->dev, "%s: tuner=%d type=%d\n",
  			__func__, f->tuner, f->type);
 
-	if (f->tuner == 0)
+	if (f->tuner == 0) {
  		f->frequency = s->f_adc;
-	else if (f->tuner == 1)
+		f->type = V4L2_TUNER_ADC;
+	} else if (f->tuner == 1) {
  		f->frequency = s->f_tuner;
-	else
+		f->type = V4L2_TUNER_RF;
+	} else {
  		return -EINVAL;
+	}
 
  	return ret;
  }

@@ -1161,7 +1172,9 @@ static int rtl2832_sdr_s_frequency(struct file *file, void *priv,
  				__func__, s->f_adc);
  		ret = rtl2832_sdr_set_adc(s);
  	} else if (f->tuner == 1) {
-		s->f_tuner = f->frequency;
+		s->f_tuner = clamp_t(unsigned int, f->frequency,
+				bands_fm[0].rangelow,
+				bands_fm[0].rangehigh);
  		dev_dbg(&s->udev->dev, "%s: RF frequency=%u Hz\n",
  				__func__, f->frequency);
 

@@ -1195,6 +1208,7 @@ static int rtl2832_sdr_g_fmt_sdr_cap(struct file *file, void *priv,
  	dev_dbg(&s->udev->dev, "%s:\n", __func__);
 
  	f->fmt.sdr.pixelformat = s->pixelformat;
+	memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));
 
  	return 0;
  }

@@ -1211,6 +1225,7 @@ static int rtl2832_sdr_s_fmt_sdr_cap(struct file *file, void *priv,
  	if (vb2_is_busy(q))
  		return -EBUSY;
 
+	memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));
  	for (i = 0; i < NUM_FORMATS; i++) {
  		if (formats[i].pixelformat == f->fmt.sdr.pixelformat) {
  			s->pixelformat = f->fmt.sdr.pixelformat;

@@ -1232,6 +1247,7 @@ static int rtl2832_sdr_try_fmt_sdr_cap(struct file *file, void *priv,
  	dev_dbg(&s->udev->dev, "%s: pixelformat fourcc %4.4s\n", __func__,
  			(char *)&f->fmt.sdr.pixelformat);
 
+	memset(f->fmt.sdr.reserved, 0, sizeof(f->fmt.sdr.reserved));
  	for (i = 0; i < NUM_FORMATS; i++) {
  		if (formats[i].pixelformat == f->fmt.sdr.pixelformat)
  			return 0;

@@ -1362,6 +1378,7 @@ struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
  	s->i2c = i2c;
  	s->cfg = cfg;
  	s->f_adc = bands_adc[0].rangelow;
+	s->f_tuner = bands_fm[0].rangelow;
  	s->pixelformat =  V4L2_SDR_FMT_CU8;
 
  	mutex_init(&s->v4l2_lock);

Antti,

Attached is a patch that fixed all but one v4l2-compliance error:

fail: v4l2-test-controls.cpp(295): returned control value out of range
fail: v4l2-test-controls.cpp(357): invalid control 00a2090c
test VIDIOC_G/S_CTRL: FAIL
fail: v4l2-test-controls.cpp(465): returned control value out of range
fail: v4l2-test-controls.cpp(573): invalid control 00a2090c
test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL

That's the BANDWIDTH control and it returned value 3200000 when the minimum was 6000000. I couldn't trace where that came from in the limited time I spent on it, I expect you can find it much quicker.

Moikka Hans!

Quoted 11 lines · Hans Verkuil

Antti,

Attached is a patch that fixed all but one v4l2-compliance error:

fail: v4l2-test-controls.cpp(295): returned control value out of range
fail: v4l2-test-controls.cpp(357): invalid control 00a2090c
test VIDIOC_G/S_CTRL: FAIL
fail: v4l2-test-controls.cpp(465): returned control value out of range
fail: v4l2-test-controls.cpp(573): invalid control 00a2090c
test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL

Quoted 3 lines

That's the BANDWIDTH control and it returned value 3200000 when the minimum was 6000000. I couldn't trace where that came from in the limited time I spent on it, I expect you can find it much quicker.

That is because I added native V4L2_CID_RF_TUNER_BANDWIDTH support only for E4000 tuner driver. The others, FC0012, FC0013 and R820T are set via DVB API by rtl2832_sdr driver, which is quite hackish solution. Devices having E4000 works correctly.

Dunno if it wise to hack rtl2832_sdr and clamp values to valid per tuner or leave it as it is. Adding V4L2_CID_RF_TUNER_BANDWIDTH to those 3 tuner drivers is also quite trivial...

Quoted 18 lines · Antti Palosaari

Moikka Hans!

Quoted 11 lines · Hans Verkuil

Antti,

Attached is a patch that fixed all but one v4l2-compliance error:

fail: v4l2-test-controls.cpp(295): returned control value out of range
fail: v4l2-test-controls.cpp(357): invalid control 00a2090c
test VIDIOC_G/S_CTRL: FAIL
fail: v4l2-test-controls.cpp(465): returned control value out of range
fail: v4l2-test-controls.cpp(573): invalid control 00a2090c
test VIDIOC_G/S/TRY_EXT_CTRLS: FAIL

Quoted 3 lines

That's the BANDWIDTH control and it returned value 3200000 when the minimum was 6000000. I couldn't trace where that came from in the limited time I spent on it, I expect you can find it much quicker.

Quoted 8 lines

That is because I added native V4L2_CID_RF_TUNER_BANDWIDTH support only for E4000 tuner driver. The others, FC0012, FC0013 and R820T are set via DVB API by rtl2832_sdr driver, which is quite hackish solution. Devices having E4000 works correctly.

Dunno if it wise to hack rtl2832_sdr and clamp values to valid per tuner or leave it as it is. Adding V4L2_CID_RF_TUNER_BANDWIDTH to those 3 tuner drivers is also quite trivial...

I recommend whatever is the best long-term solution :-)

It's good practice to fix such compliance errors. One reason is that v4l2-compliance generally stops testing whatever ioctl it is testing once it finds a problem, so there may be other failures lurking behind this one that v4l2-compliance won't find.

The other reason is that, well, it's a bug! So it should be fixed anyway.