Upmerge 2025.04.23

.github/workflows/compliance.yml

@@ -66,7 +66,9 @@ jobs:
         git log --pretty=oneline | head -n 10
         # For now we run KconfigBasic, but we should transition to Kconfig
         $ZEPHYR_BASE/scripts/ci/check_compliance.py --annotate -e Kconfig \
-        -e KconfigBasicNoModules -e ClangFormat -e Ruff -c origin/${BASE_REF}..
+        -e KconfigBasicNoModules -e ClangFormat -e Ruff \
+        -e SysbuildKconfig -e SysbuildKconfigBasic -e SysbuildKconfigBasicNoModules \
+        -c origin/${BASE_REF}..
 
     - name: upload-results
       uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4

.github/workflows/docbuild.yml

@@ -66,8 +66,8 @@ jobs:
       - name: Build documentation
         working-directory: ncs/nrf
         run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            BUILD_CONF="-DNO_DTS_BINDINGS=ON"
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            BUILD_CONF="-DDTS_BINDINGS=ON -DHW_FEATURES=ON"
           fi
 
           cmake -GNinja -Bdoc/_build -Sdoc -DSPHINXOPTS_EXTRA="-q" ${BUILD_CONF}

Kconfig.nrf

@@ -80,10 +80,6 @@ config MCUMGR_TRANSPORT_NETBUF_SIZE
 	default 2475 if MCUMGR_TRANSPORT_BT_REASSEMBLY
 	default 1024 if UPDATEABLE_IMAGE_NUMBER > 1
 
-# When using HCI on the nRF5340 we need a larger command buffer.
-config BT_BUF_CMD_TX_COUNT
-	default 10 if SOC_COMPATIBLE_NRF5340_CPUAPP || SOC_COMPATIBLE_NRF5340_CPUNET
-
 config INIT_ARCH_HW_AT_BOOT
 	default y
 	help
@@ -104,9 +100,6 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 	  chosen Zephyr flash devicetree node to ensure that swapping can be
 	  performed.
 
-config GETOPT
-	default n
-
 # Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54L20 Eng A/nRF7120 FLPR core
 config FLASH_BASE_ADDRESS
 	hex

applications/connectivity_bridge/boards/thingy91_nrf52840.conf

@@ -18,6 +18,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
 CONFIG_BT_CTLR_RX_BUFFERS=10
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
@@ -37,4 +38,7 @@ CONFIG_DP_DRIVER=y
 CONFIG_CMSIS_DAP_DEVICE_VENDOR="Nordic Semiconductor ASA"
 CONFIG_CMSIS_DAP_DEVICE_NAME="nrf91"
 
-CONFIG_USB_CDC_ACM_RINGBUF_SIZE=15360
+CONFIG_USB_CDC_ACM_RINGBUF_SIZE=12280
+
+# Reduce logging to save flash space
+CONFIG_LOG_MAX_LEVEL=1

applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf

@@ -17,6 +17,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251
 CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251

applications/nrf5340_audio/broadcast_sink/main.c

@@ -35,6 +35,11 @@ struct ble_iso_data {
 
 static uint32_t last_broadcast_id = BRDCAST_ID_NOT_USED;
 
+static struct zbus_observer_node zbus_obs_node_button;
+static struct zbus_observer_node zbus_obs_node_audio;
+static struct zbus_observer_node zbus_obs_node_volume;
+static struct zbus_observer_node zbus_obs_node_mgmt;
+
 ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
 
 ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -459,25 +464,29 @@ static int zbus_link_producers_observers(void)
 		return -ENOTSUP;
 	}
 
-	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add button sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add le_audio sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&volume_chan, &volume_evt_sub, &zbus_obs_node_volume,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add add volume sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_sub, &zbus_obs_node_mgmt,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add bt_mgmt sub");
 		return ret;

applications/nrf5340_audio/broadcast_sink/overlay-broadcast_sink.conf

@@ -26,6 +26,7 @@ CONFIG_MBEDTLS_ENABLE_HEAP=y
 CONFIG_MBEDTLS_HEAP_SIZE=2048
 
 CONFIG_BT_BUF_ACL_TX_COUNT=18
+CONFIG_BT_BUF_EVT_RX_COUNT=20
 
 CONFIG_BT_PERIPHERAL_PREF_MIN_INT=64
 CONFIG_BT_PERIPHERAL_PREF_MAX_INT=69
@@ -41,6 +42,7 @@ CONFIG_BT_BAP_BROADCAST_SNK_STREAM_COUNT=2
 CONFIG_BT_BAP_BROADCAST_SNK_COUNT=2
 CONFIG_BT_ISO_MAX_CHAN=2
 CONFIG_BT_ISO_MAX_BIG=2
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 
 ## PACS related configs ##
 CONFIG_BT_PAC_SNK_NOTIFIABLE=y

applications/nrf5340_audio/broadcast_source/main.c

@@ -24,6 +24,11 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main, CONFIG_MAIN_LOG_LEVEL);
 
+static struct zbus_observer_node zbus_obs_node_ref;
+static struct zbus_observer_node zbus_obs_node_button;
+static struct zbus_observer_node zbus_obs_node_audio;
+static struct zbus_observer_node zbus_obs_node_mgmt;
+
 ZBUS_SUBSCRIBER_DEFINE(button_evt_sub, CONFIG_BUTTON_MSG_SUB_QUEUE_SIZE);
 
 ZBUS_MSG_SUBSCRIBER_DEFINE(le_audio_evt_sub);
@@ -271,7 +276,8 @@ static int zbus_subscribers_create(void)
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&sdu_ref_chan, &sdu_ref_msg_listen, &zbus_obs_node_ref,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add timestamp listener");
 		return ret;
@@ -329,19 +335,22 @@ static int zbus_link_producers_observers(void)
 		return -ENOTSUP;
 	}
 
-	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&button_chan, &button_evt_sub, &zbus_obs_node_button,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add button sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&le_audio_chan, &le_audio_evt_sub, &zbus_obs_node_audio,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add le_audio sub");
 		return ret;
 	}
 
-	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, ZBUS_ADD_OBS_TIMEOUT_MS);
+	ret = zbus_chan_add_obs(&bt_mgmt_chan, &bt_mgmt_evt_listen, &zbus_obs_node_mgmt,
+				ZBUS_ADD_OBS_TIMEOUT_MS);
 	if (ret) {
 		LOG_ERR("Failed to add bt_mgmt listener");
 		return ret;

applications/nrf5340_audio/broadcast_source/overlay-broadcast_source.conf

@@ -23,6 +23,7 @@ CONFIG_BT_BAP_BROADCAST_SRC_STREAM_COUNT=2
 CONFIG_BT_ISO_MAX_CHAN=2
 
 CONFIG_BT_ISO_MAX_BIG=2
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
 
 CONFIG_LC3_ENC_CHAN_MAX=2
 CONFIG_ENTROPY_GENERATOR=y

applications/nrf5340_audio/src/bluetooth/bt_management/advertising/Kconfig

@@ -67,6 +67,19 @@ config BLE_ACL_ADV_SID
 	range 0x00 0x0F
 	default 0x00
 
+config BT_MGMT_ADV_STACK_SIZE
+	int "Stack size"
+	default 1024
+	help
+	  Stack size for the Bluetooth management advertising thread.
+
+config BT_MGMT_ADV_THREAD_PRIO
+	int "Thread priority for bt_mgmt advertising"
+	default 5
+	help
+	  This is a preemptible thread.
+	  This thread will subscribe to BT management advertising work items.
+
 #----------------------------------------------------------------------------#
 menu "Log level"
 

applications/nrf5340_audio/src/bluetooth/bt_management/advertising/bt_mgmt_adv.c

@@ -16,6 +16,9 @@
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(bt_mgmt_adv, CONFIG_BT_MGMT_ADV_LOG_LEVEL);
 
+struct k_work_q adv_work_q;
+K_THREAD_STACK_DEFINE(adv_work_q_stack_area, CONFIG_BT_MGMT_ADV_STACK_SIZE);
+
 ZBUS_CHAN_DECLARE(bt_mgmt_chan);
 
 #ifndef CONFIG_BT_MAX_PAIRED
@@ -417,7 +420,7 @@ int bt_mgmt_adv_start(uint8_t ext_adv_index, const struct bt_data *adv, size_t a
 			LOG_ERR("No space in the queue for adv_index");
 			return -ENOMEM;
 		}
-		k_work_submit(&adv_work);
+		k_work_submit_to_queue(&adv_work_q, &adv_work);
 
 		return 0;
 	}
@@ -465,12 +468,16 @@ int bt_mgmt_adv_start(uint8_t ext_adv_index, const struct bt_data *adv, size_t a
 		LOG_ERR("No space in the queue for adv_index");
 		return -ENOMEM;
 	}
-	k_work_submit(&adv_work);
+	k_work_submit_to_queue(&adv_work_q, &adv_work);
 
 	return 0;
 }
 
 void bt_mgmt_adv_init(void)
 {
 	k_work_init(&adv_work, advertising_process);
+	k_work_queue_init(&adv_work_q);
+	k_work_queue_start(&adv_work_q, adv_work_q_stack_area,
+			   K_THREAD_STACK_SIZEOF(adv_work_q_stack_area),
+			   CONFIG_BT_MGMT_ADV_THREAD_PRIO, NULL);
 }

applications/nrf5340_audio/src/bluetooth/bt_stream/broadcast/broadcast_sink.c

@@ -762,6 +762,10 @@ int broadcast_sink_enable(le_audio_receive_cb recv_cb)
 	int ret;
 	static bool initialized;
 	enum audio_channel channel;
+	const struct bt_pacs_register_param pacs_param = {
+		.snk_pac = true,
+		.snk_loc = true,
+	};
 
 	if (initialized) {
 		LOG_WRN("Already initialized");
@@ -777,6 +781,12 @@ int broadcast_sink_enable(le_audio_receive_cb recv_cb)
 
 	channel_assignment_get(&channel);
 
+	ret = bt_pacs_register(&pacs_param);
+	if (ret) {
+		LOG_ERR("Could not register PACS (err %d)\n", ret);
+		return ret;
+	}
+
 	if (channel == AUDIO_CH_L) {
 		ret = bt_pacs_set_location(BT_AUDIO_DIR_SINK, BT_AUDIO_LOCATION_FRONT_LEFT);
 		csip_param.rank = CSIP_HL_RANK;

applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/Kconfig.defaults

@@ -35,6 +35,9 @@ config BT_BUF_ACL_RX_SIZE
 	default 502 if (AUDIO_DFU > 0)
 	default 259
 
+config BT_BUF_EVT_RX_COUNT
+	default 14
+
 config BT_BUF_ACL_TX_COUNT
 	default 12
 

applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c

@@ -649,6 +649,13 @@ int unicast_server_enable(le_audio_receive_cb recv_cb, enum bt_audio_location lo
 {
 	int ret;
 	static bool initialized;
+	/* clang-format off */
+	const struct bt_pacs_register_param pacs_param = {
+		IF_ENABLED(CONFIG_BT_AUDIO_RX, (.snk_pac = true,))
+		IF_ENABLED(CONFIG_BT_AUDIO_RX, (.snk_loc = true,))
+		IF_ENABLED(CONFIG_BT_AUDIO_TX, (.src_pac = true,))
+		IF_ENABLED(CONFIG_BT_AUDIO_TX, (.src_loc = true,))};
+	/* clang-format on */
 
 	__ASSERT(strlen(CONFIG_BT_SET_IDENTITY_RESOLVING_KEY) == BT_CSIP_SIRK_SIZE,
 		 "SIRK incorrect size, must be 16 bytes");
@@ -681,10 +688,16 @@ int unicast_server_enable(le_audio_receive_cb recv_cb, enum bt_audio_location lo
 		memcpy(csip_param.sirk, CONFIG_BT_SET_IDENTITY_RESOLVING_KEY, BT_CSIP_SIRK_SIZE);
 	}
 
+	ret = bt_pacs_register(&pacs_param);
+	if (ret) {
+		printk("Could not register PACS (err %d)\n", ret);
+		return ret;
+	}
+
 	for (int i = 0; i < ARRAY_SIZE(caps); i++) {
 		ret = bt_pacs_cap_register(caps_dirs[i], &caps[i]);
 		if (ret) {
-			LOG_ERR("Capability register failed. Err: %d", ret);
+			LOG_ERR("Capability register failed. Err: %d (%d)", ret, i);
 			return ret;
 		}
 	}
@@ -716,30 +729,33 @@ int unicast_server_enable(le_audio_receive_cb recv_cb, enum bt_audio_location lo
 		}
 	}
 
-	ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT);
+	if (IS_ENABLED(CONFIG_BT_AUDIO_RX)) {
+		ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT);
 
-	if (ret) {
-		LOG_ERR("Supported context set failed. Err: %d", ret);
-		return ret;
-	}
+		if (ret) {
+			LOG_ERR("Supported context set failed (sink). Err: %d", ret);
+			return ret;
+		}
 
-	ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT);
-	if (ret) {
-		LOG_ERR("Available context set failed. Err: %d", ret);
-		return ret;
+		ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SINK, AVAILABLE_SINK_CONTEXT);
+		if (ret) {
+			LOG_ERR("Available context set failed (sink). Err: %d", ret);
+			return ret;
+		}
 	}
 
-	ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT);
-
-	if (ret) {
-		LOG_ERR("Supported context set failed. Err: %d", ret);
-		return ret;
-	}
+	if (IS_ENABLED(CONFIG_BT_AUDIO_TX)) {
+		ret = bt_pacs_set_supported_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT);
+		if (ret) {
+			LOG_ERR("Supported context set failed (source). Err: %d", ret);
+			return ret;
+		}
 
-	ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT);
-	if (ret) {
-		LOG_ERR("Available context set failed. Err: %d", ret);
-		return ret;
+		ret = bt_pacs_set_available_contexts(BT_AUDIO_DIR_SOURCE, AVAILABLE_SOURCE_CONTEXT);
+		if (ret) {
+			LOG_ERR("Available context set failed (source). Err: %d", ret);
+			return ret;
+		}
 	}
 
 	for (int i = 0; i < ARRAY_SIZE(cap_audio_streams); i++) {