From patchwork Mon Nov 18 17:16:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 844220 Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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 93C671C07C9 for ; Mon, 18 Nov 2024 17:16:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731950220; cv=none; b=S6aj6ZEwcjQJSkFZjMwgaEmr9AEcmYoN+7mDrQf0TuSKN7MhsVFRTyYSf+XToihfR2shBaq4MHIzzqmJFjgQo6n2rDwh+3o0lpRclyDFWnAvjNXx/BEJvwcXhPKlBj8LuopO2P2BgWvb44GYVnK3qMt01h5ZTwiPicfEPNXpFkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731950220; c=relaxed/simple; bh=RCd8P7SWrd6FHi62rUrvFyQXQfEkY0e0c1mppU+Gugo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Y/PfH1Esz7Ex1Ktz0pBDM/dz1VJvbor7jarCteRK9KzpPaM93b/THM/WCKA2ve0ZYxSODQCSfYdeqn4iKQTk9hmp8X5+3xYGuOR+theJA0n/uCQpjK+TmmOngh1/rY3dJPtJxYSHkisGoR/KHvYUkFNSzcepHdpvlsAz/5jwi54= 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=YiLfh2xF; arc=none smtp.client-ip=209.85.222.178 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="YiLfh2xF" Received: by mail-qk1-f178.google.com with SMTP id af79cd13be357-7b1418058bbso168455685a.3 for ; Mon, 18 Nov 2024 09:16:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1731950217; x=1732555017; 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=gNFvjcIFE/tMdInr/XwnZIB54kAM691O9hqiQzfdv8o=; b=YiLfh2xFyjqkwSgE7Rsby9ATobVbrDPk0+cSYRzta+TZYPMEaGc6iis2RS3HR3ot2A Fee773bV/p1ioeH53EoflQRQHYAYH0WnrjO+9HHTyK+C2WAkRP+KmKAzKH65HJujlx5B eMcDrWSHu+zpAZbJU1Ik+T1dF6ZIb6vgg7iBg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731950217; x=1732555017; 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=gNFvjcIFE/tMdInr/XwnZIB54kAM691O9hqiQzfdv8o=; b=MAonWBBWZQAK1TzhnwCl0GwK0R6FTe5zoJqdnnddcKaM+VKHeF0NFB5+eHQ9ocE0tn y4x7t2obK7xC0IZzsWKpsO5YG91I1IlCY6kcIrwQspl5XncHTIj8sGCAdiufZqZRALod 8JNFIaq34QbgxI2Nwxhwc3PleYmx4POLAaCF29CduQXsJeGJYdu8CR3HM4kIku3X/YWU SMDh4wb0zREv/sAcYjD9rcjaOB00iIxlItaTCzooemgyndzfkcIlydLrDZI8gyFf3Tyz Fj2wJmGpZCtRKRhe+RFe0k86iitA60TuucnqR80Tu4fXRGDbnpn6PBTaLAYUDQeBVdki SkfQ== X-Gm-Message-State: AOJu0Yz76YyeeTZC7eSEfWAKXwBO5kxjJSFo7ySucqD1nG5o6LB8Gl9T ZpHSpr7XK3yd5iQ0NI7YMLGQMFQMeeDjRKGqrsD4ffhtbj0C+AubI2WXVYg2oA== X-Google-Smtp-Source: AGHT+IGOkU43Z9UJjXQsK/gUo0QuSRiC01AYZTqd+ZFfoEVojsBB8wlaF8j84jOLMRBqVEuwdeRqmQ== X-Received: by 2002:a05:6214:5001:b0:6d4:85f:ccac with SMTP id 6a1803df08f44-6d4085fce05mr160427536d6.13.1731950217630; Mon, 18 Nov 2024 09:16:57 -0800 (PST) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d40dd733c3sm38255246d6.97.2024.11.18.09.16.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2024 09:16:56 -0800 (PST) From: Ricardo Ribalda Date: Mon, 18 Nov 2024 17:16:51 +0000 Subject: [PATCH v3 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: <20241118-uvc-readless-v3-1-d97c1a3084d0@chromium.org> References: <20241118-uvc-readless-v3-0-d97c1a3084d0@chromium.org> In-Reply-To: <20241118-uvc-readless-v3-0-d97c1a3084d0@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()") Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede --- drivers/media/usb/uvc/uvc_video.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index cd9c29532fb0..e165850397a0 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -76,8 +76,22 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8 unit, ret = __uvc_query_ctrl(dev, query, unit, intfnum, cs, data, size, UVC_CTRL_CONTROL_TIMEOUT); - if (likely(ret == size)) + if (ret > 0) { + if (size == ret) + return 0; + + /* + * In UVC the data is represented in little-endian by default. + * Some devices return shorter control packages that expected + * if the return value can fit in less bytes. + * Zero all the bytes that the device have not written. + */ + 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, From patchwork Mon Nov 18 17:16:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda X-Patchwork-Id: 844399 Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (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 A06ED1C1F37 for ; Mon, 18 Nov 2024 17:16:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731950221; cv=none; b=YT16WYkdd919xhYH9LWlsDrGI/ZInwMGmXAtdCWjjwPDRa7fzeP0tlTJiQ6jDDbynSgLiwdHSmkhKFeTtr2pNsk7c2NZkF434brKMUCoZLIS0XZ9w7SlkeaUQKEg0NVinUJztL/1IUL+pH1kojPrbIpzeVIb1a+hqaPdJbBvv0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731950221; c=relaxed/simple; bh=A5tEeWedtG0Y+rutx5jNpOYlvPw69q2OPMca4sA4STQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DuQqBJDvIpPbBSrRI93fn1Woa/RkOfOSz6h63nmOes/en7PJ1g+C1nV/AgK2AhWj9TfzQLW9E4THEYuHM0xsaOyr9WRBNTHI+x/ZB6KcetS2sqfrxNSvaYAJnPZMcnGtRfGBKssaFNtJNyshbjoJjA/Uz8rQqUaVUCo3gJ+y9sE= 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=OE2MIzeM; arc=none smtp.client-ip=209.85.219.41 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="OE2MIzeM" Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-6d41c87aec0so13604336d6.0 for ; Mon, 18 Nov 2024 09:16:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1731950218; x=1732555018; 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=nZ30sDfZ/stXUDJszdPegRDEKjQSfHFQOt3ymhmzQbY=; b=OE2MIzeMPum3EvO3y/9PueYnRDFwE/miApRewgduRymSNzo50c/q7QlpAjqOO9CRSv E/Pmef0Rv+sDN351xDbPKNQUR+iYduZL63OIT1PFByi8iM4PaBCXDV3MOfzIlesdB+XM 3AQWME8ZIUazUnDYKGGUJRgnKuGOy/7wPGVl8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731950218; x=1732555018; 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=nZ30sDfZ/stXUDJszdPegRDEKjQSfHFQOt3ymhmzQbY=; b=pqawn70Dv40ExZ7bxsiEUp5nDlnj0cqBodWSclECskfFgAD8JET/IzATvx5Zu3tvZQ AM9GQndT9c5jgnQEjhapCN+VVlgDRO2q5yudkl696mY2C4526X/C8akcumq4jBzGpURE wLDZ9LCQBwZZbuNtD9CtMJYlxRi8vAyWd6W3emjPQFeuCd7NtfcLusaPhxn4W6Ssv1oG ZI1aT12CShvhVu/BKl/sMXUlEGxb37IIdC/25sd52r9VdNtPAzSSQAYLNsHymZs/56T9 rx/5FosniCsZkYTHVe/eeulYl7XFjnIa8HHTmrzpP2GVEtPvXmh3yHqRoOE/W7SwwyVF u6gQ== X-Gm-Message-State: AOJu0YycSD6SJkCCphqt4gXp7QRwtSKppcROSkcM3r9rYb210Vfll4oq g+9eyV64Pc6QmzSOdjqOxQo5UY4RkghGoXLRBUWN9guKY3tio4+RuJOyNDZF0g== X-Google-Smtp-Source: AGHT+IGaNZV/qqJqHa4tiN/uf1zjGJjsroAU+mlkDujCrCE4+KZVeNFgCEheZGGSpyliMGY3+QOMAA== X-Received: by 2002:a05:6214:3387:b0:6d3:7f9c:9e51 with SMTP id 6a1803df08f44-6d3fb7ed418mr178431086d6.20.1731950218592; Mon, 18 Nov 2024 09:16:58 -0800 (PST) Received: from denia.c.googlers.com (189.216.85.34.bc.googleusercontent.com. [34.85.216.189]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6d40dd733c3sm38255246d6.97.2024.11.18.09.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2024 09:16:58 -0800 (PST) From: Ricardo Ribalda Date: Mon, 18 Nov 2024 17:16:52 +0000 Subject: [PATCH v3 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: <20241118-uvc-readless-v3-2-d97c1a3084d0@chromium.org> References: <20241118-uvc-readless-v3-0-d97c1a3084d0@chromium.org> In-Reply-To: <20241118-uvc-readless-v3-0-d97c1a3084d0@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. Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede --- 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 e165850397a0..0195394e10b5 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -110,8 +110,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);