54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
|
From f60f1605f5056d543e49fc625ffeeb05621f2ad3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vasily Khoruzhick
|
||
|
|
Date: Wed, 31 Oct 2018 19:40:18 -0700
|
||
|
|
Subject: Bluetooth: Add new quirk for broken local ext features max_page
|
||
|
|
|
||
|
|
Some adapters (e.g. RTL8723CS) advertise that they have more than
|
||
|
|
2 pages for local ext features, but they don't support any features
|
||
|
|
declared in these pages. RTL8723CS reports max_page = 2 and declares
|
||
|
|
support for sync train and secure connection, but it responds with
|
||
|
|
either garbage or with error in status on corresponding commands.
|
||
|
|
|
||
|
|
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
|
||
|
|
---
|
||
|
|
include/net/bluetooth/hci.h | 7 +++++++
|
||
|
|
net/bluetooth/hci_event.c | 4 +++-
|
||
|
|
2 files changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
|
||
|
|
index 16ab6ce87883..8e4c16210d18 100644
|
||
|
|
--- a/include/net/bluetooth/hci.h
|
||
|
|
+++ b/include/net/bluetooth/hci.h
|
||
|
|
@@ -238,6 +238,13 @@ enum {
|
||
|
|
* HCI after resume.
|
||
|
|
*/
|
||
|
|
HCI_QUIRK_NO_SUSPEND_NOTIFIER,
|
||
|
|
+
|
||
|
|
+ /* When this quirk is set, max_page for local extended features
|
||
|
|
+ * is set to 1, even if controller reports higher number. Some
|
||
|
|
+ * controllers (e.g. RTL8723CS) report more pages, but they
|
||
|
|
+ * don't actually support features declared there.
|
||
|
|
+ */
|
||
|
|
+ HCI_QUIRK_BROKEN_LOCAL_EXT_FTR_MAX_PAGE,
|
||
|
|
};
|
||
|
|
|
||
|
|
/* HCI device flags */
|
||
|
|
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
|
||
|
|
index cfeaee347db3..df3232828978 100644
|
||
|
|
--- a/net/bluetooth/hci_event.c
|
||
|
|
+++ b/net/bluetooth/hci_event.c
|
||
|
|
@@ -700,7 +700,9 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
|
||
|
|
if (rp->status)
|
||
|
|
return;
|
||
|
|
|
||
|
|
- if (hdev->max_page < rp->max_page)
|
||
|
|
+ if (!test_bit(HCI_QUIRK_BROKEN_LOCAL_EXT_FTR_MAX_PAGE,
|
||
|
|
+ &hdev->quirks) &&
|
||
|
|
+ hdev->max_page < rp->max_page)
|
||
|
|
hdev->max_page = rp->max_page;
|
||
|
|
|
||
|
|
if (rp->page < HCI_MAX_PAGES)
|
||
|
|
--
|
||
|
|
cgit v1.2.3
|
||
|
|
|