Bluetooth: Add new quirk for broken local ext features page 2

[ Upstream commit 8194f1ef5a815aea815a91daf2c721eab2674f1f ]

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>
Signed-off-by: Bastian Germann <bage@debian.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 7a381fcef939d77776313e87c23f953d758426a3..f80ae7d23734287627aeb6764ca897bba56400a9 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -294,6 +294,13 @@ enum {
         * during the hdev->setup vendor callback.
         */
        HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG,
+
+       /* 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_FEATURES_PAGE_2,
 };
 
 /* HCI device flags */

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 42a3a19b111e3788be05c742fcbbcfe558f44f08..21416ccc30ab2aed7efd4c469211520d776da3c4 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -881,8 +881,13 @@ static u8 hci_cc_read_local_ext_features(struct hci_dev *hdev, void *data,
        if (rp->status)
                return rp->status;
 
-       if (hdev->max_page < rp->max_page)
-               hdev->max_page = rp->max_page;
+       if (hdev->max_page < rp->max_page) {
+               if (test_bit(HCI_QUIRK_BROKEN_LOCAL_EXT_FEATURES_PAGE_2,
+                            &hdev->quirks))
+                       bt_dev_warn(hdev, "broken local ext features page 2");
+               else
+                       hdev->max_page = rp->max_page;
+       }
 
        if (rp->page < HCI_MAX_PAGES)
                memcpy(hdev->features[rp->page], rp->features, 8);