Re: [PATCH 5.12 regression fix] Bluetooth: btusb: Revert Fix the autosuspend enable and disable

On 2/18/21 11:02 PM, Hans de Goede wrote:

Hi,

On 2/18/21 3:36 PM, Hui Wang wrote:

quoted

On 2/18/21 8:37 PM, Hans de Goede wrote:

quoted

drivers/usb/core/hub.c: usb_new_device() contains the following:

[...]

quoted

         err = hci_register_dev(hdev);
       if (err < 0)

@@ -4688,9 +4688,6 @@ static void btusb_disconnect(struct usb_interface *intf)
           gpiod_put(data->reset_gpio);
         hci_free_dev(hdev);
-
-    if (!enable_autosuspend)
-        usb_enable_autosuspend(data->udev);

Hi Hans,

And Do we need to call usb_disable_autosuspend() in the disconnect()? like below:

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 32161dd40ed6..ef831492363c 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c

@@ -4673,6 +4673,9 @@ static void btusb_disconnect(struct usb_interface *intf)

         hci_unregister_dev(hdev);

+       if (enable_autosuspend)
+               usb_disable_autosuspend(data->udev);
+
         if (intf == data->intf) {
                 if (data->isoc)

usb_driver_release_interface(&btusb_driver, data->isoc);


Before the btusb_probe() is called, the usb device is autosuspend disabled, suppose users set the btusb.enable_autosuspend=1, the driver btusb will enable the autosuspend on this device. If users remove this driver, the disconnect() will be called, the usb device will keep autosuspend enabled. Next time if users reload this driver by 'sudo modprobe  btusb enalbe_autosuspend=0',  they will find the device is autosuspend enabled instead of disabled.

The problem with calling usb_disable_autosuspend() is that the auto-suspend setting is a bool,
rather then a counter, so if a udev-rule or the user manually through e.g. :

echo auto > /sys/bus/usb/devices/1-10/power/control

Has enabled autosuspend then we would be disabling it, which is undesirable.

Most USB drivers which have some way of enabling autosuspend by-default
(IOW which call usb_enable_autosuspend()) simply enable it at the end
of a successful probe and leave it as is on remove.

Also keep in mind that remove normally runs on unplug of the device, in
which case it does not matter as the device is going away.

If a user wants to disable autosuspend after loading the btusb module,
the correct way to do this is by simply running e.g. :

echo on > /sys/bus/usb/devices/1-10/power/control

Rather then rmmod-ing and insmod-ing the module with a different module-param value.

Got it, thanks for your explanation.

Thanks,

Hui.

Regards,

Hans