Bluetooth: hci_event: Add support for handling LE BIG Sync Lost event

[ Upstream commit b2a5f2e1c127cb431df22e114998ff72eb4578c8 ]

When the BIS source stops, the controller sends an LE BIG Sync Lost
event (subevent 0x1E). Currently, this event is not handled, causing
the BIS stream to remain active in BlueZ and preventing recovery.

Signed-off-by: Yang Li <yang.li@amlogic.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 5796ca9fe5da38985a9f039ab98fd8628be85b54..8fa82987313424d871677a4cbdb52245c59c59b1 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -2852,6 +2852,12 @@ struct hci_evt_le_big_sync_estabilished {
        __le16  bis[];
 } __packed;
 
+#define HCI_EVT_LE_BIG_SYNC_LOST 0x1e
+struct hci_evt_le_big_sync_lost {
+       __u8    handle;
+       __u8    reason;
+} __packed;
+
 #define HCI_EVT_LE_BIG_INFO_ADV_REPORT 0x22
 struct hci_evt_le_big_info_adv_report {
        __le16  sync_handle;

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c371dadc6fa3e998bd50cced740d4c7893fbe349..f22881bf1b392a2e2effeb526c00eb379f6101c0 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1352,7 +1352,8 @@ hci_conn_hash_lookup_big_sync_pend(struct hci_dev *hdev,
 }
 
 static inline struct hci_conn *
-hci_conn_hash_lookup_big_state(struct hci_dev *hdev, __u8 handle,  __u16 state)
+hci_conn_hash_lookup_big_state(struct hci_dev *hdev, __u8 handle, __u16 state,
+                              __u8 role)
 {
        struct hci_conn_hash *h = &hdev->conn_hash;
        struct hci_conn  *c;
@@ -1360,7 +1361,7 @@ hci_conn_hash_lookup_big_state(struct hci_dev *hdev, __u8 handle,  __u16 state)
        rcu_read_lock();
 
        list_for_each_entry_rcu(c, &h->list, list) {
-               if (c->type != BIS_LINK || c->state != state)
+               if (c->type != BIS_LINK || c->state != state || c->role != role)
                        continue;
 
                if (handle == c->iso_qos.bcast.big) {

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 4f379184df5b1b6851ef57eeecf8768f4444213b..f5cd935490ad976ee1de098e382afa2ddd8ae228 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -2146,7 +2146,8 @@ struct hci_conn *hci_bind_bis(struct hci_dev *hdev, bdaddr_t *dst, __u8 sid,
        struct hci_link *link;
 
        /* Look for any BIS that is open for rebinding */
-       conn = hci_conn_hash_lookup_big_state(hdev, qos->bcast.big, BT_OPEN);
+       conn = hci_conn_hash_lookup_big_state(hdev, qos->bcast.big, BT_OPEN,
+                                             HCI_ROLE_MASTER);
        if (conn) {
                memcpy(qos, &conn->iso_qos, sizeof(*qos));
                conn->state = BT_CONNECTED;

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index c1dd8d78701fe505d54fbabea7e96d01a7286f3b..b83995898da098ab5038701847c300a6466c4946 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6880,7 +6880,8 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
 
        /* Connect all BISes that are bound to the BIG */
        while ((conn = hci_conn_hash_lookup_big_state(hdev, ev->handle,
-                                                     BT_BOUND))) {
+                                                     BT_BOUND,
+                                                     HCI_ROLE_MASTER))) {
                if (ev->status) {
                        hci_connect_cfm(conn, ev->status);
                        hci_conn_del(conn);
@@ -6996,6 +6997,37 @@ unlock:
        hci_dev_unlock(hdev);
 }
 
+static void hci_le_big_sync_lost_evt(struct hci_dev *hdev, void *data,
+                                    struct sk_buff *skb)
+{
+       struct hci_evt_le_big_sync_lost *ev = data;
+       struct hci_conn *bis, *conn;
+
+       bt_dev_dbg(hdev, "big handle 0x%2.2x", ev->handle);
+
+       hci_dev_lock(hdev);
+
+       /* Delete the pa sync connection */
+       bis = hci_conn_hash_lookup_pa_sync_big_handle(hdev, ev->handle);
+       if (bis) {
+               conn = hci_conn_hash_lookup_pa_sync_handle(hdev,
+                                                          bis->sync_handle);
+               if (conn)
+                       hci_conn_del(conn);
+       }
+
+       /* Delete each bis connection */
+       while ((bis = hci_conn_hash_lookup_big_state(hdev, ev->handle,
+                                                    BT_CONNECTED,
+                                                    HCI_ROLE_SLAVE))) {
+               clear_bit(HCI_CONN_BIG_SYNC, &bis->flags);
+               hci_disconn_cfm(bis, ev->reason);
+               hci_conn_del(bis);
+       }
+
+       hci_dev_unlock(hdev);
+}
+
 static void hci_le_big_info_adv_report_evt(struct hci_dev *hdev, void *data,
                                           struct sk_buff *skb)
 {
@@ -7119,6 +7151,11 @@ static const struct hci_le_ev {
                     hci_le_big_sync_established_evt,
                     sizeof(struct hci_evt_le_big_sync_estabilished),
                     HCI_MAX_EVENT_SIZE),
+       /* [0x1e = HCI_EVT_LE_BIG_SYNC_LOST] */
+       HCI_LE_EV_VL(HCI_EVT_LE_BIG_SYNC_LOST,
+                    hci_le_big_sync_lost_evt,
+                    sizeof(struct hci_evt_le_big_sync_lost),
+                    HCI_MAX_EVENT_SIZE),
        /* [0x22 = HCI_EVT_LE_BIG_INFO_ADV_REPORT] */
        HCI_LE_EV_VL(HCI_EVT_LE_BIG_INFO_ADV_REPORT,
                     hci_le_big_info_adv_report_evt,