| Message ID | 20210103231235.792999-1-djrscally@gmail.com |
|---|---|
| Headers | show |
| Series | Add functionality to ipu3-cio2 driver allowing software_node connections to sensors on platforms designed for Windows | expand |
On Sun, Jan 03, 2021 at 11:12:33PM +0000, Daniel Scally wrote: > To ensure we handle situations in which multiple sensors of the same > model (and therefore _HID) are present in a system, we need to be able > to iterate over devices matching a known _HID but unknown _UID and _HRV > - add acpi_dev_get_next_match_dev() to accommodate that possibility and > change acpi_dev_get_first_match_dev() to simply call the new function > with a NULL starting point. Add an iterator macro for convenience. I guess we need Rafael's blessing on this. > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com> > Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Daniel Scally <djrscally@gmail.com> > --- > Changes in v4: > > - None > > drivers/acpi/utils.c | 30 ++++++++++++++++++++++++++---- > include/acpi/acpi_bus.h | 7 +++++++ > 2 files changed, 33 insertions(+), 4 deletions(-) > > diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c > index d5411a166685..ddca1550cce6 100644 > --- a/drivers/acpi/utils.c > +++ b/drivers/acpi/utils.c > @@ -843,12 +843,13 @@ bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) > EXPORT_SYMBOL(acpi_dev_present); > > /** > - * acpi_dev_get_first_match_dev - Return the first match of ACPI device > + * acpi_dev_get_next_match_dev - Return the next match of ACPI device > + * @adev: Pointer to the previous acpi_device matching this @hid, @uid and @hrv > * @hid: Hardware ID of the device. > * @uid: Unique ID of the device, pass NULL to not check _UID > * @hrv: Hardware Revision of the device, pass -1 to not check _HRV > * > - * Return the first match of ACPI device if a matching device was present > + * Return the next match of ACPI device if another matching device was present > * at the moment of invocation, or NULL otherwise. > * > * The caller is responsible to call put_device() on the returned device. > @@ -856,8 +857,9 @@ EXPORT_SYMBOL(acpi_dev_present); > * See additional information in acpi_dev_present() as well. > */ > struct acpi_device * > -acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv) > +acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv) > { > + struct device *start = adev ? &adev->dev : NULL; > struct acpi_dev_match_info match = {}; > struct device *dev; > > @@ -865,9 +867,29 @@ acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv) > match.uid = uid; > match.hrv = hrv; > > - dev = bus_find_device(&acpi_bus_type, NULL, &match, acpi_dev_match_cb); > + dev = bus_find_device(&acpi_bus_type, start, &match, acpi_dev_match_cb); > return dev ? to_acpi_device(dev) : NULL; > } > +EXPORT_SYMBOL(acpi_dev_get_next_match_dev); > + > +/** > + * acpi_dev_get_first_match_dev - Return the first match of ACPI device > + * @hid: Hardware ID of the device. > + * @uid: Unique ID of the device, pass NULL to not check _UID > + * @hrv: Hardware Revision of the device, pass -1 to not check _HRV > + * > + * Return the first match of ACPI device if a matching device was present > + * at the moment of invocation, or NULL otherwise. > + * > + * The caller is responsible to call put_device() on the returned device. > + * > + * See additional information in acpi_dev_present() as well. > + */ > +struct acpi_device * > +acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv) > +{ > + return acpi_dev_get_next_match_dev(NULL, hid, uid, hrv); > +} > EXPORT_SYMBOL(acpi_dev_get_first_match_dev); > > /* > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h > index a3abcc4b7d9f..0a028ba967d3 100644 > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -688,9 +688,16 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) > > bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2); > > +struct acpi_device * > +acpi_dev_get_next_match_dev(struct acpi_device *adev, const char *hid, const char *uid, s64 hrv); > struct acpi_device * > acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv); > > +#define for_each_acpi_dev_match(adev, hid, uid, hrv) \ > + for (adev = acpi_dev_get_first_match_dev(hid, uid, hrv); \ > + adev; \ > + adev = acpi_dev_get_next_match_dev(adev, hid, uid, hrv)) > + > static inline void acpi_dev_put(struct acpi_device *adev) > { > put_device(&adev->dev); > -- > 2.25.1 >
On 04/01/2021 12:42, Andy Shevchenko wrote: > On Sun, Jan 03, 2021 at 11:12:33PM +0000, Daniel Scally wrote: >> To ensure we handle situations in which multiple sensors of the same >> model (and therefore _HID) are present in a system, we need to be able >> to iterate over devices matching a known _HID but unknown _UID and _HRV >> - add acpi_dev_get_next_match_dev() to accommodate that possibility and >> change acpi_dev_get_first_match_dev() to simply call the new function >> with a NULL starting point. Add an iterator macro for convenience. > I guess we need Rafael's blessing on this. For this one yes
On Sun, Jan 03, 2021 at 11:12:33PM +0000, Daniel Scally wrote: > To ensure we handle situations in which multiple sensors of the same > model (and therefore _HID) are present in a system, we need to be able > to iterate over devices matching a known _HID but unknown _UID and _HRV > - add acpi_dev_get_next_match_dev() to accommodate that possibility and > change acpi_dev_get_first_match_dev() to simply call the new function > with a NULL starting point. Add an iterator macro for convenience. Since v5, also please update prefix in the Subject here to be "ACPI / bus: ". -- With Best Regards, Andy Shevchenko
Hello all v3: https://lore.kernel.org/linux-media/20201224010907.263125-1-djrscally@gmail.com/T/#m37b831bb2b406917d6db5da9acf9ed35df65d72d v2: https://lore.kernel.org/linux-media/20201217234337.1983732-1-djrscally@gmail.com/T/#md93fd090009b42a6a98aed892aff0d38cf07e0cd v1: https://lore.kernel.org/linux-media/20201130133129.1024662-1-djrscally@gmail.com/T/#m91934e12e3d033da2e768e952ea3b4a125ee3e67 The RFC version before that: https://lore.kernel.org/linux-media/20201019225903.14276-1-djrscally@gmail.com/ This series is to start adding support for webcams on laptops with ACPI tables designed for use with CIO2 on Windows. This problem has two main parts; the first part, which is handled in this series, is extending the ipu3-cio2 driver to allow for patching the firmware via software_nodes if endpoints aren't defined by ACPI. The second is adding a new driver to handle power, clocks and GPIO pins defined in DSDT tables in an awkward way. I decided to split that second part out from this series, and instead give it its own series (a v2 of which should land "soon"). The reasons for that are: 1. It's a logically separate change anyway 2. The recipients list was getting really long and 3. That probably meant that handling merge for all of this in one go was going to be impractically awkward. I'm hopeful that most or all of this series could get picked up for 5.12. We touch a few different areas (listed below), but I think the easiest approach would be to merge everything through media tree. Rafael, Greg, Mauro and Sergey; are you ok with that plan, or would you prefer a different approach? Mauro; if that plan is ok (and of course assuming that the rest of the patches are acked by their respective maintainers) could we get a dedicated feature branch just in case the following series ends up being ready in time too? lib lib/test_printf.c: Use helper function to unwind array of software_nodes base software_node: Fix refcounts in software_node_get_next_child() property: Return true in fwnode_device_is_available for NULL ops property: Call fwnode_graph_get_endpoint_by_id() for fwnode->secondary software_node: Enforce parent before child ordering of nodes arrays software_node: unregister software_nodes in reverse order include: fwnode.h: Define format macros for ports and endpoints acpi acpi: Add acpi_dev_get_next_match_dev() and helper macro media media: v4l2-core: v4l2-async: Check sd->fwnode->secondary in match_fwnode() ipu3-cio2: Add T: entry to MAINTAINERS ipu3-cio2: Rename ipu3-cio2.c ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver include: media: v4l2-fwnode: Include v4l2_fwnode_bus_type Series-level changelog: - Incorporated Andy's patch fixing the ipu3-cio2 header More details of changes on each patch. Thanks Dan Andy Shevchenko (1): media: ipu3-cio2: Add headers that ipu3-cio2.h is direct user of Daniel Scally (13): software_node: Fix refcounts in software_node_get_next_child() property: Return true in fwnode_device_is_available for NULL ops property: Call fwnode_graph_get_endpoint_by_id() for fwnode->secondary software_node: Enforce parent before child ordering of nodes arrays software_node: unregister software_nodes in reverse order include: fwnode.h: Define format macros for ports and endpoints lib/test_printf.c: Use helper function to unwind array of software_nodes ipu3-cio2: Add T: entry to MAINTAINERS ipu3-cio2: Rename ipu3-cio2.c media: v4l2-core: v4l2-async: Check sd->fwnode->secondary in match_fwnode() acpi: Add acpi_dev_get_next_match_dev() and helper macro include: media: v4l2-fwnode: Include v4l2_fwnode_bus_type ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver Heikki Krogerus (1): software_node: Add support for fwnode_graph*() family of functions MAINTAINERS | 2 + drivers/acpi/utils.c | 30 +- drivers/base/property.c | 15 +- drivers/base/swnode.c | 181 +++++++++-- drivers/media/pci/intel/ipu3/Kconfig | 18 ++ drivers/media/pci/intel/ipu3/Makefile | 3 + drivers/media/pci/intel/ipu3/cio2-bridge.c | 302 ++++++++++++++++++ drivers/media/pci/intel/ipu3/cio2-bridge.h | 125 ++++++++ .../ipu3/{ipu3-cio2.c => ipu3-cio2-main.c} | 33 ++ drivers/media/pci/intel/ipu3/ipu3-cio2.h | 24 ++ drivers/media/v4l2-core/v4l2-async.c | 8 + drivers/media/v4l2-core/v4l2-fwnode.c | 11 - include/acpi/acpi_bus.h | 7 + include/linux/fwnode.h | 7 + include/media/v4l2-fwnode.h | 22 ++ lib/test_printf.c | 4 +- 16 files changed, 754 insertions(+), 38 deletions(-) create mode 100644 drivers/media/pci/intel/ipu3/cio2-bridge.c create mode 100644 drivers/media/pci/intel/ipu3/cio2-bridge.h rename drivers/media/pci/intel/ipu3/{ipu3-cio2.c => ipu3-cio2-main.c} (98%)