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

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>

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index c79901f2dc2a0483526f36d643fcdc88f3024aae..6213012610d7a40d46dcd33b5417620b2b2551da 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -2851,6 +2851,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 69f491399dac18c17de8fdc029f4fc307fc9b2f0..1ef9279cfd6f10fb2c0eda0e801bbc8be8ef110f 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -1346,7 +1346,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;
@@ -1354,7 +1355,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 f668bde007d47d4cb67dc9b0fc29342a072fda90..fca58984ee4e7a518c95091360ce586dd3f87152 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6876,7 +6876,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);
@@ -6992,6 +6993,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)
 {
@@ -7115,6 +7147,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,