tests: bsim: Bluetooth: Testing BIG create and sync using LL interface

Update the bsim BIS tests to check BIG create and sync using
LL interface.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>

tests/bsim/bluetooth/ll/bis/Kconfig

@@ -0,0 +1,11 @@
+# Copyright 2024 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config TEST_LL_INTERFACE
+	bool "Test Broadcast ISO using internal LL interface"
+	help
+	  Test Broadcast ISO using internal LL interface.
+
+menu "Zephyr Kernel"
+source "Kconfig.zephyr"
+endmenu

tests/bsim/bluetooth/ll/bis/overlay-ll_interface.conf

@@ -0,0 +1 @@
+CONFIG_TEST_LL_INTERFACE=y

tests/bsim/bluetooth/ll/bis/src/main.c

@@ -60,6 +60,8 @@ static uint8_t chan_map[] = { 0x1F, 0XF1, 0x1F, 0xF1, 0x1F };
 static bool volatile is_iso_connected;
 static uint8_t volatile is_iso_disconnected;
 static bool volatile deleting_pa_sync;
+
+#if !defined(CONFIG_TEST_LL_INTERFACE)
 static void iso_connected(struct bt_iso_chan *chan);
 static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason);
 static void iso_recv(struct bt_iso_chan *chan,
@@ -193,6 +195,7 @@ static void iso_send(struct k_work *work)
 
 	k_work_schedule(&iso_send_work, K_USEC(9970));
 }
+#endif /* !CONFIG_TEST_LL_INTERFACE */
 
 static void setup_ext_adv(struct bt_le_ext_adv **adv)
 {
@@ -261,7 +264,7 @@ static void teardown_ext_adv(struct bt_le_ext_adv *adv)
 	printk("success.\n");
 }
 
-#if TEST_LL_INTERFACE
+#if defined(CONFIG_TEST_LL_INTERFACE)
 static void create_ll_big(uint8_t big_handle, struct bt_le_ext_adv *adv)
 {
 	uint16_t max_sdu = CONFIG_BT_CTLR_ADV_ISO_PDU_LEN_MAX;
@@ -303,8 +306,8 @@ static void terminate_ll_big(uint8_t big_handle)
 	}
 	printk("success.\n");
 }
-#endif /* TEST_LL_INTERFACE */
 
+#else /* !CONFIG_TEST_LL_INTERFACE */
 static void create_big(struct bt_le_ext_adv *adv, struct bt_iso_big **big)
 {
 	struct bt_iso_big_create_param big_create_param = { 0 };
@@ -337,6 +340,26 @@ static void create_big(struct bt_le_ext_adv *adv, struct bt_iso_big **big)
 	printk("ISO connected\n");
 }
 
+static void terminate_big(struct bt_iso_big *big)
+{
+	int err;
+
+	printk("Terminating BIG...\n");
+	err = bt_iso_big_terminate(big);
+	if (err) {
+		FAIL("Could not terminate BIG: %d\n", err);
+		return;
+	}
+	printk("success.\n");
+
+	printk("Wait for ISO disconnected callback...");
+	while (is_iso_disconnected == 0U) {
+		k_sleep(K_MSEC(100));
+	}
+	printk("ISO disconnected\n");
+}
+#endif /* !CONFIG_TEST_LL_INTERFACE */
+
 #if defined(CONFIG_BT_ISO_TEST_PARAMS)
 static void create_advanced_big(struct bt_le_ext_adv *adv, struct bt_iso_big **big)
 {
@@ -378,29 +401,9 @@ static void create_advanced_big(struct bt_le_ext_adv *adv, struct bt_iso_big **b
 }
 #endif /* CONFIG_BT_ISO_TEST_PARAMS */
 
-static void terminate_big(struct bt_iso_big *big)
-{
-	int err;
-
-	printk("Terminating BIG...\n");
-	err = bt_iso_big_terminate(big);
-	if (err) {
-		FAIL("Could not terminate BIG: %d\n", err);
-		return;
-	}
-	printk("success.\n");
-
-	printk("Wait for ISO disconnected callback...");
-	while (is_iso_disconnected == 0U) {
-		k_sleep(K_MSEC(100));
-	}
-	printk("ISO disconnected\n");
-}
-
 static void test_iso_main(void)
 {
 	struct bt_le_ext_adv *adv;
-	struct bt_iso_big *big;
 	int err;
 
 	printk("\n*ISO broadcast test*\n");
@@ -415,16 +418,19 @@ static void test_iso_main(void)
 
 	setup_ext_adv(&adv);
 
-#if TEST_LL_INTERFACE
+#if defined(CONFIG_TEST_LL_INTERFACE)
 	uint8_t big_handle = 0;
 
 	create_ll_big(big_handle, adv);
-#endif
+
+#else /* !CONFIG_TEST_LL_INTERFACE */
+	struct bt_iso_big *big;
 
 	create_big(adv, &big);
 
 	k_work_init_delayable(&iso_send_work, iso_send);
 	k_work_schedule(&iso_send_work, K_NO_WAIT);
+#endif /* !CONFIG_TEST_LL_INTERFACE */
 
 	k_sleep(K_MSEC(5000));
 
@@ -459,11 +465,11 @@ static void test_iso_main(void)
 
 	k_sleep(K_MSEC(5000));
 
-	k_work_cancel_delayable(&iso_send_work);
+#if defined(CONFIG_TEST_LL_INTERFACE)
-
-#if TEST_LL_INTERFACE
 	terminate_ll_big(big_handle);
-#endif
+
+#else /* !CONFIG_TEST_LL_INTERFACE */
+	k_work_cancel_delayable(&iso_send_work);
 
 	terminate_big(big);
 	big = NULL;
@@ -477,6 +483,7 @@ static void test_iso_main(void)
 	terminate_big(big);
 	big = NULL;
 #endif /* CONFIG_BT_ISO_TEST_PARAMS */
+#endif /* !CONFIG_TEST_LL_INTERFACE */
 
 	k_sleep(K_MSEC(10000));
 
@@ -499,6 +506,7 @@ static const char *phy2str(uint8_t phy)
 	}
 }
 
+#if !defined(CONFIG_TEST_LL_INTERFACE)
 /** Print data as d_0 d_1 d_2 ... d_(n-2) d_(n-1) d_(n) to show the 3 first and 3 last octets
  *
  * Examples:
@@ -585,6 +593,7 @@ static void iso_disconnected(struct bt_iso_chan *chan, uint8_t reason)
 
 	is_iso_disconnected = reason;
 }
+#endif /* !CONFIG_TEST_LL_INTERFACE */
 
 static bool volatile is_sync;
 
@@ -819,18 +828,17 @@ static void test_iso_recv_main(void)
 	}
 	printk("success.\n");
 
-#if TEST_LL_INTERFACE
+#if defined(CONFIG_TEST_LL_INTERFACE)
-	printk("Creating BIG Sync...");
 	uint8_t bcode[BT_ISO_BROADCAST_CODE_SIZE] = { 0 };
 	uint16_t sync_timeout = 10;
+	uint8_t bis[1] = { 0x01, };
 	uint8_t big_handle = 0;
-	uint8_t bis_handle = 0;
 	uint8_t encryption = 0;
-	uint8_t bis_count = 1; /* TODO: Add support for multiple BIS per BIG */
 	uint8_t mse = 0;
 
+	printk("Creating BIG Sync...");
 	err = ll_big_sync_create(big_handle, sync->handle, encryption, bcode,
-				 mse, sync_timeout, bis_count, &bis_handle);
+				 mse, sync_timeout, ARRAY_SIZE(bis), bis);
 	if (err) {
 		FAIL("Could not create BIG sync: %d\n", err);
 		return;
@@ -839,16 +847,6 @@ static void test_iso_recv_main(void)
 
 	k_sleep(K_MSEC(5000));
 
-	printk("Deleting Periodic Advertising Sync...");
-	deleting_pa_sync = true;
-	err = bt_le_per_adv_sync_delete(sync);
-	if (err) {
-		FAIL("Failed to delete periodic advertising sync (err %d)\n",
-		     err);
-		return;
-	}
-	printk("success.\n");
-
 	printk("Terminating BIG Sync...");
 	struct node_rx_pdu *node_rx = NULL;
 	err = ll_big_sync_terminate(big_handle, (void **)&node_rx);
@@ -866,7 +864,7 @@ static void test_iso_recv_main(void)
 
 	printk("Creating BIG Sync after terminate...");
 	err = ll_big_sync_create(big_handle, sync->handle, encryption, bcode,
-				 mse, sync_timeout, bis_count, &bis_handle);
+				 mse, sync_timeout, ARRAY_SIZE(bis), bis);
 	if (err) {
 		FAIL("Could not create BIG sync: %d\n", err);
 		return;
@@ -886,7 +884,18 @@ static void test_iso_recv_main(void)
 		node_rx->hdr.next = NULL;
 		ll_rx_mem_release((void **)&node_rx);
 	}
-#else
+
+	printk("Deleting Periodic Advertising Sync...");
+	deleting_pa_sync = true;
+	err = bt_le_per_adv_sync_delete(sync);
+	if (err) {
+		FAIL("Failed to delete periodic advertising sync (err %d)\n",
+		     err);
+		return;
+	}
+	printk("success.\n");
+
+#else /* !CONFIG_TEST_LL_INTERFACE */
 	struct bt_iso_big_sync_param big_param = { 0, };
 	struct bt_iso_big *big;
 
@@ -998,7 +1007,6 @@ static void test_iso_recv_main(void)
 		return;
 	}
 	printk("success.\n");
-#endif
 
 	for (int chan = 0; chan < CONFIG_BT_ISO_MAX_CHAN; chan++) {
 		if (expected_seq_num[chan] < SEQ_NUM_MAX) {
@@ -1007,6 +1015,7 @@ static void test_iso_recv_main(void)
 			return;
 		}
 	}
+#endif /* !CONFIG_TEST_LL_INTERFACE */
 
 	PASS("ISO recv test Passed\n");
 

tests/bsim/bluetooth/ll/bis/tests_scripts/broadcast_iso_ll_interface.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Copyright 2020 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+source ${ZEPHYR_BASE}/tests/bsim/sh_common.source
+
+# Basic ISO broadcast test: a broadcaster transmits a BIS and a receiver listens
+# to the BIS.
+simulation_id="broadcast_iso_ll_interface"
+verbosity_level=2
+
+cd ${BSIM_OUT_PATH}/bin
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf_overlay-ll_interface_conf \
+  -v=${verbosity_level} -s=${simulation_id} -d=0 -testid=receive
+
+Execute ./bs_${BOARD_TS}_tests_bsim_bluetooth_ll_bis_prj_conf_overlay-ll_interface_conf \
+  -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=broadcast
+
+Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
+  -D=2 -sim_length=30e6 $@
+
+wait_for_background_jobs

tests/bsim/bluetooth/ll/compile.sh

@@ -22,8 +22,8 @@ app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_low_lat.conf compile
 app=tests/bsim/bluetooth/ll/conn conf_file=prj_split_single_timer.conf compile
 
 app=tests/bsim/bluetooth/ll/bis compile
-app=tests/bsim/bluetooth/ll/bis \
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-ll_interface.conf compile
-  conf_overlay=overlay-ticker_expire_info.conf compile
+app=tests/bsim/bluetooth/ll/bis conf_overlay=overlay-ticker_expire_info.conf compile
 app=tests/bsim/bluetooth/ll/bis conf_file=prj_vs_dp.conf compile
 
 app=tests/bsim/bluetooth/ll/edtt/hci_test_app \