Bluetooth: btusb: Improve stability for QCA devices

BugLink: https://bugs.launchpad.net/bugs/1967067
WCN6855 2.1 will reset to apply firmware downloaded, so wait
a moment for reset done then go ahead to improve stability.

Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
(cherry picked from commit 599ece4f8f073097904d411ee70280a2ec890ad3)
Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ac91baba8342d96f20bfb7e386c39b912ed8a0b0..7d009b1a6c2b788e8d9270c0b6060fb10e1a8e24 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3239,6 +3239,7 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev,
 #define QCA_PATCH_UPDATED      0x80
 #define QCA_DFU_TIMEOUT                3000
 #define QCA_FLAG_MULTI_NVM      0x80
+#define QCA_BT_RESET_WAIT_MS    100
 
 #define WCN6855_2_0_RAM_VERSION_GF 0x400c1200
 #define WCN6855_2_1_RAM_VERSION_GF 0x400c1211
@@ -3565,6 +3566,13 @@ static int btusb_setup_qca(struct hci_dev *hdev)
                err = btusb_setup_qca_load_nvm(hdev, &ver, info);
                if (err < 0)
                        return err;
+
+               /* WCN6855 2.1 will reset to apply firmware downloaded here, so
+                * wait ~100ms for reset Done then go ahead, otherwise, it maybe
+                * cause potential enable failure.
+                */
+               if (info->rom_version == 0x00130201)
+                       msleep(QCA_BT_RESET_WAIT_MS);
        }
 
        return 0;