From patchwork Wed Nov 20 15:26:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13881328 Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 320CD19F424 for ; Wed, 20 Nov 2024 15:26:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732116389; cv=none; b=nfdRTo94ixIYUIap+AZlQPuDucYNG549LITtQf6hxoMHiqjqlmNFXaBmD4n6hAfsLZuL8otWBrTcdkN/VOW0DxrRvPmFMMouGmFPou0AkZrKPgUAjuiOTqTZAIJDzRnwXFrkzTNuLE54X7a4B38g2629ZWEkm0d+VI0COEtzWQM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732116389; c=relaxed/simple; bh=28TVCm8cQpV09q+k2GaQ8E5UnNRGHov9tfjPf83ZwiY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SgCk8gEkwrieUFeKd4w0WIBzihkCYn3yO64wq59Kql3qGAJmMfYs4xHtRezHJv/V2ucpc+9akIlRUGpAiF/HfQlMZKDKNeiDJEZO8vd/w1UTH5wuplHnX3czHdld5OvNsYYHOC2YPF4hwrMtvcD15DUKkzweT2WrfODoDV2Ft5o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=U5u/ebRg; arc=none smtp.client-ip=209.85.222.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="U5u/ebRg" Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7b147a2ff04so316150485a.3 for ; Wed, 20 Nov 2024 07:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732116386; x=1732721186; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Nf6P9DIRJxG3HHqSkmc5bDC2kbomtLiZlCyebQwPqCM=; b=U5u/ebRgFnVQX6SRR3Aj1ayyV9xBU2oWAFvFdSEPQ25dHMaX0MeUYZkAKCHIBL9QR/ 9GR4e1ObbBHBZGj/LMsgUAAXdr1DEmpJmZ+Tl43ClrAVXmsl0aML89pBxeNgdZTzjWDA XXI79BG03+mYzTGDJwFUM+Y1P12dLUjqIjjc4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732116386; x=1732721186; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nf6P9DIRJxG3HHqSkmc5bDC2kbomtLiZlCyebQwPqCM=; b=ID+Yj7QPM9pRGN29Nesnl4Cy2eNLHDTA8XAsg7xEVfBIDLqUAV67nzE4Em94N8LIc1 SLD+cPkxLzRFQz77/Sd13kJ3ZV2h885DEglLyI7AX0KMwx4qNExgE71VkcnFuJZbWcM1 qjqLa8M+PKt6iMFU0XUOItHYPS+EO7QNJYjbUcgWqL4Wy+NbKD1in2c/VE8rwoKduO7K cUbCkRIJUKhKZID0+4DzxtMsWAeEJj3NYEAc4SHuii7zWogja1xf8ecRlbcFMr0BMyEV CJeaoy0VoBvSAb5y6R14hgCq8mIlYvuH7/QEicdBsfQVvBrrzoD6Z+S3YovBs28DLWTU 25sQ== X-Gm-Message-State: AOJu0YxiSEDqOrSdLYs2T+w/k7IJcGRaCc4u8lx/q7Q/b8nv5ihhCVvy Jn7RleG25GCYaF/K8y6JKliNt1Ty48OFaZOk35lsjN4drbwo7CytqjiAfGDy2Q8TyRlE3s0Cz0w dFA== X-Google-Smtp-Source: AGHT+IFyIx3n9LVvSDGLaLi6PI8d2RhkUZLVsQYek4SUEz4fUio+9uekQYCj+qGy8K8NAK6KGh5juA== X-Received: by 2002:a05:620a:2486:b0:7b1:4fab:4418 with SMTP id af79cd13be357-7b42ee8297dmr350405785a.49.1732116386367; Wed, 20 Nov 2024 07:26:26 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46467fd76e2sm11207321cf.12.2024.11.20.07.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 07:26:25 -0800 (PST) From: Ricardo Ribalda Date: Wed, 20 Nov 2024 15:26:19 +0000 Subject: [PATCH v4 1/2] media: uvcvideo: Support partial control reads Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241120-uvc-readless-v4-1-4672dbef3d46@chromium.org> References: <20241120-uvc-readless-v4-0-4672dbef3d46@chromium.org> In-Reply-To: <20241120-uvc-readless-v4-0-4672dbef3d46@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , Sakari Ailus , stable@vger.kernel.org X-Mailer: b4 0.13.0 Some cameras, like the ELMO MX-P3, do not return all the bytes requested from a control if it can fit in less bytes. Eg: Returning 0xab instead of 0x00ab. usb 3-9: Failed to query (GET_DEF) UVC control 3 on unit 2: 1 (exp. 2). Extend the returned value from the camera and return it. Cc: stable@vger.kernel.org Fixes: a763b9fb58be ("media: uvcvideo: Do not return positive errors in uvc_query_ctrl()") Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index cd9c29532fb0..482c4ceceaac 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -79,6 +79,22 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, if (likely(ret == size)) return 0; + /* + * In UVC the data is usually represented in little-endian. + * Some devices return shorter USB control packets that expected if the + * returned value can fit in less bytes. Zero all the bytes that the + * device have not written. + * We exclude UVC_GET_INFO from the quirk. UVC_GET_LEN does not need to + * be excluded because its size is always 1. + */ + if (ret > 0 && query != UVC_GET_INFO) { + memset(data + ret, 0, size - ret); + dev_warn_once(&dev->udev->dev, + "UVC non compliance: %s control %u on unit %u returned %d bytes when we expected %u.\n", + uvc_query_name(query), cs, unit, ret, size); + return 0; + } + if (ret != -EPIPE) { dev_err(&dev->udev->dev, "Failed to query (%s) UVC control %u on unit %u: %d (exp. %u).\n", From patchwork Wed Nov 20 15:26:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 13881330 Received: from mail-qt1-f171.google.com (mail-qt1-f171.google.com [209.85.160.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 48A4A19F10A for ; Wed, 20 Nov 2024 15:26:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732116390; cv=none; b=Aihd9uYVAREK3Hud+2If80u2DBYIdzZQ+FkiT1pbVk5Wus6AMozUcYhsn07MfhrOUDux1Tl2p78lHEwOqVYC4iKvzCgYZ56CfuV6WPB0P7HT9XLwDkZze8J6p5FZlmYIxA1ubpgHeAmR7tG3RDtug9HhqvINaSZ21e7XM47wPw0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732116390; c=relaxed/simple; bh=0/4FckMiSiHC8QtZcVOi7l51C08TGrth+2RVMZNClRY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=P5atsc4zicZRR2MTSMF8oKYde1ZyK6UUqWYIEutz4udH5hVYxCeDoG0e1VXkQIa29oKSfYJqdldaCCChWS3E6czB0vNm8PImw/mWMnIwoaKPfj1AIgTd1lKjV5q3X9s4zV1uzn67/zbttCgvNd9IRT9sssuxsHrH6h38RkKei1o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=ENegmwnh; arc=none smtp.client-ip=209.85.160.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ENegmwnh" Received: by mail-qt1-f171.google.com with SMTP id d75a77b69052e-4609967ab7eso14725341cf.3 for ; Wed, 20 Nov 2024 07:26:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732116388; x=1732721188; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qumhdBhQMcwMSA8xBYQJzlSmgMMJFlVuWwTimH3pwtM=; b=ENegmwnh/wxL2CVDXS6NAHLd2aS7So4nyDddeckKu7JzBh+6c7JWu8sGeqtDiPBLot awye9PKknV1gcH0fPZCgqWE6L+GFUBg4VZ41MgB6PHZWG2phTmd9nR75BPFWMN1rv/M3 S54oAk2XyEr1aZb1MoFEvj+adz/232+qkNJfg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732116388; x=1732721188; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qumhdBhQMcwMSA8xBYQJzlSmgMMJFlVuWwTimH3pwtM=; b=G9IevUi9qfNjbtwDhCICsHKV0kyAgxgdu/RxawV8byyTara80uytjkbD+1kgowFm7V +KAHnY/SXZ61/XVRi2fIVnryJ2EaqDCma7ukFoDD3CZkIyVemmIreDaD/1fkBe4SLKux 1njW1u7mQIWNZB+74KrD+K8Dy6O/dIFxh2DaGUC0hCz1UjLzEdu/W36AOBlEBZthi6La HL4Slw+B58zWxIBA3FH9MHyrTAA7YAg25CBYiytooTKiqCpQvcPbdBbfsOvMP4FS3umE t342x6hcmgqYdJYkIj04JibkNO0oPQGmUEiKtlrsGWV5gsFxUo1fxvKCuKHkc9DOrwMq AE+Q== X-Gm-Message-State: AOJu0YyZI/tvR3fg+cZwYhXi2BRMEoBT2skIJABwdka3iBrGeOINT3iN vtFuXhYR2KwQV7UO7hjJvRnB4vGTUhOo4f1ZYejeL5j2vfuH3A80crOhSv05/oVOWqLEa7S32In Y8g== X-Gm-Gg: ASbGncvy8E5BEtY3F9WMU0jukGGKEKLk9NWlwvhmO2X9gYAPorzXj3rk631mmWLyno6 fCLBAAL5d3ouFpMZlry+NclAWNBQLcu1FsZjlxFG+gZll8lqIAQ0E9D/WUvXhXh8B8tjkjTpbWv 3okFW0i1QzVQ3DYNDr48Hk6hJPrCypR3Vv2aU6lzQaYTw75AMJ3b4TitozgxaVYMmtuiA9hw8uX 0J3C0Y15CKpk37bREJwtS7PqaiZJj2TfFYxlrCxCtwrEScqQyJ4RTV8T9ekAIrL62xY+IIw+3OQ 22rH5J4JDN/IhnDpr8qioQUQ X-Google-Smtp-Source: AGHT+IHPlAn+PtW4S65lZD+sW4FNYiPUzxXoFq72G2Q0cDPAJTNnHqS5O488xNRnPKLEVvl1B5oT8g== X-Received: by 2002:a05:622a:c7:b0:461:2a3c:c1f with SMTP id d75a77b69052e-46479c353f4mr37026111cf.52.1732116387928; Wed, 20 Nov 2024 07:26:27 -0800 (PST) Received: from denia.c.googlers.com (5.236.236.35.bc.googleusercontent.com. [35.236.236.5]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-46467fd76e2sm11207321cf.12.2024.11.20.07.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 07:26:27 -0800 (PST) From: Ricardo Ribalda Date: Wed, 20 Nov 2024 15:26:20 +0000 Subject: [PATCH v4 2/2] media: uvcvideo: Add more logging to uvc_query_ctrl() Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241120-uvc-readless-v4-2-4672dbef3d46@chromium.org> References: <20241120-uvc-readless-v4-0-4672dbef3d46@chromium.org> In-Reply-To: <20241120-uvc-readless-v4-0-4672dbef3d46@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Ricardo Ribalda , Sakari Ailus X-Mailer: b4 0.13.0 If we fail to query the ctrl error code there is no information on dmesg or in uvc_dbg. This makes difficult to debug the issue. Print a proper error message when we cannot retrieve the error code from the device. Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index 482c4ceceaac..00d9e3420fb6 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -112,8 +112,12 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, error = *(u8 *)data; *(u8 *)data = tmp; - if (ret != 1) + if (ret != 1) { + dev_err_ratelimited(&dev->udev->dev, + "Failed to query (%s) UVC error code control %u on unit %u: %d (exp. 1).\n", + uvc_query_name(query), cs, unit, ret); return ret < 0 ? ret : -EPIPE; + } uvc_dbg(dev, CONTROL, "Control error %u\n", error);