driver core/USB/thermal: fix device-tree node reuse
Subsystems (4)
Johan Hovold
maintainerPATCH 1/7 USB: core: fix device node leak
In reply to Johan HovoldMake sure to release any OF device-node reference taken when creating the USB device.
Note that we currently do not hold a reference to the root hub device-tree node (i.e. the parent controller node).
--- drivers/usb/core/usb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/usb/core/usb.c +2 -0
@@ -416,6 +416,8 @@ static void usb_release_dev(struct device *dev)usb_destroy_configuration (udev);usb_release_bos_descriptor (udev); +if (udev->parent) +of_node_put (dev->of_node);usb_put_hcd (hcd);kfree (udev->product);kfree (udev->manufacturer);
Signature · 1 line
2.13.0
Johan Hovold
maintainerPATCH 3/7 driver core: add helper to reuse a device-tree node
In reply to Johan HovoldAdd a helper function to be used when reusing the device-tree node of another device.
It is fairly common for drivers to reuse the device-tree node of a parent (or other ancestor) device when creating class or bus devices (e.g. gpio chips, i2c adapters, iio chips, spi masters, serdev, phys, usb root hubs). But reusing a device-tree node may cause problems if the new device is later probed as for example driver core would currently attempt to reinitialise an already active associated pinmux configuration.
Other potential issues include the platform-bus code unconditionally dropping the device-tree node reference in its device destructor, reinitialisation of other bus-managed resources such as clocks, and the recently added DMA-setup in driver core.
Note that for most examples above this is currently not an issue as the devices are never probed, but this is a problem for the USB bus which has recently gained device-tree support. This was discovered and worked-around in a rather ad-hoc fashion by commit dc5878abf49c ("usb:
core: move root hub's device node assignment after it is added to bus") by not setting the of_node pointer until after the root-hub device has been registered.
Instead we can allow devices to reuse a device-tree node by setting a flag in their struct device that can be used by core, bus and driver code to avoid resources from being over-allocated.
Note that the helper also grabs an extra reference to the device node, which specifically balances the unconditional put in the platform-device destructor.
--- drivers/base/core.c | 16 ++++++++++++++++ include/linux/device.h | 2 ++ 2 files changed, 18 insertions(+)
drivers/base/core.c +16 -0
@@ -2884,3 +2884,19 @@ void set_secondary_fwnode(struct device *dev, struct fwnode_handle *fwnode)else dev->fwnode = fwnode; } + +/** +* device_set_of_node_from_dev - reuse device-tree node of another device +* @dev: device whose device-tree node is being set +* @dev2: device whose device-tree node is being reused +* +* Takes another reference to the new device-tree node after first dropping +* any reference held to the old node. +*/ +void device_set_of_node_from_dev (struct device *dev,const struct device *dev2) +{ +of_node_put (dev->of_node); + dev->of_node =of_node_get (dev2->of_node); + dev->of_node_reused = true; +} +EXPORT_SYMBOL_GPL (device_set_of_node_from_dev);
include/linux/device.h +2 -0
@@ -966,6 +966,7 @@ struct device { bool offline_disabled:1; bool offline:1; + bool of_node_reused:1; };static inline struct device *kobj_to_dev (struct kobject *kobj)
@@ -1144,6 +1145,7 @@ extern int device_offline(struct device *dev);extern int device_online (struct device *dev);extern void set_primary_fwnode (struct device *dev,struct fwnode_handle *fwnode);extern void set_secondary_fwnode (struct device *dev,struct fwnode_handle *fwnode); +void device_set_of_node_from_dev (struct device *dev,const struct device *dev2);static inline int dev_num_vf (struct device *dev) {
Signature · 1 line
2.13.0
Johan Hovold
maintainerPATCH 5/7 USB: of: fix root-hub device-tree node handling
In reply to Johan HovoldIn an attempt to work around a pinmux over-allocation issue in driver core, commit dc5878abf49c ("usb: core: move root hub's device node assignment after it is added to bus") moved the device-tree node assignment until after the root hub had been registered.
This not only makes the device-tree node unavailable to the usb driver during probe, but also prevents the of_node from being linked to in sysfs and causes a race with user-space for the (recently added) devspec attribute.
Use the new device_set_of_node_from_dev() helper to reuse the node of the sysdev device, something which now prevents driver core from trying to reclaim any pinctrl pins during probe.
--- drivers/usb/core/hcd.c | 2 -- drivers/usb/core/usb.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/usb/core/hcd.c +0 -2
@@ -1076,7 +1076,6 @@ static void usb_deregister_bus (struct usb_bus *bus)static int register_root_hub (struct usb_hcd *hcd) {struct device *parent_dev = hcd->self.controller; -struct device *sysdev = hcd->self.sysdev;struct usb_device *usb_dev = hcd->self.root_hub;const int devnum =1 ;int retval;
@@ -1123,7 +1122,6 @@ static int register_root_hub(struct usb_hcd *hcd)/* Did the HC die before the root hub was registered? */ if (HCD_DEAD (hcd))usb_hc_died (hcd);/* This time clean up */ - usb_dev->dev.of_node = sysdev->of_node; }mutex_unlock (&usb_bus_idr_lock);
drivers/usb/core/usb.c +2 -2
@@ -416,8 +416,7 @@ static void usb_release_dev(struct device *dev)usb_destroy_configuration (udev);usb_release_bos_descriptor (udev); -if (udev->parent) -of_node_put (dev->of_node); +of_node_put (dev->of_node);usb_put_hcd (hcd);kfree (udev->product);kfree (udev->manufacturer);
@@ -616,6 +615,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, dev->route =0 ; dev->dev.parent = bus->controller; +device_set_of_node_from_dev (&dev->dev, bus->sysdev);dev_set_name (&dev->dev,"usb%d" , bus->busnum); root_hub =1 ; }else {
Signature · 1 line
2.13.0
Johan Hovold
maintainerPATCH 6/7 thermal: max77620: fix device-node reference imbalance
In reply to Johan HovoldThe thermal child device reuses the parent MFD-device device-tree node when registering a thermal zone, but did not take a reference to the node.
This leads to a reference imbalance, and potential use-after-free, when the node reference is dropped by the platform-bus device destructor (once for the child and later again for the parent).
Fix this by dropping any reference already held to a device-tree node and getting a reference to the parent's node which will be balanced on reprobe or on platform-device release, whichever comes first.
Note that simply clearing the of_node pointer on probe errors and on driver unbind would not allow the use of device-managed resources as specifically thermal_zone_of_sensor_unregister() claims that a valid device-tree node pointer is needed during deregistration (even if it currently does not seem to use it).
--- drivers/thermal/max77620_thermal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/thermal/max77620_thermal.c +8 -2
@@ -104,8 +104,6 @@ static int max77620_thermal_probe(struct platform_device *pdev)return -EINVAL ; } - pdev->dev.of_node = pdev->dev.parent->of_node; - mtherm->dev = &pdev->dev; mtherm->rmap =dev_get_regmap (pdev->dev.parent,NULL );if (!mtherm->rmap) {
@@ -113,6 +111,14 @@ static int max77620_thermal_probe(struct platform_device *pdev)return -ENODEV ; } +/* +* Drop any current reference to a device-tree node and get a +* reference to the parent's node which will be balanced on reprobe or +* on platform-device release. +*/ +of_node_put (pdev->dev.of_node); + pdev->dev.of_node =of_node_get (pdev->dev.parent->of_node); + mtherm->tz_device =devm_thermal_zone_of_sensor_register (&pdev->dev,0 , mtherm, &max77620_thermal_ops);if (IS_ERR (mtherm->tz_device)) {
Signature · 1 line
2.13.0
Johan Hovold
maintainerPATCH 7/7 thermal: max77620: fix pinmux conflict on reprobe
In reply to Johan HovoldUse the new helper for reusing a device-tree node of another device instead of managing the node references explicitly.
This also makes sure that the new of_node_reuse flag is set if the device is ever reprobed, something which specifically now avoids driver core from attempting to claim any pinmux resources already claimed by the parent device.
--- drivers/thermal/max77620_thermal.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/thermal/max77620_thermal.c +3 -5
@@ -112,12 +112,10 @@ static int max77620_thermal_probe(struct platform_device *pdev) }/* -* Drop any current reference to a device-tree node and get a -* reference to the parent's node which will be balanced on reprobe or -* on platform-device release. +* The reference taken to the parent's node which will be balanced on +* reprobe or on platform-device release. */ -of_node_put (pdev->dev.of_node); - pdev->dev.of_node =of_node_get (pdev->dev.parent->of_node); +device_set_of_node_from_dev (&pdev->dev, pdev->dev.parent); mtherm->tz_device =devm_thermal_zone_of_sensor_register (&pdev->dev,0 , mtherm, &max77620_thermal_ops);
Signature · 1 line
2.13.0
Johan Hovold
maintainerPATCH 2/7 USB: of: document reference taken by child-lookup helper
In reply to Johan HovoldDocument that the child-node lookup helper takes a reference to the device-tree node which needs to be dropped after use.
--- drivers/usb/core/of.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/core/of.c +3 -0
@@ -28,6 +28,9 @@* * Find the node from device tree according to its port number. * +* Takes a reference to the returned device-tree node, which needs to be +* dropped after use. +* * Return: On success, a pointer to the device node, %NULL on failure. */ struct device_node *usb_of_get_child_node(struct device_node *parent,
Signature · 1 line
2.13.0
Johan Hovold
maintainercover driver core/USB/thermal: fix device-tree node reuse
This series fixes a few issues related to device-tree node reuse.
It is fairly common for drivers to reuse the device-tree node of a parent (or other ancestor) device when creating class or bus devices (e.g. gpio chips, i2c adapters, iio chips, spi masters, serdev, phys, usb root hubs). But reusing a device-tree node may cause problems *if* the new device is later probed as for example driver core would currently attempt to reinitialise an already active associated pinmux configuration.
[ NB: For most examples above this is currently not a problem as the devices reusing a node are never probed. ]
Other potential issues include the platform-bus code unconditionally dropping the device-tree-node reference in its device destructor, reinitialisation of other bus-managed resources such as clocks, and (possibly) the recently added DMA-setup in driver core.
Instead of having drivers try to work around this (as is currently done for USB root hubs), we can allow devices to reuse a device-tree node by setting a flag in their struct device that can be used by core, bus and driver code to avoid resources from being over-allocated.
The first two patches fix a device-tree node reference leak for non-root-hub devices in USB. These were submitted yesterday to the USB list, but are included here for completeness.
The third and fourth patches add a helper that can be used when reusing a device-tree node of another device and that specifically sets a new of_node_reused flag which is then used by driver core to skip the automatic pinctrl configuration during probe.
The fifth patch removes the pinctrl over-allocation workaround from USB core, which also had some undesirable side-effects.
The final two patches fix a device-tree node imbalance and use-after-free in an thermal driver, where a platform device was reusing the device-tree node of its parent mfd during probe. This would also prevent the child device from being reprobed (e.g. due to probe deferral) if the parent node defines a pinctrl configuration.
Note that this series is against 4.12-rc3.
For reference, here is a list of relevant commits leading up to the current situation:
- [2013-01-22] ab78029ecc34 ("drivers/pinctrl: grab default handles from device core")
- [2016-02-19] 69bec7259853 ("USB: core: let USB device know device node")
- [2016-04-25] dc5878abf49c ("usb: core: move root hub's device node assignment after it is added to bus")
- [2016-10-06] 51fa91475e43 ("usb/core: Added devspec sysfs entry for devices behind the usb hub")
- [2017-03-13] a8c06e407ef9 ("usb: separate out sysdev pointer from usb_bus")
- [2017-04-10] 09515ef5ddad ("of/acpi: Configure dma operations at probe time for platform/amba/pci bus devices")
Johan
Johan Hovold (7):
USB: core: fix device node leak
USB: of: document reference taken by child-lookup helper driver core: add helper to reuse a device-tree node driver core: fix automatic pinctrl management
USB: of: fix root-hub device-tree node handling
thermal: max77620: fix device-node reference imbalance
thermal: max77620: fix pinmux conflict on reprobe
drivers/base/core.c | 16 ++++++++++++++++ drivers/base/pinctrl.c | 3 +++ drivers/thermal/max77620_thermal.c | 8 ++++++-- drivers/usb/core/hcd.c | 2 -- drivers/usb/core/of.c | 3 +++ drivers/usb/core/usb.c | 2 ++ include/linux/device.h | 2 ++ 7 files changed, 32 insertions(+), 4 deletions(-)
Signature · 1 line
2.13.0
Johan Hovold
maintainerPATCH 4/7 driver core: fix automatic pinctrl management
Commit ab78029ecc34 ("drivers/pinctrl: grab default handles from device core") added automatic pin-control management to driver core by looking up and setting any default pinctrl state found in device tree while a device is being probed.
This obviously runs into problems as soon as device-tree nodes are reused for child devices which are later also probed as pins would already have been claimed by the ancestor device.
For example if a USB host controller claims a pin, its root hub would consequently fail to probe when its device-tree node is set to the node of the controller:
pinctrl-single 48002030.pinmux: pin PIN204 already requested by 48064800.ehci; cannot claim for usb1 pinctrl-single 48002030.pinmux: pin-204 (usb1) status -22
pinctrl-single 48002030.pinmux: could not request pin 204 (PIN204) from group usb_dbg_pins on device pinctrl-single usb usb1: Error applying setting, reverse things back
usb: probe of usb1 failed with error -22
Fix this by checking the new of_node_reused flag and skipping automatic pinctrl configuration during probe if set.
Note that the flag is checked in driver core rather than in pinctrl (e.g. in pinctrl_dt_to_map()) which would specifically have prevented intentional use of a parent's pinctrl properties by a child device (should such a need ever arise).
--- drivers/base/pinctrl.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/base/pinctrl.c +3 -0
@@ -23,6 +23,9 @@ int pinctrl_bind_pins(struct device *dev) {int ret; +if (dev->of_node_reused) +return 0 ; + dev->pins =devm_kzalloc (dev,sizeof (*(dev->pins)),GFP_KERNEL );if (!dev->pins)return -ENOMEM ;
Signature · 1 line
2.13.0
Re: [PATCH 7/7] thermal: max77620: fix pinmux conflict on reprobe
In reply to Johan HovoldQuoted 22 lines · Johan Hovold
Use the new helper for reusing a device-tree node of another device instead of managing the node references explicitly.
This also makes sure that the new
of_node_reuseflag is set if the device is ever reprobed, something which specifically now avoids driver core from attempting to claim any pinmux resources already claimed by the parent device.Fixes ec4664b3fd6d ("thermal: max77620: Add thermal driver for reporting junction temp")Cc Laxman Dewangan <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/thermal/max77620_thermal.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/thermal/max77620_thermal.c +0
-0@@ -112,12 +112,10 @@ static int max77620_thermal_probe(struct platform_device *pdev) }
drivers/thermal/max77620_thermal.c static int max77620_thermal_probe(struct platform_device *pdev) · line 118
Quoted 10 lines
drivers/thermal/max77620_thermal.c +3
-5/* -* Drop any current reference to a device-tree node and get a -* reference to the parent's node which will be balanced on reprobe or -* on platform-device release. +* The reference taken to the parent's node which will be balanced on +* reprobe or on platform-device release. */ -of_node_put (pdev->dev.of_node); - pdev->dev.of_node =of_node_get (pdev->dev.parent->of_node); +device_set_of_node_from_dev (&pdev->dev, pdev->dev.parent);
Should this one be squashed with patch 6/7?
Quoted 7 lines
drivers/thermal/max77620_thermal.c +0
-0mtherm->tz_device =devm_thermal_zone_of_sensor_register (&pdev->dev,0 , mtherm, &max77620_thermal_ops);Signature · 1 line
2.13.0
Signature · 2 lines
All the best, Eduardo Valentin
Re: [PATCH 2/7] USB: of: document reference taken by child-lookup helper
In reply to Johan HovoldQuoted 13 lines · Johan Hovold
Document that the child-node lookup helper takes a reference to the device-tree node which needs to be dropped after use.
Signed-off-by Johan Hovold <[email protected]>--- drivers/usb/core/of.c | 3 +++ 1 file changed, 3 insertions(+)drivers/usb/core/of.c +0
-0
drivers/usb/core/of.c line 34
Quoted 7 lines
drivers/usb/core/of.c +3
-0@@ -28,6 +28,9 @@* * Find the node from device tree according to its port number. * +* Takes a reference to the returned device-tree node, which needs to be +* dropped after use. +* * Return: On success, a pointer to the device node, %NULL on failure.
I would use the same blurb used throughout drivers/of/* for consistency.
* Returns a node pointer with refcount incremented, use
* of_node_put() on it when done.
*/
Just my 2-cents
-Tyrel
Quoted 3 lines
drivers/usb/core/of.c +0
-0*/ struct device_node *usb_of_get_child_node(struct device_node *parent,
kbuild test robot
build botRe: [PATCH 3/7] driver core: add helper to reuse a device-tree node
In reply to Johan HovoldAll warnings (new ones prefixed by >>):
Hi Johan,
[auto build test WARNING on usb/usb-testing]
[also build test WARNING on v4.12-rc3 next-20170530]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Johan-Hovold/driver-core-USB-thermal-fix-device-tree-node-reuse/20170531-043026 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing reproduce: make htmldocs
All warnings (new ones prefixed by >>):
WARNING: convert(1) not found, for SVG to PDF conversion install ImageMagick (https://www.imagemagick.org)
arch/x86/include/asm/uaccess_32.h:1: warning: no structured comments found
include/linux/init.h:1: warning: no structured comments found
include/linux/mod_devicetable.h:686: warning: Excess struct/union/enum/typedef member 'ver_major' description in 'fsl_mc_device_id' include/linux/mod_devicetable.h:686: warning: Excess struct/union/enum/typedef member 'ver_minor' description in 'fsl_mc_device_id' kernel/sched/core.c:2088: warning: No description found for parameter 'rf'
kernel/sched/core.c:2088: warning: Excess function parameter 'cookie' description in 'try_to_wake_up_local' include/linux/kthread.h:26: warning: Excess function parameter '...' description in 'kthread_create' kernel/sys.c:1: warning: no structured comments found
include/linux/device.h:970: warning: No description found for parameter 'dma_ops'
>> include/linux/device.h:970: warning: No description found for parameter 'of_node_reused'
drivers/dma-buf/seqno-fence.c:1: warning: no structured comments found
include/linux/iio/iio.h:597: warning: No description found for parameter 'trig_readonly'
include/linux/iio/trigger.h:151: warning: No description found for parameter 'indio_dev'
include/linux/iio/trigger.h:151: warning: No description found for parameter 'trig'
include/linux/device.h:971: warning: No description found for parameter 'dma_ops'
include/linux/device.h:971: warning: No description found for parameter 'of_node_reused'
include/linux/usb/gadget.h:230: warning: No description found for parameter 'claimed'
include/linux/usb/gadget.h:230: warning: No description found for parameter 'enabled'
include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_altset_not_supp' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_stall_not_supp' include/linux/usb/gadget.h:408: warning: No description found for parameter 'quirk_zlp_not_supp'
include/drm/drm_drv.h:524: warning: No description found for parameter 'set_busid'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_handler'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_preinstall'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_postinstall'
include/drm/drm_drv.h:524: warning: No description found for parameter 'irq_uninstall'
include/drm/drm_drv.h:524: warning: No description found for parameter 'debugfs_init'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_open_object'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_close_object'
include/drm/drm_drv.h:524: warning: No description found for parameter 'prime_handle_to_fd'
include/drm/drm_drv.h:524: warning: No description found for parameter 'prime_fd_to_handle'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_export'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_import'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_pin'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_unpin'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_res_obj'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_get_sg_table'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_import_sg_table'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_vmap'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_vunmap'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_prime_mmap'
include/drm/drm_drv.h:524: warning: No description found for parameter 'gem_vm_ops'
include/drm/drm_drv.h:524: warning: No description found for parameter 'major'
include/drm/drm_drv.h:524: warning: No description found for parameter 'minor'
include/drm/drm_drv.h:524: warning: No description found for parameter 'patchlevel'
include/drm/drm_drv.h:524: warning: No description found for parameter 'name'
include/drm/drm_drv.h:524: warning: No description found for parameter 'desc'
include/drm/drm_drv.h:524: warning: No description found for parameter 'date'
include/drm/drm_drv.h:524: warning: No description found for parameter 'driver_features'
include/drm/drm_drv.h:524: warning: No description found for parameter 'ioctls'
include/drm/drm_drv.h:524: warning: No description found for parameter 'num_ioctls'
include/drm/drm_drv.h:524: warning: No description found for parameter 'fops'
include/drm/drm_color_mgmt.h:1: warning: no structured comments found
drivers/gpu/drm/drm_plane_helper.c:403: warning: No description found for parameter 'ctx' drivers/gpu/drm/drm_plane_helper.c:404: warning: No description found for parameter 'ctx' drivers/gpu/drm/i915/intel_lpe_audio.c:355: warning: No description found for parameter 'dp_output' drivers/gpu/drm/i915/intel_lpe_audio.c:355: warning: No description found for parameter 'link_rate' drivers/gpu/drm/i915/intel_lpe_audio.c:356: warning: No description found for parameter 'dp_output' drivers/gpu/drm/i915/intel_lpe_audio.c:356: warning: No description found for parameter 'link_rate' Documentation/core-api/assoc_array.rst:13: WARNING: Enumerated list ends without a blank line; unexpected unindent. Documentation/doc-guide/sphinx.rst:126: ERROR: Unknown target name: "sphinx c domain".
kernel/sched/fair.c:7650: WARNING: Inline emphasis start-string without end-string.
kernel/time/timer.c:1200: ERROR: Unexpected indentation.
kernel/time/timer.c:1202: ERROR: Unexpected indentation.
kernel/time/timer.c:1203: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:122: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/wait.h:125: ERROR: Unexpected indentation.
include/linux/wait.h:127: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/time/hrtimer.c:990: WARNING: Block quote ends without a blank line; unexpected unindent.
kernel/signal.c:322: WARNING: Inline literal start-string without end-string.
include/linux/iio/iio.h:219: ERROR: Unexpected indentation.
include/linux/iio/iio.h:220: WARNING: Block quote ends without a blank line; unexpected unindent.
include/linux/iio/iio.h:226: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/iio/industrialio-core.c:638: ERROR: Unknown target name: "iio_val".
drivers/iio/industrialio-core.c:645: ERROR: Unknown target name: "iio_val".
drivers/message/fusion/mptbase.c:5051: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/tty/serial/serial_core.c:1898: WARNING: Definition list ends without a blank line; unexpected unindent. drivers/pci/pci.c:3456: ERROR: Unexpected indentation.
include/linux/regulator/driver.h:271: ERROR: Unknown target name: "regulator_regmap_x_voltage".
include/linux/spi/spi.h:370: ERROR: Unexpected indentation.
drivers/gpu/drm/drm_scdc_helper.c:203: ERROR: Unexpected indentation.
drivers/gpu/drm/drm_scdc_helper.c:204: WARNING: Block quote ends without a blank line; unexpected unindent. drivers/gpu/drm/drm_ioctl.c:690: WARNING: Definition list ends without a blank line; unexpected unindent. Documentation/gpu/todo.rst:111: ERROR: Unknown target name: "drm_fb".
sound/soc/soc-core.c:2670: ERROR: Unknown target name: "snd_soc_daifmt".
sound/core/jack.c:312: ERROR: Unknown target name: "snd_jack_btn".
Documentation/userspace-api/unshare.rst:108: WARNING: Inline emphasis start-string without end-string. Documentation/usb/typec.rst:: WARNING: document isn't included in any toctree
Documentation/usb/usb3-debug-port.rst:: WARNING: document isn't included in any toctree
Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 56: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 69: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 82: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 96: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 109: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 122: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 133: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 164: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "~/.fonts.conf", line 193: Having multiple values in <test> isn't supported and may not work as expected Fontconfig warning: "/home/kbuild/.config/fontconfig/fonts.conf", line 43: Having multiple values in <test> isn't supported and may not work as expected
vim +/of_node_reused +970 include/linux/device.h
ca22e56d Kay Sievers 2011-12-14 954 u32 id; /* device instance */
929d2fa5 Matthew Wilcox 2008-10-16 955
9ac7849e Tejun Heo 2007-01-20 956 spinlock_t devres_lock;
9ac7849e Tejun Heo 2007-01-20 957 struct list_head devres_head;
9ac7849e Tejun Heo 2007-01-20 958
5a3ceb86 Tejun Heo 2008-08-25 959 struct klist_node knode_class;
b7a3e813 Kay Sievers 2006-10-07 960 struct class *class;
a4dbd674 David Brownell 2009-06-24 961 const struct attribute_group **groups; /* optional groups */
23681e47 Greg Kroah-Hartman 2006-06-14 962
^1da177e Linus Torvalds 2005-04-16 963 void (*release)(struct device *dev);
74416e1e Alex Williamson 2012-05-30 964 struct iommu_group *iommu_group;
57f98d2f Robin Murphy 2016-09-13 965 struct iommu_fwspec *iommu_fwspec;
4f3549d7 Rafael J. Wysocki 2013-05-02 966
4f3549d7 Rafael J. Wysocki 2013-05-02 967 bool offline_disabled:1;
4f3549d7 Rafael J. Wysocki 2013-05-02 968 bool offline:1;
aceb1c08 Johan Hovold 2017-05-30 969 bool of_node_reused:1;
^1da177e Linus Torvalds 2005-04-16 @970 };
^1da177e Linus Torvalds 2005-04-16 971
a4232963 Lars-Peter Clausen 2012-07-03 972 static inline struct device *kobj_to_dev(struct kobject *kobj)
a4232963 Lars-Peter Clausen 2012-07-03 973 {
a4232963 Lars-Peter Clausen 2012-07-03 974 return container_of(kobj, struct device, kobj);
a4232963 Lars-Peter Clausen 2012-07-03 975 }
a4232963 Lars-Peter Clausen 2012-07-03 976
9a3df1f7 Alan Stern 2008-03-19 977 /* Get the wakeup routines, which depend on struct device */
9a3df1f7 Alan Stern 2008-03-19 978 #include <linux/pm_wakeup.h>:::::: The code at line 970 was first introduced by commit :::::: 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 Linux-2.6.12-rc2
:::::: TO: Linus Torvalds <[email protected]> :::::: CC: Linus Torvalds <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH 1/7] USB: core: fix device node leak
In reply to Johan HovoldQuoted 19 lines · Johan Hovold
Make sure to release any OF device-node reference taken when creating the USB device.
Note that we currently do not hold a reference to the root hub device-tree node (i.e. the parent controller node).
Fixes 69bec7259853 ("USB: core: let USB device know device node")Cc stable <[email protected]> # v4.6Cc Peter Chen <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/usb/core/usb.c | 2 ++ 1 file changed, 2 insertions(+)drivers/usb/core/usb.c +0
-0
drivers/usb/core/usb.c static void usb_release_dev(struct device *dev) · line 420
Quoted 5 lines
drivers/usb/core/usb.c +2
-0@@ -416,6 +416,8 @@ static void usb_release_dev(struct device *dev)usb_destroy_configuration (udev);usb_release_bos_descriptor (udev); +if (udev->parent) +of_node_put (dev->of_node);
If I'm following the root hub doesn't hold an of_node reference, so does that guarantee that dev->of_node is NULL for the root hub? If so of_node_put() is safely called with a NULL reference, making the if(udev->parent) unnecessary, and further no need to remove it in follow-up patch #5.
-Tyrel
Quoted 4 lines
drivers/usb/core/usb.c +0
-0usb_put_hcd (hcd);kfree (udev->product);kfree (udev->manufacturer);
Re: [PATCH 6/7] thermal: max77620: fix device-node reference imbalance
In reply to Johan HovoldQuoted 41 lines · Johan Hovold
The thermal child device reuses the parent MFD-device device-tree node when registering a thermal zone, but did not take a reference to the node.
This leads to a reference imbalance, and potential use-after-free, when the node reference is dropped by the platform-bus device destructor (once for the child and later again for the parent).
Fix this by dropping any reference already held to a device-tree node and getting a reference to the parent's node which will be balanced on reprobe or on platform-device release, whichever comes first.
Note that simply clearing the
of_nodepointer on probe errors and on driver unbind would not allow the use of device-managed resources as specificallythermal_zone_of_sensor_unregister()claims that a valid device-tree node pointer is needed during deregistration (even if it currently does not seem to use it).Fixes ec4664b3fd6d ("thermal: max77620: Add thermal driver for reporting junction temp")Cc stable <[email protected]> # 4.9Cc Laxman Dewangan <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/thermal/max77620_thermal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/thermal/max77620_thermal.c +0
-2@@ -104,8 +104,6 @@ static int max77620_thermal_probe(struct platform_device *pdev)return -EINVAL ; } - pdev->dev.of_node = pdev->dev.parent->of_node; - mtherm->dev = &pdev->dev; mtherm->rmap =dev_get_regmap (pdev->dev.parent,NULL );if (!mtherm->rmap) {@@ -113,6 +111,14 @@ static int max77620_thermal_probe(struct platform_device *pdev)return -ENODEV ;
drivers/thermal/max77620_thermal.c static int max77620_thermal_probe(struct platform_device *pdev) · line 121
Quoted 10 lines
drivers/thermal/max77620_thermal.c +8
-0} +/* +* Drop any current reference to a device-tree node and get a +* reference to the parent's node which will be balanced on reprobe or +* on platform-device release. +*/ +of_node_put (pdev->dev.of_node); + pdev->dev.of_node =of_node_get (pdev->dev.parent->of_node); +
This seems like needless churn. Can't this just be squashed into patch #7?
-Tyrel
Quoted 4 lines
drivers/thermal/max77620_thermal.c +0
-0mtherm->tz_device =devm_thermal_zone_of_sensor_register (&pdev->dev,0 , mtherm, &max77620_thermal_ops);if (IS_ERR (mtherm->tz_device)) {
Re: [PATCH 4/7] driver core: fix automatic pinctrl management
In reply to Johan HovoldQuoted 4 lines · Johan Hovold
Commit
ab78029ecc34("drivers/pinctrl: grab default handles from device core") added automatic pin-control management to driver core by looking up and setting any default pinctrl state found in device tree while a device is being probed.
Actually we do not just support device tree, but also passing pin control states from board files. It is handled by the core all the same. So it's not a device tree thing.
One of those days we will have ACPI passing state tables too...
But I understand what you mean.
Quoted 2 lines
Fix this by checking the new
of_node_reusedflag and skipping automatic pinctrl configuration during probe if set.
Seems like a solid idea. I hope we don't need another quirk for ACPI.
Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Johan Hovold
maintainerRe: [PATCH 7/7] thermal: max77620: fix pinmux conflict on reprobe
In reply to Eduardo ValentinQuoted 23 lines · Eduardo Valentin
Quoted 22 lines · Johan Hovold
Use the new helper for reusing a device-tree node of another device instead of managing the node references explicitly.
This also makes sure that the new
of_node_reuseflag is set if the device is ever reprobed, something which specifically now avoids driver core from attempting to claim any pinmux resources already claimed by the parent device.Fixes ec4664b3fd6d ("thermal: max77620: Add thermal driver for reporting junction temp")Cc Laxman Dewangan <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/thermal/max77620_thermal.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)drivers/thermal/max77620_thermal.c +0
-0@@ -112,12 +112,10 @@ static int max77620_thermal_probe(struct platform_device *pdev) }
Quoted 12 lines
drivers/thermal/max77620_thermal.c static int max77620_thermal_probe(struct platform_device *pdev) · line 118
Quoted 10 lines
drivers/thermal/max77620_thermal.c +3
-5/* -* Drop any current reference to a device-tree node and get a -* reference to the parent's node which will be balanced on reprobe or -* on platform-device release. +* The reference taken to the parent's node which will be balanced on +* reprobe or on platform-device release. */ -of_node_put (pdev->dev.of_node); - pdev->dev.of_node =of_node_get (pdev->dev.parent->of_node); +device_set_of_node_from_dev (&pdev->dev, pdev->dev.parent);Should this one be squashed with patch 6/7?
I separated the two fixes this way as 6/7 does not depend on the rest of the series and could be backported to stable, while this one fixes something that has never worked (e.g. deferred probe of the thermal child when the parent has a pinctrl configuration) and therefore is not stable material.
Thanks,
Johan
Johan Hovold
maintainerRe: [PATCH 1/7] USB: core: fix device node leak
In reply to Tyrel DatwylerQuoted 21 lines · Tyrel Datwyler
Quoted 20 lines · Johan Hovold
Make sure to release any OF device-node reference taken when creating the USB device.
Note that we currently do not hold a reference to the root hub device-tree node (i.e. the parent controller node).
Fixes 69bec7259853 ("USB: core: let USB device know device node")Cc stable <[email protected]> # v4.6Cc Peter Chen <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/usb/core/usb.c | 2 ++ 1 file changed, 2 insertions(+)drivers/usb/core/usb.c +0
-0@@ -416,6 +416,8 @@ static void usb_release_dev(struct device *dev)
Quoted 7 lines
drivers/usb/core/usb.c static void usb_release_dev(struct device *dev) · line 420
Quoted 4 lines
drivers/usb/core/usb.c +2
-0usb_destroy_configuration (udev);usb_release_bos_descriptor (udev); +if (udev->parent) +of_node_put (dev->of_node);If I'm following the root hub doesn't hold an
of_nodereference, so does that guarantee thatdev->of_nodeis NULL for the root hub?
No, it may be non-NULL.
Quoted 3 lines
If so
of_node_put()is safely called with a NULL reference, making theif(udev->parent)unnecessary, and further no need to remove it in follow-up patch #5.
So this one is still needed.
Thanks,
Johan
Johan Hovold
maintainerRe: [PATCH 6/7] thermal: max77620: fix device-node reference imbalance
In reply to Tyrel DatwylerQuoted 44 lines · Tyrel Datwyler
Quoted 43 lines · Johan Hovold
The thermal child device reuses the parent MFD-device device-tree node when registering a thermal zone, but did not take a reference to the node.
This leads to a reference imbalance, and potential use-after-free, when the node reference is dropped by the platform-bus device destructor (once for the child and later again for the parent).
Fix this by dropping any reference already held to a device-tree node and getting a reference to the parent's node which will be balanced on reprobe or on platform-device release, whichever comes first.
Note that simply clearing the
of_nodepointer on probe errors and on driver unbind would not allow the use of device-managed resources as specificallythermal_zone_of_sensor_unregister()claims that a valid device-tree node pointer is needed during deregistration (even if it currently does not seem to use it).Fixes ec4664b3fd6d ("thermal: max77620: Add thermal driver for reporting junction temp")Cc stable <[email protected]> # 4.9Cc Laxman Dewangan <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/thermal/max77620_thermal.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/thermal/max77620_thermal.c +0
-2@@ -104,8 +104,6 @@ static int max77620_thermal_probe(struct platform_device *pdev)return -EINVAL ; } - pdev->dev.of_node = pdev->dev.parent->of_node; - mtherm->dev = &pdev->dev; mtherm->rmap =dev_get_regmap (pdev->dev.parent,NULL );if (!mtherm->rmap) {@@ -113,6 +111,14 @@ static int max77620_thermal_probe(struct platform_device *pdev)return -ENODEV ; }
Quoted 11 lines
drivers/thermal/max77620_thermal.c static int max77620_thermal_probe(struct platform_device *pdev) · line 121
Quoted 8 lines
drivers/thermal/max77620_thermal.c +8
-0+/* +* Drop any current reference to a device-tree node and get a +* reference to the parent's node which will be balanced on reprobe or +* on platform-device release. +*/ +of_node_put (pdev->dev.of_node); + pdev->dev.of_node =of_node_get (pdev->dev.parent->of_node); +This seems like needless churn. Can't this just be squashed into patch #7?
As I just replied to Eduardo, I'm fixing two separate issues here of which this one might qualify for stable while the other (7/7) does not.
Thanks,
Johan
Johan Hovold
maintainerRe: [PATCH 4/7] driver core: fix automatic pinctrl management
In reply to Linus WalleijQuoted 7 lines · Linus Walleij
Quoted 4 lines · Johan Hovold
Commit
ab78029ecc34("drivers/pinctrl: grab default handles from device core") added automatic pin-control management to driver core by looking up and setting any default pinctrl state found in device tree while a device is being probed.
Quoted 7 lines
Actually we do not just support device tree, but also passing pin control states from board files. It is handled by the core all the same. So it's not a device tree thing.
One of those days we will have ACPI passing state tables too...
But I understand what you mean.
Yes, I could have mentioned board files, but this problem only applies to device-tree descriptions (for the time being at least).
Quoted 4 lines
Quoted 2 lines
Fix this by checking the new
of_node_reusedflag and skipping automatic pinctrl configuration during probe if set.Seems like a solid idea. I hope we don't need another quirk for ACPI.
We should be able to just generalise and rename the flag (or add a second one) if it turns out ACPI needs this too.
Quoted 1 line
Acked-by Linus Walleij <[email protected]>
Thanks,
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Johan Hovold
maintainerRe: [PATCH 3/7] driver core: add helper to reuse a device-tree node
In reply to kbuild test robotQuoted 6 lines · kbuild test robot
Hi Johan,
[auto build test WARNING on usb/usb-testing]
[also build test WARNING on v4.12-rc3 next-20170530]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
Quoted 7 lines
url: https://github.com/0day-ci/linux/commits/Johan-Hovold/driver-core-USB-thermal-fix-device-tree-node-reuse/20170531-043026 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing reproduce: make htmldocsAll warnings (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
include/linux/device.h:970: warning: No description found for parameter 'of_node_reused'
Forgot to update the kernel docs here. Will fix this in a v2 after addressing any further comments.
Thanks,
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/7] USB: core: fix device node leak
In reply to Johan HovoldQuoted 19 lines · Johan Hovold
Make sure to release any OF device-node reference taken when creating the USB device.
Note that we currently do not hold a reference to the root hub device-tree node (i.e. the parent controller node).
Fixes 69bec7259853 ("USB: core: let USB device know device node")Cc stable <[email protected]> # v4.6Cc Peter Chen <[email protected]>Signed-off-by Johan Hovold <[email protected]>--- drivers/usb/core/usb.c | 2 ++ 1 file changed, 2 insertions(+)drivers/usb/core/usb.c +0
-0
drivers/usb/core/usb.c static void usb_release_dev(struct device *dev) · line 423
Quoted 8 lines
drivers/usb/core/usb.c +2
-0@@ -416,6 +416,8 @@ static void usb_release_dev(struct device *dev)usb_destroy_configuration (udev);usb_release_bos_descriptor (udev); +if (udev->parent) +of_node_put (dev->of_node);usb_put_hcd (hcd);kfree (udev->product);kfree (udev->manufacturer);
Signature · 6 lines
Best Regards, Peter Chen -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 5/7] USB: of: fix root-hub device-tree node handling
In reply to Johan HovoldQuoted 66 lines · Johan Hovold
In an attempt to work around a pinmux over-allocation issue in driver core, commit
dc5878abf49c("usb: core: move root hub's device node assignment after it is added to bus") moved the device-tree node assignment until after the root hub had been registered.This not only makes the device-tree node unavailable to the usb driver during probe, but also prevents the
of_nodefrom being linked to in sysfs and causes a race with user-space for the (recently added) devspec attribute.Use the new
device_set_of_node_from_dev()helper to reuse the node of the sysdev device, something which now prevents driver core from trying to reclaim any pinctrl pins during probe.Fixes dc5878abf49c ("usb: core: move root hub's device node assignment after it is added to bus")Fixes 51fa91475e43 ("usb/core: Added devspec sysfs entry for devices behind the usb hub")Signed-off-by Johan Hovold <[email protected]>--- drivers/usb/core/hcd.c | 2 -- drivers/usb/core/usb.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-)drivers/usb/core/hcd.c +0
-2@@ -1076,7 +1076,6 @@ static void usb_deregister_bus (struct usb_bus *bus)static int register_root_hub (struct usb_hcd *hcd) {struct device *parent_dev = hcd->self.controller; -struct device *sysdev = hcd->self.sysdev;struct usb_device *usb_dev = hcd->self.root_hub;const int devnum =1 ;int retval;@@ -1123,7 +1122,6 @@ static int register_root_hub(struct usb_hcd *hcd)/* Did the HC die before the root hub was registered? */ if (HCD_DEAD (hcd))usb_hc_died (hcd);/* This time clean up */ - usb_dev->dev.of_node = sysdev->of_node; }mutex_unlock (&usb_bus_idr_lock);drivers/usb/core/usb.c +2
-2@@ -416,8 +416,7 @@ static void usb_release_dev(struct device *dev)usb_destroy_configuration (udev);usb_release_bos_descriptor (udev); -if (udev->parent) -of_node_put (dev->of_node); +of_node_put (dev->of_node);usb_put_hcd (hcd);kfree (udev->product);kfree (udev->manufacturer);@@ -616,6 +615,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent, dev->route =0 ; dev->dev.parent = bus->controller; +device_set_of_node_from_dev (&dev->dev, bus->sysdev);dev_set_name (&dev->dev,"usb%d" , bus->busnum); root_hub =1 ; }else {Signature · 1 line
2.13.0
I am OK with it, but I suggest adding it for new rc1 since it is based on the 1st patch which is a bug-fix. If this one is really needed for stable tree in future, you can cherry-pick it.
Signature · 2 lines
Best Regards, Peter Chen
Johan Hovold
maintainerRe: [PATCH 2/7] USB: of: document reference taken by child-lookup helper
In reply to Tyrel DatwylerQuoted 24 lines · Tyrel Datwyler
Quoted 13 lines · Johan Hovold
Document that the child-node lookup helper takes a reference to the device-tree node which needs to be dropped after use.
Signed-off-by Johan Hovold <[email protected]>--- drivers/usb/core/of.c | 3 +++ 1 file changed, 3 insertions(+)drivers/usb/core/of.c +0
-0drivers/usb/core/of.c line 34
Quoted 7 lines
drivers/usb/core/of.c +3
-0@@ -28,6 +28,9 @@* * Find the node from device tree according to its port number. * +* Takes a reference to the returned device-tree node, which needs to be +* dropped after use. +* * Return: On success, a pointer to the device node, %NULL on failure. I would use the same blurb used throughout
drivers/of/*for consistency.
Quoted 5 lines
* Returns a node pointer with refcount incremented, use
*of_node_put()on it when done.
*/Just my 2-cents
I updated the comment to use a version of this also found in drivers/of:
* Return: A pointer to the node with incremented refcount if found, or
* %NULL otherwise.
which is on kernel-doc format. I don't think we need to explicitly mention which function to manipulate the refcount with in every header.
Thanks,
Johan
Johan Hovold
maintainerRe: [PATCH 5/7] USB: of: fix root-hub device-tree node handling
In reply to Peter ChenQuoted 15 lines · Peter Chen
Quoted 14 lines · Johan Hovold
In an attempt to work around a pinmux over-allocation issue in driver core, commit
dc5878abf49c("usb: core: move root hub's device node assignment after it is added to bus") moved the device-tree node assignment until after the root hub had been registered.This not only makes the device-tree node unavailable to the usb driver during probe, but also prevents the
of_nodefrom being linked to in sysfs and causes a race with user-space for the (recently added) devspec attribute.Use the new
device_set_of_node_from_dev()helper to reuse the node of the sysdev device, something which now prevents driver core from trying to reclaim any pinctrl pins during probe.
Quoted 7 lines
Quoted 3 lines
Fixes dc5878abf49c ("usb: core: move root hub's device node assignment after it is added to bus")Fixes 51fa91475e43 ("usb/core: Added devspec sysfs entry for devices behind the usb hub")Signed-off-by Johan Hovold <[email protected]>I am OK with it, but I suggest adding it for new rc1 since it is based on the 1st patch which is a bug-fix. If this one is really needed for stable tree in future, you can cherry-pick it.
I agree, and didn't intent for this one to go into 4.12-rc. Let's see how Greg wants to handle this. I'll add some comments to the cover letter in v2.
Thanks,
Johan