From patchwork Fri Aug 30 02:17:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 19968 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VFEHJ-0006Zr-C8; Fri, 30 Aug 2013 04:17:37 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1VFEHH-0007f4-4O; Fri, 30 Aug 2013 04:17:37 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752818Ab3H3CRb (ORCPT + 1 other); Thu, 29 Aug 2013 22:17:31 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:59285 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752113Ab3H3CRa (ORCPT ); Thu, 29 Aug 2013 22:17:30 -0400 Received: by mail-pa0-f44.google.com with SMTP id fz6so1699214pac.17 for ; Thu, 29 Aug 2013 19:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ABp6qPO30evJ7mKxxcJNzohga+xC+6/FX8q3ChguF6w=; b=cFo7Ie+p3ZdDElq9BHf9LmcAdRZczSYeFKLh25mdxB62nrJpgDD0xpR53R+ZUSYf8j +pLhNCWw+BRG1ya2hm/yD3g/iBaArlgBiyMnx+eOB3azHOKTUbiBfXlEBH4AHMxPirWI atf6zMaiW6WXArYJAvvsikKedb4Hp50Gtb1rY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ABp6qPO30evJ7mKxxcJNzohga+xC+6/FX8q3ChguF6w=; b=dS0KqMVAblB6t+MHMpOmzyywIczDhBMGecH1d+eC8C8rCi59CYIKvERRzZfItDH/GB 9Wd/4cO2lUsQjy07IxTxKzxobXW8imod40NH7lB8U9lkrm3tSR6BCyl0ot36e14LB5Bq EvEZoo4XuZetZxB4smjaYTC6SUcNHzB5FLYxMZz9YAEoC1i8kaTTzmYGTZuRlC0kj9V0 nn4wRTGFieoxcLGaYpr1klkGWQRiTG1fh6uYW6ugPL8wjlQkpQEUDrunQvEtMYbZ5cHe k4ed50g3UjMK1jsbJjh2kTWycIMZAUH/AAlRgPn5/ZBrX2umhvXmab+XhAdFKYC2W7Ky 3Rmw== X-Gm-Message-State: ALoCoQkU/Sl+9QYcg15koKhyS1mC5CXYEUvPvMeWCkhxt2aZdDJsyG62gKBwx8YX92abUUCWzdZI X-Received: by 10.68.228.201 with SMTP id sk9mr7076891pbc.4.1377829049804; Thu, 29 Aug 2013 19:17:29 -0700 (PDT) Received: from kawagoe.tok.corp.google.com (kawagoe.tok.corp.google.com [172.30.88.114]) by mx.google.com with ESMTPSA id ye1sm27935254pab.19.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 19:17:29 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Pawel Osciak Subject: [PATCH v1 01/19] uvcvideo: Add UVC query tracing. Date: Fri, 30 Aug 2013 11:17:00 +0900 Message-Id: <1377829038-4726-2-git-send-email-posciak@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377829038-4726-1-git-send-email-posciak@chromium.org> References: <1377829038-4726-1-git-send-email-posciak@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.8.30.20624 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_3000_3999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Add a new trace argument enabling UVC query details and contents logging. Signed-off-by: Pawel Osciak --- drivers/media/usb/uvc/uvc_video.c | 45 +++++++++++++++++++++++++-------------- drivers/media/usb/uvc/uvcvideo.h | 9 ++++++++ 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 3394c34..695f6d9 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -29,22 +29,6 @@ /* ------------------------------------------------------------------------ * UVC Controls */ - -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; - unsigned int pipe; - - 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, - unit << 8 | intfnum, data, size, timeout); -} - static const char *uvc_query_name(__u8 query) { switch (query) { @@ -69,6 +53,35 @@ static const char *uvc_query_name(__u8 query) } } +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; + 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; + + uvc_trace(UVC_TRACE_QUERY, + "%s (%d): size=%d, unit=%d, cs=%d, intf=%d\n", + uvc_query_name(query), query, size, unit, cs, intfnum); + uvc_trace(UVC_TRACE_QUERY, "Sent:\n"); + uvc_print_hex_dump(UVC_TRACE_QUERY, data, size); + + ret = usb_control_msg(dev->udev, pipe, query, type, cs << 8, + unit << 8 | intfnum, data, size, timeout); + if (ret == -EPIPE) + uvc_trace(UVC_TRACE_QUERY, "Got device STALL on query!\n"); + + uvc_trace(UVC_TRACE_QUERY, "Received:\n"); + uvc_print_hex_dump(UVC_TRACE_QUERY, data, size); + + return ret; +} + int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit, __u8 intfnum, __u8 cs, void *data, __u16 size) { diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 9e35982..75e0153 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -574,6 +574,7 @@ struct uvc_driver { #define UVC_TRACE_VIDEO (1 << 10) #define UVC_TRACE_STATS (1 << 11) #define UVC_TRACE_CLOCK (1 << 12) +#define UVC_TRACE_QUERY (1 << 13) #define UVC_WARN_MINMAX 0 #define UVC_WARN_PROBE_DEF 1 @@ -599,6 +600,14 @@ extern unsigned int uvc_timeout_param; #define uvc_printk(level, msg...) \ printk(level "uvcvideo: " msg) +#define uvc_print_hex_dump(flag, buf, len) \ + do { \ + if (uvc_trace_param & flag) { \ + print_hex_dump(KERN_DEBUG, "uvcvideo: ", \ + DUMP_PREFIX_NONE, 16, 1, buf, len, false); \ + } \ + } while (0) + /* -------------------------------------------------------------------------- * Internal functions. */