From nobody Thu Oct 9 13:19:07 2025 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (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 442B92980AF for ; Tue, 17 Jun 2025 14:42:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171357; cv=none; b=AxV0jGw5NrtAOpHXl/AKBBXfPjAKfkVWxb7eKNVutn5nldGdA/rnIeV5CT1LNp1OnRAMaMjmxmPujgKFP5CsA964jbIYA+ITv/G3eFUXCfWgjdz5BSxIg2FSF+YoYfAdJIN8uTAcbXr6uv466Kdjut1CFuHnpLHSUOih5aasB7A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171357; c=relaxed/simple; bh=aktg2opJq0+dY4a+/MNIzTnrkdP0Ocg7NaKfj2bHfhw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=g5J9QFDhrDCF8ylbNASRyWYT1Vvo7xE10bqqOyslrMA2MdOARH/6PCMdJM38FKuxxTAx8/QUJ4/OAIIXCjRvhA9P/hAC1jNCbL4sbptnj2XSGz9X+to+4MEKjrkO181RWZb+swIwmJUZZtlKxBmeo+I5tNsHZDbEc/6GAqreWnA= 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=lkqYUoYC; arc=none smtp.client-ip=209.85.167.47 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="lkqYUoYC" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5533a86a134so5123395e87.3 for ; Tue, 17 Jun 2025 07:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750171353; x=1750776153; 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=OzIXP1ycrxCwpqJ0rvCcPdawBbbWpEqHaCxqb+yy90M=; b=lkqYUoYCEgGbtLQssHjEDMlNVUOkMZSLMhZcW54QsjOKP37nb3j3DILDimDNfCDFun VUCplA7lZ30DdaR39W+RC5ZpHqTDa32JKP1ca1bT6ktwDAPh5fDfhtYgv5E/kMoPvdkJ XfwN36BoSQCuHpYI/bxxrFYo3HzcdSA3XZ6Sc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750171353; x=1750776153; 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=OzIXP1ycrxCwpqJ0rvCcPdawBbbWpEqHaCxqb+yy90M=; b=Qnjc3jT/wW/ffVErgWiJpp2vGj/Gvl5z5DXxP0ntUhWNZ7Vt7H0dtfbg8B6MZC26FU tpO6zfxJ8taXJD2UT4UrT4hsDnqB/4sHEGoepMsVjOSKgT3niKQUyOG1mV4Ut9Ao3JZg 3pSY6386Y2xaDX++gbrEbEVln+Bhju+8orJVjfAaQfUJhdbsQYMAEp9lQ4qKB7YOk/u6 gz0dRN6HH1f+z8yukEA0i5lWY+cFRJC3DaKuXOFhsF3qmWAxaFR8lV+CzD4lhzhFdAA+ kfPkUHT0eVWCJF05/Hx8wNA2d7A6AHn8EulPFsrpnAmOtlU4ZMkzissjvSf0qjgaUITW NEbw== X-Forwarded-Encrypted: i=1; AJvYcCU6jD3YENIhngIRsjQIUa3/IcBwVt9Bv6yqDjYAdA4Kd0CmCuIS6mnxzNWs+9jxh2aPIoest8uMEYE5Kv0=@vger.kernel.org X-Gm-Message-State: AOJu0YyRU02PBT5PY2KuR1PcWmphdqQ5xRcMU94iv/pS02XCb4n9cnBJ 4bdehSgXOeyrB8FDy4MQTegiXXhH2HjbvAMQncwkTsXgGZCgdqoxXLGyIG8K1pEe/w== X-Gm-Gg: ASbGncugFDLqdA3WrN2p8hT76ISs+ErkapRNyY/Jcb4usqWIzggI0wR0Zeo8uA08+22 FHUhT55av7AjCbK88NHJWkSeEnWL0ioujYK9eWw7F7HVodqGSeOv8UYHQ6SRLjxNVmd9dWQLRK6 g3Oa59pmn/S3pGRxv4XvqsBWmbjZNdulcJ67vywWmNXWXFWlRjVk0DZ19ILAVMNB6VXCl8BXGKw zkOjXTgtiGGHGELCDE7tO+aEVxMirvB4RfTmLdrGIRcD01nl3dwqqjotbmPo/+U8V/jTgyv21ZF wGtbpEulCAJq9oBt9IBeRXxFnOwlBKH68T7+UGxw8L2euWl2bVcbKJg1saimDpIqmG057D8Cp7v ztWqaAZFsqhUPN3KVQfyvcZ45ntEWJQh4RfdxGeZ3YQ== X-Google-Smtp-Source: AGHT+IGDdZamuUtegaqRzq6f6YTXv/XwbBpEBszibH6S83g9q8LYSRxOGewlvA2AvUElv4QXpy7yqQ== X-Received: by 2002:a05:6512:159d:b0:553:3665:366d with SMTP id 2adb3069b0e04-553b6ee2b81mr3316711e87.21.1750171353230; Tue, 17 Jun 2025 07:42:33 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ae234437sm1814992e87.53.2025.06.17.07.42.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 07:42:32 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 17 Jun 2025 14:42:22 +0000 Subject: [PATCH v7 1/5] media: uvcvideo: Do not mark valid metadata as invalid Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-uvc-meta-v7-1-9c50623e2286@chromium.org> References: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> In-Reply-To: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Guennadi Liakhovetski , Greg Kroah-Hartman , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda , stable@vger.kernel.org X-Mailer: b4 0.14.2 Currently, the driver performs a length check of the metadata buffer before the actual metadata size is known and before the metadata is decided to be copied. This results in valid metadata buffers being incorrectly marked as invalid. Move the length check to occur after the metadata size is determined and is decided to be copied. Cc: stable@vger.kernel.org Fixes: 088ead255245 ("media: uvcvideo: Add a metadata device node") Reviewed-by: Laurent Pinchart Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_video.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_= video.c index 11769a1832d2ba9b3f9a50bcb10b0c4cdff71f09..2e377e7b9e81599aca19b800a17= 1cc16a09c1e8a 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1442,12 +1442,6 @@ static void uvc_video_decode_meta(struct uvc_streami= ng *stream, if (!meta_buf || length =3D=3D 2) return; =20 - if (meta_buf->length - meta_buf->bytesused < - length + sizeof(meta->ns) + sizeof(meta->sof)) { - meta_buf->error =3D 1; - return; - } - has_pts =3D mem[1] & UVC_STREAM_PTS; has_scr =3D mem[1] & UVC_STREAM_SCR; =20 @@ -1468,6 +1462,12 @@ static void uvc_video_decode_meta(struct uvc_streami= ng *stream, !memcmp(scr, stream->clock.last_scr, 6))) return; =20 + if (meta_buf->length - meta_buf->bytesused < + length + sizeof(meta->ns) + sizeof(meta->sof)) { + meta_buf->error =3D 1; + return; + } + meta =3D (struct uvc_meta_buf *)((u8 *)meta_buf->mem + meta_buf->bytesuse= d); local_irq_save(flags); time =3D uvc_video_get_time(); --=20 2.50.0.rc2.692.g299adb8693-goog From nobody Thu Oct 9 13:19:07 2025 Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 999C521C16D for ; Tue, 17 Jun 2025 14:42:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171358; cv=none; b=GCpksOX2Arcoz5etk4fFfcYNW2e8nH8p8XTcJt0XRC+/UMPwcWfqpvHbw63PjxeK2qJ0u7yFfDUjP9LJ3lCeyoz4/oTzveeWv73jcBBQzUOjwiTMbAoaiGv5RMU60EK0V4oVL+YOD7C4OuZA0UJIdA477Uuq4PR9kO3bes8gcRQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171358; c=relaxed/simple; bh=bYdXHZgcVr0efBjTgUPsB8+QuqvjW8HoLU5Tp9AdihQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Is5kzsPu48uJuftoHtmcW+Gi3Y3A0mYq+aslx0Ttde8aFslO8g9RT/H0keueiPJFZhUsy5OgEnuP5D39KAZ0JVQSGVLpqvuKLH7FzBRddeugR0KUn300Cxw9PwanqG5CgaYjvvioHKsh63sbvNXXDO6ZxtycUo5yDBfSrJDUouQ= 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=Qiveonxq; arc=none smtp.client-ip=209.85.167.45 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="Qiveonxq" Received: by mail-lf1-f45.google.com with SMTP id 2adb3069b0e04-553543ddfc7so6233862e87.0 for ; Tue, 17 Jun 2025 07:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750171354; x=1750776154; 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=0xlu3CSgyiphpvjrJ4zGRNfneVAXEwqkV8GfJcaFYtI=; b=QiveonxqdrRLMX9k4hobfSqIumO2vT6j/GmEvWxTx9mJCiZGY4CDiZlDhv6YMnEouM VJiT87HOS9rKUxmS/K3jVARBolteplWl6TwKAD8ODbeonvL1qQ9SSLgLbXBphTFS8Cs4 hDCeus9kg9AFCpJXqkvrOcmdNIU1yRSmW4RNs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750171354; x=1750776154; 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=0xlu3CSgyiphpvjrJ4zGRNfneVAXEwqkV8GfJcaFYtI=; b=P1H6cdIuTBNiGH2/sm7sIfatM7645DC8vQ2C4C/yrtKVqF4taWNdWWMZonwrcUbu2F qeGrnkia/aCwPTgmTyu9z/n2o6SH91gZ+Oo77CU7zqmdWwm+Gw+TUEg6yKA7gbCT5Tyl FKe98G9CF9EvbqigBnngsgFiw36vjU9jWMxAjUrhR8L+J3QHGURDLS0Ycc/t4aBY/GBY LKmUVr2tj+7jqIh3vr0O8FW57aAsW2zVj4nEFEdyiFw/AtO/azblMbf2veMkTL9eexl0 9O/rzUHzyVMmgh7Ith2J2x9hrAFGnVHPr+2dbTidn1W4DYDwwB+vtQ9rg7lCqyY8Y/wf zNRA== X-Forwarded-Encrypted: i=1; AJvYcCUuinDy64KUk8LkrSPD5by7pH6ICFBWCnw5P/4db12TltzFLtGqSLWnuzvySXJYVdBQM0VLKKV3tHelTAU=@vger.kernel.org X-Gm-Message-State: AOJu0Yw028BHDbRHK502C5clIcOw/5ZoAfAhPuaC6kdRC9UJ06rxNEs4 i184OjKUdiaLTEdr2xdcMd0kQ710THVsyCdWDlXAMQ6s+7Yq59nuDm8bwRNTGkdlhQ== X-Gm-Gg: ASbGncsYzdxeWyduujFGwx2DubXQ6PPV0hjQsRcnYv12X/cyKUcIOfb1cTrDw5BCvK1 a6fVEhSpNiTLTBdhpr2Z7d0WGfRGF3GZTS3GCYS/lbgctyYlTFwXp5ss7DeJMIu3M/a76yyKrbP r1grwsBxtMxtw4OqtPsO+YgkjajNfqis+Ko36k2sriSkXdUkNrRQf2ufqOg++lQG+DzS8sZiDPt 1noCm05r1PmDu4SS+rXC5geRCABY2B3fY5RL1f/7qiCv2qQlPzcM/Y02yoqjWRmO+we6m0PvlP5 0X1pgsySdmB/UxEQqsmdGss9oY4KpbEJR3N1fVkv5nI8905Fe97OPKATBRBFGKqrJS6t9cvxIrw /cnJLR7AXDWofhzAjyD5/mqXiXtqkRmq50Q3RpxSGow== X-Google-Smtp-Source: AGHT+IHSNhO5TwkGdfM9rWVrhKnKMpikCyF46rs9ZtD7y07NlXl7lvAuPvpPwbsqhlOXn7g3p/KjdQ== X-Received: by 2002:a05:6512:3e0d:b0:553:a8bb:7472 with SMTP id 2adb3069b0e04-553b6e8c40amr3461768e87.15.1750171353679; Tue, 17 Jun 2025 07:42:33 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ae234437sm1814992e87.53.2025.06.17.07.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 07:42:33 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 17 Jun 2025 14:42:23 +0000 Subject: [PATCH v7 2/5] media: Documentation: Add note about UVCH length field Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-uvc-meta-v7-2-9c50623e2286@chromium.org> References: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> In-Reply-To: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Guennadi Liakhovetski , Greg Kroah-Hartman , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 The documentation currently describes the UVC length field as the "length of the rest of the block", which can be misleading. The driver limits the data copied to a maximum of 12 bytes. This change adds a clarifying sentence to the documentation to make this restriction explicit. Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- Documentation/userspace-api/media/v4l/metafmt-uvc.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/userspace-api/media/v4l/metafmt-uvc.rst b/Docume= ntation/userspace-api/media/v4l/metafmt-uvc.rst index 784346d14bbdbf28348262084d5b0646d30bd1da..4c05e9e54683a2bf844ddf26f99= d0d9713ef05de 100644 --- a/Documentation/userspace-api/media/v4l/metafmt-uvc.rst +++ b/Documentation/userspace-api/media/v4l/metafmt-uvc.rst @@ -44,7 +44,9 @@ Each individual block contains the following fields: them * - :cspan:`1` *The rest is an exact copy of the UVC payload header:* * - __u8 length; - - length of the rest of the block, including this field + - length of the rest of the block, including this field. Please note= that + regardless of this value, for V4L2_META_FMT_UVC the kernel will ne= ver + copy more than 2-12 bytes. * - __u8 flags; - Flags, indicating presence of other standard UVC fields * - __u8 buf[]; --=20 2.50.0.rc2.692.g299adb8693-goog From nobody Thu Oct 9 13:19:07 2025 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 723E12DBF63 for ; Tue, 17 Jun 2025 14:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171361; cv=none; b=odhnsg3e+j9gkVXRK8oK9HoR35qjYK3HZBMy/3TrSUGjb4H8bkEPCvmMNekbdWpV5sasjL9IguSTN0OsUGqkGr0l5Aa7Hdfxq5Cac+9tPuGJ9zZnXrq16onxEDNVlkjfldqzQpkGUf/SkIty32/X4Rpw4aRn94moHFIsPwU6D6E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171361; c=relaxed/simple; bh=VUOlaRTP4eV8iVL8FnrRm8GJrgvq6sOIU/fSE8Vhe4Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=O36gn/K1EBKl/HlkmZAlCZKz+M17ioX6EOWHGkG71gox8RtjTjrT2mnYt28AMx5EjSGaWBBxESBN01bJSYZiWhjahsHj8/ZSU/weSMM5YMXdavRZQxIvaBih9pvwgcWiNxzKRyS/75QamD03O4xCna/pysgjJqr6+lPRjcDdGDI= 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=nMkrDL9b; arc=none smtp.client-ip=209.85.167.53 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="nMkrDL9b" Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-5535652f42cso5780793e87.2 for ; Tue, 17 Jun 2025 07:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750171354; x=1750776154; 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=0XZ3dPW1w4QCfr6i2hU3GgbqSe/1fko3hczMWWZK2cI=; b=nMkrDL9b9Aj7W8cXp2+ZfjIEl5ySuRlEw4JPa/03Y/hMzsdGfFCB/w8B8LbzxOM950 7qs9YofkJX+euJXtcvSirPTjpQMa03Qd5cXJA9zP+XvJ4htR27F7lsSHiwxcxD6JGu0Y MDdQYZgjeIsINT/VlnShBn/WM6YfJbzYMtiaY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750171354; x=1750776154; 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=0XZ3dPW1w4QCfr6i2hU3GgbqSe/1fko3hczMWWZK2cI=; b=OKF1wuMMqEhnvYAnwlXyuj7enXUMSDaa61dyj760M9lvX3lPffs9Ke3NWXPOFFRmEf KbNhMvOtPDZREssKupjB5m/OnOiJ3SuxablR48Wpr/eAsdPcdr+kyvGMEndaak3JUCHd I2Y+jofEoELucDvmsiGTSe6lpNLCm45EB9fabs689QAb46Eiaw3Ese1YUKePuOH6xofS 30EVjZ6Ypaz+6gCb9TIj6Ah3QRhpf8afjdoeZFamts7H1pyU5RK/wnwUPKJ9rBkrM8yw pK5ckt/9T3obho9TH6sWa8HjqweoNCQyOdLuYnQL3kd1DiLjN3xgRSPAUnZrsDNgrSFA 3jHg== X-Forwarded-Encrypted: i=1; AJvYcCVxWPuo0P994ATcv2JXuqIb2OZVQJJPUjt8FsBwjbJyHhjpwpGmBx1Jn0Y4MWAyWMvbpx5H4SZL5lvLibM=@vger.kernel.org X-Gm-Message-State: AOJu0YxKzhIIWC/utMPwk9zuVaSQG75sd4Tpa/7HCvQ2N1tKyYPbcmLw 0MkvZa5HXv7Yksv+C9jP19tnUsR0l0qFcIPDMs4IxyATUfVE2SKRJkylLjPbz4srJYnCJUUFdo6 sLz0= X-Gm-Gg: ASbGncvHxXSTtjbrjp4VCikTztEqrNubhRurwzyJ2B664fvcmkmKYtq361luTXq38sn VKb6oZqrSI/qVblKyRRlXdQea96rlat6EZBFH9JKYBvOIB+T3pDWEYhKpi1NibrgpZRkMkOlCKo KfMbVE8EeFe34oybJwEhsVnkL9L2vyuvI7DKvgsdMMlxbYLa55Z+7wvDL2gqjrTrFLiW/EvbeRq FCIYuxv8Ss/pdS68GAx/UROdNH53u8gmkmqooCvWlfo5M9hBuJwPPowVpMhTc88OrdNpsRz3+Xb pzmsOlPoX6SGLgEMiOngNcPM78xaT/pk/yQpdu2aZ/6g5d6dhme8xZWzlmAUhm+ayIjh32kxanZ N8tZ9fTyHQmjdVRsWWOrJ10e0GOGOHC3XSyxH+pitTQ== X-Google-Smtp-Source: AGHT+IG1sZuE/Nfhe9B34FOf/eWJmAMXL0Jv1BzWgBFgKFKiF4bV662uimtyRZWQUXOB9gPR6hlDog== X-Received: by 2002:a05:6512:3b9d:b0:553:37e7:867a with SMTP id 2adb3069b0e04-553b6f4d01bmr3097555e87.49.1750171354119; Tue, 17 Jun 2025 07:42:34 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ae234437sm1814992e87.53.2025.06.17.07.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 07:42:33 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 17 Jun 2025 14:42:24 +0000 Subject: [PATCH v7 3/5] media: uvcvideo: Introduce dev->meta_formats Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-uvc-meta-v7-3-9c50623e2286@chromium.org> References: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> In-Reply-To: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Guennadi Liakhovetski , Greg Kroah-Hartman , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 Right now, there driver supports devices with one or two metadata formats. Prepare it to support more than two metadata formats. This is achieved with the introduction of a new field `meta_formats`, that contains the array of metadata formats supported by the device, in the order expected by userspace. Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 7 ++++++ drivers/media/usb/uvc/uvc_metadata.c | 46 ++++++++++++++++++++++++++++++--= ---- drivers/media/usb/uvc/uvcvideo.h | 2 ++ 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc= _driver.c index 62eb45435d8bec5c955720ecb46fb8936871e6cc..9de5abb43e19d9e876cddc5d712= 4592953db89ac 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -2315,6 +2315,13 @@ static int uvc_probe(struct usb_interface *intf, goto error; } =20 + ret =3D uvc_meta_init(dev); + if (ret < 0) { + dev_err(&dev->udev->dev, + "Error initializing the metadata formats (%d)\n", ret); + goto error; + } + if (dev->quirks & UVC_QUIRK_NO_RESET_RESUME) udev->quirks &=3D ~USB_QUIRK_RESET_RESUME; =20 diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index 82de7781f5b6b70c5ba16bcba9e0741231231904..bc84e849174397f41d1e20bf890= a876eeb5a9c67 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -64,14 +64,20 @@ static int uvc_meta_v4l2_try_format(struct file *file, = void *fh, struct uvc_device *dev =3D stream->dev; struct v4l2_meta_format *fmt =3D &format->fmt.meta; u32 fmeta =3D fmt->dataformat; + u32 i; =20 if (format->type !=3D vfh->vdev->queue->type) return -EINVAL; =20 + for (i =3D 0; (fmeta !=3D dev->meta_formats[i]) && dev->meta_formats[i]; + i++) + ; + if (!dev->meta_formats[i]) + fmeta =3D V4L2_META_FMT_UVC; + memset(fmt, 0, sizeof(*fmt)); =20 - fmt->dataformat =3D fmeta =3D=3D dev->info->meta_format - ? fmeta : V4L2_META_FMT_UVC; + fmt->dataformat =3D fmeta; fmt->buffersize =3D UVC_METADATA_BUF_SIZE; =20 return 0; @@ -112,17 +118,21 @@ static int uvc_meta_v4l2_enum_formats(struct file *fi= le, void *fh, struct v4l2_fh *vfh =3D file->private_data; struct uvc_streaming *stream =3D video_get_drvdata(vfh->vdev); struct uvc_device *dev =3D stream->dev; - u32 index =3D fdesc->index; + u32 i; + + if (fdesc->type !=3D vfh->vdev->queue->type) + return -EINVAL; =20 - if (fdesc->type !=3D vfh->vdev->queue->type || - index > 1U || (index && !dev->info->meta_format)) + for (i =3D 0; (i < fdesc->index) && dev->meta_formats[i]; i++) + ; + if (!dev->meta_formats[i]) return -EINVAL; =20 memset(fdesc, 0, sizeof(*fdesc)); =20 fdesc->type =3D vfh->vdev->queue->type; - fdesc->index =3D index; - fdesc->pixelformat =3D index ? dev->info->meta_format : V4L2_META_FMT_UVC; + fdesc->index =3D i; + fdesc->pixelformat =3D dev->meta_formats[i]; =20 return 0; } @@ -174,3 +184,25 @@ int uvc_meta_register(struct uvc_streaming *stream) V4L2_BUF_TYPE_META_CAPTURE, &uvc_meta_fops, &uvc_meta_ioctl_ops); } + +int uvc_meta_init(struct uvc_device *dev) +{ + static const u32 uvch_only[] =3D {V4L2_META_FMT_UVC, 0}; + static const u32 d4xx_format[] =3D {V4L2_META_FMT_UVC, V4L2_META_FMT_D4XX, + 0}; + + switch (dev->info->meta_format) { + case V4L2_META_FMT_D4XX: + dev->meta_formats =3D d4xx_format; + break; + case 0: + dev->meta_formats =3D uvch_only; + break; + default: + dev_err(&dev->udev->dev, "Unknown metadata format 0x%x\n", + dev->info->meta_format); + return -EINVAL; + } + + return 0; +} diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 11d6e3c2ebdfbabd7bbe5722f88ff85f406d9bb6..502f1d5608637cd28ce6f01aee3= 1c4f5df160081 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -581,6 +581,7 @@ struct uvc_device { char name[32]; =20 const struct uvc_device_info *info; + const u32 *meta_formats; /* Zero-ended list of meta formats */ =20 atomic_t nmappings; =20 @@ -751,6 +752,7 @@ int uvc_query_ctrl(struct uvc_device *dev, u8 query, u8= unit, void uvc_video_clock_update(struct uvc_streaming *stream, struct vb2_v4l2_buffer *vbuf, struct uvc_buffer *buf); +int uvc_meta_init(struct uvc_device *dev); int uvc_meta_register(struct uvc_streaming *stream); =20 int uvc_register_video_device(struct uvc_device *dev, --=20 2.50.0.rc2.692.g299adb8693-goog From nobody Thu Oct 9 13:19:07 2025 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (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 C0B0D2DE1F6 for ; Tue, 17 Jun 2025 14:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171360; cv=none; b=CpzfkxwvPu+/nCcAcwxNp1WV4oh5mWxDyteuOP0gaIpvY50ent8mnoM7sUpLF4NaWrsTu6HusCY+4xWUnirRUSfLXJONIGSvz+qyQHBrMsxHD/lxAUA4d7xNM96MaDLltEJ4KWEtB1tp+Oa+CtX8D4kXoCQIraqIrdt8AmWbhiY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171360; c=relaxed/simple; bh=UAPmwt3iH+Cs9isdHcsBzKLNaOICZcEJlQI9RpiBp8k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VdczaSBY1HRTPu0TuTMzTHVOliR5NBOF4uR29EQweTOhygaqgU+7qH/FptMdwfOu4b0y0dcJSpjd0n9d9JfNXjM7+8JjPpykaXMFDgFasnUhq+1lCIOV+3s+eVQOsXk2TO+FQKK7PWBv3suM3iGImA+PexTBsKfubc+6ZIaN4Rk= 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=m62iDcO9; arc=none smtp.client-ip=209.85.167.51 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="m62iDcO9" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-553cf020383so526082e87.2 for ; Tue, 17 Jun 2025 07:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750171355; x=1750776155; 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=zlCjqI7FmvJseGiDys0Kb0VXecdhOxVjhLPyLYz33Ng=; b=m62iDcO945c6qcvtEjrr3OlbcuEGOBafiUm4NZopLRsRu/LZyzNLa2U7Zn6emsI3Qf SU48jV/MFbeGVDqmHAqut2oCzJ1lQVIvBOmP71fEVEkpCkWTpqG5HlMx3x5RjjBrjAqu ie1/kp8kGDgA74qkF8cpwvN+7dL/rGBtcHmMw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750171355; x=1750776155; 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=zlCjqI7FmvJseGiDys0Kb0VXecdhOxVjhLPyLYz33Ng=; b=M0J0pSCyxsXtcUwxXQf7/75YYDzBLfJSE6p4jo2eMUIvBG0W7AjKI4+xbIBpj4ZI/Y 1b8n4rrb/Uc2m93BzI9RespiPjXwzKYaEcVyeHAx+SatTB60nHyM7F5OqIkTc8x1Oh8w BjhkOEfjXuykYb7d/Z1w8uKmhVVxxutBgEGZLgc58oAofEKozkoNpWkjldaXCUrzwxpI JeiL5onvJWQ9s43JgabrfzVI03mt/1UcbxQNbKKkXWDLnF1jU40RXUQ8h/bYT7kMvME+ 9ky7YiK32Sn62kiEty0aO1rOcb+V1oHr2XbaV4hmfbQ9dMF05phiS/zBZrl+I+F4q10j Xixw== X-Forwarded-Encrypted: i=1; AJvYcCUR535H6TIYaOeJqxyDje1txJK2vsLWmDOT9H+NCvY+iz5mhF8SSW6APVYd9hGFO0nJaCm8k9owlrf2RGY=@vger.kernel.org X-Gm-Message-State: AOJu0YxTWxF4V4nLpTOhZrQG4YEVKbB64KxwOZRksWkca71WML5rM5Mb GS24tNGHTSBVve3AOBhCo1N4ChFXOhyJ4BdnKZSyc7E8WV7Pn7TISZH3fT3gl8lBHVaHvtt+6u1 sOfI= X-Gm-Gg: ASbGncv3XrDQN9VDO2sDpGXmTHQvRE/6f9jVbb7jQzyeIOulAjc/ST5gXpdHdrvSO4u SwRgen4ydE/9ZP8VX1XkN21wABDofyWnV9PVujDXpHjR6zrAUKCnQ3+aXJTRHjwwXSzCh5ZmSR1 CtuxEQGeJx07Ah1ctPOi03ulmSSz4DRT1y9Je+5O4wbtdNJpJ4U2F/JM2sW5yrP56vxLv5JLEkU vwE1G98eQXMFHCb3sC3XWEODpVujzCgYukPS4iIIMhg5cv3NuyCtAopRexaoI5WVcQcnzkJv3nv 0NwPQy+UbVJKRDowe5FQ7BO0MZpzKasqD61qhiSdivipLmgXKAiIxPF1neCnNHOSG+6qG80kpQV FikcehhMwOknrEC0Ktl/dtogdbS7/zQfPzlVh1EynrA== X-Google-Smtp-Source: AGHT+IFOa0lT9/wH7oPTGOZ5fZxCbtx/o8fZq1vWuxTWtxH1WDR/Km9QErrD0MqUbFwdVLk0JHfBOg== X-Received: by 2002:a05:6512:3b91:b0:553:2ef3:f73f with SMTP id 2adb3069b0e04-553b6e77063mr3653743e87.3.1750171354517; Tue, 17 Jun 2025 07:42:34 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ae234437sm1814992e87.53.2025.06.17.07.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 07:42:34 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 17 Jun 2025 14:42:25 +0000 Subject: [PATCH v7 4/5] media: uvcvideo: Introduce V4L2_META_FMT_UVC_MSXU_1_5 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-uvc-meta-v7-4-9c50623e2286@chromium.org> References: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> In-Reply-To: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Guennadi Liakhovetski , Greg Kroah-Hartman , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 The UVC driver provides two metadata types V4L2_META_FMT_UVC, and V4L2_META_FMT_D4XX. The only difference between the two of them is that V4L2_META_FMT_UVC only copies PTS, SCR, size and flags, and V4L2_META_FMT_D4XX copies the whole metadata section. Now we only enable V4L2_META_FMT_D4XX for the Intel D4xx family of devices, but it is useful to have the whole metadata payload for any device where vendors include other metadata, such as the one described by Microsoft: https://learn.microsoft.com/en-us/windows-hardware/drivers/stream/mf-captur= e-metadata This patch introduces a new format V4L2_META_FMT_UVC_MSXU_1_5, that is identical to V4L2_META_FMT_D4XX. Let the user enable this format with a quirk for now. This way they can test if their devices provide useful metadata without rebuilding the kernel. They can later contribute patches to auto-quirk their devices. We will also work in methods to auto-detect devices compatible with this new metadata format. Suggested-by: Hans de Goede Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- .../userspace-api/media/v4l/meta-formats.rst | 1 + .../media/v4l/metafmt-uvc-msxu-1-5.rst | 23 ++++++++++++++++++= ++++ MAINTAINERS | 1 + drivers/media/usb/uvc/uvc_metadata.c | 20 +++++++++++++++++-- drivers/media/usb/uvc/uvcvideo.h | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 7 files changed, 46 insertions(+), 2 deletions(-) diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Docum= entation/userspace-api/media/v4l/meta-formats.rst index bb6876cfc271e1a0543eee4209d6251e1a6a73cc..0de80328c36bf148051a19abe9e= 5241234ddfe5c 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst @@ -20,6 +20,7 @@ These formats are used for the :ref:`metadata` interface = only. metafmt-pisp-fe metafmt-rkisp1 metafmt-uvc + metafmt-uvc-msxu-1-5 metafmt-vivid metafmt-vsp1-hgo metafmt-vsp1-hgt diff --git a/Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst= b/Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst new file mode 100644 index 0000000000000000000000000000000000000000..dd1c3076df243d770a13e7f6d07= c3296a269e16a --- /dev/null +++ b/Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst @@ -0,0 +1,23 @@ +.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later + +.. _v4l2-meta-fmt-uvc-msxu-1-5: + +*********************************** +V4L2_META_FMT_UVC_MSXU_1_5 ('UVCM') +*********************************** + +Microsoft(R)'s UVC Payload Metadata. + + +Description +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +V4L2_META_FMT_UVC_MSXU_1_5 buffers follow the metadata buffer layout of +V4L2_META_FMT_UVC with the only difference that it includes all the UVC +metadata in the `buffer[]` field, not just the first 2-12 bytes. + +The metadata format follows the specification from Microsoft(R) [1]. + +.. _1: + +[1] https://docs.microsoft.com/en-us/windows-hardware/drivers/stream/uvc-e= xtensions-1-5 diff --git a/MAINTAINERS b/MAINTAINERS index e8f3dc93a56921924f57e7d5a03ea2fa182a4448..87101630e528297c57b22ffc2fe= 553e3864d25cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25816,6 +25816,7 @@ S: Maintained W: http://www.ideasonboard.org/uvc/ T: git git://linuxtv.org/media.git F: Documentation/userspace-api/media/drivers/uvcvideo.rst +F: Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst F: Documentation/userspace-api/media/v4l/metafmt-uvc.rst F: drivers/media/common/uvc.c F: drivers/media/usb/uvc/ diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index bc84e849174397f41d1e20bf890a876eeb5a9c67..b09f81d907d64f7d7a3b0dc52de= 319879b7e68be 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -190,13 +190,29 @@ int uvc_meta_init(struct uvc_device *dev) static const u32 uvch_only[] =3D {V4L2_META_FMT_UVC, 0}; static const u32 d4xx_format[] =3D {V4L2_META_FMT_UVC, V4L2_META_FMT_D4XX, 0}; + static const u32 all_formats[] =3D {V4L2_META_FMT_UVC, V4L2_META_FMT_D4XX, + V4L2_META_FMT_UVC_MSXU_1_5, 0}; + static const u32 ms_format[] =3D {V4L2_META_FMT_UVC, + V4L2_META_FMT_UVC_MSXU_1_5, 0}; + bool support_msxu; + + support_msxu =3D dev->quirks & UVC_QUIRK_MSXU_META; =20 switch (dev->info->meta_format) { + case V4L2_META_FMT_UVC_MSXU_1_5: + dev->meta_formats =3D ms_format; + break; case V4L2_META_FMT_D4XX: - dev->meta_formats =3D d4xx_format; + if (support_msxu) + dev->meta_formats =3D all_formats; + else + dev->meta_formats =3D d4xx_format; break; case 0: - dev->meta_formats =3D uvch_only; + if (support_msxu) + dev->meta_formats =3D ms_format; + else + dev->meta_formats =3D uvch_only; break; default: dev_err(&dev->udev->dev, "Unknown metadata format 0x%x\n", diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index 502f1d5608637cd28ce6f01aee31c4f5df160081..3578ce72fb6a1153ae79c244ec1= 0093e8efdd739 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -77,6 +77,7 @@ #define UVC_QUIRK_DISABLE_AUTOSUSPEND 0x00008000 #define UVC_QUIRK_INVALID_DEVICE_SOF 0x00010000 #define UVC_QUIRK_MJPEG_NO_EOF 0x00020000 +#define UVC_QUIRK_MSXU_META 0x00040000 =20 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core= /v4l2-ioctl.c index 650dc1956f73d2f1943b56c42140c7b8d757259f..ba508f7fb577021497009ab23a7= be5add23fd08c 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1459,6 +1459,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) case V4L2_META_FMT_VSP1_HGO: descr =3D "R-Car VSP1 1-D Histogram"; break; case V4L2_META_FMT_VSP1_HGT: descr =3D "R-Car VSP1 2-D Histogram"; break; case V4L2_META_FMT_UVC: descr =3D "UVC Payload Header Metadata"; break; + case V4L2_META_FMT_UVC_MSXU_1_5: descr =3D "UVC MSXU Metadata"; break; case V4L2_META_FMT_D4XX: descr =3D "Intel D4xx UVC Metadata"; break; case V4L2_META_FMT_VIVID: descr =3D "Vivid Metadata"; break; case V4L2_META_FMT_RK_ISP1_PARAMS: descr =3D "Rockchip ISP1 3A Parameters= "; break; diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 9e3b366d5fc79d8a04c6f0752858fc23363db65c..75f2096b2d4fed5e0235ea4732d= 35044ff77a98b 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -861,6 +861,7 @@ struct v4l2_pix_format { #define V4L2_META_FMT_VSP1_HGT v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car= VSP1 2-D Histogram */ #define V4L2_META_FMT_UVC v4l2_fourcc('U', 'V', 'C', 'H') /* UVC P= ayload Header metadata */ #define V4L2_META_FMT_D4XX v4l2_fourcc('D', '4', 'X', 'X') /* D4XX = Payload Header metadata */ +#define V4L2_META_FMT_UVC_MSXU_1_5 v4l2_fourcc('U', 'V', 'C', 'M') /* UVC= MSXU metadata */ #define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D') /* Vivid Met= adata */ =20 /* Vendor specific - used for RK_ISP1 camera sub-system */ --=20 2.50.0.rc2.692.g299adb8693-goog From nobody Thu Oct 9 13:19:07 2025 Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 367312CCDE for ; Tue, 17 Jun 2025 14:42:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171360; cv=none; b=rGUWheyh1+bCbwBuuItst04nmuTd1zOvbS82zx1nb+lZoPCZcGKJwUSgQef23BYkqWjXL13mbCH8pPCsTmYI7EcwLkuOpgtHj7PLLtolGPeq1oqb19UuV9EJkdF6LPTrd4UbyORN1wXfMzauy3WpIIim3NeqP4fZ33On/G5xl9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750171360; c=relaxed/simple; bh=J3RMIWij4olJIZvhHBis/MZpmxz342SGDI+rntvCR3E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KnJfXHKRxgk2kZo3jFQyxR10NqpJmRoctRrD2/qhyPjr1FfoEUgJtwyo0vNkgugU1anusvwzoS1t5QGafVTEZnhWhEyQkFvoPI9kwHbn8bNf33Jz2I30G4tfLgf7m28PCPh1Ef1Fhnhx1W2UilsYvEYE+rNdi3CloyGY8WovYmQ= 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=a4jBjP9f; arc=none smtp.client-ip=209.85.167.46 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="a4jBjP9f" Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-553644b8f56so5987647e87.1 for ; Tue, 17 Jun 2025 07:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1750171355; x=1750776155; 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=mwBKWLCDONZ1Mqgm0XmcqesVTqC7UAS+k/XRYW3pzKs=; b=a4jBjP9fsRF6nntaJwVgxMNYnAEKt2tgnqf+Y9opzaYtMNqL3Fd73zMctIdkzoae05 GUfrm6hER7ybG3bH2RfaCkAyr4j48tMHpKXcwSDJxlCK2acH7NNXMxAK0Zg/QGYB9DK+ y5hwHAof0BMgHD3AV/LxcXfX5V9vGfbChLXxY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750171355; x=1750776155; 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=mwBKWLCDONZ1Mqgm0XmcqesVTqC7UAS+k/XRYW3pzKs=; b=qXsZmLQocYJ5BFxIT08Dm1fmiA2BEZkfH8ehs57/ei53lYFtdrml+hQCgrOFq7T8Wg J/g3V4yyCNUADXe4uCM1n+JySr3cvP580DrU8i6PFLFPvnwkglrlya+X2fTVegHTxp0u gLLkXuG8uWKWdAiQraagOQh5v5FQeBsXn+UsaA7LUlhc78BlDs5ZDbfMUniJayr/lx4D Tql137uQndl02YSuBVJWa3EuttdTH6Kc9N1Sx+hjY8baMg8Tpqgjz6lZ5oXdcVLGjie8 4LtGUsgASH5AfZNJ/6A5VDwfuLRYgAN16JyYMy2f9pqE1Sv4g0ciKy+ovlGupKgcQQxB 35ww== X-Forwarded-Encrypted: i=1; AJvYcCX3Y0+Vwea/k2/PsldR1jByc7gY9ojHB18kAR7IHxjVBqr7E6E9y3yPWDHrfrDguKme0et5x8C6uuK/+oU=@vger.kernel.org X-Gm-Message-State: AOJu0YwP/9MdWnDeoCnucPR9AG/VIngTxfTk7QtamcVmxhZif6pmY4D9 5DHXSnv3YfSTw0XKQyHSB013KAuX7RbZvQ4oerJTse3ZpZjsfssBRfVi0i/7hpYfJw== X-Gm-Gg: ASbGncsO4knjJ2S9kEPM9SOK+DpKWKF2/6ivNXEXGgKbNQRuIJc14k7ghFwnXkCbMvD 8zA6dPanR20f1mcZvAEZknHCcp/8WgRpBI/rcf0igU0zuA42SLxFXcIsn7VuoOZ/hE/nMu4+2Bj hQG1euK4lpZHEoCry3a+SoP5TtqhVdH7CIb+qxMVsUULlcYGIItp918zEYQPOrQNrJJ/jL4WgEa Ju5plsqCArrSrL+9SrJkJ4WtsYYdVa28xyR/jG6AwwIobaNpT/SBnfa8FCExoq9pTz/Ru8KvQc6 A1cviXym8n9J8ht9qyz7anIKPMJbI0IDsw3IUv7xm0SMceMgq6lvKE5RZBj0kjvRthzCuRU+M38 0Uwbcu12FJEpRnw/Pii1UMyeYj25ISkRWjXcUx4D3Tw== X-Google-Smtp-Source: AGHT+IHTAtFnky+kYSniVlDKGuaCPlXNADAnSZ6a7R69ZvRqK5HmhgT/JD2sTazuhQ0dI0Lbnlp1+w== X-Received: by 2002:a05:6512:39c3:b0:553:23f9:bb3b with SMTP id 2adb3069b0e04-553b6f43089mr3171505e87.49.1750171354955; Tue, 17 Jun 2025 07:42:34 -0700 (PDT) Received: from ribalda.c.googlers.com (166.141.88.34.bc.googleusercontent.com. [34.88.141.166]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-553ae234437sm1814992e87.53.2025.06.17.07.42.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Jun 2025 07:42:34 -0700 (PDT) From: Ricardo Ribalda Date: Tue, 17 Jun 2025 14:42:26 +0000 Subject: [PATCH v7 5/5] media: uvcvideo: Auto-set UVC_QUIRK_MSXU_META Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250617-uvc-meta-v7-5-9c50623e2286@chromium.org> References: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> In-Reply-To: <20250617-uvc-meta-v7-0-9c50623e2286@chromium.org> To: Laurent Pinchart , Mauro Carvalho Chehab , Guennadi Liakhovetski , Greg Kroah-Hartman , Hans de Goede , Hans de Goede Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Ricardo Ribalda X-Mailer: b4 0.14.2 If the camera supports the MSXU_CONTROL_METADATA control, auto set the MSXU_META quirk. Reviewed-by: Hans de Goede Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_metadata.c | 71 ++++++++++++++++++++++++++++++++= ++++ include/linux/usb/uvc.h | 3 ++ 2 files changed, 74 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index b09f81d907d64f7d7a3b0dc52de319879b7e68be..5c3e0f8c5b720a2b962ae82470b= 836f870dc64b6 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -10,6 +10,7 @@ #include #include #include +#include #include =20 #include @@ -166,6 +167,71 @@ static const struct v4l2_file_operations uvc_meta_fops= =3D { .mmap =3D vb2_fop_mmap, }; =20 +static struct uvc_entity *uvc_meta_find_msxu(struct uvc_device *dev) +{ + static const u8 uvc_msxu_guid[16] =3D UVC_GUID_MSXU_1_5; + struct uvc_entity *entity; + + list_for_each_entry(entity, &dev->entities, list) { + if (!memcmp(entity->guid, uvc_msxu_guid, sizeof(entity->guid))) + return entity; + } + + return NULL; +} + +#define MSXU_CONTROL_METADATA 0x9 +static int uvc_meta_detect_msxu(struct uvc_device *dev) +{ + u32 *data __free(kfree) =3D NULL; + struct uvc_entity *entity; + int ret; + + entity =3D uvc_meta_find_msxu(dev); + if (!entity) + return 0; + + /* + * USB requires buffers aligned in a special way, simplest way is to + * make sure that query_ctrl will work is to kmalloc() them. + */ + data =3D kmalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + /* Check if the metadata is already enabled. */ + ret =3D uvc_query_ctrl(dev, UVC_GET_CUR, entity->id, dev->intfnum, + MSXU_CONTROL_METADATA, data, sizeof(*data)); + if (ret) + return 0; + + if (*data) { + dev->quirks |=3D UVC_QUIRK_MSXU_META; + return 0; + } + + /* + * We have seen devices that require 1 to enable the metadata, others + * requiring a value !=3D 1 and others requiring a value >1. Luckily for + * us, the value from GET_MAX seems to work all the time. + */ + ret =3D uvc_query_ctrl(dev, UVC_GET_MAX, entity->id, dev->intfnum, + MSXU_CONTROL_METADATA, data, sizeof(*data)); + if (ret || !*data) + return 0; + + /* + * If we can set MSXU_CONTROL_METADATA, the device will report + * metadata. + */ + ret =3D uvc_query_ctrl(dev, UVC_SET_CUR, entity->id, dev->intfnum, + MSXU_CONTROL_METADATA, data, sizeof(*data)); + if (!ret) + dev->quirks |=3D UVC_QUIRK_MSXU_META; + + return 0; +} + int uvc_meta_register(struct uvc_streaming *stream) { struct uvc_device *dev =3D stream->dev; @@ -195,6 +261,11 @@ int uvc_meta_init(struct uvc_device *dev) static const u32 ms_format[] =3D {V4L2_META_FMT_UVC, V4L2_META_FMT_UVC_MSXU_1_5, 0}; bool support_msxu; + int ret; + + ret =3D uvc_meta_detect_msxu(dev); + if (ret) + return ret; =20 support_msxu =3D dev->quirks & UVC_QUIRK_MSXU_META; =20 diff --git a/include/linux/usb/uvc.h b/include/linux/usb/uvc.h index bce95153e5a65613a710d7316fc17cf5462b5bce..ee19e9f915b8370c333c426dc1e= e4202c7b75c5b 100644 --- a/include/linux/usb/uvc.h +++ b/include/linux/usb/uvc.h @@ -29,6 +29,9 @@ #define UVC_GUID_EXT_GPIO_CONTROLLER \ {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03} +#define UVC_GUID_MSXU_1_5 \ + {0xdc, 0x95, 0x3f, 0x0f, 0x32, 0x26, 0x4e, 0x4c, \ + 0x92, 0xc9, 0xa0, 0x47, 0x82, 0xf4, 0x3b, 0xc8} =20 #define UVC_GUID_FORMAT_MJPEG \ { 'M', 'J', 'P', 'G', 0x00, 0x00, 0x10, 0x00, \ --=20 2.50.0.rc2.692.g299adb8693-goog