Bluetooth: btintel: Fix broken LED quirk for legacy ROM devices

This patch fixes the broken LED quirk for Intel legacy ROM devices.
To fix the LED issue that doesn't turn off immediately, the host sends
the SW RFKILL command while shutting down the interface and it puts the
devices in SW RFKILL state.

Once the device is in SW RFKILL state, it can only accept HCI_Reset to
exit from the SW RFKILL state. This patch checks the quirk for broken
LED and sends the HCI_Reset before sending the HCI_Intel_Read_Version
command.

The affected legacy ROM devices are
 - 8087:07dc
 - 8087:0a2a
 - 8087:0aa7

Fixes: acac36d3c055b ("Bluetooth: btintel: Fix the LED is not turning off immediately")
Signed-off-by: Tedd Ho-Jeong An <tedd.an@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index e1f96df847b8fcced9da8cc703154c54e2efeeb0..1a4f8b227eac0b589edd9bf4798d48c01838af9d 100644 (file)
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -2355,8 +2355,15 @@ static int btintel_setup_combined(struct hci_dev *hdev)
         * As a workaround, send HCI Reset command first which will reset the
         * number of completed commands and allow normal command processing
         * from now on.
+        *
+        * Regarding the INTEL_BROKEN_SHUTDOWN_LED flag, these devices maybe
+        * in the SW_RFKILL ON state as a workaround of fixing LED issue during
+        * the shutdown() procedure, and once the device is in SW_RFKILL ON
+        * state, the only way to exit out of it is sending the HCI_Reset
+        * command.
         */
-       if (btintel_test_flag(hdev, INTEL_BROKEN_INITIAL_NCMD)) {
+       if (btintel_test_flag(hdev, INTEL_BROKEN_INITIAL_NCMD) ||
+           btintel_test_flag(hdev, INTEL_BROKEN_SHUTDOWN_LED)) {
                skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL,
                                     HCI_INIT_TIMEOUT);
                if (IS_ERR(skb)) {
@@ -2428,12 +2435,6 @@ static int btintel_setup_combined(struct hci_dev *hdev)
                                set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,
                                        &hdev->quirks);
 
-                       /* These devices have an issue with LED which doesn't
-                        * go off immediately during shutdown. Set the flag
-                        * here to send the LED OFF command during shutdown.
-                        */
-                       btintel_set_flag(hdev, INTEL_BROKEN_LED);
-
                        err = btintel_legacy_rom_setup(hdev, &ver);
                        break;
                case 0x0b:      /* SfP */
@@ -2586,9 +2587,10 @@ static int btintel_shutdown_combined(struct hci_dev *hdev)
 
        /* Some platforms have an issue with BT LED when the interface is
         * down or BT radio is turned off, which takes 5 seconds to BT LED
-        * goes off. This command turns off the BT LED immediately.
+        * goes off. As a workaround, sends HCI_Intel_SW_RFKILL to put the
+        * device in the RFKILL ON state which turns off the BT LED immediately.
         */
-       if (btintel_test_flag(hdev, INTEL_BROKEN_LED)) {
+       if (btintel_test_flag(hdev, INTEL_BROKEN_SHUTDOWN_LED)) {
                skb = __hci_cmd_sync(hdev, 0xfc3f, 0, NULL, HCI_INIT_TIMEOUT);
                if (IS_ERR(skb)) {
                        ret = PTR_ERR(skb);

diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
index e500c0d7a7298484b04314cec6103714f2b94c1d..c9b24e9299e2afd7aaf6ee66a2bee77a74a258fa 100644 (file)
--- a/drivers/bluetooth/btintel.h
+++ b/drivers/bluetooth/btintel.h
@@ -150,7 +150,7 @@ enum {
        INTEL_FIRMWARE_FAILED,
        INTEL_BOOTING,
        INTEL_BROKEN_INITIAL_NCMD,
-       INTEL_BROKEN_LED,
+       INTEL_BROKEN_SHUTDOWN_LED,
        INTEL_ROM_LEGACY,
 
        __INTEL_NUM_FLAGS,

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 74ec7ca96b692517bd48801769a5eb145585fb8a..d0619a07b069e344d56635a7c5c78479f7275e56 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -60,6 +60,7 @@ static struct usb_driver btusb_driver;
 #define BTUSB_WIDEBAND_SPEECH  0x400000
 #define BTUSB_VALID_LE_STATES   0x800000
 #define BTUSB_QCA_WCN6855      0x1000000
+#define BTUSB_INTEL_BROKEN_SHUTDOWN_LED        0x2000000
 #define BTUSB_INTEL_BROKEN_INITIAL_NCMD 0x4000000
 
 static const struct usb_device_id btusb_table[] = {
@@ -381,10 +382,13 @@ static const struct usb_device_id blacklist_table[] = {
        { USB_DEVICE(0x8087, 0x0033), .driver_info = BTUSB_INTEL_COMBINED },
        { USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR },
        { USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL_COMBINED |
-                                                    BTUSB_INTEL_BROKEN_INITIAL_NCMD },
-       { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED },
+                                                    BTUSB_INTEL_BROKEN_INITIAL_NCMD |
+                                                    BTUSB_INTEL_BROKEN_SHUTDOWN_LED },
+       { USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL_COMBINED |
+                                                    BTUSB_INTEL_BROKEN_SHUTDOWN_LED },
        { USB_DEVICE(0x8087, 0x0a2b), .driver_info = BTUSB_INTEL_COMBINED },
-       { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL_COMBINED },
+       { USB_DEVICE(0x8087, 0x0aa7), .driver_info = BTUSB_INTEL_COMBINED |
+                                                    BTUSB_INTEL_BROKEN_SHUTDOWN_LED },
        { USB_DEVICE(0x8087, 0x0aaa), .driver_info = BTUSB_INTEL_COMBINED },
 
        /* Other Intel Bluetooth devices */
@@ -3732,6 +3736,9 @@ static int btusb_probe(struct usb_interface *intf,
 
                if (id->driver_info & BTUSB_INTEL_BROKEN_INITIAL_NCMD)
                        btintel_set_flag(hdev, INTEL_BROKEN_INITIAL_NCMD);
+
+               if (id->driver_info & BTUSB_INTEL_BROKEN_SHUTDOWN_LED)
+                       btintel_set_flag(hdev, INTEL_BROKEN_SHUTDOWN_LED);
        }
 
        if (id->driver_info & BTUSB_MARVELL)