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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8554C54EBD for ; Fri, 13 Jan 2023 11:37:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234010AbjAMLhn (ORCPT ); Fri, 13 Jan 2023 06:37:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbjAMLgz (ORCPT ); Fri, 13 Jan 2023 06:36:55 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0752DCF for ; Fri, 13 Jan 2023 03:25:05 -0800 (PST) Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pGIB7-00043X-5b; Fri, 13 Jan 2023 12:24:57 +0100 Received: from pza by ptx.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1pGIB6-0002OX-6p; Fri, 13 Jan 2023 12:24:56 +0100 Date: Fri, 13 Jan 2023 12:24:56 +0100 From: Philipp Zabel To: Mauro Carvalho Chehab , Laurent Pinchart , Sakari Ailus Cc: linux-media@vger.kernel.org, kernel@pengutronix.de Subject: Re: [PATCH] media: v4l2-async: fix binding async subdevs with multiple source ports Message-ID: <20230113112456.GA9093@pengutronix.de> References: <20220810104848.846783-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220810104848.846783-1-p.zabel@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain User-Agent: Mutt/1.10.1 (2018-07-13) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c0 X-SA-Exim-Mail-From: pza@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi, On Wed, Aug 10, 2022 at 12:48:48PM +0200, Philipp Zabel wrote: > Asynchronous subdevice probing on imx-media with imx6-mipi-csi2 is > broken since commit 1f391df44607 ("media: v4l2-async: Use endpoints in > __v4l2_async_nf_add_fwnode_remote()"). > > This is a side effect of imx6-mipi-csi2 having a single subdevice with > four separate source ports connected to different subdevices. Before, > the imx-media-csi and video-mux devices registered async sub-devices > via device fwnode that matched the imx6-mipi-csi2 device on their > respective notifiers. This caused the first asd to be put on the > notifier waiting list, and the other three to return -EEXIST and be > ignored. > > With async subdev registration via endpoint fwnode, all four asds are > distinct and three of them keep dangling on their notifiers after the > first one is bound. > > This patch modifies __v4l2_async_nf_has_async_subdev() to consider > asds matching different fwnode endpoints of the same sub-device equal > if the latter is already bound and matches via device fwnode. Further, > v4l2_async_register_subdev() is modified to remove dangling duplicate > asds that were registered before the sub-device was available to check > its fwnode. > > Fixes: 1f391df44607 ("media: v4l2-async: Use endpoints in __v4l2_async_nf_add_fwnode_remote()") > Signed-off-by: Philipp Zabel Any comments on this? The issue persists on v6.2-rc3. > --- > drivers/media/v4l2-core/v4l2-async.c | 43 ++++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c > index 2f1b718a9189..b24220ed7077 100644 > --- a/drivers/media/v4l2-core/v4l2-async.c > +++ b/drivers/media/v4l2-core/v4l2-async.c > @@ -452,6 +452,22 @@ __v4l2_async_nf_has_async_subdev(struct v4l2_async_notifier *notifier, > > if (asd_equal(asd, sd->asd)) > return true; > + > + /* > + * If the asd matches an endpoint fwnode, handle sub-devices > + * with device fwnode that were already matched by another asd > + * with a different endpoint fwnode on the same device. > + */ > + if (asd->match_type == V4L2_ASYNC_MATCH_FWNODE && > + fwnode_graph_is_endpoint(asd->match.fwnode) && > + sd->fwnode && !fwnode_graph_is_endpoint(sd->fwnode)) { > + struct fwnode_handle *devnode; > + > + devnode = fwnode_graph_get_port_parent(asd->match.fwnode); > + fwnode_handle_put(devnode); > + if (devnode == sd->fwnode) > + return true; > + } > } > > return false; > @@ -749,6 +765,24 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, int adapter_id, > } > EXPORT_SYMBOL_GPL(__v4l2_async_nf_add_i2c); > > +static void v4l2_async_remove_duplicate_matches(struct v4l2_subdev *sd) > +{ > + struct v4l2_async_notifier *notifier; > + > + lockdep_assert_held(&list_lock); > + > + list_for_each_entry(notifier, ¬ifier_list, list) { > + struct v4l2_async_subdev *asd; > + > + asd = v4l2_async_find_match(notifier, sd); > + if (!asd) > + continue; > + > + /* Remove from the waiting list */ > + list_del(&asd->list); > + } > +} > + > int v4l2_async_register_subdev(struct v4l2_subdev *sd) > { > struct v4l2_async_notifier *subdev_notifier; > @@ -783,6 +817,15 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd) > if (ret) > goto err_unbind; > > + /* > + * At this point the asd is removed from the notifier wait list. > + * There might be other notifiers with asds matching different > + * fwnode endpoints of the same sd remaining. If the sd matches > + * by device fwnode, remove the dangling asds. > + */ > + if (sd->fwnode && !fwnode_graph_is_endpoint(sd->fwnode)) > + v4l2_async_remove_duplicate_matches(sd); > + > ret = v4l2_async_nf_try_complete(notifier); > if (ret) > goto err_unbind; > -- > 2.30.2 > > regards Philipp