From nobody Mon Feb 9 11:07:26 2026 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 1115618B47D for ; Fri, 4 Apr 2025 06:37:41 +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=1743748663; cv=none; b=AFvWReAqSfrQMmS5mFzH6EQUL52Ip3PkJk/G+qqq2LtAW37ZoBV7kKICVJoBVrx7G8erZ1cgMch0p23NaL+ZR7dUrMcVbP6G1YBuoySoSdyCdFi95jCM/oP6h7L4aZsezEJ/pl5aDqkVTDXir81ZFH8VWdr0+mDzq2oLm47OB48= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743748663; c=relaxed/simple; bh=LA7uZ6q3Sc7Jg4Eh7U3qdrnVOUP1fZHPRdVwZ90iFbI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TCd7ofh7nt388v1FDyfKKWuld+5cyY1ZI4JTmXWpWDgieShSFD06QHhXadctwrQHCI7D/N7Yu4E0wVfqUDNbdbRRo0LtDv/HrBOlKqfwNxvSZj6xiIDtUkcZ7AxD0Bb6zedD6omFIorTGWmaHw4DoEKIMzSzdf6XFyvtLOLJa0c= 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=NIeRi6xn; 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="NIeRi6xn" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-54991d85f99so2784315e87.1 for ; Thu, 03 Apr 2025 23:37:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743748660; x=1744353460; 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=ptSauccsQCiihyTIqD40ILfoZlJ+Jkp9zzyDCujSkmg=; b=NIeRi6xnq+ksJZM2R04NrkUlmhUOKrvMke3LG2wVHbsUy7RW1P7S2URym4/VeI967W hFggjUZAha+FoIgaLKYcslvI1bhVmxNEgDCsKO+CuXWuUWtp3IoOFEHMvtERWygE5W3g 1S5OAF9h2C0IlhEZAVjM7M4KDnd2CsRsyaBVI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743748660; x=1744353460; 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=ptSauccsQCiihyTIqD40ILfoZlJ+Jkp9zzyDCujSkmg=; b=XLpRdkdGNtc66sAT777RoCD6R1DVS2bHjtfQymTsXQLONOvSFSXnhox1nESQ7P3sRO aH6W2KyjLnHnxECS/smJuZRAT3UxvDffbbY/oAZHhrGLls+IFdPtubq3SHt4HvJNd6WN 7TXKbrOOW8iB8GYtHJKJa9DXVhELkLBSaP6JzI9HXgkWhC/v6VxG2oHtyyS2Z9rQJ1JM HdBahqW46LEksoaefwoLkEVb6k+I3WMCSoqppRhsGBK7ZKboPX105+KVTpZH9uqXLWcZ kHLkG7dQSjN1kGyHDlM7jQDLeYc0H7rcPyB4VW6LF7Xt6HO8zfKCdqcYP9SqEpAOWOrm gbXQ== X-Forwarded-Encrypted: i=1; AJvYcCWzuFrQcRq5AOWNk1O83Ug13ALJv1rT7q2mC6p+8YSLPdgi7zPx3wr0lpWFgiGgWMwzAl54nFuAMEFcNSk=@vger.kernel.org X-Gm-Message-State: AOJu0YwPraiRYBtHseL9QA/tIHuOU53DurOuQ7Af3ZaxuVUAQ3wDbG/g QxrMW4qMB4kTBLIC2xcfZBw6Z6gBlvQRw52v2H0MmqWNGzpj8CHbLTucca+0Dw== X-Gm-Gg: ASbGncuXygpRCw56+C7wm94zgZxIq/WVgm+U5elhe8zn4CdGV0s+mcdrBm9dg1t8//D 60WZI/H3tYZnam8KoSW5GrPMuvOKOscUiZ6bWzairMlCcH14rn6M20KprPhBJ0F80hLBa3B5Rm7 UZQ1m+gcEW3Ti7giAKWYSU+chw1XxziX2udkLrzhbEdddLpE787cO0doYOdruuwAnbUdU2qVT9v WJ6iTTt2GdgaLECNGnfCrkp062wAgYok/Rpm9mrdm7DRXd8w3MdX4nBG6JIdf18vb/8cBxfndHF uNZrwVXEjeNKk8AYTWagOr56WrCQr81T3GMr+TPlO5XyHm8svwqIyYAI9m8EO1ADAha8QaxHP1j tAQnGZwI4pcWsODo7SESHbWXd X-Google-Smtp-Source: AGHT+IFe0yc7cU3i1TuFDXhwgGxvVCCEnVSWjWSy8bq9xJ+B6v2LXYpgvddwkI0CUCf2TzgjhXvGGg== X-Received: by 2002:a05:6512:1281:b0:545:a70:74c5 with SMTP id 2adb3069b0e04-54c225d560cmr612312e87.13.1743748658431; Thu, 03 Apr 2025 23:37:38 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e672444sm338275e87.251.2025.04.03.23.37.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 23:37:37 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 04 Apr 2025 06:37:34 +0000 Subject: [PATCH v5 1/4] 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: <20250404-uvc-meta-v5-1-f79974fc2d20@chromium.org> References: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> In-Reply-To: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@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") Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede Reviewed-by: Laurent Pinchart --- 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 e3567aeb0007c1f0a766f331e4e744359e95a863..b113297dac61f1b2eecd72c36ea= 61ef2c1e7d28a 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c @@ -1433,12 +1433,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 @@ -1459,6 +1453,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.49.0.504.g3bcea36a83-goog From nobody Mon Feb 9 11:07:26 2026 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (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 8947F18EFD4 for ; Fri, 4 Apr 2025 06:37:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743748666; cv=none; b=eXY2r3PkvcuUhts4gtTpSx2nGbDSNXfOJxAMYhF7xoP6rIf8TWste8xbeMFqyBsZYHprKj+k1XFRqCFCP3LfD12yOUxtP2No5UyfuNyV+tPRLgpySczVZIsyWzC8VnRkwY0CmdR1HmPK2aMP9OAahyfdniMP9xBWk8tAXzAJt9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743748666; c=relaxed/simple; bh=A+EYzZLGQHIPJ5VAoM/+3fe53Af6CgodqviiAM/ONBM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LOkq1AKqJTVs637+LFYEDiA80A0iPRYdOY5y5QxCmQgGdnsjBtlPFEZAI2KRntpNYtYEzNu1irypbAuwH1SRhwGrkq+i8EHYzk7bbpHT81/Yj+W67U/8zqPy/1zDGo2i6Gva2+3aCV5rJ3MKwHgzjENiax0nZKg+Af2s57N0khA= 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=SuJ/HdOA; arc=none smtp.client-ip=209.85.208.170 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="SuJ/HdOA" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-30bee278c2aso29076661fa.0 for ; Thu, 03 Apr 2025 23:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743748662; x=1744353462; 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=uAivlvh8Vrg1UGAUIkAMwQONWXUXc2TvgNk5knB4y0c=; b=SuJ/HdOAi0xoPXS9rZe+WQUKD8sk6tvc60gxsdCvKk6yPyRLSIriLfMCYqg4Pj5QCk bRBW8dADviYbrFIXdIk4B4pfV60J/Iya7N81NGyV6cqaVM3rPuDVWu0owhzQrEN0AfaZ mgs2n3FNuXkaStTViPf0gEZOm9Kty5v1kr11Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743748662; x=1744353462; 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=uAivlvh8Vrg1UGAUIkAMwQONWXUXc2TvgNk5knB4y0c=; b=oYWj3P40oOPN66mpc43qRsX4jUb4tPK89516vUdsA40tptdq08eAmiSUchelqVXOgK tc9ne9Dwky/K8o8gawugki2zwyHSgjjKwJYObMm5JDPv5lAPVHbOXvR0/Dznsl99qZ6i JdJzIqUkL9A/4WKhaiFaLPTOoACJyVaiajeoUsmCi8PewygodDkbt/EGpC05ECTCUCip W2yiSCs8bPUux+OZi0a8EVSgKH1M75XMahZ5fBOKmEsJ+iy1jR2Ng1EhYkH2EhRR7aBX gUVKS+9SMgRDHEgxA2zVpZHoRoSbCC/WNTdgN792uDLj/XqU6mjRq+omTK3x1jT87f4R Vd7A== X-Forwarded-Encrypted: i=1; AJvYcCW2xnK6wwwaSml42Gf0uMZhhnQuFAo1tVyFnABT7YMdlKf+lMe4hThdHVdYVbGZuCjkPKcZRJvLlTlQbHM=@vger.kernel.org X-Gm-Message-State: AOJu0YyEz3S62dRSAdhPAwqr/1zgN53mvtNv61tSPXIeU1A6RT+6KbK+ MvejLdENdF86aFYiVj9EntF4TfgcDJ+RMjairMgRHZUFeICVvshRjTsRTZFQZGtbZtc2d+C7G34 = X-Gm-Gg: ASbGncuoAW2ENMqlnEl17AOvdEL/wHtJ+XeIvnPcBJkbe/vcgZzSlL5sOaIjKTUO1MW EBvcjyVxrE430DexzvrBwEQuEf7NtuotZBs+HWgX2FRTzubKCdibVTyxaDQUi9YUduut5SFvvg6 f0zMNnT3rpzrq+5Pq0Owxzp9kG7MzzVEpU6J0aNkl+csBtNXpBSoi88tQmJkHjaA3WUcRbIwsFs Q0jPI2nfw3vdVZPbsItY9NHLteflNX1k8GS663n+GOL5ccWsn6ykW2/Pgy9BbiJ/Kf7McPkk3sH lx/c6/9XkkxQYcxXWmpSVKr/z8RAdm2IJPgyP9DVvjRLWAX6g1peyjFIf5AXX0zbjGsO+rHIN3o gAtV0PIsjvEQQLiTlLJwL0LI3fbN01YRUrvU= X-Google-Smtp-Source: AGHT+IF/wt1Uxur7keuKQbSIAvPFmsIoQlSPiqbrU44NDcgTLn1iSIA3tNK/AaEw+pgVlogdaFQe2w== X-Received: by 2002:a05:6512:3501:b0:545:4ca:d395 with SMTP id 2adb3069b0e04-54c225afc3fmr610345e87.2.1743748659727; Thu, 03 Apr 2025 23:37:39 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e672444sm338275e87.251.2025.04.03.23.37.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 23:37:38 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 04 Apr 2025 06:37:35 +0000 Subject: [PATCH v5 2/4] 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: <20250404-uvc-meta-v5-2-f79974fc2d20@chromium.org> References: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> In-Reply-To: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@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. Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede --- 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..42599875331c0066cf529153cac= cb731148023b9 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 the this value, for V4L2_META_FMT_UVC the kernel will + never copy more than 2-12 bytes. * - __u8 flags; - Flags, indicating presence of other standard UVC fields * - __u8 buf[]; --=20 2.49.0.504.g3bcea36a83-goog From nobody Mon Feb 9 11:07:26 2026 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 5EDB818DB37 for ; Fri, 4 Apr 2025 06:37:44 +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=1743748666; cv=none; b=NESPIuJjHaO3Lr/GeNJi71oku64M4dKQhATxvu+NRHfo/w6k8MRS8QKZnL8LQ/eXLrOaI0QiZBr8O8djNcfDP1Il1UI6t137EunQQ+/EbkLUYUEXVLC/bq6NB+5KItfVzu/v7Mndljt45c/prHXZKr3nxj3KWFskOf4G5eLRM7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743748666; c=relaxed/simple; bh=b7Zu7FXe5Yk8VGSP7zeuJTUbCpv87TetJKqJT0JTgig=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=B9naMOc9t2I9YZh4w7HzvdDHlbrPrr1eg0eNGiKz8ho+FaQqdUAvkB4MsE4l8e+Wk2SJ16rFwrxgaKwvHWTHCJQO/+vrEWmEPpNlQ7FZYk8i4g9NQLB/uie08ZhhFlNFuHOIo9l9DcWdylfEU0ZT6s/CUxSzjA7QeiDDMZ8GLng= 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=aN/WiZmE; 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="aN/WiZmE" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-549b159c84cso2042038e87.3 for ; Thu, 03 Apr 2025 23:37:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743748662; x=1744353462; 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=Yet+7EChC7n/+00JGsTh9/MSwH5sjxZLzKQLC8/d9K0=; b=aN/WiZmEVo6lxXUGqzzyylI5g+hYTIvUE+dg47VWflEizIzvNT3gtDXUOTGdMUe5gd vz3tdi7ygi5s3yroc9E4rScgYDhjaq43uXW74ulW1RSmpQybLUl7yAKxtQkyE17h1qTT QfpviigFrMCTqszWrd6pdjpt+uD1OVcwIdVjw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743748662; x=1744353462; 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=Yet+7EChC7n/+00JGsTh9/MSwH5sjxZLzKQLC8/d9K0=; b=U8iyutiRh0tp7xJKdVP4GCuPMrhzuToFDLJAfZNfk2waD3n8JPAYfH/n7Ye7xKSrMU 4J+mpw+fW7OCLXuJHdUpjpjvHd9OwpEtupGy5zVUiHNuoW251tmJOh0ZkHByOXnfq6ib 8xjfHNUlDpgpF+NpQth2G4jMxhiQGe7HOOTbNQrjo5I9A+eHaHsjsm/skBuoTBZbfSbm g5t+XxEnp+LwaxSiQ59+b3k/XDSNP9SRI9iTRcsWTQ4Txqvv61ZwIG3dVBBlfmlnuaw/ zz7rEMGJEmUXybrEqva4hIzJYPjzOUurBzXHUMliwJuFbdC5sl/lOgcMEKJgNTP1n0Y1 J1Dg== X-Forwarded-Encrypted: i=1; AJvYcCXooqQjR/SwOj3Wm7UrxxV/+1aH7Cmt3nPWrnx94F3lnRp8bnLkbQOHOCbahYk5F7HTeIJT5hzSeRedZ4o=@vger.kernel.org X-Gm-Message-State: AOJu0YwxgibMXNjmcIUQxJg58yXwNafCMbZlH7wvWSJ8vFNF79zzallT ZPP8/BSlR239BUkeFS24+K/flnZKTiqdSZSjCEzvRXS7F0yUI5ipL0Ws2OOFzw== X-Gm-Gg: ASbGncsnCWMC8w2ZUt15s8nF1xhQJbqfwlCH/RQkix8bxaputnjwvx+HO2shX3QjtS1 6R8dEqYmd80i0zEpwdirpiHq0dxqwNJO4s7Ai4ET0ueYuFs3tlmiueHiFQ258Gqpm2tQOXKIr0w Nog5iQjESjGeh5Gxj86vBVsTV2FldKCHPzSNvhLwkur4D1cwmscYYIF2hAt8dGGGJ9AMP7reyMU CctH23NDaOT5AYd2b8zM0CQpULGPTAwTapWadzcpIhpaKjpktgyXNFIEE+ybdshirQf9B3o+quX i2GN8o2+kUXqmcMS/ChtI6qjDwyW4b6ZZdsvkFSnMrAbXFOrQqUba/asEqJdaLnzcFr/+7OZ0RD IXyl12C1HzRc5rKw2BbyvPMzM X-Google-Smtp-Source: AGHT+IEaIXZCTW3rwp+tjJpUHC5vgWNe4ojs3y5woCDSlLDDC7F6zt9didrHAHJIBVs7/ngkZEewng== X-Received: by 2002:a05:6512:3e03:b0:54b:117c:1354 with SMTP id 2adb3069b0e04-54c22808e8bmr472555e87.54.1743748662450; Thu, 03 Apr 2025 23:37:42 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e672444sm338275e87.251.2025.04.03.23.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 23:37:41 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 04 Apr 2025 06:37:36 +0000 Subject: [PATCH v5 3/4] 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: <20250404-uvc-meta-v5-3-f79974fc2d20@chromium.org> References: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> In-Reply-To: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@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 section 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. For now, flag this format with a new quirk. Suggested-by: Hans de Goede Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede --- .../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 | 43 ++++++++++++++++++= +--- drivers/media/usb/uvc/uvcvideo.h | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + include/uapi/linux/videodev2.h | 1 + 7 files changed, 65 insertions(+), 6 deletions(-) diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Docum= entation/userspace-api/media/v4l/meta-formats.rst index 86ffb3bc8ade2e0c563dd84441572ecea1a571a6..4de0d094e0702068be0c5915445= 8c9dfecbfe28d 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst @@ -19,6 +19,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..e6f95a88c0ff061df0b066b12ce= fc30f946b60aa --- /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, not just the first 2-12 bytes. + +For more details check the documentation 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 306b1384eb6d4cb7a310ada44605eaeb88cc732f..a07ed31ab057b98cf801d919b5b= bec5ee334c9ac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -25059,6 +25059,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 82de7781f5b6b70c5ba16bcba9e0741231231904..fe2678fc795d7fd5a64e8113199= 012f34c419176 100644 --- a/drivers/media/usb/uvc/uvc_metadata.c +++ b/drivers/media/usb/uvc/uvc_metadata.c @@ -63,15 +63,21 @@ static int uvc_meta_v4l2_try_format(struct file *file, = void *fh, struct uvc_streaming *stream =3D video_get_drvdata(vfh->vdev); struct uvc_device *dev =3D stream->dev; struct v4l2_meta_format *fmt =3D &format->fmt.meta; - u32 fmeta =3D fmt->dataformat; + u32 fmeta; + + if (fmt->dataformat =3D=3D dev->info->meta_format) + fmeta =3D dev->info->meta_format; + else if (fmt->dataformat =3D=3D V4L2_META_FMT_UVC_MSXU_1_5) + fmeta =3D V4L2_META_FMT_UVC_MSXU_1_5; + else + fmeta =3D V4L2_META_FMT_UVC; =20 if (format->type !=3D vfh->vdev->queue->type) return -EINVAL; =20 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; @@ -106,6 +112,27 @@ static int uvc_meta_v4l2_set_format(struct file *file,= void *fh, return ret; } =20 +static u32 uvc_meta_idx_to_fmeta(struct uvc_device *dev, u32 index) +{ + switch (index) { + case 0: + return V4L2_META_FMT_UVC; + case 1: + if (dev->info->meta_format) + return dev->info->meta_format; + if (dev->quirks & UVC_QUIRK_MSXU_META) + return V4L2_META_FMT_UVC_MSXU_1_5; + return 0; + case 2: + if (dev->info->meta_format && + dev->quirks & UVC_QUIRK_MSXU_META) + return V4L2_META_FMT_UVC_MSXU_1_5; + return 0; + } + + return 0; +} + static int uvc_meta_v4l2_enum_formats(struct file *file, void *fh, struct v4l2_fmtdesc *fdesc) { @@ -113,16 +140,20 @@ static int uvc_meta_v4l2_enum_formats(struct file *fi= le, void *fh, struct uvc_streaming *stream =3D video_get_drvdata(vfh->vdev); struct uvc_device *dev =3D stream->dev; u32 index =3D fdesc->index; + u32 fmeta; + + 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)) + fmeta =3D uvc_meta_idx_to_fmeta(dev, fdesc->index); + if (!fmeta) 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->pixelformat =3D fmeta; =20 return 0; } diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvi= deo.h index b4ee701835fc016474d2cd2a0b67b2aa915c1c60..123446683e22589f23b5228a002= 40e54f00ae6f1 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 a16fb44c7246e35f3710306fde5dfc15329b4d95..12f1232e5ca3acdefede8f9751f= 9e7191eeae58b 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1457,6 +1457,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 c8cb2796130f8d1b864d669267d2b31f73b839aa..0cf6885a5dc8752326bd10a893d= 5d09d47993c21 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -851,6 +851,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.49.0.504.g3bcea36a83-goog From nobody Mon Feb 9 11:07:26 2026 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 8DBE5191F6A for ; Fri, 4 Apr 2025 06:37:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743748667; cv=none; b=TUsN18Tao/zr8JNnwcyyPEsvkWb+rGsihBC8N9Mdi/aM2RIe8gC62JkA5/SGabDso3rQtrah3qhkE8PM56e5ABZXXPatdYSayMhd1cFooD1AZtTrK9KkPMHXeCZXiPTI398Z5R/Diq/29m76QLYMPhOp1afjgXShMtkvTIkF/ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743748667; c=relaxed/simple; bh=+KkdZxdqvHIlFaUxnw0T/2vUmNZjxcvggpVmgCAVYT0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gLBGPynJ85fPRY4ehtk4YOjFoBW8EMjAS4NgSrg7JOiVpmTEhz5Wpfq1jmovfqsJq8favCBMvcOXenphQbCbT/mFebyrLUbvJJNv9393mww9jgul1dDs5wnrynBqIfqA1w+FbGYXfSpfXec5HWgz7uD8JfuZpj6FcUodZeowxJQ= 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=Ivw09rEs; arc=none smtp.client-ip=209.85.167.42 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="Ivw09rEs" Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-54b0d638e86so1920185e87.1 for ; Thu, 03 Apr 2025 23:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1743748664; x=1744353464; 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=jfKei41NeiW8d42lUMUhoCILXY12OhST2R+tJl7Txyg=; b=Ivw09rEsNhTPbGfMN+6Geejw3Q802OsZA1khp0IBkRAmpKdoAmk2HFu3eldwrvCX/R dCoUrZDs/g/Rz7lIvc8N9w/CxUqgNlmyJCZfNnVBkvRX6fqIZm/OYHQqm/PGtEZwyynF 0cWFp36qnWUrTFHtBv14OdYQOaak+BKZUA59Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743748664; x=1744353464; 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=jfKei41NeiW8d42lUMUhoCILXY12OhST2R+tJl7Txyg=; b=oYNO5fm1gt1OlsB+DqUyapkeSOPJyszP6a6Y0Yt6y3Gb/qjg/8ODsjAvM6UPQ4CPNm vVrDGIVy0GhEfB677EDvFfHRhHjwFF65dQkR/g17RPr+JAxfQ3nMjl4QZBBD6p/bJ4oz AXJavTp1/6aUsdFHalMR5M38mStNRoDItMJz8o6SYQRrPvdePDP83/2JWGKjgqCMQXXf HQkdsCaGP4mh3P0Z+YZejlvloQw1kJTM9nFskn2lSIcrSHd636NHgpz5YLlSq22T/GhX lUnImUrSx3QBxjR/6R+w7N/7VsaATe7n2jUp9vKLqFSPYOf1oKLlClf2oseaEUqlO27W vggw== X-Forwarded-Encrypted: i=1; AJvYcCUJfhZLjdPpDcU/J4U+wfDB0LJwvNgKSTfRXaMT+GaI6Tuw3vgAF3erPBwTeDMU/8rFwGjbfjGA1rTh6qw=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+kdTqD9xe/4NFlGgCp360oHxumUScPuVAfyryJpPA1LXQ7Taz hO0J+F0+/2yT97m6nMYHnclZWNoTOjajd5ckNxAaSBrg4/bId/afeKZ9PBZgLQ== X-Gm-Gg: ASbGncuJ+hverge5FX45Zk6avVmJCkiiZnblPg+7BbGvQfAqrxeQeby2gDgU59vhHuM JJ6uWUIhUCwU1E45QSKjtjuJjRZB2BSpzB/h+vOYM/AbjgbsRXZ9az7msbE2EqBJRuccQcvSscQ d+m+sjPjO1CmHh53aZiWp1d2qLxhddmoprCJxXth4eiCg6ZOyz9nIuFd+Wl+gHev1dlgiR60o0/ 1WdOeDgUm0xPF01WSOBRbahyDCkyVMF2x2Wkq8O5C75G0+MtSq4NHtzLh6HnE+7RYd6Df2cyaw6 CFCyNendZHcLMtaf6kJ5aiYYS6HSSFPluUaSlTmkRD1+xBaQd6NqYX1aR/jSLvKlfSqcKgG/dRq /ntNfiWMqfKOTwUsL1DTYAdXm8NdVqKYkUm4= X-Google-Smtp-Source: AGHT+IGiEq5HAfK9gznqpOik3UfipLmtacM6oeNSqlOetaI/lji+MiW2P1IKEgszzXgZO7Lyb2+qvQ== X-Received: by 2002:a05:6512:3da1:b0:545:2871:7cd5 with SMTP id 2adb3069b0e04-54c22776fc6mr564255e87.15.1743748663628; Thu, 03 Apr 2025 23:37:43 -0700 (PDT) Received: from ribalda.c.googlers.com (216.148.88.34.bc.googleusercontent.com. [34.88.148.216]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c1e672444sm338275e87.251.2025.04.03.23.37.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Apr 2025 23:37:42 -0700 (PDT) From: Ricardo Ribalda Date: Fri, 04 Apr 2025 06:37:37 +0000 Subject: [PATCH v5 4/4] 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: <20250404-uvc-meta-v5-4-f79974fc2d20@chromium.org> References: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> In-Reply-To: <20250404-uvc-meta-v5-0-f79974fc2d20@chromium.org> To: Laurent Pinchart , Hans de Goede , Mauro Carvalho Chehab , Guennadi Liakhovetski Cc: linux-media@vger.kernel.org, linux-kernel@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. Signed-off-by: Ricardo Ribalda Reviewed-by: Hans de Goede --- drivers/media/usb/uvc/uvc_metadata.c | 54 ++++++++++++++++++++++++++++++++= ++++ include/linux/usb/uvc.h | 3 ++ 2 files changed, 57 insertions(+) diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/u= vc_metadata.c index fe2678fc795d7fd5a64e8113199012f34c419176..776d280f34afad515594a873acf= 075acf0438304 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 @@ -187,11 +188,64 @@ static const struct v4l2_file_operations uvc_meta_fop= s =3D { .mmap =3D vb2_fop_mmap, }; =20 +static const u8 uvc_msxu_guid[16] =3D UVC_GUID_MSXU_1_5; + +#define MSXU_CONTROL_METADATA 0x9 +static int uvc_enable_msxu(struct uvc_device *dev) +{ + u32 *data __free(kfree) =3D NULL; + struct uvc_entity *entity; + + list_for_each_entry(entity, &dev->entities, list) { + int ret; + + if (memcmp(entity->guid, uvc_msxu_guid, sizeof(entity->guid))) + continue; + + if (!data) + data =3D kmalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + ret =3D uvc_query_ctrl(dev, UVC_GET_CUR, entity->id, + dev->intfnum, MSXU_CONTROL_METADATA, + data, sizeof(*data)); + if (ret) + continue; + + if (*data) { + dev->quirks |=3D UVC_QUIRK_MSXU_META; + return 0; + } + + ret =3D uvc_query_ctrl(dev, UVC_GET_MAX, entity->id, + dev->intfnum, MSXU_CONTROL_METADATA, + data, sizeof(*data)); + if (ret || !*data) + continue; + + 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; + } + } + + return 0; +} + int uvc_meta_register(struct uvc_streaming *stream) { struct uvc_device *dev =3D stream->dev; struct video_device *vdev =3D &stream->meta.vdev; struct uvc_video_queue *queue =3D &stream->meta.queue; + int ret; + + ret =3D uvc_enable_msxu(dev); + if (ret) + return ret; =20 stream->meta.format =3D V4L2_META_FMT_UVC; =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.49.0.504.g3bcea36a83-goog