55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 52dda4dc60ae6b10bd719308e7ef03cf2c8ae6a7 Mon Sep 17 00:00:00 2001
|
|
From: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
Date: Wed, 31 Oct 2018 19:40:18 -0700
|
|
Subject: [PATCH 302/478] 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 b80415011dcd..715577a600a7 100644
|
|
--- a/include/net/bluetooth/hci.h
|
|
+++ b/include/net/bluetooth/hci.h
|
|
@@ -247,6 +247,13 @@ enum {
|
|
*/
|
|
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,
|
|
+
|
|
/*
|
|
* When this quirk is set, LE tx power is not queried on startup
|
|
* and the min/max tx power values default to HCI_TX_POWER_INVALID.
|
|
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
|
|
index 0bca035bf2dc..0958898900ed 100644
|
|
--- a/net/bluetooth/hci_event.c
|
|
+++ b/net/bluetooth/hci_event.c
|
|
@@ -725,7 +725,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)
|
|
--
|
|
2.35.3
|
|
|