Bluetooth: Add new quirks for ATS2851

[ Upstream commit 94464a7b71634037b13d54021e0dfd0fb0d8c1f0 ]

This adds quirks for broken extended create connection,
and write auth payload timeout.

Signed-off-by: Danil Pylaev <danstiv404@gmail.com>
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 a1864cff616aee5338cf41072f73746a558321b0..5bb4eaa52e14cff4ab5c3f82ff8caf10afedbf28 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -301,6 +301,20 @@ enum {
         */
        HCI_QUIRK_BROKEN_SET_RPA_TIMEOUT,
 
+       /*
+        * When this quirk is set, the HCI_OP_LE_EXT_CREATE_CONN command is
+        * disabled. This is required for the Actions Semiconductor ATS2851
+        * based controllers, which erroneously claims to support it.
+        */
+       HCI_QUIRK_BROKEN_EXT_CREATE_CONN,
+
+       /*
+        * When this quirk is set, the command WRITE_AUTH_PAYLOAD_TIMEOUT is
+        * skipped. This is required for the Actions Semiconductor ATS2851
+        * based controllers, due to a race condition in pairing process.
+        */
+       HCI_QUIRK_BROKEN_WRITE_AUTH_PAYLOAD_TIMEOUT,
+
        /* When this quirk is set, MSFT extension monitor tracking by
         * address filter is supported. Since tracking quantity of each
         * pattern is limited, this feature supports tracking multiple

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 4c185a08c3a3af36ac9f4ec8dfdb64605305b605..c95f7e6ba2551403a174746cad0519f3e6cc50a8 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1934,8 +1934,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
                           !test_bit(HCI_QUIRK_BROKEN_EXT_SCAN, &(dev)->quirks))
 
 /* Use ext create connection if command is supported */
-#define use_ext_conn(dev) ((dev)->commands[37] & 0x80)
-
+#define use_ext_conn(dev) (((dev)->commands[37] & 0x80) && \
+       !test_bit(HCI_QUIRK_BROKEN_EXT_CREATE_CONN, &(dev)->quirks))
 /* Extended advertising support */
 #define ext_adv_capable(dev) (((dev)->le_features[1] & HCI_LE_EXT_ADV))
 
@@ -1948,8 +1948,10 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
  * C24: Mandatory if the LE Controller supports Connection State and either
  * LE Feature (LL Privacy) or LE Feature (Extended Advertising) is supported
  */
-#define use_enhanced_conn_complete(dev) (ll_privacy_capable(dev) || \
-                                        ext_adv_capable(dev))
+#define use_enhanced_conn_complete(dev) ((ll_privacy_capable(dev) || \
+                                        ext_adv_capable(dev)) && \
+                                        !test_bit(HCI_QUIRK_BROKEN_EXT_CREATE_CONN, \
+                                                &(dev)->quirks))
 
 /* Periodic advertising support */
 #define per_adv_capable(dev) (((dev)->le_features[1] & HCI_LE_PERIODIC_ADV))