Bluetooth: btusb: Fix suspend issue for Realtek devices

From the perspective of controller, global suspend means there is no
SET_FEATURE (DEVICE_REMOTE_WAKEUP) and controller would drop the
firmware. It would consume less power. So we should not send this kind
of SET_FEATURE when host goes to suspend state.
Otherwise, when making device enter selective suspend, host should send
SET_FEATURE to make sure the firmware remains.

Signed-off-by: Alex Lu <alex_lu@realsil.com.cn>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 5cf0734eb31bf923de8c18cb8e8ad5d23a284a2f..31d3febed1875fee64aedab4a61b27b9e3581ccf 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -435,6 +435,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = {
 #define BTUSB_OOB_WAKE_ENABLED 11
 #define BTUSB_HW_RESET_ACTIVE  12
 #define BTUSB_TX_WAIT_VND_EVT  13
+#define BTUSB_WAKEUP_DISABLE   14
 
 struct btusb_data {
        struct hci_dev       *hdev;
@@ -1175,6 +1176,13 @@ static int btusb_open(struct hci_dev *hdev)
         */
        device_wakeup_enable(&data->udev->dev);
 
+       /* Disable device remote wakeup when host is suspended
+        * For Realtek chips, global suspend without
+        * SET_FEATURE (DEVICE_REMOTE_WAKEUP) can save more power in device.
+        */
+       if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags))
+               device_wakeup_disable(&data->udev->dev);
+
        if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))
                goto done;
 
@@ -1238,6 +1246,11 @@ static int btusb_close(struct hci_dev *hdev)
                goto failed;
 
        data->intf->needs_remote_wakeup = 0;
+
+       /* Enable remote wake up for auto-suspend */
+       if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags))
+               data->intf->needs_remote_wakeup = 1;
+
        device_wakeup_disable(&data->udev->dev);
        usb_autopm_put_interface(data->intf);
 
@@ -3771,11 +3784,11 @@ static int btusb_probe(struct usb_interface *intf,
                hdev->setup = btrtl_setup_realtek;
                hdev->shutdown = btrtl_shutdown_realtek;
 
-               /* Realtek devices lose their updated firmware over suspend,
-                * but the USB hub doesn't notice any status change.
-                * Explicitly request a device reset on resume.
+               /* Realtek devices lose their updated firmware over global
+                * suspend that means host doesn't send SET_FEATURE
+                * (DEVICE_REMOTE_WAKEUP)
                 */
-               interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;
+               set_bit(BTUSB_WAKEUP_DISABLE, &data->flags);
        }
 #endif
 
@@ -3949,6 +3962,19 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)
                enable_irq(data->oob_wake_irq);
        }
 
+       /* For global suspend, Realtek devices lose the loaded fw
+        * in them. But for autosuspend, firmware should remain.
+        * Actually, it depends on whether the usb host sends
+        * set feature (enable wakeup) or not.
+        */
+       if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags)) {
+               if (PMSG_IS_AUTO(message) &&
+                   device_can_wakeup(&data->udev->dev))
+                       data->udev->do_remote_wakeup = 1;
+               else if (!PMSG_IS_AUTO(message))
+                       data->udev->reset_resume = 1;
+       }
+
        return 0;
 }