Skip to contentSkip to conversation

Bluetooth: HCI: Fix tracking of advertisement set/instance 0x00

PATCH Superseded Luiz Augusto von Dentz 1 participant 1 message Sep 30, 2025

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH 1/1 Bluetooth: HCI: Fix tracking of advertisement set/instance 0x00

From: Luiz Augusto von Dentz <[email protected]>

This fixes the state tracking of advertisement set/instance 0x00 which is considered a legacy instance and is not tracked individually by adv_instances list, previously it was assumed that hci_dev itself would track it via HCI_LE_ADV but that is a global state not specifc to instance 0x00, so to fix it a new flag is introduced that only tracks the state of instance 0x00.

Fixes 1488af7b8b5f ("Bluetooth: hci_sync: Fix hci_resume_advertising_sync")
---
 include/net/bluetooth/hci.h |  1 +
 net/bluetooth/hci_event.c   | 18 ++++++------------
 net/bluetooth/hci_sync.c    |  7 ++++---
 3 files changed, 11 insertions(+), 15 deletions(-)
include/net/bluetooth/hci.h +1 -0
index 27395779275b..a998f8edbb53 100644
@@ -434,6 +434,7 @@ enum {
 	HCI_USER_CHANNEL,
 	HCI_EXT_CONFIGURED,
 	HCI_LE_ADV,
+	HCI_LE_ADV_0,
 	HCI_LE_PER_ADV,
 	HCI_LE_SCAN,
 	HCI_SSP_ENABLED,
net/bluetooth/hci_event.c +6 -12
index 44b3e936fef2..197002f38bfc 100644
@@ -1609,6 +1609,8 @@ static u8 hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev, void *data,
 
 		if (adv && !adv->periodic)
 			adv->enabled = true;
+		else if (!set->handle)
+			hci_dev_set_flag(hdev, HCI_LE_ADV_0);
 
 		conn = hci_lookup_le_connect(hdev);
 		if (conn)
@@ -1619,6 +1621,8 @@ static u8 hci_cc_le_set_ext_adv_enable(struct hci_dev *hdev, void *data,
 		if (cp->num_of_sets) {
 			if (adv)
 				adv->enabled = false;
+			else if (!set->handle)
+				hci_dev_clear_flag(hdev, HCI_LE_ADV_0);
 
 			/* If just one instance was disabled check if there are
 			 * any other instance enabled before clearing HCI_LE_ADV
@@ -2971,13 +2975,8 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, void *data,
 	if (list_empty(&discov->resolve)) {
 		/* When BR/EDR inquiry is active and no LE scanning is in
 		 * progress, then change discovery state to indicate completion.
-		 *
-		 * When running LE scanning and BR/EDR inquiry simultaneously
-		 * and the LE scan already finished, then change the discovery
-		 * state to indicate completion.
 		 */
-		if (!hci_dev_test_flag(hdev, HCI_LE_SCAN) ||
-		    !hci_test_quirk(hdev, HCI_QUIRK_SIMULTANEOUS_DISCOVERY))
+		if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
 			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
 		goto unlock;
 	}
@@ -2990,13 +2989,8 @@ static void hci_inquiry_complete_evt(struct hci_dev *hdev, void *data,
 	} else {
 		/* When BR/EDR inquiry is active and no LE scanning is in
 		 * progress, then change discovery state to indicate completion.
-		 *
-		 * When running LE scanning and BR/EDR inquiry simultaneously
-		 * and the LE scan already finished, then change the discovery
-		 * state to indicate completion.
 		 */
-		if (!hci_dev_test_flag(hdev, HCI_LE_SCAN) ||
-		    !hci_test_quirk(hdev, HCI_QUIRK_SIMULTANEOUS_DISCOVERY))
+		if (!hci_dev_test_flag(hdev, HCI_LE_SCAN))
 			hci_discovery_set_state(hdev, DISCOVERY_STOPPED);
 	}
 
net/bluetooth/hci_sync.c +4 -3
index eafeaa35d857..e2db065088f6 100644
@@ -2606,9 +2606,10 @@ static int hci_resume_advertising_sync(struct hci_dev *hdev)
 		/* If current advertising instance is set to instance 0x00
 		 * then we need to re-enable it.
 		 */
-		if (!hdev->cur_adv_instance)
-			err = hci_enable_ext_advertising_sync(hdev,
-							      hdev->cur_adv_instance);
+		if (hci_dev_test_and_clear_flag(hdev, HCI_LE_ADV_0)) {
+			bt_dev_err(hdev, "Re-enabling instance 0x00");
+			err = hci_enable_ext_advertising_sync(hdev, 0x00);
+		}
 	} else {
 		/* Schedule for most recent instance to be restarted and begin
 		 * the software rotation loop
Signature · 1 line
2.51.0