Merge tag 'fixes-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-microblaze.git] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 4f1cd80..6ffa89e 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -203,6 +203,23 @@ static void hci_acl_create_connection(struct hci_conn *conn)
 
        BT_DBG("hcon %p", conn);
 
+       /* Many controllers disallow HCI Create Connection while it is doing
+        * HCI Inquiry. So we cancel the Inquiry first before issuing HCI Create
+        * Connection. This may cause the MGMT discovering state to become false
+        * without user space's request but it is okay since the MGMT Discovery
+        * APIs do not promise that discovery should be done forever. Instead,
+        * the user space monitors the status of MGMT discovering and it may
+        * request for discovery again when this flag becomes false.
+        */
+       if (test_bit(HCI_INQUIRY, &hdev->flags)) {
+               /* Put this connection to "pending" state so that it will be
+                * executed after the inquiry cancel command complete event.
+                */
+               conn->state = BT_CONNECT2;
+               hci_send_cmd(hdev, HCI_OP_INQUIRY_CANCEL, 0, NULL);
+               return;
+       }
+
        conn->state = BT_CONNECT;
        conn->out = true;
        conn->role = HCI_ROLE_MASTER;
@@ -276,6 +293,20 @@ static void hci_add_sco(struct hci_conn *conn, __u16 handle)
        hci_send_cmd(hdev, HCI_OP_ADD_SCO, sizeof(cp), &cp);
 }
 
+static bool find_next_esco_param(struct hci_conn *conn,
+                                const struct sco_param *esco_param, int size)
+{
+       for (; conn->attempt <= size; conn->attempt++) {
+               if (lmp_esco_2m_capable(conn->link) ||
+                   (esco_param[conn->attempt - 1].pkt_type & ESCO_2EV3))
+                       break;
+               BT_DBG("hcon %p skipped attempt %d, eSCO 2M not supported",
+                      conn, conn->attempt);
+       }
+
+       return conn->attempt <= size;
+}
+
 bool hci_setup_sync(struct hci_conn *conn, __u16 handle)
 {
        struct hci_dev *hdev = conn->hdev;
@@ -297,13 +328,15 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle)
 
        switch (conn->setting & SCO_AIRMODE_MASK) {
        case SCO_AIRMODE_TRANSP:
-               if (conn->attempt > ARRAY_SIZE(esco_param_msbc))
+               if (!find_next_esco_param(conn, esco_param_msbc,
+                                         ARRAY_SIZE(esco_param_msbc)))
                        return false;
                param = &esco_param_msbc[conn->attempt - 1];
                break;
        case SCO_AIRMODE_CVSD:
                if (lmp_esco_capable(conn->link)) {
-                       if (conn->attempt > ARRAY_SIZE(esco_param_cvsd))
+                       if (!find_next_esco_param(conn, esco_param_cvsd,
+                                                 ARRAY_SIZE(esco_param_cvsd)))
                                return false;
                        param = &esco_param_cvsd[conn->attempt - 1];
                } else {