From: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> To: linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org, robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org, laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, pavel-+ZI9xUNit7I@public.gmane.org, sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org Subject: [PATCH v8 17/21] v4l: fwnode: Add convenience function for parsing generic references Date: Tue, 5 Sep 2017 16:05:49 +0300 [thread overview] Message-ID: <20170905130553.1332-18-sakari.ailus@linux.intel.com> (raw) In-Reply-To: <20170905130553.1332-1-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> Add function v4l2_fwnode_reference_count() for counting external references and v4l2_fwnode_reference_parse() for parsing them as async sub-devices. This can be done on e.g. flash or lens async sub-devices that are not part of but are associated with a sensor. struct v4l2_async_notifier.max_subdevs field is added to contain the maximum number of sub-devices in a notifier to reflect the memory allocated for the subdevs array. Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> --- drivers/media/v4l2-core/v4l2-fwnode.c | 85 +++++++++++++++++++++++++++++++++++ include/media/v4l2-fwnode.h | 28 ++++++++++++ 2 files changed, 113 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index e6932d7d47b6..8c059a4217b4 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -453,6 +453,91 @@ int v4l2_async_notifier_parse_fwnode_endpoints( } EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints); +static void v4l2_fwnode_print_args(struct fwnode_reference_args *args) +{ + unsigned int i; + + for (i = 0; i < args->nargs; i++) { + pr_cont(" %u", args->args[i]); + if (i + 1 < args->nargs) + pr_cont(","); + } +} + +int v4l2_fwnode_reference_parse( + struct device *dev, struct v4l2_async_notifier *notifier, + const char *prop, const char *nargs_prop, unsigned int nargs, + size_t asd_struct_size, + int (*parse_single)(struct device *dev, + struct fwnode_reference_args *args, + struct v4l2_async_subdev *asd)) +{ + struct fwnode_reference_args args; + unsigned int index = 0; + int ret = -ENOENT; + + if (asd_struct_size < sizeof(struct v4l2_async_subdev)) + return -EINVAL; + + for (; !fwnode_property_get_reference_args( + dev_fwnode(dev), prop, nargs_prop, nargs, + index, &args); index++) + fwnode_handle_put(args.fwnode); + + ret = v4l2_async_notifier_realloc(notifier, + notifier->num_subdevs + index); + if (ret) + return -ENOMEM; + + for (ret = -ENOENT, index = 0; !fwnode_property_get_reference_args( + dev_fwnode(dev), prop, nargs_prop, nargs, + index, &args); index++) { + struct v4l2_async_subdev *asd; + + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) { + ret = -EINVAL; + goto error; + } + + asd = kzalloc(asd_struct_size, GFP_KERNEL); + if (!asd) { + ret = -ENOMEM; + goto error; + } + + ret = parse_single ? parse_single(dev, &args, asd) : 0; + if (ret < 0) { + kfree(asd); + if (ret == -ENOTCONN) + dev_dbg(dev, + "ignoring reference prop \"%s\", nargs_prop \"%s\", nargs %u, index %u", + prop, nargs_prop, nargs, index); + else + dev_warn(dev, + "driver could not parse reference prop \"%s\", nargs_prop \"%s\", nargs %u, index %u", + prop, nargs_prop, nargs, index); + v4l2_fwnode_print_args(&args); + pr_cont("\n"); + if (ret == -ENOTCONN) + continue; + else + goto error; + } + + notifier->subdevs[notifier->num_subdevs] = asd; + asd->match.fwnode.fwnode = args.fwnode; + asd->match_type = V4L2_ASYNC_MATCH_FWNODE; + notifier->num_subdevs++; + } + + return 0; + +error: + fwnode_handle_put(args.fwnode); + return ret; +} +EXPORT_SYMBOL_GPL(v4l2_fwnode_reference_parse); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>"); MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>"); diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h index 6d125f26ec84..3ad71241cb20 100644 --- a/include/media/v4l2-fwnode.h +++ b/include/media/v4l2-fwnode.h @@ -254,4 +254,32 @@ int v4l2_async_notifier_parse_fwnode_endpoints( struct v4l2_fwnode_endpoint *vep, struct v4l2_async_subdev *asd)); +/** + * v4l2_fwnode_reference_parse - parse references for async sub-devices + * @dev: the device node the properties of which are parsed for references + * @notifier: the async notifier where the async subdevs will be added + * @prop: the name of the property + * @nargs_prop: the name of the property in the remote node that specifies the + * number of integer arguments (may be NULL, in that case nargs + * will be used). + * @nargs: the number of integer arguments after the reference + * @asd_struct_size: the size of the driver's async sub-device struct, including + * @struct v4l2_async_subdev + * @parse_single: driver's callback function for parsing a reference. Optional. + * Return: 0 on success + * %-ENOTCONN if the reference is to be skipped. This + * will not be considered as an error + * + * Return: 0 on success + * -ENOMEM if memory allocation failed + * -EINVAL if property parsing failed + */ +int v4l2_fwnode_reference_parse( + struct device *dev, struct v4l2_async_notifier *notifier, + const char *prop, const char *nargs_prop, unsigned int nargs, + size_t asd_struct_size, + int (*parse_single)(struct device *dev, + struct fwnode_reference_args *args, + struct v4l2_async_subdev *asd)); + #endif /* _V4L2_FWNODE_H */ -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Sakari Ailus <sakari.ailus@linux.intel.com> To: linux-media@vger.kernel.org Cc: niklas.soderlund@ragnatech.se, robh@kernel.org, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, devicetree@vger.kernel.org, pavel@ucw.cz, sre@kernel.org Subject: [PATCH v8 17/21] v4l: fwnode: Add convenience function for parsing generic references Date: Tue, 5 Sep 2017 16:05:49 +0300 [thread overview] Message-ID: <20170905130553.1332-18-sakari.ailus@linux.intel.com> (raw) In-Reply-To: <20170905130553.1332-1-sakari.ailus@linux.intel.com> Add function v4l2_fwnode_reference_count() for counting external references and v4l2_fwnode_reference_parse() for parsing them as async sub-devices. This can be done on e.g. flash or lens async sub-devices that are not part of but are associated with a sensor. struct v4l2_async_notifier.max_subdevs field is added to contain the maximum number of sub-devices in a notifier to reflect the memory allocated for the subdevs array. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/v4l2-core/v4l2-fwnode.c | 85 +++++++++++++++++++++++++++++++++++ include/media/v4l2-fwnode.h | 28 ++++++++++++ 2 files changed, 113 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c index e6932d7d47b6..8c059a4217b4 100644 --- a/drivers/media/v4l2-core/v4l2-fwnode.c +++ b/drivers/media/v4l2-core/v4l2-fwnode.c @@ -453,6 +453,91 @@ int v4l2_async_notifier_parse_fwnode_endpoints( } EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints); +static void v4l2_fwnode_print_args(struct fwnode_reference_args *args) +{ + unsigned int i; + + for (i = 0; i < args->nargs; i++) { + pr_cont(" %u", args->args[i]); + if (i + 1 < args->nargs) + pr_cont(","); + } +} + +int v4l2_fwnode_reference_parse( + struct device *dev, struct v4l2_async_notifier *notifier, + const char *prop, const char *nargs_prop, unsigned int nargs, + size_t asd_struct_size, + int (*parse_single)(struct device *dev, + struct fwnode_reference_args *args, + struct v4l2_async_subdev *asd)) +{ + struct fwnode_reference_args args; + unsigned int index = 0; + int ret = -ENOENT; + + if (asd_struct_size < sizeof(struct v4l2_async_subdev)) + return -EINVAL; + + for (; !fwnode_property_get_reference_args( + dev_fwnode(dev), prop, nargs_prop, nargs, + index, &args); index++) + fwnode_handle_put(args.fwnode); + + ret = v4l2_async_notifier_realloc(notifier, + notifier->num_subdevs + index); + if (ret) + return -ENOMEM; + + for (ret = -ENOENT, index = 0; !fwnode_property_get_reference_args( + dev_fwnode(dev), prop, nargs_prop, nargs, + index, &args); index++) { + struct v4l2_async_subdev *asd; + + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) { + ret = -EINVAL; + goto error; + } + + asd = kzalloc(asd_struct_size, GFP_KERNEL); + if (!asd) { + ret = -ENOMEM; + goto error; + } + + ret = parse_single ? parse_single(dev, &args, asd) : 0; + if (ret < 0) { + kfree(asd); + if (ret == -ENOTCONN) + dev_dbg(dev, + "ignoring reference prop \"%s\", nargs_prop \"%s\", nargs %u, index %u", + prop, nargs_prop, nargs, index); + else + dev_warn(dev, + "driver could not parse reference prop \"%s\", nargs_prop \"%s\", nargs %u, index %u", + prop, nargs_prop, nargs, index); + v4l2_fwnode_print_args(&args); + pr_cont("\n"); + if (ret == -ENOTCONN) + continue; + else + goto error; + } + + notifier->subdevs[notifier->num_subdevs] = asd; + asd->match.fwnode.fwnode = args.fwnode; + asd->match_type = V4L2_ASYNC_MATCH_FWNODE; + notifier->num_subdevs++; + } + + return 0; + +error: + fwnode_handle_put(args.fwnode); + return ret; +} +EXPORT_SYMBOL_GPL(v4l2_fwnode_reference_parse); + MODULE_LICENSE("GPL"); MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>"); MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>"); diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h index 6d125f26ec84..3ad71241cb20 100644 --- a/include/media/v4l2-fwnode.h +++ b/include/media/v4l2-fwnode.h @@ -254,4 +254,32 @@ int v4l2_async_notifier_parse_fwnode_endpoints( struct v4l2_fwnode_endpoint *vep, struct v4l2_async_subdev *asd)); +/** + * v4l2_fwnode_reference_parse - parse references for async sub-devices + * @dev: the device node the properties of which are parsed for references + * @notifier: the async notifier where the async subdevs will be added + * @prop: the name of the property + * @nargs_prop: the name of the property in the remote node that specifies the + * number of integer arguments (may be NULL, in that case nargs + * will be used). + * @nargs: the number of integer arguments after the reference + * @asd_struct_size: the size of the driver's async sub-device struct, including + * @struct v4l2_async_subdev + * @parse_single: driver's callback function for parsing a reference. Optional. + * Return: 0 on success + * %-ENOTCONN if the reference is to be skipped. This + * will not be considered as an error + * + * Return: 0 on success + * -ENOMEM if memory allocation failed + * -EINVAL if property parsing failed + */ +int v4l2_fwnode_reference_parse( + struct device *dev, struct v4l2_async_notifier *notifier, + const char *prop, const char *nargs_prop, unsigned int nargs, + size_t asd_struct_size, + int (*parse_single)(struct device *dev, + struct fwnode_reference_args *args, + struct v4l2_async_subdev *asd)); + #endif /* _V4L2_FWNODE_H */ -- 2.11.0
next prev parent reply other threads:[~2017-09-05 13:05 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-09-05 13:05 [PATCH v8 00/21] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 02/21] v4l: async: Remove re-probing support Sakari Ailus 2017-09-06 7:00 ` Hans Verkuil 2017-09-05 13:05 ` [PATCH v8 03/21] v4l: async: Use more intuitive names for internal functions Sakari Ailus 2017-09-06 7:01 ` Hans Verkuil 2017-09-08 12:40 ` Pavel Machek 2017-09-05 13:05 ` [PATCH v8 05/21] docs-rst: v4l: Include Qualcomm CAMSS in documentation build Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 06/21] v4l: fwnode: Support generic parsing of graph endpoints in a device Sakari Ailus [not found] ` <20170905130553.1332-7-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 7:41 ` Hans Verkuil 2017-09-06 7:41 ` Hans Verkuil [not found] ` <dd3a2e55-8de0-c30e-04a7-cb26b519689c-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org> 2017-09-07 7:34 ` Sakari Ailus 2017-09-07 7:34 ` Sakari Ailus 2017-09-07 8:51 ` Hans Verkuil 2017-09-07 9:58 ` Sakari Ailus [not found] ` <20170907095850.m7mlag3tofwbj2jc-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org> 2017-09-07 12:03 ` Hans Verkuil 2017-09-07 12:03 ` Hans Verkuil 2017-09-05 13:05 ` [PATCH v8 09/21] omap3isp: Fix check for our own sub-devices Sakari Ailus [not found] ` <20170905130553.1332-10-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 7:45 ` Hans Verkuil 2017-09-06 7:45 ` Hans Verkuil 2017-09-05 13:05 ` [PATCH v8 12/21] v4l: async: Introduce helpers for calling async ops callbacks Sakari Ailus [not found] ` <20170905130553.1332-13-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 7:50 ` Hans Verkuil 2017-09-06 7:50 ` Hans Verkuil 2017-09-07 7:51 ` Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 16/21] dt: bindings: Add lens-focus binding for image sensors Sakari Ailus [not found] ` <20170905130553.1332-17-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 8:48 ` Hans Verkuil 2017-09-06 8:48 ` Hans Verkuil [not found] ` <20170905130553.1332-1-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-05 13:05 ` [PATCH v8 01/21] v4l: fwnode: Move KernelDoc documentation to the header Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus [not found] ` <20170905130553.1332-2-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-08 12:39 ` Pavel Machek 2017-09-08 12:39 ` Pavel Machek 2017-09-05 13:05 ` [PATCH v8 04/21] v4l: async: Add V4L2 async documentation to the documentation build Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 07/21] omap3isp: Use generic parser for parsing fwnode endpoints Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus [not found] ` <20170905130553.1332-8-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 7:42 ` Hans Verkuil 2017-09-06 7:42 ` Hans Verkuil 2017-09-05 13:05 ` [PATCH v8 08/21] rcar-vin: " Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus [not found] ` <20170905130553.1332-9-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 7:44 ` Hans Verkuil 2017-09-06 7:44 ` Hans Verkuil [not found] ` <a51aea1f-0a00-7a7b-8197-e0f5a0443a05-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org> 2017-09-07 8:09 ` Sakari Ailus 2017-09-07 8:09 ` Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 10/21] omap3isp: Print the name of the entity where no source pads could be found Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus 2017-09-06 7:45 ` Hans Verkuil 2017-09-05 13:05 ` [PATCH v8 11/21] v4l: async: Move async subdev notifier operations to a separate structure Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 13/21] v4l: async: Register sub-devices before calling bound callback Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus [not found] ` <20170905130553.1332-14-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 7:51 ` Hans Verkuil 2017-09-06 7:51 ` Hans Verkuil 2017-09-05 13:05 ` [PATCH v8 14/21] v4l: async: Allow binding notifiers to sub-devices Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus [not found] ` <20170905130553.1332-15-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2017-09-06 8:46 ` Hans Verkuil 2017-09-06 8:46 ` Hans Verkuil 2017-09-07 8:32 ` Sakari Ailus [not found] ` <20170907083209.3xtaxwhrfmgrtpfz-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org> 2017-09-07 12:02 ` Hans Verkuil 2017-09-07 12:02 ` Hans Verkuil 2017-09-05 13:05 ` [PATCH v8 15/21] dt: bindings: Add a binding for flash devices associated to a sensor Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus 2017-09-06 8:47 ` Hans Verkuil 2017-09-05 13:05 ` Sakari Ailus [this message] 2017-09-05 13:05 ` [PATCH v8 17/21] v4l: fwnode: Add convenience function for parsing generic references Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 18/21] v4l: fwnode: Add convenience function for parsing common external refs Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 19/21] smiapp: Add support for flash and lens devices Sakari Ailus 2017-09-05 13:05 ` Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 20/21] dt: bindings: smiapp: Document lens-focus and flash properties Sakari Ailus 2017-09-05 13:05 ` [PATCH v8 21/21] arm: dts: omap3: N9/N950: Add flash references to the camera Sakari Ailus
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170905130553.1332-18-sakari.ailus@linux.intel.com \ --to=sakari.ailus-vuqaysv1563yd54fqh9/ca@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=hverkuil-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org \ --cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \ --cc=linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org \ --cc=pavel-+ZI9xUNit7I@public.gmane.org \ --cc=robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=sre-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.