69 lines
2.8 KiB
Diff
69 lines
2.8 KiB
Diff
|
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||
|
|
index 3b269060e91f..1360b2163ec5 100644
|
||
|
|
--- a/drivers/bluetooth/btusb.c
|
||
|
|
+++ b/drivers/bluetooth/btusb.c
|
||
|
|
@@ -2174,6 +2174,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 e004ba04a9ae..0fe789f6a653 100644
|
||
|
|
--- 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 bd9eb713b26b..0a7abc817f10 100644
|
||
|
|
--- a/net/bluetooth/hci_sync.c
|
||
|
|
+++ b/net/bluetooth/hci_sync.c
|
||
|
|
@@ -3798,7 +3798,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,
|
||
|
|
@@ -4316,7 +4317,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)
|
||
|
|
@@ -4475,6 +4477,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."),
|