From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55415C433DB for ; Mon, 21 Dec 2020 18:26:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 17FAE22D08 for ; Mon, 21 Dec 2020 18:26:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726630AbgLUS0Y (ORCPT ); Mon, 21 Dec 2020 13:26:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725785AbgLUS0Y (ORCPT ); Mon, 21 Dec 2020 13:26:24 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CCF0C0613D3 for ; Mon, 21 Dec 2020 10:25:43 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id 190so10766699wmz.0 for ; Mon, 21 Dec 2020 10:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C/fCz+ZBoSHS5SlHs6JCakf/TmcPwilk8kMtlWo97qo=; b=Yx/8lnR3YJEPedRdD4WXM1N4zDjp7wCJXAncjrg5mCb+/lgXSpzGIK6Vs001/yYtyS Z9VPPh9Lrof/xY+p5Yq92by9DtsDnj3mITJSnP54geGELxtA8mSVjreFMLvZbgRqOT7Q YdaHGXGbQxlXlP2ZV22NDmM4d9zRYH+olA55E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C/fCz+ZBoSHS5SlHs6JCakf/TmcPwilk8kMtlWo97qo=; b=O8Mrfgdd0lUEcTQCxQLX4wy6F8srOFgpPhTsAt53bbF6Z+IShJZqYF28krc4ZlRUOI V99MO5DWMqWLWpL38xiVB0KuhL+vp1aUZZvrayXkPyf56yyA7Ikp1DzmoMG8ui1uxCX7 mlL84x6nCW5wd2LPo+k0pNO1HLRRXWciQ+APEzxL0Zv/TOiNWhyq48oKkpg6DY+4omDV EY8nJ2GAbwijruJeUsREUldzrFHVid6d2fc3eZsq/XYuRm3+8XIhQgNLXn1QKy/WYbGS 55qa16GodrSJ5SowKu6BhIRfdVf5txOQ3v8QJJDJhhAK9rd23OdSibZ0odOs+w03DzKn DtYw== X-Gm-Message-State: AOAM530fMoiW/Fb4R9mqWhLoyDR8NMw82/2Z41xdMBOhJTpxXhPqymUZ qTGPltRRKIIvSkNRzlnPLPbXI97CtiOBRiobHyg= X-Google-Smtp-Source: ABdhPJwXa9XbLaOrRa6Tqd+Zxgqg4IJ134jEXJs5XnKRWVszI8I1lh+68ZJw2lzxCA9TfAnFpmk+hw== X-Received: by 2002:a1c:186:: with SMTP id 128mr17543418wmb.176.1608569305103; Mon, 21 Dec 2020 08:48:25 -0800 (PST) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id o125sm24581109wmo.30.2020.12.21.08.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Dec 2020 08:48:24 -0800 (PST) From: Ricardo Ribalda To: Laurent Pinchart , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Subject: [PATCH v5 04/12] media: uvcvideo: Allow extra entities Date: Mon, 21 Dec 2020 17:48:11 +0100 Message-Id: <20201221164819.792019-5-ribalda@chromium.org> X-Mailer: git-send-email 2.29.2.684.gfbc64c5ab5-goog In-Reply-To: <20201221164819.792019-1-ribalda@chromium.org> References: <20201221164819.792019-1-ribalda@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Increase the size of the id, to avoid collisions with entities implemented by the driver that are not part of the UVC device. Entities exposed by the UVC device use IDs 0-255, extra entities implemented by the driver (such as the GPIO entity) use IDs 256 and up. Reviewed-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_driver.c | 2 +- drivers/media/usb/uvc/uvcvideo.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index bfbc5a4d4ca6..82cdd1bb28dc 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1024,7 +1024,7 @@ static const u8 uvc_media_transport_input_guid[16] = UVC_GUID_UVC_MEDIA_TRANSPORT_INPUT; static const u8 uvc_processing_guid[16] = UVC_GUID_UVC_PROCESSING; -static struct uvc_entity *uvc_alloc_entity(u16 type, u8 id, +static struct uvc_entity *uvc_alloc_entity(u16 type, u16 id, unsigned int num_pads, unsigned int extra_size) { struct uvc_entity *entity; diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 0a3404091665..5d4da54dfd13 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h @@ -301,7 +301,12 @@ struct uvc_entity { * chain. */ unsigned int flags; - u8 id; + /* + * Entities exposed by the UVC device use IDs 0-255, extra entities + * implemented by the driver (such as the GPIO entity) use IDs 256 and + * up. + */ + u16 id; u16 type; char name[64]; u8 guid[16]; -- 2.29.2.684.gfbc64c5ab5-goog