From patchwork Wed Dec 13 15:34:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 45932 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eP93u-00052P-Em; Wed, 13 Dec 2017 15:35:10 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753576AbdLMPfI (ORCPT + 1 other); Wed, 13 Dec 2017 10:35:08 -0500 Received: from mout.gmx.net ([212.227.15.18]:54525 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753141AbdLMPe4 (ORCPT ); Wed, 13 Dec 2017 10:34:56 -0500 Received: from axis700.grange ([84.44.207.202]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LztD9-1f38nN3zbX-0155Mp for ; Wed, 13 Dec 2017 16:34:55 +0100 Received: from 200r.grange (200r.grange [192.168.1.16]) by axis700.grange (Postfix) with ESMTP id F39F161807 for ; Wed, 13 Dec 2017 16:34:53 +0100 (CET) Received: from lyakh (uid 1000) (envelope-from g.liakhovetski@gmx.de) id 801d12 by 200r.grange (DragonFly Mail Agent v0.9); Wed, 13 Dec 2017 16:34:53 +0100 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: Laurent Pinchart , Hans Verkuil Subject: [PATCH 2/2 v6] uvcvideo: handle control pipe protocol STALLs Date: Wed, 13 Dec 2017 16:34:53 +0100 Message-Id: <1513179293-17324-3-git-send-email-guennadi.liakhovetski@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1513179293-17324-1-git-send-email-guennadi.liakhovetski@intel.com> References: <1513179293-17324-1-git-send-email-guennadi.liakhovetski@intel.com> X-Provags-ID: V03:K0:w4yP8CaO4+IKmW4npkbUR9dtefZkUYnYpjYqTkTfGQjr87a3Kpm nxJ3WBQqPQrH92xEGvSkDj8dmDGNBnoxPquhC24l7MoUJ1i3WNvlfHMArTBMOeIuG038tvB taZBpNRDC/lT8dDc31sMl94gS0K8lHCXINaX7gO2L1XQBhdqNTy8s90sx8xDgNxnvXcTb1o NhPHNRVboGmvM13rnTtzw== X-UI-Out-Filterresults: notjunk:1; V01:K0:chx6jWLPiY8=:jLQZbr/GA5Cjmlhw47fc7H f/+3OX0pM18k9yNzr/RGVq1DzIM/kfPZRxFiCRrUrkiA/Z092ivKBBAFt02EOqpLxkqUvPEGF qpQ+rlUBVpUraDawGlQlbaYEXxOdyue5BFkE25T3albskd3hXAYbsYHq2Wd4b5WlcDG9f5Fd8 vuLbU2SryUW2Vf0f5uvZVf0JPZMWfHKG8FlVXLUFWandsdG8EiG9ESMqPqY3tV6vEwkpBteez sbBhsnrTk4Z4vCnHGqw4Vd42QjLhyZ/oEubOCkSNK+8LYTEd85pWohlfHx7sePKXZEEIgexzw wG+W4C5nLRRHBFxfipbmm60ZPLAUSvcnMekEBwXNWHilbG+nAz7gd/C6CyiV+TFY5uOS+RU6/ 5exrDeoEIwwepAqvtcZxQ/6BGZp3J0B2Gp5HzYQ8lLZav9P+gcZSIwUBoioVUcoLytZpSPkUn +UdN5R76DyrP7TsmdVlCJr6wvv7UCXqULdXHfelXie2CdNyUjpp+ICC5w5FrlStSXLGHqIFuZ wVX6gDUK31+1Aa5I7CVU0xrx0VVg9hKW+1ykgfe/pnXjN1e3lB2to4uDw6ShTWjPr1wOP0BoV pI2W+AMqExrnbuv0i+4JFBm9GkZ8ebTPennqG9Feex7rRSzFqHisFVWOdkNd72BVbIVGkcSXN yxFEzIeJYYOL3lzE7fBmMKbdHfJa9qx7lDUYLEv4zmf5LHZVWSigBSXyQMgwpbT4zGIUGpshi Sx3vj/b6mEMpBf8u5Td6M/31AkCnv5GFFjnfoAEuEAfo4bK9xy7UnK8xuZ9jgHsFl2UQMGdFs rFhJLaHVyucYNDKRHK3V07Gjk6bFw== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org When a command ends up in a STALL on the control pipe, use the Request Error Code control to provide a more precise error information to the user. Signed-off-by: Guennadi Liakhovetski --- drivers/media/usb/uvc/uvc_video.c | 59 +++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 6 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 2fc0bf2..cfcc4861 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -34,15 +34,59 @@ static int __uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, __u8 intfnum, __u8 cs, void *data, __u16 size, int timeout) { - __u8 type = USB_TYPE_CLASS | USB_RECIP_INTERFACE; + __u8 type = USB_TYPE_CLASS | USB_RECIP_INTERFACE, tmp, error; unsigned int pipe; + int ret; pipe = (query & 0x80) ? usb_rcvctrlpipe(dev->udev, 0) : usb_sndctrlpipe(dev->udev, 0); type |= (query & 0x80) ? USB_DIR_IN : USB_DIR_OUT; - return usb_control_msg(dev->udev, pipe, query, type, cs << 8, + ret = usb_control_msg(dev->udev, pipe, query, type, cs << 8, unit << 8 | intfnum, data, size, timeout); + + if (ret != -EPIPE) + return ret; + + tmp = *(u8 *)data; + + pipe = usb_rcvctrlpipe(dev->udev, 0); + type = USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN; + ret = usb_control_msg(dev->udev, pipe, UVC_GET_CUR, type, + UVC_VC_REQUEST_ERROR_CODE_CONTROL << 8, + unit << 8 | intfnum, data, 1, timeout); + error = *(u8 *)data; + *(u8 *)data = tmp; + + if (ret < 0) + return ret; + + if (!ret) + return -EINVAL; + + uvc_trace(UVC_TRACE_CONTROL, "Control error %u\n", error); + + switch (error) { + case 0: + /* Cannot happen - we received a STALL */ + return -EPIPE; + case 1: /* Not ready */ + return -EAGAIN; + case 2: /* Wrong state */ + return -EILSEQ; + case 3: /* Power */ + return -EREMOTE; + case 4: /* Out of range */ + return -ERANGE; + case 5: /* Invalid unit */ + case 6: /* Invalid control */ + case 7: /* Invalid Request */ + case 8: /* Invalid value within range */ + default: /* reserved or unknown */ + break; + } + + return -EINVAL; } static const char *uvc_query_name(__u8 query) @@ -80,7 +124,7 @@ int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, uvc_printk(KERN_ERR, "Failed to query (%s) UVC control %u on " "unit %u: %d (exp. %u).\n", uvc_query_name(query), cs, unit, ret, size); - return -EIO; + return ret < 0 ? ret : -EIO; } return 0; @@ -203,13 +247,15 @@ static int uvc_get_video_ctrl(struct uvc_streaming *stream, uvc_warn_once(stream->dev, UVC_WARN_PROBE_DEF, "UVC non " "compliance - GET_DEF(PROBE) not supported. " "Enabling workaround.\n"); - ret = -EIO; + if (ret >= 0) + ret = -EIO; goto out; } else if (ret != size) { uvc_printk(KERN_ERR, "Failed to query (%u) UVC %s control : " "%d (exp. %u).\n", query, probe ? "probe" : "commit", ret, size); - ret = -EIO; + if (ret >= 0) + ret = -EIO; goto out; } @@ -290,7 +336,8 @@ static int uvc_set_video_ctrl(struct uvc_streaming *stream, uvc_printk(KERN_ERR, "Failed to set UVC %s control : " "%d (exp. %u).\n", probe ? "probe" : "commit", ret, size); - ret = -EIO; + if (ret >= 0) + ret = -EIO; } kfree(data);