From patchwork Thu Jun 17 17:16:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 12328967 X-Patchwork-Delegate: kieran@bingham.xyz 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE,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 58C34C48BE5 for ; Thu, 17 Jun 2021 17:15:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C2A0613BF for ; Thu, 17 Jun 2021 17:15:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232245AbhFQRRn (ORCPT ); Thu, 17 Jun 2021 13:17:43 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:38287 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232176AbhFQRRn (ORCPT ); Thu, 17 Jun 2021 13:17:43 -0400 Received: (Authenticated sender: jacopo@jmondi.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id E0F10E0003; Thu, 17 Jun 2021 17:15:33 +0000 (UTC) From: Jacopo Mondi To: Hans Verkuil Cc: Jacopo Mondi , linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [RFC 1/4] media: v4l2-subdev: Introduce post_register() core op Date: Thu, 17 Jun 2021 19:16:08 +0200 Message-Id: <20210617171611.80542-2-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617171611.80542-1-jacopo+renesas@jmondi.org> References: <20210617171611.80542-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Introduce the post_register() subdevice core operation. The operation is meant to be called after the subdevice has been registered. Signed-off-by: Jacopo Mondi --- include/media/v4l2-subdev.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index d0e9a5bdb08b..6925dc2f69ac 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -184,6 +184,8 @@ struct v4l2_subdev_io_pin_config { * for it to be warned when the value of a control changes. * * @unsubscribe_event: remove event subscription from the control framework. + * + * @post_register: called after the subdevice has been registered. */ struct v4l2_subdev_core_ops { int (*log_status)(struct v4l2_subdev *sd); @@ -209,6 +211,7 @@ struct v4l2_subdev_core_ops { struct v4l2_event_subscription *sub); int (*unsubscribe_event)(struct v4l2_subdev *sd, struct v4l2_fh *fh, struct v4l2_event_subscription *sub); + int (*post_register)(struct v4l2_subdev *sd); }; /** From patchwork Thu Jun 17 17:16:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 12328965 X-Patchwork-Delegate: kieran@bingham.xyz 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE,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 4391BC49EA3 for ; Thu, 17 Jun 2021 17:15:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F145608FC for ; Thu, 17 Jun 2021 17:15:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232255AbhFQRRo (ORCPT ); Thu, 17 Jun 2021 13:17:44 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:38743 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231864AbhFQRRo (ORCPT ); Thu, 17 Jun 2021 13:17:44 -0400 Received: (Authenticated sender: jacopo@jmondi.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id CFFE3E0008; Thu, 17 Jun 2021 17:15:34 +0000 (UTC) From: Jacopo Mondi To: Hans Verkuil Cc: Jacopo Mondi , linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [RFC 2/4] media: v4l2-async: Add notifier flags Date: Thu, 17 Jun 2021 19:16:09 +0200 Message-Id: <20210617171611.80542-3-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617171611.80542-1-jacopo+renesas@jmondi.org> References: <20210617171611.80542-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Add a 'flags' field to the async notifier structure and define the V4L2_ASYNC_NOTIFIER_SKIP_POST_REGISTER flag. Signed-off-by: Jacopo Mondi --- drivers/media/v4l2-core/v4l2-async.c | 1 + include/media/v4l2-async.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index cd9e78c63791..0836e01e59ca 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -472,6 +472,7 @@ static int v4l2_async_notifier_asd_valid(struct v4l2_async_notifier *notifier, void v4l2_async_notifier_init(struct v4l2_async_notifier *notifier) { INIT_LIST_HEAD(¬ifier->asd_list); + notifier->flags = 0; } EXPORT_SYMBOL(v4l2_async_notifier_init); diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h index 5b275a845c20..3f0627bf8894 100644 --- a/include/media/v4l2-async.h +++ b/include/media/v4l2-async.h @@ -92,6 +92,13 @@ struct v4l2_async_notifier_operations { struct v4l2_async_subdev *asd); }; +/* + * Set this flag to instruct the core framework not to call the post_register() + * core operation. The driver that registered the notifier will take care to + * do so eventually. + */ +#define V4L2_ASYNC_NOTIFIER_SKIP_POST_REGISTER (1U << 0) + /** * struct v4l2_async_notifier - v4l2_device notifier data * @@ -103,6 +110,8 @@ struct v4l2_async_notifier_operations { * @waiting: list of struct v4l2_async_subdev, waiting for their drivers * @done: list of struct v4l2_subdev, already probed * @list: member in a global list of notifiers + * @flags: notifier's flags. Can be: + * %V4L2_ASYNC_NOTIFIER_SKIP_POST_REGISTER */ struct v4l2_async_notifier { const struct v4l2_async_notifier_operations *ops; @@ -113,6 +122,7 @@ struct v4l2_async_notifier { struct list_head waiting; struct list_head done; struct list_head list; + u32 flags; }; /** From patchwork Thu Jun 17 17:16:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 12328969 X-Patchwork-Delegate: kieran@bingham.xyz 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE,USER_AGENT_GIT autolearn=unavailable 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 B815AC49361 for ; Thu, 17 Jun 2021 17:15:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5408613BF for ; Thu, 17 Jun 2021 17:15:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231864AbhFQRRp (ORCPT ); Thu, 17 Jun 2021 13:17:45 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:44843 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232176AbhFQRRp (ORCPT ); Thu, 17 Jun 2021 13:17:45 -0400 Received: (Authenticated sender: jacopo@jmondi.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id CEB26E0002; Thu, 17 Jun 2021 17:15:35 +0000 (UTC) From: Jacopo Mondi To: Hans Verkuil Cc: Jacopo Mondi , linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [RFC 3/4] media: v4l2-async: Call post_register() subdev op Date: Thu, 17 Jun 2021 19:16:10 +0200 Message-Id: <20210617171611.80542-4-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617171611.80542-1-jacopo+renesas@jmondi.org> References: <20210617171611.80542-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Call the "post_register()" subdev operation on a just registered subdevice, immediately after having called the 'bound' notifier operation on the parent. Signed-off-by: Jacopo Mondi --- drivers/media/v4l2-core/v4l2-async.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index 0836e01e59ca..8656b50ee799 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -293,6 +293,16 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, return ret; } + if (!(notifier->flags & V4L2_ASYNC_NOTIFIER_SKIP_POST_REGISTER) && + sd->ops->core && sd->ops->core->post_register) { + ret = sd->ops->core->post_register(sd); + if (ret) { + v4l2_async_notifier_call_unbind(notifier, sd, sd->asd); + v4l2_device_unregister_subdev(sd); + return ret; + } + } + /* Remove from the waiting list */ list_del(&asd->list); sd->asd = asd; From patchwork Thu Jun 17 17:16:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 12328971 X-Patchwork-Delegate: kieran@bingham.xyz 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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_NONE,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 9CBCFC49EA6 for ; Thu, 17 Jun 2021 17:15:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7B51E613E1 for ; Thu, 17 Jun 2021 17:15:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232176AbhFQRRq (ORCPT ); Thu, 17 Jun 2021 13:17:46 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:38743 "EHLO relay4-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232263AbhFQRRq (ORCPT ); Thu, 17 Jun 2021 13:17:46 -0400 Received: (Authenticated sender: jacopo@jmondi.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id D5FB6E0004; Thu, 17 Jun 2021 17:15:36 +0000 (UTC) From: Jacopo Mondi To: Hans Verkuil Cc: Jacopo Mondi , linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: [RFC 4/4] media: i2c: gmsl: Defer camera intialization Date: Thu, 17 Jun 2021 19:16:11 +0200 Message-Id: <20210617171611.80542-5-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210617171611.80542-1-jacopo+renesas@jmondi.org> References: <20210617171611.80542-1-jacopo+renesas@jmondi.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Use the post_register() callback to defer the bulk of the camera modules initialization. The deserializer driver waits for all the registered camera to probe, increases its channel amplitude and the calls the subdevice post_register() operation that completes the initialization procedure. Signed-off-by: Jacopo Mondi --- drivers/media/i2c/max9286.c | 21 ++++++++-- drivers/media/i2c/rdacm20.c | 81 +++++++++++++++++++++---------------- 2 files changed, 65 insertions(+), 37 deletions(-) diff --git a/drivers/media/i2c/max9286.c b/drivers/media/i2c/max9286.c index 34582199452b..2c9cbb3079ac 100644 --- a/drivers/media/i2c/max9286.c +++ b/drivers/media/i2c/max9286.c @@ -567,17 +567,31 @@ static int max9286_notify_bound(struct v4l2_async_notifier *notifier, if (priv->bound_sources != priv->source_mask) return 0; + /* + * Once all cameras have probed, increase the channel amplitude + * to compensate for the remote noise immunity threshold and call + * the camera post_register operation to complete initialization with + * noise immunity enabled. + */ + max9286_reverse_channel_setup(priv, MAX9286_REV_AMP_HIGH); + for_each_source(priv, source) { + ret = v4l2_subdev_call(source->sd, core, post_register); + if (ret) { + dev_err(&priv->client->dev, + "Failed to initialize camera device %u\n", + index); + return ret; + } + } + /* * All enabled sources have probed and enabled their reverse control * channels: * - * - Increase the reverse channel amplitude to compensate for the - * remote ends high threshold * - Verify all configuration links are properly detected * - Disable auto-ack as communication on the control channel are now * stable. */ - max9286_reverse_channel_setup(priv, MAX9286_REV_AMP_HIGH); max9286_check_config_link(priv, priv->source_mask); max9286_configure_i2c(priv, false); @@ -630,6 +644,7 @@ static int max9286_v4l2_notifier_register(struct max9286_priv *priv) } priv->notifier.ops = &max9286_notify_ops; + priv->notifier.flags |= V4L2_ASYNC_NOTIFIER_SKIP_POST_REGISTER; ret = v4l2_async_subdev_notifier_register(&priv->sd, &priv->notifier); if (ret) { diff --git a/drivers/media/i2c/rdacm20.c b/drivers/media/i2c/rdacm20.c index cb725c2778c0..9f6ccfc9a78a 100644 --- a/drivers/media/i2c/rdacm20.c +++ b/drivers/media/i2c/rdacm20.c @@ -435,44 +435,12 @@ static int rdacm20_get_fmt(struct v4l2_subdev *sd, return 0; } -static const struct v4l2_subdev_video_ops rdacm20_video_ops = { - .s_stream = rdacm20_s_stream, -}; - -static const struct v4l2_subdev_pad_ops rdacm20_subdev_pad_ops = { - .enum_mbus_code = rdacm20_enum_mbus_code, - .get_fmt = rdacm20_get_fmt, - .set_fmt = rdacm20_get_fmt, -}; - -static const struct v4l2_subdev_ops rdacm20_subdev_ops = { - .video = &rdacm20_video_ops, - .pad = &rdacm20_subdev_pad_ops, -}; - -static int rdacm20_initialize(struct rdacm20_device *dev) +static int rdacm20_post_register(struct v4l2_subdev *sd) { + struct rdacm20_device *dev = sd_to_rdacm20(sd); unsigned int retry = 3; int ret; - max9271_wake_up(&dev->serializer); - - /* Serial link disabled during config as it needs a valid pixel clock. */ - ret = max9271_set_serial_link(&dev->serializer, false); - if (ret) - return ret; - - /* - * Ensure that we have a good link configuration before attempting to - * identify the device. - */ - ret = max9271_configure_i2c(&dev->serializer, - MAX9271_I2CSLVSH_469NS_234NS | - MAX9271_I2CSLVTO_1024US | - MAX9271_I2CMSTBT_105KBPS); - if (ret) - return ret; - /* * Hold OV10635 in reset during max9271 configuration. The reset signal * has to be asserted for at least 200 microseconds. @@ -549,6 +517,51 @@ static int rdacm20_initialize(struct rdacm20_device *dev) dev_info(dev->dev, "Identified RDACM20 camera module\n"); + return 0; +} + +static const struct v4l2_subdev_video_ops rdacm20_video_ops = { + .s_stream = rdacm20_s_stream, +}; + +static const struct v4l2_subdev_pad_ops rdacm20_subdev_pad_ops = { + .enum_mbus_code = rdacm20_enum_mbus_code, + .get_fmt = rdacm20_get_fmt, + .set_fmt = rdacm20_get_fmt, +}; + +static const struct v4l2_subdev_core_ops rdacm20_core_ops = { + .post_register = rdacm20_post_register, +}; + +static const struct v4l2_subdev_ops rdacm20_subdev_ops = { + .core = &rdacm20_core_ops, + .video = &rdacm20_video_ops, + .pad = &rdacm20_subdev_pad_ops, +}; + +static int rdacm20_initialize(struct rdacm20_device *dev) +{ + int ret; + + max9271_wake_up(&dev->serializer); + + /* Serial link disabled during config as it needs a valid pixel clock. */ + ret = max9271_set_serial_link(&dev->serializer, false); + if (ret) + return ret; + + /* + * Ensure that we have a good link configuration before attempting to + * identify the device. + */ + ret = max9271_configure_i2c(&dev->serializer, + MAX9271_I2CSLVSH_469NS_234NS | + MAX9271_I2CSLVTO_1024US | + MAX9271_I2CMSTBT_105KBPS); + if (ret) + return ret; + /* * Set reverse channel high threshold to increase noise immunity. *