* [PATCH v13 00/25] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS
@ 2017-09-15 14:16 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:16 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi folks,
We have a large influx of new, unmerged, drivers that are now parsing
fwnode endpoints and each one of them is doing this a little bit
differently. The needs are still exactly the same for the graph data
structure is device independent. This is still a non-trivial task and the
majority of the driver implementations are buggy, just buggy in different
ways.
Facilitate parsing endpoints by adding a convenience function for parsing
the endpoints, and make the omap3isp and rcar-vin drivers use them as an
example.
To show where we're getting with this, I've added support for async
sub-device notifier support that is notifiers that can be registered by
sub-device drivers as well as V4L2 fwnode improvements to make use of them
and the DTS changes for the Nokia N9. Some of these patches I've posted
previously in this set here:
<URL:http://www.spinics.net/lists/linux-media/msg118764.html>
Since that, the complete callback of the master notifier registering the
V4L2 device is only called once all sub-notifiers have been completed as
well. This way the device node creation can be postponed until all devices
have been successfully initialised.
With this, the as3645a driver successfully registers a sub-device to the
media device created by the omap3isp driver. The kernel also has the
information it's related to the sensor driven by the smiapp driver but we
don't have a way to expose that information yet.
since v12:
- Merge patches "v4l: fwnode: Support generic parsing of graph endpoints
in a device" and "v4l: fwnode: Support generic parsing of graph
endpoints, per port". Improve the commit and KernelDoc documentation as
well.
- Reformat loop conditions in v4l2_async_notifier_try_complete() and
v4l2_fwnode_reference_get_int_prop(). Improve comments in
fwnode_property_get_reference_args() return value handling. Also check
for -ENODATA in v4l2_fwnode_reference_parse_int_props().
- Add an ACPI example for v4l2_fwnode_reference_get_int_prop().
- Document index parameter, document nprops parameter better and fix
-EINVAL error code documentation for
v4l2_fwnode_reference_get_int_prop().
- Use WARN_ON_ONCE(true) instead of WARN_ON_ONCE(1) in
v4l2_async_notifier_release().
since v11:
- Add patch "et8ek8: Add support for flash and lens devices".
- Add patch "v4l: fwnode: Support generic parsing of graph endpoints, per
port". The use case for this is to parse only upstream ports in a device
with sources and sinks. The downstream ports have already been parsed by
other drivers.
- Rename v4l2_fwnode_reference_parse_sensor_common as
v4l2_async_notifier_parse_fwnode_sensor_common. This is in line with
other functions that parse information using fwnode API and set up async
sub-devices in the notifier.
since v10:
- Rename v4l2_async_get_subdev_notifier as
v4l2_async_find_subdev_notifier, as this is what it effectively does:
finds a notifier for a sub-device. Same for v4l2_async_notifier_get_v4l2_dev
/ v4l2_async_notifier_get_v4l2_dev.
- Initialise lists before calling v4l2_async_notifier_call_complete() if
there are no sub-devices in a notifier.
- Warn on missing sub-device or existing v4l2_device on sub-device
notifier register, and conversely missing v4l2_device or existing
sub-device for a master notifier.
- Set notifier's sd and v4l2_dev fields NULL when the sub-device is
unregistered.
- Document the newly added helper functions for parsing external
references in v4l2-fwnode.c better.
- Return -ENOENT in v4l2_fwnode_reference_parse if no entries are found,
and other errors as they occur.
- Turn the loop in v4l2_fwnode_reference_get_int_prop a while loop (was
for).
- Don't put fwnodes in v4l2_fwnode_reference_parse_int_props.
- Fix description of parent field in struct v4l2_async_notifier.
- In the documentation of v4l2_async_notifier_release, document that this
function must be called also after
v4l2_fwnode_reference_parse_sensor_common, not just
v4l2_async_notifier_parse_fwnode_endpoints. The same goes for
v4l2_async_notifier_parse_fwnode_endpoints as well as
v4l2_fwnode_reference_parse_sensor_common.
since v9:
- Drop "as3645a: Switch to fwnode property API" and "ACPI: Document how to
refer to LEDs from remote nodes" patches. They're better off separately
from this set.
- Address property documentation redundancy in smiapp DT binding
documentation.
- Add patches "ov5670: Add support for flash and lens devices" and
"ov13858: Add support for flash and lens devices".
since v8:
- Improve terminology for notifiers. Instead of master / subdev, we
have root, parent and subdev notifiers.
- Renamed "flash" property as "flash-leds". There are many, and currently
we make assumptions in a lot of places (e.g. LED bindings) that these
are LEDs. While we don't have any other types of flashes supported right
now (e.g. Xenon), it's safer to assume we might have them in the future.
- Use ENOTCONN instead of EPERM to tell from driver's callback function
that an endpoint is to be skipped but not handled as an error.
- Avoid accessing notifier's subdevs array as well as num_subdevs field
from rcar-vin driver.
- Add a patch "v4l: async: Allow async notifier register call succeed with no
subdevs", which allows, well, what the subject says.
- Move checks for subdev / v4l2_dev from __v4l2_async_notifier_register()
to v4l2_async_notifier_register() and
v4l2_async_subdev_notifier_register().
- Don't initialise notifier->list. There was no need to do so, as this is
the entry added to the list and not used otherwise. I.e. regarding this,
the state before this patchset is restored.
- Clean up error handling in v4l2_async_notifier_fwnode_parse_endpoint().
- WARN_ON() in v4l2_async_notifier_parse_fwnode_endpoints() if the
asd_struct_size is smaller than size of struct v4l2_async_subdev.
- Make v4l2_fwnode_reference_parse() static as there should be no need to
use it outside the V4L2 fwnode framework. Also, remove the callback
function as well as other arguments that always have the same value in
current usage. (This can be changed later on if needed without affecting
drivers.)
- Add the patch "v4l: fwnode: Add a helper function to obtain device /
interger references", which allows similar use than
v4l2_fwnode_reference_parse() but is more useful on ACPI based systems
--- on ACPI, you can only refer to device nodes (corresponding struct
deice in Linux), not to data extension nodes under the devices.
- Improve v4l2_fwnode_reference_parse_sensor_common() to work on ACPI
based systems.
- Add patch "ACPI: Document how to refer to LEDs from remote nodes" to
document using and referring to LEDs on ACPI.
- Rebase the set on AS3645A fixes I just sent ("AS3645A fixes")
- In v4l2_fwnode_reference_parse_sensor_common(), tell if parsing a
property failed.
- Improved documentation for v4l2_async_notifier_parse_fwnode_endpoints().
- Fix v4l2_async_notifier_try_all_subdevs(); it is allowed that the list
entry being iterated over is deleted but no other changes to the list
are allowed. This could be the case if a sub-device driver's notifier
binds a sub-device. Restart the loop whenever a match is found.
- Add patch "as3645a: Switch to fwnode property API" which also adds ACPI
support.
since v7:
- Added three more patches:
v4l: async: Remove re-probing support
v4l: async: Use more intuitive names for internal functions
dt: bindings: smiapp: Document lens-focus and flash properties
The last one was already sent previously after the rest of the patchset.
- Removed re-probing support. This is hard to support and only useful in
special cases. It can be reintroduced later on if there's really a need
--- note that in e.g. omap3isp this was always broken and no-one ever
complained.
- Remove smiapp driver's async complete callback (and ops). It is
redundant: the sub-device nodes are created through the master notifier.
- Improve flash property documentation in video-interfaces.txt.
- Introduce helper functions to call notifier operations, one for each
operation.
- Rename v4l2_async_test_notify as v4l2_async_match_notify and
v4l2_async_belongs to v4l2_async_find_match.
- v4l2_async_notifier_test_all_subdevs() renamed as
v4l2_async_notifier_try_all_subdevs().
- Made notifier_v4l2_dev a function (it was a macro).
- Registering subdev notifiers from sub-device drivers that control
sub-devices created through sub-notifiers is now supported. In other
words, subdev notifiers may be registered through other subdev
notifiers. This is the source of the bulk of the changes between v7 and
v8.
- Add explanatory comments to helper functions used by V4L2 async
framework. This should help understanding the internal workings of the
framework.
- Removed the "notifiers" list in struct v4l2_async_notifier. The
information can be found from existing data structures.
- Explicitly check that registering a non-subdev notifier has v4l2_dev and
a subdev notifier has a sub-device pointer.
- Unified several code paths between subdev notifiers and non-subdev
notifiers.
- Fixed v4l2_async_notifier_release() --- calling it on a notifier for
which the driver had allocated the subdevs array would lead calling
kvfree() on that array. Now notifier->max_subdevs is checked before
proceeding.
- Fixed a use-after-free issue in
v4l2_async_notifier_fwnode_parse_endpoints().
- Small fixes to KernelDoc documentation for
v4l2_async_notifier_parse_fwnode_endpoints().
since v6:
- Drop the last patch that added variant for parsing endpoints given
specific port and endpoints numbers.
- Separate driver changes from the fwnode endpoint parser patch into two
patches. rcar-vin driver is now using the name function.
- Use -ENOTCONN to tell the parser that and endpoint (or a reference) is
to be ignored.
- parse_endpoint and parse_single callback functions are now optional and
documented as such.
- Added Laurent's patch adding notifier operations struct which I rebase
on the fwnode parser patchset. I wrote another patch to call the
notifier operations through macros.
- Add DT bindings for flash and lens devices.
- V4L2 fwnode parser for references (such as flash and lens).
- Added smiapp driver support for async sub-devices (lens and flash).
- Added a few fixes for omap3isp.
since v5:
- Use v4l2_async_ prefix for static functions as well (4th patch)
- Use memcpy() to copy array rather than a loop
- Document that the v4l2_async_subdev pointer in driver specific struct
must be the first member
- Improve documentation of the added functions (4th and 5th
patches)
- Arguments
- More thorough explation of the purpose, usage and object
lifetime
- Added acks
since v4:
- Prepend the set with three documentation fixes.
- The driver's async struct must begin with struct v4l2_async_subdev. Fix this
for omap3isp and document it.
- Improve documentation for new functions.
- Don't use devm_ family of functions for allocating memory. Introduce
v4l2_async_notifier_release() to release memory resources.
- Rework both v4l2_async_notifier_fwnode_parse_endpoints() and
v4l2_async_notifier_fwnode_parse_endpoint() and the local functions they
call. This should make the code cleaner. Despite the name, for linking
and typical usage reasons the functions remain in v4l2-fwnode.c.
- Convert rcar-vin to use v4l2_async_notifier_fwnode_parse_endpoint().
- Use kvmalloc() for allocating the notifier's subdevs array.
- max_subdevs argument for notifier_realloc is now the total maximum
number of subdevs, not the number of available subdevs.
- Use fwnode_device_is_available() to make sure the device actually
exists.
- Move the note telling v4l2_async_notifier_fwnode_parse_endpoints()
should not be used by new drivers to the last patch adding
v4l2_async_notifier_fwnode_parse_endpoint().
since v3:
- Rebase on current mediatree master.
since v2:
- Rebase on CCP2 support patches.
- Prepend a patch cleaning up omap3isp driver a little.
since v1:
- The first patch has been merged (it was a bugfix).
- In anticipation that the parsing can take place over several iterations,
take the existing number of async sub-devices into account when
re-allocating an array of async sub-devices.
- Rework the first patch to better anticipate parsing single endpoint at a
time by a driver.
- Add a second patch that adds a function for parsing endpoints one at a
time based on port and endpoint numbers.
Laurent Pinchart (1):
v4l: async: Move async subdev notifier operations to a separate
structure
Pavel Machek (1):
et8ek8: Add support for flash and lens devices
Sakari Ailus (23):
v4l: fwnode: Move KernelDoc documentation to the header
v4l: async: Remove re-probing support
v4l: async: Use more intuitive names for internal functions
v4l: async: Add V4L2 async documentation to the documentation build
v4l: fwnode: Support generic parsing of graph endpoints in a device
omap3isp: Use generic parser for parsing fwnode endpoints
rcar-vin: Use generic parser for parsing fwnode endpoints
omap3isp: Fix check for our own sub-devices
omap3isp: Print the name of the entity where no source pads could be
found
v4l: async: Introduce helpers for calling async ops callbacks
v4l: async: Register sub-devices before calling bound callback
v4l: async: Allow async notifier register call succeed with no subdevs
v4l: async: Allow binding notifiers to sub-devices
dt: bindings: Add a binding for flash LED devices associated to a
sensor
dt: bindings: Add lens-focus binding for image sensors
v4l: fwnode: Add a helper function for parsing generic references
v4l: fwnode: Add a helper function to obtain device / integer
references
v4l: fwnode: Add convenience function for parsing common external refs
dt: bindings: smiapp: Document lens-focus and flash-leds properties
smiapp: Add support for flash and lens devices
ov5670: Add support for flash and lens devices
ov13858: Add support for flash and lens devices
arm: dts: omap3: N9/N950: Add flash references to the camera
.../devicetree/bindings/media/i2c/nokia,smia.txt | 2 +
.../devicetree/bindings/media/video-interfaces.txt | 10 +
Documentation/media/kapi/v4l2-async.rst | 3 +
Documentation/media/kapi/v4l2-core.rst | 1 +
arch/arm/boot/dts/omap3-n9.dts | 1 +
arch/arm/boot/dts/omap3-n950-n9.dtsi | 4 +-
arch/arm/boot/dts/omap3-n950.dts | 1 +
drivers/media/i2c/et8ek8/et8ek8_driver.c | 21 +-
drivers/media/i2c/ov13858.c | 26 +-
drivers/media/i2c/ov5670.c | 33 +-
drivers/media/i2c/smiapp/smiapp-core.c | 38 +-
drivers/media/i2c/smiapp/smiapp.h | 4 +-
drivers/media/platform/am437x/am437x-vpfe.c | 8 +-
drivers/media/platform/atmel/atmel-isc.c | 10 +-
drivers/media/platform/atmel/atmel-isi.c | 10 +-
drivers/media/platform/davinci/vpif_capture.c | 8 +-
drivers/media/platform/davinci/vpif_display.c | 8 +-
drivers/media/platform/exynos4-is/media-dev.c | 8 +-
drivers/media/platform/omap3isp/isp.c | 127 ++---
drivers/media/platform/omap3isp/isp.h | 5 +-
drivers/media/platform/pxa_camera.c | 8 +-
drivers/media/platform/qcom/camss-8x16/camss.c | 8 +-
drivers/media/platform/rcar-vin/rcar-core.c | 122 ++---
drivers/media/platform/rcar-vin/rcar-dma.c | 10 +-
drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 +-
drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
drivers/media/platform/rcar_drif.c | 10 +-
drivers/media/platform/soc_camera/soc_camera.c | 14 +-
drivers/media/platform/stm32/stm32-dcmi.c | 10 +-
drivers/media/platform/ti-vpe/cal.c | 8 +-
drivers/media/platform/xilinx/xilinx-vipp.c | 8 +-
drivers/media/v4l2-core/v4l2-async.c | 346 +++++++++----
drivers/media/v4l2-core/v4l2-fwnode.c | 565 ++++++++++++++++++---
drivers/staging/media/imx/imx-media-dev.c | 8 +-
include/media/v4l2-async.h | 69 ++-
include/media/v4l2-fwnode.h | 219 +++++++-
36 files changed, 1329 insertions(+), 422 deletions(-)
create mode 100644 Documentation/media/kapi/v4l2-async.rst
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* [PATCH v13 00/25] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS
@ 2017-09-15 14:16 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:16 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Hi folks,
We have a large influx of new, unmerged, drivers that are now parsing
fwnode endpoints and each one of them is doing this a little bit
differently. The needs are still exactly the same for the graph data
structure is device independent. This is still a non-trivial task and the
majority of the driver implementations are buggy, just buggy in different
ways.
Facilitate parsing endpoints by adding a convenience function for parsing
the endpoints, and make the omap3isp and rcar-vin drivers use them as an
example.
To show where we're getting with this, I've added support for async
sub-device notifier support that is notifiers that can be registered by
sub-device drivers as well as V4L2 fwnode improvements to make use of them
and the DTS changes for the Nokia N9. Some of these patches I've posted
previously in this set here:
<URL:http://www.spinics.net/lists/linux-media/msg118764.html>
Since that, the complete callback of the master notifier registering the
V4L2 device is only called once all sub-notifiers have been completed as
well. This way the device node creation can be postponed until all devices
have been successfully initialised.
With this, the as3645a driver successfully registers a sub-device to the
media device created by the omap3isp driver. The kernel also has the
information it's related to the sensor driven by the smiapp driver but we
don't have a way to expose that information yet.
since v12:
- Merge patches "v4l: fwnode: Support generic parsing of graph endpoints
in a device" and "v4l: fwnode: Support generic parsing of graph
endpoints, per port". Improve the commit and KernelDoc documentation as
well.
- Reformat loop conditions in v4l2_async_notifier_try_complete() and
v4l2_fwnode_reference_get_int_prop(). Improve comments in
fwnode_property_get_reference_args() return value handling. Also check
for -ENODATA in v4l2_fwnode_reference_parse_int_props().
- Add an ACPI example for v4l2_fwnode_reference_get_int_prop().
- Document index parameter, document nprops parameter better and fix
-EINVAL error code documentation for
v4l2_fwnode_reference_get_int_prop().
- Use WARN_ON_ONCE(true) instead of WARN_ON_ONCE(1) in
v4l2_async_notifier_release().
since v11:
- Add patch "et8ek8: Add support for flash and lens devices".
- Add patch "v4l: fwnode: Support generic parsing of graph endpoints, per
port". The use case for this is to parse only upstream ports in a device
with sources and sinks. The downstream ports have already been parsed by
other drivers.
- Rename v4l2_fwnode_reference_parse_sensor_common as
v4l2_async_notifier_parse_fwnode_sensor_common. This is in line with
other functions that parse information using fwnode API and set up async
sub-devices in the notifier.
since v10:
- Rename v4l2_async_get_subdev_notifier as
v4l2_async_find_subdev_notifier, as this is what it effectively does:
finds a notifier for a sub-device. Same for v4l2_async_notifier_get_v4l2_dev
/ v4l2_async_notifier_get_v4l2_dev.
- Initialise lists before calling v4l2_async_notifier_call_complete() if
there are no sub-devices in a notifier.
- Warn on missing sub-device or existing v4l2_device on sub-device
notifier register, and conversely missing v4l2_device or existing
sub-device for a master notifier.
- Set notifier's sd and v4l2_dev fields NULL when the sub-device is
unregistered.
- Document the newly added helper functions for parsing external
references in v4l2-fwnode.c better.
- Return -ENOENT in v4l2_fwnode_reference_parse if no entries are found,
and other errors as they occur.
- Turn the loop in v4l2_fwnode_reference_get_int_prop a while loop (was
for).
- Don't put fwnodes in v4l2_fwnode_reference_parse_int_props.
- Fix description of parent field in struct v4l2_async_notifier.
- In the documentation of v4l2_async_notifier_release, document that this
function must be called also after
v4l2_fwnode_reference_parse_sensor_common, not just
v4l2_async_notifier_parse_fwnode_endpoints. The same goes for
v4l2_async_notifier_parse_fwnode_endpoints as well as
v4l2_fwnode_reference_parse_sensor_common.
since v9:
- Drop "as3645a: Switch to fwnode property API" and "ACPI: Document how to
refer to LEDs from remote nodes" patches. They're better off separately
from this set.
- Address property documentation redundancy in smiapp DT binding
documentation.
- Add patches "ov5670: Add support for flash and lens devices" and
"ov13858: Add support for flash and lens devices".
since v8:
- Improve terminology for notifiers. Instead of master / subdev, we
have root, parent and subdev notifiers.
- Renamed "flash" property as "flash-leds". There are many, and currently
we make assumptions in a lot of places (e.g. LED bindings) that these
are LEDs. While we don't have any other types of flashes supported right
now (e.g. Xenon), it's safer to assume we might have them in the future.
- Use ENOTCONN instead of EPERM to tell from driver's callback function
that an endpoint is to be skipped but not handled as an error.
- Avoid accessing notifier's subdevs array as well as num_subdevs field
from rcar-vin driver.
- Add a patch "v4l: async: Allow async notifier register call succeed with no
subdevs", which allows, well, what the subject says.
- Move checks for subdev / v4l2_dev from __v4l2_async_notifier_register()
to v4l2_async_notifier_register() and
v4l2_async_subdev_notifier_register().
- Don't initialise notifier->list. There was no need to do so, as this is
the entry added to the list and not used otherwise. I.e. regarding this,
the state before this patchset is restored.
- Clean up error handling in v4l2_async_notifier_fwnode_parse_endpoint().
- WARN_ON() in v4l2_async_notifier_parse_fwnode_endpoints() if the
asd_struct_size is smaller than size of struct v4l2_async_subdev.
- Make v4l2_fwnode_reference_parse() static as there should be no need to
use it outside the V4L2 fwnode framework. Also, remove the callback
function as well as other arguments that always have the same value in
current usage. (This can be changed later on if needed without affecting
drivers.)
- Add the patch "v4l: fwnode: Add a helper function to obtain device /
interger references", which allows similar use than
v4l2_fwnode_reference_parse() but is more useful on ACPI based systems
--- on ACPI, you can only refer to device nodes (corresponding struct
deice in Linux), not to data extension nodes under the devices.
- Improve v4l2_fwnode_reference_parse_sensor_common() to work on ACPI
based systems.
- Add patch "ACPI: Document how to refer to LEDs from remote nodes" to
document using and referring to LEDs on ACPI.
- Rebase the set on AS3645A fixes I just sent ("AS3645A fixes")
- In v4l2_fwnode_reference_parse_sensor_common(), tell if parsing a
property failed.
- Improved documentation for v4l2_async_notifier_parse_fwnode_endpoints().
- Fix v4l2_async_notifier_try_all_subdevs(); it is allowed that the list
entry being iterated over is deleted but no other changes to the list
are allowed. This could be the case if a sub-device driver's notifier
binds a sub-device. Restart the loop whenever a match is found.
- Add patch "as3645a: Switch to fwnode property API" which also adds ACPI
support.
since v7:
- Added three more patches:
v4l: async: Remove re-probing support
v4l: async: Use more intuitive names for internal functions
dt: bindings: smiapp: Document lens-focus and flash properties
The last one was already sent previously after the rest of the patchset.
- Removed re-probing support. This is hard to support and only useful in
special cases. It can be reintroduced later on if there's really a need
--- note that in e.g. omap3isp this was always broken and no-one ever
complained.
- Remove smiapp driver's async complete callback (and ops). It is
redundant: the sub-device nodes are created through the master notifier.
- Improve flash property documentation in video-interfaces.txt.
- Introduce helper functions to call notifier operations, one for each
operation.
- Rename v4l2_async_test_notify as v4l2_async_match_notify and
v4l2_async_belongs to v4l2_async_find_match.
- v4l2_async_notifier_test_all_subdevs() renamed as
v4l2_async_notifier_try_all_subdevs().
- Made notifier_v4l2_dev a function (it was a macro).
- Registering subdev notifiers from sub-device drivers that control
sub-devices created through sub-notifiers is now supported. In other
words, subdev notifiers may be registered through other subdev
notifiers. This is the source of the bulk of the changes between v7 and
v8.
- Add explanatory comments to helper functions used by V4L2 async
framework. This should help understanding the internal workings of the
framework.
- Removed the "notifiers" list in struct v4l2_async_notifier. The
information can be found from existing data structures.
- Explicitly check that registering a non-subdev notifier has v4l2_dev and
a subdev notifier has a sub-device pointer.
- Unified several code paths between subdev notifiers and non-subdev
notifiers.
- Fixed v4l2_async_notifier_release() --- calling it on a notifier for
which the driver had allocated the subdevs array would lead calling
kvfree() on that array. Now notifier->max_subdevs is checked before
proceeding.
- Fixed a use-after-free issue in
v4l2_async_notifier_fwnode_parse_endpoints().
- Small fixes to KernelDoc documentation for
v4l2_async_notifier_parse_fwnode_endpoints().
since v6:
- Drop the last patch that added variant for parsing endpoints given
specific port and endpoints numbers.
- Separate driver changes from the fwnode endpoint parser patch into two
patches. rcar-vin driver is now using the name function.
- Use -ENOTCONN to tell the parser that and endpoint (or a reference) is
to be ignored.
- parse_endpoint and parse_single callback functions are now optional and
documented as such.
- Added Laurent's patch adding notifier operations struct which I rebase
on the fwnode parser patchset. I wrote another patch to call the
notifier operations through macros.
- Add DT bindings for flash and lens devices.
- V4L2 fwnode parser for references (such as flash and lens).
- Added smiapp driver support for async sub-devices (lens and flash).
- Added a few fixes for omap3isp.
since v5:
- Use v4l2_async_ prefix for static functions as well (4th patch)
- Use memcpy() to copy array rather than a loop
- Document that the v4l2_async_subdev pointer in driver specific struct
must be the first member
- Improve documentation of the added functions (4th and 5th
patches)
- Arguments
- More thorough explation of the purpose, usage and object
lifetime
- Added acks
since v4:
- Prepend the set with three documentation fixes.
- The driver's async struct must begin with struct v4l2_async_subdev. Fix this
for omap3isp and document it.
- Improve documentation for new functions.
- Don't use devm_ family of functions for allocating memory. Introduce
v4l2_async_notifier_release() to release memory resources.
- Rework both v4l2_async_notifier_fwnode_parse_endpoints() and
v4l2_async_notifier_fwnode_parse_endpoint() and the local functions they
call. This should make the code cleaner. Despite the name, for linking
and typical usage reasons the functions remain in v4l2-fwnode.c.
- Convert rcar-vin to use v4l2_async_notifier_fwnode_parse_endpoint().
- Use kvmalloc() for allocating the notifier's subdevs array.
- max_subdevs argument for notifier_realloc is now the total maximum
number of subdevs, not the number of available subdevs.
- Use fwnode_device_is_available() to make sure the device actually
exists.
- Move the note telling v4l2_async_notifier_fwnode_parse_endpoints()
should not be used by new drivers to the last patch adding
v4l2_async_notifier_fwnode_parse_endpoint().
since v3:
- Rebase on current mediatree master.
since v2:
- Rebase on CCP2 support patches.
- Prepend a patch cleaning up omap3isp driver a little.
since v1:
- The first patch has been merged (it was a bugfix).
- In anticipation that the parsing can take place over several iterations,
take the existing number of async sub-devices into account when
re-allocating an array of async sub-devices.
- Rework the first patch to better anticipate parsing single endpoint at a
time by a driver.
- Add a second patch that adds a function for parsing endpoints one at a
time based on port and endpoint numbers.
Laurent Pinchart (1):
v4l: async: Move async subdev notifier operations to a separate
structure
Pavel Machek (1):
et8ek8: Add support for flash and lens devices
Sakari Ailus (23):
v4l: fwnode: Move KernelDoc documentation to the header
v4l: async: Remove re-probing support
v4l: async: Use more intuitive names for internal functions
v4l: async: Add V4L2 async documentation to the documentation build
v4l: fwnode: Support generic parsing of graph endpoints in a device
omap3isp: Use generic parser for parsing fwnode endpoints
rcar-vin: Use generic parser for parsing fwnode endpoints
omap3isp: Fix check for our own sub-devices
omap3isp: Print the name of the entity where no source pads could be
found
v4l: async: Introduce helpers for calling async ops callbacks
v4l: async: Register sub-devices before calling bound callback
v4l: async: Allow async notifier register call succeed with no subdevs
v4l: async: Allow binding notifiers to sub-devices
dt: bindings: Add a binding for flash LED devices associated to a
sensor
dt: bindings: Add lens-focus binding for image sensors
v4l: fwnode: Add a helper function for parsing generic references
v4l: fwnode: Add a helper function to obtain device / integer
references
v4l: fwnode: Add convenience function for parsing common external refs
dt: bindings: smiapp: Document lens-focus and flash-leds properties
smiapp: Add support for flash and lens devices
ov5670: Add support for flash and lens devices
ov13858: Add support for flash and lens devices
arm: dts: omap3: N9/N950: Add flash references to the camera
.../devicetree/bindings/media/i2c/nokia,smia.txt | 2 +
.../devicetree/bindings/media/video-interfaces.txt | 10 +
Documentation/media/kapi/v4l2-async.rst | 3 +
Documentation/media/kapi/v4l2-core.rst | 1 +
arch/arm/boot/dts/omap3-n9.dts | 1 +
arch/arm/boot/dts/omap3-n950-n9.dtsi | 4 +-
arch/arm/boot/dts/omap3-n950.dts | 1 +
drivers/media/i2c/et8ek8/et8ek8_driver.c | 21 +-
drivers/media/i2c/ov13858.c | 26 +-
drivers/media/i2c/ov5670.c | 33 +-
drivers/media/i2c/smiapp/smiapp-core.c | 38 +-
drivers/media/i2c/smiapp/smiapp.h | 4 +-
drivers/media/platform/am437x/am437x-vpfe.c | 8 +-
drivers/media/platform/atmel/atmel-isc.c | 10 +-
drivers/media/platform/atmel/atmel-isi.c | 10 +-
drivers/media/platform/davinci/vpif_capture.c | 8 +-
drivers/media/platform/davinci/vpif_display.c | 8 +-
drivers/media/platform/exynos4-is/media-dev.c | 8 +-
drivers/media/platform/omap3isp/isp.c | 127 ++---
drivers/media/platform/omap3isp/isp.h | 5 +-
drivers/media/platform/pxa_camera.c | 8 +-
drivers/media/platform/qcom/camss-8x16/camss.c | 8 +-
drivers/media/platform/rcar-vin/rcar-core.c | 122 ++---
drivers/media/platform/rcar-vin/rcar-dma.c | 10 +-
drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 +-
drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
drivers/media/platform/rcar_drif.c | 10 +-
drivers/media/platform/soc_camera/soc_camera.c | 14 +-
drivers/media/platform/stm32/stm32-dcmi.c | 10 +-
drivers/media/platform/ti-vpe/cal.c | 8 +-
drivers/media/platform/xilinx/xilinx-vipp.c | 8 +-
drivers/media/v4l2-core/v4l2-async.c | 346 +++++++++----
drivers/media/v4l2-core/v4l2-fwnode.c | 565 ++++++++++++++++++---
drivers/staging/media/imx/imx-media-dev.c | 8 +-
include/media/v4l2-async.h | 69 ++-
include/media/v4l2-fwnode.h | 219 +++++++-
36 files changed, 1329 insertions(+), 422 deletions(-)
create mode 100644 Documentation/media/kapi/v4l2-async.rst
--
2.11.0
^ permalink raw reply [flat|nested] 137+ messages in thread
* [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
In V4L2 the practice is to have the KernelDoc documentation in the header
and not in .c source code files. This consequently makes the V4L2 fwnode
function documentation part of the Media documentation build.
Also correct the link related function and argument naming in
documentation.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 75 --------------------------------
include/media/v4l2-fwnode.h | 81 ++++++++++++++++++++++++++++++++++-
2 files changed, 80 insertions(+), 76 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 40b2fbfe8865..706f9e7b90f1 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -181,25 +181,6 @@ v4l2_fwnode_endpoint_parse_csi1_bus(struct fwnode_handle *fwnode,
vep->bus_type = V4L2_MBUS_CSI1;
}
-/**
- * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
- * @fwnode: pointer to the endpoint's fwnode handle
- * @vep: pointer to the V4L2 fwnode data structure
- *
- * All properties are optional. If none are found, we don't set any flags. This
- * means the port has a static configuration and no properties have to be
- * specified explicitly. If any properties that identify the bus as parallel
- * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
- * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
- * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
- * reference to @fwnode.
- *
- * NOTE: This function does not parse properties the size of which is variable
- * without a low fixed limit. Please use v4l2_fwnode_endpoint_alloc_parse() in
- * new drivers instead.
- *
- * Return: 0 on success or a negative error code on failure.
- */
int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
struct v4l2_fwnode_endpoint *vep)
{
@@ -239,14 +220,6 @@ int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_parse);
-/*
- * v4l2_fwnode_endpoint_free() - free the V4L2 fwnode acquired by
- * v4l2_fwnode_endpoint_alloc_parse()
- * @vep - the V4L2 fwnode the resources of which are to be released
- *
- * It is safe to call this function with NULL argument or on a V4L2 fwnode the
- * parsing of which failed.
- */
void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep)
{
if (IS_ERR_OR_NULL(vep))
@@ -257,29 +230,6 @@ void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep)
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_free);
-/**
- * v4l2_fwnode_endpoint_alloc_parse() - parse all fwnode node properties
- * @fwnode: pointer to the endpoint's fwnode handle
- *
- * All properties are optional. If none are found, we don't set any flags. This
- * means the port has a static configuration and no properties have to be
- * specified explicitly. If any properties that identify the bus as parallel
- * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
- * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
- * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
- * reference to @fwnode.
- *
- * v4l2_fwnode_endpoint_alloc_parse() has two important differences to
- * v4l2_fwnode_endpoint_parse():
- *
- * 1. It also parses variable size data.
- *
- * 2. The memory it has allocated to store the variable size data must be freed
- * using v4l2_fwnode_endpoint_free() when no longer needed.
- *
- * Return: Pointer to v4l2_fwnode_endpoint if successful, on an error pointer
- * on error.
- */
struct v4l2_fwnode_endpoint *v4l2_fwnode_endpoint_alloc_parse(
struct fwnode_handle *fwnode)
{
@@ -322,24 +272,6 @@ struct v4l2_fwnode_endpoint *v4l2_fwnode_endpoint_alloc_parse(
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_alloc_parse);
-/**
- * v4l2_fwnode_endpoint_parse_link() - parse a link between two endpoints
- * @__fwnode: pointer to the endpoint's fwnode at the local end of the link
- * @link: pointer to the V4L2 fwnode link data structure
- *
- * Fill the link structure with the local and remote nodes and port numbers.
- * The local_node and remote_node fields are set to point to the local and
- * remote port's parent nodes respectively (the port parent node being the
- * parent node of the port node if that node isn't a 'ports' node, or the
- * grand-parent node of the port node otherwise).
- *
- * A reference is taken to both the local and remote nodes, the caller must use
- * v4l2_fwnode_endpoint_put_link() to drop the references when done with the
- * link.
- *
- * Return: 0 on success, or -ENOLINK if the remote endpoint fwnode can't be
- * found.
- */
int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,
struct v4l2_fwnode_link *link)
{
@@ -374,13 +306,6 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_parse_link);
-/**
- * v4l2_fwnode_put_link() - drop references to nodes in a link
- * @link: pointer to the V4L2 fwnode link data structure
- *
- * Drop references to the local and remote nodes in the link. This function
- * must be called on every link parsed with v4l2_fwnode_parse_link().
- */
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
{
fwnode_handle_put(link->local_node);
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 7adec9851d9e..68eb22ba571b 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -113,13 +113,92 @@ struct v4l2_fwnode_link {
unsigned int remote_port;
};
+/**
+ * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
+ * @fwnode: pointer to the endpoint's fwnode handle
+ * @vep: pointer to the V4L2 fwnode data structure
+ *
+ * All properties are optional. If none are found, we don't set any flags. This
+ * means the port has a static configuration and no properties have to be
+ * specified explicitly. If any properties that identify the bus as parallel
+ * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
+ * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
+ * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
+ * reference to @fwnode.
+ *
+ * NOTE: This function does not parse properties the size of which is variable
+ * without a low fixed limit. Please use v4l2_fwnode_endpoint_alloc_parse() in
+ * new drivers instead.
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
struct v4l2_fwnode_endpoint *vep);
+
+/*
+ * v4l2_fwnode_endpoint_free() - free the V4L2 fwnode acquired by
+ * v4l2_fwnode_endpoint_alloc_parse()
+ * @vep - the V4L2 fwnode the resources of which are to be released
+ *
+ * It is safe to call this function with NULL argument or on a V4L2 fwnode the
+ * parsing of which failed.
+ */
+void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep);
+
+/**
+ * v4l2_fwnode_endpoint_alloc_parse() - parse all fwnode node properties
+ * @fwnode: pointer to the endpoint's fwnode handle
+ *
+ * All properties are optional. If none are found, we don't set any flags. This
+ * means the port has a static configuration and no properties have to be
+ * specified explicitly. If any properties that identify the bus as parallel
+ * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
+ * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
+ * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
+ * reference to @fwnode.
+ *
+ * v4l2_fwnode_endpoint_alloc_parse() has two important differences to
+ * v4l2_fwnode_endpoint_parse():
+ *
+ * 1. It also parses variable size data.
+ *
+ * 2. The memory it has allocated to store the variable size data must be freed
+ * using v4l2_fwnode_endpoint_free() when no longer needed.
+ *
+ * Return: Pointer to v4l2_fwnode_endpoint if successful, on an error pointer
+ * on error.
+ */
struct v4l2_fwnode_endpoint *v4l2_fwnode_endpoint_alloc_parse(
struct fwnode_handle *fwnode);
-void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep);
+
+/**
+ * v4l2_fwnode_parse_link() - parse a link between two endpoints
+ * @fwnode: pointer to the endpoint's fwnode at the local end of the link
+ * @link: pointer to the V4L2 fwnode link data structure
+ *
+ * Fill the link structure with the local and remote nodes and port numbers.
+ * The local_node and remote_node fields are set to point to the local and
+ * remote port's parent nodes respectively (the port parent node being the
+ * parent node of the port node if that node isn't a 'ports' node, or the
+ * grand-parent node of the port node otherwise).
+ *
+ * A reference is taken to both the local and remote nodes, the caller must use
+ * v4l2_fwnode_put_link() to drop the references when done with the
+ * link.
+ *
+ * Return: 0 on success, or -ENOLINK if the remote endpoint fwnode can't be
+ * found.
+ */
int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
struct v4l2_fwnode_link *link);
+
+/**
+ * v4l2_fwnode_put_link() - drop references to nodes in a link
+ * @link: pointer to the V4L2 fwnode link data structure
+ *
+ * Drop references to the local and remote nodes in the link. This function
+ * must be called on every link parsed with v4l2_fwnode_parse_link().
+ */
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
#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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
In V4L2 the practice is to have the KernelDoc documentation in the header
and not in .c source code files. This consequently makes the V4L2 fwnode
function documentation part of the Media documentation build.
Also correct the link related function and argument naming in
documentation.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 75 --------------------------------
include/media/v4l2-fwnode.h | 81 ++++++++++++++++++++++++++++++++++-
2 files changed, 80 insertions(+), 76 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 40b2fbfe8865..706f9e7b90f1 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -181,25 +181,6 @@ v4l2_fwnode_endpoint_parse_csi1_bus(struct fwnode_handle *fwnode,
vep->bus_type = V4L2_MBUS_CSI1;
}
-/**
- * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
- * @fwnode: pointer to the endpoint's fwnode handle
- * @vep: pointer to the V4L2 fwnode data structure
- *
- * All properties are optional. If none are found, we don't set any flags. This
- * means the port has a static configuration and no properties have to be
- * specified explicitly. If any properties that identify the bus as parallel
- * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
- * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
- * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
- * reference to @fwnode.
- *
- * NOTE: This function does not parse properties the size of which is variable
- * without a low fixed limit. Please use v4l2_fwnode_endpoint_alloc_parse() in
- * new drivers instead.
- *
- * Return: 0 on success or a negative error code on failure.
- */
int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
struct v4l2_fwnode_endpoint *vep)
{
@@ -239,14 +220,6 @@ int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_parse);
-/*
- * v4l2_fwnode_endpoint_free() - free the V4L2 fwnode acquired by
- * v4l2_fwnode_endpoint_alloc_parse()
- * @vep - the V4L2 fwnode the resources of which are to be released
- *
- * It is safe to call this function with NULL argument or on a V4L2 fwnode the
- * parsing of which failed.
- */
void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep)
{
if (IS_ERR_OR_NULL(vep))
@@ -257,29 +230,6 @@ void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep)
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_free);
-/**
- * v4l2_fwnode_endpoint_alloc_parse() - parse all fwnode node properties
- * @fwnode: pointer to the endpoint's fwnode handle
- *
- * All properties are optional. If none are found, we don't set any flags. This
- * means the port has a static configuration and no properties have to be
- * specified explicitly. If any properties that identify the bus as parallel
- * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
- * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
- * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
- * reference to @fwnode.
- *
- * v4l2_fwnode_endpoint_alloc_parse() has two important differences to
- * v4l2_fwnode_endpoint_parse():
- *
- * 1. It also parses variable size data.
- *
- * 2. The memory it has allocated to store the variable size data must be freed
- * using v4l2_fwnode_endpoint_free() when no longer needed.
- *
- * Return: Pointer to v4l2_fwnode_endpoint if successful, on an error pointer
- * on error.
- */
struct v4l2_fwnode_endpoint *v4l2_fwnode_endpoint_alloc_parse(
struct fwnode_handle *fwnode)
{
@@ -322,24 +272,6 @@ struct v4l2_fwnode_endpoint *v4l2_fwnode_endpoint_alloc_parse(
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_endpoint_alloc_parse);
-/**
- * v4l2_fwnode_endpoint_parse_link() - parse a link between two endpoints
- * @__fwnode: pointer to the endpoint's fwnode at the local end of the link
- * @link: pointer to the V4L2 fwnode link data structure
- *
- * Fill the link structure with the local and remote nodes and port numbers.
- * The local_node and remote_node fields are set to point to the local and
- * remote port's parent nodes respectively (the port parent node being the
- * parent node of the port node if that node isn't a 'ports' node, or the
- * grand-parent node of the port node otherwise).
- *
- * A reference is taken to both the local and remote nodes, the caller must use
- * v4l2_fwnode_endpoint_put_link() to drop the references when done with the
- * link.
- *
- * Return: 0 on success, or -ENOLINK if the remote endpoint fwnode can't be
- * found.
- */
int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,
struct v4l2_fwnode_link *link)
{
@@ -374,13 +306,6 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *__fwnode,
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_parse_link);
-/**
- * v4l2_fwnode_put_link() - drop references to nodes in a link
- * @link: pointer to the V4L2 fwnode link data structure
- *
- * Drop references to the local and remote nodes in the link. This function
- * must be called on every link parsed with v4l2_fwnode_parse_link().
- */
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
{
fwnode_handle_put(link->local_node);
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 7adec9851d9e..68eb22ba571b 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -113,13 +113,92 @@ struct v4l2_fwnode_link {
unsigned int remote_port;
};
+/**
+ * v4l2_fwnode_endpoint_parse() - parse all fwnode node properties
+ * @fwnode: pointer to the endpoint's fwnode handle
+ * @vep: pointer to the V4L2 fwnode data structure
+ *
+ * All properties are optional. If none are found, we don't set any flags. This
+ * means the port has a static configuration and no properties have to be
+ * specified explicitly. If any properties that identify the bus as parallel
+ * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
+ * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
+ * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
+ * reference to @fwnode.
+ *
+ * NOTE: This function does not parse properties the size of which is variable
+ * without a low fixed limit. Please use v4l2_fwnode_endpoint_alloc_parse() in
+ * new drivers instead.
+ *
+ * Return: 0 on success or a negative error code on failure.
+ */
int v4l2_fwnode_endpoint_parse(struct fwnode_handle *fwnode,
struct v4l2_fwnode_endpoint *vep);
+
+/*
+ * v4l2_fwnode_endpoint_free() - free the V4L2 fwnode acquired by
+ * v4l2_fwnode_endpoint_alloc_parse()
+ * @vep - the V4L2 fwnode the resources of which are to be released
+ *
+ * It is safe to call this function with NULL argument or on a V4L2 fwnode the
+ * parsing of which failed.
+ */
+void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep);
+
+/**
+ * v4l2_fwnode_endpoint_alloc_parse() - parse all fwnode node properties
+ * @fwnode: pointer to the endpoint's fwnode handle
+ *
+ * All properties are optional. If none are found, we don't set any flags. This
+ * means the port has a static configuration and no properties have to be
+ * specified explicitly. If any properties that identify the bus as parallel
+ * are found and slave-mode isn't set, we set V4L2_MBUS_MASTER. Similarly, if
+ * we recognise the bus as serial CSI-2 and clock-noncontinuous isn't set, we
+ * set the V4L2_MBUS_CSI2_CONTINUOUS_CLOCK flag. The caller should hold a
+ * reference to @fwnode.
+ *
+ * v4l2_fwnode_endpoint_alloc_parse() has two important differences to
+ * v4l2_fwnode_endpoint_parse():
+ *
+ * 1. It also parses variable size data.
+ *
+ * 2. The memory it has allocated to store the variable size data must be freed
+ * using v4l2_fwnode_endpoint_free() when no longer needed.
+ *
+ * Return: Pointer to v4l2_fwnode_endpoint if successful, on an error pointer
+ * on error.
+ */
struct v4l2_fwnode_endpoint *v4l2_fwnode_endpoint_alloc_parse(
struct fwnode_handle *fwnode);
-void v4l2_fwnode_endpoint_free(struct v4l2_fwnode_endpoint *vep);
+
+/**
+ * v4l2_fwnode_parse_link() - parse a link between two endpoints
+ * @fwnode: pointer to the endpoint's fwnode at the local end of the link
+ * @link: pointer to the V4L2 fwnode link data structure
+ *
+ * Fill the link structure with the local and remote nodes and port numbers.
+ * The local_node and remote_node fields are set to point to the local and
+ * remote port's parent nodes respectively (the port parent node being the
+ * parent node of the port node if that node isn't a 'ports' node, or the
+ * grand-parent node of the port node otherwise).
+ *
+ * A reference is taken to both the local and remote nodes, the caller must use
+ * v4l2_fwnode_put_link() to drop the references when done with the
+ * link.
+ *
+ * Return: 0 on success, or -ENOLINK if the remote endpoint fwnode can't be
+ * found.
+ */
int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
struct v4l2_fwnode_link *link);
+
+/**
+ * v4l2_fwnode_put_link() - drop references to nodes in a link
+ * @link: pointer to the V4L2 fwnode link data structure
+ *
+ * Drop references to the local and remote nodes in the link. This function
+ * must be called on every link parsed with v4l2_fwnode_parse_link().
+ */
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
#endif /* _V4L2_FWNODE_H */
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 02/25] v4l: async: Remove re-probing support
2017-09-15 14:16 ` Sakari Ailus
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-3-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Remove V4L2 async re-probing support. The re-probing support has been
there to support cases where the sub-devices require resources provided by
the main driver's hardware to function, such as clocks.
Reprobing has allowed unbinding and again binding the main driver without
explicilty unbinding the sub-device drivers. This is certainly not a
common need, and the responsibility will be the user's going forward.
An alternative could have been to introduce notifier specific locks.
Considering the complexity of the re-probing and that it isn't really a
solution to a problem but a workaround, remove re-probing instead.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/v4l2-core/v4l2-async.c | 54 ------------------------------------
1 file changed, 54 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index d741a8e0fdac..e109d9da4653 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -198,78 +198,24 @@ EXPORT_SYMBOL(v4l2_async_notifier_register);
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);
- struct device **dev;
- int i = 0;
if (!notifier->v4l2_dev)
return;
- dev = kvmalloc_array(n_subdev, sizeof(*dev), GFP_KERNEL);
- if (!dev) {
- dev_err(notifier->v4l2_dev->dev,
- "Failed to allocate device cache!\n");
- }
-
mutex_lock(&list_lock);
list_del(¬ifier->list);
list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
- struct device *d;
-
- d = get_device(sd->dev);
-
v4l2_async_cleanup(sd);
- /* If we handled USB devices, we'd have to lock the parent too */
- device_release_driver(d);
-
if (notifier->unbind)
notifier->unbind(notifier, sd, sd->asd);
-
- /*
- * Store device at the device cache, in order to call
- * put_device() on the final step
- */
- if (dev)
- dev[i++] = d;
- else
- put_device(d);
}
mutex_unlock(&list_lock);
- /*
- * Call device_attach() to reprobe devices
- *
- * NOTE: If dev allocation fails, i is 0, and the whole loop won't be
- * executed.
- */
- while (i--) {
- struct device *d = dev[i];
-
- if (d && device_attach(d) < 0) {
- const char *name = "(none)";
- int lock = device_trylock(d);
-
- if (lock && d->driver)
- name = d->driver->name;
- dev_err(d, "Failed to re-probe to %s\n", name);
- if (lock)
- device_unlock(d);
- }
- put_device(d);
- }
- kvfree(dev);
-
notifier->v4l2_dev = NULL;
-
- /*
- * Don't care about the waiting list, it is initialised and populated
- * upon notifier registration.
- */
}
EXPORT_SYMBOL(v4l2_async_notifier_unregister);
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 03/25] v4l: async: Use more intuitive names for internal functions
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Rename internal functions to make the names of the functions better
describe what they do.
Old name New name
v4l2_async_test_notify v4l2_async_match_notify
v4l2_async_belongs v4l2_async_find_match
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
---
drivers/media/v4l2-core/v4l2-async.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index e109d9da4653..831f185ecd47 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -60,8 +60,8 @@ static LIST_HEAD(subdev_list);
static LIST_HEAD(notifier_list);
static DEFINE_MUTEX(list_lock);
-static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *notifier,
- struct v4l2_subdev *sd)
+static struct v4l2_async_subdev *v4l2_async_find_match(
+ struct v4l2_async_notifier *notifier, struct v4l2_subdev *sd)
{
bool (*match)(struct v4l2_subdev *, struct v4l2_async_subdev *);
struct v4l2_async_subdev *asd;
@@ -95,9 +95,9 @@ static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *
return NULL;
}
-static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier,
- struct v4l2_subdev *sd,
- struct v4l2_async_subdev *asd)
+static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *sd,
+ struct v4l2_async_subdev *asd)
{
int ret;
@@ -175,11 +175,11 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
int ret;
- asd = v4l2_async_belongs(notifier, sd);
+ asd = v4l2_async_find_match(notifier, sd);
if (!asd)
continue;
- ret = v4l2_async_test_notify(notifier, sd, asd);
+ ret = v4l2_async_match_notify(notifier, sd, asd);
if (ret < 0) {
mutex_unlock(&list_lock);
return ret;
@@ -236,9 +236,10 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
INIT_LIST_HEAD(&sd->async_list);
list_for_each_entry(notifier, ¬ifier_list, list) {
- struct v4l2_async_subdev *asd = v4l2_async_belongs(notifier, sd);
+ struct v4l2_async_subdev *asd = v4l2_async_find_match(notifier,
+ sd);
if (asd) {
- int ret = v4l2_async_test_notify(notifier, sd, asd);
+ int ret = v4l2_async_match_notify(notifier, sd, asd);
mutex_unlock(&list_lock);
return ret;
}
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 03/25] v4l: async: Use more intuitive names for internal functions
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Rename internal functions to make the names of the functions better
describe what they do.
Old name New name
v4l2_async_test_notify v4l2_async_match_notify
v4l2_async_belongs v4l2_async_find_match
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/media/v4l2-core/v4l2-async.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index e109d9da4653..831f185ecd47 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -60,8 +60,8 @@ static LIST_HEAD(subdev_list);
static LIST_HEAD(notifier_list);
static DEFINE_MUTEX(list_lock);
-static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *notifier,
- struct v4l2_subdev *sd)
+static struct v4l2_async_subdev *v4l2_async_find_match(
+ struct v4l2_async_notifier *notifier, struct v4l2_subdev *sd)
{
bool (*match)(struct v4l2_subdev *, struct v4l2_async_subdev *);
struct v4l2_async_subdev *asd;
@@ -95,9 +95,9 @@ static struct v4l2_async_subdev *v4l2_async_belongs(struct v4l2_async_notifier *
return NULL;
}
-static int v4l2_async_test_notify(struct v4l2_async_notifier *notifier,
- struct v4l2_subdev *sd,
- struct v4l2_async_subdev *asd)
+static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *sd,
+ struct v4l2_async_subdev *asd)
{
int ret;
@@ -175,11 +175,11 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
int ret;
- asd = v4l2_async_belongs(notifier, sd);
+ asd = v4l2_async_find_match(notifier, sd);
if (!asd)
continue;
- ret = v4l2_async_test_notify(notifier, sd, asd);
+ ret = v4l2_async_match_notify(notifier, sd, asd);
if (ret < 0) {
mutex_unlock(&list_lock);
return ret;
@@ -236,9 +236,10 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)
INIT_LIST_HEAD(&sd->async_list);
list_for_each_entry(notifier, ¬ifier_list, list) {
- struct v4l2_async_subdev *asd = v4l2_async_belongs(notifier, sd);
+ struct v4l2_async_subdev *asd = v4l2_async_find_match(notifier,
+ sd);
if (asd) {
- int ret = v4l2_async_test_notify(notifier, sd, asd);
+ int ret = v4l2_async_match_notify(notifier, sd, asd);
mutex_unlock(&list_lock);
return ret;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 04/25] v4l: async: Add V4L2 async documentation to the documentation build
2017-09-15 14:16 ` Sakari Ailus
(?)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
The V4L2 async wasn't part of the documentation build. Fix this.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Documentation/media/kapi/v4l2-async.rst | 3 +++
Documentation/media/kapi/v4l2-core.rst | 1 +
2 files changed, 4 insertions(+)
create mode 100644 Documentation/media/kapi/v4l2-async.rst
diff --git a/Documentation/media/kapi/v4l2-async.rst b/Documentation/media/kapi/v4l2-async.rst
new file mode 100644
index 000000000000..523ff9eb09a0
--- /dev/null
+++ b/Documentation/media/kapi/v4l2-async.rst
@@ -0,0 +1,3 @@
+V4L2 async kAPI
+^^^^^^^^^^^^^^^
+.. kernel-doc:: include/media/v4l2-async.h
diff --git a/Documentation/media/kapi/v4l2-core.rst b/Documentation/media/kapi/v4l2-core.rst
index c7434f38fd9c..5cf292037a48 100644
--- a/Documentation/media/kapi/v4l2-core.rst
+++ b/Documentation/media/kapi/v4l2-core.rst
@@ -19,6 +19,7 @@ Video4Linux devices
v4l2-mc
v4l2-mediabus
v4l2-mem2mem
+ v4l2-async
v4l2-fwnode
v4l2-rect
v4l2-tuner
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Add two functions for parsing devices graph endpoints:
v4l2_async_notifier_parse_fwnode_endpoints and
v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
over all endpoints whereas the latter only iterates over the endpoints in
a given port.
The former is mostly useful for existing drivers that currently implement
the iteration over all the endpoints themselves whereas the latter is
especially intended for devices with both sinks and sources: async
sub-devices for external devices connected to the device's sources will
have already been set up, or they are part of the master device.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
drivers/media/v4l2-core/v4l2-fwnode.c | 185 ++++++++++++++++++++++++++++++++++
include/media/v4l2-async.h | 24 ++++-
include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
4 files changed, 354 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 831f185ecd47..bf0215dde616 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -22,6 +22,7 @@
#include <media/v4l2-async.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
@@ -219,6 +220,35 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
}
EXPORT_SYMBOL(v4l2_async_notifier_unregister);
+void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
+{
+ unsigned int i;
+
+ if (!notifier->max_subdevs)
+ return;
+
+ for (i = 0; i < notifier->num_subdevs; i++) {
+ struct v4l2_async_subdev *asd = notifier->subdevs[i];
+
+ switch (asd->match_type) {
+ case V4L2_ASYNC_MATCH_FWNODE:
+ fwnode_handle_put(asd->match.fwnode.fwnode);
+ break;
+ default:
+ WARN_ON_ONCE(true);
+ }
+
+ kfree(asd);
+ }
+
+ notifier->max_subdevs = 0;
+ notifier->num_subdevs = 0;
+
+ kvfree(notifier->subdevs);
+ notifier->subdevs = NULL;
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_release);
+
int v4l2_async_register_subdev(struct v4l2_subdev *sd)
{
struct v4l2_async_notifier *notifier;
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 706f9e7b90f1..44ee35f6aad5 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -19,6 +19,7 @@
*/
#include <linux/acpi.h>
#include <linux/kernel.h>
+#include <linux/mm.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/property.h>
@@ -26,6 +27,7 @@
#include <linux/string.h>
#include <linux/types.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-fwnode.h>
enum v4l2_fwnode_bus_type {
@@ -313,6 +315,189 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
+static int v4l2_async_notifier_realloc(struct v4l2_async_notifier *notifier,
+ unsigned int max_subdevs)
+{
+ struct v4l2_async_subdev **subdevs;
+
+ if (max_subdevs <= notifier->max_subdevs)
+ return 0;
+
+ subdevs = kvmalloc_array(
+ max_subdevs, sizeof(*notifier->subdevs),
+ GFP_KERNEL | __GFP_ZERO);
+ if (!subdevs)
+ return -ENOMEM;
+
+ if (notifier->subdevs) {
+ memcpy(subdevs, notifier->subdevs,
+ sizeof(*subdevs) * notifier->num_subdevs);
+
+ kvfree(notifier->subdevs);
+ }
+
+ notifier->subdevs = subdevs;
+ notifier->max_subdevs = max_subdevs;
+
+ return 0;
+}
+
+static int v4l2_async_notifier_fwnode_parse_endpoint(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ struct fwnode_handle *endpoint, unsigned int asd_struct_size,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ struct v4l2_async_subdev *asd;
+ struct v4l2_fwnode_endpoint *vep;
+ int ret = 0;
+
+ asd = kzalloc(asd_struct_size, GFP_KERNEL);
+ if (!asd)
+ return -ENOMEM;
+
+ asd->match.fwnode.fwnode =
+ fwnode_graph_get_remote_port_parent(endpoint);
+ if (!asd->match.fwnode.fwnode) {
+ dev_warn(dev, "bad remote port parent\n");
+ ret = -EINVAL;
+ goto out_err;
+ }
+
+ /* Ignore endpoints the parsing of which failed. */
+ vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
+ if (IS_ERR(vep)) {
+ ret = PTR_ERR(vep);
+ dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
+ ret);
+ goto out_err;
+ }
+
+ ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
+ if (ret == -ENOTCONN)
+ dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
+ vep->base.id);
+ else if (ret < 0)
+ dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
+ vep->base.port, vep->base.id, ret);
+ v4l2_fwnode_endpoint_free(vep);
+ if (ret < 0)
+ goto out_err;
+
+ asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
+ notifier->subdevs[notifier->num_subdevs] = asd;
+ notifier->num_subdevs++;
+
+ return 0;
+
+out_err:
+ fwnode_handle_put(asd->match.fwnode.fwnode);
+ kfree(asd);
+
+ return ret == -ENOTCONN ? 0 : ret;
+}
+
+static int __v4l2_async_notifier_parse_fwnode_endpoints(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size, unsigned int port, bool has_port,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ struct fwnode_handle *fwnode = NULL;
+ unsigned int max_subdevs = notifier->max_subdevs;
+ int ret;
+
+ if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
+ return -EINVAL;
+
+ for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
+ dev_fwnode(dev), fwnode)); ) {
+ if (!fwnode_device_is_available(
+ fwnode_graph_get_port_parent(fwnode)))
+ continue;
+
+ if (has_port) {
+ struct fwnode_endpoint ep;
+
+ ret = fwnode_graph_parse_endpoint(fwnode, &ep);
+ if (ret) {
+ fwnode_handle_put(fwnode);
+ return ret;
+ }
+
+ if (ep.port != port)
+ continue;
+ }
+ max_subdevs++;
+ }
+
+ /* No subdevs to add? Return here. */
+ if (max_subdevs == notifier->max_subdevs)
+ return 0;
+
+ ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
+ if (ret)
+ return ret;
+
+ for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
+ dev_fwnode(dev), fwnode)); ) {
+ if (!fwnode_device_is_available(
+ fwnode_graph_get_port_parent(fwnode)))
+ continue;
+
+ if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
+ ret = -EINVAL;
+ break;
+ }
+
+ if (has_port) {
+ struct fwnode_endpoint ep;
+
+ ret = fwnode_graph_parse_endpoint(fwnode, &ep);
+ if (ret)
+ break;
+
+ if (ep.port != port)
+ continue;
+ }
+
+ ret = v4l2_async_notifier_fwnode_parse_endpoint(
+ dev, notifier, fwnode, asd_struct_size, parse_endpoint);
+ if (ret < 0)
+ break;
+ }
+
+ fwnode_handle_put(fwnode);
+
+ return ret;
+}
+
+int v4l2_async_notifier_parse_fwnode_endpoints(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ return __v4l2_async_notifier_parse_fwnode_endpoints(
+ dev, notifier, asd_struct_size, 0, false, parse_endpoint);
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
+
+int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size, unsigned int port,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ return __v4l2_async_notifier_parse_fwnode_endpoints(
+ dev, notifier, asd_struct_size, port, true, parse_endpoint);
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
+
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-async.h b/include/media/v4l2-async.h
index c69d8c8a66d0..96fa1afc00dd 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -18,7 +18,6 @@ struct device;
struct device_node;
struct v4l2_device;
struct v4l2_subdev;
-struct v4l2_async_notifier;
/* A random max subdevice number, used to allocate an array on stack */
#define V4L2_MAX_SUBDEVS 128U
@@ -50,6 +49,10 @@ enum v4l2_async_match_type {
* @match: union of per-bus type matching data sets
* @list: used to link struct v4l2_async_subdev objects, waiting to be
* probed, to a notifier->waiting list
+ *
+ * When this struct is used as a member in a driver specific struct,
+ * the driver specific struct shall contain the @struct
+ * v4l2_async_subdev as its first member.
*/
struct v4l2_async_subdev {
enum v4l2_async_match_type match_type;
@@ -78,7 +81,8 @@ struct v4l2_async_subdev {
/**
* struct v4l2_async_notifier - v4l2_device notifier data
*
- * @num_subdevs: number of subdevices
+ * @num_subdevs: number of subdevices used in the subdevs array
+ * @max_subdevs: number of subdevices allocated in the subdevs array
* @subdevs: array of pointers to subdevice descriptors
* @v4l2_dev: pointer to struct v4l2_device
* @waiting: list of struct v4l2_async_subdev, waiting for their drivers
@@ -90,6 +94,7 @@ struct v4l2_async_subdev {
*/
struct v4l2_async_notifier {
unsigned int num_subdevs;
+ unsigned int max_subdevs;
struct v4l2_async_subdev **subdevs;
struct v4l2_device *v4l2_dev;
struct list_head waiting;
@@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
/**
+ * v4l2_async_notifier_release - release notifier resources
+ * @notifier: the notifier the resources of which are to be released
+ *
+ * Release memory resources related to a notifier, including the async
+ * sub-devices allocated for the purposes of the notifier. The user is
+ * responsible for releasing the notifier's resources after calling
+ * @v4l2_async_notifier_parse_fwnode_endpoints.
+ *
+ * There is no harm from calling v4l2_async_notifier_release in other
+ * cases as long as its memory has been zeroed after it has been
+ * allocated.
+ */
+void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
+
+/**
* v4l2_async_register_subdev - registers a sub-device to the asynchronous
* subdevice framework
*
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 68eb22ba571b..83afac48ea6b 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -25,6 +25,8 @@
#include <media/v4l2-mediabus.h>
struct fwnode_handle;
+struct v4l2_async_notifier;
+struct v4l2_async_subdev;
#define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
@@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
*/
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
+/**
+ * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
+ * device node
+ * @dev: the device the endpoints of which are to be parsed
+ * @notifier: notifier for @dev
+ * @asd_struct_size: size of the driver's async sub-device struct, including
+ * sizeof(struct v4l2_async_subdev). The &struct
+ * v4l2_async_subdev shall be the first member of
+ * the driver's async sub-device struct, i.e. both
+ * begin at the same memory address.
+ * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
+ * endpoint. Optional.
+ * Return: %0 on success
+ * %-ENOTCONN if the endpoint is to be skipped but this
+ * should not be considered as an error
+ * %-EINVAL if the endpoint configuration is invalid
+ *
+ * Parse the fwnode endpoints of the @dev device and populate the async sub-
+ * devices array of the notifier. The @parse_endpoint callback function is
+ * called for each endpoint with the corresponding async sub-device pointer to
+ * let the caller initialize the driver-specific part of the async sub-device
+ * structure.
+ *
+ * The notifier memory shall be zeroed before this function is called on the
+ * notifier.
+ *
+ * This function may not be called on a registered notifier and may be called on
+ * a notifier only once.
+ *
+ * Do not change the notifier's subdevs array, take references to the subdevs
+ * array itself or change the notifier's num_subdevs field. This is because this
+ * function allocates and reallocates the subdevs array based on parsing
+ * endpoints.
+ *
+ * The @struct v4l2_fwnode_endpoint passed to the callback function
+ * @parse_endpoint is released once the function is finished. If there is a need
+ * to retain that configuration, the user needs to allocate memory for it.
+ *
+ * Any notifier populated using this function must be released with a call to
+ * v4l2_async_notifier_release() after it has been unregistered and the async
+ * sub-devices are no longer in use, even if the function returned an error.
+ *
+ * Return: %0 on success, including when no async sub-devices are found
+ * %-ENOMEM if memory allocation failed
+ * %-EINVAL if graph or endpoint parsing failed
+ * Other error codes as returned by @parse_endpoint
+ */
+int v4l2_async_notifier_parse_fwnode_endpoints(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd));
+
+/**
+ * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
+ * endpoints of a port in a
+ * device node
+ * @dev: the device the endpoints of which are to be parsed
+ * @notifier: notifier for @dev
+ * @asd_struct_size: size of the driver's async sub-device struct, including
+ * sizeof(struct v4l2_async_subdev). The &struct
+ * v4l2_async_subdev shall be the first member of
+ * the driver's async sub-device struct, i.e. both
+ * begin at the same memory address.
+ * @port: port number where endpoints are to be parsed
+ * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
+ * endpoint. Optional.
+ * Return: %0 on success
+ * %-ENOTCONN if the endpoint is to be skipped but this
+ * should not be considered as an error
+ * %-EINVAL if the endpoint configuration is invalid
+ *
+ * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
+ * the exception that it only parses endpoints in a given port. This is useful
+ * on devices that have both sinks and sources: the async sub-devices connected
+ * to sources have already been set up by another driver (on capture devices).
+ *
+ * Parse the fwnode endpoints of the @dev device on a given @port and populate
+ * the async sub-devices array of the notifier. The @parse_endpoint callback
+ * function is called for each endpoint with the corresponding async sub-device
+ * pointer to let the caller initialize the driver-specific part of the async
+ * sub-device structure.
+ *
+ * The notifier memory shall be zeroed before this function is called on the
+ * notifier the first time.
+ *
+ * This function may not be called on a registered notifier and may be called on
+ * a notifier only once per port.
+ *
+ * Do not change the notifier's subdevs array, take references to the subdevs
+ * array itself or change the notifier's num_subdevs field. This is because this
+ * function allocates and reallocates the subdevs array based on parsing
+ * endpoints.
+ *
+ * The @struct v4l2_fwnode_endpoint passed to the callback function
+ * @parse_endpoint is released once the function is finished. If there is a need
+ * to retain that configuration, the user needs to allocate memory for it.
+ *
+ * Any notifier populated using this function must be released with a call to
+ * v4l2_async_notifier_release() after it has been unregistered and the async
+ * sub-devices are no longer in use, even if the function returned an error.
+ *
+ * Return: %0 on success, including when no async sub-devices are found
+ * %-ENOMEM if memory allocation failed
+ * %-EINVAL if graph or endpoint parsing failed
+ * Other error codes as returned by @parse_endpoint
+ */
+int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size, unsigned int port,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ 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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Add two functions for parsing devices graph endpoints:
v4l2_async_notifier_parse_fwnode_endpoints and
v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
over all endpoints whereas the latter only iterates over the endpoints in
a given port.
The former is mostly useful for existing drivers that currently implement
the iteration over all the endpoints themselves whereas the latter is
especially intended for devices with both sinks and sources: async
sub-devices for external devices connected to the device's sources will
have already been set up, or they are part of the master device.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
drivers/media/v4l2-core/v4l2-fwnode.c | 185 ++++++++++++++++++++++++++++++++++
include/media/v4l2-async.h | 24 ++++-
include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
4 files changed, 354 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 831f185ecd47..bf0215dde616 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -22,6 +22,7 @@
#include <media/v4l2-async.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
@@ -219,6 +220,35 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
}
EXPORT_SYMBOL(v4l2_async_notifier_unregister);
+void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
+{
+ unsigned int i;
+
+ if (!notifier->max_subdevs)
+ return;
+
+ for (i = 0; i < notifier->num_subdevs; i++) {
+ struct v4l2_async_subdev *asd = notifier->subdevs[i];
+
+ switch (asd->match_type) {
+ case V4L2_ASYNC_MATCH_FWNODE:
+ fwnode_handle_put(asd->match.fwnode.fwnode);
+ break;
+ default:
+ WARN_ON_ONCE(true);
+ }
+
+ kfree(asd);
+ }
+
+ notifier->max_subdevs = 0;
+ notifier->num_subdevs = 0;
+
+ kvfree(notifier->subdevs);
+ notifier->subdevs = NULL;
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_release);
+
int v4l2_async_register_subdev(struct v4l2_subdev *sd)
{
struct v4l2_async_notifier *notifier;
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 706f9e7b90f1..44ee35f6aad5 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -19,6 +19,7 @@
*/
#include <linux/acpi.h>
#include <linux/kernel.h>
+#include <linux/mm.h>
#include <linux/module.h>
#include <linux/of.h>
#include <linux/property.h>
@@ -26,6 +27,7 @@
#include <linux/string.h>
#include <linux/types.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-fwnode.h>
enum v4l2_fwnode_bus_type {
@@ -313,6 +315,189 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
}
EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
+static int v4l2_async_notifier_realloc(struct v4l2_async_notifier *notifier,
+ unsigned int max_subdevs)
+{
+ struct v4l2_async_subdev **subdevs;
+
+ if (max_subdevs <= notifier->max_subdevs)
+ return 0;
+
+ subdevs = kvmalloc_array(
+ max_subdevs, sizeof(*notifier->subdevs),
+ GFP_KERNEL | __GFP_ZERO);
+ if (!subdevs)
+ return -ENOMEM;
+
+ if (notifier->subdevs) {
+ memcpy(subdevs, notifier->subdevs,
+ sizeof(*subdevs) * notifier->num_subdevs);
+
+ kvfree(notifier->subdevs);
+ }
+
+ notifier->subdevs = subdevs;
+ notifier->max_subdevs = max_subdevs;
+
+ return 0;
+}
+
+static int v4l2_async_notifier_fwnode_parse_endpoint(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ struct fwnode_handle *endpoint, unsigned int asd_struct_size,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ struct v4l2_async_subdev *asd;
+ struct v4l2_fwnode_endpoint *vep;
+ int ret = 0;
+
+ asd = kzalloc(asd_struct_size, GFP_KERNEL);
+ if (!asd)
+ return -ENOMEM;
+
+ asd->match.fwnode.fwnode =
+ fwnode_graph_get_remote_port_parent(endpoint);
+ if (!asd->match.fwnode.fwnode) {
+ dev_warn(dev, "bad remote port parent\n");
+ ret = -EINVAL;
+ goto out_err;
+ }
+
+ /* Ignore endpoints the parsing of which failed. */
+ vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
+ if (IS_ERR(vep)) {
+ ret = PTR_ERR(vep);
+ dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
+ ret);
+ goto out_err;
+ }
+
+ ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
+ if (ret == -ENOTCONN)
+ dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
+ vep->base.id);
+ else if (ret < 0)
+ dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
+ vep->base.port, vep->base.id, ret);
+ v4l2_fwnode_endpoint_free(vep);
+ if (ret < 0)
+ goto out_err;
+
+ asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
+ notifier->subdevs[notifier->num_subdevs] = asd;
+ notifier->num_subdevs++;
+
+ return 0;
+
+out_err:
+ fwnode_handle_put(asd->match.fwnode.fwnode);
+ kfree(asd);
+
+ return ret == -ENOTCONN ? 0 : ret;
+}
+
+static int __v4l2_async_notifier_parse_fwnode_endpoints(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size, unsigned int port, bool has_port,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ struct fwnode_handle *fwnode = NULL;
+ unsigned int max_subdevs = notifier->max_subdevs;
+ int ret;
+
+ if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
+ return -EINVAL;
+
+ for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
+ dev_fwnode(dev), fwnode)); ) {
+ if (!fwnode_device_is_available(
+ fwnode_graph_get_port_parent(fwnode)))
+ continue;
+
+ if (has_port) {
+ struct fwnode_endpoint ep;
+
+ ret = fwnode_graph_parse_endpoint(fwnode, &ep);
+ if (ret) {
+ fwnode_handle_put(fwnode);
+ return ret;
+ }
+
+ if (ep.port != port)
+ continue;
+ }
+ max_subdevs++;
+ }
+
+ /* No subdevs to add? Return here. */
+ if (max_subdevs == notifier->max_subdevs)
+ return 0;
+
+ ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
+ if (ret)
+ return ret;
+
+ for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
+ dev_fwnode(dev), fwnode)); ) {
+ if (!fwnode_device_is_available(
+ fwnode_graph_get_port_parent(fwnode)))
+ continue;
+
+ if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
+ ret = -EINVAL;
+ break;
+ }
+
+ if (has_port) {
+ struct fwnode_endpoint ep;
+
+ ret = fwnode_graph_parse_endpoint(fwnode, &ep);
+ if (ret)
+ break;
+
+ if (ep.port != port)
+ continue;
+ }
+
+ ret = v4l2_async_notifier_fwnode_parse_endpoint(
+ dev, notifier, fwnode, asd_struct_size, parse_endpoint);
+ if (ret < 0)
+ break;
+ }
+
+ fwnode_handle_put(fwnode);
+
+ return ret;
+}
+
+int v4l2_async_notifier_parse_fwnode_endpoints(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ return __v4l2_async_notifier_parse_fwnode_endpoints(
+ dev, notifier, asd_struct_size, 0, false, parse_endpoint);
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
+
+int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size, unsigned int port,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd))
+{
+ return __v4l2_async_notifier_parse_fwnode_endpoints(
+ dev, notifier, asd_struct_size, port, true, parse_endpoint);
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
+
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-async.h b/include/media/v4l2-async.h
index c69d8c8a66d0..96fa1afc00dd 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -18,7 +18,6 @@ struct device;
struct device_node;
struct v4l2_device;
struct v4l2_subdev;
-struct v4l2_async_notifier;
/* A random max subdevice number, used to allocate an array on stack */
#define V4L2_MAX_SUBDEVS 128U
@@ -50,6 +49,10 @@ enum v4l2_async_match_type {
* @match: union of per-bus type matching data sets
* @list: used to link struct v4l2_async_subdev objects, waiting to be
* probed, to a notifier->waiting list
+ *
+ * When this struct is used as a member in a driver specific struct,
+ * the driver specific struct shall contain the @struct
+ * v4l2_async_subdev as its first member.
*/
struct v4l2_async_subdev {
enum v4l2_async_match_type match_type;
@@ -78,7 +81,8 @@ struct v4l2_async_subdev {
/**
* struct v4l2_async_notifier - v4l2_device notifier data
*
- * @num_subdevs: number of subdevices
+ * @num_subdevs: number of subdevices used in the subdevs array
+ * @max_subdevs: number of subdevices allocated in the subdevs array
* @subdevs: array of pointers to subdevice descriptors
* @v4l2_dev: pointer to struct v4l2_device
* @waiting: list of struct v4l2_async_subdev, waiting for their drivers
@@ -90,6 +94,7 @@ struct v4l2_async_subdev {
*/
struct v4l2_async_notifier {
unsigned int num_subdevs;
+ unsigned int max_subdevs;
struct v4l2_async_subdev **subdevs;
struct v4l2_device *v4l2_dev;
struct list_head waiting;
@@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
/**
+ * v4l2_async_notifier_release - release notifier resources
+ * @notifier: the notifier the resources of which are to be released
+ *
+ * Release memory resources related to a notifier, including the async
+ * sub-devices allocated for the purposes of the notifier. The user is
+ * responsible for releasing the notifier's resources after calling
+ * @v4l2_async_notifier_parse_fwnode_endpoints.
+ *
+ * There is no harm from calling v4l2_async_notifier_release in other
+ * cases as long as its memory has been zeroed after it has been
+ * allocated.
+ */
+void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
+
+/**
* v4l2_async_register_subdev - registers a sub-device to the asynchronous
* subdevice framework
*
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 68eb22ba571b..83afac48ea6b 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -25,6 +25,8 @@
#include <media/v4l2-mediabus.h>
struct fwnode_handle;
+struct v4l2_async_notifier;
+struct v4l2_async_subdev;
#define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
@@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
*/
void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
+/**
+ * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
+ * device node
+ * @dev: the device the endpoints of which are to be parsed
+ * @notifier: notifier for @dev
+ * @asd_struct_size: size of the driver's async sub-device struct, including
+ * sizeof(struct v4l2_async_subdev). The &struct
+ * v4l2_async_subdev shall be the first member of
+ * the driver's async sub-device struct, i.e. both
+ * begin at the same memory address.
+ * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
+ * endpoint. Optional.
+ * Return: %0 on success
+ * %-ENOTCONN if the endpoint is to be skipped but this
+ * should not be considered as an error
+ * %-EINVAL if the endpoint configuration is invalid
+ *
+ * Parse the fwnode endpoints of the @dev device and populate the async sub-
+ * devices array of the notifier. The @parse_endpoint callback function is
+ * called for each endpoint with the corresponding async sub-device pointer to
+ * let the caller initialize the driver-specific part of the async sub-device
+ * structure.
+ *
+ * The notifier memory shall be zeroed before this function is called on the
+ * notifier.
+ *
+ * This function may not be called on a registered notifier and may be called on
+ * a notifier only once.
+ *
+ * Do not change the notifier's subdevs array, take references to the subdevs
+ * array itself or change the notifier's num_subdevs field. This is because this
+ * function allocates and reallocates the subdevs array based on parsing
+ * endpoints.
+ *
+ * The @struct v4l2_fwnode_endpoint passed to the callback function
+ * @parse_endpoint is released once the function is finished. If there is a need
+ * to retain that configuration, the user needs to allocate memory for it.
+ *
+ * Any notifier populated using this function must be released with a call to
+ * v4l2_async_notifier_release() after it has been unregistered and the async
+ * sub-devices are no longer in use, even if the function returned an error.
+ *
+ * Return: %0 on success, including when no async sub-devices are found
+ * %-ENOMEM if memory allocation failed
+ * %-EINVAL if graph or endpoint parsing failed
+ * Other error codes as returned by @parse_endpoint
+ */
+int v4l2_async_notifier_parse_fwnode_endpoints(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd));
+
+/**
+ * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
+ * endpoints of a port in a
+ * device node
+ * @dev: the device the endpoints of which are to be parsed
+ * @notifier: notifier for @dev
+ * @asd_struct_size: size of the driver's async sub-device struct, including
+ * sizeof(struct v4l2_async_subdev). The &struct
+ * v4l2_async_subdev shall be the first member of
+ * the driver's async sub-device struct, i.e. both
+ * begin at the same memory address.
+ * @port: port number where endpoints are to be parsed
+ * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
+ * endpoint. Optional.
+ * Return: %0 on success
+ * %-ENOTCONN if the endpoint is to be skipped but this
+ * should not be considered as an error
+ * %-EINVAL if the endpoint configuration is invalid
+ *
+ * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
+ * the exception that it only parses endpoints in a given port. This is useful
+ * on devices that have both sinks and sources: the async sub-devices connected
+ * to sources have already been set up by another driver (on capture devices).
+ *
+ * Parse the fwnode endpoints of the @dev device on a given @port and populate
+ * the async sub-devices array of the notifier. The @parse_endpoint callback
+ * function is called for each endpoint with the corresponding async sub-device
+ * pointer to let the caller initialize the driver-specific part of the async
+ * sub-device structure.
+ *
+ * The notifier memory shall be zeroed before this function is called on the
+ * notifier the first time.
+ *
+ * This function may not be called on a registered notifier and may be called on
+ * a notifier only once per port.
+ *
+ * Do not change the notifier's subdevs array, take references to the subdevs
+ * array itself or change the notifier's num_subdevs field. This is because this
+ * function allocates and reallocates the subdevs array based on parsing
+ * endpoints.
+ *
+ * The @struct v4l2_fwnode_endpoint passed to the callback function
+ * @parse_endpoint is released once the function is finished. If there is a need
+ * to retain that configuration, the user needs to allocate memory for it.
+ *
+ * Any notifier populated using this function must be released with a call to
+ * v4l2_async_notifier_release() after it has been unregistered and the async
+ * sub-devices are no longer in use, even if the function returned an error.
+ *
+ * Return: %0 on success, including when no async sub-devices are found
+ * %-ENOMEM if memory allocation failed
+ * %-EINVAL if graph or endpoint parsing failed
+ * Other error codes as returned by @parse_endpoint
+ */
+int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ size_t asd_struct_size, unsigned int port,
+ int (*parse_endpoint)(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd));
+
#endif /* _V4L2_FWNODE_H */
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-15 14:16 ` Sakari Ailus
` (3 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
2017-09-16 7:04 ` Pavel Machek
2017-09-19 11:40 ` Laurent Pinchart
-1 siblings, 2 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Instead of using driver implementation, use
v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
of the device.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/platform/omap3isp/isp.c | 115 +++++++++++-----------------------
drivers/media/platform/omap3isp/isp.h | 5 +-
2 files changed, 37 insertions(+), 83 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 1a428fe9f070..a546cf774d40 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2001,6 +2001,7 @@ static int isp_remove(struct platform_device *pdev)
__omap3isp_put(isp, false);
media_entity_enum_cleanup(&isp->crashed);
+ v4l2_async_notifier_release(&isp->notifier);
return 0;
}
@@ -2011,44 +2012,41 @@ enum isp_of_phy {
ISP_OF_PHY_CSIPHY2,
};
-static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
- struct isp_async_subdev *isd)
+static int isp_fwnode_parse(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd)
{
+ struct isp_async_subdev *isd =
+ container_of(asd, struct isp_async_subdev, asd);
struct isp_bus_cfg *buscfg = &isd->bus;
- struct v4l2_fwnode_endpoint vep;
- unsigned int i;
- int ret;
bool csi1 = false;
-
- ret = v4l2_fwnode_endpoint_parse(fwnode, &vep);
- if (ret)
- return ret;
+ unsigned int i;
dev_dbg(dev, "parsing endpoint %pOF, interface %u\n",
- to_of_node(fwnode), vep.base.port);
+ to_of_node(vep->base.local_fwnode), vep->base.port);
- switch (vep.base.port) {
+ switch (vep->base.port) {
case ISP_OF_PHY_PARALLEL:
buscfg->interface = ISP_INTERFACE_PARALLEL;
buscfg->bus.parallel.data_lane_shift =
- vep.bus.parallel.data_shift;
+ vep->bus.parallel.data_shift;
buscfg->bus.parallel.clk_pol =
- !!(vep.bus.parallel.flags
+ !!(vep->bus.parallel.flags
& V4L2_MBUS_PCLK_SAMPLE_FALLING);
buscfg->bus.parallel.hs_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW);
+ !!(vep->bus.parallel.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW);
buscfg->bus.parallel.vs_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW);
+ !!(vep->bus.parallel.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW);
buscfg->bus.parallel.fld_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_FIELD_EVEN_LOW);
+ !!(vep->bus.parallel.flags & V4L2_MBUS_FIELD_EVEN_LOW);
buscfg->bus.parallel.data_pol =
- !!(vep.bus.parallel.flags & V4L2_MBUS_DATA_ACTIVE_LOW);
- buscfg->bus.parallel.bt656 = vep.bus_type == V4L2_MBUS_BT656;
+ !!(vep->bus.parallel.flags & V4L2_MBUS_DATA_ACTIVE_LOW);
+ buscfg->bus.parallel.bt656 = vep->bus_type == V4L2_MBUS_BT656;
break;
case ISP_OF_PHY_CSIPHY1:
case ISP_OF_PHY_CSIPHY2:
- switch (vep.bus_type) {
+ switch (vep->bus_type) {
case V4L2_MBUS_CCP2:
case V4L2_MBUS_CSI1:
dev_dbg(dev, "CSI-1/CCP-2 configuration\n");
@@ -2060,11 +2058,11 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
break;
default:
dev_err(dev, "unsupported bus type %u\n",
- vep.bus_type);
+ vep->bus_type);
return -EINVAL;
}
- switch (vep.base.port) {
+ switch (vep->base.port) {
case ISP_OF_PHY_CSIPHY1:
if (csi1)
buscfg->interface = ISP_INTERFACE_CCP2B_PHY1;
@@ -2080,47 +2078,47 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
}
if (csi1) {
buscfg->bus.ccp2.lanecfg.clk.pos =
- vep.bus.mipi_csi1.clock_lane;
+ vep->bus.mipi_csi1.clock_lane;
buscfg->bus.ccp2.lanecfg.clk.pol =
- vep.bus.mipi_csi1.lane_polarity[0];
+ vep->bus.mipi_csi1.lane_polarity[0];
dev_dbg(dev, "clock lane polarity %u, pos %u\n",
buscfg->bus.ccp2.lanecfg.clk.pol,
buscfg->bus.ccp2.lanecfg.clk.pos);
buscfg->bus.ccp2.lanecfg.data[0].pos =
- vep.bus.mipi_csi1.data_lane;
+ vep->bus.mipi_csi1.data_lane;
buscfg->bus.ccp2.lanecfg.data[0].pol =
- vep.bus.mipi_csi1.lane_polarity[1];
+ vep->bus.mipi_csi1.lane_polarity[1];
dev_dbg(dev, "data lane polarity %u, pos %u\n",
buscfg->bus.ccp2.lanecfg.data[0].pol,
buscfg->bus.ccp2.lanecfg.data[0].pos);
buscfg->bus.ccp2.strobe_clk_pol =
- vep.bus.mipi_csi1.clock_inv;
- buscfg->bus.ccp2.phy_layer = vep.bus.mipi_csi1.strobe;
+ vep->bus.mipi_csi1.clock_inv;
+ buscfg->bus.ccp2.phy_layer = vep->bus.mipi_csi1.strobe;
buscfg->bus.ccp2.ccp2_mode =
- vep.bus_type == V4L2_MBUS_CCP2;
+ vep->bus_type == V4L2_MBUS_CCP2;
buscfg->bus.ccp2.vp_clk_pol = 1;
buscfg->bus.ccp2.crc = 1;
} else {
buscfg->bus.csi2.lanecfg.clk.pos =
- vep.bus.mipi_csi2.clock_lane;
+ vep->bus.mipi_csi2.clock_lane;
buscfg->bus.csi2.lanecfg.clk.pol =
- vep.bus.mipi_csi2.lane_polarities[0];
+ vep->bus.mipi_csi2.lane_polarities[0];
dev_dbg(dev, "clock lane polarity %u, pos %u\n",
buscfg->bus.csi2.lanecfg.clk.pol,
buscfg->bus.csi2.lanecfg.clk.pos);
buscfg->bus.csi2.num_data_lanes =
- vep.bus.mipi_csi2.num_data_lanes;
+ vep->bus.mipi_csi2.num_data_lanes;
for (i = 0; i < buscfg->bus.csi2.num_data_lanes; i++) {
buscfg->bus.csi2.lanecfg.data[i].pos =
- vep.bus.mipi_csi2.data_lanes[i];
+ vep->bus.mipi_csi2.data_lanes[i];
buscfg->bus.csi2.lanecfg.data[i].pol =
- vep.bus.mipi_csi2.lane_polarities[i + 1];
+ vep->bus.mipi_csi2.lane_polarities[i + 1];
dev_dbg(dev,
"data lane %u polarity %u, pos %u\n", i,
buscfg->bus.csi2.lanecfg.data[i].pol,
@@ -2137,57 +2135,13 @@ static int isp_fwnode_parse(struct device *dev, struct fwnode_handle *fwnode,
default:
dev_warn(dev, "%pOF: invalid interface %u\n",
- to_of_node(fwnode), vep.base.port);
+ to_of_node(vep->base.local_fwnode), vep->base.port);
return -EINVAL;
}
return 0;
}
-static int isp_fwnodes_parse(struct device *dev,
- struct v4l2_async_notifier *notifier)
-{
- struct fwnode_handle *fwnode = NULL;
-
- notifier->subdevs = devm_kcalloc(
- dev, ISP_MAX_SUBDEVS, sizeof(*notifier->subdevs), GFP_KERNEL);
- if (!notifier->subdevs)
- return -ENOMEM;
-
- while (notifier->num_subdevs < ISP_MAX_SUBDEVS &&
- (fwnode = fwnode_graph_get_next_endpoint(
- of_fwnode_handle(dev->of_node), fwnode))) {
- struct isp_async_subdev *isd;
-
- isd = devm_kzalloc(dev, sizeof(*isd), GFP_KERNEL);
- if (!isd)
- goto error;
-
- if (isp_fwnode_parse(dev, fwnode, isd)) {
- devm_kfree(dev, isd);
- continue;
- }
-
- notifier->subdevs[notifier->num_subdevs] = &isd->asd;
-
- isd->asd.match.fwnode.fwnode =
- fwnode_graph_get_remote_port_parent(fwnode);
- if (!isd->asd.match.fwnode.fwnode) {
- dev_warn(dev, "bad remote port parent\n");
- goto error;
- }
-
- isd->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
- notifier->num_subdevs++;
- }
-
- return notifier->num_subdevs;
-
-error:
- fwnode_handle_put(fwnode);
- return -EINVAL;
-}
-
static int isp_subdev_notifier_complete(struct v4l2_async_notifier *async)
{
struct isp_device *isp = container_of(async, struct isp_device,
@@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
if (ret)
return ret;
- ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
+ ret = v4l2_async_notifier_parse_fwnode_endpoints(
+ &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
+ isp_fwnode_parse);
if (ret < 0)
return ret;
@@ -2407,6 +2363,7 @@ static int isp_probe(struct platform_device *pdev)
__omap3isp_put(isp, false);
error:
mutex_destroy(&isp->isp_mutex);
+ v4l2_async_notifier_release(&isp->notifier);
return ret;
}
diff --git a/drivers/media/platform/omap3isp/isp.h b/drivers/media/platform/omap3isp/isp.h
index e528df6efc09..8b9043db94b3 100644
--- a/drivers/media/platform/omap3isp/isp.h
+++ b/drivers/media/platform/omap3isp/isp.h
@@ -220,14 +220,11 @@ struct isp_device {
unsigned int sbl_resources;
unsigned int subclk_resources;
-
-#define ISP_MAX_SUBDEVS 8
- struct v4l2_subdev *subdevs[ISP_MAX_SUBDEVS];
};
struct isp_async_subdev {
- struct isp_bus_cfg bus;
struct v4l2_async_subdev asd;
+ struct isp_bus_cfg bus;
};
#define v4l2_subdev_to_bus_cfg(sd) \
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 07/25] rcar-vin: Use generic parser for parsing fwnode endpoints
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Instead of using driver implementation, use
v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
of the device.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
---
drivers/media/platform/rcar-vin/rcar-core.c | 112 +++++++++-------------------
drivers/media/platform/rcar-vin/rcar-dma.c | 10 +--
drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 ++--
drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
4 files changed, 48 insertions(+), 92 deletions(-)
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 142de447aaaa..62b4a94f9a39 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -21,6 +21,7 @@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-fwnode.h>
#include "rcar-vin.h"
@@ -77,14 +78,14 @@ static int rvin_digital_notify_complete(struct v4l2_async_notifier *notifier)
int ret;
/* Verify subdevices mbus format */
- if (!rvin_mbus_supported(&vin->digital)) {
+ if (!rvin_mbus_supported(vin->digital)) {
vin_err(vin, "Unsupported media bus format for %s\n",
- vin->digital.subdev->name);
+ vin->digital->subdev->name);
return -EINVAL;
}
vin_dbg(vin, "Found media bus format for %s: %d\n",
- vin->digital.subdev->name, vin->digital.code);
+ vin->digital->subdev->name, vin->digital->code);
ret = v4l2_device_register_subdev_nodes(&vin->v4l2_dev);
if (ret < 0) {
@@ -103,7 +104,7 @@ static void rvin_digital_notify_unbind(struct v4l2_async_notifier *notifier,
vin_dbg(vin, "unbind digital subdev %s\n", subdev->name);
rvin_v4l2_remove(vin);
- vin->digital.subdev = NULL;
+ vin->digital->subdev = NULL;
}
static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
@@ -120,117 +121,70 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SOURCE);
if (ret < 0)
return ret;
- vin->digital.source_pad = ret;
+ vin->digital->source_pad = ret;
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SINK);
- vin->digital.sink_pad = ret < 0 ? 0 : ret;
+ vin->digital->sink_pad = ret < 0 ? 0 : ret;
- vin->digital.subdev = subdev;
+ vin->digital->subdev = subdev;
vin_dbg(vin, "bound subdev %s source pad: %u sink pad: %u\n",
- subdev->name, vin->digital.source_pad,
- vin->digital.sink_pad);
+ subdev->name, vin->digital->source_pad,
+ vin->digital->sink_pad);
return 0;
}
-static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,
- struct device_node *ep,
- struct v4l2_mbus_config *mbus_cfg)
+static int rvin_digital_parse_v4l2(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd)
{
- struct v4l2_fwnode_endpoint v4l2_ep;
- int ret;
+ struct rvin_dev *vin = dev_get_drvdata(dev);
+ struct rvin_graph_entity *rvge =
+ container_of(asd, struct rvin_graph_entity, asd);
- ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep);
- if (ret) {
- vin_err(vin, "Could not parse v4l2 endpoint\n");
- return -EINVAL;
- }
+ if (vep->base.port || vep->base.id)
+ return -ENOTCONN;
- mbus_cfg->type = v4l2_ep.bus_type;
+ rvge->mbus_cfg.type = vep->bus_type;
- switch (mbus_cfg->type) {
+ switch (rvge->mbus_cfg.type) {
case V4L2_MBUS_PARALLEL:
vin_dbg(vin, "Found PARALLEL media bus\n");
- mbus_cfg->flags = v4l2_ep.bus.parallel.flags;
+ rvge->mbus_cfg.flags = vep->bus.parallel.flags;
break;
case V4L2_MBUS_BT656:
vin_dbg(vin, "Found BT656 media bus\n");
- mbus_cfg->flags = 0;
+ rvge->mbus_cfg.flags = 0;
break;
default:
vin_err(vin, "Unknown media bus type\n");
return -EINVAL;
}
- return 0;
-}
-
-static int rvin_digital_graph_parse(struct rvin_dev *vin)
-{
- struct device_node *ep, *np;
- int ret;
-
- vin->digital.asd.match.fwnode.fwnode = NULL;
- vin->digital.subdev = NULL;
-
- /*
- * Port 0 id 0 is local digital input, try to get it.
- * Not all instances can or will have this, that is OK
- */
- ep = of_graph_get_endpoint_by_regs(vin->dev->of_node, 0, 0);
- if (!ep)
- return 0;
-
- np = of_graph_get_remote_port_parent(ep);
- if (!np) {
- vin_err(vin, "No remote parent for digital input\n");
- of_node_put(ep);
- return -EINVAL;
- }
- of_node_put(np);
-
- ret = rvin_digitial_parse_v4l2(vin, ep, &vin->digital.mbus_cfg);
- of_node_put(ep);
- if (ret)
- return ret;
-
- vin->digital.asd.match.fwnode.fwnode = of_fwnode_handle(np);
- vin->digital.asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
+ vin->digital = rvge;
return 0;
}
static int rvin_digital_graph_init(struct rvin_dev *vin)
{
- struct v4l2_async_subdev **subdevs = NULL;
int ret;
- ret = rvin_digital_graph_parse(vin);
+ ret = v4l2_async_notifier_parse_fwnode_endpoints(
+ vin->dev, &vin->notifier,
+ sizeof(struct rvin_graph_entity), rvin_digital_parse_v4l2);
if (ret)
return ret;
- if (!vin->digital.asd.match.fwnode.fwnode) {
- vin_dbg(vin, "No digital subdevice found\n");
- return -ENODEV;
- }
-
- /* Register the subdevices notifier. */
- subdevs = devm_kzalloc(vin->dev, sizeof(*subdevs), GFP_KERNEL);
- if (subdevs == NULL)
- return -ENOMEM;
-
- subdevs[0] = &vin->digital.asd;
-
- vin_dbg(vin, "Found digital subdevice %pOF\n",
- to_of_node(subdevs[0]->match.fwnode.fwnode));
+ if (vin->digital)
+ vin_dbg(vin, "Found digital subdevice %pOF\n",
+ to_of_node(
+ vin->digital->asd.match.fwnode.fwnode));
- vin->notifier.num_subdevs = 1;
- vin->notifier.subdevs = subdevs;
vin->notifier.bound = rvin_digital_notify_bound;
vin->notifier.unbind = rvin_digital_notify_unbind;
vin->notifier.complete = rvin_digital_notify_complete;
-
ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier);
if (ret < 0) {
vin_err(vin, "Notifier registration failed\n");
@@ -290,6 +244,8 @@ static int rcar_vin_probe(struct platform_device *pdev)
if (ret)
return ret;
+ platform_set_drvdata(pdev, vin);
+
ret = rvin_digital_graph_init(vin);
if (ret < 0)
goto error;
@@ -297,11 +253,10 @@ static int rcar_vin_probe(struct platform_device *pdev)
pm_suspend_ignore_children(&pdev->dev, true);
pm_runtime_enable(&pdev->dev);
- platform_set_drvdata(pdev, vin);
-
return 0;
error:
rvin_dma_remove(vin);
+ v4l2_async_notifier_release(&vin->notifier);
return ret;
}
@@ -313,6 +268,7 @@ static int rcar_vin_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
v4l2_async_notifier_unregister(&vin->notifier);
+ v4l2_async_notifier_release(&vin->notifier);
rvin_dma_remove(vin);
diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c
index b136844499f6..23fdff7a7370 100644
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -183,7 +183,7 @@ static int rvin_setup(struct rvin_dev *vin)
/*
* Input interface
*/
- switch (vin->digital.code) {
+ switch (vin->digital->code) {
case MEDIA_BUS_FMT_YUYV8_1X16:
/* BT.601/BT.1358 16bit YCbCr422 */
vnmc |= VNMC_INF_YUV16;
@@ -191,7 +191,7 @@ static int rvin_setup(struct rvin_dev *vin)
break;
case MEDIA_BUS_FMT_UYVY8_2X8:
/* BT.656 8bit YCbCr422 or BT.601 8bit YCbCr422 */
- vnmc |= vin->digital.mbus_cfg.type == V4L2_MBUS_BT656 ?
+ vnmc |= vin->digital->mbus_cfg.type == V4L2_MBUS_BT656 ?
VNMC_INF_YUV8_BT656 : VNMC_INF_YUV8_BT601;
input_is_yuv = true;
break;
@@ -200,7 +200,7 @@ static int rvin_setup(struct rvin_dev *vin)
break;
case MEDIA_BUS_FMT_UYVY10_2X10:
/* BT.656 10bit YCbCr422 or BT.601 10bit YCbCr422 */
- vnmc |= vin->digital.mbus_cfg.type == V4L2_MBUS_BT656 ?
+ vnmc |= vin->digital->mbus_cfg.type == V4L2_MBUS_BT656 ?
VNMC_INF_YUV10_BT656 : VNMC_INF_YUV10_BT601;
input_is_yuv = true;
break;
@@ -212,11 +212,11 @@ static int rvin_setup(struct rvin_dev *vin)
dmr2 = VNDMR2_FTEV | VNDMR2_VLV(1);
/* Hsync Signal Polarity Select */
- if (!(vin->digital.mbus_cfg.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW))
+ if (!(vin->digital->mbus_cfg.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW))
dmr2 |= VNDMR2_HPS;
/* Vsync Signal Polarity Select */
- if (!(vin->digital.mbus_cfg.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW))
+ if (!(vin->digital->mbus_cfg.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW))
dmr2 |= VNDMR2_VPS;
/*
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index dd37ea811680..b479b882da12 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -111,7 +111,7 @@ static int rvin_reset_format(struct rvin_dev *vin)
struct v4l2_mbus_framefmt *mf = &fmt.format;
int ret;
- fmt.pad = vin->digital.source_pad;
+ fmt.pad = vin->digital->source_pad;
ret = v4l2_subdev_call(vin_to_source(vin), pad, get_fmt, NULL, &fmt);
if (ret)
@@ -172,13 +172,13 @@ static int __rvin_try_format_source(struct rvin_dev *vin,
sd = vin_to_source(vin);
- v4l2_fill_mbus_format(&format.format, pix, vin->digital.code);
+ v4l2_fill_mbus_format(&format.format, pix, vin->digital->code);
pad_cfg = v4l2_subdev_alloc_pad_config(sd);
if (pad_cfg == NULL)
return -ENOMEM;
- format.pad = vin->digital.source_pad;
+ format.pad = vin->digital->source_pad;
field = pix->field;
@@ -555,7 +555,7 @@ static int rvin_enum_dv_timings(struct file *file, void *priv_fh,
if (timings->pad)
return -EINVAL;
- timings->pad = vin->digital.sink_pad;
+ timings->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, enum_dv_timings, timings);
@@ -607,7 +607,7 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
if (cap->pad)
return -EINVAL;
- cap->pad = vin->digital.sink_pad;
+ cap->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, dv_timings_cap, cap);
@@ -625,7 +625,7 @@ static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
if (edid->pad)
return -EINVAL;
- edid->pad = vin->digital.sink_pad;
+ edid->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, get_edid, edid);
@@ -643,7 +643,7 @@ static int rvin_s_edid(struct file *file, void *fh, struct v4l2_edid *edid)
if (edid->pad)
return -EINVAL;
- edid->pad = vin->digital.sink_pad;
+ edid->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, set_edid, edid);
diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h
index 9bfb5a7c4dc4..5382078143fb 100644
--- a/drivers/media/platform/rcar-vin/rcar-vin.h
+++ b/drivers/media/platform/rcar-vin/rcar-vin.h
@@ -126,7 +126,7 @@ struct rvin_dev {
struct v4l2_device v4l2_dev;
struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_async_notifier notifier;
- struct rvin_graph_entity digital;
+ struct rvin_graph_entity *digital;
struct mutex lock;
struct vb2_queue queue;
@@ -145,7 +145,7 @@ struct rvin_dev {
struct v4l2_rect compose;
};
-#define vin_to_source(vin) vin->digital.subdev
+#define vin_to_source(vin) ((vin)->digital->subdev)
/* Debug */
#define vin_dbg(d, fmt, arg...) dev_dbg(d->dev, fmt, ##arg)
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 07/25] rcar-vin: Use generic parser for parsing fwnode endpoints
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Instead of using driver implementation, use
v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
of the device.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/platform/rcar-vin/rcar-core.c | 112 +++++++++-------------------
drivers/media/platform/rcar-vin/rcar-dma.c | 10 +--
drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 ++--
drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
4 files changed, 48 insertions(+), 92 deletions(-)
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 142de447aaaa..62b4a94f9a39 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -21,6 +21,7 @@
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-fwnode.h>
#include "rcar-vin.h"
@@ -77,14 +78,14 @@ static int rvin_digital_notify_complete(struct v4l2_async_notifier *notifier)
int ret;
/* Verify subdevices mbus format */
- if (!rvin_mbus_supported(&vin->digital)) {
+ if (!rvin_mbus_supported(vin->digital)) {
vin_err(vin, "Unsupported media bus format for %s\n",
- vin->digital.subdev->name);
+ vin->digital->subdev->name);
return -EINVAL;
}
vin_dbg(vin, "Found media bus format for %s: %d\n",
- vin->digital.subdev->name, vin->digital.code);
+ vin->digital->subdev->name, vin->digital->code);
ret = v4l2_device_register_subdev_nodes(&vin->v4l2_dev);
if (ret < 0) {
@@ -103,7 +104,7 @@ static void rvin_digital_notify_unbind(struct v4l2_async_notifier *notifier,
vin_dbg(vin, "unbind digital subdev %s\n", subdev->name);
rvin_v4l2_remove(vin);
- vin->digital.subdev = NULL;
+ vin->digital->subdev = NULL;
}
static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
@@ -120,117 +121,70 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SOURCE);
if (ret < 0)
return ret;
- vin->digital.source_pad = ret;
+ vin->digital->source_pad = ret;
ret = rvin_find_pad(subdev, MEDIA_PAD_FL_SINK);
- vin->digital.sink_pad = ret < 0 ? 0 : ret;
+ vin->digital->sink_pad = ret < 0 ? 0 : ret;
- vin->digital.subdev = subdev;
+ vin->digital->subdev = subdev;
vin_dbg(vin, "bound subdev %s source pad: %u sink pad: %u\n",
- subdev->name, vin->digital.source_pad,
- vin->digital.sink_pad);
+ subdev->name, vin->digital->source_pad,
+ vin->digital->sink_pad);
return 0;
}
-static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,
- struct device_node *ep,
- struct v4l2_mbus_config *mbus_cfg)
+static int rvin_digital_parse_v4l2(struct device *dev,
+ struct v4l2_fwnode_endpoint *vep,
+ struct v4l2_async_subdev *asd)
{
- struct v4l2_fwnode_endpoint v4l2_ep;
- int ret;
+ struct rvin_dev *vin = dev_get_drvdata(dev);
+ struct rvin_graph_entity *rvge =
+ container_of(asd, struct rvin_graph_entity, asd);
- ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep);
- if (ret) {
- vin_err(vin, "Could not parse v4l2 endpoint\n");
- return -EINVAL;
- }
+ if (vep->base.port || vep->base.id)
+ return -ENOTCONN;
- mbus_cfg->type = v4l2_ep.bus_type;
+ rvge->mbus_cfg.type = vep->bus_type;
- switch (mbus_cfg->type) {
+ switch (rvge->mbus_cfg.type) {
case V4L2_MBUS_PARALLEL:
vin_dbg(vin, "Found PARALLEL media bus\n");
- mbus_cfg->flags = v4l2_ep.bus.parallel.flags;
+ rvge->mbus_cfg.flags = vep->bus.parallel.flags;
break;
case V4L2_MBUS_BT656:
vin_dbg(vin, "Found BT656 media bus\n");
- mbus_cfg->flags = 0;
+ rvge->mbus_cfg.flags = 0;
break;
default:
vin_err(vin, "Unknown media bus type\n");
return -EINVAL;
}
- return 0;
-}
-
-static int rvin_digital_graph_parse(struct rvin_dev *vin)
-{
- struct device_node *ep, *np;
- int ret;
-
- vin->digital.asd.match.fwnode.fwnode = NULL;
- vin->digital.subdev = NULL;
-
- /*
- * Port 0 id 0 is local digital input, try to get it.
- * Not all instances can or will have this, that is OK
- */
- ep = of_graph_get_endpoint_by_regs(vin->dev->of_node, 0, 0);
- if (!ep)
- return 0;
-
- np = of_graph_get_remote_port_parent(ep);
- if (!np) {
- vin_err(vin, "No remote parent for digital input\n");
- of_node_put(ep);
- return -EINVAL;
- }
- of_node_put(np);
-
- ret = rvin_digitial_parse_v4l2(vin, ep, &vin->digital.mbus_cfg);
- of_node_put(ep);
- if (ret)
- return ret;
-
- vin->digital.asd.match.fwnode.fwnode = of_fwnode_handle(np);
- vin->digital.asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
+ vin->digital = rvge;
return 0;
}
static int rvin_digital_graph_init(struct rvin_dev *vin)
{
- struct v4l2_async_subdev **subdevs = NULL;
int ret;
- ret = rvin_digital_graph_parse(vin);
+ ret = v4l2_async_notifier_parse_fwnode_endpoints(
+ vin->dev, &vin->notifier,
+ sizeof(struct rvin_graph_entity), rvin_digital_parse_v4l2);
if (ret)
return ret;
- if (!vin->digital.asd.match.fwnode.fwnode) {
- vin_dbg(vin, "No digital subdevice found\n");
- return -ENODEV;
- }
-
- /* Register the subdevices notifier. */
- subdevs = devm_kzalloc(vin->dev, sizeof(*subdevs), GFP_KERNEL);
- if (subdevs == NULL)
- return -ENOMEM;
-
- subdevs[0] = &vin->digital.asd;
-
- vin_dbg(vin, "Found digital subdevice %pOF\n",
- to_of_node(subdevs[0]->match.fwnode.fwnode));
+ if (vin->digital)
+ vin_dbg(vin, "Found digital subdevice %pOF\n",
+ to_of_node(
+ vin->digital->asd.match.fwnode.fwnode));
- vin->notifier.num_subdevs = 1;
- vin->notifier.subdevs = subdevs;
vin->notifier.bound = rvin_digital_notify_bound;
vin->notifier.unbind = rvin_digital_notify_unbind;
vin->notifier.complete = rvin_digital_notify_complete;
-
ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier);
if (ret < 0) {
vin_err(vin, "Notifier registration failed\n");
@@ -290,6 +244,8 @@ static int rcar_vin_probe(struct platform_device *pdev)
if (ret)
return ret;
+ platform_set_drvdata(pdev, vin);
+
ret = rvin_digital_graph_init(vin);
if (ret < 0)
goto error;
@@ -297,11 +253,10 @@ static int rcar_vin_probe(struct platform_device *pdev)
pm_suspend_ignore_children(&pdev->dev, true);
pm_runtime_enable(&pdev->dev);
- platform_set_drvdata(pdev, vin);
-
return 0;
error:
rvin_dma_remove(vin);
+ v4l2_async_notifier_release(&vin->notifier);
return ret;
}
@@ -313,6 +268,7 @@ static int rcar_vin_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
v4l2_async_notifier_unregister(&vin->notifier);
+ v4l2_async_notifier_release(&vin->notifier);
rvin_dma_remove(vin);
diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c
index b136844499f6..23fdff7a7370 100644
--- a/drivers/media/platform/rcar-vin/rcar-dma.c
+++ b/drivers/media/platform/rcar-vin/rcar-dma.c
@@ -183,7 +183,7 @@ static int rvin_setup(struct rvin_dev *vin)
/*
* Input interface
*/
- switch (vin->digital.code) {
+ switch (vin->digital->code) {
case MEDIA_BUS_FMT_YUYV8_1X16:
/* BT.601/BT.1358 16bit YCbCr422 */
vnmc |= VNMC_INF_YUV16;
@@ -191,7 +191,7 @@ static int rvin_setup(struct rvin_dev *vin)
break;
case MEDIA_BUS_FMT_UYVY8_2X8:
/* BT.656 8bit YCbCr422 or BT.601 8bit YCbCr422 */
- vnmc |= vin->digital.mbus_cfg.type == V4L2_MBUS_BT656 ?
+ vnmc |= vin->digital->mbus_cfg.type == V4L2_MBUS_BT656 ?
VNMC_INF_YUV8_BT656 : VNMC_INF_YUV8_BT601;
input_is_yuv = true;
break;
@@ -200,7 +200,7 @@ static int rvin_setup(struct rvin_dev *vin)
break;
case MEDIA_BUS_FMT_UYVY10_2X10:
/* BT.656 10bit YCbCr422 or BT.601 10bit YCbCr422 */
- vnmc |= vin->digital.mbus_cfg.type == V4L2_MBUS_BT656 ?
+ vnmc |= vin->digital->mbus_cfg.type == V4L2_MBUS_BT656 ?
VNMC_INF_YUV10_BT656 : VNMC_INF_YUV10_BT601;
input_is_yuv = true;
break;
@@ -212,11 +212,11 @@ static int rvin_setup(struct rvin_dev *vin)
dmr2 = VNDMR2_FTEV | VNDMR2_VLV(1);
/* Hsync Signal Polarity Select */
- if (!(vin->digital.mbus_cfg.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW))
+ if (!(vin->digital->mbus_cfg.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW))
dmr2 |= VNDMR2_HPS;
/* Vsync Signal Polarity Select */
- if (!(vin->digital.mbus_cfg.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW))
+ if (!(vin->digital->mbus_cfg.flags & V4L2_MBUS_VSYNC_ACTIVE_LOW))
dmr2 |= VNDMR2_VPS;
/*
diff --git a/drivers/media/platform/rcar-vin/rcar-v4l2.c b/drivers/media/platform/rcar-vin/rcar-v4l2.c
index dd37ea811680..b479b882da12 100644
--- a/drivers/media/platform/rcar-vin/rcar-v4l2.c
+++ b/drivers/media/platform/rcar-vin/rcar-v4l2.c
@@ -111,7 +111,7 @@ static int rvin_reset_format(struct rvin_dev *vin)
struct v4l2_mbus_framefmt *mf = &fmt.format;
int ret;
- fmt.pad = vin->digital.source_pad;
+ fmt.pad = vin->digital->source_pad;
ret = v4l2_subdev_call(vin_to_source(vin), pad, get_fmt, NULL, &fmt);
if (ret)
@@ -172,13 +172,13 @@ static int __rvin_try_format_source(struct rvin_dev *vin,
sd = vin_to_source(vin);
- v4l2_fill_mbus_format(&format.format, pix, vin->digital.code);
+ v4l2_fill_mbus_format(&format.format, pix, vin->digital->code);
pad_cfg = v4l2_subdev_alloc_pad_config(sd);
if (pad_cfg == NULL)
return -ENOMEM;
- format.pad = vin->digital.source_pad;
+ format.pad = vin->digital->source_pad;
field = pix->field;
@@ -555,7 +555,7 @@ static int rvin_enum_dv_timings(struct file *file, void *priv_fh,
if (timings->pad)
return -EINVAL;
- timings->pad = vin->digital.sink_pad;
+ timings->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, enum_dv_timings, timings);
@@ -607,7 +607,7 @@ static int rvin_dv_timings_cap(struct file *file, void *priv_fh,
if (cap->pad)
return -EINVAL;
- cap->pad = vin->digital.sink_pad;
+ cap->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, dv_timings_cap, cap);
@@ -625,7 +625,7 @@ static int rvin_g_edid(struct file *file, void *fh, struct v4l2_edid *edid)
if (edid->pad)
return -EINVAL;
- edid->pad = vin->digital.sink_pad;
+ edid->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, get_edid, edid);
@@ -643,7 +643,7 @@ static int rvin_s_edid(struct file *file, void *fh, struct v4l2_edid *edid)
if (edid->pad)
return -EINVAL;
- edid->pad = vin->digital.sink_pad;
+ edid->pad = vin->digital->sink_pad;
ret = v4l2_subdev_call(sd, pad, set_edid, edid);
diff --git a/drivers/media/platform/rcar-vin/rcar-vin.h b/drivers/media/platform/rcar-vin/rcar-vin.h
index 9bfb5a7c4dc4..5382078143fb 100644
--- a/drivers/media/platform/rcar-vin/rcar-vin.h
+++ b/drivers/media/platform/rcar-vin/rcar-vin.h
@@ -126,7 +126,7 @@ struct rvin_dev {
struct v4l2_device v4l2_dev;
struct v4l2_ctrl_handler ctrl_handler;
struct v4l2_async_notifier notifier;
- struct rvin_graph_entity digital;
+ struct rvin_graph_entity *digital;
struct mutex lock;
struct vb2_queue queue;
@@ -145,7 +145,7 @@ struct rvin_dev {
struct v4l2_rect compose;
};
-#define vin_to_source(vin) vin->digital.subdev
+#define vin_to_source(vin) ((vin)->digital->subdev)
/* Debug */
#define vin_dbg(d, fmt, arg...) dev_dbg(d->dev, fmt, ##arg)
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 08/25] omap3isp: Fix check for our own sub-devices
2017-09-15 14:16 ` Sakari Ailus
` (4 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-9-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
We only want to link sub-devices that were bound to the async notifier the
isp driver registered but there may be other sub-devices in the
v4l2_device as well. Check for the correct async notifier.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
drivers/media/platform/omap3isp/isp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index a546cf774d40..3b1a9cd0e591 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2155,7 +2155,7 @@ static int isp_subdev_notifier_complete(struct v4l2_async_notifier *async)
return ret;
list_for_each_entry(sd, &v4l2_dev->subdevs, list) {
- if (!sd->asd)
+ if (sd->notifier != &isp->notifier)
continue;
ret = isp_link_entity(isp, &sd->entity,
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 09/25] omap3isp: Print the name of the entity where no source pads could be found
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
If no source pads are found in an entity, print the name of the entity.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
---
drivers/media/platform/omap3isp/isp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 3b1a9cd0e591..9a694924e46e 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -1669,8 +1669,8 @@ static int isp_link_entity(
break;
}
if (i == entity->num_pads) {
- dev_err(isp->dev, "%s: no source pad in external entity\n",
- __func__);
+ dev_err(isp->dev, "%s: no source pad in external entity %s\n",
+ __func__, entity->name);
return -EINVAL;
}
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 09/25] omap3isp: Print the name of the entity where no source pads could be found
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
If no source pads are found in an entity, print the name of the entity.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
drivers/media/platform/omap3isp/isp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 3b1a9cd0e591..9a694924e46e 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -1669,8 +1669,8 @@ static int isp_link_entity(
break;
}
if (i == entity->num_pads) {
- dev_err(isp->dev, "%s: no source pad in external entity\n",
- __func__);
+ dev_err(isp->dev, "%s: no source pad in external entity %s\n",
+ __func__, entity->name);
return -EINVAL;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 10/25] v4l: async: Move async subdev notifier operations to a separate structure
2017-09-15 14:16 ` Sakari Ailus
` (5 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
The async subdev notifier .bound(), .unbind() and .complete() operations
are function pointers stored directly in the v4l2_async_subdev
structure. As the structure isn't immutable, this creates a potential
security risk as the function pointers are mutable.
To fix this, move the function pointers to a new
v4l2_async_subdev_operations structure that can be made const in
drivers.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/platform/am437x/am437x-vpfe.c | 8 +++++--
drivers/media/platform/atmel/atmel-isc.c | 10 ++++++---
drivers/media/platform/atmel/atmel-isi.c | 10 ++++++---
drivers/media/platform/davinci/vpif_capture.c | 8 +++++--
drivers/media/platform/davinci/vpif_display.c | 8 +++++--
drivers/media/platform/exynos4-is/media-dev.c | 8 +++++--
drivers/media/platform/omap3isp/isp.c | 6 +++++-
drivers/media/platform/pxa_camera.c | 8 +++++--
drivers/media/platform/qcom/camss-8x16/camss.c | 8 +++++--
drivers/media/platform/rcar-vin/rcar-core.c | 10 ++++++---
drivers/media/platform/rcar_drif.c | 10 ++++++---
drivers/media/platform/soc_camera/soc_camera.c | 14 +++++++------
drivers/media/platform/stm32/stm32-dcmi.c | 10 ++++++---
drivers/media/platform/ti-vpe/cal.c | 8 +++++--
drivers/media/platform/xilinx/xilinx-vipp.c | 8 +++++--
drivers/media/v4l2-core/v4l2-async.c | 20 +++++++++---------
drivers/staging/media/imx/imx-media-dev.c | 8 +++++--
include/media/v4l2-async.h | 29 +++++++++++++++++---------
18 files changed, 131 insertions(+), 60 deletions(-)
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index dfcc484cab89..0997c640191d 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -2417,6 +2417,11 @@ static int vpfe_async_complete(struct v4l2_async_notifier *notifier)
return vpfe_probe_complete(vpfe);
}
+static const struct v4l2_async_notifier_operations vpfe_async_ops = {
+ .bound = vpfe_async_bound,
+ .complete = vpfe_async_complete,
+};
+
static struct vpfe_config *
vpfe_get_pdata(struct platform_device *pdev)
{
@@ -2590,8 +2595,7 @@ static int vpfe_probe(struct platform_device *pdev)
vpfe->notifier.subdevs = vpfe->cfg->asd;
vpfe->notifier.num_subdevs = ARRAY_SIZE(vpfe->cfg->asd);
- vpfe->notifier.bound = vpfe_async_bound;
- vpfe->notifier.complete = vpfe_async_complete;
+ vpfe->notifier.ops = &vpfe_async_ops;
ret = v4l2_async_notifier_register(&vpfe->v4l2_dev,
&vpfe->notifier);
if (ret) {
diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c
index d7103c5f92c3..48544c4137cb 100644
--- a/drivers/media/platform/atmel/atmel-isc.c
+++ b/drivers/media/platform/atmel/atmel-isc.c
@@ -1639,6 +1639,12 @@ static int isc_async_complete(struct v4l2_async_notifier *notifier)
return 0;
}
+static const struct v4l2_async_notifier_operations isc_async_ops = {
+ .bound = isc_async_bound,
+ .unbind = isc_async_unbind,
+ .complete = isc_async_complete,
+};
+
static void isc_subdev_cleanup(struct isc_device *isc)
{
struct isc_subdev_entity *subdev_entity;
@@ -1851,9 +1857,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
list_for_each_entry(subdev_entity, &isc->subdev_entities, list) {
subdev_entity->notifier.subdevs = &subdev_entity->asd;
subdev_entity->notifier.num_subdevs = 1;
- subdev_entity->notifier.bound = isc_async_bound;
- subdev_entity->notifier.unbind = isc_async_unbind;
- subdev_entity->notifier.complete = isc_async_complete;
+ subdev_entity->notifier.ops = &isc_async_ops;
ret = v4l2_async_notifier_register(&isc->v4l2_dev,
&subdev_entity->notifier);
diff --git a/drivers/media/platform/atmel/atmel-isi.c b/drivers/media/platform/atmel/atmel-isi.c
index 891fa2505efa..eadbf9def358 100644
--- a/drivers/media/platform/atmel/atmel-isi.c
+++ b/drivers/media/platform/atmel/atmel-isi.c
@@ -1105,6 +1105,12 @@ static int isi_graph_notify_bound(struct v4l2_async_notifier *notifier,
return 0;
}
+static const struct v4l2_async_notifier_operations isi_graph_notify_ops = {
+ .bound = isi_graph_notify_bound,
+ .unbind = isi_graph_notify_unbind,
+ .complete = isi_graph_notify_complete,
+};
+
static int isi_graph_parse(struct atmel_isi *isi, struct device_node *node)
{
struct device_node *ep = NULL;
@@ -1152,9 +1158,7 @@ static int isi_graph_init(struct atmel_isi *isi)
isi->notifier.subdevs = subdevs;
isi->notifier.num_subdevs = 1;
- isi->notifier.bound = isi_graph_notify_bound;
- isi->notifier.unbind = isi_graph_notify_unbind;
- isi->notifier.complete = isi_graph_notify_complete;
+ isi->notifier.ops = &isi_graph_notify_ops;
ret = v4l2_async_notifier_register(&isi->v4l2_dev, &isi->notifier);
if (ret < 0) {
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 0ef36cec21d1..a89367ab1e06 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1500,6 +1500,11 @@ static int vpif_async_complete(struct v4l2_async_notifier *notifier)
return vpif_probe_complete();
}
+static const struct v4l2_async_notifier_operations vpif_async_ops = {
+ .bound = vpif_async_bound,
+ .complete = vpif_async_complete,
+};
+
static struct vpif_capture_config *
vpif_capture_get_pdata(struct platform_device *pdev)
{
@@ -1691,8 +1696,7 @@ static __init int vpif_probe(struct platform_device *pdev)
} else {
vpif_obj.notifier.subdevs = vpif_obj.config->asd;
vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0];
- vpif_obj.notifier.bound = vpif_async_bound;
- vpif_obj.notifier.complete = vpif_async_complete;
+ vpif_obj.notifier.ops = &vpif_async_ops;
err = v4l2_async_notifier_register(&vpif_obj.v4l2_dev,
&vpif_obj.notifier);
if (err) {
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 56fe4e5b396e..ff2f75a328c9 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -1232,6 +1232,11 @@ static int vpif_async_complete(struct v4l2_async_notifier *notifier)
return vpif_probe_complete();
}
+static const struct v4l2_async_notifier_operations vpif_async_ops = {
+ .bound = vpif_async_bound,
+ .complete = vpif_async_complete,
+};
+
/*
* vpif_probe: This function creates device entries by register itself to the
* V4L2 driver and initializes fields of each channel objects
@@ -1313,8 +1318,7 @@ static __init int vpif_probe(struct platform_device *pdev)
} else {
vpif_obj.notifier.subdevs = vpif_obj.config->asd;
vpif_obj.notifier.num_subdevs = vpif_obj.config->asd_sizes[0];
- vpif_obj.notifier.bound = vpif_async_bound;
- vpif_obj.notifier.complete = vpif_async_complete;
+ vpif_obj.notifier.ops = &vpif_async_ops;
err = v4l2_async_notifier_register(&vpif_obj.v4l2_dev,
&vpif_obj.notifier);
if (err) {
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c
index d4656d5175d7..c15596b56dc9 100644
--- a/drivers/media/platform/exynos4-is/media-dev.c
+++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -1405,6 +1405,11 @@ static int subdev_notifier_complete(struct v4l2_async_notifier *notifier)
return media_device_register(&fmd->media_dev);
}
+static const struct v4l2_async_notifier_operations subdev_notifier_ops = {
+ .bound = subdev_notifier_bound,
+ .complete = subdev_notifier_complete,
+};
+
static int fimc_md_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -1479,8 +1484,7 @@ static int fimc_md_probe(struct platform_device *pdev)
if (fmd->num_sensors > 0) {
fmd->subdev_notifier.subdevs = fmd->async_subdevs;
fmd->subdev_notifier.num_subdevs = fmd->num_sensors;
- fmd->subdev_notifier.bound = subdev_notifier_bound;
- fmd->subdev_notifier.complete = subdev_notifier_complete;
+ fmd->subdev_notifier.ops = &subdev_notifier_ops;
fmd->num_sensors = 0;
ret = v4l2_async_notifier_register(&fmd->v4l2_dev,
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 9a694924e46e..0f08d602f756 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2171,6 +2171,10 @@ static int isp_subdev_notifier_complete(struct v4l2_async_notifier *async)
return media_device_register(&isp->media_dev);
}
+static const struct v4l2_async_notifier_operations isp_subdev_notifier_ops = {
+ .complete = isp_subdev_notifier_complete,
+};
+
/*
* isp_probe - Probe ISP platform device
* @pdev: Pointer to ISP platform device
@@ -2341,7 +2345,7 @@ static int isp_probe(struct platform_device *pdev)
if (ret < 0)
goto error_register_entities;
- isp->notifier.complete = isp_subdev_notifier_complete;
+ isp->notifier.ops = &isp_subdev_notifier_ops;
ret = v4l2_async_notifier_register(&isp->v4l2_dev, &isp->notifier);
if (ret)
diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
index edca993c2b1f..9d3f0cb1d95a 100644
--- a/drivers/media/platform/pxa_camera.c
+++ b/drivers/media/platform/pxa_camera.c
@@ -2221,6 +2221,11 @@ static void pxa_camera_sensor_unbind(struct v4l2_async_notifier *notifier,
mutex_unlock(&pcdev->mlock);
}
+static const struct v4l2_async_notifier_operations pxa_camera_sensor_ops = {
+ .bound = pxa_camera_sensor_bound,
+ .unbind = pxa_camera_sensor_unbind,
+};
+
/*
* Driver probe, remove, suspend and resume operations
*/
@@ -2489,8 +2494,7 @@ static int pxa_camera_probe(struct platform_device *pdev)
pcdev->asds[0] = &pcdev->asd;
pcdev->notifier.subdevs = pcdev->asds;
pcdev->notifier.num_subdevs = 1;
- pcdev->notifier.bound = pxa_camera_sensor_bound;
- pcdev->notifier.unbind = pxa_camera_sensor_unbind;
+ pcdev->notifier.ops = &pxa_camera_sensor_ops;
if (!of_have_populated_dt())
pcdev->asd.match_type = V4L2_ASYNC_MATCH_I2C;
diff --git a/drivers/media/platform/qcom/camss-8x16/camss.c b/drivers/media/platform/qcom/camss-8x16/camss.c
index a3760b5dd1d1..390a42c17b66 100644
--- a/drivers/media/platform/qcom/camss-8x16/camss.c
+++ b/drivers/media/platform/qcom/camss-8x16/camss.c
@@ -601,6 +601,11 @@ static int camss_subdev_notifier_complete(struct v4l2_async_notifier *async)
return media_device_register(&camss->media_dev);
}
+static const struct v4l2_async_notifier_operations camss_subdev_notifier_ops = {
+ .bound = camss_subdev_notifier_bound,
+ .complete = camss_subdev_notifier_complete,
+};
+
static const struct media_device_ops camss_media_ops = {
.link_notify = v4l2_pipeline_link_notify,
};
@@ -655,8 +660,7 @@ static int camss_probe(struct platform_device *pdev)
goto err_register_entities;
if (camss->notifier.num_subdevs) {
- camss->notifier.bound = camss_subdev_notifier_bound;
- camss->notifier.complete = camss_subdev_notifier_complete;
+ camss->notifier.ops = &camss_subdev_notifier_ops;
ret = v4l2_async_notifier_register(&camss->v4l2_dev,
&camss->notifier);
diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
index 62b4a94f9a39..55acab4f2905 100644
--- a/drivers/media/platform/rcar-vin/rcar-core.c
+++ b/drivers/media/platform/rcar-vin/rcar-core.c
@@ -134,6 +134,12 @@ static int rvin_digital_notify_bound(struct v4l2_async_notifier *notifier,
return 0;
}
+static const struct v4l2_async_notifier_operations rvin_digital_notify_ops = {
+ .bound = rvin_digital_notify_bound,
+ .unbind = rvin_digital_notify_unbind,
+ .complete = rvin_digital_notify_complete,
+};
+
static int rvin_digital_parse_v4l2(struct device *dev,
struct v4l2_fwnode_endpoint *vep,
@@ -182,9 +188,7 @@ static int rvin_digital_graph_init(struct rvin_dev *vin)
to_of_node(
vin->digital->asd.match.fwnode.fwnode));
- vin->notifier.bound = rvin_digital_notify_bound;
- vin->notifier.unbind = rvin_digital_notify_unbind;
- vin->notifier.complete = rvin_digital_notify_complete;
+ vin->notifier.ops = &rvin_digital_notify_ops;
ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier);
if (ret < 0) {
vin_err(vin, "Notifier registration failed\n");
diff --git a/drivers/media/platform/rcar_drif.c b/drivers/media/platform/rcar_drif.c
index 522364ff0d5d..0b2214d6d621 100644
--- a/drivers/media/platform/rcar_drif.c
+++ b/drivers/media/platform/rcar_drif.c
@@ -1185,6 +1185,12 @@ static int rcar_drif_notify_complete(struct v4l2_async_notifier *notifier)
return ret;
}
+static const struct v4l2_async_notifier_operations rcar_drif_notify_ops = {
+ .bound = rcar_drif_notify_bound,
+ .unbind = rcar_drif_notify_unbind,
+ .complete = rcar_drif_notify_complete,
+};
+
/* Read endpoint properties */
static void rcar_drif_get_ep_properties(struct rcar_drif_sdr *sdr,
struct fwnode_handle *fwnode)
@@ -1347,9 +1353,7 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr)
if (ret)
goto error;
- sdr->notifier.bound = rcar_drif_notify_bound;
- sdr->notifier.unbind = rcar_drif_notify_unbind;
- sdr->notifier.complete = rcar_drif_notify_complete;
+ sdr->notifier.ops = &rcar_drif_notify_ops;
/* Register notifier */
ret = v4l2_async_notifier_register(&sdr->v4l2_dev, &sdr->notifier);
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 1f3c450c7a69..916ff68b73d4 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -1391,6 +1391,12 @@ static int soc_camera_async_complete(struct v4l2_async_notifier *notifier)
return 0;
}
+static const struct v4l2_async_notifier_operations soc_camera_async_ops = {
+ .bound = soc_camera_async_bound,
+ .unbind = soc_camera_async_unbind,
+ .complete = soc_camera_async_complete,
+};
+
static int scan_async_group(struct soc_camera_host *ici,
struct v4l2_async_subdev **asd, unsigned int size)
{
@@ -1437,9 +1443,7 @@ static int scan_async_group(struct soc_camera_host *ici,
sasc->notifier.subdevs = asd;
sasc->notifier.num_subdevs = size;
- sasc->notifier.bound = soc_camera_async_bound;
- sasc->notifier.unbind = soc_camera_async_unbind;
- sasc->notifier.complete = soc_camera_async_complete;
+ sasc->notifier.ops = &soc_camera_async_ops;
icd->sasc = sasc;
icd->parent = ici->v4l2_dev.dev;
@@ -1537,9 +1541,7 @@ static int soc_of_bind(struct soc_camera_host *ici,
sasc->notifier.subdevs = &info->subdev;
sasc->notifier.num_subdevs = 1;
- sasc->notifier.bound = soc_camera_async_bound;
- sasc->notifier.unbind = soc_camera_async_unbind;
- sasc->notifier.complete = soc_camera_async_complete;
+ sasc->notifier.ops = &soc_camera_async_ops;
icd->sasc = sasc;
icd->parent = ici->v4l2_dev.dev;
diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
index 35ba6f211b79..ac4c450a6c7d 100644
--- a/drivers/media/platform/stm32/stm32-dcmi.c
+++ b/drivers/media/platform/stm32/stm32-dcmi.c
@@ -1495,6 +1495,12 @@ static int dcmi_graph_notify_bound(struct v4l2_async_notifier *notifier,
return 0;
}
+static const struct v4l2_async_notifier_operations dcmi_graph_notify_ops = {
+ .bound = dcmi_graph_notify_bound,
+ .unbind = dcmi_graph_notify_unbind,
+ .complete = dcmi_graph_notify_complete,
+};
+
static int dcmi_graph_parse(struct stm32_dcmi *dcmi, struct device_node *node)
{
struct device_node *ep = NULL;
@@ -1542,9 +1548,7 @@ static int dcmi_graph_init(struct stm32_dcmi *dcmi)
dcmi->notifier.subdevs = subdevs;
dcmi->notifier.num_subdevs = 1;
- dcmi->notifier.bound = dcmi_graph_notify_bound;
- dcmi->notifier.unbind = dcmi_graph_notify_unbind;
- dcmi->notifier.complete = dcmi_graph_notify_complete;
+ dcmi->notifier.ops = &dcmi_graph_notify_ops;
ret = v4l2_async_notifier_register(&dcmi->v4l2_dev, &dcmi->notifier);
if (ret < 0) {
diff --git a/drivers/media/platform/ti-vpe/cal.c b/drivers/media/platform/ti-vpe/cal.c
index 42e383a48ffe..8b586c864524 100644
--- a/drivers/media/platform/ti-vpe/cal.c
+++ b/drivers/media/platform/ti-vpe/cal.c
@@ -1522,6 +1522,11 @@ static int cal_async_complete(struct v4l2_async_notifier *notifier)
return 0;
}
+static const struct v4l2_async_notifier_operations cal_async_ops = {
+ .bound = cal_async_bound,
+ .complete = cal_async_complete,
+};
+
static int cal_complete_ctx(struct cal_ctx *ctx)
{
struct video_device *vfd;
@@ -1736,8 +1741,7 @@ static int of_cal_create_instance(struct cal_ctx *ctx, int inst)
ctx->asd_list[0] = asd;
ctx->notifier.subdevs = ctx->asd_list;
ctx->notifier.num_subdevs = 1;
- ctx->notifier.bound = cal_async_bound;
- ctx->notifier.complete = cal_async_complete;
+ ctx->notifier.ops = &cal_async_ops;
ret = v4l2_async_notifier_register(&ctx->v4l2_dev,
&ctx->notifier);
if (ret) {
diff --git a/drivers/media/platform/xilinx/xilinx-vipp.c b/drivers/media/platform/xilinx/xilinx-vipp.c
index ebfdf334d99c..d881cf09876d 100644
--- a/drivers/media/platform/xilinx/xilinx-vipp.c
+++ b/drivers/media/platform/xilinx/xilinx-vipp.c
@@ -351,6 +351,11 @@ static int xvip_graph_notify_bound(struct v4l2_async_notifier *notifier,
return -EINVAL;
}
+static const struct v4l2_async_notifier_operations xvip_graph_notify_ops = {
+ .bound = xvip_graph_notify_bound,
+ .complete = xvip_graph_notify_complete,
+};
+
static int xvip_graph_parse_one(struct xvip_composite_device *xdev,
struct device_node *node)
{
@@ -548,8 +553,7 @@ static int xvip_graph_init(struct xvip_composite_device *xdev)
xdev->notifier.subdevs = subdevs;
xdev->notifier.num_subdevs = num_subdevs;
- xdev->notifier.bound = xvip_graph_notify_bound;
- xdev->notifier.complete = xvip_graph_notify_complete;
+ xdev->notifier.ops = &xvip_graph_notify_ops;
ret = v4l2_async_notifier_register(&xdev->v4l2_dev, &xdev->notifier);
if (ret < 0) {
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index bf0215dde616..7b2125b3d62f 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -102,16 +102,16 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
{
int ret;
- if (notifier->bound) {
- ret = notifier->bound(notifier, sd, asd);
+ if (notifier->ops->bound) {
+ ret = notifier->ops->bound(notifier, sd, asd);
if (ret < 0)
return ret;
}
ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
if (ret < 0) {
- if (notifier->unbind)
- notifier->unbind(notifier, sd, asd);
+ if (notifier->ops->unbind)
+ notifier->ops->unbind(notifier, sd, asd);
return ret;
}
@@ -123,8 +123,8 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
/* Move from the global subdevice list to notifier's done */
list_move(&sd->async_list, ¬ifier->done);
- if (list_empty(¬ifier->waiting) && notifier->complete)
- return notifier->complete(notifier);
+ if (list_empty(¬ifier->waiting) && notifier->ops->complete)
+ return notifier->ops->complete(notifier);
return 0;
}
@@ -210,8 +210,8 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
v4l2_async_cleanup(sd);
- if (notifier->unbind)
- notifier->unbind(notifier, sd, sd->asd);
+ if (notifier->ops->unbind)
+ notifier->ops->unbind(notifier, sd, sd->asd);
}
mutex_unlock(&list_lock);
@@ -300,8 +300,8 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
v4l2_async_cleanup(sd);
- if (notifier->unbind)
- notifier->unbind(notifier, sd, sd->asd);
+ if (notifier->ops->unbind)
+ notifier->ops->unbind(notifier, sd, sd->asd);
mutex_unlock(&list_lock);
}
diff --git a/drivers/staging/media/imx/imx-media-dev.c b/drivers/staging/media/imx/imx-media-dev.c
index d96f4512224f..e8dc2c93658a 100644
--- a/drivers/staging/media/imx/imx-media-dev.c
+++ b/drivers/staging/media/imx/imx-media-dev.c
@@ -440,6 +440,11 @@ static int imx_media_probe_complete(struct v4l2_async_notifier *notifier)
return media_device_register(&imxmd->md);
}
+static const struct v4l2_async_notifier_operations imx_media_subdev_ops = {
+ .bound = imx_media_subdev_bound,
+ .complete = imx_media_probe_complete,
+};
+
/*
* adds controls to a video device from an entity subdevice.
* Continues upstream from the entity's sink pads.
@@ -608,8 +613,7 @@ static int imx_media_probe(struct platform_device *pdev)
/* prepare the async subdev notifier and register it */
imxmd->subdev_notifier.subdevs = imxmd->async_ptrs;
- imxmd->subdev_notifier.bound = imx_media_subdev_bound;
- imxmd->subdev_notifier.complete = imx_media_probe_complete;
+ imxmd->subdev_notifier.ops = &imx_media_subdev_ops;
ret = v4l2_async_notifier_register(&imxmd->v4l2_dev,
&imxmd->subdev_notifier);
if (ret) {
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 96fa1afc00dd..3c48f8b66d12 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -18,6 +18,7 @@ struct device;
struct device_node;
struct v4l2_device;
struct v4l2_subdev;
+struct v4l2_async_notifier;
/* A random max subdevice number, used to allocate an array on stack */
#define V4L2_MAX_SUBDEVS 128U
@@ -79,8 +80,25 @@ struct v4l2_async_subdev {
};
/**
+ * struct v4l2_async_notifier_operations - Asynchronous V4L2 notifier operations
+ * @bound: a subdevice driver has successfully probed one of the subdevices
+ * @complete: all subdevices have been probed successfully
+ * @unbind: a subdevice is leaving
+ */
+struct v4l2_async_notifier_operations {
+ int (*bound)(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *subdev,
+ struct v4l2_async_subdev *asd);
+ int (*complete)(struct v4l2_async_notifier *notifier);
+ void (*unbind)(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *subdev,
+ struct v4l2_async_subdev *asd);
+};
+
+/**
* struct v4l2_async_notifier - v4l2_device notifier data
*
+ * @ops: notifier operations
* @num_subdevs: number of subdevices used in the subdevs array
* @max_subdevs: number of subdevices allocated in the subdevs array
* @subdevs: array of pointers to subdevice descriptors
@@ -88,11 +106,9 @@ struct v4l2_async_subdev {
* @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
- * @bound: a subdevice driver has successfully probed one of subdevices
- * @complete: all subdevices have been probed successfully
- * @unbind: a subdevice is leaving
*/
struct v4l2_async_notifier {
+ const struct v4l2_async_notifier_operations *ops;
unsigned int num_subdevs;
unsigned int max_subdevs;
struct v4l2_async_subdev **subdevs;
@@ -100,13 +116,6 @@ struct v4l2_async_notifier {
struct list_head waiting;
struct list_head done;
struct list_head list;
- int (*bound)(struct v4l2_async_notifier *notifier,
- struct v4l2_subdev *subdev,
- struct v4l2_async_subdev *asd);
- int (*complete)(struct v4l2_async_notifier *notifier);
- void (*unbind)(struct v4l2_async_notifier *notifier,
- struct v4l2_subdev *subdev,
- struct v4l2_async_subdev *asd);
};
/**
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Add three helper functions to call async operations callbacks. Besides
simplifying callbacks, this allows async notifiers to have no ops set,
i.e. it can be left NULL.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
---
drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++++++++++----------
include/media/v4l2-async.h | 1 +
2 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 7b2125b3d62f..c35d04b9122f 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -25,6 +25,34 @@
#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
+static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier *n,
+ struct v4l2_subdev *subdev,
+ struct v4l2_async_subdev *asd)
+{
+ if (!n->ops || !n->ops->bound)
+ return 0;
+
+ return n->ops->bound(n, subdev, asd);
+}
+
+static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier *n,
+ struct v4l2_subdev *subdev,
+ struct v4l2_async_subdev *asd)
+{
+ if (!n->ops || !n->ops->unbind)
+ return;
+
+ n->ops->unbind(n, subdev, asd);
+}
+
+static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
+{
+ if (!n->ops || !n->ops->complete)
+ return 0;
+
+ return n->ops->complete(n);
+}
+
static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
{
#if IS_ENABLED(CONFIG_I2C)
@@ -102,16 +130,13 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
{
int ret;
- if (notifier->ops->bound) {
- ret = notifier->ops->bound(notifier, sd, asd);
- if (ret < 0)
- return ret;
- }
+ ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
+ if (ret < 0)
+ return ret;
ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
if (ret < 0) {
- if (notifier->ops->unbind)
- notifier->ops->unbind(notifier, sd, asd);
+ v4l2_async_notifier_call_unbind(notifier, sd, asd);
return ret;
}
@@ -123,8 +148,8 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
/* Move from the global subdevice list to notifier's done */
list_move(&sd->async_list, ¬ifier->done);
- if (list_empty(¬ifier->waiting) && notifier->ops->complete)
- return notifier->ops->complete(notifier);
+ if (list_empty(¬ifier->waiting))
+ return v4l2_async_notifier_call_complete(notifier);
return 0;
}
@@ -210,8 +235,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
v4l2_async_cleanup(sd);
- if (notifier->ops->unbind)
- notifier->ops->unbind(notifier, sd, sd->asd);
+ v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
}
mutex_unlock(&list_lock);
@@ -300,8 +324,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
v4l2_async_cleanup(sd);
- if (notifier->ops->unbind)
- notifier->ops->unbind(notifier, sd, sd->asd);
+ v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
mutex_unlock(&list_lock);
}
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 3c48f8b66d12..3bc8a7c0d83f 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -164,4 +164,5 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd);
* @sd: pointer to &struct v4l2_subdev
*/
void v4l2_async_unregister_subdev(struct v4l2_subdev *sd);
+
#endif
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Add three helper functions to call async operations callbacks. Besides
simplifying callbacks, this allows async notifiers to have no ops set,
i.e. it can be left NULL.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++++++++++----------
include/media/v4l2-async.h | 1 +
2 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 7b2125b3d62f..c35d04b9122f 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -25,6 +25,34 @@
#include <media/v4l2-fwnode.h>
#include <media/v4l2-subdev.h>
+static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier *n,
+ struct v4l2_subdev *subdev,
+ struct v4l2_async_subdev *asd)
+{
+ if (!n->ops || !n->ops->bound)
+ return 0;
+
+ return n->ops->bound(n, subdev, asd);
+}
+
+static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier *n,
+ struct v4l2_subdev *subdev,
+ struct v4l2_async_subdev *asd)
+{
+ if (!n->ops || !n->ops->unbind)
+ return;
+
+ n->ops->unbind(n, subdev, asd);
+}
+
+static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
+{
+ if (!n->ops || !n->ops->complete)
+ return 0;
+
+ return n->ops->complete(n);
+}
+
static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
{
#if IS_ENABLED(CONFIG_I2C)
@@ -102,16 +130,13 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
{
int ret;
- if (notifier->ops->bound) {
- ret = notifier->ops->bound(notifier, sd, asd);
- if (ret < 0)
- return ret;
- }
+ ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
+ if (ret < 0)
+ return ret;
ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
if (ret < 0) {
- if (notifier->ops->unbind)
- notifier->ops->unbind(notifier, sd, asd);
+ v4l2_async_notifier_call_unbind(notifier, sd, asd);
return ret;
}
@@ -123,8 +148,8 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
/* Move from the global subdevice list to notifier's done */
list_move(&sd->async_list, ¬ifier->done);
- if (list_empty(¬ifier->waiting) && notifier->ops->complete)
- return notifier->ops->complete(notifier);
+ if (list_empty(¬ifier->waiting))
+ return v4l2_async_notifier_call_complete(notifier);
return 0;
}
@@ -210,8 +235,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
v4l2_async_cleanup(sd);
- if (notifier->ops->unbind)
- notifier->ops->unbind(notifier, sd, sd->asd);
+ v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
}
mutex_unlock(&list_lock);
@@ -300,8 +324,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd)
v4l2_async_cleanup(sd);
- if (notifier->ops->unbind)
- notifier->ops->unbind(notifier, sd, sd->asd);
+ v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
mutex_unlock(&list_lock);
}
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 3c48f8b66d12..3bc8a7c0d83f 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -164,4 +164,5 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd);
* @sd: pointer to &struct v4l2_subdev
*/
void v4l2_async_unregister_subdev(struct v4l2_subdev *sd);
+
#endif
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 12/25] v4l: async: Register sub-devices before calling bound callback
2017-09-15 14:16 ` Sakari Ailus
` (6 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
2017-09-19 12:01 ` Laurent Pinchart
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Register the sub-device before calling the notifier's bound callback.
Doing this the other way around is problematic as the struct v4l2_device
has not assigned for the sub-device yet and may be required by the bound
callback.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/v4l2-core/v4l2-async.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index c35d04b9122f..9895b610e2a0 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -130,13 +130,13 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
{
int ret;
- ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
+ ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
if (ret < 0)
return ret;
- ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
+ ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
if (ret < 0) {
- v4l2_async_notifier_call_unbind(notifier, sd, asd);
+ v4l2_device_unregister_subdev(sd);
return ret;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
2017-09-15 14:16 ` Sakari Ailus
` (7 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
2017-09-19 12:04 ` Laurent Pinchart
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
The information on how many async sub-devices would be bindable to a
notifier is typically dependent on information from platform firmware and
it's not driver's business to be aware of that.
Many V4L2 main drivers are perfectly usable (and useful) without async
sub-devices and so if there aren't any around, just proceed call the
notifier's complete callback immediately without registering the notifier
itself.
If a driver needs to check whether there are async sub-devices available,
it can be done by inspecting the notifier's num_subdevs field which tells
the number of async sub-devices.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/v4l2-core/v4l2-async.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 9895b610e2a0..4be2f16af051 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -170,14 +170,16 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
struct v4l2_async_subdev *asd;
int i;
- if (!v4l2_dev || !notifier->num_subdevs ||
- notifier->num_subdevs > V4L2_MAX_SUBDEVS)
+ if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
return -EINVAL;
notifier->v4l2_dev = v4l2_dev;
INIT_LIST_HEAD(¬ifier->waiting);
INIT_LIST_HEAD(¬ifier->done);
+ if (!notifier->num_subdevs)
+ return v4l2_async_notifier_call_complete(notifier);
+
for (i = 0; i < notifier->num_subdevs; i++) {
asd = notifier->subdevs[i];
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Registering a notifier has required the knowledge of struct v4l2_device
for the reason that sub-devices generally are registered to the
v4l2_device (as well as the media device, also available through
v4l2_device).
This information is not available for sub-device drivers at probe time.
What this patch does is that it allows registering notifiers without
having v4l2_device around. Instead the sub-device pointer is stored in the
notifier. Once the sub-device of the driver that registered the notifier
is registered, the notifier will gain the knowledge of the v4l2_device,
and the binding of async sub-devices from the sub-device driver's notifier
may proceed.
The root notifier's complete callback is only called when all sub-device
notifiers are completed.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
drivers/media/v4l2-core/v4l2-async.c | 218 ++++++++++++++++++++++++++++++-----
include/media/v4l2-async.h | 16 ++-
2 files changed, 203 insertions(+), 31 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 4be2f16af051..52fe22b9b6b4 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -53,6 +53,10 @@ static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
return n->ops->complete(n);
}
+static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *sd,
+ struct v4l2_async_subdev *asd);
+
static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
{
#if IS_ENABLED(CONFIG_I2C)
@@ -124,14 +128,127 @@ static struct v4l2_async_subdev *v4l2_async_find_match(
return NULL;
}
+/* Find the sub-device notifier registered by a sub-device driver. */
+static struct v4l2_async_notifier *v4l2_async_find_subdev_notifier(
+ struct v4l2_subdev *sd)
+{
+ struct v4l2_async_notifier *n;
+
+ list_for_each_entry(n, ¬ifier_list, list)
+ if (n->sd == sd)
+ return n;
+
+ return NULL;
+}
+
+/* Return true if all sub-device notifiers are complete, false otherwise. */
+static bool v4l2_async_subdev_notifiers_complete(
+ struct v4l2_async_notifier *notifier)
+{
+ struct v4l2_subdev *sd;
+
+ if (!list_empty(¬ifier->waiting))
+ return false;
+
+ list_for_each_entry(sd, ¬ifier->done, async_list) {
+ struct v4l2_async_notifier *subdev_notifier =
+ v4l2_async_find_subdev_notifier(sd);
+
+ if (subdev_notifier &&
+ !v4l2_async_subdev_notifiers_complete(subdev_notifier))
+ return false;
+ }
+
+ return true;
+}
+
+/* Get v4l2_device related to the notifier if one can be found. */
+static struct v4l2_device *v4l2_async_notifier_find_v4l2_dev(
+ struct v4l2_async_notifier *notifier)
+{
+ while (notifier->parent)
+ notifier = notifier->parent;
+
+ return notifier->v4l2_dev;
+}
+
+/* Test all async sub-devices in a notifier for a match. */
+static int v4l2_async_notifier_try_all_subdevs(
+ struct v4l2_async_notifier *notifier)
+{
+ struct v4l2_subdev *sd;
+
+ if (!v4l2_async_notifier_find_v4l2_dev(notifier))
+ return 0;
+
+again:
+ list_for_each_entry(sd, &subdev_list, async_list) {
+ struct v4l2_async_subdev *asd;
+ int ret;
+
+ asd = v4l2_async_find_match(notifier, sd);
+ if (!asd)
+ continue;
+
+ ret = v4l2_async_match_notify(notifier, sd, asd);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * v4l2_async_match_notify() may lead to registering a
+ * new notifier and thus changing the async subdevs
+ * list. In order to proceed safely from here, restart
+ * parsing the list from the beginning.
+ */
+ goto again;
+ }
+
+ return 0;
+}
+
+/* Try completing a notifier. */
+static int v4l2_async_notifier_try_complete(
+ struct v4l2_async_notifier *notifier)
+{
+ do {
+ int ret;
+
+ /* Any local async sub-devices left? */
+ if (!list_empty(¬ifier->waiting))
+ return 0;
+
+ /*
+ * Any sub-device notifiers waiting for async subdevs
+ * to be bound?
+ */
+ if (!v4l2_async_subdev_notifiers_complete(notifier))
+ return 0;
+
+ /* Proceed completing the notifier */
+ ret = v4l2_async_notifier_call_complete(notifier);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * Obtain notifier's parent. If there is one, repeat
+ * the process, otherwise we're done here.
+ */
+ notifier = notifier->parent;
+ } while (notifier);
+
+ return 0;
+}
+
static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *sd,
struct v4l2_async_subdev *asd)
{
+ struct v4l2_async_notifier *subdev_notifier;
int ret;
- ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
- if (ret < 0)
+ ret = v4l2_device_register_subdev(
+ v4l2_async_notifier_find_v4l2_dev(notifier), sd);
+ if (ret)
return ret;
ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
@@ -148,10 +265,20 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
/* Move from the global subdevice list to notifier's done */
list_move(&sd->async_list, ¬ifier->done);
- if (list_empty(¬ifier->waiting))
- return v4l2_async_notifier_call_complete(notifier);
+ /*
+ * See if the sub-device has a notifier. If it does, proceed
+ * with checking for its async sub-devices.
+ */
+ subdev_notifier = v4l2_async_find_subdev_notifier(sd);
+ if (subdev_notifier && !subdev_notifier->parent) {
+ subdev_notifier->parent = notifier;
+ ret = v4l2_async_notifier_try_all_subdevs(subdev_notifier);
+ if (ret)
+ return ret;
+ }
- return 0;
+ /* Try completing the notifier and its parent(s). */
+ return v4l2_async_notifier_try_complete(notifier);
}
static void v4l2_async_cleanup(struct v4l2_subdev *sd)
@@ -163,17 +290,15 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
sd->dev = NULL;
}
-int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
- struct v4l2_async_notifier *notifier)
+static int __v4l2_async_notifier_register(struct v4l2_async_notifier *notifier)
{
- struct v4l2_subdev *sd, *tmp;
struct v4l2_async_subdev *asd;
+ int ret;
int i;
- if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
+ if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
return -EINVAL;
- notifier->v4l2_dev = v4l2_dev;
INIT_LIST_HEAD(¬ifier->waiting);
INIT_LIST_HEAD(¬ifier->done);
@@ -200,18 +325,10 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
mutex_lock(&list_lock);
- list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
- int ret;
-
- asd = v4l2_async_find_match(notifier, sd);
- if (!asd)
- continue;
-
- ret = v4l2_async_match_notify(notifier, sd, asd);
- if (ret < 0) {
- mutex_unlock(&list_lock);
- return ret;
- }
+ ret = v4l2_async_notifier_try_all_subdevs(notifier);
+ if (ret) {
+ mutex_unlock(&list_lock);
+ return ret;
}
/* Keep also completed notifiers on the list */
@@ -221,29 +338,70 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
return 0;
}
+
+int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
+ struct v4l2_async_notifier *notifier)
+{
+ if (WARN_ON(!v4l2_dev || notifier->sd))
+ return -EINVAL;
+
+ notifier->v4l2_dev = v4l2_dev;
+
+ return __v4l2_async_notifier_register(notifier);
+}
EXPORT_SYMBOL(v4l2_async_notifier_register);
-void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
+int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
+ struct v4l2_async_notifier *notifier)
{
- struct v4l2_subdev *sd, *tmp;
+ if (WARN_ON(!sd || notifier->v4l2_dev))
+ return -EINVAL;
- if (!notifier->v4l2_dev)
- return;
+ notifier->sd = sd;
- mutex_lock(&list_lock);
+ return __v4l2_async_notifier_register(notifier);
+}
+EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
- list_del(¬ifier->list);
+/* Unbind all sub-devices in the notifier tree. */
+static void v4l2_async_notifier_unbind_all_subdevs(
+ struct v4l2_async_notifier *notifier)
+{
+ struct v4l2_subdev *sd, *tmp;
list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
+ struct v4l2_async_notifier *subdev_notifier =
+ v4l2_async_find_subdev_notifier(sd);
+
+ if (subdev_notifier)
+ v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
+
v4l2_async_cleanup(sd);
v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
- }
- mutex_unlock(&list_lock);
+ list_del(&sd->async_list);
+ list_add(&sd->async_list, &subdev_list);
+ }
+ notifier->parent = NULL;
+ notifier->sd = NULL;
notifier->v4l2_dev = NULL;
}
+
+void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
+{
+ if (!notifier->v4l2_dev && !notifier->sd)
+ return;
+
+ mutex_lock(&list_lock);
+
+ v4l2_async_notifier_unbind_all_subdevs(notifier);
+
+ list_del(¬ifier->list);
+
+ mutex_unlock(&list_lock);
+}
EXPORT_SYMBOL(v4l2_async_notifier_unregister);
void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 3bc8a7c0d83f..a13803a6371d 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -102,7 +102,9 @@ struct v4l2_async_notifier_operations {
* @num_subdevs: number of subdevices used in the subdevs array
* @max_subdevs: number of subdevices allocated in the subdevs array
* @subdevs: array of pointers to subdevice descriptors
- * @v4l2_dev: pointer to struct v4l2_device
+ * @v4l2_dev: v4l2_device of the root notifier, NULL otherwise
+ * @sd: sub-device that registered the notifier, NULL otherwise
+ * @parent: parent notifier
* @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
@@ -113,6 +115,8 @@ struct v4l2_async_notifier {
unsigned int max_subdevs;
struct v4l2_async_subdev **subdevs;
struct v4l2_device *v4l2_dev;
+ struct v4l2_subdev *sd;
+ struct v4l2_async_notifier *parent;
struct list_head waiting;
struct list_head done;
struct list_head list;
@@ -128,6 +132,16 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
struct v4l2_async_notifier *notifier);
/**
+ * v4l2_async_subdev_notifier_register - registers a subdevice asynchronous
+ * notifier for a sub-device
+ *
+ * @sd: pointer to &struct v4l2_subdev
+ * @notifier: pointer to &struct v4l2_async_notifier
+ */
+int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
+ struct v4l2_async_notifier *notifier);
+
+/**
* v4l2_async_notifier_unregister - unregisters a subdevice asynchronous notifier
*
* @notifier: pointer to &struct v4l2_async_notifier
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Registering a notifier has required the knowledge of struct v4l2_device
for the reason that sub-devices generally are registered to the
v4l2_device (as well as the media device, also available through
v4l2_device).
This information is not available for sub-device drivers at probe time.
What this patch does is that it allows registering notifiers without
having v4l2_device around. Instead the sub-device pointer is stored in the
notifier. Once the sub-device of the driver that registered the notifier
is registered, the notifier will gain the knowledge of the v4l2_device,
and the binding of async sub-devices from the sub-device driver's notifier
may proceed.
The root notifier's complete callback is only called when all sub-device
notifiers are completed.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-async.c | 218 ++++++++++++++++++++++++++++++-----
include/media/v4l2-async.h | 16 ++-
2 files changed, 203 insertions(+), 31 deletions(-)
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 4be2f16af051..52fe22b9b6b4 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -53,6 +53,10 @@ static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
return n->ops->complete(n);
}
+static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
+ struct v4l2_subdev *sd,
+ struct v4l2_async_subdev *asd);
+
static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
{
#if IS_ENABLED(CONFIG_I2C)
@@ -124,14 +128,127 @@ static struct v4l2_async_subdev *v4l2_async_find_match(
return NULL;
}
+/* Find the sub-device notifier registered by a sub-device driver. */
+static struct v4l2_async_notifier *v4l2_async_find_subdev_notifier(
+ struct v4l2_subdev *sd)
+{
+ struct v4l2_async_notifier *n;
+
+ list_for_each_entry(n, ¬ifier_list, list)
+ if (n->sd == sd)
+ return n;
+
+ return NULL;
+}
+
+/* Return true if all sub-device notifiers are complete, false otherwise. */
+static bool v4l2_async_subdev_notifiers_complete(
+ struct v4l2_async_notifier *notifier)
+{
+ struct v4l2_subdev *sd;
+
+ if (!list_empty(¬ifier->waiting))
+ return false;
+
+ list_for_each_entry(sd, ¬ifier->done, async_list) {
+ struct v4l2_async_notifier *subdev_notifier =
+ v4l2_async_find_subdev_notifier(sd);
+
+ if (subdev_notifier &&
+ !v4l2_async_subdev_notifiers_complete(subdev_notifier))
+ return false;
+ }
+
+ return true;
+}
+
+/* Get v4l2_device related to the notifier if one can be found. */
+static struct v4l2_device *v4l2_async_notifier_find_v4l2_dev(
+ struct v4l2_async_notifier *notifier)
+{
+ while (notifier->parent)
+ notifier = notifier->parent;
+
+ return notifier->v4l2_dev;
+}
+
+/* Test all async sub-devices in a notifier for a match. */
+static int v4l2_async_notifier_try_all_subdevs(
+ struct v4l2_async_notifier *notifier)
+{
+ struct v4l2_subdev *sd;
+
+ if (!v4l2_async_notifier_find_v4l2_dev(notifier))
+ return 0;
+
+again:
+ list_for_each_entry(sd, &subdev_list, async_list) {
+ struct v4l2_async_subdev *asd;
+ int ret;
+
+ asd = v4l2_async_find_match(notifier, sd);
+ if (!asd)
+ continue;
+
+ ret = v4l2_async_match_notify(notifier, sd, asd);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * v4l2_async_match_notify() may lead to registering a
+ * new notifier and thus changing the async subdevs
+ * list. In order to proceed safely from here, restart
+ * parsing the list from the beginning.
+ */
+ goto again;
+ }
+
+ return 0;
+}
+
+/* Try completing a notifier. */
+static int v4l2_async_notifier_try_complete(
+ struct v4l2_async_notifier *notifier)
+{
+ do {
+ int ret;
+
+ /* Any local async sub-devices left? */
+ if (!list_empty(¬ifier->waiting))
+ return 0;
+
+ /*
+ * Any sub-device notifiers waiting for async subdevs
+ * to be bound?
+ */
+ if (!v4l2_async_subdev_notifiers_complete(notifier))
+ return 0;
+
+ /* Proceed completing the notifier */
+ ret = v4l2_async_notifier_call_complete(notifier);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * Obtain notifier's parent. If there is one, repeat
+ * the process, otherwise we're done here.
+ */
+ notifier = notifier->parent;
+ } while (notifier);
+
+ return 0;
+}
+
static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
struct v4l2_subdev *sd,
struct v4l2_async_subdev *asd)
{
+ struct v4l2_async_notifier *subdev_notifier;
int ret;
- ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
- if (ret < 0)
+ ret = v4l2_device_register_subdev(
+ v4l2_async_notifier_find_v4l2_dev(notifier), sd);
+ if (ret)
return ret;
ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
@@ -148,10 +265,20 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
/* Move from the global subdevice list to notifier's done */
list_move(&sd->async_list, ¬ifier->done);
- if (list_empty(¬ifier->waiting))
- return v4l2_async_notifier_call_complete(notifier);
+ /*
+ * See if the sub-device has a notifier. If it does, proceed
+ * with checking for its async sub-devices.
+ */
+ subdev_notifier = v4l2_async_find_subdev_notifier(sd);
+ if (subdev_notifier && !subdev_notifier->parent) {
+ subdev_notifier->parent = notifier;
+ ret = v4l2_async_notifier_try_all_subdevs(subdev_notifier);
+ if (ret)
+ return ret;
+ }
- return 0;
+ /* Try completing the notifier and its parent(s). */
+ return v4l2_async_notifier_try_complete(notifier);
}
static void v4l2_async_cleanup(struct v4l2_subdev *sd)
@@ -163,17 +290,15 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
sd->dev = NULL;
}
-int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
- struct v4l2_async_notifier *notifier)
+static int __v4l2_async_notifier_register(struct v4l2_async_notifier *notifier)
{
- struct v4l2_subdev *sd, *tmp;
struct v4l2_async_subdev *asd;
+ int ret;
int i;
- if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
+ if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
return -EINVAL;
- notifier->v4l2_dev = v4l2_dev;
INIT_LIST_HEAD(¬ifier->waiting);
INIT_LIST_HEAD(¬ifier->done);
@@ -200,18 +325,10 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
mutex_lock(&list_lock);
- list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
- int ret;
-
- asd = v4l2_async_find_match(notifier, sd);
- if (!asd)
- continue;
-
- ret = v4l2_async_match_notify(notifier, sd, asd);
- if (ret < 0) {
- mutex_unlock(&list_lock);
- return ret;
- }
+ ret = v4l2_async_notifier_try_all_subdevs(notifier);
+ if (ret) {
+ mutex_unlock(&list_lock);
+ return ret;
}
/* Keep also completed notifiers on the list */
@@ -221,29 +338,70 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
return 0;
}
+
+int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
+ struct v4l2_async_notifier *notifier)
+{
+ if (WARN_ON(!v4l2_dev || notifier->sd))
+ return -EINVAL;
+
+ notifier->v4l2_dev = v4l2_dev;
+
+ return __v4l2_async_notifier_register(notifier);
+}
EXPORT_SYMBOL(v4l2_async_notifier_register);
-void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
+int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
+ struct v4l2_async_notifier *notifier)
{
- struct v4l2_subdev *sd, *tmp;
+ if (WARN_ON(!sd || notifier->v4l2_dev))
+ return -EINVAL;
- if (!notifier->v4l2_dev)
- return;
+ notifier->sd = sd;
- mutex_lock(&list_lock);
+ return __v4l2_async_notifier_register(notifier);
+}
+EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
- list_del(¬ifier->list);
+/* Unbind all sub-devices in the notifier tree. */
+static void v4l2_async_notifier_unbind_all_subdevs(
+ struct v4l2_async_notifier *notifier)
+{
+ struct v4l2_subdev *sd, *tmp;
list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
+ struct v4l2_async_notifier *subdev_notifier =
+ v4l2_async_find_subdev_notifier(sd);
+
+ if (subdev_notifier)
+ v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
+
v4l2_async_cleanup(sd);
v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
- }
- mutex_unlock(&list_lock);
+ list_del(&sd->async_list);
+ list_add(&sd->async_list, &subdev_list);
+ }
+ notifier->parent = NULL;
+ notifier->sd = NULL;
notifier->v4l2_dev = NULL;
}
+
+void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
+{
+ if (!notifier->v4l2_dev && !notifier->sd)
+ return;
+
+ mutex_lock(&list_lock);
+
+ v4l2_async_notifier_unbind_all_subdevs(notifier);
+
+ list_del(¬ifier->list);
+
+ mutex_unlock(&list_lock);
+}
EXPORT_SYMBOL(v4l2_async_notifier_unregister);
void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 3bc8a7c0d83f..a13803a6371d 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -102,7 +102,9 @@ struct v4l2_async_notifier_operations {
* @num_subdevs: number of subdevices used in the subdevs array
* @max_subdevs: number of subdevices allocated in the subdevs array
* @subdevs: array of pointers to subdevice descriptors
- * @v4l2_dev: pointer to struct v4l2_device
+ * @v4l2_dev: v4l2_device of the root notifier, NULL otherwise
+ * @sd: sub-device that registered the notifier, NULL otherwise
+ * @parent: parent notifier
* @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
@@ -113,6 +115,8 @@ struct v4l2_async_notifier {
unsigned int max_subdevs;
struct v4l2_async_subdev **subdevs;
struct v4l2_device *v4l2_dev;
+ struct v4l2_subdev *sd;
+ struct v4l2_async_notifier *parent;
struct list_head waiting;
struct list_head done;
struct list_head list;
@@ -128,6 +132,16 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
struct v4l2_async_notifier *notifier);
/**
+ * v4l2_async_subdev_notifier_register - registers a subdevice asynchronous
+ * notifier for a sub-device
+ *
+ * @sd: pointer to &struct v4l2_subdev
+ * @notifier: pointer to &struct v4l2_async_notifier
+ */
+int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
+ struct v4l2_async_notifier *notifier);
+
+/**
* v4l2_async_notifier_unregister - unregisters a subdevice asynchronous notifier
*
* @notifier: pointer to &struct v4l2_async_notifier
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 15/25] dt: bindings: Add a binding for flash LED devices associated to a sensor
2017-09-15 14:16 ` Sakari Ailus
` (8 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-16-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Camera flash drivers (and LEDs) are separate from the sensor devices in
DT. In order to make an association between the two, provide the
association information to the software.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
Documentation/devicetree/bindings/media/video-interfaces.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt
index 852041a7480c..fdba30479b47 100644
--- a/Documentation/devicetree/bindings/media/video-interfaces.txt
+++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
@@ -67,6 +67,14 @@ are required in a relevant parent node:
identifier, should be 1.
- #size-cells : should be zero.
+
+Optional properties
+-------------------
+
+- flash-leds: An array of phandles, each referring to a flash LED, a sub-node
+ of the LED driver device node.
+
+
Optional endpoint properties
----------------------------
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 16/25] dt: bindings: Add lens-focus binding for image sensors
2017-09-15 14:16 ` Sakari Ailus
` (9 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
The lens-focus property contains a phandle to the lens voice coil driver
that is associated to the sensor; typically both are contained in the same
camera module.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
Documentation/devicetree/bindings/media/video-interfaces.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt
index fdba30479b47..b535bdde861c 100644
--- a/Documentation/devicetree/bindings/media/video-interfaces.txt
+++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
@@ -74,6 +74,8 @@ Optional properties
- flash-leds: An array of phandles, each referring to a flash LED, a sub-node
of the LED driver device node.
+- lens-focus: A phandle to the node of the focus lens controller.
+
Optional endpoint properties
----------------------------
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
2017-09-15 14:16 ` Sakari Ailus
` (10 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-18-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Add function 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.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 69 +++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 44ee35f6aad5..65e84ea1cc35 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -498,6 +498,75 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
}
EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
+/*
+ * 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
+ *
+ * Return: 0 on success
+ * -ENOENT if no entries were found
+ * -ENOMEM if memory allocation failed
+ * -EINVAL if property parsing failed
+ */
+static int v4l2_fwnode_reference_parse(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ const char *prop)
+{
+ struct fwnode_reference_args args;
+ unsigned int index;
+ int ret;
+
+ for (index = 0;
+ !(ret = fwnode_property_get_reference_args(
+ dev_fwnode(dev), prop, NULL, 0, index, &args));
+ index++)
+ fwnode_handle_put(args.fwnode);
+
+ if (!index)
+ return -ENOENT;
+
+ /*
+ * Note that right now both -ENODATA and -ENOENT may signal
+ * out-of-bounds access. Return the error in cases other than that.
+ */
+ if (ret != -ENOENT && ret != -ENODATA)
+ return ret;
+
+ ret = v4l2_async_notifier_realloc(notifier,
+ notifier->num_subdevs + index);
+ if (ret)
+ return ret;
+
+ for (index = 0; !fwnode_property_get_reference_args(
+ dev_fwnode(dev), prop, NULL, 0, index, &args);
+ index++) {
+ struct v4l2_async_subdev *asd;
+
+ if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
+ ret = -EINVAL;
+ goto error;
+ }
+
+ asd = kzalloc(sizeof(*asd), GFP_KERNEL);
+ if (!asd) {
+ ret = -ENOMEM;
+ 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;
+}
+
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references
2017-09-15 14:16 ` Sakari Ailus
` (11 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
2017-09-19 8:31 ` Hans Verkuil
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
v4l2_fwnode_reference_parse_int_prop() will find an fwnode such that under
the device's own fwnode, it will follow child fwnodes with the given
property-value pair and return the resulting fwnode.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 201 ++++++++++++++++++++++++++++++++++
1 file changed, 201 insertions(+)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 65e84ea1cc35..968a345a288f 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -567,6 +567,207 @@ static int v4l2_fwnode_reference_parse(
return ret;
}
+/*
+ * v4l2_fwnode_reference_get_int_prop - parse a reference with integer
+ * arguments
+ * @dev: struct device pointer
+ * @notifier: notifier for @dev
+ * @prop: the name of the property
+ * @index: the index of the reference to get
+ * @props: the array of integer property names
+ * @nprops: the number of integer property names in @nprops
+ *
+ * Find fwnodes referred to by a property @prop, then under that
+ * iteratively, @nprops times, follow each child node which has a
+ * property in @props array at a given child index the value of which
+ * matches the integer argument at an index.
+ *
+ * For example, if this function was called with arguments and values
+ * @dev corresponding to device "SEN", @prop == "flash-leds", @index
+ * == 1, @props == { "led" }, @nprops == 1, with the ASL snippet below
+ * it would return the node marked with THISONE. The @dev argument in
+ * the ASL below.
+ *
+ * Device (LED)
+ * {
+ * Name (_DSD, Package () {
+ * ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
+ * Package () {
+ * Package () { "led0", "LED0" },
+ * Package () { "led1", "LED1" },
+ * }
+ * })
+ * Name (LED0, Package () {
+ * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+ * Package () {
+ * Package () { "led", 0 },
+ * }
+ * })
+ * Name (LED1, Package () {
+ * // THISONE
+ * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+ * Package () {
+ * Package () { "led", 1 },
+ * }
+ * })
+ * }
+ *
+ * Device (SEN)
+ * {
+ * Name (_DSD, Package () {
+ * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
+ * Package () {
+ * Package () {
+ * "flash-leds",
+ * Package () { ^LED, 0, ^LED, 1 },
+ * }
+ * }
+ * })
+ * }
+ *
+ * where
+ *
+ * LED LED driver device
+ * LED0 First LED
+ * LED1 Second LED
+ * SEN Camera sensor device (or another device the LED is
+ * related to)
+ *
+ * Return: 0 on success
+ * -ENOENT if no entries (or the property itself) were found
+ * -EINVAL if property parsing otherwise failed
+ * -ENOMEM if memory allocation failed
+ */
+static struct fwnode_handle *v4l2_fwnode_reference_get_int_prop(
+ struct fwnode_handle *fwnode, const char *prop, unsigned int index,
+ const char **props, unsigned int nprops)
+{
+ struct fwnode_reference_args fwnode_args;
+ unsigned int *args = fwnode_args.args;
+ struct fwnode_handle *child;
+ int ret;
+
+ /*
+ * Obtain remote fwnode as well as the integer arguments.
+ *
+ * Note that right now both -ENODATA and -ENOENT may signal
+ * out-of-bounds access. Return -ENOENT in that case.
+ */
+ ret = fwnode_property_get_reference_args(fwnode, prop, NULL, nprops,
+ index, &fwnode_args);
+ if (ret)
+ return ERR_PTR(ret == -ENODATA ? -ENOENT : ret);
+
+ /*
+ * Find a node in the tree under the referred fwnode corresponding the
+ * integer arguments.
+ */
+ fwnode = fwnode_args.fwnode;
+ while (nprops--) {
+ u32 val;
+
+ /* Loop over all child nodes under fwnode. */
+ fwnode_for_each_child_node(fwnode, child) {
+ if (fwnode_property_read_u32(child, *props, &val))
+ continue;
+
+ /* Found property, see if its value matches. */
+ if (val == *args)
+ break;
+ }
+
+ fwnode_handle_put(fwnode);
+
+ /* No property found; return an error here. */
+ if (!child) {
+ fwnode = ERR_PTR(-ENOENT);
+ break;
+ }
+
+ props++;
+ args++;
+ fwnode = child;
+ }
+
+ return fwnode;
+}
+
+/*
+ * v4l2_fwnode_reference_parse_int_props - parse references for async sub-devices
+ * @dev: struct device pointer
+ * @notifier: notifier for @dev
+ * @prop: the name of the property
+ * @props: the array of integer property names
+ * @nprops: the number of integer properties
+ *
+ * Use v4l2_fwnode_reference_get_int_prop to find fwnodes through reference in
+ * property @prop with integer arguments with child nodes matching in properties
+ * @props. Then, set up V4L2 async sub-devices for those fwnodes in the notifier
+ * accordingly.
+ *
+ * While it is technically possible to use this function on DT, it is only
+ * meaningful on ACPI. On Device tree you can refer to any node in the tree but
+ * on ACPI the references are limited to devices.
+ *
+ * Return: 0 on success
+ * -ENOENT if no entries (or the property itself) were found
+ * -EINVAL if property parsing otherwisefailed
+ * -ENOMEM if memory allocation failed
+ */
+static int v4l2_fwnode_reference_parse_int_props(
+ struct device *dev, struct v4l2_async_notifier *notifier,
+ const char *prop, const char **props, unsigned int nprops)
+{
+ struct fwnode_handle *fwnode;
+ unsigned int index;
+ int ret;
+
+ for (index = 0; !IS_ERR((fwnode = v4l2_fwnode_reference_get_int_prop(
+ dev_fwnode(dev), prop, index, props,
+ nprops))); index++)
+ fwnode_handle_put(fwnode);
+
+ /*
+ * Note that right now both -ENODATA and -ENOENT may signal
+ * out-of-bounds access. Return the error in cases other than that.
+ */
+ if (PTR_ERR(fwnode) != -ENOENT && PTR_ERR(fwnode) != -ENODATA)
+ return PTR_ERR(fwnode);
+
+ ret = v4l2_async_notifier_realloc(notifier,
+ notifier->num_subdevs + index);
+ if (ret)
+ return -ENOMEM;
+
+ for (index = 0; !IS_ERR((fwnode = v4l2_fwnode_reference_get_int_prop(
+ dev_fwnode(dev), prop, index, props,
+ nprops))); index++) {
+ struct v4l2_async_subdev *asd;
+
+ if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
+ ret = -EINVAL;
+ goto error;
+ }
+
+ asd = kzalloc(sizeof(struct v4l2_async_subdev), GFP_KERNEL);
+ if (!asd) {
+ ret = -ENOMEM;
+ goto error;
+ }
+
+ notifier->subdevs[notifier->num_subdevs] = asd;
+ asd->match.fwnode.fwnode = fwnode;
+ asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
+ notifier->num_subdevs++;
+ }
+
+ return PTR_ERR(fwnode) == -ENOENT ? 0 : PTR_ERR(fwnode);
+
+error:
+ fwnode_handle_put(fwnode);
+ return ret;
+}
+
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 19/25] v4l: fwnode: Add convenience function for parsing common external refs
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Add v4l2_fwnode_parse_reference_sensor_common for parsing common
sensor properties that refer to adjacent devices such as flash or lens
driver chips.
As this is an association only, there's little a regular driver needs to
know about these devices as such.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 35 +++++++++++++++++++++++++++++++++++
include/media/v4l2-async.h | 3 ++-
include/media/v4l2-fwnode.h | 21 +++++++++++++++++++++
3 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 968a345a288f..7de2fd195e19 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -768,6 +768,41 @@ static int v4l2_fwnode_reference_parse_int_props(
return ret;
}
+int v4l2_async_notifier_parse_fwnode_sensor_common(
+ struct device *dev, struct v4l2_async_notifier *notifier)
+{
+ static const char *led_props[] = { "led" };
+ static const struct {
+ const char *name;
+ const char **props;
+ unsigned int nprops;
+ } props[] = {
+ { "flash-leds", led_props, ARRAY_SIZE(led_props) },
+ { "lens-focus", NULL, 0 },
+ };
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(props); i++) {
+ int ret;
+
+ if (props[i].props && is_acpi_node(dev_fwnode(dev)))
+ ret = v4l2_fwnode_reference_parse_int_props(
+ dev, notifier, props[i].name,
+ props[i].props, props[i].nprops);
+ else
+ ret = v4l2_fwnode_reference_parse(
+ dev, notifier, props[i].name);
+ if (ret && ret != -ENOENT) {
+ dev_warn(dev, "parsing property \"%s\" failed (%d)\n",
+ props[i].name, ret);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_sensor_common);
+
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-async.h b/include/media/v4l2-async.h
index a13803a6371d..378e20e3b44d 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -155,7 +155,8 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
* Release memory resources related to a notifier, including the async
* sub-devices allocated for the purposes of the notifier. The user is
* responsible for releasing the notifier's resources after calling
- * @v4l2_async_notifier_parse_fwnode_endpoints.
+ * @v4l2_async_notifier_parse_fwnode_endpoints or
+ * @v4l2_fwnode_reference_parse_sensor_common.
*
* There is no harm from calling v4l2_async_notifier_release in other
* cases as long as its memory has been zeroed after it has been
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 83afac48ea6b..7f315383c0ae 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -318,4 +318,25 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
struct v4l2_fwnode_endpoint *vep,
struct v4l2_async_subdev *asd));
+/**
+ * v4l2_fwnode_reference_parse_sensor_common - parse common references on
+ * sensors 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
+ *
+ * Parse common sensor properties for remote devices related to the
+ * sensor and set up async sub-devices for them.
+ *
+ * Any notifier populated using this function must be released with a call to
+ * v4l2_async_notifier_release() after it has been unregistered and the async
+ * sub-devices are no longer in use, even in the case the function returned an
+ * error.
+ *
+ * Return: 0 on success
+ * -ENOMEM if memory allocation failed
+ * -EINVAL if property parsing failed
+ */
+int v4l2_async_notifier_parse_fwnode_sensor_common(
+ struct device *dev, struct v4l2_async_notifier *notifier);
+
#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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 19/25] v4l: fwnode: Add convenience function for parsing common external refs
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Add v4l2_fwnode_parse_reference_sensor_common for parsing common
sensor properties that refer to adjacent devices such as flash or lens
driver chips.
As this is an association only, there's little a regular driver needs to
know about these devices as such.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
drivers/media/v4l2-core/v4l2-fwnode.c | 35 +++++++++++++++++++++++++++++++++++
include/media/v4l2-async.h | 3 ++-
include/media/v4l2-fwnode.h | 21 +++++++++++++++++++++
3 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 968a345a288f..7de2fd195e19 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -768,6 +768,41 @@ static int v4l2_fwnode_reference_parse_int_props(
return ret;
}
+int v4l2_async_notifier_parse_fwnode_sensor_common(
+ struct device *dev, struct v4l2_async_notifier *notifier)
+{
+ static const char *led_props[] = { "led" };
+ static const struct {
+ const char *name;
+ const char **props;
+ unsigned int nprops;
+ } props[] = {
+ { "flash-leds", led_props, ARRAY_SIZE(led_props) },
+ { "lens-focus", NULL, 0 },
+ };
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(props); i++) {
+ int ret;
+
+ if (props[i].props && is_acpi_node(dev_fwnode(dev)))
+ ret = v4l2_fwnode_reference_parse_int_props(
+ dev, notifier, props[i].name,
+ props[i].props, props[i].nprops);
+ else
+ ret = v4l2_fwnode_reference_parse(
+ dev, notifier, props[i].name);
+ if (ret && ret != -ENOENT) {
+ dev_warn(dev, "parsing property \"%s\" failed (%d)\n",
+ props[i].name, ret);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_sensor_common);
+
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-async.h b/include/media/v4l2-async.h
index a13803a6371d..378e20e3b44d 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -155,7 +155,8 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
* Release memory resources related to a notifier, including the async
* sub-devices allocated for the purposes of the notifier. The user is
* responsible for releasing the notifier's resources after calling
- * @v4l2_async_notifier_parse_fwnode_endpoints.
+ * @v4l2_async_notifier_parse_fwnode_endpoints or
+ * @v4l2_fwnode_reference_parse_sensor_common.
*
* There is no harm from calling v4l2_async_notifier_release in other
* cases as long as its memory has been zeroed after it has been
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index 83afac48ea6b..7f315383c0ae 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -318,4 +318,25 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
struct v4l2_fwnode_endpoint *vep,
struct v4l2_async_subdev *asd));
+/**
+ * v4l2_fwnode_reference_parse_sensor_common - parse common references on
+ * sensors 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
+ *
+ * Parse common sensor properties for remote devices related to the
+ * sensor and set up async sub-devices for them.
+ *
+ * Any notifier populated using this function must be released with a call to
+ * v4l2_async_notifier_release() after it has been unregistered and the async
+ * sub-devices are no longer in use, even in the case the function returned an
+ * error.
+ *
+ * Return: 0 on success
+ * -ENOMEM if memory allocation failed
+ * -EINVAL if property parsing failed
+ */
+int v4l2_async_notifier_parse_fwnode_sensor_common(
+ struct device *dev, struct v4l2_async_notifier *notifier);
+
#endif /* _V4L2_FWNODE_H */
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 20/25] dt: bindings: smiapp: Document lens-focus and flash-leds properties
2017-09-15 14:16 ` Sakari Ailus
` (12 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Document optional lens-focus and flash-leds properties for the smiapp
driver.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
Documentation/devicetree/bindings/media/i2c/nokia,smia.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/media/i2c/nokia,smia.txt b/Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
index 855e1faf73e2..33f10a94c381 100644
--- a/Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
+++ b/Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
@@ -27,6 +27,8 @@ Optional properties
- nokia,nvm-size: The size of the NVM, in bytes. If the size is not given,
the NVM contents will not be read.
- reset-gpios: XSHUTDOWN GPIO
+- flash-leds: See ../video-interfaces.txt
+- lens-focus: See ../video-interfaces.txt
Endpoint node mandatory properties
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 21/25] smiapp: Add support for flash and lens devices
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
These types devices aren't directly related to the sensor, but are
nevertheless handled by the smiapp driver due to the relationship of these
component to the main part of the camera module --- the sensor.
This does not yet address providing the user space with information on how
to associate the sensor or lens devices but the kernel now has the
necessary information to do that.
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
---
drivers/media/i2c/smiapp/smiapp-core.c | 38 +++++++++++++++++++++++++++-------
drivers/media/i2c/smiapp/smiapp.h | 4 +++-
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 700f433261d0..a4735a96ea41 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -31,7 +31,7 @@
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
#include <linux/smiapp.h>
-#include <linux/v4l2-mediabus.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-fwnode.h>
#include <media/v4l2-device.h>
@@ -2887,17 +2887,24 @@ static int smiapp_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&sensor->src->sd, client, &smiapp_ops);
sensor->src->sd.internal_ops = &smiapp_internal_src_ops;
+ rval = v4l2_async_notifier_parse_fwnode_sensor_common(
+ &client->dev, &sensor->notifier);
+ if (rval < 0)
+ return rval;
+
sensor->vana = devm_regulator_get(&client->dev, "vana");
if (IS_ERR(sensor->vana)) {
dev_err(&client->dev, "could not get regulator for vana\n");
- return PTR_ERR(sensor->vana);
+ rval = PTR_ERR(sensor->vana);
+ goto out_release_async_notifier;
}
sensor->ext_clk = devm_clk_get(&client->dev, NULL);
if (IS_ERR(sensor->ext_clk)) {
dev_err(&client->dev, "could not get clock (%ld)\n",
PTR_ERR(sensor->ext_clk));
- return -EPROBE_DEFER;
+ rval = -EPROBE_DEFER;
+ goto out_release_async_notifier;
}
rval = clk_set_rate(sensor->ext_clk, sensor->hwcfg->ext_clk);
@@ -2905,17 +2912,19 @@ static int smiapp_probe(struct i2c_client *client,
dev_err(&client->dev,
"unable to set clock freq to %u\n",
sensor->hwcfg->ext_clk);
- return rval;
+ goto out_release_async_notifier;
}
sensor->xshutdown = devm_gpiod_get_optional(&client->dev, "xshutdown",
GPIOD_OUT_LOW);
- if (IS_ERR(sensor->xshutdown))
- return PTR_ERR(sensor->xshutdown);
+ if (IS_ERR(sensor->xshutdown)) {
+ rval = PTR_ERR(sensor->xshutdown);
+ goto out_release_async_notifier;
+ }
rval = smiapp_power_on(&client->dev);
if (rval < 0)
- return rval;
+ goto out_release_async_notifier;
rval = smiapp_identify_module(sensor);
if (rval) {
@@ -3092,9 +3101,14 @@ static int smiapp_probe(struct i2c_client *client,
if (rval < 0)
goto out_media_entity_cleanup;
+ rval = v4l2_async_subdev_notifier_register(&sensor->src->sd,
+ &sensor->notifier);
+ if (rval)
+ goto out_media_entity_cleanup;
+
rval = v4l2_async_register_subdev(&sensor->src->sd);
if (rval < 0)
- goto out_media_entity_cleanup;
+ goto out_unregister_async_notifier;
pm_runtime_set_active(&client->dev);
pm_runtime_get_noresume(&client->dev);
@@ -3105,6 +3119,9 @@ static int smiapp_probe(struct i2c_client *client,
return 0;
+out_unregister_async_notifier:
+ v4l2_async_notifier_unregister(&sensor->notifier);
+
out_media_entity_cleanup:
media_entity_cleanup(&sensor->src->sd.entity);
@@ -3114,6 +3131,9 @@ static int smiapp_probe(struct i2c_client *client,
out_power_off:
smiapp_power_off(&client->dev);
+out_release_async_notifier:
+ v4l2_async_notifier_release(&sensor->notifier);
+
return rval;
}
@@ -3124,6 +3144,8 @@ static int smiapp_remove(struct i2c_client *client)
unsigned int i;
v4l2_async_unregister_subdev(subdev);
+ v4l2_async_notifier_unregister(&sensor->notifier);
+ v4l2_async_notifier_release(&sensor->notifier);
pm_runtime_disable(&client->dev);
if (!pm_runtime_status_suspended(&client->dev))
diff --git a/drivers/media/i2c/smiapp/smiapp.h b/drivers/media/i2c/smiapp/smiapp.h
index f74d695018b9..be92cb5713f4 100644
--- a/drivers/media/i2c/smiapp/smiapp.h
+++ b/drivers/media/i2c/smiapp/smiapp.h
@@ -20,9 +20,10 @@
#define __SMIAPP_PRIV_H_
#include <linux/mutex.h>
+#include <media/i2c/smiapp.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-subdev.h>
-#include <media/i2c/smiapp.h>
#include "smiapp-pll.h"
#include "smiapp-reg.h"
@@ -172,6 +173,7 @@ struct smiapp_subdev {
* struct smiapp_sensor - Main device structure
*/
struct smiapp_sensor {
+ struct v4l2_async_notifier notifier;
/*
* "mutex" is used to serialise access to all fields here
* except v4l2_ctrls at the end of the struct. "mutex" is also
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 21/25] smiapp: Add support for flash and lens devices
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
These types devices aren't directly related to the sensor, but are
nevertheless handled by the smiapp driver due to the relationship of these
component to the main part of the camera module --- the sensor.
This does not yet address providing the user space with information on how
to associate the sensor or lens devices but the kernel now has the
necessary information to do that.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
drivers/media/i2c/smiapp/smiapp-core.c | 38 +++++++++++++++++++++++++++-------
drivers/media/i2c/smiapp/smiapp.h | 4 +++-
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 700f433261d0..a4735a96ea41 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -31,7 +31,7 @@
#include <linux/regulator/consumer.h>
#include <linux/slab.h>
#include <linux/smiapp.h>
-#include <linux/v4l2-mediabus.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-fwnode.h>
#include <media/v4l2-device.h>
@@ -2887,17 +2887,24 @@ static int smiapp_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&sensor->src->sd, client, &smiapp_ops);
sensor->src->sd.internal_ops = &smiapp_internal_src_ops;
+ rval = v4l2_async_notifier_parse_fwnode_sensor_common(
+ &client->dev, &sensor->notifier);
+ if (rval < 0)
+ return rval;
+
sensor->vana = devm_regulator_get(&client->dev, "vana");
if (IS_ERR(sensor->vana)) {
dev_err(&client->dev, "could not get regulator for vana\n");
- return PTR_ERR(sensor->vana);
+ rval = PTR_ERR(sensor->vana);
+ goto out_release_async_notifier;
}
sensor->ext_clk = devm_clk_get(&client->dev, NULL);
if (IS_ERR(sensor->ext_clk)) {
dev_err(&client->dev, "could not get clock (%ld)\n",
PTR_ERR(sensor->ext_clk));
- return -EPROBE_DEFER;
+ rval = -EPROBE_DEFER;
+ goto out_release_async_notifier;
}
rval = clk_set_rate(sensor->ext_clk, sensor->hwcfg->ext_clk);
@@ -2905,17 +2912,19 @@ static int smiapp_probe(struct i2c_client *client,
dev_err(&client->dev,
"unable to set clock freq to %u\n",
sensor->hwcfg->ext_clk);
- return rval;
+ goto out_release_async_notifier;
}
sensor->xshutdown = devm_gpiod_get_optional(&client->dev, "xshutdown",
GPIOD_OUT_LOW);
- if (IS_ERR(sensor->xshutdown))
- return PTR_ERR(sensor->xshutdown);
+ if (IS_ERR(sensor->xshutdown)) {
+ rval = PTR_ERR(sensor->xshutdown);
+ goto out_release_async_notifier;
+ }
rval = smiapp_power_on(&client->dev);
if (rval < 0)
- return rval;
+ goto out_release_async_notifier;
rval = smiapp_identify_module(sensor);
if (rval) {
@@ -3092,9 +3101,14 @@ static int smiapp_probe(struct i2c_client *client,
if (rval < 0)
goto out_media_entity_cleanup;
+ rval = v4l2_async_subdev_notifier_register(&sensor->src->sd,
+ &sensor->notifier);
+ if (rval)
+ goto out_media_entity_cleanup;
+
rval = v4l2_async_register_subdev(&sensor->src->sd);
if (rval < 0)
- goto out_media_entity_cleanup;
+ goto out_unregister_async_notifier;
pm_runtime_set_active(&client->dev);
pm_runtime_get_noresume(&client->dev);
@@ -3105,6 +3119,9 @@ static int smiapp_probe(struct i2c_client *client,
return 0;
+out_unregister_async_notifier:
+ v4l2_async_notifier_unregister(&sensor->notifier);
+
out_media_entity_cleanup:
media_entity_cleanup(&sensor->src->sd.entity);
@@ -3114,6 +3131,9 @@ static int smiapp_probe(struct i2c_client *client,
out_power_off:
smiapp_power_off(&client->dev);
+out_release_async_notifier:
+ v4l2_async_notifier_release(&sensor->notifier);
+
return rval;
}
@@ -3124,6 +3144,8 @@ static int smiapp_remove(struct i2c_client *client)
unsigned int i;
v4l2_async_unregister_subdev(subdev);
+ v4l2_async_notifier_unregister(&sensor->notifier);
+ v4l2_async_notifier_release(&sensor->notifier);
pm_runtime_disable(&client->dev);
if (!pm_runtime_status_suspended(&client->dev))
diff --git a/drivers/media/i2c/smiapp/smiapp.h b/drivers/media/i2c/smiapp/smiapp.h
index f74d695018b9..be92cb5713f4 100644
--- a/drivers/media/i2c/smiapp/smiapp.h
+++ b/drivers/media/i2c/smiapp/smiapp.h
@@ -20,9 +20,10 @@
#define __SMIAPP_PRIV_H_
#include <linux/mutex.h>
+#include <media/i2c/smiapp.h>
+#include <media/v4l2-async.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-subdev.h>
-#include <media/i2c/smiapp.h>
#include "smiapp-pll.h"
#include "smiapp-reg.h"
@@ -172,6 +173,7 @@ struct smiapp_subdev {
* struct smiapp_sensor - Main device structure
*/
struct smiapp_sensor {
+ struct v4l2_async_notifier notifier;
/*
* "mutex" is used to serialise access to all fields here
* except v4l2_ctrls at the end of the struct. "mutex" is also
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 22/25] et8ek8: Add support for flash and lens devices
2017-09-15 14:16 ` Sakari Ailus
` (13 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
From: Pavel Machek <pavel@ucw.cz>
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
These types devices aren't directly related to the sensor, but are
nevertheless handled by the et8ek8 driver due to the relationship of these
component to the main part of the camera module --- the sensor.
[Sakari Ailus: Rename fwnode function, check for ret < 0 only.]
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/i2c/et8ek8/et8ek8_driver.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/media/i2c/et8ek8/et8ek8_driver.c b/drivers/media/i2c/et8ek8/et8ek8_driver.c
index c14f0fd6ded3..0ef1b8025935 100644
--- a/drivers/media/i2c/et8ek8/et8ek8_driver.c
+++ b/drivers/media/i2c/et8ek8/et8ek8_driver.c
@@ -34,10 +34,12 @@
#include <linux/sort.h>
#include <linux/v4l2-mediabus.h>
+#include <media/v4l2-async.h>
#include <media/media-entity.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
#include <media/v4l2-subdev.h>
+#include <media/v4l2-fwnode.h>
#include "et8ek8_reg.h"
@@ -46,6 +48,7 @@
#define ET8EK8_MAX_MSG 8
struct et8ek8_sensor {
+ struct v4l2_async_notifier notifier;
struct v4l2_subdev subdev;
struct media_pad pad;
struct v4l2_mbus_framefmt format;
@@ -1446,6 +1449,11 @@ static int et8ek8_probe(struct i2c_client *client,
sensor->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
sensor->subdev.internal_ops = &et8ek8_internal_ops;
+ ret = v4l2_async_notifier_parse_fwnode_sensor_common(
+ &client->dev, &sensor->notifier);
+ if (ret < 0)
+ goto err_release;
+
sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
ret = media_entity_pads_init(&sensor->subdev.entity, 1, &sensor->pad);
if (ret < 0) {
@@ -1453,18 +1461,27 @@ static int et8ek8_probe(struct i2c_client *client,
goto err_mutex;
}
+ ret = v4l2_async_subdev_notifier_register(&sensor->subdev,
+ &sensor->notifier);
+ if (ret)
+ goto err_entity;
+
ret = v4l2_async_register_subdev(&sensor->subdev);
if (ret < 0)
- goto err_entity;
+ goto err_async;
dev_dbg(dev, "initialized!\n");
return 0;
+err_async:
+ v4l2_async_notifier_unregister(&sensor->notifier);
err_entity:
media_entity_cleanup(&sensor->subdev.entity);
err_mutex:
mutex_destroy(&sensor->power_lock);
+err_release:
+ v4l2_async_notifier_release(&sensor->notifier);
return ret;
}
@@ -1480,6 +1497,8 @@ static int __exit et8ek8_remove(struct i2c_client *client)
}
v4l2_device_unregister_subdev(&sensor->subdev);
+ v4l2_async_notifier_unregister(&sensor->notifier);
+ v4l2_async_notifier_release(&sensor->notifier);
device_remove_file(&client->dev, &dev_attr_priv_mem);
v4l2_ctrl_handler_free(&sensor->ctrl_handler);
v4l2_async_unregister_subdev(&sensor->subdev);
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 23/25] ov5670: Add support for flash and lens devices
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
---
drivers/media/i2c/ov5670.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index 6f7a1d6d2200..a791701fa2b9 100644
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -18,6 +18,7 @@
#include <linux/pm_runtime.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#define OV5670_REG_CHIP_ID 0x300a
#define OV5670_CHIP_ID 0x005670
@@ -1807,6 +1808,7 @@ static const struct ov5670_mode supported_modes[] = {
struct ov5670 {
struct v4l2_subdev sd;
struct media_pad pad;
+ struct v4l2_async_notifier notifier;
struct v4l2_ctrl_handler ctrl_handler;
/* V4L2 Controls */
@@ -2473,11 +2475,13 @@ static int ov5670_probe(struct i2c_client *client)
return -EINVAL;
ov5670 = devm_kzalloc(&client->dev, sizeof(*ov5670), GFP_KERNEL);
- if (!ov5670) {
- ret = -ENOMEM;
- err_msg = "devm_kzalloc() error";
- goto error_print;
- }
+ if (!ov5670)
+ return -ENOMEM;
+
+ ret = v4l2_async_notifier_parse_fwnode_sensor_common(
+ &client->dev, &ov5670->notifier);
+ if (ret < 0)
+ return ret;
/* Initialize subdev */
v4l2_i2c_subdev_init(&ov5670->sd, client, &ov5670_subdev_ops);
@@ -2486,7 +2490,7 @@ static int ov5670_probe(struct i2c_client *client)
ret = ov5670_identify_module(ov5670);
if (ret) {
err_msg = "ov5670_identify_module() error";
- goto error_print;
+ goto error_release_notifier;
}
mutex_init(&ov5670->mutex);
@@ -2513,11 +2517,18 @@ static int ov5670_probe(struct i2c_client *client)
goto error_handler_free;
}
+ ret = v4l2_async_subdev_notifier_register(&ov5670->sd,
+ &ov5670->notifier);
+ if (ret) {
+ err_msg = "can't register async notifier";
+ goto error_entity_cleanup;
+ }
+
/* Async register for subdev */
ret = v4l2_async_register_subdev(&ov5670->sd);
if (ret < 0) {
err_msg = "v4l2_async_register_subdev() error";
- goto error_entity_cleanup;
+ goto error_unregister_notifier;
}
ov5670->streaming = false;
@@ -2533,6 +2544,9 @@ static int ov5670_probe(struct i2c_client *client)
return 0;
+error_unregister_notifier:
+ v4l2_async_notifier_unregister(&ov5670->notifier);
+
error_entity_cleanup:
media_entity_cleanup(&ov5670->sd.entity);
@@ -2542,7 +2556,8 @@ static int ov5670_probe(struct i2c_client *client)
error_mutex_destroy:
mutex_destroy(&ov5670->mutex);
-error_print:
+error_release_notifier:
+ v4l2_async_notifier_release(&ov5670->notifier);
dev_err(&client->dev, "%s: %s %d\n", __func__, err_msg, ret);
return ret;
@@ -2554,6 +2569,8 @@ static int ov5670_remove(struct i2c_client *client)
struct ov5670 *ov5670 = to_ov5670(sd);
v4l2_async_unregister_subdev(sd);
+ v4l2_async_notifier_unregister(&ov5670->notifier);
+ v4l2_async_notifier_release(&ov5670->notifier);
media_entity_cleanup(&sd->entity);
v4l2_ctrl_handler_free(sd->ctrl_handler);
mutex_destroy(&ov5670->mutex);
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 23/25] ov5670: Add support for flash and lens devices
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/i2c/ov5670.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index 6f7a1d6d2200..a791701fa2b9 100644
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -18,6 +18,7 @@
#include <linux/pm_runtime.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#define OV5670_REG_CHIP_ID 0x300a
#define OV5670_CHIP_ID 0x005670
@@ -1807,6 +1808,7 @@ static const struct ov5670_mode supported_modes[] = {
struct ov5670 {
struct v4l2_subdev sd;
struct media_pad pad;
+ struct v4l2_async_notifier notifier;
struct v4l2_ctrl_handler ctrl_handler;
/* V4L2 Controls */
@@ -2473,11 +2475,13 @@ static int ov5670_probe(struct i2c_client *client)
return -EINVAL;
ov5670 = devm_kzalloc(&client->dev, sizeof(*ov5670), GFP_KERNEL);
- if (!ov5670) {
- ret = -ENOMEM;
- err_msg = "devm_kzalloc() error";
- goto error_print;
- }
+ if (!ov5670)
+ return -ENOMEM;
+
+ ret = v4l2_async_notifier_parse_fwnode_sensor_common(
+ &client->dev, &ov5670->notifier);
+ if (ret < 0)
+ return ret;
/* Initialize subdev */
v4l2_i2c_subdev_init(&ov5670->sd, client, &ov5670_subdev_ops);
@@ -2486,7 +2490,7 @@ static int ov5670_probe(struct i2c_client *client)
ret = ov5670_identify_module(ov5670);
if (ret) {
err_msg = "ov5670_identify_module() error";
- goto error_print;
+ goto error_release_notifier;
}
mutex_init(&ov5670->mutex);
@@ -2513,11 +2517,18 @@ static int ov5670_probe(struct i2c_client *client)
goto error_handler_free;
}
+ ret = v4l2_async_subdev_notifier_register(&ov5670->sd,
+ &ov5670->notifier);
+ if (ret) {
+ err_msg = "can't register async notifier";
+ goto error_entity_cleanup;
+ }
+
/* Async register for subdev */
ret = v4l2_async_register_subdev(&ov5670->sd);
if (ret < 0) {
err_msg = "v4l2_async_register_subdev() error";
- goto error_entity_cleanup;
+ goto error_unregister_notifier;
}
ov5670->streaming = false;
@@ -2533,6 +2544,9 @@ static int ov5670_probe(struct i2c_client *client)
return 0;
+error_unregister_notifier:
+ v4l2_async_notifier_unregister(&ov5670->notifier);
+
error_entity_cleanup:
media_entity_cleanup(&ov5670->sd.entity);
@@ -2542,7 +2556,8 @@ static int ov5670_probe(struct i2c_client *client)
error_mutex_destroy:
mutex_destroy(&ov5670->mutex);
-error_print:
+error_release_notifier:
+ v4l2_async_notifier_release(&ov5670->notifier);
dev_err(&client->dev, "%s: %s %d\n", __func__, err_msg, ret);
return ret;
@@ -2554,6 +2569,8 @@ static int ov5670_remove(struct i2c_client *client)
struct ov5670 *ov5670 = to_ov5670(sd);
v4l2_async_unregister_subdev(sd);
+ v4l2_async_notifier_unregister(&ov5670->notifier);
+ v4l2_async_notifier_release(&ov5670->notifier);
media_entity_cleanup(&sd->entity);
v4l2_ctrl_handler_free(sd->ctrl_handler);
mutex_destroy(&ov5670->mutex);
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 24/25] ov13858: Add support for flash and lens devices
2017-09-15 14:16 ` Sakari Ailus
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
---
drivers/media/i2c/ov13858.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index af7af0d14c69..a8a9fb0a1756 100644
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -18,6 +18,7 @@
#include <linux/pm_runtime.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#define OV13858_REG_VALUE_08BIT 1
#define OV13858_REG_VALUE_16BIT 2
@@ -1028,6 +1029,7 @@ static const struct ov13858_mode supported_modes[] = {
struct ov13858 {
struct v4l2_subdev sd;
struct media_pad pad;
+ struct v4l2_async_notifier notifier;
struct v4l2_ctrl_handler ctrl_handler;
/* V4L2 Controls */
@@ -1715,6 +1717,11 @@ static int ov13858_probe(struct i2c_client *client,
if (!ov13858)
return -ENOMEM;
+ ret = v4l2_async_notifier_parse_fwnode_sensor_common(
+ &client->dev, &ov13858->notifier);
+ if (ret < 0)
+ return ret;
+
/* Initialize subdev */
v4l2_i2c_subdev_init(&ov13858->sd, client, &ov13858_subdev_ops);
@@ -1722,7 +1729,7 @@ static int ov13858_probe(struct i2c_client *client,
ret = ov13858_identify_module(ov13858);
if (ret) {
dev_err(&client->dev, "failed to find sensor: %d\n", ret);
- return ret;
+ goto error_notifier_release;
}
/* Set default mode to max resolution */
@@ -1730,7 +1737,7 @@ static int ov13858_probe(struct i2c_client *client,
ret = ov13858_init_controls(ov13858);
if (ret)
- return ret;
+ goto error_notifier_release;
/* Initialize subdev */
ov13858->sd.internal_ops = &ov13858_internal_ops;
@@ -1746,9 +1753,14 @@ static int ov13858_probe(struct i2c_client *client,
goto error_handler_free;
}
+ ret = v4l2_async_subdev_notifier_register(&ov13858->sd,
+ &ov13858->notifier);
+ if (ret)
+ goto error_media_entity;
+
ret = v4l2_async_register_subdev(&ov13858->sd);
if (ret < 0)
- goto error_media_entity;
+ goto error_notifier_unregister;
/*
* Device is already turned on by i2c-core with ACPI domain PM.
@@ -1761,11 +1773,17 @@ static int ov13858_probe(struct i2c_client *client,
return 0;
+error_notifier_unregister:
+ v4l2_async_notifier_unregister(&ov13858->notifier);
+
error_media_entity:
media_entity_cleanup(&ov13858->sd.entity);
error_handler_free:
ov13858_free_controls(ov13858);
+
+error_notifier_release:
+ v4l2_async_notifier_release(&ov13858->notifier);
dev_err(&client->dev, "%s failed:%d\n", __func__, ret);
return ret;
@@ -1777,6 +1795,8 @@ static int ov13858_remove(struct i2c_client *client)
struct ov13858 *ov13858 = to_ov13858(sd);
v4l2_async_unregister_subdev(sd);
+ v4l2_async_notifier_unregister(&ov13858->notifier);
+ v4l2_async_notifier_release(&ov13858->notifier);
media_entity_cleanup(&sd->entity);
ov13858_free_controls(ov13858);
--
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
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 24/25] ov13858: Add support for flash and lens devices
@ 2017-09-15 14:17 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Parse async sub-devices by using
v4l2_subdev_fwnode_reference_parse_sensor_common().
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/i2c/ov13858.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/ov13858.c b/drivers/media/i2c/ov13858.c
index af7af0d14c69..a8a9fb0a1756 100644
--- a/drivers/media/i2c/ov13858.c
+++ b/drivers/media/i2c/ov13858.c
@@ -18,6 +18,7 @@
#include <linux/pm_runtime.h>
#include <media/v4l2-ctrls.h>
#include <media/v4l2-device.h>
+#include <media/v4l2-fwnode.h>
#define OV13858_REG_VALUE_08BIT 1
#define OV13858_REG_VALUE_16BIT 2
@@ -1028,6 +1029,7 @@ static const struct ov13858_mode supported_modes[] = {
struct ov13858 {
struct v4l2_subdev sd;
struct media_pad pad;
+ struct v4l2_async_notifier notifier;
struct v4l2_ctrl_handler ctrl_handler;
/* V4L2 Controls */
@@ -1715,6 +1717,11 @@ static int ov13858_probe(struct i2c_client *client,
if (!ov13858)
return -ENOMEM;
+ ret = v4l2_async_notifier_parse_fwnode_sensor_common(
+ &client->dev, &ov13858->notifier);
+ if (ret < 0)
+ return ret;
+
/* Initialize subdev */
v4l2_i2c_subdev_init(&ov13858->sd, client, &ov13858_subdev_ops);
@@ -1722,7 +1729,7 @@ static int ov13858_probe(struct i2c_client *client,
ret = ov13858_identify_module(ov13858);
if (ret) {
dev_err(&client->dev, "failed to find sensor: %d\n", ret);
- return ret;
+ goto error_notifier_release;
}
/* Set default mode to max resolution */
@@ -1730,7 +1737,7 @@ static int ov13858_probe(struct i2c_client *client,
ret = ov13858_init_controls(ov13858);
if (ret)
- return ret;
+ goto error_notifier_release;
/* Initialize subdev */
ov13858->sd.internal_ops = &ov13858_internal_ops;
@@ -1746,9 +1753,14 @@ static int ov13858_probe(struct i2c_client *client,
goto error_handler_free;
}
+ ret = v4l2_async_subdev_notifier_register(&ov13858->sd,
+ &ov13858->notifier);
+ if (ret)
+ goto error_media_entity;
+
ret = v4l2_async_register_subdev(&ov13858->sd);
if (ret < 0)
- goto error_media_entity;
+ goto error_notifier_unregister;
/*
* Device is already turned on by i2c-core with ACPI domain PM.
@@ -1761,11 +1773,17 @@ static int ov13858_probe(struct i2c_client *client,
return 0;
+error_notifier_unregister:
+ v4l2_async_notifier_unregister(&ov13858->notifier);
+
error_media_entity:
media_entity_cleanup(&ov13858->sd.entity);
error_handler_free:
ov13858_free_controls(ov13858);
+
+error_notifier_release:
+ v4l2_async_notifier_release(&ov13858->notifier);
dev_err(&client->dev, "%s failed:%d\n", __func__, ret);
return ret;
@@ -1777,6 +1795,8 @@ static int ov13858_remove(struct i2c_client *client)
struct ov13858 *ov13858 = to_ov13858(sd);
v4l2_async_unregister_subdev(sd);
+ v4l2_async_notifier_unregister(&ov13858->notifier);
+ v4l2_async_notifier_release(&ov13858->notifier);
media_entity_cleanup(&sd->entity);
ov13858_free_controls(ov13858);
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* [PATCH v13 25/25] arm: dts: omap3: N9/N950: Add flash references to the camera
2017-09-15 14:16 ` Sakari Ailus
` (14 preceding siblings ...)
(?)
@ 2017-09-15 14:17 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-15 14:17 UTC (permalink / raw)
To: linux-media
Cc: niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, pavel, sre
Add flash and indicator LED phandles to the sensor node.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
arch/arm/boot/dts/omap3-n9.dts | 1 +
arch/arm/boot/dts/omap3-n950-n9.dtsi | 4 ++--
arch/arm/boot/dts/omap3-n950.dts | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
index b9e58c536afd..39e35f8b8206 100644
--- a/arch/arm/boot/dts/omap3-n9.dts
+++ b/arch/arm/boot/dts/omap3-n9.dts
@@ -26,6 +26,7 @@
clocks = <&isp 0>;
clock-frequency = <9600000>;
nokia,nvm-size = <(16 * 64)>;
+ flash-leds = <&as3645a_flash &as3645a_indicator>;
port {
smia_1_1: endpoint {
link-frequencies = /bits/ 64 <199200000 210000000 499200000>;
diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi
index 1b0bd72945f2..12fbb3da5fce 100644
--- a/arch/arm/boot/dts/omap3-n950-n9.dtsi
+++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi
@@ -271,14 +271,14 @@
#size-cells = <0>;
reg = <0x30>;
compatible = "ams,as3645a";
- flash@0 {
+ as3645a_flash: flash@0 {
reg = <0x0>;
flash-timeout-us = <150000>;
flash-max-microamp = <320000>;
led-max-microamp = <60000>;
ams,input-max-microamp = <1750000>;
};
- indicator@1 {
+ as3645a_indicator: indicator@1 {
reg = <0x1>;
led-max-microamp = <10000>;
};
diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index 646601a3ebd8..c354a1ed1e70 100644
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -60,6 +60,7 @@
clocks = <&isp 0>;
clock-frequency = <9600000>;
nokia,nvm-size = <(16 * 64)>;
+ flash-leds = <&as3645a_flash &as3645a_indicator>;
port {
smia_1_1: endpoint {
link-frequencies = /bits/ 64 <210000000 333600000 398400000>;
--
2.11.0
^ permalink raw reply related [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-15 14:17 ` [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints Sakari Ailus
@ 2017-09-16 7:04 ` Pavel Machek
2017-09-16 7:18 ` Pavel Machek
2017-09-19 11:40 ` Laurent Pinchart
1 sibling, 1 reply; 137+ messages in thread
From: Pavel Machek @ 2017-09-16 7:04 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, sre
[-- Attachment #1: Type: text/plain, Size: 673 bytes --]
Hi!
> Instead of using driver implementation, use
> v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> of the device.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Patches at least up to here look fine o me.
We are at version 13 of the series... Is merge of the series expected
anytimme soon?
If not, can we at least merge patches up to here, so that less stuff
is retransmitted over and over?
Thanks,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-15 14:17 ` Sakari Ailus
@ 2017-09-16 7:13 ` Pavel Machek
-1 siblings, 0 replies; 137+ messages in thread
From: Pavel Machek @ 2017-09-16 7:13 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, sre-DgEjT+Ai2ygdnm+yROfE0A
[-- Attachment #1: Type: text/plain, Size: 716 bytes --]
On Fri 2017-09-15 17:17:10, Sakari Ailus wrote:
> Add three helper functions to call async operations callbacks. Besides
> simplifying callbacks, this allows async notifiers to have no ops set,
> i.e. it can be left NULL.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
I'd remove "_call" from these names; they are long enough already and
do not add much. But either way is okay.
Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
@ 2017-09-16 7:13 ` Pavel Machek
0 siblings, 0 replies; 137+ messages in thread
From: Pavel Machek @ 2017-09-16 7:13 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, sre
[-- Attachment #1: Type: text/plain, Size: 640 bytes --]
On Fri 2017-09-15 17:17:10, Sakari Ailus wrote:
> Add three helper functions to call async operations callbacks. Besides
> simplifying callbacks, this allows async notifiers to have no ops set,
> i.e. it can be left NULL.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
I'd remove "_call" from these names; they are long enough already and
do not add much. But either way is okay.
Acked-by: Pavel Machek <pavel@ucw.cz>
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-16 7:04 ` Pavel Machek
@ 2017-09-16 7:18 ` Pavel Machek
0 siblings, 0 replies; 137+ messages in thread
From: Pavel Machek @ 2017-09-16 7:18 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, sre-DgEjT+Ai2ygdnm+yROfE0A
[-- Attachment #1: Type: text/plain, Size: 713 bytes --]
On Sat 2017-09-16 09:04:31, Pavel Machek wrote:
> Hi!
>
> > Instead of using driver implementation, use
> > v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> > of the device.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
>
> Patches at least up to here look fine o me.
I went through some others.
So, 2,4,5,6,10,12:
Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
Best regards,
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
@ 2017-09-16 7:18 ` Pavel Machek
0 siblings, 0 replies; 137+ messages in thread
From: Pavel Machek @ 2017-09-16 7:18 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
laurent.pinchart, devicetree, sre
[-- Attachment #1: Type: text/plain, Size: 637 bytes --]
On Sat 2017-09-16 09:04:31, Pavel Machek wrote:
> Hi!
>
> > Instead of using driver implementation, use
> > v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> > of the device.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
>
> Patches at least up to here look fine o me.
I went through some others.
So, 2,4,5,6,10,12:
Acked-by: Pavel Machek <pavel@ucw.cz>
Best regards,
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-15 14:17 ` Sakari Ailus
(?)
@ 2017-09-19 8:03 ` Hans Verkuil
2017-09-19 8:20 ` Sakari Ailus
-1 siblings, 1 reply; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:03 UTC (permalink / raw)
To: Sakari Ailus, linux-media
Cc: niklas.soderlund, maxime.ripard, robh, laurent.pinchart,
devicetree, pavel, sre
On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> Add two functions for parsing devices graph endpoints:
> v4l2_async_notifier_parse_fwnode_endpoints and
> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> over all endpoints whereas the latter only iterates over the endpoints in
> a given port.
>
> The former is mostly useful for existing drivers that currently implement
> the iteration over all the endpoints themselves whereas the latter is
> especially intended for devices with both sinks and sources: async
> sub-devices for external devices connected to the device's sources will
> have already been set up, or they are part of the master device.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
> drivers/media/v4l2-core/v4l2-fwnode.c | 185 ++++++++++++++++++++++++++++++++++
> include/media/v4l2-async.h | 24 ++++-
> include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
> 4 files changed, 354 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index 831f185ecd47..bf0215dde616 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -22,6 +22,7 @@
>
> #include <media/v4l2-async.h>
> #include <media/v4l2-device.h>
> +#include <media/v4l2-fwnode.h>
> #include <media/v4l2-subdev.h>
>
> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
> @@ -219,6 +220,35 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> }
> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
>
> +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
> +{
> + unsigned int i;
> +
> + if (!notifier->max_subdevs)
> + return;
> +
> + for (i = 0; i < notifier->num_subdevs; i++) {
> + struct v4l2_async_subdev *asd = notifier->subdevs[i];
> +
> + switch (asd->match_type) {
> + case V4L2_ASYNC_MATCH_FWNODE:
> + fwnode_handle_put(asd->match.fwnode.fwnode);
> + break;
> + default:
> + WARN_ON_ONCE(true);
Please add a break here.
> + }
> +
> + kfree(asd);
> + }
> +
> + notifier->max_subdevs = 0;
> + notifier->num_subdevs = 0;
> +
> + kvfree(notifier->subdevs);
> + notifier->subdevs = NULL;
> +}
> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_release);
> +
> int v4l2_async_register_subdev(struct v4l2_subdev *sd)
> {
> struct v4l2_async_notifier *notifier;
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> index 706f9e7b90f1..44ee35f6aad5 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -19,6 +19,7 @@
> */
> #include <linux/acpi.h>
> #include <linux/kernel.h>
> +#include <linux/mm.h>
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/property.h>
> @@ -26,6 +27,7 @@
> #include <linux/string.h>
> #include <linux/types.h>
>
> +#include <media/v4l2-async.h>
> #include <media/v4l2-fwnode.h>
>
> enum v4l2_fwnode_bus_type {
> @@ -313,6 +315,189 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
> }
> EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
>
> +static int v4l2_async_notifier_realloc(struct v4l2_async_notifier *notifier,
> + unsigned int max_subdevs)
> +{
> + struct v4l2_async_subdev **subdevs;
> +
> + if (max_subdevs <= notifier->max_subdevs)
> + return 0;
> +
> + subdevs = kvmalloc_array(
> + max_subdevs, sizeof(*notifier->subdevs),
> + GFP_KERNEL | __GFP_ZERO);
> + if (!subdevs)
> + return -ENOMEM;
> +
> + if (notifier->subdevs) {
> + memcpy(subdevs, notifier->subdevs,
> + sizeof(*subdevs) * notifier->num_subdevs);
> +
> + kvfree(notifier->subdevs);
> + }
> +
> + notifier->subdevs = subdevs;
> + notifier->max_subdevs = max_subdevs;
> +
> + return 0;
> +}
> +
> +static int v4l2_async_notifier_fwnode_parse_endpoint(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + struct fwnode_handle *endpoint, unsigned int asd_struct_size,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd))
> +{
> + struct v4l2_async_subdev *asd;
> + struct v4l2_fwnode_endpoint *vep;
> + int ret = 0;
> +
> + asd = kzalloc(asd_struct_size, GFP_KERNEL);
> + if (!asd)
> + return -ENOMEM;
> +
> + asd->match.fwnode.fwnode =
> + fwnode_graph_get_remote_port_parent(endpoint);
> + if (!asd->match.fwnode.fwnode) {
> + dev_warn(dev, "bad remote port parent\n");
> + ret = -EINVAL;
> + goto out_err;
> + }
> +
> + /* Ignore endpoints the parsing of which failed. */
> + vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
> + if (IS_ERR(vep)) {
> + ret = PTR_ERR(vep);
> + dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
> + ret);
> + goto out_err;
> + }
> +
> + ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
> + if (ret == -ENOTCONN)
> + dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
> + vep->base.id);
> + else if (ret < 0)
> + dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
> + vep->base.port, vep->base.id, ret);
> + v4l2_fwnode_endpoint_free(vep);
> + if (ret < 0)
> + goto out_err;
> +
> + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
> + notifier->subdevs[notifier->num_subdevs] = asd;
> + notifier->num_subdevs++;
> +
> + return 0;
> +
> +out_err:
> + fwnode_handle_put(asd->match.fwnode.fwnode);
> + kfree(asd);
> +
> + return ret == -ENOTCONN ? 0 : ret;
> +}
> +
> +static int __v4l2_async_notifier_parse_fwnode_endpoints(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size, unsigned int port, bool has_port,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd))
> +{
> + struct fwnode_handle *fwnode = NULL;
> + unsigned int max_subdevs = notifier->max_subdevs;
> + int ret;
> +
> + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
> + return -EINVAL;
> +
> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> + dev_fwnode(dev), fwnode)); ) {
You can replace this by:
while ((fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), fwnode))) {
> + if (!fwnode_device_is_available(
> + fwnode_graph_get_port_parent(fwnode)))
> + continue;
> +
> + if (has_port) {
> + struct fwnode_endpoint ep;
> +
> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> + if (ret) {
> + fwnode_handle_put(fwnode);
> + return ret;
> + }
> +
> + if (ep.port != port)
> + continue;
> + }
> + max_subdevs++;
> + }
> +
> + /* No subdevs to add? Return here. */
> + if (max_subdevs == notifier->max_subdevs)
> + return 0;
> +
> + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
> + if (ret)
> + return ret;
> +
> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> + dev_fwnode(dev), fwnode)); ) {
Same here: this can be a 'while'.
> + if (!fwnode_device_is_available(
> + fwnode_graph_get_port_parent(fwnode)))
> + continue;
> +
> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> + ret = -EINVAL;
> + break;
> + }
> +
> + if (has_port) {
> + struct fwnode_endpoint ep;
> +
> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> + if (ret)
> + break;
> +
> + if (ep.port != port)
> + continue;
> + }
> +
> + ret = v4l2_async_notifier_fwnode_parse_endpoint(
> + dev, notifier, fwnode, asd_struct_size, parse_endpoint);
> + if (ret < 0)
> + break;
> + }
> +
> + fwnode_handle_put(fwnode);
> +
> + return ret;
> +}
> +
> +int v4l2_async_notifier_parse_fwnode_endpoints(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd))
> +{
> + return __v4l2_async_notifier_parse_fwnode_endpoints(
> + dev, notifier, asd_struct_size, 0, false, parse_endpoint);
> +}
> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
> +
> +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size, unsigned int port,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd))
> +{
> + return __v4l2_async_notifier_parse_fwnode_endpoints(
> + dev, notifier, asd_struct_size, port, true, parse_endpoint);
> +}
> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
> +
> 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-async.h b/include/media/v4l2-async.h
> index c69d8c8a66d0..96fa1afc00dd 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -18,7 +18,6 @@ struct device;
> struct device_node;
> struct v4l2_device;
> struct v4l2_subdev;
> -struct v4l2_async_notifier;
>
> /* A random max subdevice number, used to allocate an array on stack */
> #define V4L2_MAX_SUBDEVS 128U
> @@ -50,6 +49,10 @@ enum v4l2_async_match_type {
> * @match: union of per-bus type matching data sets
> * @list: used to link struct v4l2_async_subdev objects, waiting to be
> * probed, to a notifier->waiting list
> + *
> + * When this struct is used as a member in a driver specific struct,
> + * the driver specific struct shall contain the @struct
> + * v4l2_async_subdev as its first member.
> */
> struct v4l2_async_subdev {
> enum v4l2_async_match_type match_type;
> @@ -78,7 +81,8 @@ struct v4l2_async_subdev {
> /**
> * struct v4l2_async_notifier - v4l2_device notifier data
> *
> - * @num_subdevs: number of subdevices
> + * @num_subdevs: number of subdevices used in the subdevs array
> + * @max_subdevs: number of subdevices allocated in the subdevs array
> * @subdevs: array of pointers to subdevice descriptors
> * @v4l2_dev: pointer to struct v4l2_device
> * @waiting: list of struct v4l2_async_subdev, waiting for their drivers
> @@ -90,6 +94,7 @@ struct v4l2_async_subdev {
> */
> struct v4l2_async_notifier {
> unsigned int num_subdevs;
> + unsigned int max_subdevs;
> struct v4l2_async_subdev **subdevs;
> struct v4l2_device *v4l2_dev;
> struct list_head waiting;
> @@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
>
> /**
> + * v4l2_async_notifier_release - release notifier resources
> + * @notifier: the notifier the resources of which are to be released
> + *
> + * Release memory resources related to a notifier, including the async
> + * sub-devices allocated for the purposes of the notifier. The user is
> + * responsible for releasing the notifier's resources after calling
> + * @v4l2_async_notifier_parse_fwnode_endpoints.
> + *
> + * There is no harm from calling v4l2_async_notifier_release in other
> + * cases as long as its memory has been zeroed after it has been
> + * allocated.
> + */
> +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
> +
> +/**
> * v4l2_async_register_subdev - registers a sub-device to the asynchronous
> * subdevice framework
> *
> diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
> index 68eb22ba571b..83afac48ea6b 100644
> --- a/include/media/v4l2-fwnode.h
> +++ b/include/media/v4l2-fwnode.h
> @@ -25,6 +25,8 @@
> #include <media/v4l2-mediabus.h>
>
> struct fwnode_handle;
> +struct v4l2_async_notifier;
> +struct v4l2_async_subdev;
>
> #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
>
> @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
> */
> void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
>
> +/**
> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
> + * device node
> + * @dev: the device the endpoints of which are to be parsed
> + * @notifier: notifier for @dev
> + * @asd_struct_size: size of the driver's async sub-device struct, including
> + * sizeof(struct v4l2_async_subdev). The &struct
> + * v4l2_async_subdev shall be the first member of
> + * the driver's async sub-device struct, i.e. both
> + * begin at the same memory address.
> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> + * endpoint. Optional.
> + * Return: %0 on success
> + * %-ENOTCONN if the endpoint is to be skipped but this
> + * should not be considered as an error
> + * %-EINVAL if the endpoint configuration is invalid
> + *
> + * Parse the fwnode endpoints of the @dev device and populate the async sub-
> + * devices array of the notifier. The @parse_endpoint callback function is
> + * called for each endpoint with the corresponding async sub-device pointer to
> + * let the caller initialize the driver-specific part of the async sub-device
> + * structure.
> + *
> + * The notifier memory shall be zeroed before this function is called on the
> + * notifier.
> + *
> + * This function may not be called on a registered notifier and may be called on
> + * a notifier only once.
> + *
> + * Do not change the notifier's subdevs array, take references to the subdevs
> + * array itself or change the notifier's num_subdevs field. This is because this
> + * function allocates and reallocates the subdevs array based on parsing
> + * endpoints.
> + *
> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> + * @parse_endpoint is released once the function is finished. If there is a need
> + * to retain that configuration, the user needs to allocate memory for it.
> + *
> + * Any notifier populated using this function must be released with a call to
> + * v4l2_async_notifier_release() after it has been unregistered and the async
> + * sub-devices are no longer in use, even if the function returned an error.
> + *
> + * Return: %0 on success, including when no async sub-devices are found
> + * %-ENOMEM if memory allocation failed
> + * %-EINVAL if graph or endpoint parsing failed
> + * Other error codes as returned by @parse_endpoint
> + */
> +int v4l2_async_notifier_parse_fwnode_endpoints(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd));
> +
> +/**
> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
> + * endpoints of a port in a
> + * device node
> + * @dev: the device the endpoints of which are to be parsed
> + * @notifier: notifier for @dev
> + * @asd_struct_size: size of the driver's async sub-device struct, including
> + * sizeof(struct v4l2_async_subdev). The &struct
> + * v4l2_async_subdev shall be the first member of
> + * the driver's async sub-device struct, i.e. both
> + * begin at the same memory address.
> + * @port: port number where endpoints are to be parsed
> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> + * endpoint. Optional.
> + * Return: %0 on success
> + * %-ENOTCONN if the endpoint is to be skipped but this
> + * should not be considered as an error
> + * %-EINVAL if the endpoint configuration is invalid
> + *
> + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
> + * the exception that it only parses endpoints in a given port. This is useful
> + * on devices that have both sinks and sources: the async sub-devices connected
on -> for
> + * to sources have already been set up by another driver (on capture devices).
on -> for
So if I understand this correctly for devices with both sinks and sources you use
this function to just parse the sink ports. And you have to give explicit port
numbers since you can't tell from parsing the device tree if a port is a sink or
source port, right? Only the driver knows this.
> + *
> + * Parse the fwnode endpoints of the @dev device on a given @port and populate
> + * the async sub-devices array of the notifier. The @parse_endpoint callback
> + * function is called for each endpoint with the corresponding async sub-device
> + * pointer to let the caller initialize the driver-specific part of the async
> + * sub-device structure.
> + *
> + * The notifier memory shall be zeroed before this function is called on the
> + * notifier the first time.
> + *
> + * This function may not be called on a registered notifier and may be called on
> + * a notifier only once per port.
> + *
> + * Do not change the notifier's subdevs array, take references to the subdevs
> + * array itself or change the notifier's num_subdevs field. This is because this
> + * function allocates and reallocates the subdevs array based on parsing
> + * endpoints.
> + *
> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> + * @parse_endpoint is released once the function is finished. If there is a need
> + * to retain that configuration, the user needs to allocate memory for it.
> + *
> + * Any notifier populated using this function must be released with a call to
> + * v4l2_async_notifier_release() after it has been unregistered and the async
> + * sub-devices are no longer in use, even if the function returned an error.
> + *
> + * Return: %0 on success, including when no async sub-devices are found
> + * %-ENOMEM if memory allocation failed
> + * %-EINVAL if graph or endpoint parsing failed
> + * Other error codes as returned by @parse_endpoint
> + */
> +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size, unsigned int port,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd));
> +
> #endif /* _V4L2_FWNODE_H */
>
Regards,
Hans
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
2017-09-15 14:17 ` Sakari Ailus
@ 2017-09-19 8:06 ` Hans Verkuil
-1 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:06 UTC (permalink / raw)
To: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> Registering a notifier has required the knowledge of struct v4l2_device
> for the reason that sub-devices generally are registered to the
> v4l2_device (as well as the media device, also available through
> v4l2_device).
>
> This information is not available for sub-device drivers at probe time.
>
> What this patch does is that it allows registering notifiers without
> having v4l2_device around. Instead the sub-device pointer is stored in the
> notifier. Once the sub-device of the driver that registered the notifier
> is registered, the notifier will gain the knowledge of the v4l2_device,
> and the binding of async sub-devices from the sub-device driver's notifier
> may proceed.
>
> The root notifier's complete callback is only called when all sub-device
> notifiers are completed.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
Regards,
Hans
> ---
> drivers/media/v4l2-core/v4l2-async.c | 218 ++++++++++++++++++++++++++++++-----
> include/media/v4l2-async.h | 16 ++-
> 2 files changed, 203 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index 4be2f16af051..52fe22b9b6b4 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -53,6 +53,10 @@ static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
> return n->ops->complete(n);
> }
>
> +static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> + struct v4l2_subdev *sd,
> + struct v4l2_async_subdev *asd);
> +
> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
> {
> #if IS_ENABLED(CONFIG_I2C)
> @@ -124,14 +128,127 @@ static struct v4l2_async_subdev *v4l2_async_find_match(
> return NULL;
> }
>
> +/* Find the sub-device notifier registered by a sub-device driver. */
> +static struct v4l2_async_notifier *v4l2_async_find_subdev_notifier(
> + struct v4l2_subdev *sd)
> +{
> + struct v4l2_async_notifier *n;
> +
> + list_for_each_entry(n, ¬ifier_list, list)
> + if (n->sd == sd)
> + return n;
> +
> + return NULL;
> +}
> +
> +/* Return true if all sub-device notifiers are complete, false otherwise. */
> +static bool v4l2_async_subdev_notifiers_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!list_empty(¬ifier->waiting))
> + return false;
> +
> + list_for_each_entry(sd, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier &&
> + !v4l2_async_subdev_notifiers_complete(subdev_notifier))
> + return false;
> + }
> +
> + return true;
> +}
> +
> +/* Get v4l2_device related to the notifier if one can be found. */
> +static struct v4l2_device *v4l2_async_notifier_find_v4l2_dev(
> + struct v4l2_async_notifier *notifier)
> +{
> + while (notifier->parent)
> + notifier = notifier->parent;
> +
> + return notifier->v4l2_dev;
> +}
> +
> +/* Test all async sub-devices in a notifier for a match. */
> +static int v4l2_async_notifier_try_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!v4l2_async_notifier_find_v4l2_dev(notifier))
> + return 0;
> +
> +again:
> + list_for_each_entry(sd, &subdev_list, async_list) {
> + struct v4l2_async_subdev *asd;
> + int ret;
> +
> + asd = v4l2_async_find_match(notifier, sd);
> + if (!asd)
> + continue;
> +
> + ret = v4l2_async_match_notify(notifier, sd, asd);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * v4l2_async_match_notify() may lead to registering a
> + * new notifier and thus changing the async subdevs
> + * list. In order to proceed safely from here, restart
> + * parsing the list from the beginning.
> + */
> + goto again;
> + }
> +
> + return 0;
> +}
> +
> +/* Try completing a notifier. */
> +static int v4l2_async_notifier_try_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + do {
> + int ret;
> +
> + /* Any local async sub-devices left? */
> + if (!list_empty(¬ifier->waiting))
> + return 0;
> +
> + /*
> + * Any sub-device notifiers waiting for async subdevs
> + * to be bound?
> + */
> + if (!v4l2_async_subdev_notifiers_complete(notifier))
> + return 0;
> +
> + /* Proceed completing the notifier */
> + ret = v4l2_async_notifier_call_complete(notifier);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * Obtain notifier's parent. If there is one, repeat
> + * the process, otherwise we're done here.
> + */
> + notifier = notifier->parent;
> + } while (notifier);
> +
> + return 0;
> +}
> +
> static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> struct v4l2_subdev *sd,
> struct v4l2_async_subdev *asd)
> {
> + struct v4l2_async_notifier *subdev_notifier;
> int ret;
>
> - ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> - if (ret < 0)
> + ret = v4l2_device_register_subdev(
> + v4l2_async_notifier_find_v4l2_dev(notifier), sd);
> + if (ret)
> return ret;
>
> ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> @@ -148,10 +265,20 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> /* Move from the global subdevice list to notifier's done */
> list_move(&sd->async_list, ¬ifier->done);
>
> - if (list_empty(¬ifier->waiting))
> - return v4l2_async_notifier_call_complete(notifier);
> + /*
> + * See if the sub-device has a notifier. If it does, proceed
> + * with checking for its async sub-devices.
> + */
> + subdev_notifier = v4l2_async_find_subdev_notifier(sd);
> + if (subdev_notifier && !subdev_notifier->parent) {
> + subdev_notifier->parent = notifier;
> + ret = v4l2_async_notifier_try_all_subdevs(subdev_notifier);
> + if (ret)
> + return ret;
> + }
>
> - return 0;
> + /* Try completing the notifier and its parent(s). */
> + return v4l2_async_notifier_try_complete(notifier);
> }
>
> static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> @@ -163,17 +290,15 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> sd->dev = NULL;
> }
>
> -int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> - struct v4l2_async_notifier *notifier)
> +static int __v4l2_async_notifier_register(struct v4l2_async_notifier *notifier)
> {
> - struct v4l2_subdev *sd, *tmp;
> struct v4l2_async_subdev *asd;
> + int ret;
> int i;
>
> - if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> + if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> return -EINVAL;
>
> - notifier->v4l2_dev = v4l2_dev;
> INIT_LIST_HEAD(¬ifier->waiting);
> INIT_LIST_HEAD(¬ifier->done);
>
> @@ -200,18 +325,10 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
>
> mutex_lock(&list_lock);
>
> - list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
> - int ret;
> -
> - asd = v4l2_async_find_match(notifier, sd);
> - if (!asd)
> - continue;
> -
> - ret = v4l2_async_match_notify(notifier, sd, asd);
> - if (ret < 0) {
> - mutex_unlock(&list_lock);
> - return ret;
> - }
> + ret = v4l2_async_notifier_try_all_subdevs(notifier);
> + if (ret) {
> + mutex_unlock(&list_lock);
> + return ret;
> }
>
> /* Keep also completed notifiers on the list */
> @@ -221,29 +338,70 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
>
> return 0;
> }
> +
> +int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> + struct v4l2_async_notifier *notifier)
> +{
> + if (WARN_ON(!v4l2_dev || notifier->sd))
> + return -EINVAL;
> +
> + notifier->v4l2_dev = v4l2_dev;
> +
> + return __v4l2_async_notifier_register(notifier);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_register);
>
> -void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
> + struct v4l2_async_notifier *notifier)
> {
> - struct v4l2_subdev *sd, *tmp;
> + if (WARN_ON(!sd || notifier->v4l2_dev))
> + return -EINVAL;
>
> - if (!notifier->v4l2_dev)
> - return;
> + notifier->sd = sd;
>
> - mutex_lock(&list_lock);
> + return __v4l2_async_notifier_register(notifier);
> +}
> +EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
>
> - list_del(¬ifier->list);
> +/* Unbind all sub-devices in the notifier tree. */
> +static void v4l2_async_notifier_unbind_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd, *tmp;
>
> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier)
> + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> +
> v4l2_async_cleanup(sd);
>
> v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> - }
>
> - mutex_unlock(&list_lock);
> + list_del(&sd->async_list);
> + list_add(&sd->async_list, &subdev_list);
> + }
>
> + notifier->parent = NULL;
> + notifier->sd = NULL;
> notifier->v4l2_dev = NULL;
> }
> +
> +void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +{
> + if (!notifier->v4l2_dev && !notifier->sd)
> + return;
> +
> + mutex_lock(&list_lock);
> +
> + v4l2_async_notifier_unbind_all_subdevs(notifier);
> +
> + list_del(¬ifier->list);
> +
> + mutex_unlock(&list_lock);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
>
> void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index 3bc8a7c0d83f..a13803a6371d 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -102,7 +102,9 @@ struct v4l2_async_notifier_operations {
> * @num_subdevs: number of subdevices used in the subdevs array
> * @max_subdevs: number of subdevices allocated in the subdevs array
> * @subdevs: array of pointers to subdevice descriptors
> - * @v4l2_dev: pointer to struct v4l2_device
> + * @v4l2_dev: v4l2_device of the root notifier, NULL otherwise
> + * @sd: sub-device that registered the notifier, NULL otherwise
> + * @parent: parent notifier
> * @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
> @@ -113,6 +115,8 @@ struct v4l2_async_notifier {
> unsigned int max_subdevs;
> struct v4l2_async_subdev **subdevs;
> struct v4l2_device *v4l2_dev;
> + struct v4l2_subdev *sd;
> + struct v4l2_async_notifier *parent;
> struct list_head waiting;
> struct list_head done;
> struct list_head list;
> @@ -128,6 +132,16 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> struct v4l2_async_notifier *notifier);
>
> /**
> + * v4l2_async_subdev_notifier_register - registers a subdevice asynchronous
> + * notifier for a sub-device
> + *
> + * @sd: pointer to &struct v4l2_subdev
> + * @notifier: pointer to &struct v4l2_async_notifier
> + */
> +int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
> + struct v4l2_async_notifier *notifier);
> +
> +/**
> * v4l2_async_notifier_unregister - unregisters a subdevice asynchronous notifier
> *
> * @notifier: pointer to &struct v4l2_async_notifier
>
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
@ 2017-09-19 8:06 ` Hans Verkuil
0 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:06 UTC (permalink / raw)
To: Sakari Ailus, linux-media
Cc: niklas.soderlund, maxime.ripard, robh, laurent.pinchart,
devicetree, pavel, sre
On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> Registering a notifier has required the knowledge of struct v4l2_device
> for the reason that sub-devices generally are registered to the
> v4l2_device (as well as the media device, also available through
> v4l2_device).
>
> This information is not available for sub-device drivers at probe time.
>
> What this patch does is that it allows registering notifiers without
> having v4l2_device around. Instead the sub-device pointer is stored in the
> notifier. Once the sub-device of the driver that registered the notifier
> is registered, the notifier will gain the knowledge of the v4l2_device,
> and the binding of async sub-devices from the sub-device driver's notifier
> may proceed.
>
> The root notifier's complete callback is only called when all sub-device
> notifiers are completed.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Regards,
Hans
> ---
> drivers/media/v4l2-core/v4l2-async.c | 218 ++++++++++++++++++++++++++++++-----
> include/media/v4l2-async.h | 16 ++-
> 2 files changed, 203 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index 4be2f16af051..52fe22b9b6b4 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -53,6 +53,10 @@ static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
> return n->ops->complete(n);
> }
>
> +static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> + struct v4l2_subdev *sd,
> + struct v4l2_async_subdev *asd);
> +
> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
> {
> #if IS_ENABLED(CONFIG_I2C)
> @@ -124,14 +128,127 @@ static struct v4l2_async_subdev *v4l2_async_find_match(
> return NULL;
> }
>
> +/* Find the sub-device notifier registered by a sub-device driver. */
> +static struct v4l2_async_notifier *v4l2_async_find_subdev_notifier(
> + struct v4l2_subdev *sd)
> +{
> + struct v4l2_async_notifier *n;
> +
> + list_for_each_entry(n, ¬ifier_list, list)
> + if (n->sd == sd)
> + return n;
> +
> + return NULL;
> +}
> +
> +/* Return true if all sub-device notifiers are complete, false otherwise. */
> +static bool v4l2_async_subdev_notifiers_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!list_empty(¬ifier->waiting))
> + return false;
> +
> + list_for_each_entry(sd, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier &&
> + !v4l2_async_subdev_notifiers_complete(subdev_notifier))
> + return false;
> + }
> +
> + return true;
> +}
> +
> +/* Get v4l2_device related to the notifier if one can be found. */
> +static struct v4l2_device *v4l2_async_notifier_find_v4l2_dev(
> + struct v4l2_async_notifier *notifier)
> +{
> + while (notifier->parent)
> + notifier = notifier->parent;
> +
> + return notifier->v4l2_dev;
> +}
> +
> +/* Test all async sub-devices in a notifier for a match. */
> +static int v4l2_async_notifier_try_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!v4l2_async_notifier_find_v4l2_dev(notifier))
> + return 0;
> +
> +again:
> + list_for_each_entry(sd, &subdev_list, async_list) {
> + struct v4l2_async_subdev *asd;
> + int ret;
> +
> + asd = v4l2_async_find_match(notifier, sd);
> + if (!asd)
> + continue;
> +
> + ret = v4l2_async_match_notify(notifier, sd, asd);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * v4l2_async_match_notify() may lead to registering a
> + * new notifier and thus changing the async subdevs
> + * list. In order to proceed safely from here, restart
> + * parsing the list from the beginning.
> + */
> + goto again;
> + }
> +
> + return 0;
> +}
> +
> +/* Try completing a notifier. */
> +static int v4l2_async_notifier_try_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + do {
> + int ret;
> +
> + /* Any local async sub-devices left? */
> + if (!list_empty(¬ifier->waiting))
> + return 0;
> +
> + /*
> + * Any sub-device notifiers waiting for async subdevs
> + * to be bound?
> + */
> + if (!v4l2_async_subdev_notifiers_complete(notifier))
> + return 0;
> +
> + /* Proceed completing the notifier */
> + ret = v4l2_async_notifier_call_complete(notifier);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * Obtain notifier's parent. If there is one, repeat
> + * the process, otherwise we're done here.
> + */
> + notifier = notifier->parent;
> + } while (notifier);
> +
> + return 0;
> +}
> +
> static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> struct v4l2_subdev *sd,
> struct v4l2_async_subdev *asd)
> {
> + struct v4l2_async_notifier *subdev_notifier;
> int ret;
>
> - ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> - if (ret < 0)
> + ret = v4l2_device_register_subdev(
> + v4l2_async_notifier_find_v4l2_dev(notifier), sd);
> + if (ret)
> return ret;
>
> ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> @@ -148,10 +265,20 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> /* Move from the global subdevice list to notifier's done */
> list_move(&sd->async_list, ¬ifier->done);
>
> - if (list_empty(¬ifier->waiting))
> - return v4l2_async_notifier_call_complete(notifier);
> + /*
> + * See if the sub-device has a notifier. If it does, proceed
> + * with checking for its async sub-devices.
> + */
> + subdev_notifier = v4l2_async_find_subdev_notifier(sd);
> + if (subdev_notifier && !subdev_notifier->parent) {
> + subdev_notifier->parent = notifier;
> + ret = v4l2_async_notifier_try_all_subdevs(subdev_notifier);
> + if (ret)
> + return ret;
> + }
>
> - return 0;
> + /* Try completing the notifier and its parent(s). */
> + return v4l2_async_notifier_try_complete(notifier);
> }
>
> static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> @@ -163,17 +290,15 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> sd->dev = NULL;
> }
>
> -int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> - struct v4l2_async_notifier *notifier)
> +static int __v4l2_async_notifier_register(struct v4l2_async_notifier *notifier)
> {
> - struct v4l2_subdev *sd, *tmp;
> struct v4l2_async_subdev *asd;
> + int ret;
> int i;
>
> - if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> + if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> return -EINVAL;
>
> - notifier->v4l2_dev = v4l2_dev;
> INIT_LIST_HEAD(¬ifier->waiting);
> INIT_LIST_HEAD(¬ifier->done);
>
> @@ -200,18 +325,10 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
>
> mutex_lock(&list_lock);
>
> - list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
> - int ret;
> -
> - asd = v4l2_async_find_match(notifier, sd);
> - if (!asd)
> - continue;
> -
> - ret = v4l2_async_match_notify(notifier, sd, asd);
> - if (ret < 0) {
> - mutex_unlock(&list_lock);
> - return ret;
> - }
> + ret = v4l2_async_notifier_try_all_subdevs(notifier);
> + if (ret) {
> + mutex_unlock(&list_lock);
> + return ret;
> }
>
> /* Keep also completed notifiers on the list */
> @@ -221,29 +338,70 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
>
> return 0;
> }
> +
> +int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> + struct v4l2_async_notifier *notifier)
> +{
> + if (WARN_ON(!v4l2_dev || notifier->sd))
> + return -EINVAL;
> +
> + notifier->v4l2_dev = v4l2_dev;
> +
> + return __v4l2_async_notifier_register(notifier);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_register);
>
> -void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
> + struct v4l2_async_notifier *notifier)
> {
> - struct v4l2_subdev *sd, *tmp;
> + if (WARN_ON(!sd || notifier->v4l2_dev))
> + return -EINVAL;
>
> - if (!notifier->v4l2_dev)
> - return;
> + notifier->sd = sd;
>
> - mutex_lock(&list_lock);
> + return __v4l2_async_notifier_register(notifier);
> +}
> +EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
>
> - list_del(¬ifier->list);
> +/* Unbind all sub-devices in the notifier tree. */
> +static void v4l2_async_notifier_unbind_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd, *tmp;
>
> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier)
> + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> +
> v4l2_async_cleanup(sd);
>
> v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> - }
>
> - mutex_unlock(&list_lock);
> + list_del(&sd->async_list);
> + list_add(&sd->async_list, &subdev_list);
> + }
>
> + notifier->parent = NULL;
> + notifier->sd = NULL;
> notifier->v4l2_dev = NULL;
> }
> +
> +void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +{
> + if (!notifier->v4l2_dev && !notifier->sd)
> + return;
> +
> + mutex_lock(&list_lock);
> +
> + v4l2_async_notifier_unbind_all_subdevs(notifier);
> +
> + list_del(¬ifier->list);
> +
> + mutex_unlock(&list_lock);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
>
> void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index 3bc8a7c0d83f..a13803a6371d 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -102,7 +102,9 @@ struct v4l2_async_notifier_operations {
> * @num_subdevs: number of subdevices used in the subdevs array
> * @max_subdevs: number of subdevices allocated in the subdevs array
> * @subdevs: array of pointers to subdevice descriptors
> - * @v4l2_dev: pointer to struct v4l2_device
> + * @v4l2_dev: v4l2_device of the root notifier, NULL otherwise
> + * @sd: sub-device that registered the notifier, NULL otherwise
> + * @parent: parent notifier
> * @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
> @@ -113,6 +115,8 @@ struct v4l2_async_notifier {
> unsigned int max_subdevs;
> struct v4l2_async_subdev **subdevs;
> struct v4l2_device *v4l2_dev;
> + struct v4l2_subdev *sd;
> + struct v4l2_async_notifier *parent;
> struct list_head waiting;
> struct list_head done;
> struct list_head list;
> @@ -128,6 +132,16 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> struct v4l2_async_notifier *notifier);
>
> /**
> + * v4l2_async_subdev_notifier_register - registers a subdevice asynchronous
> + * notifier for a sub-device
> + *
> + * @sd: pointer to &struct v4l2_subdev
> + * @notifier: pointer to &struct v4l2_async_notifier
> + */
> +int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
> + struct v4l2_async_notifier *notifier);
> +
> +/**
> * v4l2_async_notifier_unregister - unregisters a subdevice asynchronous notifier
> *
> * @notifier: pointer to &struct v4l2_async_notifier
>
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
2017-09-15 14:17 ` [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references Sakari Ailus
@ 2017-09-19 8:14 ` Hans Verkuil
0 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:14 UTC (permalink / raw)
To: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA
Cc: niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> Add function 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.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
Regards,
Hans
> ---
> drivers/media/v4l2-core/v4l2-fwnode.c | 69 +++++++++++++++++++++++++++++++++++
> 1 file changed, 69 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> index 44ee35f6aad5..65e84ea1cc35 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -498,6 +498,75 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> }
> EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
>
> +/*
> + * 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
> + *
> + * Return: 0 on success
> + * -ENOENT if no entries were found
> + * -ENOMEM if memory allocation failed
> + * -EINVAL if property parsing failed
> + */
> +static int v4l2_fwnode_reference_parse(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + const char *prop)
> +{
> + struct fwnode_reference_args args;
> + unsigned int index;
> + int ret;
> +
> + for (index = 0;
> + !(ret = fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args));
> + index++)
> + fwnode_handle_put(args.fwnode);
> +
> + if (!index)
> + return -ENOENT;
> +
> + /*
> + * Note that right now both -ENODATA and -ENOENT may signal
> + * out-of-bounds access. Return the error in cases other than that.
> + */
> + if (ret != -ENOENT && ret != -ENODATA)
> + return ret;
> +
> + ret = v4l2_async_notifier_realloc(notifier,
> + notifier->num_subdevs + index);
> + if (ret)
> + return ret;
> +
> + for (index = 0; !fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args);
> + index++) {
> + struct v4l2_async_subdev *asd;
> +
> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> + ret = -EINVAL;
> + goto error;
> + }
> +
> + asd = kzalloc(sizeof(*asd), GFP_KERNEL);
> + if (!asd) {
> + ret = -ENOMEM;
> + 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;
> +}
> +
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>");
> MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>");
>
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
@ 2017-09-19 8:14 ` Hans Verkuil
0 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:14 UTC (permalink / raw)
To: Sakari Ailus, linux-media
Cc: niklas.soderlund, maxime.ripard, robh, laurent.pinchart,
devicetree, pavel, sre
On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> Add function 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.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Regards,
Hans
> ---
> drivers/media/v4l2-core/v4l2-fwnode.c | 69 +++++++++++++++++++++++++++++++++++
> 1 file changed, 69 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> index 44ee35f6aad5..65e84ea1cc35 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -498,6 +498,75 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> }
> EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
>
> +/*
> + * 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
> + *
> + * Return: 0 on success
> + * -ENOENT if no entries were found
> + * -ENOMEM if memory allocation failed
> + * -EINVAL if property parsing failed
> + */
> +static int v4l2_fwnode_reference_parse(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + const char *prop)
> +{
> + struct fwnode_reference_args args;
> + unsigned int index;
> + int ret;
> +
> + for (index = 0;
> + !(ret = fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args));
> + index++)
> + fwnode_handle_put(args.fwnode);
> +
> + if (!index)
> + return -ENOENT;
> +
> + /*
> + * Note that right now both -ENODATA and -ENOENT may signal
> + * out-of-bounds access. Return the error in cases other than that.
> + */
> + if (ret != -ENOENT && ret != -ENODATA)
> + return ret;
> +
> + ret = v4l2_async_notifier_realloc(notifier,
> + notifier->num_subdevs + index);
> + if (ret)
> + return ret;
> +
> + for (index = 0; !fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args);
> + index++) {
> + struct v4l2_async_subdev *asd;
> +
> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> + ret = -EINVAL;
> + goto error;
> + }
> +
> + asd = kzalloc(sizeof(*asd), GFP_KERNEL);
> + if (!asd) {
> + ret = -ENOMEM;
> + 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;
> +}
> +
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
> MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
>
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 8:03 ` Hans Verkuil
@ 2017-09-19 8:20 ` Sakari Ailus
[not found] ` <20170919082015.vt6olgirnvmpcrpa-z7MJbOB4PBP+e+fPlCVrcFDQ4js95KgL@public.gmane.org>
0 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 8:20 UTC (permalink / raw)
To: Hans Verkuil
Cc: linux-media, niklas.soderlund, maxime.ripard, robh,
laurent.pinchart, devicetree, pavel, sre
Hi Hans,
Thank you for the review.
On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> > Add two functions for parsing devices graph endpoints:
> > v4l2_async_notifier_parse_fwnode_endpoints and
> > v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> > over all endpoints whereas the latter only iterates over the endpoints in
> > a given port.
> >
> > The former is mostly useful for existing drivers that currently implement
> > the iteration over all the endpoints themselves whereas the latter is
> > especially intended for devices with both sinks and sources: async
> > sub-devices for external devices connected to the device's sources will
> > have already been set up, or they are part of the master device.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> > drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
> > drivers/media/v4l2-core/v4l2-fwnode.c | 185 ++++++++++++++++++++++++++++++++++
> > include/media/v4l2-async.h | 24 ++++-
> > include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
> > 4 files changed, 354 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> > index 831f185ecd47..bf0215dde616 100644
> > --- a/drivers/media/v4l2-core/v4l2-async.c
> > +++ b/drivers/media/v4l2-core/v4l2-async.c
> > @@ -22,6 +22,7 @@
> >
> > #include <media/v4l2-async.h>
> > #include <media/v4l2-device.h>
> > +#include <media/v4l2-fwnode.h>
> > #include <media/v4l2-subdev.h>
> >
> > static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
> > @@ -219,6 +220,35 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> > }
> > EXPORT_SYMBOL(v4l2_async_notifier_unregister);
> >
> > +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
> > +{
> > + unsigned int i;
> > +
> > + if (!notifier->max_subdevs)
> > + return;
> > +
> > + for (i = 0; i < notifier->num_subdevs; i++) {
> > + struct v4l2_async_subdev *asd = notifier->subdevs[i];
> > +
> > + switch (asd->match_type) {
> > + case V4L2_ASYNC_MATCH_FWNODE:
> > + fwnode_handle_put(asd->match.fwnode.fwnode);
> > + break;
> > + default:
> > + WARN_ON_ONCE(true);
>
> Please add a break here.
Yes.
>
> > + }
> > +
> > + kfree(asd);
> > + }
> > +
> > + notifier->max_subdevs = 0;
> > + notifier->num_subdevs = 0;
> > +
> > + kvfree(notifier->subdevs);
> > + notifier->subdevs = NULL;
> > +}
> > +EXPORT_SYMBOL_GPL(v4l2_async_notifier_release);
> > +
> > int v4l2_async_register_subdev(struct v4l2_subdev *sd)
> > {
> > struct v4l2_async_notifier *notifier;
> > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> > index 706f9e7b90f1..44ee35f6aad5 100644
> > --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> > @@ -19,6 +19,7 @@
> > */
> > #include <linux/acpi.h>
> > #include <linux/kernel.h>
> > +#include <linux/mm.h>
> > #include <linux/module.h>
> > #include <linux/of.h>
> > #include <linux/property.h>
> > @@ -26,6 +27,7 @@
> > #include <linux/string.h>
> > #include <linux/types.h>
> >
> > +#include <media/v4l2-async.h>
> > #include <media/v4l2-fwnode.h>
> >
> > enum v4l2_fwnode_bus_type {
> > @@ -313,6 +315,189 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
> > }
> > EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
> >
> > +static int v4l2_async_notifier_realloc(struct v4l2_async_notifier *notifier,
> > + unsigned int max_subdevs)
> > +{
> > + struct v4l2_async_subdev **subdevs;
> > +
> > + if (max_subdevs <= notifier->max_subdevs)
> > + return 0;
> > +
> > + subdevs = kvmalloc_array(
> > + max_subdevs, sizeof(*notifier->subdevs),
> > + GFP_KERNEL | __GFP_ZERO);
> > + if (!subdevs)
> > + return -ENOMEM;
> > +
> > + if (notifier->subdevs) {
> > + memcpy(subdevs, notifier->subdevs,
> > + sizeof(*subdevs) * notifier->num_subdevs);
> > +
> > + kvfree(notifier->subdevs);
> > + }
> > +
> > + notifier->subdevs = subdevs;
> > + notifier->max_subdevs = max_subdevs;
> > +
> > + return 0;
> > +}
> > +
> > +static int v4l2_async_notifier_fwnode_parse_endpoint(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + struct fwnode_handle *endpoint, unsigned int asd_struct_size,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd))
> > +{
> > + struct v4l2_async_subdev *asd;
> > + struct v4l2_fwnode_endpoint *vep;
> > + int ret = 0;
> > +
> > + asd = kzalloc(asd_struct_size, GFP_KERNEL);
> > + if (!asd)
> > + return -ENOMEM;
> > +
> > + asd->match.fwnode.fwnode =
> > + fwnode_graph_get_remote_port_parent(endpoint);
> > + if (!asd->match.fwnode.fwnode) {
> > + dev_warn(dev, "bad remote port parent\n");
> > + ret = -EINVAL;
> > + goto out_err;
> > + }
> > +
> > + /* Ignore endpoints the parsing of which failed. */
> > + vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
> > + if (IS_ERR(vep)) {
> > + ret = PTR_ERR(vep);
> > + dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
> > + ret);
> > + goto out_err;
> > + }
> > +
> > + ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
> > + if (ret == -ENOTCONN)
> > + dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
> > + vep->base.id);
> > + else if (ret < 0)
> > + dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
> > + vep->base.port, vep->base.id, ret);
> > + v4l2_fwnode_endpoint_free(vep);
> > + if (ret < 0)
> > + goto out_err;
> > +
> > + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
> > + notifier->subdevs[notifier->num_subdevs] = asd;
> > + notifier->num_subdevs++;
> > +
> > + return 0;
> > +
> > +out_err:
> > + fwnode_handle_put(asd->match.fwnode.fwnode);
> > + kfree(asd);
> > +
> > + return ret == -ENOTCONN ? 0 : ret;
> > +}
> > +
> > +static int __v4l2_async_notifier_parse_fwnode_endpoints(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + size_t asd_struct_size, unsigned int port, bool has_port,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd))
> > +{
> > + struct fwnode_handle *fwnode = NULL;
> > + unsigned int max_subdevs = notifier->max_subdevs;
> > + int ret;
> > +
> > + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
> > + return -EINVAL;
> > +
> > + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> > + dev_fwnode(dev), fwnode)); ) {
>
> You can replace this by:
>
> while ((fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), fwnode))) {
>
> > + if (!fwnode_device_is_available(
> > + fwnode_graph_get_port_parent(fwnode)))
> > + continue;
> > +
> > + if (has_port) {
> > + struct fwnode_endpoint ep;
> > +
> > + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> > + if (ret) {
> > + fwnode_handle_put(fwnode);
> > + return ret;
> > + }
> > +
> > + if (ep.port != port)
> > + continue;
> > + }
> > + max_subdevs++;
> > + }
> > +
> > + /* No subdevs to add? Return here. */
> > + if (max_subdevs == notifier->max_subdevs)
> > + return 0;
> > +
> > + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
> > + if (ret)
> > + return ret;
> > +
> > + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> > + dev_fwnode(dev), fwnode)); ) {
>
> Same here: this can be a 'while'.
The fwnode = NULL assignment still needs to be done. A for loop has a
natural initialiser for the loop, I think it's cleaner than using while
here.
The macro would be implemented this way as well.
For the loop above this one, I'd use for for consistency: it's the same
loop after all.
This reminds me --- I'll send the patch for the macro.
>
> > + if (!fwnode_device_is_available(
> > + fwnode_graph_get_port_parent(fwnode)))
> > + continue;
> > +
> > + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> > + ret = -EINVAL;
> > + break;
> > + }
> > +
> > + if (has_port) {
> > + struct fwnode_endpoint ep;
> > +
> > + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> > + if (ret)
> > + break;
> > +
> > + if (ep.port != port)
> > + continue;
> > + }
> > +
> > + ret = v4l2_async_notifier_fwnode_parse_endpoint(
> > + dev, notifier, fwnode, asd_struct_size, parse_endpoint);
> > + if (ret < 0)
> > + break;
> > + }
> > +
> > + fwnode_handle_put(fwnode);
> > +
> > + return ret;
> > +}
> > +
> > +int v4l2_async_notifier_parse_fwnode_endpoints(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + size_t asd_struct_size,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd))
> > +{
> > + return __v4l2_async_notifier_parse_fwnode_endpoints(
> > + dev, notifier, asd_struct_size, 0, false, parse_endpoint);
> > +}
> > +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
> > +
> > +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + size_t asd_struct_size, unsigned int port,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd))
> > +{
> > + return __v4l2_async_notifier_parse_fwnode_endpoints(
> > + dev, notifier, asd_struct_size, port, true, parse_endpoint);
> > +}
> > +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
> > +
> > 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-async.h b/include/media/v4l2-async.h
> > index c69d8c8a66d0..96fa1afc00dd 100644
> > --- a/include/media/v4l2-async.h
> > +++ b/include/media/v4l2-async.h
> > @@ -18,7 +18,6 @@ struct device;
> > struct device_node;
> > struct v4l2_device;
> > struct v4l2_subdev;
> > -struct v4l2_async_notifier;
> >
> > /* A random max subdevice number, used to allocate an array on stack */
> > #define V4L2_MAX_SUBDEVS 128U
> > @@ -50,6 +49,10 @@ enum v4l2_async_match_type {
> > * @match: union of per-bus type matching data sets
> > * @list: used to link struct v4l2_async_subdev objects, waiting to be
> > * probed, to a notifier->waiting list
> > + *
> > + * When this struct is used as a member in a driver specific struct,
> > + * the driver specific struct shall contain the @struct
> > + * v4l2_async_subdev as its first member.
> > */
> > struct v4l2_async_subdev {
> > enum v4l2_async_match_type match_type;
> > @@ -78,7 +81,8 @@ struct v4l2_async_subdev {
> > /**
> > * struct v4l2_async_notifier - v4l2_device notifier data
> > *
> > - * @num_subdevs: number of subdevices
> > + * @num_subdevs: number of subdevices used in the subdevs array
> > + * @max_subdevs: number of subdevices allocated in the subdevs array
> > * @subdevs: array of pointers to subdevice descriptors
> > * @v4l2_dev: pointer to struct v4l2_device
> > * @waiting: list of struct v4l2_async_subdev, waiting for their drivers
> > @@ -90,6 +94,7 @@ struct v4l2_async_subdev {
> > */
> > struct v4l2_async_notifier {
> > unsigned int num_subdevs;
> > + unsigned int max_subdevs;
> > struct v4l2_async_subdev **subdevs;
> > struct v4l2_device *v4l2_dev;
> > struct list_head waiting;
> > @@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> > void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
> >
> > /**
> > + * v4l2_async_notifier_release - release notifier resources
> > + * @notifier: the notifier the resources of which are to be released
> > + *
> > + * Release memory resources related to a notifier, including the async
> > + * sub-devices allocated for the purposes of the notifier. The user is
> > + * responsible for releasing the notifier's resources after calling
> > + * @v4l2_async_notifier_parse_fwnode_endpoints.
> > + *
> > + * There is no harm from calling v4l2_async_notifier_release in other
> > + * cases as long as its memory has been zeroed after it has been
> > + * allocated.
> > + */
> > +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
> > +
> > +/**
> > * v4l2_async_register_subdev - registers a sub-device to the asynchronous
> > * subdevice framework
> > *
> > diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
> > index 68eb22ba571b..83afac48ea6b 100644
> > --- a/include/media/v4l2-fwnode.h
> > +++ b/include/media/v4l2-fwnode.h
> > @@ -25,6 +25,8 @@
> > #include <media/v4l2-mediabus.h>
> >
> > struct fwnode_handle;
> > +struct v4l2_async_notifier;
> > +struct v4l2_async_subdev;
> >
> > #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
> >
> > @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
> > */
> > void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
> >
> > +/**
> > + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
> > + * device node
> > + * @dev: the device the endpoints of which are to be parsed
> > + * @notifier: notifier for @dev
> > + * @asd_struct_size: size of the driver's async sub-device struct, including
> > + * sizeof(struct v4l2_async_subdev). The &struct
> > + * v4l2_async_subdev shall be the first member of
> > + * the driver's async sub-device struct, i.e. both
> > + * begin at the same memory address.
> > + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> > + * endpoint. Optional.
> > + * Return: %0 on success
> > + * %-ENOTCONN if the endpoint is to be skipped but this
> > + * should not be considered as an error
> > + * %-EINVAL if the endpoint configuration is invalid
> > + *
> > + * Parse the fwnode endpoints of the @dev device and populate the async sub-
> > + * devices array of the notifier. The @parse_endpoint callback function is
> > + * called for each endpoint with the corresponding async sub-device pointer to
> > + * let the caller initialize the driver-specific part of the async sub-device
> > + * structure.
> > + *
> > + * The notifier memory shall be zeroed before this function is called on the
> > + * notifier.
> > + *
> > + * This function may not be called on a registered notifier and may be called on
> > + * a notifier only once.
> > + *
> > + * Do not change the notifier's subdevs array, take references to the subdevs
> > + * array itself or change the notifier's num_subdevs field. This is because this
> > + * function allocates and reallocates the subdevs array based on parsing
> > + * endpoints.
> > + *
> > + * The @struct v4l2_fwnode_endpoint passed to the callback function
> > + * @parse_endpoint is released once the function is finished. If there is a need
> > + * to retain that configuration, the user needs to allocate memory for it.
> > + *
> > + * Any notifier populated using this function must be released with a call to
> > + * v4l2_async_notifier_release() after it has been unregistered and the async
> > + * sub-devices are no longer in use, even if the function returned an error.
> > + *
> > + * Return: %0 on success, including when no async sub-devices are found
> > + * %-ENOMEM if memory allocation failed
> > + * %-EINVAL if graph or endpoint parsing failed
> > + * Other error codes as returned by @parse_endpoint
> > + */
> > +int v4l2_async_notifier_parse_fwnode_endpoints(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + size_t asd_struct_size,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd));
> > +
> > +/**
> > + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
> > + * endpoints of a port in a
> > + * device node
> > + * @dev: the device the endpoints of which are to be parsed
> > + * @notifier: notifier for @dev
> > + * @asd_struct_size: size of the driver's async sub-device struct, including
> > + * sizeof(struct v4l2_async_subdev). The &struct
> > + * v4l2_async_subdev shall be the first member of
> > + * the driver's async sub-device struct, i.e. both
> > + * begin at the same memory address.
> > + * @port: port number where endpoints are to be parsed
> > + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> > + * endpoint. Optional.
> > + * Return: %0 on success
> > + * %-ENOTCONN if the endpoint is to be skipped but this
> > + * should not be considered as an error
> > + * %-EINVAL if the endpoint configuration is invalid
> > + *
> > + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
> > + * the exception that it only parses endpoints in a given port. This is useful
> > + * on devices that have both sinks and sources: the async sub-devices connected
>
> on -> for
>
> > + * to sources have already been set up by another driver (on capture devices).
>
> on -> for
Agreed on both.
>
> So if I understand this correctly for devices with both sinks and sources you use
> this function to just parse the sink ports. And you have to give explicit port
> numbers since you can't tell from parsing the device tree if a port is a sink or
> source port, right? Only the driver knows this.
Correct. The graph data structure in DT isn't directed, so this is only
known by the driver.
>
> > + *
> > + * Parse the fwnode endpoints of the @dev device on a given @port and populate
> > + * the async sub-devices array of the notifier. The @parse_endpoint callback
> > + * function is called for each endpoint with the corresponding async sub-device
> > + * pointer to let the caller initialize the driver-specific part of the async
> > + * sub-device structure.
> > + *
> > + * The notifier memory shall be zeroed before this function is called on the
> > + * notifier the first time.
> > + *
> > + * This function may not be called on a registered notifier and may be called on
> > + * a notifier only once per port.
> > + *
> > + * Do not change the notifier's subdevs array, take references to the subdevs
> > + * array itself or change the notifier's num_subdevs field. This is because this
> > + * function allocates and reallocates the subdevs array based on parsing
> > + * endpoints.
> > + *
> > + * The @struct v4l2_fwnode_endpoint passed to the callback function
> > + * @parse_endpoint is released once the function is finished. If there is a need
> > + * to retain that configuration, the user needs to allocate memory for it.
> > + *
> > + * Any notifier populated using this function must be released with a call to
> > + * v4l2_async_notifier_release() after it has been unregistered and the async
> > + * sub-devices are no longer in use, even if the function returned an error.
> > + *
> > + * Return: %0 on success, including when no async sub-devices are found
> > + * %-ENOMEM if memory allocation failed
> > + * %-EINVAL if graph or endpoint parsing failed
> > + * Other error codes as returned by @parse_endpoint
> > + */
> > +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + size_t asd_struct_size, unsigned int port,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd));
> > +
> > #endif /* _V4L2_FWNODE_H */
> >
>
--
Kind regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references
2017-09-15 14:17 ` [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references Sakari Ailus
@ 2017-09-19 8:31 ` Hans Verkuil
2017-09-19 8:45 ` Sakari Ailus
0 siblings, 1 reply; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:31 UTC (permalink / raw)
To: Sakari Ailus, linux-media
Cc: niklas.soderlund, maxime.ripard, robh, laurent.pinchart,
devicetree, pavel, sre
Hi Sakari,
I'm slowly starting to understand this. The example helped a lot. But I still have
some questions, see below.
On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> v4l2_fwnode_reference_parse_int_prop() will find an fwnode such that under
> the device's own fwnode, it will follow child fwnodes with the given
> property-value pair and return the resulting fwnode.
I think both the subject, commit log, function comment and function name should
reflect the fact that this function is for an ACPI reference.
It's only called for ACPI (from patch 19):
+ if (props[i].props && is_acpi_node(dev_fwnode(dev)))
+ ret = v4l2_fwnode_reference_parse_int_props(
So renaming it to v4l2_fwnode_acpi_reference_parse_int_props or something similar
would clarify this fact.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> drivers/media/v4l2-core/v4l2-fwnode.c | 201 ++++++++++++++++++++++++++++++++++
> 1 file changed, 201 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> index 65e84ea1cc35..968a345a288f 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -567,6 +567,207 @@ static int v4l2_fwnode_reference_parse(
> return ret;
> }
>
> +/*
> + * v4l2_fwnode_reference_get_int_prop - parse a reference with integer
> + * arguments
> + * @dev: struct device pointer
> + * @notifier: notifier for @dev
> + * @prop: the name of the property
> + * @index: the index of the reference to get
> + * @props: the array of integer property names
> + * @nprops: the number of integer property names in @nprops
You mean 'in @props'?
One thing that is not clear to me is when you would use an nprops value > 1.
What's the use-case for that? It only makes sense (I think) if you would have
property names that are all aliases of one another.
> + *
> + * Find fwnodes referred to by a property @prop, then under that
> + * iteratively, @nprops times, follow each child node which has a
> + * property in @props array at a given child index the value of which
> + * matches the integer argument at an index.
> + *
> + * For example, if this function was called with arguments and values
> + * @dev corresponding to device "SEN", @prop == "flash-leds", @index
> + * == 1, @props == { "led" }, @nprops == 1, with the ASL snippet below
> + * it would return the node marked with THISONE. The @dev argument in
> + * the ASL below.
That last sentence about the @dev seems incomplete. I'm not sure what is
meant by it.
> + *
> + * Device (LED)
> + * {
> + * Name (_DSD, Package () {
> + * ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
> + * Package () {
> + * Package () { "led0", "LED0" },
> + * Package () { "led1", "LED1" },
> + * }
> + * })
> + * Name (LED0, Package () {
> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> + * Package () {
> + * Package () { "led", 0 },
> + * }
> + * })
> + * Name (LED1, Package () {
> + * // THISONE
> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> + * Package () {
> + * Package () { "led", 1 },
> + * }
> + * })
> + * }
> + *
> + * Device (SEN)
> + * {
> + * Name (_DSD, Package () {
> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> + * Package () {
> + * Package () {
> + * "flash-leds",
> + * Package () { ^LED, 0, ^LED, 1 },
> + * }
> + * }
> + * })
> + * }
> + *
> + * where
> + *
> + * LED LED driver device
> + * LED0 First LED
> + * LED1 Second LED
> + * SEN Camera sensor device (or another device the LED is
> + * related to)
> + *
> + * Return: 0 on success
> + * -ENOENT if no entries (or the property itself) were found
> + * -EINVAL if property parsing otherwise failed
> + * -ENOMEM if memory allocation failed
> + */
> +static struct fwnode_handle *v4l2_fwnode_reference_get_int_prop(
> + struct fwnode_handle *fwnode, const char *prop, unsigned int index,
> + const char **props, unsigned int nprops)
> +{
> + struct fwnode_reference_args fwnode_args;
> + unsigned int *args = fwnode_args.args;
> + struct fwnode_handle *child;
> + int ret;
> +
> + /*
> + * Obtain remote fwnode as well as the integer arguments.
> + *
> + * Note that right now both -ENODATA and -ENOENT may signal
> + * out-of-bounds access. Return -ENOENT in that case.
> + */
> + ret = fwnode_property_get_reference_args(fwnode, prop, NULL, nprops,
> + index, &fwnode_args);
> + if (ret)
> + return ERR_PTR(ret == -ENODATA ? -ENOENT : ret);
> +
> + /*
> + * Find a node in the tree under the referred fwnode corresponding the
> + * integer arguments.
> + */
> + fwnode = fwnode_args.fwnode;
So given the example above, fwnode would point to the LED device?
If correct, then mention that in the comment.
> + while (nprops--) {
> + u32 val;
> +
> + /* Loop over all child nodes under fwnode. */
And here you check if the LED device has child nodes that have a *props
property with a value matching the index.
So given the example above it is looking for a child with property "led"
and value 1.
It's useful if that is mentioned in the comment as well.
> + fwnode_for_each_child_node(fwnode, child) {
> + if (fwnode_property_read_u32(child, *props, &val))
> + continue;
> +
> + /* Found property, see if its value matches. */
> + if (val == *args)
> + break;
> + }
> +
> + fwnode_handle_put(fwnode);
> +
> + /* No property found; return an error here. */
> + if (!child) {
> + fwnode = ERR_PTR(-ENOENT);
> + break;
> + }
> +
> + props++;
> + args++;
> + fwnode = child;
> + }
> +
> + return fwnode;
> +}
> +
> +/*
> + * v4l2_fwnode_reference_parse_int_props - parse references for async sub-devices
> + * @dev: struct device pointer
> + * @notifier: notifier for @dev
> + * @prop: the name of the property
> + * @props: the array of integer property names
> + * @nprops: the number of integer properties
> + *
> + * Use v4l2_fwnode_reference_get_int_prop to find fwnodes through reference in
> + * property @prop with integer arguments with child nodes matching in properties
> + * @props. Then, set up V4L2 async sub-devices for those fwnodes in the notifier
> + * accordingly.
> + *
> + * While it is technically possible to use this function on DT, it is only
> + * meaningful on ACPI. On Device tree you can refer to any node in the tree but
> + * on ACPI the references are limited to devices.
> + *
> + * Return: 0 on success
> + * -ENOENT if no entries (or the property itself) were found
> + * -EINVAL if property parsing otherwisefailed
> + * -ENOMEM if memory allocation failed
> + */
> +static int v4l2_fwnode_reference_parse_int_props(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + const char *prop, const char **props, unsigned int nprops)
> +{
> + struct fwnode_handle *fwnode;
> + unsigned int index;
> + int ret;
> +
> + for (index = 0; !IS_ERR((fwnode = v4l2_fwnode_reference_get_int_prop(
> + dev_fwnode(dev), prop, index, props,
> + nprops))); index++)
> + fwnode_handle_put(fwnode);
> +
> + /*
> + * Note that right now both -ENODATA and -ENOENT may signal
> + * out-of-bounds access. Return the error in cases other than that.
> + */
> + if (PTR_ERR(fwnode) != -ENOENT && PTR_ERR(fwnode) != -ENODATA)
> + return PTR_ERR(fwnode);
> +
> + ret = v4l2_async_notifier_realloc(notifier,
> + notifier->num_subdevs + index);
> + if (ret)
> + return -ENOMEM;
> +
> + for (index = 0; !IS_ERR((fwnode = v4l2_fwnode_reference_get_int_prop(
> + dev_fwnode(dev), prop, index, props,
> + nprops))); index++) {
> + struct v4l2_async_subdev *asd;
> +
> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> + ret = -EINVAL;
> + goto error;
> + }
> +
> + asd = kzalloc(sizeof(struct v4l2_async_subdev), GFP_KERNEL);
> + if (!asd) {
> + ret = -ENOMEM;
> + goto error;
> + }
> +
> + notifier->subdevs[notifier->num_subdevs] = asd;
> + asd->match.fwnode.fwnode = fwnode;
> + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
> + notifier->num_subdevs++;
> + }
> +
> + return PTR_ERR(fwnode) == -ENOENT ? 0 : PTR_ERR(fwnode);
> +
> +error:
> + fwnode_handle_put(fwnode);
> + return ret;
> +}
> +
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
> MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
>
Regards,
Hans
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 8:20 ` Sakari Ailus
@ 2017-09-19 8:40 ` Hans Verkuil
0 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:40 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
On 09/19/2017 10:20 AM, Sakari Ailus wrote:
> Hi Hans,
>
> Thank you for the review.
>
> On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
>> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
>>> Add two functions for parsing devices graph endpoints:
>>> v4l2_async_notifier_parse_fwnode_endpoints and
>>> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
>>> over all endpoints whereas the latter only iterates over the endpoints in
>>> a given port.
>>>
>>> The former is mostly useful for existing drivers that currently implement
>>> the iteration over all the endpoints themselves whereas the latter is
>>> especially intended for devices with both sinks and sources: async
>>> sub-devices for external devices connected to the device's sources will
>>> have already been set up, or they are part of the master device.
>>>
>>> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
>>> ---
>>> drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
>>> drivers/media/v4l2-core/v4l2-fwnode.c | 185 ++++++++++++++++++++++++++++++++++
>>> include/media/v4l2-async.h | 24 ++++-
>>> include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
>>> 4 files changed, 354 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
>>> index 831f185ecd47..bf0215dde616 100644
>>> --- a/drivers/media/v4l2-core/v4l2-async.c
>>> +++ b/drivers/media/v4l2-core/v4l2-async.c
>>> @@ -22,6 +22,7 @@
>>>
>>> #include <media/v4l2-async.h>
>>> #include <media/v4l2-device.h>
>>> +#include <media/v4l2-fwnode.h>
>>> #include <media/v4l2-subdev.h>
>>>
>>> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
>>> @@ -219,6 +220,35 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
>>> }
>>> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
>>>
>>> +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
>>> +{
>>> + unsigned int i;
>>> +
>>> + if (!notifier->max_subdevs)
>>> + return;
>>> +
>>> + for (i = 0; i < notifier->num_subdevs; i++) {
>>> + struct v4l2_async_subdev *asd = notifier->subdevs[i];
>>> +
>>> + switch (asd->match_type) {
>>> + case V4L2_ASYNC_MATCH_FWNODE:
>>> + fwnode_handle_put(asd->match.fwnode.fwnode);
>>> + break;
>>> + default:
>>> + WARN_ON_ONCE(true);
>>
>> Please add a break here.
>
> Yes.
>
>>
>>> + }
>>> +
>>> + kfree(asd);
>>> + }
>>> +
>>> + notifier->max_subdevs = 0;
>>> + notifier->num_subdevs = 0;
>>> +
>>> + kvfree(notifier->subdevs);
>>> + notifier->subdevs = NULL;
>>> +}
>>> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_release);
>>> +
>>> int v4l2_async_register_subdev(struct v4l2_subdev *sd)
>>> {
>>> struct v4l2_async_notifier *notifier;
>>> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
>>> index 706f9e7b90f1..44ee35f6aad5 100644
>>> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
>>> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
>>> @@ -19,6 +19,7 @@
>>> */
>>> #include <linux/acpi.h>
>>> #include <linux/kernel.h>
>>> +#include <linux/mm.h>
>>> #include <linux/module.h>
>>> #include <linux/of.h>
>>> #include <linux/property.h>
>>> @@ -26,6 +27,7 @@
>>> #include <linux/string.h>
>>> #include <linux/types.h>
>>>
>>> +#include <media/v4l2-async.h>
>>> #include <media/v4l2-fwnode.h>
>>>
>>> enum v4l2_fwnode_bus_type {
>>> @@ -313,6 +315,189 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
>>> }
>>> EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
>>>
>>> +static int v4l2_async_notifier_realloc(struct v4l2_async_notifier *notifier,
>>> + unsigned int max_subdevs)
>>> +{
>>> + struct v4l2_async_subdev **subdevs;
>>> +
>>> + if (max_subdevs <= notifier->max_subdevs)
>>> + return 0;
>>> +
>>> + subdevs = kvmalloc_array(
>>> + max_subdevs, sizeof(*notifier->subdevs),
>>> + GFP_KERNEL | __GFP_ZERO);
>>> + if (!subdevs)
>>> + return -ENOMEM;
>>> +
>>> + if (notifier->subdevs) {
>>> + memcpy(subdevs, notifier->subdevs,
>>> + sizeof(*subdevs) * notifier->num_subdevs);
>>> +
>>> + kvfree(notifier->subdevs);
>>> + }
>>> +
>>> + notifier->subdevs = subdevs;
>>> + notifier->max_subdevs = max_subdevs;
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int v4l2_async_notifier_fwnode_parse_endpoint(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + struct fwnode_handle *endpoint, unsigned int asd_struct_size,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + struct v4l2_async_subdev *asd;
>>> + struct v4l2_fwnode_endpoint *vep;
>>> + int ret = 0;
>>> +
>>> + asd = kzalloc(asd_struct_size, GFP_KERNEL);
>>> + if (!asd)
>>> + return -ENOMEM;
>>> +
>>> + asd->match.fwnode.fwnode =
>>> + fwnode_graph_get_remote_port_parent(endpoint);
>>> + if (!asd->match.fwnode.fwnode) {
>>> + dev_warn(dev, "bad remote port parent\n");
>>> + ret = -EINVAL;
>>> + goto out_err;
>>> + }
>>> +
>>> + /* Ignore endpoints the parsing of which failed. */
>>> + vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
>>> + if (IS_ERR(vep)) {
>>> + ret = PTR_ERR(vep);
>>> + dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
>>> + ret);
>>> + goto out_err;
>>> + }
>>> +
>>> + ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
>>> + if (ret == -ENOTCONN)
>>> + dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
>>> + vep->base.id);
>>> + else if (ret < 0)
>>> + dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
>>> + vep->base.port, vep->base.id, ret);
>>> + v4l2_fwnode_endpoint_free(vep);
>>> + if (ret < 0)
>>> + goto out_err;
>>> +
>>> + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
>>> + notifier->subdevs[notifier->num_subdevs] = asd;
>>> + notifier->num_subdevs++;
>>> +
>>> + return 0;
>>> +
>>> +out_err:
>>> + fwnode_handle_put(asd->match.fwnode.fwnode);
>>> + kfree(asd);
>>> +
>>> + return ret == -ENOTCONN ? 0 : ret;
>>> +}
>>> +
>>> +static int __v4l2_async_notifier_parse_fwnode_endpoints(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size, unsigned int port, bool has_port,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + struct fwnode_handle *fwnode = NULL;
>>> + unsigned int max_subdevs = notifier->max_subdevs;
>>> + int ret;
>>> +
>>> + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
>>> + return -EINVAL;
>>> +
>>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
>>> + dev_fwnode(dev), fwnode)); ) {
>>
>> You can replace this by:
>>
>> while ((fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), fwnode))) {
>>
>>> + if (!fwnode_device_is_available(
>>> + fwnode_graph_get_port_parent(fwnode)))
>>> + continue;
>>> +
>>> + if (has_port) {
>>> + struct fwnode_endpoint ep;
>>> +
>>> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
>>> + if (ret) {
>>> + fwnode_handle_put(fwnode);
>>> + return ret;
>>> + }
>>> +
>>> + if (ep.port != port)
>>> + continue;
>>> + }
>>> + max_subdevs++;
>>> + }
>>> +
>>> + /* No subdevs to add? Return here. */
>>> + if (max_subdevs == notifier->max_subdevs)
>>> + return 0;
>>> +
>>> + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
>>> + dev_fwnode(dev), fwnode)); ) {
>>
>> Same here: this can be a 'while'.
>
> The fwnode = NULL assignment still needs to be done. A for loop has a
> natural initialiser for the loop, I think it's cleaner than using while
> here.
After the previous while fwnode is NULL again (since that's when the while
stops).
>
> The macro would be implemented this way as well.
>
> For the loop above this one, I'd use for for consistency: it's the same
> loop after all.
>
> This reminds me --- I'll send the patch for the macro.
If this is going to be replaced by a macro, then disregard my comment.
>
>>
>>> + if (!fwnode_device_is_available(
>>> + fwnode_graph_get_port_parent(fwnode)))
>>> + continue;
>>> +
>>> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
>>> + ret = -EINVAL;
>>> + break;
>>> + }
>>> +
>>> + if (has_port) {
>>> + struct fwnode_endpoint ep;
>>> +
>>> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
>>> + if (ret)
>>> + break;
>>> +
>>> + if (ep.port != port)
>>> + continue;
>>> + }
>>> +
>>> + ret = v4l2_async_notifier_fwnode_parse_endpoint(
>>> + dev, notifier, fwnode, asd_struct_size, parse_endpoint);
>>> + if (ret < 0)
>>> + break;
>>> + }
>>> +
>>> + fwnode_handle_put(fwnode);
>>> +
>>> + return ret;
>>> +}
>>> +
>>> +int v4l2_async_notifier_parse_fwnode_endpoints(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + return __v4l2_async_notifier_parse_fwnode_endpoints(
>>> + dev, notifier, asd_struct_size, 0, false, parse_endpoint);
>>> +}
>>> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
>>> +
>>> +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size, unsigned int port,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + return __v4l2_async_notifier_parse_fwnode_endpoints(
>>> + dev, notifier, asd_struct_size, port, true, parse_endpoint);
>>> +}
>>> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
>>> +
>>> 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-async.h b/include/media/v4l2-async.h
>>> index c69d8c8a66d0..96fa1afc00dd 100644
>>> --- a/include/media/v4l2-async.h
>>> +++ b/include/media/v4l2-async.h
>>> @@ -18,7 +18,6 @@ struct device;
>>> struct device_node;
>>> struct v4l2_device;
>>> struct v4l2_subdev;
>>> -struct v4l2_async_notifier;
>>>
>>> /* A random max subdevice number, used to allocate an array on stack */
>>> #define V4L2_MAX_SUBDEVS 128U
>>> @@ -50,6 +49,10 @@ enum v4l2_async_match_type {
>>> * @match: union of per-bus type matching data sets
>>> * @list: used to link struct v4l2_async_subdev objects, waiting to be
>>> * probed, to a notifier->waiting list
>>> + *
>>> + * When this struct is used as a member in a driver specific struct,
>>> + * the driver specific struct shall contain the @struct
>>> + * v4l2_async_subdev as its first member.
>>> */
>>> struct v4l2_async_subdev {
>>> enum v4l2_async_match_type match_type;
>>> @@ -78,7 +81,8 @@ struct v4l2_async_subdev {
>>> /**
>>> * struct v4l2_async_notifier - v4l2_device notifier data
>>> *
>>> - * @num_subdevs: number of subdevices
>>> + * @num_subdevs: number of subdevices used in the subdevs array
>>> + * @max_subdevs: number of subdevices allocated in the subdevs array
>>> * @subdevs: array of pointers to subdevice descriptors
>>> * @v4l2_dev: pointer to struct v4l2_device
>>> * @waiting: list of struct v4l2_async_subdev, waiting for their drivers
>>> @@ -90,6 +94,7 @@ struct v4l2_async_subdev {
>>> */
>>> struct v4l2_async_notifier {
>>> unsigned int num_subdevs;
>>> + unsigned int max_subdevs;
>>> struct v4l2_async_subdev **subdevs;
>>> struct v4l2_device *v4l2_dev;
>>> struct list_head waiting;
>>> @@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
>>> void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
>>>
>>> /**
>>> + * v4l2_async_notifier_release - release notifier resources
>>> + * @notifier: the notifier the resources of which are to be released
>>> + *
>>> + * Release memory resources related to a notifier, including the async
>>> + * sub-devices allocated for the purposes of the notifier. The user is
>>> + * responsible for releasing the notifier's resources after calling
>>> + * @v4l2_async_notifier_parse_fwnode_endpoints.
>>> + *
>>> + * There is no harm from calling v4l2_async_notifier_release in other
>>> + * cases as long as its memory has been zeroed after it has been
>>> + * allocated.
>>> + */
>>> +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
>>> +
>>> +/**
>>> * v4l2_async_register_subdev - registers a sub-device to the asynchronous
>>> * subdevice framework
>>> *
>>> diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
>>> index 68eb22ba571b..83afac48ea6b 100644
>>> --- a/include/media/v4l2-fwnode.h
>>> +++ b/include/media/v4l2-fwnode.h
>>> @@ -25,6 +25,8 @@
>>> #include <media/v4l2-mediabus.h>
>>>
>>> struct fwnode_handle;
>>> +struct v4l2_async_notifier;
>>> +struct v4l2_async_subdev;
>>>
>>> #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
>>>
>>> @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
>>> */
>>> void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
>>>
>>> +/**
>>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
>>> + * device node
>>> + * @dev: the device the endpoints of which are to be parsed
>>> + * @notifier: notifier for @dev
>>> + * @asd_struct_size: size of the driver's async sub-device struct, including
>>> + * sizeof(struct v4l2_async_subdev). The &struct
>>> + * v4l2_async_subdev shall be the first member of
>>> + * the driver's async sub-device struct, i.e. both
>>> + * begin at the same memory address.
>>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
>>> + * endpoint. Optional.
>>> + * Return: %0 on success
>>> + * %-ENOTCONN if the endpoint is to be skipped but this
>>> + * should not be considered as an error
>>> + * %-EINVAL if the endpoint configuration is invalid
>>> + *
>>> + * Parse the fwnode endpoints of the @dev device and populate the async sub-
>>> + * devices array of the notifier. The @parse_endpoint callback function is
>>> + * called for each endpoint with the corresponding async sub-device pointer to
>>> + * let the caller initialize the driver-specific part of the async sub-device
>>> + * structure.
>>> + *
>>> + * The notifier memory shall be zeroed before this function is called on the
>>> + * notifier.
>>> + *
>>> + * This function may not be called on a registered notifier and may be called on
>>> + * a notifier only once.
>>> + *
>>> + * Do not change the notifier's subdevs array, take references to the subdevs
>>> + * array itself or change the notifier's num_subdevs field. This is because this
>>> + * function allocates and reallocates the subdevs array based on parsing
>>> + * endpoints.
>>> + *
>>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
>>> + * @parse_endpoint is released once the function is finished. If there is a need
>>> + * to retain that configuration, the user needs to allocate memory for it.
>>> + *
>>> + * Any notifier populated using this function must be released with a call to
>>> + * v4l2_async_notifier_release() after it has been unregistered and the async
>>> + * sub-devices are no longer in use, even if the function returned an error.
>>> + *
>>> + * Return: %0 on success, including when no async sub-devices are found
>>> + * %-ENOMEM if memory allocation failed
>>> + * %-EINVAL if graph or endpoint parsing failed
>>> + * Other error codes as returned by @parse_endpoint
>>> + */
>>> +int v4l2_async_notifier_parse_fwnode_endpoints(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd));
>>> +
>>> +/**
>>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
>>> + * endpoints of a port in a
>>> + * device node
>>> + * @dev: the device the endpoints of which are to be parsed
>>> + * @notifier: notifier for @dev
>>> + * @asd_struct_size: size of the driver's async sub-device struct, including
>>> + * sizeof(struct v4l2_async_subdev). The &struct
>>> + * v4l2_async_subdev shall be the first member of
>>> + * the driver's async sub-device struct, i.e. both
>>> + * begin at the same memory address.
>>> + * @port: port number where endpoints are to be parsed
>>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
>>> + * endpoint. Optional.
>>> + * Return: %0 on success
>>> + * %-ENOTCONN if the endpoint is to be skipped but this
>>> + * should not be considered as an error
>>> + * %-EINVAL if the endpoint configuration is invalid
>>> + *
>>> + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
>>> + * the exception that it only parses endpoints in a given port. This is useful
>>> + * on devices that have both sinks and sources: the async sub-devices connected
>>
>> on -> for
>>
>>> + * to sources have already been set up by another driver (on capture devices).
>>
>> on -> for
>
> Agreed on both.
>
>>
>> So if I understand this correctly for devices with both sinks and sources you use
>> this function to just parse the sink ports. And you have to give explicit port
>> numbers since you can't tell from parsing the device tree if a port is a sink or
>> source port, right? Only the driver knows this.
>
> Correct. The graph data structure in DT isn't directed, so this is only
> known by the driver.
I think this should be clarified.
I wonder if there is any way around it. I don't have time to dig into this, but
isn't it possible to tell that the source ports are already configured?
Anyway, that can be looked at later.
Regards,
Hans
>
>>
>>> + *
>>> + * Parse the fwnode endpoints of the @dev device on a given @port and populate
>>> + * the async sub-devices array of the notifier. The @parse_endpoint callback
>>> + * function is called for each endpoint with the corresponding async sub-device
>>> + * pointer to let the caller initialize the driver-specific part of the async
>>> + * sub-device structure.
>>> + *
>>> + * The notifier memory shall be zeroed before this function is called on the
>>> + * notifier the first time.
>>> + *
>>> + * This function may not be called on a registered notifier and may be called on
>>> + * a notifier only once per port.
>>> + *
>>> + * Do not change the notifier's subdevs array, take references to the subdevs
>>> + * array itself or change the notifier's num_subdevs field. This is because this
>>> + * function allocates and reallocates the subdevs array based on parsing
>>> + * endpoints.
>>> + *
>>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
>>> + * @parse_endpoint is released once the function is finished. If there is a need
>>> + * to retain that configuration, the user needs to allocate memory for it.
>>> + *
>>> + * Any notifier populated using this function must be released with a call to
>>> + * v4l2_async_notifier_release() after it has been unregistered and the async
>>> + * sub-devices are no longer in use, even if the function returned an error.
>>> + *
>>> + * Return: %0 on success, including when no async sub-devices are found
>>> + * %-ENOMEM if memory allocation failed
>>> + * %-EINVAL if graph or endpoint parsing failed
>>> + * Other error codes as returned by @parse_endpoint
>>> + */
>>> +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size, unsigned int port,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd));
>>> +
>>> #endif /* _V4L2_FWNODE_H */
>>>
>>
>
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
@ 2017-09-19 8:40 ` Hans Verkuil
0 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 8:40 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh,
laurent.pinchart, devicetree, pavel, sre
On 09/19/2017 10:20 AM, Sakari Ailus wrote:
> Hi Hans,
>
> Thank you for the review.
>
> On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
>> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
>>> Add two functions for parsing devices graph endpoints:
>>> v4l2_async_notifier_parse_fwnode_endpoints and
>>> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
>>> over all endpoints whereas the latter only iterates over the endpoints in
>>> a given port.
>>>
>>> The former is mostly useful for existing drivers that currently implement
>>> the iteration over all the endpoints themselves whereas the latter is
>>> especially intended for devices with both sinks and sources: async
>>> sub-devices for external devices connected to the device's sources will
>>> have already been set up, or they are part of the master device.
>>>
>>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
>>> ---
>>> drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
>>> drivers/media/v4l2-core/v4l2-fwnode.c | 185 ++++++++++++++++++++++++++++++++++
>>> include/media/v4l2-async.h | 24 ++++-
>>> include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
>>> 4 files changed, 354 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
>>> index 831f185ecd47..bf0215dde616 100644
>>> --- a/drivers/media/v4l2-core/v4l2-async.c
>>> +++ b/drivers/media/v4l2-core/v4l2-async.c
>>> @@ -22,6 +22,7 @@
>>>
>>> #include <media/v4l2-async.h>
>>> #include <media/v4l2-device.h>
>>> +#include <media/v4l2-fwnode.h>
>>> #include <media/v4l2-subdev.h>
>>>
>>> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
>>> @@ -219,6 +220,35 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
>>> }
>>> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
>>>
>>> +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
>>> +{
>>> + unsigned int i;
>>> +
>>> + if (!notifier->max_subdevs)
>>> + return;
>>> +
>>> + for (i = 0; i < notifier->num_subdevs; i++) {
>>> + struct v4l2_async_subdev *asd = notifier->subdevs[i];
>>> +
>>> + switch (asd->match_type) {
>>> + case V4L2_ASYNC_MATCH_FWNODE:
>>> + fwnode_handle_put(asd->match.fwnode.fwnode);
>>> + break;
>>> + default:
>>> + WARN_ON_ONCE(true);
>>
>> Please add a break here.
>
> Yes.
>
>>
>>> + }
>>> +
>>> + kfree(asd);
>>> + }
>>> +
>>> + notifier->max_subdevs = 0;
>>> + notifier->num_subdevs = 0;
>>> +
>>> + kvfree(notifier->subdevs);
>>> + notifier->subdevs = NULL;
>>> +}
>>> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_release);
>>> +
>>> int v4l2_async_register_subdev(struct v4l2_subdev *sd)
>>> {
>>> struct v4l2_async_notifier *notifier;
>>> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
>>> index 706f9e7b90f1..44ee35f6aad5 100644
>>> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
>>> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
>>> @@ -19,6 +19,7 @@
>>> */
>>> #include <linux/acpi.h>
>>> #include <linux/kernel.h>
>>> +#include <linux/mm.h>
>>> #include <linux/module.h>
>>> #include <linux/of.h>
>>> #include <linux/property.h>
>>> @@ -26,6 +27,7 @@
>>> #include <linux/string.h>
>>> #include <linux/types.h>
>>>
>>> +#include <media/v4l2-async.h>
>>> #include <media/v4l2-fwnode.h>
>>>
>>> enum v4l2_fwnode_bus_type {
>>> @@ -313,6 +315,189 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
>>> }
>>> EXPORT_SYMBOL_GPL(v4l2_fwnode_put_link);
>>>
>>> +static int v4l2_async_notifier_realloc(struct v4l2_async_notifier *notifier,
>>> + unsigned int max_subdevs)
>>> +{
>>> + struct v4l2_async_subdev **subdevs;
>>> +
>>> + if (max_subdevs <= notifier->max_subdevs)
>>> + return 0;
>>> +
>>> + subdevs = kvmalloc_array(
>>> + max_subdevs, sizeof(*notifier->subdevs),
>>> + GFP_KERNEL | __GFP_ZERO);
>>> + if (!subdevs)
>>> + return -ENOMEM;
>>> +
>>> + if (notifier->subdevs) {
>>> + memcpy(subdevs, notifier->subdevs,
>>> + sizeof(*subdevs) * notifier->num_subdevs);
>>> +
>>> + kvfree(notifier->subdevs);
>>> + }
>>> +
>>> + notifier->subdevs = subdevs;
>>> + notifier->max_subdevs = max_subdevs;
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static int v4l2_async_notifier_fwnode_parse_endpoint(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + struct fwnode_handle *endpoint, unsigned int asd_struct_size,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + struct v4l2_async_subdev *asd;
>>> + struct v4l2_fwnode_endpoint *vep;
>>> + int ret = 0;
>>> +
>>> + asd = kzalloc(asd_struct_size, GFP_KERNEL);
>>> + if (!asd)
>>> + return -ENOMEM;
>>> +
>>> + asd->match.fwnode.fwnode =
>>> + fwnode_graph_get_remote_port_parent(endpoint);
>>> + if (!asd->match.fwnode.fwnode) {
>>> + dev_warn(dev, "bad remote port parent\n");
>>> + ret = -EINVAL;
>>> + goto out_err;
>>> + }
>>> +
>>> + /* Ignore endpoints the parsing of which failed. */
>>> + vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
>>> + if (IS_ERR(vep)) {
>>> + ret = PTR_ERR(vep);
>>> + dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
>>> + ret);
>>> + goto out_err;
>>> + }
>>> +
>>> + ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
>>> + if (ret == -ENOTCONN)
>>> + dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
>>> + vep->base.id);
>>> + else if (ret < 0)
>>> + dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
>>> + vep->base.port, vep->base.id, ret);
>>> + v4l2_fwnode_endpoint_free(vep);
>>> + if (ret < 0)
>>> + goto out_err;
>>> +
>>> + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
>>> + notifier->subdevs[notifier->num_subdevs] = asd;
>>> + notifier->num_subdevs++;
>>> +
>>> + return 0;
>>> +
>>> +out_err:
>>> + fwnode_handle_put(asd->match.fwnode.fwnode);
>>> + kfree(asd);
>>> +
>>> + return ret == -ENOTCONN ? 0 : ret;
>>> +}
>>> +
>>> +static int __v4l2_async_notifier_parse_fwnode_endpoints(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size, unsigned int port, bool has_port,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + struct fwnode_handle *fwnode = NULL;
>>> + unsigned int max_subdevs = notifier->max_subdevs;
>>> + int ret;
>>> +
>>> + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
>>> + return -EINVAL;
>>> +
>>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
>>> + dev_fwnode(dev), fwnode)); ) {
>>
>> You can replace this by:
>>
>> while ((fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), fwnode))) {
>>
>>> + if (!fwnode_device_is_available(
>>> + fwnode_graph_get_port_parent(fwnode)))
>>> + continue;
>>> +
>>> + if (has_port) {
>>> + struct fwnode_endpoint ep;
>>> +
>>> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
>>> + if (ret) {
>>> + fwnode_handle_put(fwnode);
>>> + return ret;
>>> + }
>>> +
>>> + if (ep.port != port)
>>> + continue;
>>> + }
>>> + max_subdevs++;
>>> + }
>>> +
>>> + /* No subdevs to add? Return here. */
>>> + if (max_subdevs == notifier->max_subdevs)
>>> + return 0;
>>> +
>>> + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
>>> + if (ret)
>>> + return ret;
>>> +
>>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
>>> + dev_fwnode(dev), fwnode)); ) {
>>
>> Same here: this can be a 'while'.
>
> The fwnode = NULL assignment still needs to be done. A for loop has a
> natural initialiser for the loop, I think it's cleaner than using while
> here.
After the previous while fwnode is NULL again (since that's when the while
stops).
>
> The macro would be implemented this way as well.
>
> For the loop above this one, I'd use for for consistency: it's the same
> loop after all.
>
> This reminds me --- I'll send the patch for the macro.
If this is going to be replaced by a macro, then disregard my comment.
>
>>
>>> + if (!fwnode_device_is_available(
>>> + fwnode_graph_get_port_parent(fwnode)))
>>> + continue;
>>> +
>>> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
>>> + ret = -EINVAL;
>>> + break;
>>> + }
>>> +
>>> + if (has_port) {
>>> + struct fwnode_endpoint ep;
>>> +
>>> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
>>> + if (ret)
>>> + break;
>>> +
>>> + if (ep.port != port)
>>> + continue;
>>> + }
>>> +
>>> + ret = v4l2_async_notifier_fwnode_parse_endpoint(
>>> + dev, notifier, fwnode, asd_struct_size, parse_endpoint);
>>> + if (ret < 0)
>>> + break;
>>> + }
>>> +
>>> + fwnode_handle_put(fwnode);
>>> +
>>> + return ret;
>>> +}
>>> +
>>> +int v4l2_async_notifier_parse_fwnode_endpoints(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + return __v4l2_async_notifier_parse_fwnode_endpoints(
>>> + dev, notifier, asd_struct_size, 0, false, parse_endpoint);
>>> +}
>>> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
>>> +
>>> +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size, unsigned int port,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd))
>>> +{
>>> + return __v4l2_async_notifier_parse_fwnode_endpoints(
>>> + dev, notifier, asd_struct_size, port, true, parse_endpoint);
>>> +}
>>> +EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
>>> +
>>> 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-async.h b/include/media/v4l2-async.h
>>> index c69d8c8a66d0..96fa1afc00dd 100644
>>> --- a/include/media/v4l2-async.h
>>> +++ b/include/media/v4l2-async.h
>>> @@ -18,7 +18,6 @@ struct device;
>>> struct device_node;
>>> struct v4l2_device;
>>> struct v4l2_subdev;
>>> -struct v4l2_async_notifier;
>>>
>>> /* A random max subdevice number, used to allocate an array on stack */
>>> #define V4L2_MAX_SUBDEVS 128U
>>> @@ -50,6 +49,10 @@ enum v4l2_async_match_type {
>>> * @match: union of per-bus type matching data sets
>>> * @list: used to link struct v4l2_async_subdev objects, waiting to be
>>> * probed, to a notifier->waiting list
>>> + *
>>> + * When this struct is used as a member in a driver specific struct,
>>> + * the driver specific struct shall contain the @struct
>>> + * v4l2_async_subdev as its first member.
>>> */
>>> struct v4l2_async_subdev {
>>> enum v4l2_async_match_type match_type;
>>> @@ -78,7 +81,8 @@ struct v4l2_async_subdev {
>>> /**
>>> * struct v4l2_async_notifier - v4l2_device notifier data
>>> *
>>> - * @num_subdevs: number of subdevices
>>> + * @num_subdevs: number of subdevices used in the subdevs array
>>> + * @max_subdevs: number of subdevices allocated in the subdevs array
>>> * @subdevs: array of pointers to subdevice descriptors
>>> * @v4l2_dev: pointer to struct v4l2_device
>>> * @waiting: list of struct v4l2_async_subdev, waiting for their drivers
>>> @@ -90,6 +94,7 @@ struct v4l2_async_subdev {
>>> */
>>> struct v4l2_async_notifier {
>>> unsigned int num_subdevs;
>>> + unsigned int max_subdevs;
>>> struct v4l2_async_subdev **subdevs;
>>> struct v4l2_device *v4l2_dev;
>>> struct list_head waiting;
>>> @@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
>>> void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier);
>>>
>>> /**
>>> + * v4l2_async_notifier_release - release notifier resources
>>> + * @notifier: the notifier the resources of which are to be released
>>> + *
>>> + * Release memory resources related to a notifier, including the async
>>> + * sub-devices allocated for the purposes of the notifier. The user is
>>> + * responsible for releasing the notifier's resources after calling
>>> + * @v4l2_async_notifier_parse_fwnode_endpoints.
>>> + *
>>> + * There is no harm from calling v4l2_async_notifier_release in other
>>> + * cases as long as its memory has been zeroed after it has been
>>> + * allocated.
>>> + */
>>> +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
>>> +
>>> +/**
>>> * v4l2_async_register_subdev - registers a sub-device to the asynchronous
>>> * subdevice framework
>>> *
>>> diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
>>> index 68eb22ba571b..83afac48ea6b 100644
>>> --- a/include/media/v4l2-fwnode.h
>>> +++ b/include/media/v4l2-fwnode.h
>>> @@ -25,6 +25,8 @@
>>> #include <media/v4l2-mediabus.h>
>>>
>>> struct fwnode_handle;
>>> +struct v4l2_async_notifier;
>>> +struct v4l2_async_subdev;
>>>
>>> #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
>>>
>>> @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle *fwnode,
>>> */
>>> void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
>>>
>>> +/**
>>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
>>> + * device node
>>> + * @dev: the device the endpoints of which are to be parsed
>>> + * @notifier: notifier for @dev
>>> + * @asd_struct_size: size of the driver's async sub-device struct, including
>>> + * sizeof(struct v4l2_async_subdev). The &struct
>>> + * v4l2_async_subdev shall be the first member of
>>> + * the driver's async sub-device struct, i.e. both
>>> + * begin at the same memory address.
>>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
>>> + * endpoint. Optional.
>>> + * Return: %0 on success
>>> + * %-ENOTCONN if the endpoint is to be skipped but this
>>> + * should not be considered as an error
>>> + * %-EINVAL if the endpoint configuration is invalid
>>> + *
>>> + * Parse the fwnode endpoints of the @dev device and populate the async sub-
>>> + * devices array of the notifier. The @parse_endpoint callback function is
>>> + * called for each endpoint with the corresponding async sub-device pointer to
>>> + * let the caller initialize the driver-specific part of the async sub-device
>>> + * structure.
>>> + *
>>> + * The notifier memory shall be zeroed before this function is called on the
>>> + * notifier.
>>> + *
>>> + * This function may not be called on a registered notifier and may be called on
>>> + * a notifier only once.
>>> + *
>>> + * Do not change the notifier's subdevs array, take references to the subdevs
>>> + * array itself or change the notifier's num_subdevs field. This is because this
>>> + * function allocates and reallocates the subdevs array based on parsing
>>> + * endpoints.
>>> + *
>>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
>>> + * @parse_endpoint is released once the function is finished. If there is a need
>>> + * to retain that configuration, the user needs to allocate memory for it.
>>> + *
>>> + * Any notifier populated using this function must be released with a call to
>>> + * v4l2_async_notifier_release() after it has been unregistered and the async
>>> + * sub-devices are no longer in use, even if the function returned an error.
>>> + *
>>> + * Return: %0 on success, including when no async sub-devices are found
>>> + * %-ENOMEM if memory allocation failed
>>> + * %-EINVAL if graph or endpoint parsing failed
>>> + * Other error codes as returned by @parse_endpoint
>>> + */
>>> +int v4l2_async_notifier_parse_fwnode_endpoints(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd));
>>> +
>>> +/**
>>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
>>> + * endpoints of a port in a
>>> + * device node
>>> + * @dev: the device the endpoints of which are to be parsed
>>> + * @notifier: notifier for @dev
>>> + * @asd_struct_size: size of the driver's async sub-device struct, including
>>> + * sizeof(struct v4l2_async_subdev). The &struct
>>> + * v4l2_async_subdev shall be the first member of
>>> + * the driver's async sub-device struct, i.e. both
>>> + * begin at the same memory address.
>>> + * @port: port number where endpoints are to be parsed
>>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
>>> + * endpoint. Optional.
>>> + * Return: %0 on success
>>> + * %-ENOTCONN if the endpoint is to be skipped but this
>>> + * should not be considered as an error
>>> + * %-EINVAL if the endpoint configuration is invalid
>>> + *
>>> + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
>>> + * the exception that it only parses endpoints in a given port. This is useful
>>> + * on devices that have both sinks and sources: the async sub-devices connected
>>
>> on -> for
>>
>>> + * to sources have already been set up by another driver (on capture devices).
>>
>> on -> for
>
> Agreed on both.
>
>>
>> So if I understand this correctly for devices with both sinks and sources you use
>> this function to just parse the sink ports. And you have to give explicit port
>> numbers since you can't tell from parsing the device tree if a port is a sink or
>> source port, right? Only the driver knows this.
>
> Correct. The graph data structure in DT isn't directed, so this is only
> known by the driver.
I think this should be clarified.
I wonder if there is any way around it. I don't have time to dig into this, but
isn't it possible to tell that the source ports are already configured?
Anyway, that can be looked at later.
Regards,
Hans
>
>>
>>> + *
>>> + * Parse the fwnode endpoints of the @dev device on a given @port and populate
>>> + * the async sub-devices array of the notifier. The @parse_endpoint callback
>>> + * function is called for each endpoint with the corresponding async sub-device
>>> + * pointer to let the caller initialize the driver-specific part of the async
>>> + * sub-device structure.
>>> + *
>>> + * The notifier memory shall be zeroed before this function is called on the
>>> + * notifier the first time.
>>> + *
>>> + * This function may not be called on a registered notifier and may be called on
>>> + * a notifier only once per port.
>>> + *
>>> + * Do not change the notifier's subdevs array, take references to the subdevs
>>> + * array itself or change the notifier's num_subdevs field. This is because this
>>> + * function allocates and reallocates the subdevs array based on parsing
>>> + * endpoints.
>>> + *
>>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
>>> + * @parse_endpoint is released once the function is finished. If there is a need
>>> + * to retain that configuration, the user needs to allocate memory for it.
>>> + *
>>> + * Any notifier populated using this function must be released with a call to
>>> + * v4l2_async_notifier_release() after it has been unregistered and the async
>>> + * sub-devices are no longer in use, even if the function returned an error.
>>> + *
>>> + * Return: %0 on success, including when no async sub-devices are found
>>> + * %-ENOMEM if memory allocation failed
>>> + * %-EINVAL if graph or endpoint parsing failed
>>> + * Other error codes as returned by @parse_endpoint
>>> + */
>>> +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>> + size_t asd_struct_size, unsigned int port,
>>> + int (*parse_endpoint)(struct device *dev,
>>> + struct v4l2_fwnode_endpoint *vep,
>>> + struct v4l2_async_subdev *asd));
>>> +
>>> #endif /* _V4L2_FWNODE_H */
>>>
>>
>
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references
2017-09-19 8:31 ` Hans Verkuil
@ 2017-09-19 8:45 ` Sakari Ailus
2017-09-19 9:21 ` Hans Verkuil
0 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 8:45 UTC (permalink / raw)
To: Hans Verkuil
Cc: linux-media, niklas.soderlund, maxime.ripard, robh,
laurent.pinchart, devicetree, pavel, sre
Hi Hans,
Thank you for the review.
On Tue, Sep 19, 2017 at 10:31:41AM +0200, Hans Verkuil wrote:
> Hi Sakari,
>
> I'm slowly starting to understand this. The example helped a lot. But I still have
> some questions, see below.
>
> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> > v4l2_fwnode_reference_parse_int_prop() will find an fwnode such that under
> > the device's own fwnode, it will follow child fwnodes with the given
> > property-value pair and return the resulting fwnode.
>
> I think both the subject, commit log, function comment and function name should
> reflect the fact that this function is for an ACPI reference.
>
> It's only called for ACPI (from patch 19):
>
> + if (props[i].props && is_acpi_node(dev_fwnode(dev)))
> + ret = v4l2_fwnode_reference_parse_int_props(
>
> So renaming it to v4l2_fwnode_acpi_reference_parse_int_props or something similar
> would clarify this fact.
I don't think we'll see many like this one. I presume we won't use it on DT
albeit there are no direct references to ACPI in the code itself.
How about v4l2_fwnode_parse_acpi_reference (+ "s" for the one below)?
>
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> > drivers/media/v4l2-core/v4l2-fwnode.c | 201 ++++++++++++++++++++++++++++++++++
> > 1 file changed, 201 insertions(+)
> >
> > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> > index 65e84ea1cc35..968a345a288f 100644
> > --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> > @@ -567,6 +567,207 @@ static int v4l2_fwnode_reference_parse(
> > return ret;
> > }
> >
> > +/*
> > + * v4l2_fwnode_reference_get_int_prop - parse a reference with integer
> > + * arguments
> > + * @dev: struct device pointer
> > + * @notifier: notifier for @dev
> > + * @prop: the name of the property
> > + * @index: the index of the reference to get
> > + * @props: the array of integer property names
> > + * @nprops: the number of integer property names in @nprops
>
> You mean 'in @props'?
Yes, I'll fix that.
>
> One thing that is not clear to me is when you would use an nprops value > 1.
> What's the use-case for that? It only makes sense (I think) if you would have
> property names that are all aliases of one another.
There may be several flash LEDs related to a sensor. That's the use case,
for instance.
>
> > + *
> > + * Find fwnodes referred to by a property @prop, then under that
> > + * iteratively, @nprops times, follow each child node which has a
> > + * property in @props array at a given child index the value of which
> > + * matches the integer argument at an index.
> > + *
> > + * For example, if this function was called with arguments and values
> > + * @dev corresponding to device "SEN", @prop == "flash-leds", @index
> > + * == 1, @props == { "led" }, @nprops == 1, with the ASL snippet below
> > + * it would return the node marked with THISONE. The @dev argument in
> > + * the ASL below.
>
> That last sentence about the @dev seems incomplete. I'm not sure what is
> meant by it.
I think it was meant to convey some information but it got added to the
previous sentence. I'll remove it.
>
> > + *
> > + * Device (LED)
> > + * {
> > + * Name (_DSD, Package () {
> > + * ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
> > + * Package () {
> > + * Package () { "led0", "LED0" },
> > + * Package () { "led1", "LED1" },
> > + * }
> > + * })
> > + * Name (LED0, Package () {
> > + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> > + * Package () {
> > + * Package () { "led", 0 },
> > + * }
> > + * })
> > + * Name (LED1, Package () {
> > + * // THISONE
> > + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> > + * Package () {
> > + * Package () { "led", 1 },
> > + * }
> > + * })
> > + * }
> > + *
> > + * Device (SEN)
> > + * {
> > + * Name (_DSD, Package () {
> > + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> > + * Package () {
> > + * Package () {
> > + * "flash-leds",
> > + * Package () { ^LED, 0, ^LED, 1 },
> > + * }
> > + * }
> > + * })
> > + * }
> > + *
> > + * where
> > + *
> > + * LED LED driver device
> > + * LED0 First LED
> > + * LED1 Second LED
> > + * SEN Camera sensor device (or another device the LED is
> > + * related to)
> > + *
> > + * Return: 0 on success
> > + * -ENOENT if no entries (or the property itself) were found
> > + * -EINVAL if property parsing otherwise failed
> > + * -ENOMEM if memory allocation failed
> > + */
> > +static struct fwnode_handle *v4l2_fwnode_reference_get_int_prop(
> > + struct fwnode_handle *fwnode, const char *prop, unsigned int index,
> > + const char **props, unsigned int nprops)
> > +{
> > + struct fwnode_reference_args fwnode_args;
> > + unsigned int *args = fwnode_args.args;
> > + struct fwnode_handle *child;
> > + int ret;
> > +
> > + /*
> > + * Obtain remote fwnode as well as the integer arguments.
> > + *
> > + * Note that right now both -ENODATA and -ENOENT may signal
> > + * out-of-bounds access. Return -ENOENT in that case.
> > + */
> > + ret = fwnode_property_get_reference_args(fwnode, prop, NULL, nprops,
> > + index, &fwnode_args);
> > + if (ret)
> > + return ERR_PTR(ret == -ENODATA ? -ENOENT : ret);
> > +
> > + /*
> > + * Find a node in the tree under the referred fwnode corresponding the
> > + * integer arguments.
> > + */
> > + fwnode = fwnode_args.fwnode;
>
> So given the example above, fwnode would point to the LED device?
>
> If correct, then mention that in the comment.
It could be a LED driver device, but it could be something else as well.
Like a lens VCM, depending on the property being parsed. That's why I
didn't put it in the comments. But this is a device node, not a
hierarchical data extension node, for instance. That's what I think I
should add.
>
> > + while (nprops--) {
> > + u32 val;
> > +
> > + /* Loop over all child nodes under fwnode. */
>
> And here you check if the LED device has child nodes that have a *props
> property with a value matching the index.
>
> So given the example above it is looking for a child with property "led"
> and value 1.
>
> It's useful if that is mentioned in the comment as well.
But should I? This isn't specific to LEDs.
>
> > + fwnode_for_each_child_node(fwnode, child) {
> > + if (fwnode_property_read_u32(child, *props, &val))
> > + continue;
> > +
> > + /* Found property, see if its value matches. */
> > + if (val == *args)
> > + break;
> > + }
> > +
> > + fwnode_handle_put(fwnode);
> > +
> > + /* No property found; return an error here. */
> > + if (!child) {
> > + fwnode = ERR_PTR(-ENOENT);
> > + break;
> > + }
> > +
> > + props++;
> > + args++;
> > + fwnode = child;
> > + }
> > +
> > + return fwnode;
> > +}
> > +
> > +/*
> > + * v4l2_fwnode_reference_parse_int_props - parse references for async sub-devices
> > + * @dev: struct device pointer
> > + * @notifier: notifier for @dev
> > + * @prop: the name of the property
> > + * @props: the array of integer property names
> > + * @nprops: the number of integer properties
> > + *
> > + * Use v4l2_fwnode_reference_get_int_prop to find fwnodes through reference in
> > + * property @prop with integer arguments with child nodes matching in properties
> > + * @props. Then, set up V4L2 async sub-devices for those fwnodes in the notifier
> > + * accordingly.
> > + *
> > + * While it is technically possible to use this function on DT, it is only
> > + * meaningful on ACPI. On Device tree you can refer to any node in the tree but
> > + * on ACPI the references are limited to devices.
> > + *
> > + * Return: 0 on success
> > + * -ENOENT if no entries (or the property itself) were found
> > + * -EINVAL if property parsing otherwisefailed
> > + * -ENOMEM if memory allocation failed
> > + */
> > +static int v4l2_fwnode_reference_parse_int_props(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + const char *prop, const char **props, unsigned int nprops)
> > +{
> > + struct fwnode_handle *fwnode;
> > + unsigned int index;
> > + int ret;
> > +
> > + for (index = 0; !IS_ERR((fwnode = v4l2_fwnode_reference_get_int_prop(
> > + dev_fwnode(dev), prop, index, props,
> > + nprops))); index++)
> > + fwnode_handle_put(fwnode);
> > +
> > + /*
> > + * Note that right now both -ENODATA and -ENOENT may signal
> > + * out-of-bounds access. Return the error in cases other than that.
> > + */
> > + if (PTR_ERR(fwnode) != -ENOENT && PTR_ERR(fwnode) != -ENODATA)
> > + return PTR_ERR(fwnode);
> > +
> > + ret = v4l2_async_notifier_realloc(notifier,
> > + notifier->num_subdevs + index);
> > + if (ret)
> > + return -ENOMEM;
> > +
> > + for (index = 0; !IS_ERR((fwnode = v4l2_fwnode_reference_get_int_prop(
> > + dev_fwnode(dev), prop, index, props,
> > + nprops))); index++) {
> > + struct v4l2_async_subdev *asd;
> > +
> > + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> > + ret = -EINVAL;
> > + goto error;
> > + }
> > +
> > + asd = kzalloc(sizeof(struct v4l2_async_subdev), GFP_KERNEL);
> > + if (!asd) {
> > + ret = -ENOMEM;
> > + goto error;
> > + }
> > +
> > + notifier->subdevs[notifier->num_subdevs] = asd;
> > + asd->match.fwnode.fwnode = fwnode;
> > + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
> > + notifier->num_subdevs++;
> > + }
> > +
> > + return PTR_ERR(fwnode) == -ENOENT ? 0 : PTR_ERR(fwnode);
> > +
> > +error:
> > + fwnode_handle_put(fwnode);
> > + return ret;
> > +}
> > +
> > MODULE_LICENSE("GPL");
> > MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
> > MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
--
Kind regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references
2017-09-19 8:45 ` Sakari Ailus
@ 2017-09-19 9:21 ` Hans Verkuil
[not found] ` <09f8ce37-c6e0-e448-c773-e1f3510d1024-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
0 siblings, 1 reply; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 9:21 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh,
laurent.pinchart, devicetree, pavel, sre
On 09/19/17 10:45, Sakari Ailus wrote:
> Hi Hans,
>
> Thank you for the review.
>
> On Tue, Sep 19, 2017 at 10:31:41AM +0200, Hans Verkuil wrote:
>> Hi Sakari,
>>
>> I'm slowly starting to understand this. The example helped a lot. But I still have
>> some questions, see below.
>>
>> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
>>> v4l2_fwnode_reference_parse_int_prop() will find an fwnode such that under
>>> the device's own fwnode, it will follow child fwnodes with the given
>>> property-value pair and return the resulting fwnode.
>>
>> I think both the subject, commit log, function comment and function name should
>> reflect the fact that this function is for an ACPI reference.
>>
>> It's only called for ACPI (from patch 19):
>>
>> + if (props[i].props && is_acpi_node(dev_fwnode(dev)))
>> + ret = v4l2_fwnode_reference_parse_int_props(
>>
>> So renaming it to v4l2_fwnode_acpi_reference_parse_int_props or something similar
>> would clarify this fact.
>
> I don't think we'll see many like this one. I presume we won't use it on DT
> albeit there are no direct references to ACPI in the code itself.
>
> How about v4l2_fwnode_parse_acpi_reference (+ "s" for the one below)?
Sounds good.
>
>>
>>>
>>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
>>> ---
>>> drivers/media/v4l2-core/v4l2-fwnode.c | 201 ++++++++++++++++++++++++++++++++++
>>> 1 file changed, 201 insertions(+)
>>>
>>> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
>>> index 65e84ea1cc35..968a345a288f 100644
>>> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
>>> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
>>> @@ -567,6 +567,207 @@ static int v4l2_fwnode_reference_parse(
>>> return ret;
>>> }
>>>
>>> +/*
>>> + * v4l2_fwnode_reference_get_int_prop - parse a reference with integer
>>> + * arguments
>>> + * @dev: struct device pointer
>>> + * @notifier: notifier for @dev
>>> + * @prop: the name of the property
>>> + * @index: the index of the reference to get
>>> + * @props: the array of integer property names
>>> + * @nprops: the number of integer property names in @nprops
>>
>> You mean 'in @props'?
>
> Yes, I'll fix that.
>
>>
>> One thing that is not clear to me is when you would use an nprops value > 1.
>> What's the use-case for that? It only makes sense (I think) if you would have
>> property names that are all aliases of one another.
>
> There may be several flash LEDs related to a sensor. That's the use case,
> for instance.
I think it would be helpful if the example shows two LEDs related to a
sensor. Part of the problem I have in understanding this code is that I
have zero experience with ACPI (and that is probably true for most other
developers), so I don't know how this is encoded. With a good example it
is much easier to understand.
>
>>
>>> + *
>>> + * Find fwnodes referred to by a property @prop, then under that
>>> + * iteratively, @nprops times, follow each child node which has a
>>> + * property in @props array at a given child index the value of which
>>> + * matches the integer argument at an index.
>>> + *
>>> + * For example, if this function was called with arguments and values
>>> + * @dev corresponding to device "SEN", @prop == "flash-leds", @index
>>> + * == 1, @props == { "led" }, @nprops == 1, with the ASL snippet below
>>> + * it would return the node marked with THISONE. The @dev argument in
>>> + * the ASL below.
>>
>> That last sentence about the @dev seems incomplete. I'm not sure what is
>> meant by it.
>
> I think it was meant to convey some information but it got added to the
> previous sentence. I'll remove it.
>
>>
>>> + *
>>> + * Device (LED)
>>> + * {
>>> + * Name (_DSD, Package () {
>>> + * ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
>>> + * Package () {
>>> + * Package () { "led0", "LED0" },
>>> + * Package () { "led1", "LED1" },
>>> + * }
>>> + * })
>>> + * Name (LED0, Package () {
>>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
>>> + * Package () {
>>> + * Package () { "led", 0 },
>>> + * }
>>> + * })
>>> + * Name (LED1, Package () {
>>> + * // THISONE
>>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
>>> + * Package () {
>>> + * Package () { "led", 1 },
>>> + * }
>>> + * })
>>> + * }
>>> + *
>>> + * Device (SEN)
>>> + * {
>>> + * Name (_DSD, Package () {
>>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
>>> + * Package () {
>>> + * Package () {
>>> + * "flash-leds",
>>> + * Package () { ^LED, 0, ^LED, 1 },
>>> + * }
>>> + * }
>>> + * })
>>> + * }
>>> + *
>>> + * where
>>> + *
>>> + * LED LED driver device
>>> + * LED0 First LED
>>> + * LED1 Second LED
>>> + * SEN Camera sensor device (or another device the LED is
>>> + * related to)
>>> + *
>>> + * Return: 0 on success
>>> + * -ENOENT if no entries (or the property itself) were found
>>> + * -EINVAL if property parsing otherwise failed
>>> + * -ENOMEM if memory allocation failed
>>> + */
>>> +static struct fwnode_handle *v4l2_fwnode_reference_get_int_prop(
>>> + struct fwnode_handle *fwnode, const char *prop, unsigned int index,
>>> + const char **props, unsigned int nprops)
>>> +{
>>> + struct fwnode_reference_args fwnode_args;
>>> + unsigned int *args = fwnode_args.args;
>>> + struct fwnode_handle *child;
>>> + int ret;
>>> +
>>> + /*
>>> + * Obtain remote fwnode as well as the integer arguments.
>>> + *
>>> + * Note that right now both -ENODATA and -ENOENT may signal
>>> + * out-of-bounds access. Return -ENOENT in that case.
>>> + */
>>> + ret = fwnode_property_get_reference_args(fwnode, prop, NULL, nprops,
>>> + index, &fwnode_args);
>>> + if (ret)
>>> + return ERR_PTR(ret == -ENODATA ? -ENOENT : ret);
>>> +
>>> + /*
>>> + * Find a node in the tree under the referred fwnode corresponding the
>>> + * integer arguments.
>>> + */
>>> + fwnode = fwnode_args.fwnode;
>>
>> So given the example above, fwnode would point to the LED device?
>>
>> If correct, then mention that in the comment.
>
> It could be a LED driver device, but it could be something else as well.
> Like a lens VCM, depending on the property being parsed. That's why I
> didn't put it in the comments. But this is a device node, not a
> hierarchical data extension node, for instance. That's what I think I
> should add.
I think that will help.
>
>>
>>> + while (nprops--) {
>>> + u32 val;
>>> +
>>> + /* Loop over all child nodes under fwnode. */
>>
>> And here you check if the LED device has child nodes that have a *props
>> property with a value matching the index.
>>
>> So given the example above it is looking for a child with property "led"
>> and value 1.
>>
>> It's useful if that is mentioned in the comment as well.
>
> But should I? This isn't specific to LEDs.
Ignore this comment for now. I'll take another look when I see v14.
Regards,
Hans
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 02/25] v4l: async: Remove re-probing support
2017-09-15 14:17 ` [PATCH v13 02/25] v4l: async: Remove re-probing support Sakari Ailus
@ 2017-09-19 9:21 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 9:21 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A, Michael Turquette
Hi Sakari,
(CC'ing Mike Turquette)
Thank you for the patch.
On Friday, 15 September 2017 17:17:01 EEST Sakari Ailus wrote:
> Remove V4L2 async re-probing support. The re-probing support has been
> there to support cases where the sub-devices require resources provided by
> the main driver's hardware to function, such as clocks.
>
> Reprobing has allowed unbinding and again binding the main driver without
> explicilty unbinding the sub-device drivers. This is certainly not a
> common need, and the responsibility will be the user's going forward.
>
> An alternative could have been to introduce notifier specific locks.
> Considering the complexity of the re-probing and that it isn't really a
> solution to a problem but a workaround, remove re-probing instead.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
As stated before we need a plan to fix the issue that reprobind was supposed
to address.
To my knowledge the only intended user of the reprobind code was the OMAP3 ISP
when it provides a clock to the sensor. I've briefly discussed this with Mike
last week, and he believed we could handle the issue by "un-orphaning" the
orphaned clock when the OMAP3 ISP is reprobed. Mike, have you had time to
check whether that would be feasible without too much effort and/or pain ?
In the meantime, for this patch,
Acked-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 54 --------------------------------
> 1 file changed, 54 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index d741a8e0fdac..e109d9da4653
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -198,78 +198,24 @@ EXPORT_SYMBOL(v4l2_async_notifier_register);
> 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);
> - struct device **dev;
> - int i = 0;
>
> if (!notifier->v4l2_dev)
> return;
>
> - dev = kvmalloc_array(n_subdev, sizeof(*dev), GFP_KERNEL);
> - if (!dev) {
> - dev_err(notifier->v4l2_dev->dev,
> - "Failed to allocate device cache!\n");
> - }
> -
> mutex_lock(&list_lock);
>
> list_del(¬ifier->list);
>
> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> - struct device *d;
> -
> - d = get_device(sd->dev);
> -
> v4l2_async_cleanup(sd);
>
> - /* If we handled USB devices, we'd have to lock the parent too */
> - device_release_driver(d);
> -
> if (notifier->unbind)
> notifier->unbind(notifier, sd, sd->asd);
> -
> - /*
> - * Store device at the device cache, in order to call
> - * put_device() on the final step
> - */
> - if (dev)
> - dev[i++] = d;
> - else
> - put_device(d);
> }
>
> mutex_unlock(&list_lock);
>
> - /*
> - * Call device_attach() to reprobe devices
> - *
> - * NOTE: If dev allocation fails, i is 0, and the whole loop won't be
> - * executed.
> - */
> - while (i--) {
> - struct device *d = dev[i];
> -
> - if (d && device_attach(d) < 0) {
> - const char *name = "(none)";
> - int lock = device_trylock(d);
> -
> - if (lock && d->driver)
> - name = d->driver->name;
> - dev_err(d, "Failed to re-probe to %s\n", name);
> - if (lock)
> - device_unlock(d);
> - }
> - put_device(d);
> - }
> - kvfree(dev);
> -
> notifier->v4l2_dev = NULL;
> -
> - /*
> - * Don't care about the waiting list, it is initialised and populated
> - * upon notifier registration.
> - */
> }
> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 02/25] v4l: async: Remove re-probing support
@ 2017-09-19 9:21 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 9:21 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre, Michael Turquette
Hi Sakari,
(CC'ing Mike Turquette)
Thank you for the patch.
On Friday, 15 September 2017 17:17:01 EEST Sakari Ailus wrote:
> Remove V4L2 async re-probing support. The re-probing support has been
> there to support cases where the sub-devices require resources provided by
> the main driver's hardware to function, such as clocks.
>
> Reprobing has allowed unbinding and again binding the main driver without
> explicilty unbinding the sub-device drivers. This is certainly not a
> common need, and the responsibility will be the user's going forward.
>
> An alternative could have been to introduce notifier specific locks.
> Considering the complexity of the re-probing and that it isn't really a
> solution to a problem but a workaround, remove re-probing instead.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
As stated before we need a plan to fix the issue that reprobind was supposed
to address.
To my knowledge the only intended user of the reprobind code was the OMAP3 ISP
when it provides a clock to the sensor. I've briefly discussed this with Mike
last week, and he believed we could handle the issue by "un-orphaning" the
orphaned clock when the OMAP3 ISP is reprobed. Mike, have you had time to
check whether that would be feasible without too much effort and/or pain ?
In the meantime, for this patch,
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 54 --------------------------------
> 1 file changed, 54 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index d741a8e0fdac..e109d9da4653
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -198,78 +198,24 @@ EXPORT_SYMBOL(v4l2_async_notifier_register);
> 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);
> - struct device **dev;
> - int i = 0;
>
> if (!notifier->v4l2_dev)
> return;
>
> - dev = kvmalloc_array(n_subdev, sizeof(*dev), GFP_KERNEL);
> - if (!dev) {
> - dev_err(notifier->v4l2_dev->dev,
> - "Failed to allocate device cache!\n");
> - }
> -
> mutex_lock(&list_lock);
>
> list_del(¬ifier->list);
>
> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> - struct device *d;
> -
> - d = get_device(sd->dev);
> -
> v4l2_async_cleanup(sd);
>
> - /* If we handled USB devices, we'd have to lock the parent too */
> - device_release_driver(d);
> -
> if (notifier->unbind)
> notifier->unbind(notifier, sd, sd->asd);
> -
> - /*
> - * Store device at the device cache, in order to call
> - * put_device() on the final step
> - */
> - if (dev)
> - dev[i++] = d;
> - else
> - put_device(d);
> }
>
> mutex_unlock(&list_lock);
>
> - /*
> - * Call device_attach() to reprobe devices
> - *
> - * NOTE: If dev allocation fails, i is 0, and the whole loop won't be
> - * executed.
> - */
> - while (i--) {
> - struct device *d = dev[i];
> -
> - if (d && device_attach(d) < 0) {
> - const char *name = "(none)";
> - int lock = device_trylock(d);
> -
> - if (lock && d->driver)
> - name = d->driver->name;
> - dev_err(d, "Failed to re-probe to %s\n", name);
> - if (lock)
> - device_unlock(d);
> - }
> - put_device(d);
> - }
> - kvfree(dev);
> -
> notifier->v4l2_dev = NULL;
> -
> - /*
> - * Don't care about the waiting list, it is initialised and populated
> - * upon notifier registration.
> - */
> }
> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 8:40 ` Hans Verkuil
@ 2017-09-19 9:30 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 9:30 UTC (permalink / raw)
To: Hans Verkuil
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA,
pavel-+ZI9xUNit7I, sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Hans,
On Tuesday, 19 September 2017 11:40:14 EEST Hans Verkuil wrote:
> On 09/19/2017 10:20 AM, Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
> >> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> >>> Add two functions for parsing devices graph endpoints:
> >>> v4l2_async_notifier_parse_fwnode_endpoints and
> >>> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> >>> over all endpoints whereas the latter only iterates over the endpoints
> >>> in a given port.
> >>>
> >>> The former is mostly useful for existing drivers that currently
> >>> implement the iteration over all the endpoints themselves whereas the
> >>> latter is especially intended for devices with both sinks and sources:
> >>> async sub-devices for external devices connected to the device's sources
> >>> will have already been set up, or they are part of the master device.
> >>>
> >>> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> >>> ---
> >>>
> >>> drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
> >>> drivers/media/v4l2-core/v4l2-fwnode.c | 185 +++++++++++++++++++++++++++
> >>> include/media/v4l2-async.h | 24 ++++-
> >>> include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
> >>> 4 files changed, 354 insertions(+), 2 deletions(-)
[snip]
> >>> diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
> >>> index 68eb22ba571b..83afac48ea6b 100644
> >>> --- a/include/media/v4l2-fwnode.h
> >>> +++ b/include/media/v4l2-fwnode.h
> >>> @@ -25,6 +25,8 @@
> >>>
> >>> #include <media/v4l2-mediabus.h>
> >>>
> >>> struct fwnode_handle;
> >>> +struct v4l2_async_notifier;
> >>> +struct v4l2_async_subdev;
> >>>
> >>> #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
> >>>
> >>> @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle
> >>> *fwnode,
> >>> */
> >>> void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
> >>>
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode
> >>> endpoints in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct,
> >>> including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2
> >>> fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * Parse the fwnode endpoints of the @dev device and populate the async
> >>> sub-
> >>> + * devices array of the notifier. The @parse_endpoint callback function
> >>> is
> >>> + * called for each endpoint with the corresponding async sub-device
> >>> pointer to
> >>> + * let the caller initialize the driver-specific part of the async sub-
> >>> device
> >>> + * structure.
> >>> + *
> >>> + * The notifier memory shall be zeroed before this function is called
> >>> on the
> >>> + * notifier.
> >>> + *
> >>> + * This function may not be called on a registered notifier and may be
> >>> called on
> >>> + * a notifier only once.
> >>> + *
> >>> + * Do not change the notifier's subdevs array, take references to the
> >>> subdevs
> >>> + * array itself or change the notifier's num_subdevs field. This is
> >>> because this
> >>> + * function allocates and reallocates the subdevs array based on
> >>> parsing
> >>> + * endpoints.
> >>> + *
> >>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> >>> + * @parse_endpoint is released once the function is finished. If there
> >>> is a need
> >>> + * to retain that configuration, the user needs to allocate memory for
> >>> it.
> >>> + *
> >>> + * Any notifier populated using this function must be released with a
> >>> call to
> >>> + * v4l2_async_notifier_release() after it has been unregistered and the
> >>> async
> >>> + * sub-devices are no longer in use, even if the function returned an
> >>> error.
> >>> + *
> >>> + * Return: %0 on success, including when no async sub-devices are found
> >>> + * %-ENOMEM if memory allocation failed
> >>> + * %-EINVAL if graph or endpoint parsing failed
> >>> + * Other error codes as returned by @parse_endpoint
> >>> + */
> >>> +int v4l2_async_notifier_parse_fwnode_endpoints(
> >>> + struct device *dev, struct v4l2_async_notifier *notifier,
> >>> + size_t asd_struct_size,
> >>> + int (*parse_endpoint)(struct device *dev,
> >>> + struct v4l2_fwnode_endpoint *vep,
> >>> + struct v4l2_async_subdev *asd));
> >>> +
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2
> >>> fwnode
> >>> + * endpoints of a port in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct,
> >>> including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @port: port number where endpoints are to be parsed
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2
> >>> fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * This function is just like
> >>> @v4l2_async_notifier_parse_fwnode_endpoints with
> >>> + * the exception that it only parses endpoints in a given port. This is
> >>> useful
> >>> + * on devices that have both sinks and sources: the async sub-devices
> >>> connected
> >>
> >> on -> for
> >>
> >>> + * to sources have already been set up by another driver (on capture
> >>> devices).
> >>
> >> on -> for
> >
> > Agreed on both.
> >
> >> So if I understand this correctly for devices with both sinks and sources
> >> you use this function to just parse the sink ports. And you have to give
> >> explicit port numbers since you can't tell from parsing the device tree
> >> if a port is a sink or source port, right? Only the driver knows this.
> >
> > Correct. The graph data structure in DT isn't directed, so this is only
> > known by the driver.
>
> I think this should be clarified.
>
> I wonder if there is any way around it. I don't have time to dig into this,
> but isn't it possible to tell that the source ports are already configured?
Please also note that it's not always source ports, it depends in which
direction we want to traverse the graph. The usual way is from master to
slave, so from source to sink for capture devices but from sink to source for
output devices.
It's a bit of a mess, and this is part of the reason why I don't think sub-
notifiers are the best idea. It would be better in my opinion to maintain a
single list of async matches, which would be gradually enriched by subdevices
as they are probed. This would help detecting and handling duplicates.
> Anyway, that can be looked at later.
[snip]
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
@ 2017-09-19 9:30 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 9:30 UTC (permalink / raw)
To: Hans Verkuil
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
devicetree, pavel, sre
Hi Hans,
On Tuesday, 19 September 2017 11:40:14 EEST Hans Verkuil wrote:
> On 09/19/2017 10:20 AM, Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
> >> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> >>> Add two functions for parsing devices graph endpoints:
> >>> v4l2_async_notifier_parse_fwnode_endpoints and
> >>> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> >>> over all endpoints whereas the latter only iterates over the endpoints
> >>> in a given port.
> >>>
> >>> The former is mostly useful for existing drivers that currently
> >>> implement the iteration over all the endpoints themselves whereas the
> >>> latter is especially intended for devices with both sinks and sources:
> >>> async sub-devices for external devices connected to the device's sources
> >>> will have already been set up, or they are part of the master device.
> >>>
> >>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >>> ---
> >>>
> >>> drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
> >>> drivers/media/v4l2-core/v4l2-fwnode.c | 185 +++++++++++++++++++++++++++
> >>> include/media/v4l2-async.h | 24 ++++-
> >>> include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
> >>> 4 files changed, 354 insertions(+), 2 deletions(-)
[snip]
> >>> diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
> >>> index 68eb22ba571b..83afac48ea6b 100644
> >>> --- a/include/media/v4l2-fwnode.h
> >>> +++ b/include/media/v4l2-fwnode.h
> >>> @@ -25,6 +25,8 @@
> >>>
> >>> #include <media/v4l2-mediabus.h>
> >>>
> >>> struct fwnode_handle;
> >>> +struct v4l2_async_notifier;
> >>> +struct v4l2_async_subdev;
> >>>
> >>> #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
> >>>
> >>> @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle
> >>> *fwnode,
> >>> */
> >>> void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
> >>>
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode
> >>> endpoints in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct,
> >>> including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2
> >>> fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * Parse the fwnode endpoints of the @dev device and populate the async
> >>> sub-
> >>> + * devices array of the notifier. The @parse_endpoint callback function
> >>> is
> >>> + * called for each endpoint with the corresponding async sub-device
> >>> pointer to
> >>> + * let the caller initialize the driver-specific part of the async sub-
> >>> device
> >>> + * structure.
> >>> + *
> >>> + * The notifier memory shall be zeroed before this function is called
> >>> on the
> >>> + * notifier.
> >>> + *
> >>> + * This function may not be called on a registered notifier and may be
> >>> called on
> >>> + * a notifier only once.
> >>> + *
> >>> + * Do not change the notifier's subdevs array, take references to the
> >>> subdevs
> >>> + * array itself or change the notifier's num_subdevs field. This is
> >>> because this
> >>> + * function allocates and reallocates the subdevs array based on
> >>> parsing
> >>> + * endpoints.
> >>> + *
> >>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> >>> + * @parse_endpoint is released once the function is finished. If there
> >>> is a need
> >>> + * to retain that configuration, the user needs to allocate memory for
> >>> it.
> >>> + *
> >>> + * Any notifier populated using this function must be released with a
> >>> call to
> >>> + * v4l2_async_notifier_release() after it has been unregistered and the
> >>> async
> >>> + * sub-devices are no longer in use, even if the function returned an
> >>> error.
> >>> + *
> >>> + * Return: %0 on success, including when no async sub-devices are found
> >>> + * %-ENOMEM if memory allocation failed
> >>> + * %-EINVAL if graph or endpoint parsing failed
> >>> + * Other error codes as returned by @parse_endpoint
> >>> + */
> >>> +int v4l2_async_notifier_parse_fwnode_endpoints(
> >>> + struct device *dev, struct v4l2_async_notifier *notifier,
> >>> + size_t asd_struct_size,
> >>> + int (*parse_endpoint)(struct device *dev,
> >>> + struct v4l2_fwnode_endpoint *vep,
> >>> + struct v4l2_async_subdev *asd));
> >>> +
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2
> >>> fwnode
> >>> + * endpoints of a port in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct,
> >>> including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @port: port number where endpoints are to be parsed
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2
> >>> fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * This function is just like
> >>> @v4l2_async_notifier_parse_fwnode_endpoints with
> >>> + * the exception that it only parses endpoints in a given port. This is
> >>> useful
> >>> + * on devices that have both sinks and sources: the async sub-devices
> >>> connected
> >>
> >> on -> for
> >>
> >>> + * to sources have already been set up by another driver (on capture
> >>> devices).
> >>
> >> on -> for
> >
> > Agreed on both.
> >
> >> So if I understand this correctly for devices with both sinks and sources
> >> you use this function to just parse the sink ports. And you have to give
> >> explicit port numbers since you can't tell from parsing the device tree
> >> if a port is a sink or source port, right? Only the driver knows this.
> >
> > Correct. The graph data structure in DT isn't directed, so this is only
> > known by the driver.
>
> I think this should be clarified.
>
> I wonder if there is any way around it. I don't have time to dig into this,
> but isn't it possible to tell that the source ports are already configured?
Please also note that it's not always source ports, it depends in which
direction we want to traverse the graph. The usual way is from master to
slave, so from source to sink for capture devices but from sink to source for
output devices.
It's a bit of a mess, and this is part of the reason why I don't think sub-
notifiers are the best idea. It would be better in my opinion to maintain a
single list of async matches, which would be gradually enriched by subdevices
as they are probed. This would help detecting and handling duplicates.
> Anyway, that can be looked at later.
[snip]
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 8:40 ` Hans Verkuil
@ 2017-09-19 10:00 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 10:00 UTC (permalink / raw)
To: Hans Verkuil
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Hans,
On Tue, Sep 19, 2017 at 10:40:14AM +0200, Hans Verkuil wrote:
> On 09/19/2017 10:20 AM, Sakari Ailus wrote:
> > Hi Hans,
> >
> > Thank you for the review.
> >
> > On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
> >> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
...
> >>> +static int __v4l2_async_notifier_parse_fwnode_endpoints(
> >>> + struct device *dev, struct v4l2_async_notifier *notifier,
> >>> + size_t asd_struct_size, unsigned int port, bool has_port,
> >>> + int (*parse_endpoint)(struct device *dev,
> >>> + struct v4l2_fwnode_endpoint *vep,
> >>> + struct v4l2_async_subdev *asd))
> >>> +{
> >>> + struct fwnode_handle *fwnode = NULL;
> >>> + unsigned int max_subdevs = notifier->max_subdevs;
> >>> + int ret;
> >>> +
> >>> + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
> >>> + return -EINVAL;
> >>> +
> >>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> >>> + dev_fwnode(dev), fwnode)); ) {
> >>
> >> You can replace this by:
> >>
> >> while ((fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), fwnode))) {
> >>
> >>> + if (!fwnode_device_is_available(
> >>> + fwnode_graph_get_port_parent(fwnode)))
> >>> + continue;
> >>> +
> >>> + if (has_port) {
> >>> + struct fwnode_endpoint ep;
> >>> +
> >>> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> >>> + if (ret) {
> >>> + fwnode_handle_put(fwnode);
> >>> + return ret;
> >>> + }
> >>> +
> >>> + if (ep.port != port)
> >>> + continue;
> >>> + }
> >>> + max_subdevs++;
> >>> + }
> >>> +
> >>> + /* No subdevs to add? Return here. */
> >>> + if (max_subdevs == notifier->max_subdevs)
> >>> + return 0;
> >>> +
> >>> + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
> >>> + if (ret)
> >>> + return ret;
> >>> +
> >>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> >>> + dev_fwnode(dev), fwnode)); ) {
> >>
> >> Same here: this can be a 'while'.
> >
> > The fwnode = NULL assignment still needs to be done. A for loop has a
> > natural initialiser for the loop, I think it's cleaner than using while
> > here.
>
> After the previous while fwnode is NULL again (since that's when the while
> stops).
>
> >
> > The macro would be implemented this way as well.
> >
> > For the loop above this one, I'd use for for consistency: it's the same
> > loop after all.
> >
> > This reminds me --- I'll send the patch for the macro.
>
> If this is going to be replaced by a macro, then disregard my comment.
Yes. I just sent that to linux-acpi (as well as devicetree and to you).
...
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct, including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * Parse the fwnode endpoints of the @dev device and populate the async sub-
> >>> + * devices array of the notifier. The @parse_endpoint callback function is
> >>> + * called for each endpoint with the corresponding async sub-device pointer to
> >>> + * let the caller initialize the driver-specific part of the async sub-device
> >>> + * structure.
> >>> + *
> >>> + * The notifier memory shall be zeroed before this function is called on the
> >>> + * notifier.
> >>> + *
> >>> + * This function may not be called on a registered notifier and may be called on
> >>> + * a notifier only once.
> >>> + *
> >>> + * Do not change the notifier's subdevs array, take references to the subdevs
> >>> + * array itself or change the notifier's num_subdevs field. This is because this
> >>> + * function allocates and reallocates the subdevs array based on parsing
> >>> + * endpoints.
> >>> + *
> >>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> >>> + * @parse_endpoint is released once the function is finished. If there is a need
> >>> + * to retain that configuration, the user needs to allocate memory for it.
> >>> + *
> >>> + * Any notifier populated using this function must be released with a call to
> >>> + * v4l2_async_notifier_release() after it has been unregistered and the async
> >>> + * sub-devices are no longer in use, even if the function returned an error.
> >>> + *
> >>> + * Return: %0 on success, including when no async sub-devices are found
> >>> + * %-ENOMEM if memory allocation failed
> >>> + * %-EINVAL if graph or endpoint parsing failed
> >>> + * Other error codes as returned by @parse_endpoint
> >>> + */
> >>> +int v4l2_async_notifier_parse_fwnode_endpoints(
> >>> + struct device *dev, struct v4l2_async_notifier *notifier,
> >>> + size_t asd_struct_size,
> >>> + int (*parse_endpoint)(struct device *dev,
> >>> + struct v4l2_fwnode_endpoint *vep,
> >>> + struct v4l2_async_subdev *asd));
> >>> +
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
> >>> + * endpoints of a port in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct, including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @port: port number where endpoints are to be parsed
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
> >>> + * the exception that it only parses endpoints in a given port. This is useful
> >>> + * on devices that have both sinks and sources: the async sub-devices connected
> >>
> >> on -> for
> >>
> >>> + * to sources have already been set up by another driver (on capture devices).
> >>
> >> on -> for
> >
> > Agreed on both.
> >
> >>
> >> So if I understand this correctly for devices with both sinks and sources you use
> >> this function to just parse the sink ports. And you have to give explicit port
> >> numbers since you can't tell from parsing the device tree if a port is a sink or
> >> source port, right? Only the driver knows this.
> >
> > Correct. The graph data structure in DT isn't directed, so this is only
> > known by the driver.
>
> I think this should be clarified.
>
> I wonder if there is any way around it. I don't have time to dig into this, but
> isn't it possible to tell that the source ports are already configured?
Well, this is essentially what the documentation is attempting to convey.
:-)
I can add this / change the existing wording, if you think it could help.
--
Regards,
Sakari Ailus
sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
@ 2017-09-19 10:00 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 10:00 UTC (permalink / raw)
To: Hans Verkuil
Cc: linux-media, niklas.soderlund, maxime.ripard, robh,
laurent.pinchart, devicetree, pavel, sre
Hi Hans,
On Tue, Sep 19, 2017 at 10:40:14AM +0200, Hans Verkuil wrote:
> On 09/19/2017 10:20 AM, Sakari Ailus wrote:
> > Hi Hans,
> >
> > Thank you for the review.
> >
> > On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
> >> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
...
> >>> +static int __v4l2_async_notifier_parse_fwnode_endpoints(
> >>> + struct device *dev, struct v4l2_async_notifier *notifier,
> >>> + size_t asd_struct_size, unsigned int port, bool has_port,
> >>> + int (*parse_endpoint)(struct device *dev,
> >>> + struct v4l2_fwnode_endpoint *vep,
> >>> + struct v4l2_async_subdev *asd))
> >>> +{
> >>> + struct fwnode_handle *fwnode = NULL;
> >>> + unsigned int max_subdevs = notifier->max_subdevs;
> >>> + int ret;
> >>> +
> >>> + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
> >>> + return -EINVAL;
> >>> +
> >>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> >>> + dev_fwnode(dev), fwnode)); ) {
> >>
> >> You can replace this by:
> >>
> >> while ((fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), fwnode))) {
> >>
> >>> + if (!fwnode_device_is_available(
> >>> + fwnode_graph_get_port_parent(fwnode)))
> >>> + continue;
> >>> +
> >>> + if (has_port) {
> >>> + struct fwnode_endpoint ep;
> >>> +
> >>> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> >>> + if (ret) {
> >>> + fwnode_handle_put(fwnode);
> >>> + return ret;
> >>> + }
> >>> +
> >>> + if (ep.port != port)
> >>> + continue;
> >>> + }
> >>> + max_subdevs++;
> >>> + }
> >>> +
> >>> + /* No subdevs to add? Return here. */
> >>> + if (max_subdevs == notifier->max_subdevs)
> >>> + return 0;
> >>> +
> >>> + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
> >>> + if (ret)
> >>> + return ret;
> >>> +
> >>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> >>> + dev_fwnode(dev), fwnode)); ) {
> >>
> >> Same here: this can be a 'while'.
> >
> > The fwnode = NULL assignment still needs to be done. A for loop has a
> > natural initialiser for the loop, I think it's cleaner than using while
> > here.
>
> After the previous while fwnode is NULL again (since that's when the while
> stops).
>
> >
> > The macro would be implemented this way as well.
> >
> > For the loop above this one, I'd use for for consistency: it's the same
> > loop after all.
> >
> > This reminds me --- I'll send the patch for the macro.
>
> If this is going to be replaced by a macro, then disregard my comment.
Yes. I just sent that to linux-acpi (as well as devicetree and to you).
...
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct, including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * Parse the fwnode endpoints of the @dev device and populate the async sub-
> >>> + * devices array of the notifier. The @parse_endpoint callback function is
> >>> + * called for each endpoint with the corresponding async sub-device pointer to
> >>> + * let the caller initialize the driver-specific part of the async sub-device
> >>> + * structure.
> >>> + *
> >>> + * The notifier memory shall be zeroed before this function is called on the
> >>> + * notifier.
> >>> + *
> >>> + * This function may not be called on a registered notifier and may be called on
> >>> + * a notifier only once.
> >>> + *
> >>> + * Do not change the notifier's subdevs array, take references to the subdevs
> >>> + * array itself or change the notifier's num_subdevs field. This is because this
> >>> + * function allocates and reallocates the subdevs array based on parsing
> >>> + * endpoints.
> >>> + *
> >>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> >>> + * @parse_endpoint is released once the function is finished. If there is a need
> >>> + * to retain that configuration, the user needs to allocate memory for it.
> >>> + *
> >>> + * Any notifier populated using this function must be released with a call to
> >>> + * v4l2_async_notifier_release() after it has been unregistered and the async
> >>> + * sub-devices are no longer in use, even if the function returned an error.
> >>> + *
> >>> + * Return: %0 on success, including when no async sub-devices are found
> >>> + * %-ENOMEM if memory allocation failed
> >>> + * %-EINVAL if graph or endpoint parsing failed
> >>> + * Other error codes as returned by @parse_endpoint
> >>> + */
> >>> +int v4l2_async_notifier_parse_fwnode_endpoints(
> >>> + struct device *dev, struct v4l2_async_notifier *notifier,
> >>> + size_t asd_struct_size,
> >>> + int (*parse_endpoint)(struct device *dev,
> >>> + struct v4l2_fwnode_endpoint *vep,
> >>> + struct v4l2_async_subdev *asd));
> >>> +
> >>> +/**
> >>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
> >>> + * endpoints of a port in a
> >>> + * device node
> >>> + * @dev: the device the endpoints of which are to be parsed
> >>> + * @notifier: notifier for @dev
> >>> + * @asd_struct_size: size of the driver's async sub-device struct, including
> >>> + * sizeof(struct v4l2_async_subdev). The &struct
> >>> + * v4l2_async_subdev shall be the first member of
> >>> + * the driver's async sub-device struct, i.e. both
> >>> + * begin at the same memory address.
> >>> + * @port: port number where endpoints are to be parsed
> >>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> >>> + * endpoint. Optional.
> >>> + * Return: %0 on success
> >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> >>> + * should not be considered as an error
> >>> + * %-EINVAL if the endpoint configuration is invalid
> >>> + *
> >>> + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
> >>> + * the exception that it only parses endpoints in a given port. This is useful
> >>> + * on devices that have both sinks and sources: the async sub-devices connected
> >>
> >> on -> for
> >>
> >>> + * to sources have already been set up by another driver (on capture devices).
> >>
> >> on -> for
> >
> > Agreed on both.
> >
> >>
> >> So if I understand this correctly for devices with both sinks and sources you use
> >> this function to just parse the sink ports. And you have to give explicit port
> >> numbers since you can't tell from parsing the device tree if a port is a sink or
> >> source port, right? Only the driver knows this.
> >
> > Correct. The graph data structure in DT isn't directed, so this is only
> > known by the driver.
>
> I think this should be clarified.
>
> I wonder if there is any way around it. I don't have time to dig into this, but
> isn't it possible to tell that the source ports are already configured?
Well, this is essentially what the documentation is attempting to convey.
:-)
I can add this / change the existing wording, if you think it could help.
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 10:00 ` Sakari Ailus
(?)
@ 2017-09-19 10:10 ` Hans Verkuil
-1 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 10:10 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh,
laurent.pinchart, devicetree, pavel, sre
On 09/19/17 12:00, Sakari Ailus wrote:
> Hi Hans,
>
> On Tue, Sep 19, 2017 at 10:40:14AM +0200, Hans Verkuil wrote:
>> On 09/19/2017 10:20 AM, Sakari Ailus wrote:
>>> Hi Hans,
>>>
>>> Thank you for the review.
>>>
>>> On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
>>>> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> ...
>>>>> +static int __v4l2_async_notifier_parse_fwnode_endpoints(
>>>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>>>> + size_t asd_struct_size, unsigned int port, bool has_port,
>>>>> + int (*parse_endpoint)(struct device *dev,
>>>>> + struct v4l2_fwnode_endpoint *vep,
>>>>> + struct v4l2_async_subdev *asd))
>>>>> +{
>>>>> + struct fwnode_handle *fwnode = NULL;
>>>>> + unsigned int max_subdevs = notifier->max_subdevs;
>>>>> + int ret;
>>>>> +
>>>>> + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
>>>>> + return -EINVAL;
>>>>> +
>>>>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
>>>>> + dev_fwnode(dev), fwnode)); ) {
>>>>
>>>> You can replace this by:
>>>>
>>>> while ((fwnode = fwnode_graph_get_next_endpoint(dev_fwnode(dev), fwnode))) {
>>>>
>>>>> + if (!fwnode_device_is_available(
>>>>> + fwnode_graph_get_port_parent(fwnode)))
>>>>> + continue;
>>>>> +
>>>>> + if (has_port) {
>>>>> + struct fwnode_endpoint ep;
>>>>> +
>>>>> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
>>>>> + if (ret) {
>>>>> + fwnode_handle_put(fwnode);
>>>>> + return ret;
>>>>> + }
>>>>> +
>>>>> + if (ep.port != port)
>>>>> + continue;
>>>>> + }
>>>>> + max_subdevs++;
>>>>> + }
>>>>> +
>>>>> + /* No subdevs to add? Return here. */
>>>>> + if (max_subdevs == notifier->max_subdevs)
>>>>> + return 0;
>>>>> +
>>>>> + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
>>>>> + if (ret)
>>>>> + return ret;
>>>>> +
>>>>> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
>>>>> + dev_fwnode(dev), fwnode)); ) {
>>>>
>>>> Same here: this can be a 'while'.
>>>
>>> The fwnode = NULL assignment still needs to be done. A for loop has a
>>> natural initialiser for the loop, I think it's cleaner than using while
>>> here.
>>
>> After the previous while fwnode is NULL again (since that's when the while
>> stops).
>>
>>>
>>> The macro would be implemented this way as well.
>>>
>>> For the loop above this one, I'd use for for consistency: it's the same
>>> loop after all.
>>>
>>> This reminds me --- I'll send the patch for the macro.
>>
>> If this is going to be replaced by a macro, then disregard my comment.
>
> Yes. I just sent that to linux-acpi (as well as devicetree and to you).
>
> ...
>
>>>>> +/**
>>>>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints in a
>>>>> + * device node
>>>>> + * @dev: the device the endpoints of which are to be parsed
>>>>> + * @notifier: notifier for @dev
>>>>> + * @asd_struct_size: size of the driver's async sub-device struct, including
>>>>> + * sizeof(struct v4l2_async_subdev). The &struct
>>>>> + * v4l2_async_subdev shall be the first member of
>>>>> + * the driver's async sub-device struct, i.e. both
>>>>> + * begin at the same memory address.
>>>>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
>>>>> + * endpoint. Optional.
>>>>> + * Return: %0 on success
>>>>> + * %-ENOTCONN if the endpoint is to be skipped but this
>>>>> + * should not be considered as an error
>>>>> + * %-EINVAL if the endpoint configuration is invalid
>>>>> + *
>>>>> + * Parse the fwnode endpoints of the @dev device and populate the async sub-
>>>>> + * devices array of the notifier. The @parse_endpoint callback function is
>>>>> + * called for each endpoint with the corresponding async sub-device pointer to
>>>>> + * let the caller initialize the driver-specific part of the async sub-device
>>>>> + * structure.
>>>>> + *
>>>>> + * The notifier memory shall be zeroed before this function is called on the
>>>>> + * notifier.
>>>>> + *
>>>>> + * This function may not be called on a registered notifier and may be called on
>>>>> + * a notifier only once.
>>>>> + *
>>>>> + * Do not change the notifier's subdevs array, take references to the subdevs
>>>>> + * array itself or change the notifier's num_subdevs field. This is because this
>>>>> + * function allocates and reallocates the subdevs array based on parsing
>>>>> + * endpoints.
>>>>> + *
>>>>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
>>>>> + * @parse_endpoint is released once the function is finished. If there is a need
>>>>> + * to retain that configuration, the user needs to allocate memory for it.
>>>>> + *
>>>>> + * Any notifier populated using this function must be released with a call to
>>>>> + * v4l2_async_notifier_release() after it has been unregistered and the async
>>>>> + * sub-devices are no longer in use, even if the function returned an error.
>>>>> + *
>>>>> + * Return: %0 on success, including when no async sub-devices are found
>>>>> + * %-ENOMEM if memory allocation failed
>>>>> + * %-EINVAL if graph or endpoint parsing failed
>>>>> + * Other error codes as returned by @parse_endpoint
>>>>> + */
>>>>> +int v4l2_async_notifier_parse_fwnode_endpoints(
>>>>> + struct device *dev, struct v4l2_async_notifier *notifier,
>>>>> + size_t asd_struct_size,
>>>>> + int (*parse_endpoint)(struct device *dev,
>>>>> + struct v4l2_fwnode_endpoint *vep,
>>>>> + struct v4l2_async_subdev *asd));
>>>>> +
>>>>> +/**
>>>>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
>>>>> + * endpoints of a port in a
>>>>> + * device node
>>>>> + * @dev: the device the endpoints of which are to be parsed
>>>>> + * @notifier: notifier for @dev
>>>>> + * @asd_struct_size: size of the driver's async sub-device struct, including
>>>>> + * sizeof(struct v4l2_async_subdev). The &struct
>>>>> + * v4l2_async_subdev shall be the first member of
>>>>> + * the driver's async sub-device struct, i.e. both
>>>>> + * begin at the same memory address.
>>>>> + * @port: port number where endpoints are to be parsed
>>>>> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
>>>>> + * endpoint. Optional.
>>>>> + * Return: %0 on success
>>>>> + * %-ENOTCONN if the endpoint is to be skipped but this
>>>>> + * should not be considered as an error
>>>>> + * %-EINVAL if the endpoint configuration is invalid
>>>>> + *
>>>>> + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints with
>>>>> + * the exception that it only parses endpoints in a given port. This is useful
>>>>> + * on devices that have both sinks and sources: the async sub-devices connected
>>>>
>>>> on -> for
>>>>
>>>>> + * to sources have already been set up by another driver (on capture devices).
>>>>
>>>> on -> for
>>>
>>> Agreed on both.
>>>
>>>>
>>>> So if I understand this correctly for devices with both sinks and sources you use
>>>> this function to just parse the sink ports. And you have to give explicit port
>>>> numbers since you can't tell from parsing the device tree if a port is a sink or
>>>> source port, right? Only the driver knows this.
>>>
>>> Correct. The graph data structure in DT isn't directed, so this is only
>>> known by the driver.
>>
>> I think this should be clarified.
>>
>> I wonder if there is any way around it. I don't have time to dig into this, but
>> isn't it possible to tell that the source ports are already configured?
>
> Well, this is essentially what the documentation is attempting to convey.
> :-)
>
> I can add this / change the existing wording, if you think it could help.
Yes please. The documentation is just missing the little fact that the DT can't
tell the difference between a sink and source port, hence the driver has to be
explicit about which ports to parse in a case like this.
Regards,
Hans
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references
2017-09-19 9:21 ` Hans Verkuil
@ 2017-09-19 10:16 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 10:16 UTC (permalink / raw)
To: Hans Verkuil
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Hans,
On Tue, Sep 19, 2017 at 11:21:50AM +0200, Hans Verkuil wrote:
> On 09/19/17 10:45, Sakari Ailus wrote:
> > Hi Hans,
> >
> > Thank you for the review.
> >
> > On Tue, Sep 19, 2017 at 10:31:41AM +0200, Hans Verkuil wrote:
> >> Hi Sakari,
> >>
> >> I'm slowly starting to understand this. The example helped a lot. But I still have
> >> some questions, see below.
> >>
> >> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> >>> v4l2_fwnode_reference_parse_int_prop() will find an fwnode such that under
> >>> the device's own fwnode, it will follow child fwnodes with the given
> >>> property-value pair and return the resulting fwnode.
> >>
> >> I think both the subject, commit log, function comment and function name should
> >> reflect the fact that this function is for an ACPI reference.
> >>
> >> It's only called for ACPI (from patch 19):
> >>
> >> + if (props[i].props && is_acpi_node(dev_fwnode(dev)))
> >> + ret = v4l2_fwnode_reference_parse_int_props(
> >>
> >> So renaming it to v4l2_fwnode_acpi_reference_parse_int_props or something similar
> >> would clarify this fact.
> >
> > I don't think we'll see many like this one. I presume we won't use it on DT
> > albeit there are no direct references to ACPI in the code itself.
> >
> > How about v4l2_fwnode_parse_acpi_reference (+ "s" for the one below)?
>
> Sounds good.
>
> >
> >>
> >>>
> >>> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> >>> ---
> >>> drivers/media/v4l2-core/v4l2-fwnode.c | 201 ++++++++++++++++++++++++++++++++++
> >>> 1 file changed, 201 insertions(+)
> >>>
> >>> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> >>> index 65e84ea1cc35..968a345a288f 100644
> >>> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> >>> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> >>> @@ -567,6 +567,207 @@ static int v4l2_fwnode_reference_parse(
> >>> return ret;
> >>> }
> >>>
> >>> +/*
> >>> + * v4l2_fwnode_reference_get_int_prop - parse a reference with integer
> >>> + * arguments
> >>> + * @dev: struct device pointer
> >>> + * @notifier: notifier for @dev
> >>> + * @prop: the name of the property
> >>> + * @index: the index of the reference to get
> >>> + * @props: the array of integer property names
> >>> + * @nprops: the number of integer property names in @nprops
> >>
> >> You mean 'in @props'?
> >
> > Yes, I'll fix that.
> >
> >>
> >> One thing that is not clear to me is when you would use an nprops value > 1.
> >> What's the use-case for that? It only makes sense (I think) if you would have
> >> property names that are all aliases of one another.
> >
> > There may be several flash LEDs related to a sensor. That's the use case,
> > for instance.
>
> I think it would be helpful if the example shows two LEDs related to a
> sensor. Part of the problem I have in understanding this code is that I
> have zero experience with ACPI (and that is probably true for most other
> developers), so I don't know how this is encoded. With a good example it
> is much easier to understand.
I'm a bit at loss here. Are you happy with the example below, or do you
think something is missing in the documentation here.
>
> >
> >>
> >>> + *
> >>> + * Find fwnodes referred to by a property @prop, then under that
> >>> + * iteratively, @nprops times, follow each child node which has a
> >>> + * property in @props array at a given child index the value of which
> >>> + * matches the integer argument at an index.
> >>> + *
> >>> + * For example, if this function was called with arguments and values
> >>> + * @dev corresponding to device "SEN", @prop == "flash-leds", @index
> >>> + * == 1, @props == { "led" }, @nprops == 1, with the ASL snippet below
> >>> + * it would return the node marked with THISONE. The @dev argument in
> >>> + * the ASL below.
> >>
> >> That last sentence about the @dev seems incomplete. I'm not sure what is
> >> meant by it.
> >
> > I think it was meant to convey some information but it got added to the
> > previous sentence. I'll remove it.
> >
> >>
> >>> + *
> >>> + * Device (LED)
> >>> + * {
> >>> + * Name (_DSD, Package () {
> >>> + * ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
> >>> + * Package () {
> >>> + * Package () { "led0", "LED0" },
> >>> + * Package () { "led1", "LED1" },
> >>> + * }
> >>> + * })
> >>> + * Name (LED0, Package () {
> >>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> >>> + * Package () {
> >>> + * Package () { "led", 0 },
> >>> + * }
> >>> + * })
> >>> + * Name (LED1, Package () {
> >>> + * // THISONE
> >>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> >>> + * Package () {
> >>> + * Package () { "led", 1 },
> >>> + * }
> >>> + * })
> >>> + * }
> >>> + *
> >>> + * Device (SEN)
> >>> + * {
> >>> + * Name (_DSD, Package () {
> >>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> >>> + * Package () {
> >>> + * Package () {
> >>> + * "flash-leds",
> >>> + * Package () { ^LED, 0, ^LED, 1 },
> >>> + * }
> >>> + * }
> >>> + * })
> >>> + * }
> >>> + *
> >>> + * where
> >>> + *
> >>> + * LED LED driver device
> >>> + * LED0 First LED
> >>> + * LED1 Second LED
> >>> + * SEN Camera sensor device (or another device the LED is
> >>> + * related to)
> >>> + *
> >>> + * Return: 0 on success
> >>> + * -ENOENT if no entries (or the property itself) were found
> >>> + * -EINVAL if property parsing otherwise failed
> >>> + * -ENOMEM if memory allocation failed
> >>> + */
> >>> +static struct fwnode_handle *v4l2_fwnode_reference_get_int_prop(
> >>> + struct fwnode_handle *fwnode, const char *prop, unsigned int index,
> >>> + const char **props, unsigned int nprops)
> >>> +{
> >>> + struct fwnode_reference_args fwnode_args;
> >>> + unsigned int *args = fwnode_args.args;
> >>> + struct fwnode_handle *child;
> >>> + int ret;
> >>> +
> >>> + /*
> >>> + * Obtain remote fwnode as well as the integer arguments.
> >>> + *
> >>> + * Note that right now both -ENODATA and -ENOENT may signal
> >>> + * out-of-bounds access. Return -ENOENT in that case.
> >>> + */
> >>> + ret = fwnode_property_get_reference_args(fwnode, prop, NULL, nprops,
> >>> + index, &fwnode_args);
> >>> + if (ret)
> >>> + return ERR_PTR(ret == -ENODATA ? -ENOENT : ret);
> >>> +
> >>> + /*
> >>> + * Find a node in the tree under the referred fwnode corresponding the
> >>> + * integer arguments.
> >>> + */
> >>> + fwnode = fwnode_args.fwnode;
> >>
> >> So given the example above, fwnode would point to the LED device?
> >>
> >> If correct, then mention that in the comment.
> >
> > It could be a LED driver device, but it could be something else as well.
> > Like a lens VCM, depending on the property being parsed. That's why I
> > didn't put it in the comments. But this is a device node, not a
> > hierarchical data extension node, for instance. That's what I think I
> > should add.
>
> I think that will help.
Agreed.
Yeah, in DT all fwnodes are DT nodes but in ACPI some are device nodes and
others hierarchical data extension nodes. Oh well...
>
> >
> >>
> >>> + while (nprops--) {
> >>> + u32 val;
> >>> +
> >>> + /* Loop over all child nodes under fwnode. */
> >>
> >> And here you check if the LED device has child nodes that have a *props
> >> property with a value matching the index.
> >>
> >> So given the example above it is looking for a child with property "led"
> >> and value 1.
> >>
> >> It's useful if that is mentioned in the comment as well.
> >
> > But should I? This isn't specific to LEDs.
>
> Ignore this comment for now. I'll take another look when I see v14.
--
Regards,
Sakari Ailus
sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references
@ 2017-09-19 10:16 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 10:16 UTC (permalink / raw)
To: Hans Verkuil
Cc: linux-media, niklas.soderlund, maxime.ripard, robh,
laurent.pinchart, devicetree, pavel, sre
Hi Hans,
On Tue, Sep 19, 2017 at 11:21:50AM +0200, Hans Verkuil wrote:
> On 09/19/17 10:45, Sakari Ailus wrote:
> > Hi Hans,
> >
> > Thank you for the review.
> >
> > On Tue, Sep 19, 2017 at 10:31:41AM +0200, Hans Verkuil wrote:
> >> Hi Sakari,
> >>
> >> I'm slowly starting to understand this. The example helped a lot. But I still have
> >> some questions, see below.
> >>
> >> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> >>> v4l2_fwnode_reference_parse_int_prop() will find an fwnode such that under
> >>> the device's own fwnode, it will follow child fwnodes with the given
> >>> property-value pair and return the resulting fwnode.
> >>
> >> I think both the subject, commit log, function comment and function name should
> >> reflect the fact that this function is for an ACPI reference.
> >>
> >> It's only called for ACPI (from patch 19):
> >>
> >> + if (props[i].props && is_acpi_node(dev_fwnode(dev)))
> >> + ret = v4l2_fwnode_reference_parse_int_props(
> >>
> >> So renaming it to v4l2_fwnode_acpi_reference_parse_int_props or something similar
> >> would clarify this fact.
> >
> > I don't think we'll see many like this one. I presume we won't use it on DT
> > albeit there are no direct references to ACPI in the code itself.
> >
> > How about v4l2_fwnode_parse_acpi_reference (+ "s" for the one below)?
>
> Sounds good.
>
> >
> >>
> >>>
> >>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >>> ---
> >>> drivers/media/v4l2-core/v4l2-fwnode.c | 201 ++++++++++++++++++++++++++++++++++
> >>> 1 file changed, 201 insertions(+)
> >>>
> >>> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
> >>> index 65e84ea1cc35..968a345a288f 100644
> >>> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> >>> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> >>> @@ -567,6 +567,207 @@ static int v4l2_fwnode_reference_parse(
> >>> return ret;
> >>> }
> >>>
> >>> +/*
> >>> + * v4l2_fwnode_reference_get_int_prop - parse a reference with integer
> >>> + * arguments
> >>> + * @dev: struct device pointer
> >>> + * @notifier: notifier for @dev
> >>> + * @prop: the name of the property
> >>> + * @index: the index of the reference to get
> >>> + * @props: the array of integer property names
> >>> + * @nprops: the number of integer property names in @nprops
> >>
> >> You mean 'in @props'?
> >
> > Yes, I'll fix that.
> >
> >>
> >> One thing that is not clear to me is when you would use an nprops value > 1.
> >> What's the use-case for that? It only makes sense (I think) if you would have
> >> property names that are all aliases of one another.
> >
> > There may be several flash LEDs related to a sensor. That's the use case,
> > for instance.
>
> I think it would be helpful if the example shows two LEDs related to a
> sensor. Part of the problem I have in understanding this code is that I
> have zero experience with ACPI (and that is probably true for most other
> developers), so I don't know how this is encoded. With a good example it
> is much easier to understand.
I'm a bit at loss here. Are you happy with the example below, or do you
think something is missing in the documentation here.
>
> >
> >>
> >>> + *
> >>> + * Find fwnodes referred to by a property @prop, then under that
> >>> + * iteratively, @nprops times, follow each child node which has a
> >>> + * property in @props array at a given child index the value of which
> >>> + * matches the integer argument at an index.
> >>> + *
> >>> + * For example, if this function was called with arguments and values
> >>> + * @dev corresponding to device "SEN", @prop == "flash-leds", @index
> >>> + * == 1, @props == { "led" }, @nprops == 1, with the ASL snippet below
> >>> + * it would return the node marked with THISONE. The @dev argument in
> >>> + * the ASL below.
> >>
> >> That last sentence about the @dev seems incomplete. I'm not sure what is
> >> meant by it.
> >
> > I think it was meant to convey some information but it got added to the
> > previous sentence. I'll remove it.
> >
> >>
> >>> + *
> >>> + * Device (LED)
> >>> + * {
> >>> + * Name (_DSD, Package () {
> >>> + * ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
> >>> + * Package () {
> >>> + * Package () { "led0", "LED0" },
> >>> + * Package () { "led1", "LED1" },
> >>> + * }
> >>> + * })
> >>> + * Name (LED0, Package () {
> >>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> >>> + * Package () {
> >>> + * Package () { "led", 0 },
> >>> + * }
> >>> + * })
> >>> + * Name (LED1, Package () {
> >>> + * // THISONE
> >>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> >>> + * Package () {
> >>> + * Package () { "led", 1 },
> >>> + * }
> >>> + * })
> >>> + * }
> >>> + *
> >>> + * Device (SEN)
> >>> + * {
> >>> + * Name (_DSD, Package () {
> >>> + * ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> >>> + * Package () {
> >>> + * Package () {
> >>> + * "flash-leds",
> >>> + * Package () { ^LED, 0, ^LED, 1 },
> >>> + * }
> >>> + * }
> >>> + * })
> >>> + * }
> >>> + *
> >>> + * where
> >>> + *
> >>> + * LED LED driver device
> >>> + * LED0 First LED
> >>> + * LED1 Second LED
> >>> + * SEN Camera sensor device (or another device the LED is
> >>> + * related to)
> >>> + *
> >>> + * Return: 0 on success
> >>> + * -ENOENT if no entries (or the property itself) were found
> >>> + * -EINVAL if property parsing otherwise failed
> >>> + * -ENOMEM if memory allocation failed
> >>> + */
> >>> +static struct fwnode_handle *v4l2_fwnode_reference_get_int_prop(
> >>> + struct fwnode_handle *fwnode, const char *prop, unsigned int index,
> >>> + const char **props, unsigned int nprops)
> >>> +{
> >>> + struct fwnode_reference_args fwnode_args;
> >>> + unsigned int *args = fwnode_args.args;
> >>> + struct fwnode_handle *child;
> >>> + int ret;
> >>> +
> >>> + /*
> >>> + * Obtain remote fwnode as well as the integer arguments.
> >>> + *
> >>> + * Note that right now both -ENODATA and -ENOENT may signal
> >>> + * out-of-bounds access. Return -ENOENT in that case.
> >>> + */
> >>> + ret = fwnode_property_get_reference_args(fwnode, prop, NULL, nprops,
> >>> + index, &fwnode_args);
> >>> + if (ret)
> >>> + return ERR_PTR(ret == -ENODATA ? -ENOENT : ret);
> >>> +
> >>> + /*
> >>> + * Find a node in the tree under the referred fwnode corresponding the
> >>> + * integer arguments.
> >>> + */
> >>> + fwnode = fwnode_args.fwnode;
> >>
> >> So given the example above, fwnode would point to the LED device?
> >>
> >> If correct, then mention that in the comment.
> >
> > It could be a LED driver device, but it could be something else as well.
> > Like a lens VCM, depending on the property being parsed. That's why I
> > didn't put it in the comments. But this is a device node, not a
> > hierarchical data extension node, for instance. That's what I think I
> > should add.
>
> I think that will help.
Agreed.
Yeah, in DT all fwnodes are DT nodes but in ACPI some are device nodes and
others hierarchical data extension nodes. Oh well...
>
> >
> >>
> >>> + while (nprops--) {
> >>> + u32 val;
> >>> +
> >>> + /* Loop over all child nodes under fwnode. */
> >>
> >> And here you check if the LED device has child nodes that have a *props
> >> property with a value matching the index.
> >>
> >> So given the example above it is looking for a child with property "led"
> >> and value 1.
> >>
> >> It's useful if that is mentioned in the comment as well.
> >
> > But should I? This isn't specific to LEDs.
>
> Ignore this comment for now. I'll take another look when I see v14.
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-15 14:17 ` Sakari Ailus
@ 2017-09-19 10:48 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 10:48 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> In V4L2 the practice is to have the KernelDoc documentation in the header
> and not in .c source code files. This consequently makes the V4L2 fwnode
> function documentation part of the Media documentation build.
>
> Also correct the link related function and argument naming in
> documentation.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
I'm still very opposed to this. In addition to increasing the risk of
documentation becoming stale, it also makes review more difficult. I'm
reviewing patch 05/25 of this series and I have to jump around the patch to
verify that the documentation matches the implementation, it's really
annoying.
We should instead move all function documentation from header files to source
files.
> ---
> drivers/media/v4l2-core/v4l2-fwnode.c | 75 --------------------------------
> include/media/v4l2-fwnode.h | 81 +++++++++++++++++++++++++++++++-
> 2 files changed, 80 insertions(+), 76 deletions(-)
[snip]
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-19 10:48 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 10:48 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> In V4L2 the practice is to have the KernelDoc documentation in the header
> and not in .c source code files. This consequently makes the V4L2 fwnode
> function documentation part of the Media documentation build.
>
> Also correct the link related function and argument naming in
> documentation.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
I'm still very opposed to this. In addition to increasing the risk of
documentation becoming stale, it also makes review more difficult. I'm
reviewing patch 05/25 of this series and I have to jump around the patch to
verify that the documentation matches the implementation, it's really
annoying.
We should instead move all function documentation from header files to source
files.
> ---
> drivers/media/v4l2-core/v4l2-fwnode.c | 75 --------------------------------
> include/media/v4l2-fwnode.h | 81 +++++++++++++++++++++++++++++++-
> 2 files changed, 80 insertions(+), 76 deletions(-)
[snip]
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-19 10:48 ` Laurent Pinchart
@ 2017-09-19 11:04 ` Hans Verkuil
-1 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 11:04 UTC (permalink / raw)
To: Laurent Pinchart, Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA,
pavel-+ZI9xUNit7I, sre-DgEjT+Ai2ygdnm+yROfE0A
On 09/19/17 12:48, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
>> In V4L2 the practice is to have the KernelDoc documentation in the header
>> and not in .c source code files. This consequently makes the V4L2 fwnode
>> function documentation part of the Media documentation build.
>>
>> Also correct the link related function and argument naming in
>> documentation.
>>
>> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
>> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
>> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
>> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
>
> I'm still very opposed to this. In addition to increasing the risk of
> documentation becoming stale, it also makes review more difficult. I'm
> reviewing patch 05/25 of this series and I have to jump around the patch to
> verify that the documentation matches the implementation, it's really
> annoying.
>
> We should instead move all function documentation from header files to source
> files.
I disagree with this. Yes, it makes reviewing harder, but when you have to
*use* these functions as e.g. a driver developer, then having it in the
header is much more convenient.
Regards,
Hans
>
>> ---
>> drivers/media/v4l2-core/v4l2-fwnode.c | 75 --------------------------------
>> include/media/v4l2-fwnode.h | 81 +++++++++++++++++++++++++++++++-
>> 2 files changed, 80 insertions(+), 76 deletions(-)
>
> [snip]
>
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-19 11:04 ` Hans Verkuil
0 siblings, 0 replies; 137+ messages in thread
From: Hans Verkuil @ 2017-09-19 11:04 UTC (permalink / raw)
To: Laurent Pinchart, Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, devicetree,
pavel, sre
On 09/19/17 12:48, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
>> In V4L2 the practice is to have the KernelDoc documentation in the header
>> and not in .c source code files. This consequently makes the V4L2 fwnode
>> function documentation part of the Media documentation build.
>>
>> Also correct the link related function and argument naming in
>> documentation.
>>
>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
>> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
>> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
>> Acked-by: Pavel Machek <pavel@ucw.cz>
>
> I'm still very opposed to this. In addition to increasing the risk of
> documentation becoming stale, it also makes review more difficult. I'm
> reviewing patch 05/25 of this series and I have to jump around the patch to
> verify that the documentation matches the implementation, it's really
> annoying.
>
> We should instead move all function documentation from header files to source
> files.
I disagree with this. Yes, it makes reviewing harder, but when you have to
*use* these functions as e.g. a driver developer, then having it in the
header is much more convenient.
Regards,
Hans
>
>> ---
>> drivers/media/v4l2-core/v4l2-fwnode.c | 75 --------------------------------
>> include/media/v4l2-fwnode.h | 81 +++++++++++++++++++++++++++++++-
>> 2 files changed, 80 insertions(+), 76 deletions(-)
>
> [snip]
>
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-19 11:04 ` Hans Verkuil
@ 2017-09-19 11:07 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:07 UTC (permalink / raw)
To: Hans Verkuil
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA,
pavel-+ZI9xUNit7I, sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Hans,
On Tuesday, 19 September 2017 14:04:36 EEST Hans Verkuil wrote:
> On 09/19/17 12:48, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> >> In V4L2 the practice is to have the KernelDoc documentation in the header
> >> and not in .c source code files. This consequently makes the V4L2 fwnode
> >> function documentation part of the Media documentation build.
> >>
> >> Also correct the link related function and argument naming in
> >> documentation.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
> >> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> >> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> >
> > I'm still very opposed to this. In addition to increasing the risk of
> > documentation becoming stale, it also makes review more difficult. I'm
> > reviewing patch 05/25 of this series and I have to jump around the patch
> > to verify that the documentation matches the implementation, it's really
> > annoying.
> >
> > We should instead move all function documentation from header files to
> > source files.
>
> I disagree with this. Yes, it makes reviewing harder, but when you have to
> *use* these functions as e.g. a driver developer, then having it in the
> header is much more convenient.
When writing a driver you can use the compiled documentation. We're lacking
reviewers in V4L2, we should make their life easier if we want to attract
more.
Furthermore, if documentation becomes stale, it will become useless for driver
authors, regardless of where it's stored.
> >> ---
> >>
> >> drivers/media/v4l2-core/v4l2-fwnode.c | 75 -----------------------------
> >> include/media/v4l2-fwnode.h | 81 +++++++++++++++++++++++++++-
> >> 2 files changed, 80 insertions(+), 76 deletions(-)
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-19 11:07 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:07 UTC (permalink / raw)
To: Hans Verkuil
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
devicetree, pavel, sre
Hi Hans,
On Tuesday, 19 September 2017 14:04:36 EEST Hans Verkuil wrote:
> On 09/19/17 12:48, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> >> In V4L2 the practice is to have the KernelDoc documentation in the header
> >> and not in .c source code files. This consequently makes the V4L2 fwnode
> >> function documentation part of the Media documentation build.
> >>
> >> Also correct the link related function and argument naming in
> >> documentation.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> >> Acked-by: Pavel Machek <pavel@ucw.cz>
> >
> > I'm still very opposed to this. In addition to increasing the risk of
> > documentation becoming stale, it also makes review more difficult. I'm
> > reviewing patch 05/25 of this series and I have to jump around the patch
> > to verify that the documentation matches the implementation, it's really
> > annoying.
> >
> > We should instead move all function documentation from header files to
> > source files.
>
> I disagree with this. Yes, it makes reviewing harder, but when you have to
> *use* these functions as e.g. a driver developer, then having it in the
> header is much more convenient.
When writing a driver you can use the compiled documentation. We're lacking
reviewers in V4L2, we should make their life easier if we want to attract
more.
Furthermore, if documentation becomes stale, it will become useless for driver
authors, regardless of where it's stored.
> >> ---
> >>
> >> drivers/media/v4l2-core/v4l2-fwnode.c | 75 -----------------------------
> >> include/media/v4l2-fwnode.h | 81 +++++++++++++++++++++++++++-
> >> 2 files changed, 80 insertions(+), 76 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-19 10:48 ` Laurent Pinchart
@ 2017-09-19 11:10 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 11:10 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 01:48:27PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> > In V4L2 the practice is to have the KernelDoc documentation in the header
> > and not in .c source code files. This consequently makes the V4L2 fwnode
> > function documentation part of the Media documentation build.
> >
> > Also correct the link related function and argument naming in
> > documentation.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
> > Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> > Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
>
> I'm still very opposed to this. In addition to increasing the risk of
> documentation becoming stale, it also makes review more difficult. I'm
> reviewing patch 05/25 of this series and I have to jump around the patch to
> verify that the documentation matches the implementation, it's really
> annoying.
I'd like to have this discussion separately from the patchset, which is
right now in its 13th version. This patch simply makes the current state
consistent; V4L2 async was the only part of V4L2 with KernelDoc
documentation in .c files.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-19 11:10 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 11:10 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 01:48:27PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> > In V4L2 the practice is to have the KernelDoc documentation in the header
> > and not in .c source code files. This consequently makes the V4L2 fwnode
> > function documentation part of the Media documentation build.
> >
> > Also correct the link related function and argument naming in
> > documentation.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > Acked-by: Pavel Machek <pavel@ucw.cz>
>
> I'm still very opposed to this. In addition to increasing the risk of
> documentation becoming stale, it also makes review more difficult. I'm
> reviewing patch 05/25 of this series and I have to jump around the patch to
> verify that the documentation matches the implementation, it's really
> annoying.
I'd like to have this discussion separately from the patchset, which is
right now in its 13th version. This patch simply makes the current state
consistent; V4L2 async was the only part of V4L2 with KernelDoc
documentation in .c files.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-19 11:10 ` Sakari Ailus
@ 2017-09-19 11:14 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:14 UTC (permalink / raw)
To: Sakari Ailus
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
On Tuesday, 19 September 2017 14:10:37 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 01:48:27PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> >> In V4L2 the practice is to have the KernelDoc documentation in the
> >> header and not in .c source code files. This consequently makes the V4L2
> >> fwnode function documentation part of the Media documentation build.
> >>
> >> Also correct the link related function and argument naming in
> >> documentation.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
> >> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> >> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> >
> > I'm still very opposed to this. In addition to increasing the risk of
> > documentation becoming stale, it also makes review more difficult. I'm
> > reviewing patch 05/25 of this series and I have to jump around the patch
> > to verify that the documentation matches the implementation, it's really
> > annoying.
>
> I'd like to have this discussion separately from the patchset, which is
> right now in its 13th version. This patch simply makes the current state
> consistent; V4L2 async was the only part of V4L2 with KernelDoc
> documentation in .c files.
But there's no need to move the documentation at this point until we reach an
agreement, is there ?
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-19 11:14 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:14 UTC (permalink / raw)
To: Sakari Ailus
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 14:10:37 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 01:48:27PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> >> In V4L2 the practice is to have the KernelDoc documentation in the
> >> header and not in .c source code files. This consequently makes the V4L2
> >> fwnode function documentation part of the Media documentation build.
> >>
> >> Also correct the link related function and argument naming in
> >> documentation.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> >> Acked-by: Pavel Machek <pavel@ucw.cz>
> >
> > I'm still very opposed to this. In addition to increasing the risk of
> > documentation becoming stale, it also makes review more difficult. I'm
> > reviewing patch 05/25 of this series and I have to jump around the patch
> > to verify that the documentation matches the implementation, it's really
> > annoying.
>
> I'd like to have this discussion separately from the patchset, which is
> right now in its 13th version. This patch simply makes the current state
> consistent; V4L2 async was the only part of V4L2 with KernelDoc
> documentation in .c files.
But there's no need to move the documentation at this point until we reach an
agreement, is there ?
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-19 11:04 ` Hans Verkuil
@ 2017-09-19 11:22 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 11:22 UTC (permalink / raw)
To: Hans Verkuil
Cc: Laurent Pinchart, Sakari Ailus,
linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, devicetree-u79uwXL29TY76Z2rM5mHXA,
pavel-+ZI9xUNit7I, sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Hans,
On Tue, Sep 19, 2017 at 01:04:36PM +0200, Hans Verkuil wrote:
> On 09/19/17 12:48, Laurent Pinchart wrote:
> > Hi Sakari,
> >
> > Thank you for the patch.
> >
> > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> >> In V4L2 the practice is to have the KernelDoc documentation in the header
> >> and not in .c source code files. This consequently makes the V4L2 fwnode
> >> function documentation part of the Media documentation build.
> >>
> >> Also correct the link related function and argument naming in
> >> documentation.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
> >> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> >> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> >
> > I'm still very opposed to this. In addition to increasing the risk of
> > documentation becoming stale, it also makes review more difficult. I'm
> > reviewing patch 05/25 of this series and I have to jump around the patch to
> > verify that the documentation matches the implementation, it's really
> > annoying.
> >
> > We should instead move all function documentation from header files to source
> > files.
>
> I disagree with this. Yes, it makes reviewing harder, but when you have to
> *use* these functions as e.g. a driver developer, then having it in the
> header is much more convenient.
For developers writing a driver and _not_ using e.g. the HTML
documentation, programs like cscope point the user to the implementation of
the function --- which is in the .c file, not the header. This is what I
personally tend to do at least; for most of the time I ignore where exactly
a given function is implemented (this is actually not self-evident in V4L2
outside async / fwnode).
The rest of the kernel appears to generally have the KernelDoc in .c files,
for a reason or another:
14:05:15 nauris sailus [~/scratch/src/linux]git grep '/\*\*$' -- include/|wc -l
6997
14:14:46 nauris sailus [~/scratch/src/linux]git grep '/\*\*$' -- drivers/ net/ mm/ lib/ kernel/ fs/ firmware/ init/ ipc/ block/ crypto/ |wc -l
44756
I think I'm slightly leaning towards moving it: having the documentation
where the implementation is does help keeping it up-to-date. It's currently
all too easy to change a function without realising it was actually
documented somewhere.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-19 11:22 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 11:22 UTC (permalink / raw)
To: Hans Verkuil
Cc: Laurent Pinchart, Sakari Ailus, linux-media, niklas.soderlund,
maxime.ripard, robh, devicetree, pavel, sre
Hi Hans,
On Tue, Sep 19, 2017 at 01:04:36PM +0200, Hans Verkuil wrote:
> On 09/19/17 12:48, Laurent Pinchart wrote:
> > Hi Sakari,
> >
> > Thank you for the patch.
> >
> > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> >> In V4L2 the practice is to have the KernelDoc documentation in the header
> >> and not in .c source code files. This consequently makes the V4L2 fwnode
> >> function documentation part of the Media documentation build.
> >>
> >> Also correct the link related function and argument naming in
> >> documentation.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> >> Acked-by: Pavel Machek <pavel@ucw.cz>
> >
> > I'm still very opposed to this. In addition to increasing the risk of
> > documentation becoming stale, it also makes review more difficult. I'm
> > reviewing patch 05/25 of this series and I have to jump around the patch to
> > verify that the documentation matches the implementation, it's really
> > annoying.
> >
> > We should instead move all function documentation from header files to source
> > files.
>
> I disagree with this. Yes, it makes reviewing harder, but when you have to
> *use* these functions as e.g. a driver developer, then having it in the
> header is much more convenient.
For developers writing a driver and _not_ using e.g. the HTML
documentation, programs like cscope point the user to the implementation of
the function --- which is in the .c file, not the header. This is what I
personally tend to do at least; for most of the time I ignore where exactly
a given function is implemented (this is actually not self-evident in V4L2
outside async / fwnode).
The rest of the kernel appears to generally have the KernelDoc in .c files,
for a reason or another:
14:05:15 nauris sailus [~/scratch/src/linux]git grep '/\*\*$' -- include/|wc -l
6997
14:14:46 nauris sailus [~/scratch/src/linux]git grep '/\*\*$' -- drivers/ net/ mm/ lib/ kernel/ fs/ firmware/ init/ ipc/ block/ crypto/ |wc -l
44756
I think I'm slightly leaning towards moving it: having the documentation
where the implementation is does help keeping it up-to-date. It's currently
all too easy to change a function without realising it was actually
documented somewhere.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
2017-09-19 11:14 ` Laurent Pinchart
@ 2017-09-19 11:25 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 11:25 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 02:14:39PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 14:10:37 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 01:48:27PM +0300, Laurent Pinchart wrote:
> > > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> > >> In V4L2 the practice is to have the KernelDoc documentation in the
> > >> header and not in .c source code files. This consequently makes the V4L2
> > >> fwnode function documentation part of the Media documentation build.
> > >>
> > >> Also correct the link related function and argument naming in
> > >> documentation.
> > >>
> > >> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
> > >> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> > >> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> > >
> > > I'm still very opposed to this. In addition to increasing the risk of
> > > documentation becoming stale, it also makes review more difficult. I'm
> > > reviewing patch 05/25 of this series and I have to jump around the patch
> > > to verify that the documentation matches the implementation, it's really
> > > annoying.
> >
> > I'd like to have this discussion separately from the patchset, which is
> > right now in its 13th version. This patch simply makes the current state
> > consistent; V4L2 async was the only part of V4L2 with KernelDoc
> > documentation in .c files.
>
> But there's no need to move the documentation at this point until we reach an
> agreement, is there ?
The status quo has is that the KernelDoc is in headers. Generally, if you
change parts that appear to lack framework-wide changes already done, you
do those changes before making other changes since it's a no-brainer.
Which is what this patch represents.
If we end up moving the KernelDoc to .c files moving this back could result
into an extra patch. I'm not too worried about that frankly.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header
@ 2017-09-19 11:25 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 11:25 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 02:14:39PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 14:10:37 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 01:48:27PM +0300, Laurent Pinchart wrote:
> > > On Friday, 15 September 2017 17:17:00 EEST Sakari Ailus wrote:
> > >> In V4L2 the practice is to have the KernelDoc documentation in the
> > >> header and not in .c source code files. This consequently makes the V4L2
> > >> fwnode function documentation part of the Media documentation build.
> > >>
> > >> Also correct the link related function and argument naming in
> > >> documentation.
> > >>
> > >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > >> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> > >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > >> Acked-by: Pavel Machek <pavel@ucw.cz>
> > >
> > > I'm still very opposed to this. In addition to increasing the risk of
> > > documentation becoming stale, it also makes review more difficult. I'm
> > > reviewing patch 05/25 of this series and I have to jump around the patch
> > > to verify that the documentation matches the implementation, it's really
> > > annoying.
> >
> > I'd like to have this discussion separately from the patchset, which is
> > right now in its 13th version. This patch simply makes the current state
> > consistent; V4L2 async was the only part of V4L2 with KernelDoc
> > documentation in .c files.
>
> But there's no need to move the documentation at this point until we reach an
> agreement, is there ?
The status quo has is that the KernelDoc is in headers. Generally, if you
change parts that appear to lack framework-wide changes already done, you
do those changes before making other changes since it's a no-brainer.
Which is what this patch represents.
If we end up moving the KernelDoc to .c files moving this back could result
into an extra patch. I'm not too worried about that frankly.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-15 14:17 ` Sakari Ailus
(?)
(?)
@ 2017-09-19 11:35 ` Laurent Pinchart
2017-09-19 12:11 ` Sakari Ailus
-1 siblings, 1 reply; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:35 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:04 EEST Sakari Ailus wrote:
> Add two functions for parsing devices graph endpoints:
> v4l2_async_notifier_parse_fwnode_endpoints and
> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> over all endpoints whereas the latter only iterates over the endpoints in
> a given port.
>
> The former is mostly useful for existing drivers that currently implement
> the iteration over all the endpoints themselves whereas the latter is
> especially intended for devices with both sinks and sources: async
> sub-devices for external devices connected to the device's sources will
> have already been set up, or they are part of the master device.
Did you mean s/or they/as they/ ?
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
> drivers/media/v4l2-core/v4l2-fwnode.c | 185 +++++++++++++++++++++++++++++++
> include/media/v4l2-async.h | 24 ++++-
> include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
> 4 files changed, 354 insertions(+), 2 deletions(-)
[snip]
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c
> b/drivers/media/v4l2-core/v4l2-fwnode.c index 706f9e7b90f1..44ee35f6aad5
> 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
[snip]
> +static int v4l2_async_notifier_fwnode_parse_endpoint(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + struct fwnode_handle *endpoint, unsigned int asd_struct_size,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd))
> +{
> + struct v4l2_async_subdev *asd;
> + struct v4l2_fwnode_endpoint *vep;
> + int ret = 0;
> +
> + asd = kzalloc(asd_struct_size, GFP_KERNEL);
> + if (!asd)
> + return -ENOMEM;
> +
> + asd->match.fwnode.fwnode =
> + fwnode_graph_get_remote_port_parent(endpoint);
> + if (!asd->match.fwnode.fwnode) {
> + dev_warn(dev, "bad remote port parent\n");
> + ret = -EINVAL;
> + goto out_err;
> + }
> +
> + /* Ignore endpoints the parsing of which failed. */
I think this comment is outdated.
> + vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
> + if (IS_ERR(vep)) {
> + ret = PTR_ERR(vep);
> + dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
> + ret);
> + goto out_err;
> + }
> +
> + ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
> + if (ret == -ENOTCONN)
> + dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
> + vep->base.id);
How about "ignoring port@%u/endpoint@%u\n" ? It would make the message more
explicit.
> + else if (ret < 0)
> + dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
Same here.
> + vep->base.port, vep->base.id, ret);
> + v4l2_fwnode_endpoint_free(vep);
> + if (ret < 0)
> + goto out_err;
> +
> + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
I'd move this line right before setting asd->match.fwnode.fwnode.
> + notifier->subdevs[notifier->num_subdevs] = asd;
> + notifier->num_subdevs++;
> +
> + return 0;
> +
> +out_err:
> + fwnode_handle_put(asd->match.fwnode.fwnode);
> + kfree(asd);
> +
> + return ret == -ENOTCONN ? 0 : ret;
> +}
> +
> +static int __v4l2_async_notifier_parse_fwnode_endpoints(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size, unsigned int port, bool has_port,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd))
> +{
> + struct fwnode_handle *fwnode = NULL;
> + unsigned int max_subdevs = notifier->max_subdevs;
> + int ret;
> +
> + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
> + return -EINVAL;
> +
> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> + dev_fwnode(dev), fwnode)); ) {
> + if (!fwnode_device_is_available(
> + fwnode_graph_get_port_parent(fwnode)))
Doesn't fwnode_graph_get_port_parent() increment the refcount on the parent,
which you should then release ?
> + continue;
> +
> + if (has_port) {
> + struct fwnode_endpoint ep;
> +
> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> + if (ret) {
> + fwnode_handle_put(fwnode);
> + return ret;
> + }
> +
> + if (ep.port != port)
> + continue;
> + }
> + max_subdevs++;
> + }
> +
> + /* No subdevs to add? Return here. */
> + if (max_subdevs == notifier->max_subdevs)
> + return 0;
> +
> + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
> + if (ret)
> + return ret;
> +
> + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> + dev_fwnode(dev), fwnode)); ) {
> + if (!fwnode_device_is_available(
> + fwnode_graph_get_port_parent(fwnode)))
Same here.
> + continue;
> +
> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> + ret = -EINVAL;
> + break;
> + }
> +
> + if (has_port) {
> + struct fwnode_endpoint ep;
> +
> + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> + if (ret)
> + break;
> +
> + if (ep.port != port)
> + continue;
> + }
> +
> + ret = v4l2_async_notifier_fwnode_parse_endpoint(
> + dev, notifier, fwnode, asd_struct_size, parse_endpoint);
> + if (ret < 0)
> + break;
> + }
> +
> + fwnode_handle_put(fwnode);
> +
> + return ret;
> +}
[snip]
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index c69d8c8a66d0..96fa1afc00dd 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -18,7 +18,6 @@ struct device;
> struct device_node;
> struct v4l2_device;
> struct v4l2_subdev;
> -struct v4l2_async_notifier;
>
> /* A random max subdevice number, used to allocate an array on stack */
> #define V4L2_MAX_SUBDEVS 128U
> @@ -50,6 +49,10 @@ enum v4l2_async_match_type {
> * @match: union of per-bus type matching data sets
> * @list: used to link struct v4l2_async_subdev objects, waiting to be
> * probed, to a notifier->waiting list
> + *
> + * When this struct is used as a member in a driver specific struct,
> + * the driver specific struct shall contain the @struct
> + * v4l2_async_subdev as its first member.
Unless I'm mistaken @ is used to refer to function arguments (sphinx typesets
it using <strong> in HTML). References to structures can be created with &.
Have you compiled the documentation ? :-)
> */
> struct v4l2_async_subdev {
> enum v4l2_async_match_type match_type;
> @@ -78,7 +81,8 @@ struct v4l2_async_subdev {
> /**
> * struct v4l2_async_notifier - v4l2_device notifier data
> *
> - * @num_subdevs: number of subdevices
> + * @num_subdevs: number of subdevices used in the subdevs array
> + * @max_subdevs: number of subdevices allocated in the subdevs array
> * @subdevs: array of pointers to subdevice descriptors
> * @v4l2_dev: pointer to struct v4l2_device
> * @waiting: list of struct v4l2_async_subdev, waiting for their drivers
> @@ -90,6 +94,7 @@ struct v4l2_async_subdev {
> */
> struct v4l2_async_notifier {
> unsigned int num_subdevs;
> + unsigned int max_subdevs;
> struct v4l2_async_subdev **subdevs;
> struct v4l2_device *v4l2_dev;
> struct list_head waiting;
> @@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device
> *v4l2_dev, void v4l2_async_notifier_unregister(struct v4l2_async_notifier
> *notifier);
>
> /**
> + * v4l2_async_notifier_release - release notifier resources
> + * @notifier: the notifier the resources of which are to be released
> + *
> + * Release memory resources related to a notifier, including the async
> + * sub-devices allocated for the purposes of the notifier. The user is
> + * responsible for releasing the notifier's resources after calling
> + * @v4l2_async_notifier_parse_fwnode_endpoints.
Don't use @. If you want sphinx to generate a link, just append () after the
function name.
> + *
> + * There is no harm from calling v4l2_async_notifier_release in other
Here too.
> + * cases as long as its memory has been zeroed after it has been
> + * allocated.
As the function WARNs for types other than V4L2_ASYNC_MATCH_FWNODE you might
want to mention that in the documentation.
> + */
> +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
> +
> +/**
> * v4l2_async_register_subdev - registers a sub-device to the asynchronous
> * subdevice framework
> *
> diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
> index 68eb22ba571b..83afac48ea6b 100644
> --- a/include/media/v4l2-fwnode.h
> +++ b/include/media/v4l2-fwnode.h
> @@ -25,6 +25,8 @@
> #include <media/v4l2-mediabus.h>
>
> struct fwnode_handle;
> +struct v4l2_async_notifier;
> +struct v4l2_async_subdev;
>
> #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
>
> @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle
> *fwnode, */
> void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
>
> +/**
> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints
> in a
> + * device node
> + * @dev: the device the endpoints of which are to be parsed
> + * @notifier: notifier for @dev
> + * @asd_struct_size: size of the driver's async sub-device struct,
> including
> + * sizeof(struct v4l2_async_subdev). The &struct
> + * v4l2_async_subdev shall be the first member of
> + * the driver's async sub-device struct, i.e. both
> + * begin at the same memory address.
> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> + * endpoint. Optional.
> + * Return: %0 on success
> + * %-ENOTCONN if the endpoint is to be skipped but this
> + * should not be considered as an error
> + * %-EINVAL if the endpoint configuration is invalid
> + *
> + * Parse the fwnode endpoints of the @dev device and populate the async
> sub-
> + * devices array of the notifier. The @parse_endpoint callback function is
> + * called for each endpoint with the corresponding async sub-device pointer
> to
> + * let the caller initialize the driver-specific part of the async sub-
> device
> + * structure.
> + *
> + * The notifier memory shall be zeroed before this function is called on
> the
> + * notifier.
> + *
> + * This function may not be called on a registered notifier and may be
> called on
> + * a notifier only once.
> + *
> + * Do not change the notifier's subdevs array, take references to the
> subdevs
> + * array itself or change the notifier's num_subdevs field. This is because
> this
> + * function allocates and reallocates the subdevs array based on parsing
> + * endpoints.
> + *
> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> + * @parse_endpoint is released once the function is finished. If there is a
> need
> + * to retain that configuration, the user needs to allocate memory for it.
> + *
> + * Any notifier populated using this function must be released with a call
> to
> + * v4l2_async_notifier_release() after it has been unregistered and the
> async
> + * sub-devices are no longer in use, even if the function returned an
> error.
> + *
> + * Return: %0 on success, including when no async sub-devices are found
> + * %-ENOMEM if memory allocation failed
> + * %-EINVAL if graph or endpoint parsing failed
> + * Other error codes as returned by @parse_endpoint
> + */
> +int v4l2_async_notifier_parse_fwnode_endpoints(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd));
> +
> +/**
> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
> + * endpoints of a port in a
> + * device node
This clearly shows that the function name is getting a bit long :-)
> + * @dev: the device the endpoints of which are to be parsed
> + * @notifier: notifier for @dev
> + * @asd_struct_size: size of the driver's async sub-device struct,
> including
> + * sizeof(struct v4l2_async_subdev). The &struct
> + * v4l2_async_subdev shall be the first member of
> + * the driver's async sub-device struct, i.e. both
> + * begin at the same memory address.
> + * @port: port number where endpoints are to be parsed
> + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> + * endpoint. Optional.
> + * Return: %0 on success
> + * %-ENOTCONN if the endpoint is to be skipped but this
> + * should not be considered as an error
> + * %-EINVAL if the endpoint configuration is invalid
> + *
> + * This function is just like @v4l2_async_notifier_parse_fwnode_endpoints
> with
> + * the exception that it only parses endpoints in a given port. This is
> useful
> + * on devices that have both sinks and sources: the async sub-devices
> connected
> + * to sources have already been set up by another driver (on capture
> devices).
> + *
> + * Parse the fwnode endpoints of the @dev device on a given @port and
> populate
> + * the async sub-devices array of the notifier. The @parse_endpoint
> callback
> + * function is called for each endpoint with the corresponding async sub-
> device
> + * pointer to let the caller initialize the driver-specific part of the
> async
> + * sub-device structure.
> + *
> + * The notifier memory shall be zeroed before this function is called on
> the
> + * notifier the first time.
> + *
> + * This function may not be called on a registered notifier and may be
> called on
> + * a notifier only once per port.
> + *
> + * Do not change the notifier's subdevs array, take references to the
> subdevs
> + * array itself or change the notifier's num_subdevs field. This is because
> this
> + * function allocates and reallocates the subdevs array based on parsing
> + * endpoints.
> + *
> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> + * @parse_endpoint is released once the function is finished. If there is a
> need
> + * to retain that configuration, the user needs to allocate memory for it.
> + *
> + * Any notifier populated using this function must be released with a call
> to
> + * v4l2_async_notifier_release() after it has been unregistered and the
> async
> + * sub-devices are no longer in use, even if the function returned an
> error.
> + *
> + * Return: %0 on success, including when no async sub-devices are found
> + * %-ENOMEM if memory allocation failed
> + * %-EINVAL if graph or endpoint parsing failed
> + * Other error codes as returned by @parse_endpoint
> + */
> +int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + size_t asd_struct_size, unsigned int port,
> + int (*parse_endpoint)(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd));
> +
> #endif /* _V4L2_FWNODE_H */
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 9:30 ` Laurent Pinchart
(?)
@ 2017-09-19 11:37 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 11:37 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Hans Verkuil, linux-media, niklas.soderlund, maxime.ripard, robh,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 12:30:34PM +0300, Laurent Pinchart wrote:
> Hi Hans,
>
> On Tuesday, 19 September 2017 11:40:14 EEST Hans Verkuil wrote:
> > On 09/19/2017 10:20 AM, Sakari Ailus wrote:
> > > On Tue, Sep 19, 2017 at 10:03:27AM +0200, Hans Verkuil wrote:
> > >> On 09/15/2017 04:17 PM, Sakari Ailus wrote:
> > >>> Add two functions for parsing devices graph endpoints:
> > >>> v4l2_async_notifier_parse_fwnode_endpoints and
> > >>> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> > >>> over all endpoints whereas the latter only iterates over the endpoints
> > >>> in a given port.
> > >>>
> > >>> The former is mostly useful for existing drivers that currently
> > >>> implement the iteration over all the endpoints themselves whereas the
> > >>> latter is especially intended for devices with both sinks and sources:
> > >>> async sub-devices for external devices connected to the device's sources
> > >>> will have already been set up, or they are part of the master device.
> > >>>
> > >>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > >>> ---
> > >>>
> > >>> drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
> > >>> drivers/media/v4l2-core/v4l2-fwnode.c | 185 +++++++++++++++++++++++++++
> > >>> include/media/v4l2-async.h | 24 ++++-
> > >>> include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
> > >>> 4 files changed, 354 insertions(+), 2 deletions(-)
>
> [snip]
>
> > >>> diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
> > >>> index 68eb22ba571b..83afac48ea6b 100644
> > >>> --- a/include/media/v4l2-fwnode.h
> > >>> +++ b/include/media/v4l2-fwnode.h
> > >>> @@ -25,6 +25,8 @@
> > >>>
> > >>> #include <media/v4l2-mediabus.h>
> > >>>
> > >>> struct fwnode_handle;
> > >>> +struct v4l2_async_notifier;
> > >>> +struct v4l2_async_subdev;
> > >>>
> > >>> #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
> > >>>
> > >>> @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle
> > >>> *fwnode,
> > >>> */
> > >>> void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
> > >>>
> > >>> +/**
> > >>> + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode
> > >>> endpoints in a
> > >>> + * device node
> > >>> + * @dev: the device the endpoints of which are to be parsed
> > >>> + * @notifier: notifier for @dev
> > >>> + * @asd_struct_size: size of the driver's async sub-device struct,
> > >>> including
> > >>> + * sizeof(struct v4l2_async_subdev). The &struct
> > >>> + * v4l2_async_subdev shall be the first member of
> > >>> + * the driver's async sub-device struct, i.e. both
> > >>> + * begin at the same memory address.
> > >>> + * @parse_endpoint: Driver's callback function called on each V4L2
> > >>> fwnode
> > >>> + * endpoint. Optional.
> > >>> + * Return: %0 on success
> > >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> > >>> + * should not be considered as an error
> > >>> + * %-EINVAL if the endpoint configuration is invalid
> > >>> + *
> > >>> + * Parse the fwnode endpoints of the @dev device and populate the async
> > >>> sub-
> > >>> + * devices array of the notifier. The @parse_endpoint callback function
> > >>> is
> > >>> + * called for each endpoint with the corresponding async sub-device
> > >>> pointer to
> > >>> + * let the caller initialize the driver-specific part of the async sub-
> > >>> device
> > >>> + * structure.
> > >>> + *
> > >>> + * The notifier memory shall be zeroed before this function is called
> > >>> on the
> > >>> + * notifier.
> > >>> + *
> > >>> + * This function may not be called on a registered notifier and may be
> > >>> called on
> > >>> + * a notifier only once.
> > >>> + *
> > >>> + * Do not change the notifier's subdevs array, take references to the
> > >>> subdevs
> > >>> + * array itself or change the notifier's num_subdevs field. This is
> > >>> because this
> > >>> + * function allocates and reallocates the subdevs array based on
> > >>> parsing
> > >>> + * endpoints.
> > >>> + *
> > >>> + * The @struct v4l2_fwnode_endpoint passed to the callback function
> > >>> + * @parse_endpoint is released once the function is finished. If there
> > >>> is a need
> > >>> + * to retain that configuration, the user needs to allocate memory for
> > >>> it.
> > >>> + *
> > >>> + * Any notifier populated using this function must be released with a
> > >>> call to
> > >>> + * v4l2_async_notifier_release() after it has been unregistered and the
> > >>> async
> > >>> + * sub-devices are no longer in use, even if the function returned an
> > >>> error.
> > >>> + *
> > >>> + * Return: %0 on success, including when no async sub-devices are found
> > >>> + * %-ENOMEM if memory allocation failed
> > >>> + * %-EINVAL if graph or endpoint parsing failed
> > >>> + * Other error codes as returned by @parse_endpoint
> > >>> + */
> > >>> +int v4l2_async_notifier_parse_fwnode_endpoints(
> > >>> + struct device *dev, struct v4l2_async_notifier *notifier,
> > >>> + size_t asd_struct_size,
> > >>> + int (*parse_endpoint)(struct device *dev,
> > >>> + struct v4l2_fwnode_endpoint *vep,
> > >>> + struct v4l2_async_subdev *asd));
> > >>> +
> > >>> +/**
> > >>> + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2
> > >>> fwnode
> > >>> + * endpoints of a port in a
> > >>> + * device node
> > >>> + * @dev: the device the endpoints of which are to be parsed
> > >>> + * @notifier: notifier for @dev
> > >>> + * @asd_struct_size: size of the driver's async sub-device struct,
> > >>> including
> > >>> + * sizeof(struct v4l2_async_subdev). The &struct
> > >>> + * v4l2_async_subdev shall be the first member of
> > >>> + * the driver's async sub-device struct, i.e. both
> > >>> + * begin at the same memory address.
> > >>> + * @port: port number where endpoints are to be parsed
> > >>> + * @parse_endpoint: Driver's callback function called on each V4L2
> > >>> fwnode
> > >>> + * endpoint. Optional.
> > >>> + * Return: %0 on success
> > >>> + * %-ENOTCONN if the endpoint is to be skipped but this
> > >>> + * should not be considered as an error
> > >>> + * %-EINVAL if the endpoint configuration is invalid
> > >>> + *
> > >>> + * This function is just like
> > >>> @v4l2_async_notifier_parse_fwnode_endpoints with
> > >>> + * the exception that it only parses endpoints in a given port. This is
> > >>> useful
> > >>> + * on devices that have both sinks and sources: the async sub-devices
> > >>> connected
> > >>
> > >> on -> for
> > >>
> > >>> + * to sources have already been set up by another driver (on capture
> > >>> devices).
> > >>
> > >> on -> for
> > >
> > > Agreed on both.
> > >
> > >> So if I understand this correctly for devices with both sinks and sources
> > >> you use this function to just parse the sink ports. And you have to give
> > >> explicit port numbers since you can't tell from parsing the device tree
> > >> if a port is a sink or source port, right? Only the driver knows this.
> > >
> > > Correct. The graph data structure in DT isn't directed, so this is only
> > > known by the driver.
> >
> > I think this should be clarified.
> >
> > I wonder if there is any way around it. I don't have time to dig into this,
> > but isn't it possible to tell that the source ports are already configured?
>
> Please also note that it's not always source ports, it depends in which
> direction we want to traverse the graph. The usual way is from master to
> slave, so from source to sink for capture devices but from sink to source for
> output devices.
>
> It's a bit of a mess, and this is part of the reason why I don't think sub-
> notifiers are the best idea. It would be better in my opinion to maintain a
> single list of async matches, which would be gradually enriched by subdevices
> as they are probed. This would help detecting and handling duplicates.
Well, there are indeed corner cases looming ahead where a driver might not
have enough information on what to parse and what not to. What I'd still do
is to proceed with what likely addresses more than 95 % of the cases
imaginable, and all we have today.
In the future setting up async sub-devices and parsing endpoints need to be
separated. With that, drivers won't need to know anymore which ports to
parse and which ones not. Creating links to the newly V4L2 async registered
sub-devices could be added to this. This will be more complicated than just
expressing an idea though. :-)
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-15 14:17 ` [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints Sakari Ailus
2017-09-16 7:04 ` Pavel Machek
@ 2017-09-19 11:40 ` Laurent Pinchart
2017-09-19 12:41 ` Sakari Ailus
2017-09-19 12:43 ` Sakari Ailus
1 sibling, 2 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:40 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:05 EEST Sakari Ailus wrote:
> Instead of using driver implementation, use
Did you mean s/using driver implementation/using a driver implementation/ (or
perhaps "custom driver implementation") ?
> v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> of the device.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
> drivers/media/platform/omap3isp/isp.c | 115 ++++++++++---------------------
> drivers/media/platform/omap3isp/isp.h | 5 +-
> 2 files changed, 37 insertions(+), 83 deletions(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c
> b/drivers/media/platform/omap3isp/isp.c index 1a428fe9f070..a546cf774d40
> 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
[snip]
> @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> + isp_fwnode_parse);
> if (ret < 0)
The documentation in patch 05/25 states that v4l2_async_notifier_release()
should be called even if v4l2_async_notifier_parse_fwnode_endpoints() fails. I
don't think that's needed here, so you might want to update the documentation
(and possibly the implementation of the function).
Apart from that,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> return ret;
>
> @@ -2407,6 +2363,7 @@ static int isp_probe(struct platform_device *pdev)
> __omap3isp_put(isp, false);
> error:
> mutex_destroy(&isp->isp_mutex);
> + v4l2_async_notifier_release(&isp->notifier);
>
> return ret;
> }
[snip]
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 07/25] rcar-vin: Use generic parser for parsing fwnode endpoints
2017-09-15 14:17 ` Sakari Ailus
@ 2017-09-19 11:53 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:53 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:06 EEST Sakari Ailus wrote:
> Instead of using driver implementation, use
Same comment as for patch 06/25.
> v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> of the device.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> ---
> drivers/media/platform/rcar-vin/rcar-core.c | 112 ++++++++-----------------
> drivers/media/platform/rcar-vin/rcar-dma.c | 10 +--
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 ++--
> drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
> 4 files changed, 48 insertions(+), 92 deletions(-)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-core.c
> b/drivers/media/platform/rcar-vin/rcar-core.c index
> 142de447aaaa..62b4a94f9a39 100644
> --- a/drivers/media/platform/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/rcar-vin/rcar-core.c
[snip]
> @@ -120,117 +121,70 @@ static int rvin_digital_notify_bound(struct
[snip]
> -static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,
> - struct device_node *ep,
> - struct v4l2_mbus_config *mbus_cfg)
> +static int rvin_digital_parse_v4l2(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd)
> {
> - struct v4l2_fwnode_endpoint v4l2_ep;
> - int ret;
> + struct rvin_dev *vin = dev_get_drvdata(dev);
Doesn't this show that we miss a context argument to the callback function ?
Storing the context in device driver data is probably OK if the driver parsing
the endpoints controls the struct device, but is that always the case ?
> + struct rvin_graph_entity *rvge =
> + container_of(asd, struct rvin_graph_entity, asd);
>
> - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep);
> - if (ret) {
> - vin_err(vin, "Could not parse v4l2 endpoint\n");
> - return -EINVAL;
> - }
> + if (vep->base.port || vep->base.id)
> + return -ENOTCONN;
>
> - mbus_cfg->type = v4l2_ep.bus_type;
> + rvge->mbus_cfg.type = vep->bus_type;
>
> - switch (mbus_cfg->type) {
> + switch (rvge->mbus_cfg.type) {
> case V4L2_MBUS_PARALLEL:
> vin_dbg(vin, "Found PARALLEL media bus\n");
> - mbus_cfg->flags = v4l2_ep.bus.parallel.flags;
> + rvge->mbus_cfg.flags = vep->bus.parallel.flags;
> break;
> case V4L2_MBUS_BT656:
> vin_dbg(vin, "Found BT656 media bus\n");
> - mbus_cfg->flags = 0;
> + rvge->mbus_cfg.flags = 0;
> break;
> default:
> vin_err(vin, "Unknown media bus type\n");
> return -EINVAL;
> }
>
> - return 0;
> -}
> -
> -static int rvin_digital_graph_parse(struct rvin_dev *vin)
> -{
> - struct device_node *ep, *np;
> - int ret;
> -
> - vin->digital.asd.match.fwnode.fwnode = NULL;
> - vin->digital.subdev = NULL;
> -
> - /*
> - * Port 0 id 0 is local digital input, try to get it.
> - * Not all instances can or will have this, that is OK
> - */
> - ep = of_graph_get_endpoint_by_regs(vin->dev->of_node, 0, 0);
> - if (!ep)
> - return 0;
> -
> - np = of_graph_get_remote_port_parent(ep);
> - if (!np) {
> - vin_err(vin, "No remote parent for digital input\n");
> - of_node_put(ep);
> - return -EINVAL;
> - }
> - of_node_put(np);
> -
> - ret = rvin_digitial_parse_v4l2(vin, ep, &vin->digital.mbus_cfg);
> - of_node_put(ep);
> - if (ret)
> - return ret;
> -
> - vin->digital.asd.match.fwnode.fwnode = of_fwnode_handle(np);
> - vin->digital.asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
> + vin->digital = rvge;
>
> return 0;
> }
>
> static int rvin_digital_graph_init(struct rvin_dev *vin)
> {
> - struct v4l2_async_subdev **subdevs = NULL;
> int ret;
>
> - ret = rvin_digital_graph_parse(vin);
> + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> + vin->dev, &vin->notifier,
> + sizeof(struct rvin_graph_entity), rvin_digital_parse_v4l2);
> if (ret)
> return ret;
>
> - if (!vin->digital.asd.match.fwnode.fwnode) {
> - vin_dbg(vin, "No digital subdevice found\n");
> - return -ENODEV;
> - }
> -
> - /* Register the subdevices notifier. */
> - subdevs = devm_kzalloc(vin->dev, sizeof(*subdevs), GFP_KERNEL);
> - if (subdevs == NULL)
> - return -ENOMEM;
> -
> - subdevs[0] = &vin->digital.asd;
> -
> - vin_dbg(vin, "Found digital subdevice %pOF\n",
> - to_of_node(subdevs[0]->match.fwnode.fwnode));
> + if (vin->digital)
> + vin_dbg(vin, "Found digital subdevice %pOF\n",
> + to_of_node(
> + vin->digital->asd.match.fwnode.fwnode));
Isn't this is a change in behaviour ? The driver currently returns -ENODEV
when no digital subdev is found.
> - vin->notifier.num_subdevs = 1;
> - vin->notifier.subdevs = subdevs;
> vin->notifier.bound = rvin_digital_notify_bound;
> vin->notifier.unbind = rvin_digital_notify_unbind;
> vin->notifier.complete = rvin_digital_notify_complete;
> -
> ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier);
> if (ret < 0) {
> vin_err(vin, "Notifier registration failed\n");
[snip]
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 07/25] rcar-vin: Use generic parser for parsing fwnode endpoints
@ 2017-09-19 11:53 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:53 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:06 EEST Sakari Ailus wrote:
> Instead of using driver implementation, use
Same comment as for patch 06/25.
> v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> of the device.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
> drivers/media/platform/rcar-vin/rcar-core.c | 112 ++++++++-----------------
> drivers/media/platform/rcar-vin/rcar-dma.c | 10 +--
> drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 ++--
> drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
> 4 files changed, 48 insertions(+), 92 deletions(-)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-core.c
> b/drivers/media/platform/rcar-vin/rcar-core.c index
> 142de447aaaa..62b4a94f9a39 100644
> --- a/drivers/media/platform/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/rcar-vin/rcar-core.c
[snip]
> @@ -120,117 +121,70 @@ static int rvin_digital_notify_bound(struct
[snip]
> -static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,
> - struct device_node *ep,
> - struct v4l2_mbus_config *mbus_cfg)
> +static int rvin_digital_parse_v4l2(struct device *dev,
> + struct v4l2_fwnode_endpoint *vep,
> + struct v4l2_async_subdev *asd)
> {
> - struct v4l2_fwnode_endpoint v4l2_ep;
> - int ret;
> + struct rvin_dev *vin = dev_get_drvdata(dev);
Doesn't this show that we miss a context argument to the callback function ?
Storing the context in device driver data is probably OK if the driver parsing
the endpoints controls the struct device, but is that always the case ?
> + struct rvin_graph_entity *rvge =
> + container_of(asd, struct rvin_graph_entity, asd);
>
> - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep);
> - if (ret) {
> - vin_err(vin, "Could not parse v4l2 endpoint\n");
> - return -EINVAL;
> - }
> + if (vep->base.port || vep->base.id)
> + return -ENOTCONN;
>
> - mbus_cfg->type = v4l2_ep.bus_type;
> + rvge->mbus_cfg.type = vep->bus_type;
>
> - switch (mbus_cfg->type) {
> + switch (rvge->mbus_cfg.type) {
> case V4L2_MBUS_PARALLEL:
> vin_dbg(vin, "Found PARALLEL media bus\n");
> - mbus_cfg->flags = v4l2_ep.bus.parallel.flags;
> + rvge->mbus_cfg.flags = vep->bus.parallel.flags;
> break;
> case V4L2_MBUS_BT656:
> vin_dbg(vin, "Found BT656 media bus\n");
> - mbus_cfg->flags = 0;
> + rvge->mbus_cfg.flags = 0;
> break;
> default:
> vin_err(vin, "Unknown media bus type\n");
> return -EINVAL;
> }
>
> - return 0;
> -}
> -
> -static int rvin_digital_graph_parse(struct rvin_dev *vin)
> -{
> - struct device_node *ep, *np;
> - int ret;
> -
> - vin->digital.asd.match.fwnode.fwnode = NULL;
> - vin->digital.subdev = NULL;
> -
> - /*
> - * Port 0 id 0 is local digital input, try to get it.
> - * Not all instances can or will have this, that is OK
> - */
> - ep = of_graph_get_endpoint_by_regs(vin->dev->of_node, 0, 0);
> - if (!ep)
> - return 0;
> -
> - np = of_graph_get_remote_port_parent(ep);
> - if (!np) {
> - vin_err(vin, "No remote parent for digital input\n");
> - of_node_put(ep);
> - return -EINVAL;
> - }
> - of_node_put(np);
> -
> - ret = rvin_digitial_parse_v4l2(vin, ep, &vin->digital.mbus_cfg);
> - of_node_put(ep);
> - if (ret)
> - return ret;
> -
> - vin->digital.asd.match.fwnode.fwnode = of_fwnode_handle(np);
> - vin->digital.asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
> + vin->digital = rvge;
>
> return 0;
> }
>
> static int rvin_digital_graph_init(struct rvin_dev *vin)
> {
> - struct v4l2_async_subdev **subdevs = NULL;
> int ret;
>
> - ret = rvin_digital_graph_parse(vin);
> + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> + vin->dev, &vin->notifier,
> + sizeof(struct rvin_graph_entity), rvin_digital_parse_v4l2);
> if (ret)
> return ret;
>
> - if (!vin->digital.asd.match.fwnode.fwnode) {
> - vin_dbg(vin, "No digital subdevice found\n");
> - return -ENODEV;
> - }
> -
> - /* Register the subdevices notifier. */
> - subdevs = devm_kzalloc(vin->dev, sizeof(*subdevs), GFP_KERNEL);
> - if (subdevs == NULL)
> - return -ENOMEM;
> -
> - subdevs[0] = &vin->digital.asd;
> -
> - vin_dbg(vin, "Found digital subdevice %pOF\n",
> - to_of_node(subdevs[0]->match.fwnode.fwnode));
> + if (vin->digital)
> + vin_dbg(vin, "Found digital subdevice %pOF\n",
> + to_of_node(
> + vin->digital->asd.match.fwnode.fwnode));
Isn't this is a change in behaviour ? The driver currently returns -ENODEV
when no digital subdev is found.
> - vin->notifier.num_subdevs = 1;
> - vin->notifier.subdevs = subdevs;
> vin->notifier.bound = rvin_digital_notify_bound;
> vin->notifier.unbind = rvin_digital_notify_unbind;
> vin->notifier.complete = rvin_digital_notify_complete;
> -
> ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier);
> if (ret < 0) {
> vin_err(vin, "Notifier registration failed\n");
[snip]
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 08/25] omap3isp: Fix check for our own sub-devices
2017-09-15 14:17 ` [PATCH v13 08/25] omap3isp: Fix check for our own sub-devices Sakari Ailus
@ 2017-09-19 11:55 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:55 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:07 EEST Sakari Ailus wrote:
> We only want to link sub-devices that were bound to the async notifier the
> isp driver registered but there may be other sub-devices in the
> v4l2_device as well. Check for the correct async notifier.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> ---
> drivers/media/platform/omap3isp/isp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c
> b/drivers/media/platform/omap3isp/isp.c index a546cf774d40..3b1a9cd0e591
> 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -2155,7 +2155,7 @@ static int isp_subdev_notifier_complete(struct
> v4l2_async_notifier *async) return ret;
>
> list_for_each_entry(sd, &v4l2_dev->subdevs, list) {
> - if (!sd->asd)
> + if (sd->notifier != &isp->notifier)
> continue;
>
> ret = isp_link_entity(isp, &sd->entity,
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 08/25] omap3isp: Fix check for our own sub-devices
@ 2017-09-19 11:55 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:55 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:07 EEST Sakari Ailus wrote:
> We only want to link sub-devices that were bound to the async notifier the
> isp driver registered but there may be other sub-devices in the
> v4l2_device as well. Check for the correct async notifier.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/platform/omap3isp/isp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c
> b/drivers/media/platform/omap3isp/isp.c index a546cf774d40..3b1a9cd0e591
> 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -2155,7 +2155,7 @@ static int isp_subdev_notifier_complete(struct
> v4l2_async_notifier *async) return ret;
>
> list_for_each_entry(sd, &v4l2_dev->subdevs, list) {
> - if (!sd->asd)
> + if (sd->notifier != &isp->notifier)
> continue;
>
> ret = isp_link_entity(isp, &sd->entity,
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 09/25] omap3isp: Print the name of the entity where no source pads could be found
2017-09-15 14:17 ` Sakari Ailus
(?)
@ 2017-09-19 11:56 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 11:56 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:08 EEST Sakari Ailus wrote:
> If no source pads are found in an entity, print the name of the entity.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/platform/omap3isp/isp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/omap3isp/isp.c
> b/drivers/media/platform/omap3isp/isp.c index 3b1a9cd0e591..9a694924e46e
> 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -1669,8 +1669,8 @@ static int isp_link_entity(
> break;
> }
> if (i == entity->num_pads) {
> - dev_err(isp->dev, "%s: no source pad in external entity\n",
> - __func__);
> + dev_err(isp->dev, "%s: no source pad in external entity %s\n",
> + __func__, entity->name);
> return -EINVAL;
> }
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-15 14:17 ` Sakari Ailus
@ 2017-09-19 12:01 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:01 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> Add three helper functions to call async operations callbacks. Besides
> simplifying callbacks, this allows async notifiers to have no ops set,
> i.e. it can be left NULL.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++++++++--------
> include/media/v4l2-async.h | 1 +
> 2 files changed, 37 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index 7b2125b3d62f..c35d04b9122f
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -25,6 +25,34 @@
> #include <media/v4l2-fwnode.h>
> #include <media/v4l2-subdev.h>
>
> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier *n,
> + struct v4l2_subdev *subdev,
> + struct v4l2_async_subdev *asd)
> +{
> + if (!n->ops || !n->ops->bound)
> + return 0;
> +
> + return n->ops->bound(n, subdev, asd);
> +}
> +
> +static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier *n,
> + struct v4l2_subdev *subdev,
> + struct v4l2_async_subdev *asd)
> +{
> + if (!n->ops || !n->ops->unbind)
> + return;
> +
> + n->ops->unbind(n, subdev, asd);
> +}
> +
> +static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
> +{
> + if (!n->ops || !n->ops->complete)
> + return 0;
> +
> + return n->ops->complete(n);
> +}
> +
Wouldn't it be enough to add a single v4l2_async_notifier_call() macro ?
#define v4l2_async_notifier_call(n, op, args...) \
((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
Apart from that,
Reviewed-by: Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>
> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev
> *asd) {
> #if IS_ENABLED(CONFIG_I2C)
> @@ -102,16 +130,13 @@ static int v4l2_async_match_notify(struct
> v4l2_async_notifier *notifier, {
> int ret;
>
> - if (notifier->ops->bound) {
> - ret = notifier->ops->bound(notifier, sd, asd);
> - if (ret < 0)
> - return ret;
> - }
> + ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> + if (ret < 0)
> + return ret;
>
> ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> if (ret < 0) {
> - if (notifier->ops->unbind)
> - notifier->ops->unbind(notifier, sd, asd);
> + v4l2_async_notifier_call_unbind(notifier, sd, asd);
> return ret;
> }
>
> @@ -123,8 +148,8 @@ static int v4l2_async_match_notify(struct
> v4l2_async_notifier *notifier, /* Move from the global subdevice list to
> notifier's done */
> list_move(&sd->async_list, ¬ifier->done);
>
> - if (list_empty(¬ifier->waiting) && notifier->ops->complete)
> - return notifier->ops->complete(notifier);
> + if (list_empty(¬ifier->waiting))
> + return v4l2_async_notifier_call_complete(notifier);
>
> return 0;
> }
> @@ -210,8 +235,7 @@ void v4l2_async_notifier_unregister(struct
> v4l2_async_notifier *notifier) list_for_each_entry_safe(sd, tmp,
> ¬ifier->done, async_list) { v4l2_async_cleanup(sd);
>
> - if (notifier->ops->unbind)
> - notifier->ops->unbind(notifier, sd, sd->asd);
> + v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> }
>
> mutex_unlock(&list_lock);
> @@ -300,8 +324,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev
> *sd)
>
> v4l2_async_cleanup(sd);
>
> - if (notifier->ops->unbind)
> - notifier->ops->unbind(notifier, sd, sd->asd);
> + v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
>
> mutex_unlock(&list_lock);
> }
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index 3c48f8b66d12..3bc8a7c0d83f 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -164,4 +164,5 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd);
> * @sd: pointer to &struct v4l2_subdev
> */
> void v4l2_async_unregister_subdev(struct v4l2_subdev *sd);
> +
> #endif
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
@ 2017-09-19 12:01 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:01 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> Add three helper functions to call async operations callbacks. Besides
> simplifying callbacks, this allows async notifiers to have no ops set,
> i.e. it can be left NULL.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++++++++--------
> include/media/v4l2-async.h | 1 +
> 2 files changed, 37 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index 7b2125b3d62f..c35d04b9122f
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -25,6 +25,34 @@
> #include <media/v4l2-fwnode.h>
> #include <media/v4l2-subdev.h>
>
> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier *n,
> + struct v4l2_subdev *subdev,
> + struct v4l2_async_subdev *asd)
> +{
> + if (!n->ops || !n->ops->bound)
> + return 0;
> +
> + return n->ops->bound(n, subdev, asd);
> +}
> +
> +static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier *n,
> + struct v4l2_subdev *subdev,
> + struct v4l2_async_subdev *asd)
> +{
> + if (!n->ops || !n->ops->unbind)
> + return;
> +
> + n->ops->unbind(n, subdev, asd);
> +}
> +
> +static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
> +{
> + if (!n->ops || !n->ops->complete)
> + return 0;
> +
> + return n->ops->complete(n);
> +}
> +
Wouldn't it be enough to add a single v4l2_async_notifier_call() macro ?
#define v4l2_async_notifier_call(n, op, args...) \
((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
Apart from that,
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev
> *asd) {
> #if IS_ENABLED(CONFIG_I2C)
> @@ -102,16 +130,13 @@ static int v4l2_async_match_notify(struct
> v4l2_async_notifier *notifier, {
> int ret;
>
> - if (notifier->ops->bound) {
> - ret = notifier->ops->bound(notifier, sd, asd);
> - if (ret < 0)
> - return ret;
> - }
> + ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> + if (ret < 0)
> + return ret;
>
> ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> if (ret < 0) {
> - if (notifier->ops->unbind)
> - notifier->ops->unbind(notifier, sd, asd);
> + v4l2_async_notifier_call_unbind(notifier, sd, asd);
> return ret;
> }
>
> @@ -123,8 +148,8 @@ static int v4l2_async_match_notify(struct
> v4l2_async_notifier *notifier, /* Move from the global subdevice list to
> notifier's done */
> list_move(&sd->async_list, ¬ifier->done);
>
> - if (list_empty(¬ifier->waiting) && notifier->ops->complete)
> - return notifier->ops->complete(notifier);
> + if (list_empty(¬ifier->waiting))
> + return v4l2_async_notifier_call_complete(notifier);
>
> return 0;
> }
> @@ -210,8 +235,7 @@ void v4l2_async_notifier_unregister(struct
> v4l2_async_notifier *notifier) list_for_each_entry_safe(sd, tmp,
> ¬ifier->done, async_list) { v4l2_async_cleanup(sd);
>
> - if (notifier->ops->unbind)
> - notifier->ops->unbind(notifier, sd, sd->asd);
> + v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> }
>
> mutex_unlock(&list_lock);
> @@ -300,8 +324,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev
> *sd)
>
> v4l2_async_cleanup(sd);
>
> - if (notifier->ops->unbind)
> - notifier->ops->unbind(notifier, sd, sd->asd);
> + v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
>
> mutex_unlock(&list_lock);
> }
> diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> index 3c48f8b66d12..3bc8a7c0d83f 100644
> --- a/include/media/v4l2-async.h
> +++ b/include/media/v4l2-async.h
> @@ -164,4 +164,5 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd);
> * @sd: pointer to &struct v4l2_subdev
> */
> void v4l2_async_unregister_subdev(struct v4l2_subdev *sd);
> +
> #endif
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 12/25] v4l: async: Register sub-devices before calling bound callback
2017-09-15 14:17 ` [PATCH v13 12/25] v4l: async: Register sub-devices before calling bound callback Sakari Ailus
@ 2017-09-19 12:01 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:01 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:11 EEST Sakari Ailus wrote:
> Register the sub-device before calling the notifier's bound callback.
> Doing this the other way around is problematic as the struct v4l2_device
> has not assigned for the sub-device yet and may be required by the bound
> callback.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index c35d04b9122f..9895b610e2a0
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -130,13 +130,13 @@ static int v4l2_async_match_notify(struct
> v4l2_async_notifier *notifier, {
> int ret;
>
> - ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> + ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> if (ret < 0)
> return ret;
>
> - ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> + ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> if (ret < 0) {
> - v4l2_async_notifier_call_unbind(notifier, sd, asd);
> + v4l2_device_unregister_subdev(sd);
> return ret;
> }
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
2017-09-15 14:17 ` [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs Sakari Ailus
@ 2017-09-19 12:04 ` Laurent Pinchart
2017-09-19 12:52 ` Laurent Pinchart
0 siblings, 1 reply; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:04 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:12 EEST Sakari Ailus wrote:
> The information on how many async sub-devices would be bindable to a
> notifier is typically dependent on information from platform firmware and
> it's not driver's business to be aware of that.
>
> Many V4L2 main drivers are perfectly usable (and useful) without async
> sub-devices and so if there aren't any around, just proceed call the
> notifier's complete callback immediately without registering the notifier
> itself.
>
> If a driver needs to check whether there are async sub-devices available,
> it can be done by inspecting the notifier's num_subdevs field which tells
> the number of async sub-devices.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index 9895b610e2a0..4be2f16af051
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -170,14 +170,16 @@ int v4l2_async_notifier_register(struct v4l2_device
> *v4l2_dev, struct v4l2_async_subdev *asd;
> int i;
>
> - if (!v4l2_dev || !notifier->num_subdevs ||
> - notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> + if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> return -EINVAL;
>
> notifier->v4l2_dev = v4l2_dev;
> INIT_LIST_HEAD(¬ifier->waiting);
> INIT_LIST_HEAD(¬ifier->done);
>
> + if (!notifier->num_subdevs)
> + return v4l2_async_notifier_call_complete(notifier);
> +
> for (i = 0; i < notifier->num_subdevs; i++) {
> asd = notifier->subdevs[i];
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 21/25] smiapp: Add support for flash and lens devices
2017-09-15 14:17 ` Sakari Ailus
@ 2017-09-19 12:08 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:08 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:20 EEST Sakari Ailus wrote:
> Parse async sub-devices by using
> v4l2_subdev_fwnode_reference_parse_sensor_common().
>
> These types devices aren't directly related to the sensor, but are
> nevertheless handled by the smiapp driver due to the relationship of these
> component to the main part of the camera module --- the sensor.
>
> This does not yet address providing the user space with information on how
> to associate the sensor or lens devices but the kernel now has the
> necessary information to do that.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
Something is bothering me here, not so much in the contents of the patch
itself than in its nature. There are four patches in this series that add
support for flash and lens devices to the smiapp, et8ek8, ov5670 and ov13858
drivers. We have way more sensor drivers than that, and I don't really want to
patch them all to support flash and lens. I believe a less intrusive approach,
more focussed on the V4L2 core, is needed.
> ---
> drivers/media/i2c/smiapp/smiapp-core.c | 38 ++++++++++++++++++++++++-------
> drivers/media/i2c/smiapp/smiapp.h | 4 +++-
> 2 files changed, 33 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/i2c/smiapp/smiapp-core.c
> b/drivers/media/i2c/smiapp/smiapp-core.c index 700f433261d0..a4735a96ea41
> 100644
> --- a/drivers/media/i2c/smiapp/smiapp-core.c
> +++ b/drivers/media/i2c/smiapp/smiapp-core.c
> @@ -31,7 +31,7 @@
> #include <linux/regulator/consumer.h>
> #include <linux/slab.h>
> #include <linux/smiapp.h>
> -#include <linux/v4l2-mediabus.h>
> +#include <media/v4l2-async.h>
> #include <media/v4l2-fwnode.h>
> #include <media/v4l2-device.h>
>
> @@ -2887,17 +2887,24 @@ static int smiapp_probe(struct i2c_client *client,
> v4l2_i2c_subdev_init(&sensor->src->sd, client, &smiapp_ops);
> sensor->src->sd.internal_ops = &smiapp_internal_src_ops;
>
> + rval = v4l2_async_notifier_parse_fwnode_sensor_common(
> + &client->dev, &sensor->notifier);
> + if (rval < 0)
> + return rval;
> +
> sensor->vana = devm_regulator_get(&client->dev, "vana");
> if (IS_ERR(sensor->vana)) {
> dev_err(&client->dev, "could not get regulator for vana\n");
> - return PTR_ERR(sensor->vana);
> + rval = PTR_ERR(sensor->vana);
> + goto out_release_async_notifier;
> }
>
> sensor->ext_clk = devm_clk_get(&client->dev, NULL);
> if (IS_ERR(sensor->ext_clk)) {
> dev_err(&client->dev, "could not get clock (%ld)\n",
> PTR_ERR(sensor->ext_clk));
> - return -EPROBE_DEFER;
> + rval = -EPROBE_DEFER;
> + goto out_release_async_notifier;
> }
>
> rval = clk_set_rate(sensor->ext_clk, sensor->hwcfg->ext_clk);
> @@ -2905,17 +2912,19 @@ static int smiapp_probe(struct i2c_client *client,
> dev_err(&client->dev,
> "unable to set clock freq to %u\n",
> sensor->hwcfg->ext_clk);
> - return rval;
> + goto out_release_async_notifier;
> }
>
> sensor->xshutdown = devm_gpiod_get_optional(&client->dev, "xshutdown",
> GPIOD_OUT_LOW);
> - if (IS_ERR(sensor->xshutdown))
> - return PTR_ERR(sensor->xshutdown);
> + if (IS_ERR(sensor->xshutdown)) {
> + rval = PTR_ERR(sensor->xshutdown);
> + goto out_release_async_notifier;
> + }
>
> rval = smiapp_power_on(&client->dev);
> if (rval < 0)
> - return rval;
> + goto out_release_async_notifier;
>
> rval = smiapp_identify_module(sensor);
> if (rval) {
> @@ -3092,9 +3101,14 @@ static int smiapp_probe(struct i2c_client *client,
> if (rval < 0)
> goto out_media_entity_cleanup;
>
> + rval = v4l2_async_subdev_notifier_register(&sensor->src->sd,
> + &sensor->notifier);
> + if (rval)
> + goto out_media_entity_cleanup;
> +
> rval = v4l2_async_register_subdev(&sensor->src->sd);
> if (rval < 0)
> - goto out_media_entity_cleanup;
> + goto out_unregister_async_notifier;
>
> pm_runtime_set_active(&client->dev);
> pm_runtime_get_noresume(&client->dev);
> @@ -3105,6 +3119,9 @@ static int smiapp_probe(struct i2c_client *client,
>
> return 0;
>
> +out_unregister_async_notifier:
> + v4l2_async_notifier_unregister(&sensor->notifier);
> +
> out_media_entity_cleanup:
> media_entity_cleanup(&sensor->src->sd.entity);
>
> @@ -3114,6 +3131,9 @@ static int smiapp_probe(struct i2c_client *client,
> out_power_off:
> smiapp_power_off(&client->dev);
>
> +out_release_async_notifier:
> + v4l2_async_notifier_release(&sensor->notifier);
> +
> return rval;
> }
>
> @@ -3124,6 +3144,8 @@ static int smiapp_remove(struct i2c_client *client)
> unsigned int i;
>
> v4l2_async_unregister_subdev(subdev);
> + v4l2_async_notifier_unregister(&sensor->notifier);
> + v4l2_async_notifier_release(&sensor->notifier);
>
> pm_runtime_disable(&client->dev);
> if (!pm_runtime_status_suspended(&client->dev))
> diff --git a/drivers/media/i2c/smiapp/smiapp.h
> b/drivers/media/i2c/smiapp/smiapp.h index f74d695018b9..be92cb5713f4 100644
> --- a/drivers/media/i2c/smiapp/smiapp.h
> +++ b/drivers/media/i2c/smiapp/smiapp.h
> @@ -20,9 +20,10 @@
> #define __SMIAPP_PRIV_H_
>
> #include <linux/mutex.h>
> +#include <media/i2c/smiapp.h>
> +#include <media/v4l2-async.h>
> #include <media/v4l2-ctrls.h>
> #include <media/v4l2-subdev.h>
> -#include <media/i2c/smiapp.h>
>
> #include "smiapp-pll.h"
> #include "smiapp-reg.h"
> @@ -172,6 +173,7 @@ struct smiapp_subdev {
> * struct smiapp_sensor - Main device structure
> */
> struct smiapp_sensor {
> + struct v4l2_async_notifier notifier;
> /*
> * "mutex" is used to serialise access to all fields here
> * except v4l2_ctrls at the end of the struct. "mutex" is also
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 21/25] smiapp: Add support for flash and lens devices
@ 2017-09-19 12:08 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:08 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:20 EEST Sakari Ailus wrote:
> Parse async sub-devices by using
> v4l2_subdev_fwnode_reference_parse_sensor_common().
>
> These types devices aren't directly related to the sensor, but are
> nevertheless handled by the smiapp driver due to the relationship of these
> component to the main part of the camera module --- the sensor.
>
> This does not yet address providing the user space with information on how
> to associate the sensor or lens devices but the kernel now has the
> necessary information to do that.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
Something is bothering me here, not so much in the contents of the patch
itself than in its nature. There are four patches in this series that add
support for flash and lens devices to the smiapp, et8ek8, ov5670 and ov13858
drivers. We have way more sensor drivers than that, and I don't really want to
patch them all to support flash and lens. I believe a less intrusive approach,
more focussed on the V4L2 core, is needed.
> ---
> drivers/media/i2c/smiapp/smiapp-core.c | 38 ++++++++++++++++++++++++-------
> drivers/media/i2c/smiapp/smiapp.h | 4 +++-
> 2 files changed, 33 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/i2c/smiapp/smiapp-core.c
> b/drivers/media/i2c/smiapp/smiapp-core.c index 700f433261d0..a4735a96ea41
> 100644
> --- a/drivers/media/i2c/smiapp/smiapp-core.c
> +++ b/drivers/media/i2c/smiapp/smiapp-core.c
> @@ -31,7 +31,7 @@
> #include <linux/regulator/consumer.h>
> #include <linux/slab.h>
> #include <linux/smiapp.h>
> -#include <linux/v4l2-mediabus.h>
> +#include <media/v4l2-async.h>
> #include <media/v4l2-fwnode.h>
> #include <media/v4l2-device.h>
>
> @@ -2887,17 +2887,24 @@ static int smiapp_probe(struct i2c_client *client,
> v4l2_i2c_subdev_init(&sensor->src->sd, client, &smiapp_ops);
> sensor->src->sd.internal_ops = &smiapp_internal_src_ops;
>
> + rval = v4l2_async_notifier_parse_fwnode_sensor_common(
> + &client->dev, &sensor->notifier);
> + if (rval < 0)
> + return rval;
> +
> sensor->vana = devm_regulator_get(&client->dev, "vana");
> if (IS_ERR(sensor->vana)) {
> dev_err(&client->dev, "could not get regulator for vana\n");
> - return PTR_ERR(sensor->vana);
> + rval = PTR_ERR(sensor->vana);
> + goto out_release_async_notifier;
> }
>
> sensor->ext_clk = devm_clk_get(&client->dev, NULL);
> if (IS_ERR(sensor->ext_clk)) {
> dev_err(&client->dev, "could not get clock (%ld)\n",
> PTR_ERR(sensor->ext_clk));
> - return -EPROBE_DEFER;
> + rval = -EPROBE_DEFER;
> + goto out_release_async_notifier;
> }
>
> rval = clk_set_rate(sensor->ext_clk, sensor->hwcfg->ext_clk);
> @@ -2905,17 +2912,19 @@ static int smiapp_probe(struct i2c_client *client,
> dev_err(&client->dev,
> "unable to set clock freq to %u\n",
> sensor->hwcfg->ext_clk);
> - return rval;
> + goto out_release_async_notifier;
> }
>
> sensor->xshutdown = devm_gpiod_get_optional(&client->dev, "xshutdown",
> GPIOD_OUT_LOW);
> - if (IS_ERR(sensor->xshutdown))
> - return PTR_ERR(sensor->xshutdown);
> + if (IS_ERR(sensor->xshutdown)) {
> + rval = PTR_ERR(sensor->xshutdown);
> + goto out_release_async_notifier;
> + }
>
> rval = smiapp_power_on(&client->dev);
> if (rval < 0)
> - return rval;
> + goto out_release_async_notifier;
>
> rval = smiapp_identify_module(sensor);
> if (rval) {
> @@ -3092,9 +3101,14 @@ static int smiapp_probe(struct i2c_client *client,
> if (rval < 0)
> goto out_media_entity_cleanup;
>
> + rval = v4l2_async_subdev_notifier_register(&sensor->src->sd,
> + &sensor->notifier);
> + if (rval)
> + goto out_media_entity_cleanup;
> +
> rval = v4l2_async_register_subdev(&sensor->src->sd);
> if (rval < 0)
> - goto out_media_entity_cleanup;
> + goto out_unregister_async_notifier;
>
> pm_runtime_set_active(&client->dev);
> pm_runtime_get_noresume(&client->dev);
> @@ -3105,6 +3119,9 @@ static int smiapp_probe(struct i2c_client *client,
>
> return 0;
>
> +out_unregister_async_notifier:
> + v4l2_async_notifier_unregister(&sensor->notifier);
> +
> out_media_entity_cleanup:
> media_entity_cleanup(&sensor->src->sd.entity);
>
> @@ -3114,6 +3131,9 @@ static int smiapp_probe(struct i2c_client *client,
> out_power_off:
> smiapp_power_off(&client->dev);
>
> +out_release_async_notifier:
> + v4l2_async_notifier_release(&sensor->notifier);
> +
> return rval;
> }
>
> @@ -3124,6 +3144,8 @@ static int smiapp_remove(struct i2c_client *client)
> unsigned int i;
>
> v4l2_async_unregister_subdev(subdev);
> + v4l2_async_notifier_unregister(&sensor->notifier);
> + v4l2_async_notifier_release(&sensor->notifier);
>
> pm_runtime_disable(&client->dev);
> if (!pm_runtime_status_suspended(&client->dev))
> diff --git a/drivers/media/i2c/smiapp/smiapp.h
> b/drivers/media/i2c/smiapp/smiapp.h index f74d695018b9..be92cb5713f4 100644
> --- a/drivers/media/i2c/smiapp/smiapp.h
> +++ b/drivers/media/i2c/smiapp/smiapp.h
> @@ -20,9 +20,10 @@
> #define __SMIAPP_PRIV_H_
>
> #include <linux/mutex.h>
> +#include <media/i2c/smiapp.h>
> +#include <media/v4l2-async.h>
> #include <media/v4l2-ctrls.h>
> #include <media/v4l2-subdev.h>
> -#include <media/i2c/smiapp.h>
>
> #include "smiapp-pll.h"
> #include "smiapp-reg.h"
> @@ -172,6 +173,7 @@ struct smiapp_subdev {
> * struct smiapp_sensor - Main device structure
> */
> struct smiapp_sensor {
> + struct v4l2_async_notifier notifier;
> /*
> * "mutex" is used to serialise access to all fields here
> * except v4l2_ctrls at the end of the struct. "mutex" is also
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 11:35 ` Laurent Pinchart
@ 2017-09-19 12:11 ` Sakari Ailus
[not found] ` <20170919121131.6m4cf4ftzhq7vpnc-z7MJbOB4PBP+e+fPlCVrcFDQ4js95KgL@public.gmane.org>
0 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:11 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 02:35:01PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
Thanks for the review!
>
> On Friday, 15 September 2017 17:17:04 EEST Sakari Ailus wrote:
> > Add two functions for parsing devices graph endpoints:
> > v4l2_async_notifier_parse_fwnode_endpoints and
> > v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> > over all endpoints whereas the latter only iterates over the endpoints in
> > a given port.
> >
> > The former is mostly useful for existing drivers that currently implement
> > the iteration over all the endpoints themselves whereas the latter is
> > especially intended for devices with both sinks and sources: async
> > sub-devices for external devices connected to the device's sources will
> > have already been set up, or they are part of the master device.
>
> Did you mean s/or they/as they/ ?
No. There are two options here: either the sub-devices a sub-device is
connected to (through a graph endpoint) is instantiated through the async
framework *or* through the master device driver. But not by both of them at
the same time.
>
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> > drivers/media/v4l2-core/v4l2-async.c | 30 ++++++
> > drivers/media/v4l2-core/v4l2-fwnode.c | 185 +++++++++++++++++++++++++++++++
> > include/media/v4l2-async.h | 24 ++++-
> > include/media/v4l2-fwnode.h | 117 +++++++++++++++++++++
> > 4 files changed, 354 insertions(+), 2 deletions(-)
>
> [snip]
>
> > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c
> > b/drivers/media/v4l2-core/v4l2-fwnode.c index 706f9e7b90f1..44ee35f6aad5
> > 100644
> > --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
>
> [snip]
>
> > +static int v4l2_async_notifier_fwnode_parse_endpoint(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + struct fwnode_handle *endpoint, unsigned int asd_struct_size,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd))
> > +{
> > + struct v4l2_async_subdev *asd;
> > + struct v4l2_fwnode_endpoint *vep;
> > + int ret = 0;
> > +
> > + asd = kzalloc(asd_struct_size, GFP_KERNEL);
> > + if (!asd)
> > + return -ENOMEM;
> > +
> > + asd->match.fwnode.fwnode =
> > + fwnode_graph_get_remote_port_parent(endpoint);
> > + if (!asd->match.fwnode.fwnode) {
> > + dev_warn(dev, "bad remote port parent\n");
> > + ret = -EINVAL;
> > + goto out_err;
> > + }
> > +
> > + /* Ignore endpoints the parsing of which failed. */
>
> I think this comment is outdated.
Hmm. Yes. I'll remove it.
>
> > + vep = v4l2_fwnode_endpoint_alloc_parse(endpoint);
> > + if (IS_ERR(vep)) {
> > + ret = PTR_ERR(vep);
> > + dev_warn(dev, "unable to parse V4L2 fwnode endpoint (%d)\n",
> > + ret);
> > + goto out_err;
> > + }
> > +
> > + ret = parse_endpoint ? parse_endpoint(dev, vep, asd) : 0;
> > + if (ret == -ENOTCONN)
> > + dev_dbg(dev, "ignoring endpoint %u,%u\n", vep->base.port,
> > + vep->base.id);
>
> How about "ignoring port@%u/endpoint@%u\n" ? It would make the message more
> explicit.
Works for me.
>
> > + else if (ret < 0)
> > + dev_warn(dev, "driver could not parse endpoint %u,%u (%d)\n",
>
> Same here.
>
> > + vep->base.port, vep->base.id, ret);
> > + v4l2_fwnode_endpoint_free(vep);
> > + if (ret < 0)
> > + goto out_err;
> > +
> > + asd->match_type = V4L2_ASYNC_MATCH_FWNODE;
>
> I'd move this line right before setting asd->match.fwnode.fwnode.
I'll move it.
>
> > + notifier->subdevs[notifier->num_subdevs] = asd;
> > + notifier->num_subdevs++;
> > +
> > + return 0;
> > +
> > +out_err:
> > + fwnode_handle_put(asd->match.fwnode.fwnode);
> > + kfree(asd);
> > +
> > + return ret == -ENOTCONN ? 0 : ret;
> > +}
> > +
> > +static int __v4l2_async_notifier_parse_fwnode_endpoints(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + size_t asd_struct_size, unsigned int port, bool has_port,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd))
> > +{
> > + struct fwnode_handle *fwnode = NULL;
> > + unsigned int max_subdevs = notifier->max_subdevs;
> > + int ret;
> > +
> > + if (WARN_ON(asd_struct_size < sizeof(struct v4l2_async_subdev)))
> > + return -EINVAL;
> > +
> > + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> > + dev_fwnode(dev), fwnode)); ) {
> > + if (!fwnode_device_is_available(
> > + fwnode_graph_get_port_parent(fwnode)))
>
> Doesn't fwnode_graph_get_port_parent() increment the refcount on the parent,
> which you should then release ?
Good catch. I'll fix this for v14.
>
> > + continue;
> > +
> > + if (has_port) {
> > + struct fwnode_endpoint ep;
> > +
> > + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> > + if (ret) {
> > + fwnode_handle_put(fwnode);
> > + return ret;
> > + }
> > +
> > + if (ep.port != port)
> > + continue;
> > + }
> > + max_subdevs++;
> > + }
> > +
> > + /* No subdevs to add? Return here. */
> > + if (max_subdevs == notifier->max_subdevs)
> > + return 0;
> > +
> > + ret = v4l2_async_notifier_realloc(notifier, max_subdevs);
> > + if (ret)
> > + return ret;
> > +
> > + for (fwnode = NULL; (fwnode = fwnode_graph_get_next_endpoint(
> > + dev_fwnode(dev), fwnode)); ) {
> > + if (!fwnode_device_is_available(
> > + fwnode_graph_get_port_parent(fwnode)))
>
> Same here.
Yes.
>
> > + continue;
> > +
> > + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> > + ret = -EINVAL;
> > + break;
> > + }
> > +
> > + if (has_port) {
> > + struct fwnode_endpoint ep;
> > +
> > + ret = fwnode_graph_parse_endpoint(fwnode, &ep);
> > + if (ret)
> > + break;
> > +
> > + if (ep.port != port)
> > + continue;
> > + }
> > +
> > + ret = v4l2_async_notifier_fwnode_parse_endpoint(
> > + dev, notifier, fwnode, asd_struct_size, parse_endpoint);
> > + if (ret < 0)
> > + break;
> > + }
> > +
> > + fwnode_handle_put(fwnode);
> > +
> > + return ret;
> > +}
>
> [snip]
>
> > diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> > index c69d8c8a66d0..96fa1afc00dd 100644
> > --- a/include/media/v4l2-async.h
> > +++ b/include/media/v4l2-async.h
> > @@ -18,7 +18,6 @@ struct device;
> > struct device_node;
> > struct v4l2_device;
> > struct v4l2_subdev;
> > -struct v4l2_async_notifier;
> >
> > /* A random max subdevice number, used to allocate an array on stack */
> > #define V4L2_MAX_SUBDEVS 128U
> > @@ -50,6 +49,10 @@ enum v4l2_async_match_type {
> > * @match: union of per-bus type matching data sets
> > * @list: used to link struct v4l2_async_subdev objects, waiting to be
> > * probed, to a notifier->waiting list
> > + *
> > + * When this struct is used as a member in a driver specific struct,
> > + * the driver specific struct shall contain the @struct
> > + * v4l2_async_subdev as its first member.
>
> Unless I'm mistaken @ is used to refer to function arguments (sphinx typesets
> it using <strong> in HTML). References to structures can be created with &.
> Have you compiled the documentation ? :-)
Yes, but I've probably changed it since doing so. I'll do that again before
v14.
>
> > */
> > struct v4l2_async_subdev {
> > enum v4l2_async_match_type match_type;
> > @@ -78,7 +81,8 @@ struct v4l2_async_subdev {
> > /**
> > * struct v4l2_async_notifier - v4l2_device notifier data
> > *
> > - * @num_subdevs: number of subdevices
> > + * @num_subdevs: number of subdevices used in the subdevs array
> > + * @max_subdevs: number of subdevices allocated in the subdevs array
> > * @subdevs: array of pointers to subdevice descriptors
> > * @v4l2_dev: pointer to struct v4l2_device
> > * @waiting: list of struct v4l2_async_subdev, waiting for their drivers
> > @@ -90,6 +94,7 @@ struct v4l2_async_subdev {
> > */
> > struct v4l2_async_notifier {
> > unsigned int num_subdevs;
> > + unsigned int max_subdevs;
> > struct v4l2_async_subdev **subdevs;
> > struct v4l2_device *v4l2_dev;
> > struct list_head waiting;
> > @@ -121,6 +126,21 @@ int v4l2_async_notifier_register(struct v4l2_device
> > *v4l2_dev, void v4l2_async_notifier_unregister(struct v4l2_async_notifier
> > *notifier);
> >
> > /**
> > + * v4l2_async_notifier_release - release notifier resources
> > + * @notifier: the notifier the resources of which are to be released
> > + *
> > + * Release memory resources related to a notifier, including the async
> > + * sub-devices allocated for the purposes of the notifier. The user is
> > + * responsible for releasing the notifier's resources after calling
> > + * @v4l2_async_notifier_parse_fwnode_endpoints.
>
> Don't use @. If you want sphinx to generate a link, just append () after the
> function name.
>
> > + *
> > + * There is no harm from calling v4l2_async_notifier_release in other
>
> Here too.
Ack.
>
> > + * cases as long as its memory has been zeroed after it has been
> > + * allocated.
>
> As the function WARNs for types other than V4L2_ASYNC_MATCH_FWNODE you might
> want to mention that in the documentation.
I wouldn't. The user would have to do something very wrong to get there.
The user isn't allowed to touch the notifier's subdevs array directly and
the existing functions only use fwnode matching. This is documented in the
user-visible parsing functions themselves.
>
> > + */
> > +void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier);
> > +
> > +/**
> > * v4l2_async_register_subdev - registers a sub-device to the asynchronous
> > * subdevice framework
> > *
> > diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
> > index 68eb22ba571b..83afac48ea6b 100644
> > --- a/include/media/v4l2-fwnode.h
> > +++ b/include/media/v4l2-fwnode.h
> > @@ -25,6 +25,8 @@
> > #include <media/v4l2-mediabus.h>
> >
> > struct fwnode_handle;
> > +struct v4l2_async_notifier;
> > +struct v4l2_async_subdev;
> >
> > #define V4L2_FWNODE_CSI2_MAX_DATA_LANES 4
> >
> > @@ -201,4 +203,119 @@ int v4l2_fwnode_parse_link(struct fwnode_handle
> > *fwnode, */
> > void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link);
> >
> > +/**
> > + * v4l2_async_notifier_parse_fwnode_endpoints - Parse V4L2 fwnode endpoints
> > in a
> > + * device node
> > + * @dev: the device the endpoints of which are to be parsed
> > + * @notifier: notifier for @dev
> > + * @asd_struct_size: size of the driver's async sub-device struct,
> > including
> > + * sizeof(struct v4l2_async_subdev). The &struct
> > + * v4l2_async_subdev shall be the first member of
> > + * the driver's async sub-device struct, i.e. both
> > + * begin at the same memory address.
> > + * @parse_endpoint: Driver's callback function called on each V4L2 fwnode
> > + * endpoint. Optional.
> > + * Return: %0 on success
> > + * %-ENOTCONN if the endpoint is to be skipped but this
> > + * should not be considered as an error
> > + * %-EINVAL if the endpoint configuration is invalid
> > + *
> > + * Parse the fwnode endpoints of the @dev device and populate the async
> > sub-
> > + * devices array of the notifier. The @parse_endpoint callback function is
> > + * called for each endpoint with the corresponding async sub-device pointer
> > to
> > + * let the caller initialize the driver-specific part of the async sub-
> > device
> > + * structure.
> > + *
> > + * The notifier memory shall be zeroed before this function is called on
> > the
> > + * notifier.
> > + *
> > + * This function may not be called on a registered notifier and may be
> > called on
> > + * a notifier only once.
> > + *
> > + * Do not change the notifier's subdevs array, take references to the
> > subdevs
> > + * array itself or change the notifier's num_subdevs field. This is because
> > this
> > + * function allocates and reallocates the subdevs array based on parsing
> > + * endpoints.
> > + *
> > + * The @struct v4l2_fwnode_endpoint passed to the callback function
> > + * @parse_endpoint is released once the function is finished. If there is a
> > need
> > + * to retain that configuration, the user needs to allocate memory for it.
> > + *
> > + * Any notifier populated using this function must be released with a call
> > to
> > + * v4l2_async_notifier_release() after it has been unregistered and the
> > async
> > + * sub-devices are no longer in use, even if the function returned an
> > error.
> > + *
> > + * Return: %0 on success, including when no async sub-devices are found
> > + * %-ENOMEM if memory allocation failed
> > + * %-EINVAL if graph or endpoint parsing failed
> > + * Other error codes as returned by @parse_endpoint
> > + */
> > +int v4l2_async_notifier_parse_fwnode_endpoints(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + size_t asd_struct_size,
> > + int (*parse_endpoint)(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd));
> > +
> > +/**
> > + * v4l2_async_notifier_parse_fwnode_endpoints_by_port - Parse V4L2 fwnode
> > + * endpoints of a port in a
> > + * device node
>
> This clearly shows that the function name is getting a bit long :-)
Yes. The arguments are few and the function is likely not used many times
in a driver.
If you have a better suggestion I'd be happy to have one.
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 15/25] dt: bindings: Add a binding for flash LED devices associated to a sensor
2017-09-15 14:17 ` [PATCH v13 15/25] dt: bindings: Add a binding for flash LED devices associated to a sensor Sakari Ailus
@ 2017-09-19 12:12 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:12 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:14 EEST Sakari Ailus wrote:
> Camera flash drivers (and LEDs) are separate from the sensor devices in
> DT. In order to make an association between the two, provide the
> association information to the software.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> ---
> Documentation/devicetree/bindings/media/video-interfaces.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt
> b/Documentation/devicetree/bindings/media/video-interfaces.txt index
> 852041a7480c..fdba30479b47 100644
> --- a/Documentation/devicetree/bindings/media/video-interfaces.txt
> +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
> @@ -67,6 +67,14 @@ are required in a relevant parent node:
> identifier, should be 1.
> - #size-cells : should be zero.
>
> +
> +Optional properties
> +-------------------
> +
> +- flash-leds: An array of phandles, each referring to a flash LED, a
> sub-node
> + of the LED driver device node.
What happens with non-LED flash controllers ?
> +
> +
> Optional endpoint properties
> ----------------------------
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 15/25] dt: bindings: Add a binding for flash LED devices associated to a sensor
@ 2017-09-19 12:12 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:12 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:14 EEST Sakari Ailus wrote:
> Camera flash drivers (and LEDs) are separate from the sensor devices in
> DT. In order to make an association between the two, provide the
> association information to the software.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Acked-by: Rob Herring <robh@kernel.org>
> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> Acked-by: Pavel Machek <pavel@ucw.cz>
> ---
> Documentation/devicetree/bindings/media/video-interfaces.txt | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt
> b/Documentation/devicetree/bindings/media/video-interfaces.txt index
> 852041a7480c..fdba30479b47 100644
> --- a/Documentation/devicetree/bindings/media/video-interfaces.txt
> +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
> @@ -67,6 +67,14 @@ are required in a relevant parent node:
> identifier, should be 1.
> - #size-cells : should be zero.
>
> +
> +Optional properties
> +-------------------
> +
> +- flash-leds: An array of phandles, each referring to a flash LED, a
> sub-node
> + of the LED driver device node.
What happens with non-LED flash controllers ?
> +
> +
> Optional endpoint properties
> ----------------------------
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-19 12:01 ` Laurent Pinchart
(?)
@ 2017-09-19 12:13 ` Sakari Ailus
2017-09-19 12:43 ` Laurent Pinchart
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:13 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:01:14PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> > Add three helper functions to call async operations callbacks. Besides
> > simplifying callbacks, this allows async notifiers to have no ops set,
> > i.e. it can be left NULL.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > ---
> > drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++++++++--------
> > include/media/v4l2-async.h | 1 +
> > 2 files changed, 37 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > b/drivers/media/v4l2-core/v4l2-async.c index 7b2125b3d62f..c35d04b9122f
> > 100644
> > --- a/drivers/media/v4l2-core/v4l2-async.c
> > +++ b/drivers/media/v4l2-core/v4l2-async.c
> > @@ -25,6 +25,34 @@
> > #include <media/v4l2-fwnode.h>
> > #include <media/v4l2-subdev.h>
> >
> > +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier *n,
> > + struct v4l2_subdev *subdev,
> > + struct v4l2_async_subdev *asd)
> > +{
> > + if (!n->ops || !n->ops->bound)
> > + return 0;
> > +
> > + return n->ops->bound(n, subdev, asd);
> > +}
> > +
> > +static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier *n,
> > + struct v4l2_subdev *subdev,
> > + struct v4l2_async_subdev *asd)
> > +{
> > + if (!n->ops || !n->ops->unbind)
> > + return;
> > +
> > + n->ops->unbind(n, subdev, asd);
> > +}
> > +
> > +static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier *n)
> > +{
> > + if (!n->ops || !n->ops->complete)
> > + return 0;
> > +
> > + return n->ops->complete(n);
> > +}
> > +
>
> Wouldn't it be enough to add a single v4l2_async_notifier_call() macro ?
>
> #define v4l2_async_notifier_call(n, op, args...) \
> ((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
I actually had that in an earlier version but I changed it based on review
comments from Hans. A single macro isn't enough: some functions have int
return type. I think the way it is now is nicer.
>
> Apart from that,
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> > static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev
> > *asd) {
> > #if IS_ENABLED(CONFIG_I2C)
> > @@ -102,16 +130,13 @@ static int v4l2_async_match_notify(struct
> > v4l2_async_notifier *notifier, {
> > int ret;
> >
> > - if (notifier->ops->bound) {
> > - ret = notifier->ops->bound(notifier, sd, asd);
> > - if (ret < 0)
> > - return ret;
> > - }
> > + ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> > + if (ret < 0)
> > + return ret;
> >
> > ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> > if (ret < 0) {
> > - if (notifier->ops->unbind)
> > - notifier->ops->unbind(notifier, sd, asd);
> > + v4l2_async_notifier_call_unbind(notifier, sd, asd);
> > return ret;
> > }
> >
> > @@ -123,8 +148,8 @@ static int v4l2_async_match_notify(struct
> > v4l2_async_notifier *notifier, /* Move from the global subdevice list to
> > notifier's done */
> > list_move(&sd->async_list, ¬ifier->done);
> >
> > - if (list_empty(¬ifier->waiting) && notifier->ops->complete)
> > - return notifier->ops->complete(notifier);
> > + if (list_empty(¬ifier->waiting))
> > + return v4l2_async_notifier_call_complete(notifier);
> >
> > return 0;
> > }
> > @@ -210,8 +235,7 @@ void v4l2_async_notifier_unregister(struct
> > v4l2_async_notifier *notifier) list_for_each_entry_safe(sd, tmp,
> > ¬ifier->done, async_list) { v4l2_async_cleanup(sd);
> >
> > - if (notifier->ops->unbind)
> > - notifier->ops->unbind(notifier, sd, sd->asd);
> > + v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> > }
> >
> > mutex_unlock(&list_lock);
> > @@ -300,8 +324,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev
> > *sd)
> >
> > v4l2_async_cleanup(sd);
> >
> > - if (notifier->ops->unbind)
> > - notifier->ops->unbind(notifier, sd, sd->asd);
> > + v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> >
> > mutex_unlock(&list_lock);
> > }
> > diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
> > index 3c48f8b66d12..3bc8a7c0d83f 100644
> > --- a/include/media/v4l2-async.h
> > +++ b/include/media/v4l2-async.h
> > @@ -164,4 +164,5 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd);
> > * @sd: pointer to &struct v4l2_subdev
> > */
> > void v4l2_async_unregister_subdev(struct v4l2_subdev *sd);
> > +
> > #endif
>
>
> --
> Regards,
>
> Laurent Pinchart
>
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 15/25] dt: bindings: Add a binding for flash LED devices associated to a sensor
2017-09-19 12:12 ` Laurent Pinchart
@ 2017-09-19 12:16 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:16 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 03:12:42PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:14 EEST Sakari Ailus wrote:
> > Camera flash drivers (and LEDs) are separate from the sensor devices in
> > DT. In order to make an association between the two, provide the
> > association information to the software.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> > Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> > Acked-by: Pavel Machek <pavel-+ZI9xUNit7I@public.gmane.org>
> > ---
> > Documentation/devicetree/bindings/media/video-interfaces.txt | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt
> > b/Documentation/devicetree/bindings/media/video-interfaces.txt index
> > 852041a7480c..fdba30479b47 100644
> > --- a/Documentation/devicetree/bindings/media/video-interfaces.txt
> > +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
> > @@ -67,6 +67,14 @@ are required in a relevant parent node:
> > identifier, should be 1.
> > - #size-cells : should be zero.
> >
> > +
> > +Optional properties
> > +-------------------
> > +
> > +- flash-leds: An array of phandles, each referring to a flash LED, a
> > sub-node
> > + of the LED driver device node.
>
> What happens with non-LED flash controllers ?
We don't have any at the moment.
The way the bindings are currently defined (LED references are to
individual LEDs for instance) are specific to LED bindings. I'd rather not
make assumptions for e.g. Xenon flash devices. Which might never appear:
LED luminosity, efficiency and maximum current has been steadily increasing
over the past years.
--
Regards,
Sakari Ailus
sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 15/25] dt: bindings: Add a binding for flash LED devices associated to a sensor
@ 2017-09-19 12:16 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:16 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:12:42PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:14 EEST Sakari Ailus wrote:
> > Camera flash drivers (and LEDs) are separate from the sensor devices in
> > DT. In order to make an association between the two, provide the
> > association information to the software.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Acked-by: Rob Herring <robh@kernel.org>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > Acked-by: Pavel Machek <pavel@ucw.cz>
> > ---
> > Documentation/devicetree/bindings/media/video-interfaces.txt | 8 ++++++++
> > 1 file changed, 8 insertions(+)
> >
> > diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt
> > b/Documentation/devicetree/bindings/media/video-interfaces.txt index
> > 852041a7480c..fdba30479b47 100644
> > --- a/Documentation/devicetree/bindings/media/video-interfaces.txt
> > +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
> > @@ -67,6 +67,14 @@ are required in a relevant parent node:
> > identifier, should be 1.
> > - #size-cells : should be zero.
> >
> > +
> > +Optional properties
> > +-------------------
> > +
> > +- flash-leds: An array of phandles, each referring to a flash LED, a
> > sub-node
> > + of the LED driver device node.
>
> What happens with non-LED flash controllers ?
We don't have any at the moment.
The way the bindings are currently defined (LED references are to
individual LEDs for instance) are specific to LED bindings. I'd rather not
make assumptions for e.g. Xenon flash devices. Which might never appear:
LED luminosity, efficiency and maximum current has been steadily increasing
over the past years.
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
2017-09-15 14:17 ` [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references Sakari Ailus
@ 2017-09-19 12:19 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:19 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:16 EEST Sakari Ailus wrote:
> Add function 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.
>
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> ---
> drivers/media/v4l2-core/v4l2-fwnode.c | 69 ++++++++++++++++++++++++++++++++
> 1 file changed, 69 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c
> b/drivers/media/v4l2-core/v4l2-fwnode.c index 44ee35f6aad5..65e84ea1cc35
> 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -498,6 +498,75 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> }
> EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
>
> +/*
> + * 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
> + *
> + * Return: 0 on success
> + * -ENOENT if no entries were found
> + * -ENOMEM if memory allocation failed
> + * -EINVAL if property parsing failed
> + */
> +static int v4l2_fwnode_reference_parse(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + const char *prop)
> +{
> + struct fwnode_reference_args args;
> + unsigned int index;
> + int ret;
> +
> + for (index = 0;
> + !(ret = fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args));
> + index++)
> + fwnode_handle_put(args.fwnode);
This seems to indicate that the fwnode API is missing a function to count the
number of references in a property. Should that be fixed ?
The rest looks OK to me.
> + if (!index)
> + return -ENOENT;
> +
> + /*
> + * Note that right now both -ENODATA and -ENOENT may signal
> + * out-of-bounds access. Return the error in cases other than that.
> + */
> + if (ret != -ENOENT && ret != -ENODATA)
> + return ret;
> +
> + ret = v4l2_async_notifier_realloc(notifier,
> + notifier->num_subdevs + index);
> + if (ret)
> + return ret;
> +
> + for (index = 0; !fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args);
> + index++) {
> + struct v4l2_async_subdev *asd;
> +
> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> + ret = -EINVAL;
> + goto error;
> + }
> +
> + asd = kzalloc(sizeof(*asd), GFP_KERNEL);
> + if (!asd) {
> + ret = -ENOMEM;
> + 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;
> +}
> +
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>");
> MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>");
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
@ 2017-09-19 12:19 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:19 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:16 EEST Sakari Ailus wrote:
> Add function 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.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> drivers/media/v4l2-core/v4l2-fwnode.c | 69 ++++++++++++++++++++++++++++++++
> 1 file changed, 69 insertions(+)
>
> diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c
> b/drivers/media/v4l2-core/v4l2-fwnode.c index 44ee35f6aad5..65e84ea1cc35
> 100644
> --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> @@ -498,6 +498,75 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> }
> EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
>
> +/*
> + * 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
> + *
> + * Return: 0 on success
> + * -ENOENT if no entries were found
> + * -ENOMEM if memory allocation failed
> + * -EINVAL if property parsing failed
> + */
> +static int v4l2_fwnode_reference_parse(
> + struct device *dev, struct v4l2_async_notifier *notifier,
> + const char *prop)
> +{
> + struct fwnode_reference_args args;
> + unsigned int index;
> + int ret;
> +
> + for (index = 0;
> + !(ret = fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args));
> + index++)
> + fwnode_handle_put(args.fwnode);
This seems to indicate that the fwnode API is missing a function to count the
number of references in a property. Should that be fixed ?
The rest looks OK to me.
> + if (!index)
> + return -ENOENT;
> +
> + /*
> + * Note that right now both -ENODATA and -ENOENT may signal
> + * out-of-bounds access. Return the error in cases other than that.
> + */
> + if (ret != -ENOENT && ret != -ENODATA)
> + return ret;
> +
> + ret = v4l2_async_notifier_realloc(notifier,
> + notifier->num_subdevs + index);
> + if (ret)
> + return ret;
> +
> + for (index = 0; !fwnode_property_get_reference_args(
> + dev_fwnode(dev), prop, NULL, 0, index, &args);
> + index++) {
> + struct v4l2_async_subdev *asd;
> +
> + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> + ret = -EINVAL;
> + goto error;
> + }
> +
> + asd = kzalloc(sizeof(*asd), GFP_KERNEL);
> + if (!asd) {
> + ret = -ENOMEM;
> + 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;
> +}
> +
> MODULE_LICENSE("GPL");
> MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
> MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 21/25] smiapp: Add support for flash and lens devices
2017-09-19 12:08 ` Laurent Pinchart
(?)
@ 2017-09-19 12:20 ` Sakari Ailus
2017-09-19 12:38 ` Laurent Pinchart
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:20 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:08:25PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:20 EEST Sakari Ailus wrote:
> > Parse async sub-devices by using
> > v4l2_subdev_fwnode_reference_parse_sensor_common().
> >
> > These types devices aren't directly related to the sensor, but are
> > nevertheless handled by the smiapp driver due to the relationship of these
> > component to the main part of the camera module --- the sensor.
> >
> > This does not yet address providing the user space with information on how
> > to associate the sensor or lens devices but the kernel now has the
> > necessary information to do that.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > Acked-by: Pavel Machek <pavel@ucw.cz>
>
> Something is bothering me here, not so much in the contents of the patch
> itself than in its nature. There are four patches in this series that add
> support for flash and lens devices to the smiapp, et8ek8, ov5670 and ov13858
> drivers. We have way more sensor drivers than that, and I don't really want to
> patch them all to support flash and lens. I believe a less intrusive approach,
> more focussed on the V4L2 core, is needed.
You could move this to the framework, yes. Nothing prevents that. Perhaps a
flag telling the framework whether this should be done? Just being
opportunistic might work as well.
>
> > ---
> > drivers/media/i2c/smiapp/smiapp-core.c | 38 ++++++++++++++++++++++++-------
> > drivers/media/i2c/smiapp/smiapp.h | 4 +++-
> > 2 files changed, 33 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/media/i2c/smiapp/smiapp-core.c
> > b/drivers/media/i2c/smiapp/smiapp-core.c index 700f433261d0..a4735a96ea41
> > 100644
> > --- a/drivers/media/i2c/smiapp/smiapp-core.c
> > +++ b/drivers/media/i2c/smiapp/smiapp-core.c
> > @@ -31,7 +31,7 @@
> > #include <linux/regulator/consumer.h>
> > #include <linux/slab.h>
> > #include <linux/smiapp.h>
> > -#include <linux/v4l2-mediabus.h>
> > +#include <media/v4l2-async.h>
> > #include <media/v4l2-fwnode.h>
> > #include <media/v4l2-device.h>
> >
> > @@ -2887,17 +2887,24 @@ static int smiapp_probe(struct i2c_client *client,
> > v4l2_i2c_subdev_init(&sensor->src->sd, client, &smiapp_ops);
> > sensor->src->sd.internal_ops = &smiapp_internal_src_ops;
> >
> > + rval = v4l2_async_notifier_parse_fwnode_sensor_common(
> > + &client->dev, &sensor->notifier);
> > + if (rval < 0)
> > + return rval;
> > +
> > sensor->vana = devm_regulator_get(&client->dev, "vana");
> > if (IS_ERR(sensor->vana)) {
> > dev_err(&client->dev, "could not get regulator for vana\n");
> > - return PTR_ERR(sensor->vana);
> > + rval = PTR_ERR(sensor->vana);
> > + goto out_release_async_notifier;
> > }
> >
> > sensor->ext_clk = devm_clk_get(&client->dev, NULL);
> > if (IS_ERR(sensor->ext_clk)) {
> > dev_err(&client->dev, "could not get clock (%ld)\n",
> > PTR_ERR(sensor->ext_clk));
> > - return -EPROBE_DEFER;
> > + rval = -EPROBE_DEFER;
> > + goto out_release_async_notifier;
> > }
> >
> > rval = clk_set_rate(sensor->ext_clk, sensor->hwcfg->ext_clk);
> > @@ -2905,17 +2912,19 @@ static int smiapp_probe(struct i2c_client *client,
> > dev_err(&client->dev,
> > "unable to set clock freq to %u\n",
> > sensor->hwcfg->ext_clk);
> > - return rval;
> > + goto out_release_async_notifier;
> > }
> >
> > sensor->xshutdown = devm_gpiod_get_optional(&client->dev, "xshutdown",
> > GPIOD_OUT_LOW);
> > - if (IS_ERR(sensor->xshutdown))
> > - return PTR_ERR(sensor->xshutdown);
> > + if (IS_ERR(sensor->xshutdown)) {
> > + rval = PTR_ERR(sensor->xshutdown);
> > + goto out_release_async_notifier;
> > + }
> >
> > rval = smiapp_power_on(&client->dev);
> > if (rval < 0)
> > - return rval;
> > + goto out_release_async_notifier;
> >
> > rval = smiapp_identify_module(sensor);
> > if (rval) {
> > @@ -3092,9 +3101,14 @@ static int smiapp_probe(struct i2c_client *client,
> > if (rval < 0)
> > goto out_media_entity_cleanup;
> >
> > + rval = v4l2_async_subdev_notifier_register(&sensor->src->sd,
> > + &sensor->notifier);
> > + if (rval)
> > + goto out_media_entity_cleanup;
> > +
> > rval = v4l2_async_register_subdev(&sensor->src->sd);
> > if (rval < 0)
> > - goto out_media_entity_cleanup;
> > + goto out_unregister_async_notifier;
> >
> > pm_runtime_set_active(&client->dev);
> > pm_runtime_get_noresume(&client->dev);
> > @@ -3105,6 +3119,9 @@ static int smiapp_probe(struct i2c_client *client,
> >
> > return 0;
> >
> > +out_unregister_async_notifier:
> > + v4l2_async_notifier_unregister(&sensor->notifier);
> > +
> > out_media_entity_cleanup:
> > media_entity_cleanup(&sensor->src->sd.entity);
> >
> > @@ -3114,6 +3131,9 @@ static int smiapp_probe(struct i2c_client *client,
> > out_power_off:
> > smiapp_power_off(&client->dev);
> >
> > +out_release_async_notifier:
> > + v4l2_async_notifier_release(&sensor->notifier);
> > +
> > return rval;
> > }
> >
> > @@ -3124,6 +3144,8 @@ static int smiapp_remove(struct i2c_client *client)
> > unsigned int i;
> >
> > v4l2_async_unregister_subdev(subdev);
> > + v4l2_async_notifier_unregister(&sensor->notifier);
> > + v4l2_async_notifier_release(&sensor->notifier);
> >
> > pm_runtime_disable(&client->dev);
> > if (!pm_runtime_status_suspended(&client->dev))
> > diff --git a/drivers/media/i2c/smiapp/smiapp.h
> > b/drivers/media/i2c/smiapp/smiapp.h index f74d695018b9..be92cb5713f4 100644
> > --- a/drivers/media/i2c/smiapp/smiapp.h
> > +++ b/drivers/media/i2c/smiapp/smiapp.h
> > @@ -20,9 +20,10 @@
> > #define __SMIAPP_PRIV_H_
> >
> > #include <linux/mutex.h>
> > +#include <media/i2c/smiapp.h>
> > +#include <media/v4l2-async.h>
> > #include <media/v4l2-ctrls.h>
> > #include <media/v4l2-subdev.h>
> > -#include <media/i2c/smiapp.h>
> >
> > #include "smiapp-pll.h"
> > #include "smiapp-reg.h"
> > @@ -172,6 +173,7 @@ struct smiapp_subdev {
> > * struct smiapp_sensor - Main device structure
> > */
> > struct smiapp_sensor {
> > + struct v4l2_async_notifier notifier;
> > /*
> > * "mutex" is used to serialise access to all fields here
> > * except v4l2_ctrls at the end of the struct. "mutex" is also
>
>
> --
> Regards,
>
> Laurent Pinchart
>
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 12:11 ` Sakari Ailus
@ 2017-09-19 12:34 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:34 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
On Tuesday, 19 September 2017 15:11:32 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 02:35:01PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:04 EEST Sakari Ailus wrote:
> >> Add two functions for parsing devices graph endpoints:
> >> v4l2_async_notifier_parse_fwnode_endpoints and
> >> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> >> over all endpoints whereas the latter only iterates over the endpoints
> >> in a given port.
> >>
> >> The former is mostly useful for existing drivers that currently
> >> implement the iteration over all the endpoints themselves whereas the
> >> latter is especially intended for devices with both sinks and sources:
> >> async sub-devices for external devices connected to the device's sources
> >> will have already been set up, or they are part of the master device.
> >
> > Did you mean s/or they/as they/ ?
>
> No. There are two options here: either the sub-devices a sub-device is
> connected to (through a graph endpoint) is instantiated through the async
> framework *or* through the master device driver. But not by both of them at
> the same time.
The message is then contradicting itself:
"async sub-devices for external devices connected to the device's sources will
have already been set up, or they are part of the master device."
They refers to "async sub-devices". If they're part of the master device,
they're not async sub-devices.
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
@ 2017-09-19 12:34 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:34 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 15:11:32 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 02:35:01PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:04 EEST Sakari Ailus wrote:
> >> Add two functions for parsing devices graph endpoints:
> >> v4l2_async_notifier_parse_fwnode_endpoints and
> >> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> >> over all endpoints whereas the latter only iterates over the endpoints
> >> in a given port.
> >>
> >> The former is mostly useful for existing drivers that currently
> >> implement the iteration over all the endpoints themselves whereas the
> >> latter is especially intended for devices with both sinks and sources:
> >> async sub-devices for external devices connected to the device's sources
> >> will have already been set up, or they are part of the master device.
> >
> > Did you mean s/or they/as they/ ?
>
> No. There are two options here: either the sub-devices a sub-device is
> connected to (through a graph endpoint) is instantiated through the async
> framework *or* through the master device driver. But not by both of them at
> the same time.
The message is then contradicting itself:
"async sub-devices for external devices connected to the device's sources will
have already been set up, or they are part of the master device."
They refers to "async sub-devices". If they're part of the master device,
they're not async sub-devices.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 21/25] smiapp: Add support for flash and lens devices
2017-09-19 12:20 ` Sakari Ailus
@ 2017-09-19 12:38 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:38 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 15:20:34 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 03:08:25PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:20 EEST Sakari Ailus wrote:
> >> Parse async sub-devices by using
> >> v4l2_subdev_fwnode_reference_parse_sensor_common().
> >>
> >> These types devices aren't directly related to the sensor, but are
> >> nevertheless handled by the smiapp driver due to the relationship of
> >> these component to the main part of the camera module --- the sensor.
> >>
> >> This does not yet address providing the user space with information on
> >> how to associate the sensor or lens devices but the kernel now has the
> >> necessary information to do that.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> >> Acked-by: Pavel Machek <pavel@ucw.cz>
> >
> > Something is bothering me here, not so much in the contents of the patch
> > itself than in its nature. There are four patches in this series that add
> > support for flash and lens devices to the smiapp, et8ek8, ov5670 and
> > ov13858 drivers. We have way more sensor drivers than that, and I don't
> > really want to patch them all to support flash and lens. I believe a less
> > intrusive approach, more focussed on the V4L2 core, is needed.
>
> You could move this to the framework, yes. Nothing prevents that. Perhaps a
> flag telling the framework whether this should be done? Just being
> opportunistic might work as well.
How is would be done is another matter which I haven't thought about yet :-)
My point is that I don't think converting all drivers is a good idea, you
should aim for an implementation in the core.
> >> ---
> >>
> >> drivers/media/i2c/smiapp/smiapp-core.c | 38 ++++++++++++++++++++-------
> >> drivers/media/i2c/smiapp/smiapp.h | 4 +++-
> >> 2 files changed, 33 insertions(+), 9 deletions(-)
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 07/25] rcar-vin: Use generic parser for parsing fwnode endpoints
2017-09-19 11:53 ` Laurent Pinchart
(?)
@ 2017-09-19 12:39 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:39 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 02:53:16PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:06 EEST Sakari Ailus wrote:
> > Instead of using driver implementation, use
>
> Same comment as for patch 06/25.
Will fix.
>
> > v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> > of the device.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > ---
> > drivers/media/platform/rcar-vin/rcar-core.c | 112 ++++++++-----------------
> > drivers/media/platform/rcar-vin/rcar-dma.c | 10 +--
> > drivers/media/platform/rcar-vin/rcar-v4l2.c | 14 ++--
> > drivers/media/platform/rcar-vin/rcar-vin.h | 4 +-
> > 4 files changed, 48 insertions(+), 92 deletions(-)
> >
> > diff --git a/drivers/media/platform/rcar-vin/rcar-core.c
> > b/drivers/media/platform/rcar-vin/rcar-core.c index
> > 142de447aaaa..62b4a94f9a39 100644
> > --- a/drivers/media/platform/rcar-vin/rcar-core.c
> > +++ b/drivers/media/platform/rcar-vin/rcar-core.c
>
> [snip]
>
> > @@ -120,117 +121,70 @@ static int rvin_digital_notify_bound(struct
>
> [snip]
>
> > -static int rvin_digitial_parse_v4l2(struct rvin_dev *vin,
> > - struct device_node *ep,
> > - struct v4l2_mbus_config *mbus_cfg)
> > +static int rvin_digital_parse_v4l2(struct device *dev,
> > + struct v4l2_fwnode_endpoint *vep,
> > + struct v4l2_async_subdev *asd)
> > {
> > - struct v4l2_fwnode_endpoint v4l2_ep;
> > - int ret;
> > + struct rvin_dev *vin = dev_get_drvdata(dev);
>
> Doesn't this show that we miss a context argument to the callback function ?
> Storing the context in device driver data is probably OK if the driver parsing
> the endpoints controls the struct device, but is that always the case ?
How does a driver know the hardware other than, uh, the device?
I guess we could add a private pointer when the async notifier is
registered if there's a real need for it. The notifier could be an
alternative but it wouldn't be applicable to sub-devices.
>
> > + struct rvin_graph_entity *rvge =
> > + container_of(asd, struct rvin_graph_entity, asd);
> >
> > - ret = v4l2_fwnode_endpoint_parse(of_fwnode_handle(ep), &v4l2_ep);
> > - if (ret) {
> > - vin_err(vin, "Could not parse v4l2 endpoint\n");
> > - return -EINVAL;
> > - }
> > + if (vep->base.port || vep->base.id)
> > + return -ENOTCONN;
> >
> > - mbus_cfg->type = v4l2_ep.bus_type;
> > + rvge->mbus_cfg.type = vep->bus_type;
> >
> > - switch (mbus_cfg->type) {
> > + switch (rvge->mbus_cfg.type) {
> > case V4L2_MBUS_PARALLEL:
> > vin_dbg(vin, "Found PARALLEL media bus\n");
> > - mbus_cfg->flags = v4l2_ep.bus.parallel.flags;
> > + rvge->mbus_cfg.flags = vep->bus.parallel.flags;
> > break;
> > case V4L2_MBUS_BT656:
> > vin_dbg(vin, "Found BT656 media bus\n");
> > - mbus_cfg->flags = 0;
> > + rvge->mbus_cfg.flags = 0;
> > break;
> > default:
> > vin_err(vin, "Unknown media bus type\n");
> > return -EINVAL;
> > }
> >
> > - return 0;
> > -}
> > -
> > -static int rvin_digital_graph_parse(struct rvin_dev *vin)
> > -{
> > - struct device_node *ep, *np;
> > - int ret;
> > -
> > - vin->digital.asd.match.fwnode.fwnode = NULL;
> > - vin->digital.subdev = NULL;
> > -
> > - /*
> > - * Port 0 id 0 is local digital input, try to get it.
> > - * Not all instances can or will have this, that is OK
> > - */
> > - ep = of_graph_get_endpoint_by_regs(vin->dev->of_node, 0, 0);
> > - if (!ep)
> > - return 0;
> > -
> > - np = of_graph_get_remote_port_parent(ep);
> > - if (!np) {
> > - vin_err(vin, "No remote parent for digital input\n");
> > - of_node_put(ep);
> > - return -EINVAL;
> > - }
> > - of_node_put(np);
> > -
> > - ret = rvin_digitial_parse_v4l2(vin, ep, &vin->digital.mbus_cfg);
> > - of_node_put(ep);
> > - if (ret)
> > - return ret;
> > -
> > - vin->digital.asd.match.fwnode.fwnode = of_fwnode_handle(np);
> > - vin->digital.asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
> > + vin->digital = rvge;
> >
> > return 0;
> > }
> >
> > static int rvin_digital_graph_init(struct rvin_dev *vin)
> > {
> > - struct v4l2_async_subdev **subdevs = NULL;
> > int ret;
> >
> > - ret = rvin_digital_graph_parse(vin);
> > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > + vin->dev, &vin->notifier,
> > + sizeof(struct rvin_graph_entity), rvin_digital_parse_v4l2);
> > if (ret)
> > return ret;
> >
> > - if (!vin->digital.asd.match.fwnode.fwnode) {
> > - vin_dbg(vin, "No digital subdevice found\n");
> > - return -ENODEV;
> > - }
> > -
> > - /* Register the subdevices notifier. */
> > - subdevs = devm_kzalloc(vin->dev, sizeof(*subdevs), GFP_KERNEL);
> > - if (subdevs == NULL)
> > - return -ENOMEM;
> > -
> > - subdevs[0] = &vin->digital.asd;
> > -
> > - vin_dbg(vin, "Found digital subdevice %pOF\n",
> > - to_of_node(subdevs[0]->match.fwnode.fwnode));
> > + if (vin->digital)
> > + vin_dbg(vin, "Found digital subdevice %pOF\n",
> > + to_of_node(
> > + vin->digital->asd.match.fwnode.fwnode));
>
> Isn't this is a change in behaviour ? The driver currently returns -ENODEV
> when no digital subdev is found.
Seems so, I'll address that in v14.
>
> > - vin->notifier.num_subdevs = 1;
> > - vin->notifier.subdevs = subdevs;
> > vin->notifier.bound = rvin_digital_notify_bound;
> > vin->notifier.unbind = rvin_digital_notify_unbind;
> > vin->notifier.complete = rvin_digital_notify_complete;
> > -
> > ret = v4l2_async_notifier_register(&vin->v4l2_dev, &vin->notifier);
> > if (ret < 0) {
> > vin_err(vin, "Notifier registration failed\n");
>
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-19 11:40 ` Laurent Pinchart
@ 2017-09-19 12:41 ` Sakari Ailus
2017-09-19 12:43 ` Sakari Ailus
1 sibling, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:41 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
Thanks for the review!
On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:05 EEST Sakari Ailus wrote:
> > Instead of using driver implementation, use
>
> Did you mean s/using driver implementation/using a driver implementation/ (or
> perhaps "custom driver implementation") ?
I think "custom driver implementation" best describes this. I'll use it.
>
> > v4l2_async_notifier_parse_fwnode_endpoints() to parse the fwnode endpoints
> > of the device.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > ---
> > drivers/media/platform/omap3isp/isp.c | 115 ++++++++++---------------------
> > drivers/media/platform/omap3isp/isp.h | 5 +-
> > 2 files changed, 37 insertions(+), 83 deletions(-)
> >
> > diff --git a/drivers/media/platform/omap3isp/isp.c
> > b/drivers/media/platform/omap3isp/isp.c index 1a428fe9f070..a546cf774d40
> > 100644
> > --- a/drivers/media/platform/omap3isp/isp.c
> > +++ b/drivers/media/platform/omap3isp/isp.c
>
> [snip]
>
> > @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> > if (ret)
> > return ret;
> >
> > - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > + isp_fwnode_parse);
> > if (ret < 0)
>
> The documentation in patch 05/25 states that v4l2_async_notifier_release()
> should be called even if v4l2_async_notifier_parse_fwnode_endpoints() fails. I
> don't think that's needed here, so you might want to update the documentation
> (and possibly the implementation of the function).
>
> Apart from that,
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Thanks!
>
> > return ret;
> >
> > @@ -2407,6 +2363,7 @@ static int isp_probe(struct platform_device *pdev)
> > __omap3isp_put(isp, false);
> > error:
> > mutex_destroy(&isp->isp_mutex);
> > + v4l2_async_notifier_release(&isp->notifier);
> >
> > return ret;
> > }
>
> [snip]
>
> --
> Regards,
>
> Laurent Pinchart
>
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-19 11:40 ` Laurent Pinchart
2017-09-19 12:41 ` Sakari Ailus
@ 2017-09-19 12:43 ` Sakari Ailus
2017-09-19 12:46 ` Laurent Pinchart
1 sibling, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 12:43 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> > if (ret)
> > return ret;
> >
> > - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > + isp_fwnode_parse);
> > if (ret < 0)
>
> The documentation in patch 05/25 states that v4l2_async_notifier_release()
> should be called even if v4l2_async_notifier_parse_fwnode_endpoints() fails. I
> don't think that's needed here, so you might want to update the documentation
> (and possibly the implementation of the function).
It is. If parsing fails, async sub-devices may have been already set up.
This happens e.g. when the parsing fails after the first one has been
successfully set up already.
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-19 12:13 ` Sakari Ailus
@ 2017-09-19 12:43 ` Laurent Pinchart
2017-09-19 14:50 ` Sakari Ailus
0 siblings, 1 reply; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:43 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 15:13:11 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 03:01:14PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> >> Add three helper functions to call async operations callbacks. Besides
> >> simplifying callbacks, this allows async notifiers to have no ops set,
> >> i.e. it can be left NULL.
> >>
> >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> >> ---
> >>
> >> drivers/media/v4l2-core/v4l2-async.c | 49 +++++++++++++++++++++--------
> >> include/media/v4l2-async.h | 1 +
> >> 2 files changed, 37 insertions(+), 13 deletions(-)
> >>
> >> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> >> b/drivers/media/v4l2-core/v4l2-async.c index 7b2125b3d62f..c35d04b9122f
> >> 100644
> >> --- a/drivers/media/v4l2-core/v4l2-async.c
> >> +++ b/drivers/media/v4l2-core/v4l2-async.c
> >> @@ -25,6 +25,34 @@
> >>
> >> #include <media/v4l2-fwnode.h>
> >> #include <media/v4l2-subdev.h>
> >>
> >> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier
> >> *n,
> >> + struct v4l2_subdev *subdev,
> >> + struct v4l2_async_subdev *asd)
> >> +{
> >> + if (!n->ops || !n->ops->bound)
> >> + return 0;
> >> +
> >> + return n->ops->bound(n, subdev, asd);
> >> +}
> >> +
> >> +static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier
> >> *n,
> >> + struct v4l2_subdev *subdev,
> >> + struct v4l2_async_subdev *asd)
> >> +{
> >> + if (!n->ops || !n->ops->unbind)
> >> + return;
> >> +
> >> + n->ops->unbind(n, subdev, asd);
> >> +}
> >> +
> >> +static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier
> >> *n)
> >> +{
> >> + if (!n->ops || !n->ops->complete)
> >> + return 0;
> >> +
> >> + return n->ops->complete(n);
> >> +}
> >> +
> >
> > Wouldn't it be enough to add a single v4l2_async_notifier_call() macro ?
> >
> > #define v4l2_async_notifier_call(n, op, args...) \
> >
> > ((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
>
> I actually had that in an earlier version but I changed it based on review
> comments from Hans. A single macro isn't enough: some functions have int
> return type. I think the way it is now is nicer.
What bothers me there is the overhead of a function call.
By the way, what's the use case for ops being NULL ?
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-19 12:43 ` Sakari Ailus
@ 2017-09-19 12:46 ` Laurent Pinchart
2017-09-19 14:47 ` Sakari Ailus
2017-09-20 15:50 ` Sakari Ailus
0 siblings, 2 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:46 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > > @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> > >
> > > if (ret)
> > >
> > > return ret;
> > >
> > > - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > > + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > > + isp_fwnode_parse);
> > >
> > > if (ret < 0)
> >
> > The documentation in patch 05/25 states that v4l2_async_notifier_release()
> > should be called even if v4l2_async_notifier_parse_fwnode_endpoints()
> > fails. I don't think that's needed here, so you might want to update the
> > documentation (and possibly the implementation of the function).
>
> It is. If parsing fails, async sub-devices may have been already set up.
> This happens e.g. when the parsing fails after the first one has been
> successfully set up already.
But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
internally when an error occurs. Otherwise you need to call
v4l2_async_notifier_release() here.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
2017-09-19 12:04 ` Laurent Pinchart
@ 2017-09-19 12:52 ` Laurent Pinchart
2017-09-19 14:58 ` Sakari Ailus
0 siblings, 1 reply; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 12:52 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 15:04:43 EEST Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:12 EEST Sakari Ailus wrote:
> > The information on how many async sub-devices would be bindable to a
> > notifier is typically dependent on information from platform firmware and
> > it's not driver's business to be aware of that.
> >
> > Many V4L2 main drivers are perfectly usable (and useful) without async
> > sub-devices and so if there aren't any around, just proceed call the
> > notifier's complete callback immediately without registering the notifier
> > itself.
> >
> > If a driver needs to check whether there are async sub-devices available,
> > it can be done by inspecting the notifier's num_subdevs field which tells
> > the number of async sub-devices.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
I take this back.
> > ---
> >
> > drivers/media/v4l2-core/v4l2-async.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > b/drivers/media/v4l2-core/v4l2-async.c index 9895b610e2a0..4be2f16af051
> > 100644
> > --- a/drivers/media/v4l2-core/v4l2-async.c
> > +++ b/drivers/media/v4l2-core/v4l2-async.c
> > @@ -170,14 +170,16 @@ int v4l2_async_notifier_register(struct v4l2_device
> > *v4l2_dev, struct v4l2_async_subdev *asd;
> >
> > int i;
> >
> > - if (!v4l2_dev || !notifier->num_subdevs ||
> > - notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> > + if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> >
> > return -EINVAL;
> >
> > notifier->v4l2_dev = v4l2_dev;
> > INIT_LIST_HEAD(¬ifier->waiting);
> > INIT_LIST_HEAD(¬ifier->done);
> >
> > + if (!notifier->num_subdevs)
> > + return v4l2_async_notifier_call_complete(notifier);
> > +
This skips adding the notifier to the notifier_list. Won't this result in an
oops when calling list_del(¬ifier->list) in
v4l2_async_notifier_unregister() ?
> > for (i = 0; i < notifier->num_subdevs; i++) {
> >
> > asd = notifier->subdevs[i];
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
2017-09-19 12:19 ` Laurent Pinchart
(?)
@ 2017-09-19 13:04 ` Sakari Ailus
[not found] ` <20170919130453.ii5kz54qxlot4of2-z7MJbOB4PBP+e+fPlCVrcFDQ4js95KgL@public.gmane.org>
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 13:04 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:19:59PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:16 EEST Sakari Ailus wrote:
> > Add function 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.
> >
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> > drivers/media/v4l2-core/v4l2-fwnode.c | 69 ++++++++++++++++++++++++++++++++
> > 1 file changed, 69 insertions(+)
> >
> > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c
> > b/drivers/media/v4l2-core/v4l2-fwnode.c index 44ee35f6aad5..65e84ea1cc35
> > 100644
> > --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> > @@ -498,6 +498,75 @@ int v4l2_async_notifier_parse_fwnode_endpoints_by_port(
> > }
> > EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
> >
> > +/*
> > + * 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
> > + *
> > + * Return: 0 on success
> > + * -ENOENT if no entries were found
> > + * -ENOMEM if memory allocation failed
> > + * -EINVAL if property parsing failed
> > + */
> > +static int v4l2_fwnode_reference_parse(
> > + struct device *dev, struct v4l2_async_notifier *notifier,
> > + const char *prop)
> > +{
> > + struct fwnode_reference_args args;
> > + unsigned int index;
> > + int ret;
> > +
> > + for (index = 0;
> > + !(ret = fwnode_property_get_reference_args(
> > + dev_fwnode(dev), prop, NULL, 0, index, &args));
> > + index++)
> > + fwnode_handle_put(args.fwnode);
>
> This seems to indicate that the fwnode API is missing a function to count the
> number of references in a property. Should that be fixed ?
I can send a patch adding that.
OF has one available but it's only for cases where the number of integer
arguments isn't fixed.
>
> The rest looks OK to me.
>
> > + if (!index)
> > + return -ENOENT;
> > +
> > + /*
> > + * Note that right now both -ENODATA and -ENOENT may signal
> > + * out-of-bounds access. Return the error in cases other than that.
> > + */
> > + if (ret != -ENOENT && ret != -ENODATA)
> > + return ret;
> > +
> > + ret = v4l2_async_notifier_realloc(notifier,
> > + notifier->num_subdevs + index);
> > + if (ret)
> > + return ret;
> > +
> > + for (index = 0; !fwnode_property_get_reference_args(
> > + dev_fwnode(dev), prop, NULL, 0, index, &args);
> > + index++) {
> > + struct v4l2_async_subdev *asd;
> > +
> > + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> > + ret = -EINVAL;
> > + goto error;
> > + }
> > +
> > + asd = kzalloc(sizeof(*asd), GFP_KERNEL);
> > + if (!asd) {
> > + ret = -ENOMEM;
> > + 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;
> > +}
> > +
> > MODULE_LICENSE("GPL");
> > MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
> > MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
>
>
> --
> Regards,
>
> Laurent Pinchart
>
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
2017-09-15 14:17 ` Sakari Ailus
@ 2017-09-19 13:52 ` Laurent Pinchart
-1 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 13:52 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:13 EEST Sakari Ailus wrote:
> Registering a notifier has required the knowledge of struct v4l2_device
> for the reason that sub-devices generally are registered to the
> v4l2_device (as well as the media device, also available through
> v4l2_device).
>
> This information is not available for sub-device drivers at probe time.
>
> What this patch does is that it allows registering notifiers without
> having v4l2_device around. Instead the sub-device pointer is stored in the
> notifier. Once the sub-device of the driver that registered the notifier
> is registered, the notifier will gain the knowledge of the v4l2_device,
> and the binding of async sub-devices from the sub-device driver's notifier
> may proceed.
>
> The root notifier's complete callback is only called when all sub-device
> notifiers are completed.
This is a bit hard to review, shouldn't it be split in two patches, one that
refactors the functions, and another one that allows binding notifiers to
subdevs ?
> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 218 +++++++++++++++++++++++++++-----
> include/media/v4l2-async.h | 16 ++-
> 2 files changed, 203 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index 4be2f16af051..52fe22b9b6b4
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -53,6 +53,10 @@ static int v4l2_async_notifier_call_complete(struct
> v4l2_async_notifier *n) return n->ops->complete(n);
> }
>
> +static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> + struct v4l2_subdev *sd,
> + struct v4l2_async_subdev *asd);
Forward declarations are often a sign that something is wrong :-/ If you
really need to keep this I'd move it right before the function that needs it.
> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev
> *asd) {
> #if IS_ENABLED(CONFIG_I2C)
> @@ -124,14 +128,127 @@ static struct v4l2_async_subdev
> *v4l2_async_find_match( return NULL;
> }
>
> +/* Find the sub-device notifier registered by a sub-device driver. */
> +static struct v4l2_async_notifier *v4l2_async_find_subdev_notifier(
> + struct v4l2_subdev *sd)
> +{
> + struct v4l2_async_notifier *n;
> +
> + list_for_each_entry(n, ¬ifier_list, list)
> + if (n->sd == sd)
> + return n;
> +
> + return NULL;
> +}
> +
> +/* Return true if all sub-device notifiers are complete, false otherwise.
> */
> +static bool v4l2_async_subdev_notifiers_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!list_empty(¬ifier->waiting))
> + return false;
> +
> + list_for_each_entry(sd, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier &&
> + !v4l2_async_subdev_notifiers_complete(subdev_notifier))
> + return false;
This will loop forever if two subdevs add each other to their respective
notifiers. We might not have any use case for that right now, but it's bound
to happen, at least as a bug during development, and an infinite loop (with an
additional stack overflow bonus) isn't very nice to debug.
> + }
> +
> + return true;
> +}
> +
> +/* Get v4l2_device related to the notifier if one can be found. */
> +static struct v4l2_device *v4l2_async_notifier_find_v4l2_dev(
> + struct v4l2_async_notifier *notifier)
> +{
> + while (notifier->parent)
> + notifier = notifier->parent;
> +
> + return notifier->v4l2_dev;
> +}
> +
> +/* Test all async sub-devices in a notifier for a match. */
> +static int v4l2_async_notifier_try_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!v4l2_async_notifier_find_v4l2_dev(notifier))
> + return 0;
> +
> +again:
> + list_for_each_entry(sd, &subdev_list, async_list) {
> + struct v4l2_async_subdev *asd;
> + int ret;
> +
> + asd = v4l2_async_find_match(notifier, sd);
> + if (!asd)
> + continue;
> +
> + ret = v4l2_async_match_notify(notifier, sd, asd);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * v4l2_async_match_notify() may lead to registering a
> + * new notifier and thus changing the async subdevs
> + * list. In order to proceed safely from here, restart
> + * parsing the list from the beginning.
> + */
> + goto again;
> + }
> +
> + return 0;
> +}
> +
> +/* Try completing a notifier. */
> +static int v4l2_async_notifier_try_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + do {
> + int ret;
> +
> + /* Any local async sub-devices left? */
> + if (!list_empty(¬ifier->waiting))
> + return 0;
> +
> + /*
> + * Any sub-device notifiers waiting for async subdevs
> + * to be bound?
> + */
> + if (!v4l2_async_subdev_notifiers_complete(notifier))
> + return 0;
> +
> + /* Proceed completing the notifier */
> + ret = v4l2_async_notifier_call_complete(notifier);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * Obtain notifier's parent. If there is one, repeat
> + * the process, otherwise we're done here.
> + */
> + notifier = notifier->parent;
> + } while (notifier);
> +
> + return 0;
> +}
> +
> static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> struct v4l2_subdev *sd,
> struct v4l2_async_subdev *asd)
> {
> + struct v4l2_async_notifier *subdev_notifier;
> int ret;
>
> - ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> - if (ret < 0)
> + ret = v4l2_device_register_subdev(
> + v4l2_async_notifier_find_v4l2_dev(notifier), sd);
> + if (ret)
> return ret;
>
> ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> @@ -148,10 +265,20 @@ static int v4l2_async_match_notify(struct
> v4l2_async_notifier *notifier, /* Move from the global subdevice list to
> notifier's done */
> list_move(&sd->async_list, ¬ifier->done);
>
> - if (list_empty(¬ifier->waiting))
> - return v4l2_async_notifier_call_complete(notifier);
> + /*
> + * See if the sub-device has a notifier. If it does, proceed
> + * with checking for its async sub-devices.
> + */
> + subdev_notifier = v4l2_async_find_subdev_notifier(sd);
> + if (subdev_notifier && !subdev_notifier->parent) {
> + subdev_notifier->parent = notifier;
> + ret = v4l2_async_notifier_try_all_subdevs(subdev_notifier);
> + if (ret)
> + return ret;
> + }
>
> - return 0;
> + /* Try completing the notifier and its parent(s). */
> + return v4l2_async_notifier_try_complete(notifier);
> }
>
> static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> @@ -163,17 +290,15 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> sd->dev = NULL;
> }
>
> -int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> - struct v4l2_async_notifier *notifier)
> +static int __v4l2_async_notifier_register(struct v4l2_async_notifier
> *notifier) {
> - struct v4l2_subdev *sd, *tmp;
> struct v4l2_async_subdev *asd;
> + int ret;
> int i;
>
> - if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> + if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> return -EINVAL;
>
> - notifier->v4l2_dev = v4l2_dev;
> INIT_LIST_HEAD(¬ifier->waiting);
> INIT_LIST_HEAD(¬ifier->done);
>
> @@ -200,18 +325,10 @@ int v4l2_async_notifier_register(struct v4l2_device
> *v4l2_dev,
>
> mutex_lock(&list_lock);
>
> - list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
> - int ret;
> -
> - asd = v4l2_async_find_match(notifier, sd);
> - if (!asd)
> - continue;
> -
> - ret = v4l2_async_match_notify(notifier, sd, asd);
> - if (ret < 0) {
> - mutex_unlock(&list_lock);
> - return ret;
> - }
> + ret = v4l2_async_notifier_try_all_subdevs(notifier);
> + if (ret) {
> + mutex_unlock(&list_lock);
> + return ret;
> }
>
> /* Keep also completed notifiers on the list */
> @@ -221,29 +338,70 @@ int v4l2_async_notifier_register(struct v4l2_device
> *v4l2_dev,
>
> return 0;
> }
> +
> +int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> + struct v4l2_async_notifier *notifier)
> +{
> + if (WARN_ON(!v4l2_dev || notifier->sd))
> + return -EINVAL;
> +
> + notifier->v4l2_dev = v4l2_dev;
> +
> + return __v4l2_async_notifier_register(notifier);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_register);
>
> -void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
> + struct v4l2_async_notifier *notifier)
> {
> - struct v4l2_subdev *sd, *tmp;
> + if (WARN_ON(!sd || notifier->v4l2_dev))
> + return -EINVAL;
>
> - if (!notifier->v4l2_dev)
> - return;
> + notifier->sd = sd;
>
> - mutex_lock(&list_lock);
> + return __v4l2_async_notifier_register(notifier);
> +}
> +EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
>
> - list_del(¬ifier->list);
> +/* Unbind all sub-devices in the notifier tree. */
> +static void v4l2_async_notifier_unbind_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd, *tmp;
>
> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier)
> + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> +
> v4l2_async_cleanup(sd);
>
> v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> - }
>
> - mutex_unlock(&list_lock);
> + list_del(&sd->async_list);
> + list_add(&sd->async_list, &subdev_list);
How about list_move() ?
This seems to be new code, and by the look of it, I wonder whether it doesn't
belong in the reprobing removal patch.
> + }
>
> + notifier->parent = NULL;
> + notifier->sd = NULL;
> notifier->v4l2_dev = NULL;
> }
> +
> +void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +{
> + if (!notifier->v4l2_dev && !notifier->sd)
> + return;
> +
> + mutex_lock(&list_lock);
> +
> + v4l2_async_notifier_unbind_all_subdevs(notifier);
> +
> + list_del(¬ifier->list);
> +
> + mutex_unlock(&list_lock);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
>
> void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
[snip]
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
@ 2017-09-19 13:52 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 13:52 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
Thank you for the patch.
On Friday, 15 September 2017 17:17:13 EEST Sakari Ailus wrote:
> Registering a notifier has required the knowledge of struct v4l2_device
> for the reason that sub-devices generally are registered to the
> v4l2_device (as well as the media device, also available through
> v4l2_device).
>
> This information is not available for sub-device drivers at probe time.
>
> What this patch does is that it allows registering notifiers without
> having v4l2_device around. Instead the sub-device pointer is stored in the
> notifier. Once the sub-device of the driver that registered the notifier
> is registered, the notifier will gain the knowledge of the v4l2_device,
> and the binding of async sub-devices from the sub-device driver's notifier
> may proceed.
>
> The root notifier's complete callback is only called when all sub-device
> notifiers are completed.
This is a bit hard to review, shouldn't it be split in two patches, one that
refactors the functions, and another one that allows binding notifiers to
subdevs ?
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> drivers/media/v4l2-core/v4l2-async.c | 218 +++++++++++++++++++++++++++-----
> include/media/v4l2-async.h | 16 ++-
> 2 files changed, 203 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> b/drivers/media/v4l2-core/v4l2-async.c index 4be2f16af051..52fe22b9b6b4
> 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -53,6 +53,10 @@ static int v4l2_async_notifier_call_complete(struct
> v4l2_async_notifier *n) return n->ops->complete(n);
> }
>
> +static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> + struct v4l2_subdev *sd,
> + struct v4l2_async_subdev *asd);
Forward declarations are often a sign that something is wrong :-/ If you
really need to keep this I'd move it right before the function that needs it.
> static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev
> *asd) {
> #if IS_ENABLED(CONFIG_I2C)
> @@ -124,14 +128,127 @@ static struct v4l2_async_subdev
> *v4l2_async_find_match( return NULL;
> }
>
> +/* Find the sub-device notifier registered by a sub-device driver. */
> +static struct v4l2_async_notifier *v4l2_async_find_subdev_notifier(
> + struct v4l2_subdev *sd)
> +{
> + struct v4l2_async_notifier *n;
> +
> + list_for_each_entry(n, ¬ifier_list, list)
> + if (n->sd == sd)
> + return n;
> +
> + return NULL;
> +}
> +
> +/* Return true if all sub-device notifiers are complete, false otherwise.
> */
> +static bool v4l2_async_subdev_notifiers_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!list_empty(¬ifier->waiting))
> + return false;
> +
> + list_for_each_entry(sd, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier &&
> + !v4l2_async_subdev_notifiers_complete(subdev_notifier))
> + return false;
This will loop forever if two subdevs add each other to their respective
notifiers. We might not have any use case for that right now, but it's bound
to happen, at least as a bug during development, and an infinite loop (with an
additional stack overflow bonus) isn't very nice to debug.
> + }
> +
> + return true;
> +}
> +
> +/* Get v4l2_device related to the notifier if one can be found. */
> +static struct v4l2_device *v4l2_async_notifier_find_v4l2_dev(
> + struct v4l2_async_notifier *notifier)
> +{
> + while (notifier->parent)
> + notifier = notifier->parent;
> +
> + return notifier->v4l2_dev;
> +}
> +
> +/* Test all async sub-devices in a notifier for a match. */
> +static int v4l2_async_notifier_try_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd;
> +
> + if (!v4l2_async_notifier_find_v4l2_dev(notifier))
> + return 0;
> +
> +again:
> + list_for_each_entry(sd, &subdev_list, async_list) {
> + struct v4l2_async_subdev *asd;
> + int ret;
> +
> + asd = v4l2_async_find_match(notifier, sd);
> + if (!asd)
> + continue;
> +
> + ret = v4l2_async_match_notify(notifier, sd, asd);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * v4l2_async_match_notify() may lead to registering a
> + * new notifier and thus changing the async subdevs
> + * list. In order to proceed safely from here, restart
> + * parsing the list from the beginning.
> + */
> + goto again;
> + }
> +
> + return 0;
> +}
> +
> +/* Try completing a notifier. */
> +static int v4l2_async_notifier_try_complete(
> + struct v4l2_async_notifier *notifier)
> +{
> + do {
> + int ret;
> +
> + /* Any local async sub-devices left? */
> + if (!list_empty(¬ifier->waiting))
> + return 0;
> +
> + /*
> + * Any sub-device notifiers waiting for async subdevs
> + * to be bound?
> + */
> + if (!v4l2_async_subdev_notifiers_complete(notifier))
> + return 0;
> +
> + /* Proceed completing the notifier */
> + ret = v4l2_async_notifier_call_complete(notifier);
> + if (ret < 0)
> + return ret;
> +
> + /*
> + * Obtain notifier's parent. If there is one, repeat
> + * the process, otherwise we're done here.
> + */
> + notifier = notifier->parent;
> + } while (notifier);
> +
> + return 0;
> +}
> +
> static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> struct v4l2_subdev *sd,
> struct v4l2_async_subdev *asd)
> {
> + struct v4l2_async_notifier *subdev_notifier;
> int ret;
>
> - ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> - if (ret < 0)
> + ret = v4l2_device_register_subdev(
> + v4l2_async_notifier_find_v4l2_dev(notifier), sd);
> + if (ret)
> return ret;
>
> ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> @@ -148,10 +265,20 @@ static int v4l2_async_match_notify(struct
> v4l2_async_notifier *notifier, /* Move from the global subdevice list to
> notifier's done */
> list_move(&sd->async_list, ¬ifier->done);
>
> - if (list_empty(¬ifier->waiting))
> - return v4l2_async_notifier_call_complete(notifier);
> + /*
> + * See if the sub-device has a notifier. If it does, proceed
> + * with checking for its async sub-devices.
> + */
> + subdev_notifier = v4l2_async_find_subdev_notifier(sd);
> + if (subdev_notifier && !subdev_notifier->parent) {
> + subdev_notifier->parent = notifier;
> + ret = v4l2_async_notifier_try_all_subdevs(subdev_notifier);
> + if (ret)
> + return ret;
> + }
>
> - return 0;
> + /* Try completing the notifier and its parent(s). */
> + return v4l2_async_notifier_try_complete(notifier);
> }
>
> static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> @@ -163,17 +290,15 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> sd->dev = NULL;
> }
>
> -int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> - struct v4l2_async_notifier *notifier)
> +static int __v4l2_async_notifier_register(struct v4l2_async_notifier
> *notifier) {
> - struct v4l2_subdev *sd, *tmp;
> struct v4l2_async_subdev *asd;
> + int ret;
> int i;
>
> - if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> + if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> return -EINVAL;
>
> - notifier->v4l2_dev = v4l2_dev;
> INIT_LIST_HEAD(¬ifier->waiting);
> INIT_LIST_HEAD(¬ifier->done);
>
> @@ -200,18 +325,10 @@ int v4l2_async_notifier_register(struct v4l2_device
> *v4l2_dev,
>
> mutex_lock(&list_lock);
>
> - list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
> - int ret;
> -
> - asd = v4l2_async_find_match(notifier, sd);
> - if (!asd)
> - continue;
> -
> - ret = v4l2_async_match_notify(notifier, sd, asd);
> - if (ret < 0) {
> - mutex_unlock(&list_lock);
> - return ret;
> - }
> + ret = v4l2_async_notifier_try_all_subdevs(notifier);
> + if (ret) {
> + mutex_unlock(&list_lock);
> + return ret;
> }
>
> /* Keep also completed notifiers on the list */
> @@ -221,29 +338,70 @@ int v4l2_async_notifier_register(struct v4l2_device
> *v4l2_dev,
>
> return 0;
> }
> +
> +int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> + struct v4l2_async_notifier *notifier)
> +{
> + if (WARN_ON(!v4l2_dev || notifier->sd))
> + return -EINVAL;
> +
> + notifier->v4l2_dev = v4l2_dev;
> +
> + return __v4l2_async_notifier_register(notifier);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_register);
>
> -void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
> + struct v4l2_async_notifier *notifier)
> {
> - struct v4l2_subdev *sd, *tmp;
> + if (WARN_ON(!sd || notifier->v4l2_dev))
> + return -EINVAL;
>
> - if (!notifier->v4l2_dev)
> - return;
> + notifier->sd = sd;
>
> - mutex_lock(&list_lock);
> + return __v4l2_async_notifier_register(notifier);
> +}
> +EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
>
> - list_del(¬ifier->list);
> +/* Unbind all sub-devices in the notifier tree. */
> +static void v4l2_async_notifier_unbind_all_subdevs(
> + struct v4l2_async_notifier *notifier)
> +{
> + struct v4l2_subdev *sd, *tmp;
>
> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> + struct v4l2_async_notifier *subdev_notifier =
> + v4l2_async_find_subdev_notifier(sd);
> +
> + if (subdev_notifier)
> + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> +
> v4l2_async_cleanup(sd);
>
> v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> - }
>
> - mutex_unlock(&list_lock);
> + list_del(&sd->async_list);
> + list_add(&sd->async_list, &subdev_list);
How about list_move() ?
This seems to be new code, and by the look of it, I wonder whether it doesn't
belong in the reprobing removal patch.
> + }
>
> + notifier->parent = NULL;
> + notifier->sd = NULL;
> notifier->v4l2_dev = NULL;
> }
> +
> +void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> +{
> + if (!notifier->v4l2_dev && !notifier->sd)
> + return;
> +
> + mutex_lock(&list_lock);
> +
> + v4l2_async_notifier_unbind_all_subdevs(notifier);
> +
> + list_del(¬ifier->list);
> +
> + mutex_unlock(&list_lock);
> +}
> EXPORT_SYMBOL(v4l2_async_notifier_unregister);
>
> void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
[snip]
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
2017-09-19 13:04 ` Sakari Ailus
@ 2017-09-19 14:01 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 14:01 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
On Tuesday, 19 September 2017 16:04:53 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 03:19:59PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:16 EEST Sakari Ailus wrote:
> > > Add function 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.
> > >
> > > Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > > ---
> > >
> > > drivers/media/v4l2-core/v4l2-fwnode.c | 69 ++++++++++++++++++++++++++++
> > > 1 file changed, 69 insertions(+)
> > >
> > > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c
> > > b/drivers/media/v4l2-core/v4l2-fwnode.c index 44ee35f6aad5..65e84ea1cc35
> > > 100644
> > > --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> > > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> > > @@ -498,6 +498,75 @@ int
> > > v4l2_async_notifier_parse_fwnode_endpoints_by_port( }
> > >
> > > EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
> > >
> > > +/*
> > > + * 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
> > > + *
> > > + * Return: 0 on success
> > > + * -ENOENT if no entries were found
> > > + * -ENOMEM if memory allocation failed
> > > + * -EINVAL if property parsing failed
> > > + */
> > > +static int v4l2_fwnode_reference_parse(
> > > + struct device *dev, struct v4l2_async_notifier *notifier,
> > > + const char *prop)
> > > +{
> > > + struct fwnode_reference_args args;
> > > + unsigned int index;
> > > + int ret;
> > > +
> > > + for (index = 0;
> > > + !(ret = fwnode_property_get_reference_args(
> > > + dev_fwnode(dev), prop, NULL, 0, index, &args));
> > > + index++)
> > > + fwnode_handle_put(args.fwnode);
> >
> > This seems to indicate that the fwnode API is missing a function to count
> > the number of references in a property. Should that be fixed ?
>
> I can send a patch adding that.
>
> OF has one available but it's only for cases where the number of integer
> arguments isn't fixed.
Yes, in all other cases the size of one reference is known (it's the sum of
the sizes of all arguments), so the number of references can be computed with
size(property) / size(reference).
> > The rest looks OK to me.
> >
> > > + if (!index)
> > > + return -ENOENT;
> > > +
> > > + /*
> > > + * Note that right now both -ENODATA and -ENOENT may signal
> > > + * out-of-bounds access. Return the error in cases other than that.
> > > + */
> > > + if (ret != -ENOENT && ret != -ENODATA)
> > > + return ret;
> > > +
> > > + ret = v4l2_async_notifier_realloc(notifier,
> > > + notifier->num_subdevs + index);
> > > + if (ret)
> > > + return ret;
> > > +
> > > + for (index = 0; !fwnode_property_get_reference_args(
> > > + dev_fwnode(dev), prop, NULL, 0, index, &args);
> > > + index++) {
> > > + struct v4l2_async_subdev *asd;
> > > +
> > > + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> > > + ret = -EINVAL;
> > > + goto error;
> > > + }
> > > +
> > > + asd = kzalloc(sizeof(*asd), GFP_KERNEL);
> > > + if (!asd) {
> > > + ret = -ENOMEM;
> > > + 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;
> > > +}
> > > +
> > >
> > > MODULE_LICENSE("GPL");
> > > MODULE_AUTHOR("Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>");
> > > MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org>");
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references
@ 2017-09-19 14:01 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 14:01 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 16:04:53 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 03:19:59PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:16 EEST Sakari Ailus wrote:
> > > Add function 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.
> > >
> > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > > ---
> > >
> > > drivers/media/v4l2-core/v4l2-fwnode.c | 69 ++++++++++++++++++++++++++++
> > > 1 file changed, 69 insertions(+)
> > >
> > > diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c
> > > b/drivers/media/v4l2-core/v4l2-fwnode.c index 44ee35f6aad5..65e84ea1cc35
> > > 100644
> > > --- a/drivers/media/v4l2-core/v4l2-fwnode.c
> > > +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
> > > @@ -498,6 +498,75 @@ int
> > > v4l2_async_notifier_parse_fwnode_endpoints_by_port( }
> > >
> > > EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints_by_port);
> > >
> > > +/*
> > > + * 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
> > > + *
> > > + * Return: 0 on success
> > > + * -ENOENT if no entries were found
> > > + * -ENOMEM if memory allocation failed
> > > + * -EINVAL if property parsing failed
> > > + */
> > > +static int v4l2_fwnode_reference_parse(
> > > + struct device *dev, struct v4l2_async_notifier *notifier,
> > > + const char *prop)
> > > +{
> > > + struct fwnode_reference_args args;
> > > + unsigned int index;
> > > + int ret;
> > > +
> > > + for (index = 0;
> > > + !(ret = fwnode_property_get_reference_args(
> > > + dev_fwnode(dev), prop, NULL, 0, index, &args));
> > > + index++)
> > > + fwnode_handle_put(args.fwnode);
> >
> > This seems to indicate that the fwnode API is missing a function to count
> > the number of references in a property. Should that be fixed ?
>
> I can send a patch adding that.
>
> OF has one available but it's only for cases where the number of integer
> arguments isn't fixed.
Yes, in all other cases the size of one reference is known (it's the sum of
the sizes of all arguments), so the number of references can be computed with
size(property) / size(reference).
> > The rest looks OK to me.
> >
> > > + if (!index)
> > > + return -ENOENT;
> > > +
> > > + /*
> > > + * Note that right now both -ENODATA and -ENOENT may signal
> > > + * out-of-bounds access. Return the error in cases other than that.
> > > + */
> > > + if (ret != -ENOENT && ret != -ENODATA)
> > > + return ret;
> > > +
> > > + ret = v4l2_async_notifier_realloc(notifier,
> > > + notifier->num_subdevs + index);
> > > + if (ret)
> > > + return ret;
> > > +
> > > + for (index = 0; !fwnode_property_get_reference_args(
> > > + dev_fwnode(dev), prop, NULL, 0, index, &args);
> > > + index++) {
> > > + struct v4l2_async_subdev *asd;
> > > +
> > > + if (WARN_ON(notifier->num_subdevs >= notifier->max_subdevs)) {
> > > + ret = -EINVAL;
> > > + goto error;
> > > + }
> > > +
> > > + asd = kzalloc(sizeof(*asd), GFP_KERNEL);
> > > + if (!asd) {
> > > + ret = -ENOMEM;
> > > + 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;
> > > +}
> > > +
> > >
> > > MODULE_LICENSE("GPL");
> > > MODULE_AUTHOR("Sakari Ailus <sakari.ailus@linux.intel.com>");
> > > MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung.com>");
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-19 12:46 ` Laurent Pinchart
@ 2017-09-19 14:47 ` Sakari Ailus
2017-09-20 15:50 ` Sakari Ailus
1 sibling, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 14:47 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 03:46:18PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > > > @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> > > >
> > > > if (ret)
> > > >
> > > > return ret;
> > > >
> > > > - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > > > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > > > + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > > > + isp_fwnode_parse);
> > > >
> > > > if (ret < 0)
> > >
> > > The documentation in patch 05/25 states that v4l2_async_notifier_release()
> > > should be called even if v4l2_async_notifier_parse_fwnode_endpoints()
> > > fails. I don't think that's needed here, so you might want to update the
> > > documentation (and possibly the implementation of the function).
> >
> > It is. If parsing fails, async sub-devices may have been already set up.
> > This happens e.g. when the parsing fails after the first one has been
> > successfully set up already.
>
> But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
> internally when an error occurs. Otherwise you need to call
> v4l2_async_notifier_release() here.
The functions that set up async sub-devices can be called multiple times
(on separate references). This is quite alike setting up a control handler
really, so I adopted the same pattern.
If there is a failure, how many async sub-devices should be cleaned up, if
there have been async sub-devices already set up before calling this
function?
--
Regards,
Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
@ 2017-09-19 14:47 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 14:47 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:46:18PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > > > @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> > > >
> > > > if (ret)
> > > >
> > > > return ret;
> > > >
> > > > - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > > > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > > > + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > > > + isp_fwnode_parse);
> > > >
> > > > if (ret < 0)
> > >
> > > The documentation in patch 05/25 states that v4l2_async_notifier_release()
> > > should be called even if v4l2_async_notifier_parse_fwnode_endpoints()
> > > fails. I don't think that's needed here, so you might want to update the
> > > documentation (and possibly the implementation of the function).
> >
> > It is. If parsing fails, async sub-devices may have been already set up.
> > This happens e.g. when the parsing fails after the first one has been
> > successfully set up already.
>
> But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
> internally when an error occurs. Otherwise you need to call
> v4l2_async_notifier_release() here.
The functions that set up async sub-devices can be called multiple times
(on separate references). This is quite alike setting up a control handler
really, so I adopted the same pattern.
If there is a failure, how many async sub-devices should be cleaned up, if
there have been async sub-devices already set up before calling this
function?
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-19 12:43 ` Laurent Pinchart
@ 2017-09-19 14:50 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 14:50 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 03:43:48PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:13:11 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 03:01:14PM +0300, Laurent Pinchart wrote:
> > > On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> > >> Add three helper functions to call async operations callbacks. Besides
> > >> simplifying callbacks, this allows async notifiers to have no ops set,
> > >> i.e. it can be left NULL.
> > >>
> > >> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > >> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> > >> ---
> > >>
> > >> drivers/media/v4l2-core/v4l2-async.c | 49 +++++++++++++++++++++--------
> > >> include/media/v4l2-async.h | 1 +
> > >> 2 files changed, 37 insertions(+), 13 deletions(-)
> > >>
> > >> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > >> b/drivers/media/v4l2-core/v4l2-async.c index 7b2125b3d62f..c35d04b9122f
> > >> 100644
> > >> --- a/drivers/media/v4l2-core/v4l2-async.c
> > >> +++ b/drivers/media/v4l2-core/v4l2-async.c
> > >> @@ -25,6 +25,34 @@
> > >>
> > >> #include <media/v4l2-fwnode.h>
> > >> #include <media/v4l2-subdev.h>
> > >>
> > >> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier
> > >> *n,
> > >> + struct v4l2_subdev *subdev,
> > >> + struct v4l2_async_subdev *asd)
> > >> +{
> > >> + if (!n->ops || !n->ops->bound)
> > >> + return 0;
> > >> +
> > >> + return n->ops->bound(n, subdev, asd);
> > >> +}
> > >> +
> > >> +static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier
> > >> *n,
> > >> + struct v4l2_subdev *subdev,
> > >> + struct v4l2_async_subdev *asd)
> > >> +{
> > >> + if (!n->ops || !n->ops->unbind)
> > >> + return;
> > >> +
> > >> + n->ops->unbind(n, subdev, asd);
> > >> +}
> > >> +
> > >> +static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier
> > >> *n)
> > >> +{
> > >> + if (!n->ops || !n->ops->complete)
> > >> + return 0;
> > >> +
> > >> + return n->ops->complete(n);
> > >> +}
> > >> +
> > >
> > > Wouldn't it be enough to add a single v4l2_async_notifier_call() macro ?
> > >
> > > #define v4l2_async_notifier_call(n, op, args...) \
> > >
> > > ((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
> >
> > I actually had that in an earlier version but I changed it based on review
> > comments from Hans. A single macro isn't enough: some functions have int
> > return type. I think the way it is now is nicer.
>
> What bothers me there is the overhead of a function call.
Overhead... of a function call?
Do you really mean what you're saying? :-) The functions will be called a
relatively small number of times during module loading / device probing.
>
> By the way, what's the use case for ops being NULL ?
If a driver has no need for any of the callbacks, there's no benefit from
having to set ops struct either. This applies to devices that are
associated to the sensor, for instance.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
@ 2017-09-19 14:50 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 14:50 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:43:48PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:13:11 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 03:01:14PM +0300, Laurent Pinchart wrote:
> > > On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> > >> Add three helper functions to call async operations callbacks. Besides
> > >> simplifying callbacks, this allows async notifiers to have no ops set,
> > >> i.e. it can be left NULL.
> > >>
> > >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > >> ---
> > >>
> > >> drivers/media/v4l2-core/v4l2-async.c | 49 +++++++++++++++++++++--------
> > >> include/media/v4l2-async.h | 1 +
> > >> 2 files changed, 37 insertions(+), 13 deletions(-)
> > >>
> > >> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > >> b/drivers/media/v4l2-core/v4l2-async.c index 7b2125b3d62f..c35d04b9122f
> > >> 100644
> > >> --- a/drivers/media/v4l2-core/v4l2-async.c
> > >> +++ b/drivers/media/v4l2-core/v4l2-async.c
> > >> @@ -25,6 +25,34 @@
> > >>
> > >> #include <media/v4l2-fwnode.h>
> > >> #include <media/v4l2-subdev.h>
> > >>
> > >> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier
> > >> *n,
> > >> + struct v4l2_subdev *subdev,
> > >> + struct v4l2_async_subdev *asd)
> > >> +{
> > >> + if (!n->ops || !n->ops->bound)
> > >> + return 0;
> > >> +
> > >> + return n->ops->bound(n, subdev, asd);
> > >> +}
> > >> +
> > >> +static void v4l2_async_notifier_call_unbind(struct v4l2_async_notifier
> > >> *n,
> > >> + struct v4l2_subdev *subdev,
> > >> + struct v4l2_async_subdev *asd)
> > >> +{
> > >> + if (!n->ops || !n->ops->unbind)
> > >> + return;
> > >> +
> > >> + n->ops->unbind(n, subdev, asd);
> > >> +}
> > >> +
> > >> +static int v4l2_async_notifier_call_complete(struct v4l2_async_notifier
> > >> *n)
> > >> +{
> > >> + if (!n->ops || !n->ops->complete)
> > >> + return 0;
> > >> +
> > >> + return n->ops->complete(n);
> > >> +}
> > >> +
> > >
> > > Wouldn't it be enough to add a single v4l2_async_notifier_call() macro ?
> > >
> > > #define v4l2_async_notifier_call(n, op, args...) \
> > >
> > > ((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
> >
> > I actually had that in an earlier version but I changed it based on review
> > comments from Hans. A single macro isn't enough: some functions have int
> > return type. I think the way it is now is nicer.
>
> What bothers me there is the overhead of a function call.
Overhead... of a function call?
Do you really mean what you're saying? :-) The functions will be called a
relatively small number of times during module loading / device probing.
>
> By the way, what's the use case for ops being NULL ?
If a driver has no need for any of the callbacks, there's no benefit from
having to set ops struct either. This applies to devices that are
associated to the sensor, for instance.
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
2017-09-19 12:52 ` Laurent Pinchart
@ 2017-09-19 14:58 ` Sakari Ailus
[not found] ` <20170919145831.uztphjdtd3fdxzvr-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org>
0 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 14:58 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:52:02PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:04:43 EEST Laurent Pinchart wrote:
> > Hi Sakari,
> >
> > Thank you for the patch.
> >
> > On Friday, 15 September 2017 17:17:12 EEST Sakari Ailus wrote:
> > > The information on how many async sub-devices would be bindable to a
> > > notifier is typically dependent on information from platform firmware and
> > > it's not driver's business to be aware of that.
> > >
> > > Many V4L2 main drivers are perfectly usable (and useful) without async
> > > sub-devices and so if there aren't any around, just proceed call the
> > > notifier's complete callback immediately without registering the notifier
> > > itself.
> > >
> > > If a driver needs to check whether there are async sub-devices available,
> > > it can be done by inspecting the notifier's num_subdevs field which tells
> > > the number of async sub-devices.
> > >
> > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > > Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> >
> > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> I take this back.
>
> > > ---
> > >
> > > drivers/media/v4l2-core/v4l2-async.c | 6 ++++--
> > > 1 file changed, 4 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > > b/drivers/media/v4l2-core/v4l2-async.c index 9895b610e2a0..4be2f16af051
> > > 100644
> > > --- a/drivers/media/v4l2-core/v4l2-async.c
> > > +++ b/drivers/media/v4l2-core/v4l2-async.c
> > > @@ -170,14 +170,16 @@ int v4l2_async_notifier_register(struct v4l2_device
> > > *v4l2_dev, struct v4l2_async_subdev *asd;
> > >
> > > int i;
> > >
> > > - if (!v4l2_dev || !notifier->num_subdevs ||
> > > - notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> > > + if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> > >
> > > return -EINVAL;
> > >
> > > notifier->v4l2_dev = v4l2_dev;
> > > INIT_LIST_HEAD(¬ifier->waiting);
> > > INIT_LIST_HEAD(¬ifier->done);
> > >
> > > + if (!notifier->num_subdevs)
> > > + return v4l2_async_notifier_call_complete(notifier);
> > > +
>
> This skips adding the notifier to the notifier_list. Won't this result in an
> oops when calling list_del(¬ifier->list) in
> v4l2_async_notifier_unregister() ?
Good point. I'll add initialising the list head to the register function,
with an appropriate comment.
>
> > > for (i = 0; i < notifier->num_subdevs; i++) {
> > >
> > > asd = notifier->subdevs[i];
>
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
2017-09-19 14:58 ` Sakari Ailus
@ 2017-09-19 15:03 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 15:03 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
On Tue, Sep 19, 2017 at 05:58:32PM +0300, Sakari Ailus wrote:
> > This skips adding the notifier to the notifier_list. Won't this result in an
> > oops when calling list_del(¬ifier->list) in
> > v4l2_async_notifier_unregister() ?
>
> Good point. I'll add initialising the list head to the register function,
> with an appropriate comment.
I'll set v4l2_dev NULL instead; no tricks with lists needed.
--
Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
@ 2017-09-19 15:03 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 15:03 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
On Tue, Sep 19, 2017 at 05:58:32PM +0300, Sakari Ailus wrote:
> > This skips adding the notifier to the notifier_list. Won't this result in an
> > oops when calling list_del(¬ifier->list) in
> > v4l2_async_notifier_unregister() ?
>
> Good point. I'll add initialising the list head to the register function,
> with an appropriate comment.
I'll set v4l2_dev NULL instead; no tricks with lists needed.
--
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
2017-09-19 13:52 ` Laurent Pinchart
(?)
@ 2017-09-19 15:17 ` Sakari Ailus
[not found] ` <20170919151732.4yafxfcxrreizd7r-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org>
-1 siblings, 1 reply; 137+ messages in thread
From: Sakari Ailus @ 2017-09-19 15:17 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 04:52:29PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> Thank you for the patch.
>
> On Friday, 15 September 2017 17:17:13 EEST Sakari Ailus wrote:
> > Registering a notifier has required the knowledge of struct v4l2_device
> > for the reason that sub-devices generally are registered to the
> > v4l2_device (as well as the media device, also available through
> > v4l2_device).
> >
> > This information is not available for sub-device drivers at probe time.
> >
> > What this patch does is that it allows registering notifiers without
> > having v4l2_device around. Instead the sub-device pointer is stored in the
> > notifier. Once the sub-device of the driver that registered the notifier
> > is registered, the notifier will gain the knowledge of the v4l2_device,
> > and the binding of async sub-devices from the sub-device driver's notifier
> > may proceed.
> >
> > The root notifier's complete callback is only called when all sub-device
> > notifiers are completed.
>
> This is a bit hard to review, shouldn't it be split in two patches, one that
> refactors the functions, and another one that allows binding notifiers to
> subdevs ?
>
> > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > ---
> > drivers/media/v4l2-core/v4l2-async.c | 218 +++++++++++++++++++++++++++-----
> > include/media/v4l2-async.h | 16 ++-
> > 2 files changed, 203 insertions(+), 31 deletions(-)
> >
> > diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > b/drivers/media/v4l2-core/v4l2-async.c index 4be2f16af051..52fe22b9b6b4
> > 100644
> > --- a/drivers/media/v4l2-core/v4l2-async.c
> > +++ b/drivers/media/v4l2-core/v4l2-async.c
> > @@ -53,6 +53,10 @@ static int v4l2_async_notifier_call_complete(struct
> > v4l2_async_notifier *n) return n->ops->complete(n);
> > }
> >
> > +static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> > + struct v4l2_subdev *sd,
> > + struct v4l2_async_subdev *asd);
>
> Forward declarations are often a sign that something is wrong :-/ If you
> really need to keep this I'd move it right before the function that needs it.
"Something being wrong" here is that we have a data structure (the graph)
and a portion of the graph is parsed at any given point of time; there is
no central location with the knowledge of each node in the graph. Therefore
the process is recursive: you only learn of new nodes to parse when you
have parsed something.
I can move the declaration closer to where it's used.
>
> > static bool match_i2c(struct v4l2_subdev *sd, struct v4l2_async_subdev
> > *asd) {
> > #if IS_ENABLED(CONFIG_I2C)
> > @@ -124,14 +128,127 @@ static struct v4l2_async_subdev
> > *v4l2_async_find_match( return NULL;
> > }
> >
> > +/* Find the sub-device notifier registered by a sub-device driver. */
> > +static struct v4l2_async_notifier *v4l2_async_find_subdev_notifier(
> > + struct v4l2_subdev *sd)
> > +{
> > + struct v4l2_async_notifier *n;
> > +
> > + list_for_each_entry(n, ¬ifier_list, list)
> > + if (n->sd == sd)
> > + return n;
> > +
> > + return NULL;
> > +}
> > +
> > +/* Return true if all sub-device notifiers are complete, false otherwise.
> > */
> > +static bool v4l2_async_subdev_notifiers_complete(
> > + struct v4l2_async_notifier *notifier)
> > +{
> > + struct v4l2_subdev *sd;
> > +
> > + if (!list_empty(¬ifier->waiting))
> > + return false;
> > +
> > + list_for_each_entry(sd, ¬ifier->done, async_list) {
> > + struct v4l2_async_notifier *subdev_notifier =
> > + v4l2_async_find_subdev_notifier(sd);
> > +
> > + if (subdev_notifier &&
> > + !v4l2_async_subdev_notifiers_complete(subdev_notifier))
> > + return false;
>
> This will loop forever if two subdevs add each other to their respective
> notifiers. We might not have any use case for that right now, but it's bound
> to happen, at least as a bug during development, and an infinite loop (with an
> additional stack overflow bonus) isn't very nice to debug.
Well, yes. If you have a driver bug then this is what could happen.
One option is to check whether an fwnode has already been associated with
an async subdev and fail if it is. I was originally thinking of adding that
but then ended up postponing that for later. I can add that to v14.
>
> > + }
> > +
> > + return true;
> > +}
> > +
> > +/* Get v4l2_device related to the notifier if one can be found. */
> > +static struct v4l2_device *v4l2_async_notifier_find_v4l2_dev(
> > + struct v4l2_async_notifier *notifier)
> > +{
> > + while (notifier->parent)
> > + notifier = notifier->parent;
> > +
> > + return notifier->v4l2_dev;
> > +}
> > +
> > +/* Test all async sub-devices in a notifier for a match. */
> > +static int v4l2_async_notifier_try_all_subdevs(
> > + struct v4l2_async_notifier *notifier)
> > +{
> > + struct v4l2_subdev *sd;
> > +
> > + if (!v4l2_async_notifier_find_v4l2_dev(notifier))
> > + return 0;
> > +
> > +again:
> > + list_for_each_entry(sd, &subdev_list, async_list) {
> > + struct v4l2_async_subdev *asd;
> > + int ret;
> > +
> > + asd = v4l2_async_find_match(notifier, sd);
> > + if (!asd)
> > + continue;
> > +
> > + ret = v4l2_async_match_notify(notifier, sd, asd);
> > + if (ret < 0)
> > + return ret;
> > +
> > + /*
> > + * v4l2_async_match_notify() may lead to registering a
> > + * new notifier and thus changing the async subdevs
> > + * list. In order to proceed safely from here, restart
> > + * parsing the list from the beginning.
> > + */
> > + goto again;
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +/* Try completing a notifier. */
> > +static int v4l2_async_notifier_try_complete(
> > + struct v4l2_async_notifier *notifier)
> > +{
> > + do {
> > + int ret;
> > +
> > + /* Any local async sub-devices left? */
> > + if (!list_empty(¬ifier->waiting))
> > + return 0;
> > +
> > + /*
> > + * Any sub-device notifiers waiting for async subdevs
> > + * to be bound?
> > + */
> > + if (!v4l2_async_subdev_notifiers_complete(notifier))
> > + return 0;
> > +
> > + /* Proceed completing the notifier */
> > + ret = v4l2_async_notifier_call_complete(notifier);
> > + if (ret < 0)
> > + return ret;
> > +
> > + /*
> > + * Obtain notifier's parent. If there is one, repeat
> > + * the process, otherwise we're done here.
> > + */
> > + notifier = notifier->parent;
> > + } while (notifier);
> > +
> > + return 0;
> > +}
> > +
> > static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,
> > struct v4l2_subdev *sd,
> > struct v4l2_async_subdev *asd)
> > {
> > + struct v4l2_async_notifier *subdev_notifier;
> > int ret;
> >
> > - ret = v4l2_device_register_subdev(notifier->v4l2_dev, sd);
> > - if (ret < 0)
> > + ret = v4l2_device_register_subdev(
> > + v4l2_async_notifier_find_v4l2_dev(notifier), sd);
> > + if (ret)
> > return ret;
> >
> > ret = v4l2_async_notifier_call_bound(notifier, sd, asd);
> > @@ -148,10 +265,20 @@ static int v4l2_async_match_notify(struct
> > v4l2_async_notifier *notifier, /* Move from the global subdevice list to
> > notifier's done */
> > list_move(&sd->async_list, ¬ifier->done);
> >
> > - if (list_empty(¬ifier->waiting))
> > - return v4l2_async_notifier_call_complete(notifier);
> > + /*
> > + * See if the sub-device has a notifier. If it does, proceed
> > + * with checking for its async sub-devices.
> > + */
> > + subdev_notifier = v4l2_async_find_subdev_notifier(sd);
> > + if (subdev_notifier && !subdev_notifier->parent) {
> > + subdev_notifier->parent = notifier;
> > + ret = v4l2_async_notifier_try_all_subdevs(subdev_notifier);
> > + if (ret)
> > + return ret;
> > + }
> >
> > - return 0;
> > + /* Try completing the notifier and its parent(s). */
> > + return v4l2_async_notifier_try_complete(notifier);
> > }
> >
> > static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> > @@ -163,17 +290,15 @@ static void v4l2_async_cleanup(struct v4l2_subdev *sd)
> > sd->dev = NULL;
> > }
> >
> > -int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> > - struct v4l2_async_notifier *notifier)
> > +static int __v4l2_async_notifier_register(struct v4l2_async_notifier
> > *notifier) {
> > - struct v4l2_subdev *sd, *tmp;
> > struct v4l2_async_subdev *asd;
> > + int ret;
> > int i;
> >
> > - if (!v4l2_dev || notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> > + if (notifier->num_subdevs > V4L2_MAX_SUBDEVS)
> > return -EINVAL;
> >
> > - notifier->v4l2_dev = v4l2_dev;
> > INIT_LIST_HEAD(¬ifier->waiting);
> > INIT_LIST_HEAD(¬ifier->done);
> >
> > @@ -200,18 +325,10 @@ int v4l2_async_notifier_register(struct v4l2_device
> > *v4l2_dev,
> >
> > mutex_lock(&list_lock);
> >
> > - list_for_each_entry_safe(sd, tmp, &subdev_list, async_list) {
> > - int ret;
> > -
> > - asd = v4l2_async_find_match(notifier, sd);
> > - if (!asd)
> > - continue;
> > -
> > - ret = v4l2_async_match_notify(notifier, sd, asd);
> > - if (ret < 0) {
> > - mutex_unlock(&list_lock);
> > - return ret;
> > - }
> > + ret = v4l2_async_notifier_try_all_subdevs(notifier);
> > + if (ret) {
> > + mutex_unlock(&list_lock);
> > + return ret;
> > }
> >
> > /* Keep also completed notifiers on the list */
> > @@ -221,29 +338,70 @@ int v4l2_async_notifier_register(struct v4l2_device
> > *v4l2_dev,
> >
> > return 0;
> > }
> > +
> > +int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
> > + struct v4l2_async_notifier *notifier)
> > +{
> > + if (WARN_ON(!v4l2_dev || notifier->sd))
> > + return -EINVAL;
> > +
> > + notifier->v4l2_dev = v4l2_dev;
> > +
> > + return __v4l2_async_notifier_register(notifier);
> > +}
> > EXPORT_SYMBOL(v4l2_async_notifier_register);
> >
> > -void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> > +int v4l2_async_subdev_notifier_register(struct v4l2_subdev *sd,
> > + struct v4l2_async_notifier *notifier)
> > {
> > - struct v4l2_subdev *sd, *tmp;
> > + if (WARN_ON(!sd || notifier->v4l2_dev))
> > + return -EINVAL;
> >
> > - if (!notifier->v4l2_dev)
> > - return;
> > + notifier->sd = sd;
> >
> > - mutex_lock(&list_lock);
> > + return __v4l2_async_notifier_register(notifier);
> > +}
> > +EXPORT_SYMBOL(v4l2_async_subdev_notifier_register);
> >
> > - list_del(¬ifier->list);
> > +/* Unbind all sub-devices in the notifier tree. */
> > +static void v4l2_async_notifier_unbind_all_subdevs(
> > + struct v4l2_async_notifier *notifier)
> > +{
> > + struct v4l2_subdev *sd, *tmp;
> >
> > list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> > + struct v4l2_async_notifier *subdev_notifier =
> > + v4l2_async_find_subdev_notifier(sd);
> > +
> > + if (subdev_notifier)
> > + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> > +
> > v4l2_async_cleanup(sd);
> >
> > v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> > - }
> >
> > - mutex_unlock(&list_lock);
> > + list_del(&sd->async_list);
> > + list_add(&sd->async_list, &subdev_list);
>
> How about list_move() ?
Yeah.
>
> This seems to be new code, and by the look of it, I wonder whether it doesn't
> belong in the reprobing removal patch.
This is not related to re-probing. Here we're moving an async sub-device
back to the global sub-device list when its notifier is going away.
>
> > + }
> >
> > + notifier->parent = NULL;
> > + notifier->sd = NULL;
> > notifier->v4l2_dev = NULL;
> > }
> > +
> > +void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier)
> > +{
> > + if (!notifier->v4l2_dev && !notifier->sd)
> > + return;
> > +
> > + mutex_lock(&list_lock);
> > +
> > + v4l2_async_notifier_unbind_all_subdevs(notifier);
> > +
> > + list_del(¬ifier->list);
> > +
> > + mutex_unlock(&list_lock);
> > +}
> > EXPORT_SYMBOL(v4l2_async_notifier_unregister);
> >
> > void v4l2_async_notifier_release(struct v4l2_async_notifier *notifier)
>
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-19 14:47 ` Sakari Ailus
(?)
@ 2017-09-19 16:12 ` Laurent Pinchart
2017-09-21 8:46 ` Sakari Ailus
-1 siblings, 1 reply; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 16:12 UTC (permalink / raw)
To: Sakari Ailus
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 17:47:22 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 03:46:18PM +0300, Laurent Pinchart wrote:
> > On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> >> On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> >>>> @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device
> >>>> *pdev)
> >>>> if (ret)
> >>>> return ret;
> >>>>
> >>>> - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> >>>> + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> >>>> + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> >>>> + isp_fwnode_parse);
> >>>> if (ret < 0)
> >>>
> >>> The documentation in patch 05/25 states that
> >>> v4l2_async_notifier_release() should be called even if
> >>> v4l2_async_notifier_parse_fwnode_endpoints() fails. I don't think that's
> >>> needed here, so you might want to update the documentation (and possibly
> >>> the implementation of the function).
> >>
> >> It is. If parsing fails, async sub-devices may have been already set up.
> >> This happens e.g. when the parsing fails after the first one has been
> >> successfully set up already.
> >
> > But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
> > internally when an error occurs. Otherwise you need to call
> > v4l2_async_notifier_release() here.
>
> The functions that set up async sub-devices can be called multiple times
> (on separate references). This is quite alike setting up a control handler
> really, so I adopted the same pattern.
>
> If there is a failure, how many async sub-devices should be cleaned up, if
> there have been async sub-devices already set up before calling this
> function?
I'm not opposed to that pattern, I just thought that cleanup could be
automated for v4l2_async_notifier_parse_fwnode_endpoints() failures, as
opposed to v4l2_async_notifier_parse_fwnode_endpoints_by_port() failures.
As this patch, written by the author of
v4l2_async_notifier_parse_fwnode_endpoints() and part of the same patch
series, is missing a call to v4l2_async_notifier_release(), I expect driver
authors to make the same mistake and was thus wondering how to prevent that.
I believe that the issue here is that initialization of the notifier is done
implicitly by the first call to a parsing function. With explicit notification
it should be clear to driver authors that they need to call the cleanup
function:
ret = init()
if (ret)
return ret;
ret = parse()
if (ret) {
cleanup();
return ret;
}
ret = parse()
if (ret) {
cleanup();
return ret;
}
ret = parse()
if (ret) {
cleanup();
return ret;
}
But with an implicit initialization it's easy to miss cleanup when
v4l2_async_notifier_parse_fwnode_endpoints() fails, as that function can be
considered as an initilization function that performs cleanup internally.
I'm not sure what the best pattern would be. At the very least you need to fix
this patch, but that wouldn't prevent future mistakes.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-19 14:50 ` Sakari Ailus
(?)
@ 2017-09-19 16:27 ` Laurent Pinchart
2017-09-20 15:54 ` Sakari Ailus
-1 siblings, 1 reply; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 16:27 UTC (permalink / raw)
To: Sakari Ailus
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 17:50:49 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 03:43:48PM +0300, Laurent Pinchart wrote:
> > On Tuesday, 19 September 2017 15:13:11 EEST Sakari Ailus wrote:
> >> On Tue, Sep 19, 2017 at 03:01:14PM +0300, Laurent Pinchart wrote:
> >>> On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> >>>> Add three helper functions to call async operations callbacks.
> >>>> Besides simplifying callbacks, this allows async notifiers to have no
> >>>> ops set, i.e. it can be left NULL.
> >>>>
> >>>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >>>> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> >>>> ---
> >>>>
> >>>> drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++--------
> >>>> include/media/v4l2-async.h | 1 +
> >>>> 2 files changed, 37 insertions(+), 13 deletions(-)
> >>>>
> >>>> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> >>>> b/drivers/media/v4l2-core/v4l2-async.c index
> >>>> 7b2125b3d62f..c35d04b9122f
> >>>> 100644
> >>>> --- a/drivers/media/v4l2-core/v4l2-async.c
> >>>> +++ b/drivers/media/v4l2-core/v4l2-async.c
> >>>> @@ -25,6 +25,34 @@
> >>>>
> >>>> #include <media/v4l2-fwnode.h>
> >>>> #include <media/v4l2-subdev.h>
> >>>>
> >>>> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier
> >>>> *n,
> >>>> + struct v4l2_subdev *subdev,
> >>>> + struct v4l2_async_subdev *asd)
> >>>> +{
> >>>> + if (!n->ops || !n->ops->bound)
> >>>> + return 0;
> >>>> +
> >>>> + return n->ops->bound(n, subdev, asd);
> >>>> +}
> >>>> +
> >>>> +static void v4l2_async_notifier_call_unbind(struct
> >>>> v4l2_async_notifier
> >>>> *n,
> >>>> + struct v4l2_subdev *subdev,
> >>>> + struct v4l2_async_subdev *asd)
> >>>> +{
> >>>> + if (!n->ops || !n->ops->unbind)
> >>>> + return;
> >>>> +
> >>>> + n->ops->unbind(n, subdev, asd);
> >>>> +}
> >>>> +
> >>>> +static int v4l2_async_notifier_call_complete(struct
> >>>> v4l2_async_notifier
> >>>> *n)
> >>>> +{
> >>>> + if (!n->ops || !n->ops->complete)
> >>>> + return 0;
> >>>> +
> >>>> + return n->ops->complete(n);
> >>>> +}
> >>>> +
> >>>
> >>> Wouldn't it be enough to add a single v4l2_async_notifier_call() macro
> >>> ?
> >>>
> >>> #define v4l2_async_notifier_call(n, op, args...) \
> >>>
> >>> ((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
> >>
> >> I actually had that in an earlier version but I changed it based on
> >> review comments from Hans. A single macro isn't enough: some functions
> >> have int return type. I think the way it is now is nicer.
> >
> > What bothers me there is the overhead of a function call.
>
> Overhead... of a function call?
>
> Do you really mean what you're saying? :-) The functions will be called a
> relatively small number of times during module loading / device probing.
That's why I haven't said it's a big deal :-) There's of course no need to
optimize that if the tradeoff is large, but if all operations had the same
return type a macro could have been useful (although in this very specific
case I'm more concerned about code size than about CPU cycles).
> > By the way, what's the use case for ops being NULL ?
>
> If a driver has no need for any of the callbacks, there's no benefit from
> having to set ops struct either. This applies to devices that are
> associated to the sensor, for instance.
So in that case the subdev notifier is only registered to delay the complete()
callback until the flash and lens controllers are available, with the sensor
itself having no need to access the flash and lens controllers ?
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
2017-09-19 15:17 ` Sakari Ailus
@ 2017-09-19 17:52 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 17:52 UTC (permalink / raw)
To: Sakari Ailus
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Sakari,
On Tuesday, 19 September 2017 18:17:32 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 04:52:29PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:13 EEST Sakari Ailus wrote:
> > > Registering a notifier has required the knowledge of struct v4l2_device
> >> for the reason that sub-devices generally are registered to the
> >> v4l2_device (as well as the media device, also available through
> >> v4l2_device).
> >>
> >> This information is not available for sub-device drivers at probe time.
> >>
> >> What this patch does is that it allows registering notifiers without
> >> having v4l2_device around. Instead the sub-device pointer is stored in
> >> the notifier. Once the sub-device of the driver that registered the
> >> notifier is registered, the notifier will gain the knowledge of the
> >> v4l2_device, and the binding of async sub-devices from the sub-device
> >> driver's notifier may proceed.
> >>
> >> The root notifier's complete callback is only called when all sub-device
> >> notifiers are completed.
> >
> > This is a bit hard to review, shouldn't it be split in two patches, one
> > that refactors the functions, and another one that allows binding
> > notifiers to subdevs ?
> >
> >> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> >> ---
> >>
> >> drivers/media/v4l2-core/v4l2-async.c | 218 ++++++++++++++++++++++++-----
> >> include/media/v4l2-async.h | 16 ++-
> >> 2 files changed, 203 insertions(+), 31 deletions(-)
> >>
> >> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> >> b/drivers/media/v4l2-core/v4l2-async.c index 4be2f16af051..52fe22b9b6b4
> >> 100644
> >> --- a/drivers/media/v4l2-core/v4l2-async.c
> >> +++ b/drivers/media/v4l2-core/v4l2-async.c
[snip]
> >> +/* Unbind all sub-devices in the notifier tree. */
> >> +static void v4l2_async_notifier_unbind_all_subdevs(
> >> + struct v4l2_async_notifier *notifier)
> >> +{
> >> + struct v4l2_subdev *sd, *tmp;
> >>
> >> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> >>
> >> + struct v4l2_async_notifier *subdev_notifier =
> >> + v4l2_async_find_subdev_notifier(sd);
> >> +
> >> + if (subdev_notifier)
> >> + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> >> +
> >> v4l2_async_cleanup(sd);
> >>
> >> v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> >> - }
> >>
> >> - mutex_unlock(&list_lock);
> >> + list_del(&sd->async_list);
> >> + list_add(&sd->async_list, &subdev_list);
> >
> > How about list_move() ?
>
> Yeah.
>
> > This seems to be new code, and by the look of it, I wonder whether it
> > doesn't belong in the reprobing removal patch.
>
> This is not related to re-probing. Here we're moving an async sub-device
> back to the global sub-device list when its notifier is going away.
In order to make the subdev bindable again when the notifier will be re-
registered. This wasn't needed before, as reprobing took care of that.
> >> + }
> >>
> >> + notifier->parent = NULL;
> >> + notifier->sd = NULL;
> >> notifier->v4l2_dev = NULL;
> >> }
--
Regards,
Laurent Pinchart
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
@ 2017-09-19 17:52 ` Laurent Pinchart
0 siblings, 0 replies; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 17:52 UTC (permalink / raw)
To: Sakari Ailus
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 18:17:32 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 04:52:29PM +0300, Laurent Pinchart wrote:
> > On Friday, 15 September 2017 17:17:13 EEST Sakari Ailus wrote:
> > > Registering a notifier has required the knowledge of struct v4l2_device
> >> for the reason that sub-devices generally are registered to the
> >> v4l2_device (as well as the media device, also available through
> >> v4l2_device).
> >>
> >> This information is not available for sub-device drivers at probe time.
> >>
> >> What this patch does is that it allows registering notifiers without
> >> having v4l2_device around. Instead the sub-device pointer is stored in
> >> the notifier. Once the sub-device of the driver that registered the
> >> notifier is registered, the notifier will gain the knowledge of the
> >> v4l2_device, and the binding of async sub-devices from the sub-device
> >> driver's notifier may proceed.
> >>
> >> The root notifier's complete callback is only called when all sub-device
> >> notifiers are completed.
> >
> > This is a bit hard to review, shouldn't it be split in two patches, one
> > that refactors the functions, and another one that allows binding
> > notifiers to subdevs ?
> >
> >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >> ---
> >>
> >> drivers/media/v4l2-core/v4l2-async.c | 218 ++++++++++++++++++++++++-----
> >> include/media/v4l2-async.h | 16 ++-
> >> 2 files changed, 203 insertions(+), 31 deletions(-)
> >>
> >> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> >> b/drivers/media/v4l2-core/v4l2-async.c index 4be2f16af051..52fe22b9b6b4
> >> 100644
> >> --- a/drivers/media/v4l2-core/v4l2-async.c
> >> +++ b/drivers/media/v4l2-core/v4l2-async.c
[snip]
> >> +/* Unbind all sub-devices in the notifier tree. */
> >> +static void v4l2_async_notifier_unbind_all_subdevs(
> >> + struct v4l2_async_notifier *notifier)
> >> +{
> >> + struct v4l2_subdev *sd, *tmp;
> >>
> >> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> >>
> >> + struct v4l2_async_notifier *subdev_notifier =
> >> + v4l2_async_find_subdev_notifier(sd);
> >> +
> >> + if (subdev_notifier)
> >> + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> >> +
> >> v4l2_async_cleanup(sd);
> >>
> >> v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> >> - }
> >>
> >> - mutex_unlock(&list_lock);
> >> + list_del(&sd->async_list);
> >> + list_add(&sd->async_list, &subdev_list);
> >
> > How about list_move() ?
>
> Yeah.
>
> > This seems to be new code, and by the look of it, I wonder whether it
> > doesn't belong in the reprobing removal patch.
>
> This is not related to re-probing. Here we're moving an async sub-device
> back to the global sub-device list when its notifier is going away.
In order to make the subdev bindable again when the notifier will be re-
registered. This wasn't needed before, as reprobing took care of that.
> >> + }
> >>
> >> + notifier->parent = NULL;
> >> + notifier->sd = NULL;
> >> notifier->v4l2_dev = NULL;
> >> }
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
2017-09-19 15:03 ` Sakari Ailus
(?)
@ 2017-09-19 17:54 ` Laurent Pinchart
2017-09-20 10:51 ` Sakari Ailus
-1 siblings, 1 reply; 137+ messages in thread
From: Laurent Pinchart @ 2017-09-19 17:54 UTC (permalink / raw)
To: Sakari Ailus
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Sakari,
On Tuesday, 19 September 2017 18:03:48 EEST Sakari Ailus wrote:
> On Tue, Sep 19, 2017 at 05:58:32PM +0300, Sakari Ailus wrote:
> >> This skips adding the notifier to the notifier_list. Won't this result
> >> in an oops when calling list_del(¬ifier->list) in
> >> v4l2_async_notifier_unregister() ?
> >
> > Good point. I'll add initialising the list head to the register function,
> > with an appropriate comment.
>
> I'll set v4l2_dev NULL instead; no tricks with lists needed.
Shouldn't the notifier still be added to the notifier_list ?
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices
2017-09-19 17:52 ` Laurent Pinchart
(?)
@ 2017-09-20 9:42 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-20 9:42 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 08:52:56PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 18:17:32 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 04:52:29PM +0300, Laurent Pinchart wrote:
> > > On Friday, 15 September 2017 17:17:13 EEST Sakari Ailus wrote:
> > > > Registering a notifier has required the knowledge of struct v4l2_device
> > >> for the reason that sub-devices generally are registered to the
> > >> v4l2_device (as well as the media device, also available through
> > >> v4l2_device).
> > >>
> > >> This information is not available for sub-device drivers at probe time.
> > >>
> > >> What this patch does is that it allows registering notifiers without
> > >> having v4l2_device around. Instead the sub-device pointer is stored in
> > >> the notifier. Once the sub-device of the driver that registered the
> > >> notifier is registered, the notifier will gain the knowledge of the
> > >> v4l2_device, and the binding of async sub-devices from the sub-device
> > >> driver's notifier may proceed.
> > >>
> > >> The root notifier's complete callback is only called when all sub-device
> > >> notifiers are completed.
> > >
> > > This is a bit hard to review, shouldn't it be split in two patches, one
> > > that refactors the functions, and another one that allows binding
> > > notifiers to subdevs ?
> > >
> > >> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > >> ---
> > >>
> > >> drivers/media/v4l2-core/v4l2-async.c | 218 ++++++++++++++++++++++++-----
> > >> include/media/v4l2-async.h | 16 ++-
> > >> 2 files changed, 203 insertions(+), 31 deletions(-)
> > >>
> > >> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > >> b/drivers/media/v4l2-core/v4l2-async.c index 4be2f16af051..52fe22b9b6b4
> > >> 100644
> > >> --- a/drivers/media/v4l2-core/v4l2-async.c
> > >> +++ b/drivers/media/v4l2-core/v4l2-async.c
>
> [snip]
>
> > >> +/* Unbind all sub-devices in the notifier tree. */
> > >> +static void v4l2_async_notifier_unbind_all_subdevs(
> > >> + struct v4l2_async_notifier *notifier)
> > >> +{
> > >> + struct v4l2_subdev *sd, *tmp;
> > >>
> > >> list_for_each_entry_safe(sd, tmp, ¬ifier->done, async_list) {
> > >>
> > >> + struct v4l2_async_notifier *subdev_notifier =
> > >> + v4l2_async_find_subdev_notifier(sd);
> > >> +
> > >> + if (subdev_notifier)
> > >> + v4l2_async_notifier_unbind_all_subdevs(subdev_notifier);
> > >> +
> > >> v4l2_async_cleanup(sd);
> > >>
> > >> v4l2_async_notifier_call_unbind(notifier, sd, sd->asd);
> > >> - }
> > >>
> > >> - mutex_unlock(&list_lock);
> > >> + list_del(&sd->async_list);
> > >> + list_add(&sd->async_list, &subdev_list);
> > >
> > > How about list_move() ?
> >
> > Yeah.
> >
> > > This seems to be new code, and by the look of it, I wonder whether it
> > > doesn't belong in the reprobing removal patch.
> >
> > This is not related to re-probing. Here we're moving an async sub-device
> > back to the global sub-device list when its notifier is going away.
>
> In order to make the subdev bindable again when the notifier will be re-
> registered. This wasn't needed before, as reprobing took care of that.
Ah, I see what you mean now. That the async sub-device is returned to the
global list?
I also noticed the sd shouldn't be set NULL except to the notifier this is
directly called on. I'll fix that as well.
>
> > >> + }
> > >>
> > >> + notifier->parent = NULL;
> > >> + notifier->sd = NULL;
> > >> notifier->v4l2_dev = NULL;
> > >> }
>
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
2017-09-19 17:54 ` Laurent Pinchart
@ 2017-09-20 10:51 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-20 10:51 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 08:54:12PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 18:03:48 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 05:58:32PM +0300, Sakari Ailus wrote:
> > >> This skips adding the notifier to the notifier_list. Won't this result
> > >> in an oops when calling list_del(¬ifier->list) in
> > >> v4l2_async_notifier_unregister() ?
> > >
> > > Good point. I'll add initialising the list head to the register function,
> > > with an appropriate comment.
> >
> > I'll set v4l2_dev NULL instead; no tricks with lists needed.
>
> Shouldn't the notifier still be added to the notifier_list ?
Would there be any benefit of that?
The notifier's v4l2_dev field is also used to determine whether the
notifier is registered currently. If the notifier is added to the notifier
list, we need to remove it in unregistration as well.
--
Sakari Ailus
sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs
@ 2017-09-20 10:51 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-20 10:51 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 08:54:12PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 18:03:48 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 05:58:32PM +0300, Sakari Ailus wrote:
> > >> This skips adding the notifier to the notifier_list. Won't this result
> > >> in an oops when calling list_del(¬ifier->list) in
> > >> v4l2_async_notifier_unregister() ?
> > >
> > > Good point. I'll add initialising the list head to the register function,
> > > with an appropriate comment.
> >
> > I'll set v4l2_dev NULL instead; no tricks with lists needed.
>
> Shouldn't the notifier still be added to the notifier_list ?
Would there be any benefit of that?
The notifier's v4l2_dev field is also used to determine whether the
notifier is registered currently. If the notifier is added to the notifier
list, we need to remove it in unregistration as well.
--
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-19 12:46 ` Laurent Pinchart
@ 2017-09-20 15:50 ` Sakari Ailus
2017-09-20 15:50 ` Sakari Ailus
1 sibling, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-20 15:50 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 03:46:18PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > > > @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> > > >
> > > > if (ret)
> > > >
> > > > return ret;
> > > >
> > > > - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > > > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > > > + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > > > + isp_fwnode_parse);
> > > >
> > > > if (ret < 0)
> > >
> > > The documentation in patch 05/25 states that v4l2_async_notifier_release()
> > > should be called even if v4l2_async_notifier_parse_fwnode_endpoints()
> > > fails. I don't think that's needed here, so you might want to update the
> > > documentation (and possibly the implementation of the function).
> >
> > It is. If parsing fails, async sub-devices may have been already set up.
> > This happens e.g. when the parsing fails after the first one has been
> > successfully set up already.
>
> But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
> internally when an error occurs. Otherwise you need to call
> v4l2_async_notifier_release() here.
If a driver uses the variant that parses the endpoints by port, how should
that function behave? Release just as many async sub-devices it set up, and
leave the rest for the driver to handle?
The reason I left it as such as to make the responsibility clear: it
belongs to the driver.
I can change that if you really think it makes a difference for better. I'm
just not that certain about it.
--
Regards,
Sakari Ailus
sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
@ 2017-09-20 15:50 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-20 15:50 UTC (permalink / raw)
To: Laurent Pinchart
Cc: linux-media, niklas.soderlund, maxime.ripard, robh, hverkuil,
devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 03:46:18PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > > > @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device *pdev)
> > > >
> > > > if (ret)
> > > >
> > > > return ret;
> > > >
> > > > - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > > > + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > > > + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > > > + isp_fwnode_parse);
> > > >
> > > > if (ret < 0)
> > >
> > > The documentation in patch 05/25 states that v4l2_async_notifier_release()
> > > should be called even if v4l2_async_notifier_parse_fwnode_endpoints()
> > > fails. I don't think that's needed here, so you might want to update the
> > > documentation (and possibly the implementation of the function).
> >
> > It is. If parsing fails, async sub-devices may have been already set up.
> > This happens e.g. when the parsing fails after the first one has been
> > successfully set up already.
>
> But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
> internally when an error occurs. Otherwise you need to call
> v4l2_async_notifier_release() here.
If a driver uses the variant that parses the endpoints by port, how should
that function behave? Release just as many async sub-devices it set up, and
leave the rest for the driver to handle?
The reason I left it as such as to make the responsibility clear: it
belongs to the driver.
I can change that if you really think it makes a difference for better. I'm
just not that certain about it.
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
2017-09-19 16:27 ` Laurent Pinchart
@ 2017-09-20 15:54 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-20 15:54 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 07:27:17PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 17:50:49 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 03:43:48PM +0300, Laurent Pinchart wrote:
> > > On Tuesday, 19 September 2017 15:13:11 EEST Sakari Ailus wrote:
> > >> On Tue, Sep 19, 2017 at 03:01:14PM +0300, Laurent Pinchart wrote:
> > >>> On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> > >>>> Add three helper functions to call async operations callbacks.
> > >>>> Besides simplifying callbacks, this allows async notifiers to have no
> > >>>> ops set, i.e. it can be left NULL.
> > >>>>
> > >>>> Signed-off-by: Sakari Ailus <sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
> > >>>> Acked-by: Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
> > >>>> ---
> > >>>>
> > >>>> drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++--------
> > >>>> include/media/v4l2-async.h | 1 +
> > >>>> 2 files changed, 37 insertions(+), 13 deletions(-)
> > >>>>
> > >>>> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > >>>> b/drivers/media/v4l2-core/v4l2-async.c index
> > >>>> 7b2125b3d62f..c35d04b9122f
> > >>>> 100644
> > >>>> --- a/drivers/media/v4l2-core/v4l2-async.c
> > >>>> +++ b/drivers/media/v4l2-core/v4l2-async.c
> > >>>> @@ -25,6 +25,34 @@
> > >>>>
> > >>>> #include <media/v4l2-fwnode.h>
> > >>>> #include <media/v4l2-subdev.h>
> > >>>>
> > >>>> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier
> > >>>> *n,
> > >>>> + struct v4l2_subdev *subdev,
> > >>>> + struct v4l2_async_subdev *asd)
> > >>>> +{
> > >>>> + if (!n->ops || !n->ops->bound)
> > >>>> + return 0;
> > >>>> +
> > >>>> + return n->ops->bound(n, subdev, asd);
> > >>>> +}
> > >>>> +
> > >>>> +static void v4l2_async_notifier_call_unbind(struct
> > >>>> v4l2_async_notifier
> > >>>> *n,
> > >>>> + struct v4l2_subdev *subdev,
> > >>>> + struct v4l2_async_subdev *asd)
> > >>>> +{
> > >>>> + if (!n->ops || !n->ops->unbind)
> > >>>> + return;
> > >>>> +
> > >>>> + n->ops->unbind(n, subdev, asd);
> > >>>> +}
> > >>>> +
> > >>>> +static int v4l2_async_notifier_call_complete(struct
> > >>>> v4l2_async_notifier
> > >>>> *n)
> > >>>> +{
> > >>>> + if (!n->ops || !n->ops->complete)
> > >>>> + return 0;
> > >>>> +
> > >>>> + return n->ops->complete(n);
> > >>>> +}
> > >>>> +
> > >>>
> > >>> Wouldn't it be enough to add a single v4l2_async_notifier_call() macro
> > >>> ?
> > >>>
> > >>> #define v4l2_async_notifier_call(n, op, args...) \
> > >>>
> > >>> ((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
> > >>
> > >> I actually had that in an earlier version but I changed it based on
> > >> review comments from Hans. A single macro isn't enough: some functions
> > >> have int return type. I think the way it is now is nicer.
> > >
> > > What bothers me there is the overhead of a function call.
> >
> > Overhead... of a function call?
> >
> > Do you really mean what you're saying? :-) The functions will be called a
> > relatively small number of times during module loading / device probing.
>
> That's why I haven't said it's a big deal :-) There's of course no need to
> optimize that if the tradeoff is large, but if all operations had the same
> return type a macro could have been useful (although in this very specific
> case I'm more concerned about code size than about CPU cycles).
Code size in the async framework? Generally calling a function doesn't take
a lot of code, and the kernel is, well, full of function calls. I'm frankly
more concerned about the number of lines of code to maintain and
readability of that code.
>
> > > By the way, what's the use case for ops being NULL ?
> >
> > If a driver has no need for any of the callbacks, there's no benefit from
> > having to set ops struct either. This applies to devices that are
> > associated to the sensor, for instance.
>
> So in that case the subdev notifier is only registered to delay the complete()
> callback until the flash and lens controllers are available, with the sensor
> itself having no need to access the flash and lens controllers ?
Essentially yes. In the future we'll need to make use of the association
information to tell which devices are related but this shouldn't be a job
for individual drivers.
--
Regards,
Sakari Ailus
sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks
@ 2017-09-20 15:54 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-20 15:54 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 07:27:17PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 17:50:49 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 03:43:48PM +0300, Laurent Pinchart wrote:
> > > On Tuesday, 19 September 2017 15:13:11 EEST Sakari Ailus wrote:
> > >> On Tue, Sep 19, 2017 at 03:01:14PM +0300, Laurent Pinchart wrote:
> > >>> On Friday, 15 September 2017 17:17:10 EEST Sakari Ailus wrote:
> > >>>> Add three helper functions to call async operations callbacks.
> > >>>> Besides simplifying callbacks, this allows async notifiers to have no
> > >>>> ops set, i.e. it can be left NULL.
> > >>>>
> > >>>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> > >>>> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
> > >>>> ---
> > >>>>
> > >>>> drivers/media/v4l2-core/v4l2-async.c | 49 ++++++++++++++++++--------
> > >>>> include/media/v4l2-async.h | 1 +
> > >>>> 2 files changed, 37 insertions(+), 13 deletions(-)
> > >>>>
> > >>>> diff --git a/drivers/media/v4l2-core/v4l2-async.c
> > >>>> b/drivers/media/v4l2-core/v4l2-async.c index
> > >>>> 7b2125b3d62f..c35d04b9122f
> > >>>> 100644
> > >>>> --- a/drivers/media/v4l2-core/v4l2-async.c
> > >>>> +++ b/drivers/media/v4l2-core/v4l2-async.c
> > >>>> @@ -25,6 +25,34 @@
> > >>>>
> > >>>> #include <media/v4l2-fwnode.h>
> > >>>> #include <media/v4l2-subdev.h>
> > >>>>
> > >>>> +static int v4l2_async_notifier_call_bound(struct v4l2_async_notifier
> > >>>> *n,
> > >>>> + struct v4l2_subdev *subdev,
> > >>>> + struct v4l2_async_subdev *asd)
> > >>>> +{
> > >>>> + if (!n->ops || !n->ops->bound)
> > >>>> + return 0;
> > >>>> +
> > >>>> + return n->ops->bound(n, subdev, asd);
> > >>>> +}
> > >>>> +
> > >>>> +static void v4l2_async_notifier_call_unbind(struct
> > >>>> v4l2_async_notifier
> > >>>> *n,
> > >>>> + struct v4l2_subdev *subdev,
> > >>>> + struct v4l2_async_subdev *asd)
> > >>>> +{
> > >>>> + if (!n->ops || !n->ops->unbind)
> > >>>> + return;
> > >>>> +
> > >>>> + n->ops->unbind(n, subdev, asd);
> > >>>> +}
> > >>>> +
> > >>>> +static int v4l2_async_notifier_call_complete(struct
> > >>>> v4l2_async_notifier
> > >>>> *n)
> > >>>> +{
> > >>>> + if (!n->ops || !n->ops->complete)
> > >>>> + return 0;
> > >>>> +
> > >>>> + return n->ops->complete(n);
> > >>>> +}
> > >>>> +
> > >>>
> > >>> Wouldn't it be enough to add a single v4l2_async_notifier_call() macro
> > >>> ?
> > >>>
> > >>> #define v4l2_async_notifier_call(n, op, args...) \
> > >>>
> > >>> ((n)->ops && (n)->ops->op ? (n)->ops->op(n, ##args) : 0)
> > >>
> > >> I actually had that in an earlier version but I changed it based on
> > >> review comments from Hans. A single macro isn't enough: some functions
> > >> have int return type. I think the way it is now is nicer.
> > >
> > > What bothers me there is the overhead of a function call.
> >
> > Overhead... of a function call?
> >
> > Do you really mean what you're saying? :-) The functions will be called a
> > relatively small number of times during module loading / device probing.
>
> That's why I haven't said it's a big deal :-) There's of course no need to
> optimize that if the tradeoff is large, but if all operations had the same
> return type a macro could have been useful (although in this very specific
> case I'm more concerned about code size than about CPU cycles).
Code size in the async framework? Generally calling a function doesn't take
a lot of code, and the kernel is, well, full of function calls. I'm frankly
more concerned about the number of lines of code to maintain and
readability of that code.
>
> > > By the way, what's the use case for ops being NULL ?
> >
> > If a driver has no need for any of the callbacks, there's no benefit from
> > having to set ops struct either. This applies to devices that are
> > associated to the sensor, for instance.
>
> So in that case the subdev notifier is only registered to delay the complete()
> callback until the flash and lens controllers are available, with the sensor
> itself having no need to access the flash and lens controllers ?
Essentially yes. In the future we'll need to make use of the association
information to tell which devices are related but this shouldn't be a job
for individual drivers.
--
Regards,
Sakari Ailus
sakari.ailus@linux.intel.com
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
2017-09-19 16:12 ` Laurent Pinchart
@ 2017-09-21 8:46 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-21 8:46 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media-u79uwXL29TY76Z2rM5mHXA,
niklas.soderlund-1zkq55x86MTxsAP9Fp7wbw,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
robh-DgEjT+Ai2ygdnm+yROfE0A, hverkuil-qWit8jRvyhVmR6Xm/wNWPw,
devicetree-u79uwXL29TY76Z2rM5mHXA, pavel-+ZI9xUNit7I,
sre-DgEjT+Ai2ygdnm+yROfE0A
Hi Laurent,
On Tue, Sep 19, 2017 at 07:12:14PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 17:47:22 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 03:46:18PM +0300, Laurent Pinchart wrote:
> > > On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> > >> On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > >>>> @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device
> > >>>> *pdev)
> > >>>> if (ret)
> > >>>> return ret;
> > >>>>
> > >>>> - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > >>>> + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > >>>> + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > >>>> + isp_fwnode_parse);
> > >>>> if (ret < 0)
> > >>>
> > >>> The documentation in patch 05/25 states that
> > >>> v4l2_async_notifier_release() should be called even if
> > >>> v4l2_async_notifier_parse_fwnode_endpoints() fails. I don't think that's
> > >>> needed here, so you might want to update the documentation (and possibly
> > >>> the implementation of the function).
> > >>
> > >> It is. If parsing fails, async sub-devices may have been already set up.
> > >> This happens e.g. when the parsing fails after the first one has been
> > >> successfully set up already.
> > >
> > > But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
> > > internally when an error occurs. Otherwise you need to call
> > > v4l2_async_notifier_release() here.
> >
> > The functions that set up async sub-devices can be called multiple times
> > (on separate references). This is quite alike setting up a control handler
> > really, so I adopted the same pattern.
> >
> > If there is a failure, how many async sub-devices should be cleaned up, if
> > there have been async sub-devices already set up before calling this
> > function?
>
> I'm not opposed to that pattern, I just thought that cleanup could be
> automated for v4l2_async_notifier_parse_fwnode_endpoints() failures, as
> opposed to v4l2_async_notifier_parse_fwnode_endpoints_by_port() failures.
>
> As this patch, written by the author of
> v4l2_async_notifier_parse_fwnode_endpoints() and part of the same patch
> series, is missing a call to v4l2_async_notifier_release(), I expect driver
> authors to make the same mistake and was thus wondering how to prevent that.
>
> I believe that the issue here is that initialization of the notifier is done
> implicitly by the first call to a parsing function. With explicit notification
> it should be clear to driver authors that they need to call the cleanup
> function:
>
> ret = init()
> if (ret)
> return ret;
>
> ret = parse()
> if (ret) {
> cleanup();
> return ret;
> }
>
> ret = parse()
> if (ret) {
> cleanup();
> return ret;
> }
>
> ret = parse()
> if (ret) {
> cleanup();
> return ret;
> }
>
> But with an implicit initialization it's easy to miss cleanup when
> v4l2_async_notifier_parse_fwnode_endpoints() fails, as that function can be
> considered as an initilization function that performs cleanup internally.
>
> I'm not sure what the best pattern would be. At the very least you need to fix
> this patch, but that wouldn't prevent future mistakes.
The patch was actually originally written before this was apparent. I agree
that it is not a common pattern to require cleanup function to be called on
a failure.
I'll fix the patch for v14.
Going forward, I see no reason why we couldn't automate much of this for
drivers: the bindings are generic after all. The notifier could be
registered through registration of the v4l2_device. It could be simply
released immediately if there would be no async sub-devices around.
It's not a trivial change, and I'd think well out of scope of this set:
we'll need to move link creation to the framework and detach async
sub-deviecs from parsing the endpoint properties as well.
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus-X3B1VOXEql0@public.gmane.org
--
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
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints
@ 2017-09-21 8:46 ` Sakari Ailus
0 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-21 8:46 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
Hi Laurent,
On Tue, Sep 19, 2017 at 07:12:14PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 17:47:22 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 03:46:18PM +0300, Laurent Pinchart wrote:
> > > On Tuesday, 19 September 2017 15:43:26 EEST Sakari Ailus wrote:
> > >> On Tue, Sep 19, 2017 at 02:40:29PM +0300, Laurent Pinchart wrote:
> > >>>> @@ -2256,7 +2210,9 @@ static int isp_probe(struct platform_device
> > >>>> *pdev)
> > >>>> if (ret)
> > >>>> return ret;
> > >>>>
> > >>>> - ret = isp_fwnodes_parse(&pdev->dev, &isp->notifier);
> > >>>> + ret = v4l2_async_notifier_parse_fwnode_endpoints(
> > >>>> + &pdev->dev, &isp->notifier, sizeof(struct isp_async_subdev),
> > >>>> + isp_fwnode_parse);
> > >>>> if (ret < 0)
> > >>>
> > >>> The documentation in patch 05/25 states that
> > >>> v4l2_async_notifier_release() should be called even if
> > >>> v4l2_async_notifier_parse_fwnode_endpoints() fails. I don't think that's
> > >>> needed here, so you might want to update the documentation (and possibly
> > >>> the implementation of the function).
> > >>
> > >> It is. If parsing fails, async sub-devices may have been already set up.
> > >> This happens e.g. when the parsing fails after the first one has been
> > >> successfully set up already.
> > >
> > > But for v4l2_async_notifier_parse_fwnode_endpoints() we could clean up
> > > internally when an error occurs. Otherwise you need to call
> > > v4l2_async_notifier_release() here.
> >
> > The functions that set up async sub-devices can be called multiple times
> > (on separate references). This is quite alike setting up a control handler
> > really, so I adopted the same pattern.
> >
> > If there is a failure, how many async sub-devices should be cleaned up, if
> > there have been async sub-devices already set up before calling this
> > function?
>
> I'm not opposed to that pattern, I just thought that cleanup could be
> automated for v4l2_async_notifier_parse_fwnode_endpoints() failures, as
> opposed to v4l2_async_notifier_parse_fwnode_endpoints_by_port() failures.
>
> As this patch, written by the author of
> v4l2_async_notifier_parse_fwnode_endpoints() and part of the same patch
> series, is missing a call to v4l2_async_notifier_release(), I expect driver
> authors to make the same mistake and was thus wondering how to prevent that.
>
> I believe that the issue here is that initialization of the notifier is done
> implicitly by the first call to a parsing function. With explicit notification
> it should be clear to driver authors that they need to call the cleanup
> function:
>
> ret = init()
> if (ret)
> return ret;
>
> ret = parse()
> if (ret) {
> cleanup();
> return ret;
> }
>
> ret = parse()
> if (ret) {
> cleanup();
> return ret;
> }
>
> ret = parse()
> if (ret) {
> cleanup();
> return ret;
> }
>
> But with an implicit initialization it's easy to miss cleanup when
> v4l2_async_notifier_parse_fwnode_endpoints() fails, as that function can be
> considered as an initilization function that performs cleanup internally.
>
> I'm not sure what the best pattern would be. At the very least you need to fix
> this patch, but that wouldn't prevent future mistakes.
The patch was actually originally written before this was apparent. I agree
that it is not a common pattern to require cleanup function to be called on
a failure.
I'll fix the patch for v14.
Going forward, I see no reason why we couldn't automate much of this for
drivers: the bindings are generic after all. The notifier could be
registered through registration of the v4l2_device. It could be simply
released immediately if there would be no async sub-devices around.
It's not a trivial change, and I'd think well out of scope of this set:
we'll need to move link creation to the framework and detach async
sub-deviecs from parsing the endpoint properties as well.
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
* Re: [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device
2017-09-19 12:34 ` Laurent Pinchart
(?)
@ 2017-09-26 20:56 ` Sakari Ailus
-1 siblings, 0 replies; 137+ messages in thread
From: Sakari Ailus @ 2017-09-26 20:56 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Sakari Ailus, linux-media, niklas.soderlund, maxime.ripard, robh,
hverkuil, devicetree, pavel, sre
On Tue, Sep 19, 2017 at 03:34:00PM +0300, Laurent Pinchart wrote:
> Hi Sakari,
>
> On Tuesday, 19 September 2017 15:11:32 EEST Sakari Ailus wrote:
> > On Tue, Sep 19, 2017 at 02:35:01PM +0300, Laurent Pinchart wrote:
> > > On Friday, 15 September 2017 17:17:04 EEST Sakari Ailus wrote:
> > >> Add two functions for parsing devices graph endpoints:
> > >> v4l2_async_notifier_parse_fwnode_endpoints and
> > >> v4l2_async_notifier_parse_fwnode_endpoints_by_port. The former iterates
> > >> over all endpoints whereas the latter only iterates over the endpoints
> > >> in a given port.
> > >>
> > >> The former is mostly useful for existing drivers that currently
> > >> implement the iteration over all the endpoints themselves whereas the
> > >> latter is especially intended for devices with both sinks and sources:
> > >> async sub-devices for external devices connected to the device's sources
> > >> will have already been set up, or they are part of the master device.
> > >
> > > Did you mean s/or they/as they/ ?
> >
> > No. There are two options here: either the sub-devices a sub-device is
> > connected to (through a graph endpoint) is instantiated through the async
> > framework *or* through the master device driver. But not by both of them at
> > the same time.
>
> The message is then contradicting itself:
>
> "async sub-devices for external devices connected to the device's sources will
> have already been set up, or they are part of the master device."
>
> They refers to "async sub-devices". If they're part of the master device,
> they're not async sub-devices.
Ah, now I see what you mean. I'll replace "they" with "the external
sub-devices". The paragraph becomes:
The former is mostly useful for existing drivers that currently implement
the iteration over all the endpoints themselves whereas the latter is
especially intended for devices with both sinks and sources: async
sub-devices for external devices connected to the device's sources will
have already been set up, or the external sub-devices are part of the
master device.
How about that?
--
Regards,
Sakari Ailus
e-mail: sakari.ailus@iki.fi
^ permalink raw reply [flat|nested] 137+ messages in thread
end of thread, other threads:[~2017-09-26 20:56 UTC | newest]
Thread overview: 137+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-15 14:16 [PATCH v13 00/25] Unified fwnode endpoint parser, async sub-device notifier support, N9 flash DTS Sakari Ailus
2017-09-15 14:16 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 02/25] v4l: async: Remove re-probing support Sakari Ailus
[not found] ` <20170915141724.23124-3-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 9:21 ` Laurent Pinchart
2017-09-19 9:21 ` Laurent Pinchart
2017-09-15 14:17 ` [PATCH v13 04/25] v4l: async: Add V4L2 async documentation to the documentation build Sakari Ailus
[not found] ` <20170915141724.23124-1-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-15 14:17 ` [PATCH v13 01/25] v4l: fwnode: Move KernelDoc documentation to the header Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-2-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 10:48 ` Laurent Pinchart
2017-09-19 10:48 ` Laurent Pinchart
2017-09-19 11:04 ` Hans Verkuil
2017-09-19 11:04 ` Hans Verkuil
[not found] ` <29354478-ec46-278b-c457-4e6f3cc6848c-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
2017-09-19 11:07 ` Laurent Pinchart
2017-09-19 11:07 ` Laurent Pinchart
2017-09-19 11:22 ` Sakari Ailus
2017-09-19 11:22 ` Sakari Ailus
2017-09-19 11:10 ` Sakari Ailus
2017-09-19 11:10 ` Sakari Ailus
[not found] ` <20170919111036.5va2unwqh2vymojr-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org>
2017-09-19 11:14 ` Laurent Pinchart
2017-09-19 11:14 ` Laurent Pinchart
2017-09-19 11:25 ` Sakari Ailus
2017-09-19 11:25 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 03/25] v4l: async: Use more intuitive names for internal functions Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 05/25] v4l: fwnode: Support generic parsing of graph endpoints in a device Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
2017-09-19 8:03 ` Hans Verkuil
2017-09-19 8:20 ` Sakari Ailus
[not found] ` <20170919082015.vt6olgirnvmpcrpa-z7MJbOB4PBP+e+fPlCVrcFDQ4js95KgL@public.gmane.org>
2017-09-19 8:40 ` Hans Verkuil
2017-09-19 8:40 ` Hans Verkuil
[not found] ` <af99e12c-6fb8-a633-eec2-c1eb9d82226a-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
2017-09-19 9:30 ` Laurent Pinchart
2017-09-19 9:30 ` Laurent Pinchart
2017-09-19 11:37 ` Sakari Ailus
2017-09-19 10:00 ` Sakari Ailus
2017-09-19 10:00 ` Sakari Ailus
2017-09-19 10:10 ` Hans Verkuil
2017-09-19 11:35 ` Laurent Pinchart
2017-09-19 12:11 ` Sakari Ailus
[not found] ` <20170919121131.6m4cf4ftzhq7vpnc-z7MJbOB4PBP+e+fPlCVrcFDQ4js95KgL@public.gmane.org>
2017-09-19 12:34 ` Laurent Pinchart
2017-09-19 12:34 ` Laurent Pinchart
2017-09-26 20:56 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 07/25] rcar-vin: Use generic parser for parsing fwnode endpoints Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-8-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 11:53 ` Laurent Pinchart
2017-09-19 11:53 ` Laurent Pinchart
2017-09-19 12:39 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 09/25] omap3isp: Print the name of the entity where no source pads could be found Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
2017-09-19 11:56 ` Laurent Pinchart
2017-09-15 14:17 ` [PATCH v13 11/25] v4l: async: Introduce helpers for calling async ops callbacks Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-12-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-16 7:13 ` Pavel Machek
2017-09-16 7:13 ` Pavel Machek
2017-09-19 12:01 ` Laurent Pinchart
2017-09-19 12:01 ` Laurent Pinchart
2017-09-19 12:13 ` Sakari Ailus
2017-09-19 12:43 ` Laurent Pinchart
2017-09-19 14:50 ` Sakari Ailus
2017-09-19 14:50 ` Sakari Ailus
2017-09-19 16:27 ` Laurent Pinchart
2017-09-20 15:54 ` Sakari Ailus
2017-09-20 15:54 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 14/25] v4l: async: Allow binding notifiers to sub-devices Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-15-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 8:06 ` Hans Verkuil
2017-09-19 8:06 ` Hans Verkuil
2017-09-19 13:52 ` Laurent Pinchart
2017-09-19 13:52 ` Laurent Pinchart
2017-09-19 15:17 ` Sakari Ailus
[not found] ` <20170919151732.4yafxfcxrreizd7r-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org>
2017-09-19 17:52 ` Laurent Pinchart
2017-09-19 17:52 ` Laurent Pinchart
2017-09-20 9:42 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 19/25] v4l: fwnode: Add convenience function for parsing common external refs Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 21/25] smiapp: Add support for flash and lens devices Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
[not found] ` <20170915141724.23124-22-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 12:08 ` Laurent Pinchart
2017-09-19 12:08 ` Laurent Pinchart
2017-09-19 12:20 ` Sakari Ailus
2017-09-19 12:38 ` Laurent Pinchart
2017-09-15 14:17 ` [PATCH v13 23/25] ov5670: " Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 24/25] ov13858: " Sakari Ailus
2017-09-15 14:17 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 06/25] omap3isp: Use generic parser for parsing fwnode endpoints Sakari Ailus
2017-09-16 7:04 ` Pavel Machek
2017-09-16 7:18 ` Pavel Machek
2017-09-16 7:18 ` Pavel Machek
2017-09-19 11:40 ` Laurent Pinchart
2017-09-19 12:41 ` Sakari Ailus
2017-09-19 12:43 ` Sakari Ailus
2017-09-19 12:46 ` Laurent Pinchart
2017-09-19 14:47 ` Sakari Ailus
2017-09-19 14:47 ` Sakari Ailus
2017-09-19 16:12 ` Laurent Pinchart
2017-09-21 8:46 ` Sakari Ailus
2017-09-21 8:46 ` Sakari Ailus
2017-09-20 15:50 ` Sakari Ailus
2017-09-20 15:50 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 08/25] omap3isp: Fix check for our own sub-devices Sakari Ailus
[not found] ` <20170915141724.23124-9-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 11:55 ` Laurent Pinchart
2017-09-19 11:55 ` Laurent Pinchart
2017-09-15 14:17 ` [PATCH v13 10/25] v4l: async: Move async subdev notifier operations to a separate structure Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 12/25] v4l: async: Register sub-devices before calling bound callback Sakari Ailus
2017-09-19 12:01 ` Laurent Pinchart
2017-09-15 14:17 ` [PATCH v13 13/25] v4l: async: Allow async notifier register call succeed with no subdevs Sakari Ailus
2017-09-19 12:04 ` Laurent Pinchart
2017-09-19 12:52 ` Laurent Pinchart
2017-09-19 14:58 ` Sakari Ailus
[not found] ` <20170919145831.uztphjdtd3fdxzvr-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org>
2017-09-19 15:03 ` Sakari Ailus
2017-09-19 15:03 ` Sakari Ailus
2017-09-19 17:54 ` Laurent Pinchart
2017-09-20 10:51 ` Sakari Ailus
2017-09-20 10:51 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 15/25] dt: bindings: Add a binding for flash LED devices associated to a sensor Sakari Ailus
[not found] ` <20170915141724.23124-16-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 12:12 ` Laurent Pinchart
2017-09-19 12:12 ` Laurent Pinchart
2017-09-19 12:16 ` Sakari Ailus
2017-09-19 12:16 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 16/25] dt: bindings: Add lens-focus binding for image sensors Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 17/25] v4l: fwnode: Add a helper function for parsing generic references Sakari Ailus
[not found] ` <20170915141724.23124-18-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-09-19 8:14 ` Hans Verkuil
2017-09-19 8:14 ` Hans Verkuil
2017-09-19 12:19 ` Laurent Pinchart
2017-09-19 12:19 ` Laurent Pinchart
2017-09-19 13:04 ` Sakari Ailus
[not found] ` <20170919130453.ii5kz54qxlot4of2-z7MJbOB4PBP+e+fPlCVrcFDQ4js95KgL@public.gmane.org>
2017-09-19 14:01 ` Laurent Pinchart
2017-09-19 14:01 ` Laurent Pinchart
2017-09-15 14:17 ` [PATCH v13 18/25] v4l: fwnode: Add a helper function to obtain device / integer references Sakari Ailus
2017-09-19 8:31 ` Hans Verkuil
2017-09-19 8:45 ` Sakari Ailus
2017-09-19 9:21 ` Hans Verkuil
[not found] ` <09f8ce37-c6e0-e448-c773-e1f3510d1024-qWit8jRvyhVmR6Xm/wNWPw@public.gmane.org>
2017-09-19 10:16 ` Sakari Ailus
2017-09-19 10:16 ` Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 20/25] dt: bindings: smiapp: Document lens-focus and flash-leds properties Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 22/25] et8ek8: Add support for flash and lens devices Sakari Ailus
2017-09-15 14:17 ` [PATCH v13 25/25] arm: dts: omap3: N9/N950: Add flash references to the camera Sakari Ailus
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.