hid2hci: when recovering from S3 use parent devpath

PATCH In review Mario Limonciello 5 participants 18 messages Jul 27, 2009 – Aug 11, 2009

lore

Share & tools

lore

Mario Limonciello

author

2009-07-27 21:19 UTC #0 lore raw

PATCH 2/2 hid2hci: when recovering from S3 use parent devpath

Hi:

After the previous cleanup submitted to hid2hci, the code for finding the sibling device changed significantly. Although this works perfectly fine when all the devices are on the bus, it doesn't for the recovery from S3 situation. The device is already off the bus by the time hid2hci is called so the devpath is not found in the udev database. The easiest way to solve this is to use the parent's devpath instead, but this does introduce a dependency on importing the env variable DEVPATH from the parent.

Regards

Signature · 3 lines

Mario Limonciello
*Dell | Linux Engineering*
[email protected]

Since the BT device is off the bus, trying to query it from the udev database fails. We need to send the parent's DEVPATH (unfortunately by pulling in from the $env) and then go from there.

=== modified file 'extras/hid2hci/70-hid2hci.rules'

hid2hci/70-hid2hci.rules +2 -2

@@ -20,8 +20,8 @@
 # Unfortunately the only event seen is the BT device disappearing, so the mouse
 # device needs to be chased down on the USB bus.
 ATTR{bDeviceClass}=="e0", ATTR{bDeviceSubClass}=="01", ATTR{bDeviceProtocol}=="01", \
-  ATTR{idVendor}=="413c", ATTR{bmAttributes}=="e0", \
-  ENV{REMOVE_CMD}="hid2hci --method=dell --devpath=%p --find-sibling-intf=03:01:02"
+  ATTR{idVendor}=="413c", ATTR{bmAttributes}=="e0", IMPORT{parent}="DEVPATH", \
+  ENV{REMOVE_CMD}="hid2hci --method=dell --devpath=$env{DEVPATH} --find-sibling-intf=03:01:02"
 
 # CSR devices
 ATTR{idVendor}=="0a12|0458|05ac", ATTR{idProduct}=="1000", RUN+="hid2hci --method=csr --devpath=%p"

=== modified file 'extras/hid2hci/hid2hci.c'

hid2hci/hid2hci.c +1 -6

@@ -210,11 +210,6 @@
 		return usb_open(dev);
 	}
 
-	/* find matching sibling of the current usb_device, they share the same hub */
-	udev_parent = udev_device_get_parent_with_subsystem_devtype(udev_dev, "usb", "usb_device");
-	if (udev_parent == NULL)
-		return NULL;
-
 	enumerate = udev_enumerate_new(udev);
 	if (enumerate == NULL)
 		return NULL;

@@ -222,7 +217,7 @@
 	udev_enumerate_add_match_subsystem(enumerate, "usb");
 
 	/* match all childs of the parent */
-	util_strscpyl(str, sizeof(str), udev_device_get_sysname(udev_parent), "*", NULL);
+	util_strscpyl(str, sizeof(str), udev_device_get_sysname(udev_dev), "*", NULL);
 	udev_enumerate_add_match_sysname(enumerate, str);
 
 	/* match the specified interface */

Marcel Holtmann

2009-07-27 21:35 UTC #1 lore raw

Hi Mario,

Quoted 8 lines

After the previous cleanup submitted to hid2hci, the code for finding the sibling device changed significantly. Although this works perfectly fine when all the devices are on the bus, it doesn't for the recovery from S3 situation. The device is already off the bus by the time hid2hci is called so the devpath is not found in the udev database. The easiest way to solve this is to use the parent's devpath instead, but this does introduce a dependency on importing the env variable DEVPATH from the parent.

at least this should be a private variable.

Regards

Marcel

Mario Limonciello

author

2009-07-27 22:36 UTC #2 lore raw