Bluetooth: btrtl: Ask ic_info to drop firmware

Some un-support wakeup platforms keep USB power and suspend signal
is coming late, this makes Realtek some chip keep its firmware,
and make it never load new firmware.

So use vendor specific HCI command to ask them drop its firmware after
system shutdown or resume.

Signed-off-by: Hilda Wu <[email protected]>
Signed-off-by: Marcel Holtmann <[email protected]>

diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 08582effb25ec1d8c2ac3e36754c191a040af504..c2bdd1e6060e83f4ee5542d3c2a7a088833be3ba 100644 (file)
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -601,8 +601,10 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
        hci_rev = le16_to_cpu(resp->hci_rev);
        lmp_subver = le16_to_cpu(resp->lmp_subver);
 
        hci_rev = le16_to_cpu(resp->hci_rev);
        lmp_subver = le16_to_cpu(resp->lmp_subver);
 

-       if (resp->hci_ver == 0x8 && le16_to_cpu(resp->hci_rev) == 0x826c &&
-           resp->lmp_ver == 0x8 && le16_to_cpu(resp->lmp_subver) == 0xa99e)
+       btrtl_dev->ic_info = btrtl_match_ic(lmp_subver, hci_rev, hci_ver,
+                                           hdev->bus);
+
+       if (!btrtl_dev->ic_info)

                btrtl_dev->drop_fw = true;
 
        if (btrtl_dev->drop_fw) {
                btrtl_dev->drop_fw = true;
 
        if (btrtl_dev->drop_fw) {


@@ -641,13 +643,13 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev,
                hci_ver = resp->hci_ver;
                hci_rev = le16_to_cpu(resp->hci_rev);
                lmp_subver = le16_to_cpu(resp->lmp_subver);
                hci_ver = resp->hci_ver;
                hci_rev = le16_to_cpu(resp->hci_rev);
                lmp_subver = le16_to_cpu(resp->lmp_subver);

+
+               btrtl_dev->ic_info = btrtl_match_ic(lmp_subver, hci_rev, hci_ver,
+                                                   hdev->bus);

        }
 out_free:
        kfree_skb(skb);
 
        }
 out_free:
        kfree_skb(skb);
 

-       btrtl_dev->ic_info = btrtl_match_ic(lmp_subver, hci_rev, hci_ver,
-                                           hdev->bus);
-

        if (!btrtl_dev->ic_info) {
                rtl_dev_info(hdev, "unknown IC info, lmp subver %04x, hci rev %04x, hci ver %04x",
                            lmp_subver, hci_rev, hci_ver);
        if (!btrtl_dev->ic_info) {
                rtl_dev_info(hdev, "unknown IC info, lmp subver %04x, hci rev %04x, hci ver %04x",
                            lmp_subver, hci_rev, hci_ver);