Bluetooth: btusb: Fix CSR clones again by re-adding ERR_DATA_REPORTING quirk

A patch series by a Qualcomm engineer essentially removed my
quirk/workaround because they thought it was unnecessary.

It wasn't, and it broke everything again:

https://patchwork.kernel.org/project/netdevbpf/list/?series=661703&archive=both&state=*

He argues that the quirk is not necessary because the code should check
if the dongle says if it's supported or not. The problem is that for
these Chinese CSR clones they say that it would work:

= New Index: 00:00:00:00:00:00 (Primary,USB,hci0)
= Open Index: 00:00:00:00:00:00
< HCI Command: Read Local Version Information (0x04|0x0001) plen 0
> HCI Event: Command Complete (0x0e) plen 12
> [hci0] 11.276039
      Read Local Version Information (0x04|0x0001) ncmd 1
        Status: Success (0x00)
        HCI version: Bluetooth 5.0 (0x09) - Revision 2064 (0x0810)
        LMP version: Bluetooth 5.0 (0x09) - Subversion 8978 (0x2312)
        Manufacturer: Cambridge Silicon Radio (10)
...
< HCI Command: Read Local Supported Features (0x04|0x0003) plen 0
> HCI Event: Command Complete (0x0e) plen 68
> [hci0] 11.668030
      Read Local Supported Commands (0x04|0x0002) ncmd 1
        Status: Success (0x00)
        Commands: 163 entries
          ...
          Read Default Erroneous Data Reporting (Octet 18 - Bit 2)
          Write Default Erroneous Data Reporting (Octet 18 - Bit 3)
          ...
...
< HCI Command: Read Default Erroneous Data Reporting (0x03|0x005a) plen 0
= Close Index: 00:1A:7D:DA:71:XX

So bring it back wholesale.

Fixes: 63b1a7dd38bf ("Bluetooth: hci_sync: Remove HCI_QUIRK_BROKEN_ERR_DATA_REPORTING")
Fixes: e168f6900877 ("Bluetooth: btusb: Remove HCI_QUIRK_BROKEN_ERR_DATA_REPORTING for fake CSR")
Fixes: 766ae2422b43 ("Bluetooth: hci_sync: Check LMP feature bit instead of quirk")
Cc: stable@vger.kernel.org
Cc: Zijun Hu <quic_zijuhu@quicinc.com>
Cc: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Tested-by: Ismael Ferreras Morezuelas <swyterzone@gmail.com>
Signed-off-by: Ismael Ferreras Morezuelas <swyterzone@gmail.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 271963805a3841498c3a8bde4d999c45d5ec2a7b..59d947dec36e54346de44c7e61707bd1072e2875 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2118,6 +2118,7 @@ static int btusb_setup_csr(struct hci_dev *hdev)
                 * without these the controller will lock up.
                 */
                set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, &hdev->quirks);
+               set_bit(HCI_QUIRK_BROKEN_ERR_DATA_REPORTING, &hdev->quirks);
                set_bit(HCI_QUIRK_BROKEN_FILTER_CLEAR_ALL, &hdev->quirks);
                set_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks);
 

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index e004ba04a9ae16b7cac00f3c6d9f2a8ad9807cd8..0fe789f6a653416e77e7a950c80280a695311873 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -228,6 +228,17 @@ enum {
         */
        HCI_QUIRK_VALID_LE_STATES,
 
+       /* When this quirk is set, then erroneous data reporting
+        * is ignored. This is mainly due to the fact that the HCI
+        * Read Default Erroneous Data Reporting command is advertised,
+        * but not supported; these controllers often reply with unknown
+        * command and tend to lock up randomly. Needing a hard reset.
+        *
+        * This quirk can be set before hci_register_dev is called or
+        * during the hdev->setup vendor callback.
+        */
+       HCI_QUIRK_BROKEN_ERR_DATA_REPORTING,
+
        /*
         * When this quirk is set, then the hci_suspend_notifier is not
         * registered. This is intended for devices which drop completely

diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 76c3107c9f91f4172612fe9bb5145ee458f6c576..a91145e167f2b6636d49fa686d80f42de27b280b 100644 (file)
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -3780,7 +3780,8 @@ static int hci_read_page_scan_activity_sync(struct hci_dev *hdev)
 static int hci_read_def_err_data_reporting_sync(struct hci_dev *hdev)
 {
        if (!(hdev->commands[18] & 0x04) ||
-           !(hdev->features[0][6] & LMP_ERR_DATA_REPORTING))
+           !(hdev->features[0][6] & LMP_ERR_DATA_REPORTING) ||
+           test_bit(HCI_QUIRK_BROKEN_ERR_DATA_REPORTING, &hdev->quirks))
                return 0;
 
        return __hci_cmd_sync_status(hdev, HCI_OP_READ_DEF_ERR_DATA_REPORTING,
@@ -4298,7 +4299,8 @@ static int hci_set_err_data_report_sync(struct hci_dev *hdev)
        bool enabled = hci_dev_test_flag(hdev, HCI_WIDEBAND_SPEECH_ENABLED);
 
        if (!(hdev->commands[18] & 0x08) ||
-           !(hdev->features[0][6] & LMP_ERR_DATA_REPORTING))
+           !(hdev->features[0][6] & LMP_ERR_DATA_REPORTING) ||
+           test_bit(HCI_QUIRK_BROKEN_ERR_DATA_REPORTING, &hdev->quirks))
                return 0;
 
        if (enabled == hdev->err_data_reporting)
@@ -4457,6 +4459,9 @@ static const struct {
        HCI_QUIRK_BROKEN(STORED_LINK_KEY,
                         "HCI Delete Stored Link Key command is advertised, "
                         "but not supported."),
+       HCI_QUIRK_BROKEN(ERR_DATA_REPORTING,
+                        "HCI Read Default Erroneous Data Reporting command is "
+                        "advertised, but not supported."),
        HCI_QUIRK_BROKEN(READ_TRANSMIT_POWER,
                         "HCI Read Transmit Power Level command is advertised, "
                         "but not supported."),