[PATCH 02/22] [media] v4l2-async: allow subdevices to add further subdevices to the notifier waiting list

Philipp Zabel
2016-10-07T16:01:13Z

Currently the v4l2_async_notifier needs to be given a list of matches
for all expected subdevices on creation. When chaining subdevices that
are asynchronously probed via device tree, the bridge device that sets
up the notifier does not know the complete list of subdevices, as it
can only parse its own device tree node to obtain information about
the nearest neighbor subdevices.
To support indirectly connected subdevices, we need to support amending
the existing notifier waiting list with newly found neighbor subdevices
with each registered subdevice.

This can be achieved by adding new v42l_async_subdev matches to the
notifier waiting list during the v4l2_subdev registered callback, which
is called under the list lock from either v4l2_async_register_subdev or
v4l2_async_notifier_register. For this purpose a new exported function
__v4l2_async_notifier_add_subdev is added.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
drivers/media/v4l2-core/v4l2-async.c | 78 ++++++++++++++++++++++++++++++++++--
include/media/v4l2-async.h | 12 ++++++
2 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index c4f1930..404eeea 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -109,6 +109,7 @@ static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier,
if (ret < 0)
return ret;
}
+
/* Move from the global subdevice list to notifier's done */
list_move(&sd->async_list, &notifier->done);

@@ -158,7 +159,7 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
struct v4l2_async_notifier *notifier)
{
struct v4l2_async_subdev *asd;
- int ret;
+ struct list_head *tail;
int i;

if (!notifier->num_subdevs || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
@@ -191,17 +192,71 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
/* Keep also completed notifiers on the list */
list_add(&notifier->list, &notifier_list);

+ do {
+ int ret;
+
+ tail = notifier->waiting.prev;
+
+ ret = v4l2_async_test_notify_all(notifier);
+ if (ret < 0) {
+ mutex_unlock(&list_lock);
+ return ret;
+ }
+
+ /*
+ * If entries were added to the notifier waiting list, check
+ * again if the corresponding subdevices are already available.
+ */
+ } while (tail != notifier->waiting.prev);
+
mutex_unlock(&list_lock);

- return ret;
+ return 0;
}
EXPORT_SYMBOL(v4l2_async_notifier_register);

+int __v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,
+ struct v4l2_async_subdev *asd)
+{
+ struct v4l2_async_subdev *tmp_asd;
+
+ lockdep_assert_held(&list_lock);
+
+ if (asd->match_type != V4L2_ASYNC_MATCH_OF)
+ return -EINVAL;
+
+ /*
+ * First check if the same notifier is already on the waiting or done
+ * lists. This can happen if a subdevice with multiple outputs is added
+ * by all its downstream subdevices.
+ */
+ list_for_each_entry(tmp_asd, &notifier->waiting, list)
+ if (tmp_asd->match.of.node == asd->match.of.node)
+ return 0;
+ list_for_each_entry(tmp_asd, &notifier->done, list)
+ if (tmp_asd->match.of.node == asd->match.of.node)
+ return 0;
+
+ /*
+ * Add the new async subdev to the notifier waiting list, so
+ * v4l2_async_belongs may use it to compare against entries in
+ * subdev_list.
+ * In case the subdev matching asd has already been passed in the
+ * subdev_list walk in v4l2_async_notifier_register, or if
+ * we are called from v4l2_async_register_subdev, the subdev_list
+ * will have to be walked again.
+ */
+ list_add_tail(&asd->list, &notifier->waiting);
+
+ return 0;
+}
+
void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
{
struct v4l2_subdev *sd, *tmp;
- unsigned int notif_n_subdev = notifier->num_subdevs;
- unsigned int n_subdev = min(notif_n_subdev, V4L2_MAX_SUBDEVS);
+ unsigned int notif_n_subdev = 0;
+ unsigned int n_subdev;
+ struct list_head *list;
struct device **dev;
int i = 0;

@@ -218,6 +273,10 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)

list_del(&notifier->list);

+ list_for_each(list, &notifier->done)
+ ++notif_n_subdev;
+ n_subdev = min(notif_n_subdev, V4L2_MAX_SUBDEVS);
+
list_for_each_entry_safe(sd, tmp, &notifier->done, async_list) {
struct device *d;

@@ -294,8 +353,19 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
list_for_each_entry(notifier, &notifier_list, list) {
struct v4l2_async_subdev *asd = v4l2_async_belongs(notifier, sd);
if (asd) {
+ struct list_head *tail = notifier->waiting.prev;
int ret = v4l2_async_test_notify(notifier, sd, asd);
+
+ /*
+ * If entries were added to the notifier waiting list,
+ * check if the corresponding subdevices are already
+ * available.
+ */
+ if (tail != notifier->waiting.prev)
+ ret = v4l2_async_test_notify_all(notifier);
+
mutex_unlock(&list_lock);
+
return ret;
}
}
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 8e2a236..e4e4b11 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -114,6 +114,18 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
struct v4l2_async_notifier *notifier);

/**
+ * __v4l2_async_notifier_add_subdev - adds a subdevice to the notifier waitlist
+ *
+ * @v4l2_notifier: notifier the calling subdev is bound to
+ * @asd: asynchronous subdev match
+ *
+ * To be called from inside a subdevices' registered_async callback to add
+ * additional subdevices to the notifier waiting list.
+ */
+int __v4l2_async_notifier_add_subdev(struct v4l2_async_notifier *notifier,
+ struct v4l2_async_subdev *asd);
+
+/**
* v4l2_async_notifier_unregister - unregisters a subdevice asynchronous notifier
*
* @notifier: pointer to &struct v4l2_async_notifier
--
2.9.3