lkml.org 
[lkml]   [2018]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 69/88] Bluetooth: btusb: Restore QCA Rome suspend/resume fix with a "rewritten" version
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hans de Goede <hdegoede@redhat.com>

    commit 61f5acea8737d9b717fcc22bb6679924f3c82b98 upstream.

    Commit 7d06d5895c15 ("Revert "Bluetooth: btusb: fix QCA...suspend/resume"")
    removed the setting of the BTUSB_RESET_RESUME quirk for QCA Rome devices,
    instead favoring adding USB_QUIRK_RESET_RESUME quirks in usb/core/quirks.c.

    This was done because the DIY BTUSB_RESET_RESUME reset-resume handling
    has several issues (see the original commit message). An added advantage
    of moving over to the USB-core reset-resume handling is that it also
    disables autosuspend for these devices, which is similarly broken on these.

    But there are 2 issues with this approach:
    1) It leaves the broken DIY BTUSB_RESET_RESUME code in place for Realtek
    devices.
    2) Sofar only 2 of the 10 QCA devices known to the btusb code have been
    added to usb/core/quirks.c and if we fix the Realtek case the same way
    we need to add an additional 14 entries. So in essence we need to
    duplicate a large part of the usb_device_id table in btusb.c in
    usb/core/quirks.c and manually keep them in sync.

    This commit instead restores setting a reset-resume quirk for QCA devices
    in the btusb.c code, avoiding the duplicate usb_device_id table problem.

    This commit avoids the problems with the original DIY BTUSB_RESET_RESUME
    code by simply setting the USB_QUIRK_RESET_RESUME quirk directly on the
    usb_device.

    This commit also moves the BTUSB_REALTEK case over to directly setting the
    USB_QUIRK_RESET_RESUME on the usb_device and removes the now unused
    BTUSB_RESET_RESUME code.

    BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836
    Fixes: 7d06d5895c15 ("Revert "Bluetooth: btusb: fix QCA...suspend/resume"")
    Cc: Leif Liddy <leif.linux@gmail.com>
    Cc: Matthias Kaehlcke <mka@chromium.org>
    Cc: Brian Norris <briannorris@chromium.org>
    Cc: Daniel Drake <drake@endlessm.com>
    Cc: Kai-Heng Feng <kai.heng.feng@canonical.com>
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/bluetooth/btusb.c | 21 ++++++++++-----------
    1 file changed, 10 insertions(+), 11 deletions(-)

    --- a/drivers/bluetooth/btusb.c
    +++ b/drivers/bluetooth/btusb.c
    @@ -23,6 +23,7 @@

    #include <linux/module.h>
    #include <linux/usb.h>
    +#include <linux/usb/quirks.h>
    #include <linux/firmware.h>
    #include <asm/unaligned.h>

    @@ -369,8 +370,8 @@ static const struct usb_device_id blackl
    #define BTUSB_FIRMWARE_LOADED 7
    #define BTUSB_FIRMWARE_FAILED 8
    #define BTUSB_BOOTING 9
    -#define BTUSB_RESET_RESUME 10
    -#define BTUSB_DIAG_RUNNING 11
    +#define BTUSB_DIAG_RUNNING 10
    +#define BTUSB_OOB_WAKE_ENABLED 11

    struct btusb_data {
    struct hci_dev *hdev;
    @@ -2925,6 +2926,12 @@ static int btusb_probe(struct usb_interf
    if (id->driver_info & BTUSB_QCA_ROME) {
    data->setup_on_usb = btusb_setup_qca;
    hdev->set_bdaddr = btusb_set_bdaddr_ath3012;
    +
    + /* QCA Rome devices lose their updated firmware over suspend,
    + * but the USB hub doesn't notice any status change.
    + * explicitly request a device reset on resume.
    + */
    + interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;
    }

    #ifdef CONFIG_BT_HCIBTUSB_RTL
    @@ -2935,7 +2942,7 @@ static int btusb_probe(struct usb_interf
    * but the USB hub doesn't notice any status change.
    * Explicitly request a device reset on resume.
    */
    - set_bit(BTUSB_RESET_RESUME, &data->flags);
    + interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;
    }
    #endif

    @@ -3092,14 +3099,6 @@ static int btusb_suspend(struct usb_inte
    btusb_stop_traffic(data);
    usb_kill_anchored_urbs(&data->tx_anchor);

    - /* Optionally request a device reset on resume, but only when
    - * wakeups are disabled. If wakeups are enabled we assume the
    - * device will stay powered up throughout suspend.
    - */
    - if (test_bit(BTUSB_RESET_RESUME, &data->flags) &&
    - !device_may_wakeup(&data->udev->dev))
    - data->udev->reset_resume = 1;
    -
    return 0;
    }


    \
     
     \ /
      Last update: 2018-02-15 19:13    [W:4.056 / U:0.748 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site