Noup changed from upstream pr 93825

.github/workflows/west-commands.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches: [main]
     paths:
+      - .github/workflows/west-commands.yml
       - scripts/west_commands/**
       - scripts/requirements-west-ncs-sbom.txt
       - scripts/requirements-extra.txt
@@ -21,9 +22,6 @@ jobs:
       - name: Install python dependencies
         working-directory: ncs/nrf
         run: |
-          pip3 install -U pip
-          pip3 install -U setuptools
-          pip3 install -U wheel
           pip3 install -U mypy types-colorama types-editdistance types-PyYAML
           grep -E "west==" scripts/requirements-fixed.txt | cut -f1 -d"#" | cut -d ' ' -f '1'| xargs pip3 install -U
           pip3 show -f west
@@ -37,9 +35,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, macos-13, windows-latest]
+        os: [ubuntu-24.04, macos-14, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
+      - name: Setup Python
+        uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5
+        with:
+          python-version: '3.12'
       - name: Checkout sources
         uses: nrfconnect/action-checkout-west-update@main
         with:
@@ -48,7 +50,6 @@ jobs:
       - name: Install requirements
         shell: bash
         run: |
-          python3 -m pip install -U pip
           pip3 install -r nrf/scripts/requirements-west-ncs-sbom.txt
           pip3 install -r nrf/scripts/requirements-extra.txt
       - name: Smoke test ncs-loot & ncs-compare

CODEOWNERS

@@ -122,7 +122,7 @@
 /doc/nrf/libraries/bluetooth/mesh.rst     @nrfconnect/ncs-paladin-doc
 /doc/nrf/libraries/bluetooth/services/fast_pair/ @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/libraries/bluetooth/services/fast_pair.rst @nrfconnect/ncs-si-bluebagel-doc
-/doc/nrf/libraries/bluetooth/services/wifi_prov.rst @nrfconnect/ncs-wifi-doc
+/doc/nrf/libraries/bluetooth/services/wifi_prov_ble.rst @nrfconnect/ncs-wifi-doc
 /doc/nrf/libraries/caf/                   @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
 /doc/nrf/libraries/debug/cpu_load.rst     @nrfconnect/ncs-doc-leads
 /doc/nrf/libraries/debug/etb_trace.rst    @nrfconnect/ncs-cia-doc
@@ -173,6 +173,7 @@
 /doc/nrf/libraries/networking/rest_client.rst @nrfconnect/ncs-iot-positioning-doc
 /doc/nrf/libraries/networking/softap_wifi_provision.rst @nrfconnect/ncs-cia-doc
 /doc/nrf/libraries/networking/wifi_mgmt_ext.rst @nrfconnect/ncs-cia-doc
+/doc/nrf/libraries/networking/wifi_prov_*.rst @nrfconnect/ncs-cia-doc
 /doc/nrf/libraries/networking/wifi_ready.rst @nrfconnect/ncs-wifi-doc
 /doc/nrf/libraries/nfc/                   @nrfconnect/ncs-si-muffin-doc
 /doc/nrf/libraries/nrf_rpc/index.rst      @nrfconnect/ncs-si-muffin-doc
@@ -540,6 +541,7 @@
 /samples/tfm/                             @nrfconnect/ncs-aegir
 /samples/wifi/provisioning/ble/           @wentong-li @bama-nordic
 /samples/wifi/provisioning/softap/        @nrfconnect/ncs-cia
+/samples/wifi/provisioning/internal/      @krish2718 @rado17
 /samples/wifi/radio_test/                 @bama-nordic @sachinthegreen
 /samples/wifi/scan/                       @D-Triveni @bama-nordic
 /samples/wifi/shell/                      @nrfconnect/ncs-co-networking @krish2718 @sachinthegreen @rado17

Jenkinsfile

@@ -1,4 +1,4 @@
-@Library("CI_LIB") _
+@Library("CI_LIB@v3.1-branch") _
 
 def pipeline = new ncs.sdk_nrf.Main()
 

VERSION

@@ -1 +1 @@
-3.0.99
+3.1.0-rc1

applications/ipc_radio/prj.conf

@@ -7,3 +7,4 @@
 CONFIG_SERIAL=n
 CONFIG_UART_CONSOLE=n
 CONFIG_LOG=n
+CONFIG_TIMESLICE_SIZE=0

applications/matter_bridge/sysbuild/ipc_radio/prj.conf

@@ -40,3 +40,6 @@ CONFIG_IPC_SERVICE=y
 # ipc_radio
 CONFIG_IPC_RADIO_BT=y
 CONFIG_IPC_RADIO_BT_HCI_IPC=y
+
+# Workaround for the spinlock assertion issue.
+CONFIG_TIMESLICE_SIZE=0

applications/matter_weather_station/prj.conf

@@ -75,6 +75,7 @@ CONFIG_SHELL_LOG_BACKEND=y
 # Configure USB CDC ACM
 CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n
 CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather"
+CONFIG_USB_DEVICE_VID=0x1915
 CONFIG_USB_DEVICE_PID=0x530D
 CONFIG_UART_LINE_CTRL=y
 CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51

applications/matter_weather_station/sysbuild/ipc_radio/prj.conf

@@ -51,3 +51,6 @@ CONFIG_IPC_RADIO_BT_HCI_IPC=y
 # that is pulled in by NETCORE_IPC_RADIO_IEEE802154 in application's Kconfig.sysbuild.
 # For Wi-Fi builds, this option will not get applied anyway.
 CONFIG_NRF_802154_ENCRYPTION=y
+
+# Workaround for the spinlock assertion issue.
+CONFIG_TIMESLICE_SIZE=0

applications/nrf5340_audio/src/audio/audio_datapath.c

@@ -87,7 +87,7 @@ LOG_MODULE_REGISTER(audio_datapath, CONFIG_AUDIO_DATAPATH_LOG_LEVEL);
 #define JUST_IN_TIME_BOUND_US	   2500
 
 /* How often to print under-run warning */
-#define UNDERRUN_LOG_INTERVAL_BLKS 5000
+#define LOG_INTERVAL_BLKS 5000
 
 NET_BUF_POOL_FIXED_DEFINE(pool_i2s_rx, FIFO_NUM_BLKS, BLK_STEREO_SIZE_OCTETS,
 			  sizeof(struct audio_metadata), NULL);
@@ -247,7 +247,7 @@ static void drift_comp_state_set(enum drift_comp_state new_state)
  *
  * @param	frame_start_ts_us	I2S frame start timestamp.
  */
-static void audio_datapath_drift_compensation(uint32_t frame_start_ts_us)
+static inline void audio_datapath_drift_compensation(uint32_t frame_start_ts_us)
 {
 	if (CONFIG_AUDIO_DEV == HEADSET) {
 		/** For headsets we do not use the timestamp gotten from hci_tx_sync_get to adjust
@@ -580,7 +580,7 @@ static struct {
  * @retval	0 if success.
  * @retval	-ENOMEM No available buffers.
  */
-static int alt_buffer_get(void **p_buffer)
+static inline int alt_buffer_get(void **p_buffer)
 {
 	if (!alt.buf_0_in_use) {
 		alt.buf_0_in_use = true;
@@ -601,7 +601,7 @@ static int alt_buffer_get(void **p_buffer)
  *
  * @param	p_buffer	Buffer to free.
  */
-static void alt_buffer_free(void const *const p_buffer)
+static inline void alt_buffer_free(void const *const p_buffer)
 {
 	if (p_buffer == alt.buf_0) {
 		alt.buf_0_in_use = false;
@@ -619,6 +619,14 @@ static void alt_buffer_free_both(void)
 	alt.buf_1_in_use = false;
 }
 
+static struct audio_metadata i2s_meta = {.data_coding = PCM,
+					 .data_len_us = 1000,
+					 .sample_rate_hz = CONFIG_AUDIO_SAMPLE_RATE_HZ,
+					 .bits_per_sample = CONFIG_AUDIO_BIT_DEPTH_BITS,
+					 .carried_bits_per_sample = CONFIG_AUDIO_BIT_DEPTH_BITS,
+					 .locations = BT_AUDIO_LOCATION_FRONT_LEFT |
+						      BT_AUDIO_LOCATION_FRONT_RIGHT,
+					 .bad_data = false};
 /*
  * This handler function is called every time I2S needs new buffers for
  * TX and RX data.
@@ -632,8 +640,10 @@ static void alt_buffer_free_both(void)
 static void audio_datapath_i2s_blk_complete(uint32_t frame_start_ts_us, uint32_t *rx_buf_released,
 					    uint32_t const *tx_buf_released)
 {
-	int ret;
-	static bool underrun_condition;
+	int ret = 0;
+	static uint32_t num_calls;
+
+	num_calls++;
 
 	alt_buffer_free(tx_buf_released);
 
@@ -645,83 +655,77 @@ static void audio_datapath_i2s_blk_complete(uint32_t frame_start_ts_us, uint32_t
 	static uint8_t *tx_buf;
 
 	if (IS_ENABLED(CONFIG_STREAM_BIDIRECTIONAL) || (CONFIG_AUDIO_DEV == HEADSET)) {
-		if (tx_buf_released != NULL) {
-			/* Double buffered index */
-			uint32_t next_out_blk_idx = NEXT_IDX(ctrl_blk.out.cons_blk_idx);
-
-			if (next_out_blk_idx != ctrl_blk.out.prod_blk_idx) {
-				/* Only increment if not in under-run condition */
-				ctrl_blk.out.cons_blk_idx = next_out_blk_idx;
-				if (underrun_condition) {
-					underrun_condition = false;
-					LOG_WRN("Data received, total under-runs: %d",
-						ctrl_blk.out.total_blk_underruns);
-				}
+		static bool underrun_condition;
 
-				tx_buf = (uint8_t *)&ctrl_blk.out
-						 .fifo[next_out_blk_idx * BLK_STEREO_NUM_SAMPS];
+		if (tx_buf_released == NULL) {
+			ERR_CHK_MSG(-ENOMEM, "No TX data available");
+		}
 
-			} else {
-				if (stream_state_get() == STATE_STREAMING) {
-					underrun_condition = true;
-					ctrl_blk.out.total_blk_underruns++;
+		/* Double buffered index */
+		uint32_t next_out_blk_idx = NEXT_IDX(ctrl_blk.out.cons_blk_idx);
 
-					if ((ctrl_blk.out.total_blk_underruns %
-					     UNDERRUN_LOG_INTERVAL_BLKS) == 0) {
-						LOG_WRN("In I2S TX under-run condition, total: %d",
-							ctrl_blk.out.total_blk_underruns);
-					}
-				}
+		if (next_out_blk_idx != ctrl_blk.out.prod_blk_idx) {
+			/* Only increment if not in under-run condition */
+			ctrl_blk.out.cons_blk_idx = next_out_blk_idx;
+			if (underrun_condition) {
+				underrun_condition = false;
+				LOG_WRN("Data received, total under-runs: %d",
+					ctrl_blk.out.total_blk_underruns);
+			}
 
-				/*
-				 * No data available in out.fifo
-				 * use alternative buffers
-				 */
-				ret = alt_buffer_get((void **)&tx_buf);
-				ERR_CHK(ret);
+			tx_buf = (uint8_t *)&ctrl_blk.out
+					 .fifo[next_out_blk_idx * BLK_STEREO_NUM_SAMPS];
 
-				memset(tx_buf, 0, BLK_STEREO_SIZE_OCTETS);
-			}
+		} else {
+			if (stream_state_get() == STATE_STREAMING) {
+				underrun_condition = true;
+				ctrl_blk.out.total_blk_underruns++;
 
-			if (tone_active) {
-				tone_mix(tx_buf);
+				if ((ctrl_blk.out.total_blk_underruns % LOG_INTERVAL_BLKS) == 0) {
+					LOG_WRN("In I2S TX under-run condition, total: %d",
+						ctrl_blk.out.total_blk_underruns);
+				}
 			}
+
+			/*
+			 * No data available in out.fifo
+			 * use alternative buffers
+			 */
+			ret = alt_buffer_get((void **)&tx_buf);
+			ERR_CHK(ret);
+
+			memset(tx_buf, 0, BLK_STEREO_SIZE_OCTETS);
+		}
+
+		if (tone_active) {
+			tone_mix(tx_buf);
 		}
 	}
 
 	/********** I2S RX **********/
-	static int prev_ret;
 	struct net_buf *rx_audio_block = NULL;
+	static uint32_t num_overruns;
+	static uint32_t num_overruns_last_printed;
 
 	if (IS_ENABLED(CONFIG_STREAM_BIDIRECTIONAL) || (CONFIG_AUDIO_DEV == GATEWAY)) {
 		if (rx_buf_released == NULL) {
-			/* No RX data available */
 			ERR_CHK_MSG(-ENOMEM, "No RX data available");
 		}
 
 		if (k_msgq_num_free_get(ctrl_blk.in.audio_q) == 0 || pool_i2s_rx.avail_count == 0) {
-			ret = -ENOMEM;
-		} else {
-			ret = 0;
-		}
-
-		/* If RX FIFO is filled up */
-		if (ret == -ENOMEM) {
+			/* If RX FIFO is filled up */
+			num_overruns++;
 			struct net_buf *stale_i2s_data;
-
-			if (ret != prev_ret) {
-				LOG_WRN("I2S RX overrun. Single msg");
-				prev_ret = ret;
-			}
-
 			ret = k_msgq_get(ctrl_blk.in.audio_q, (void *)&stale_i2s_data, K_NO_WAIT);
 			ERR_CHK(ret);
-
+			/* Discard data */
 			net_buf_unref(stale_i2s_data);
+		}
 
-		} else if (ret == 0 && prev_ret == -ENOMEM) {
-			LOG_WRN("I2S RX continuing stream");
-			prev_ret = ret;
+		if ((num_calls % LOG_INTERVAL_BLKS == 0) &&
+		    (num_overruns != num_overruns_last_printed)) {
+			LOG_WRN("I2S RX overrun count: %d", num_overruns);
+			num_overruns_last_printed = num_overruns;
 		}
 
 		rx_audio_block = net_buf_alloc(&pool_i2s_rx, K_NO_WAIT);
@@ -732,16 +736,9 @@ static void audio_datapath_i2s_blk_complete(uint32_t frame_start_ts_us, uint32_t
 		/* Store RX buffer in net_buf */
 		net_buf_add_mem(rx_audio_block, rx_buf_released, BLK_STEREO_SIZE_OCTETS);
 
+		/* Store I2S related metadata */
 		struct audio_metadata *meta = net_buf_user_data(rx_audio_block);
-
-		/* Add meta data */
-		meta->data_coding = PCM;
-		meta->data_len_us = 1000;
-		meta->sample_rate_hz = CONFIG_AUDIO_SAMPLE_RATE_HZ;
-		meta->bits_per_sample = CONFIG_AUDIO_BIT_DEPTH_BITS;
-		meta->carried_bits_per_sample = CONFIG_AUDIO_BIT_DEPTH_BITS;
-		meta->locations = BT_AUDIO_LOCATION_FRONT_LEFT | BT_AUDIO_LOCATION_FRONT_RIGHT;
-		meta->bad_data = false;
+		*meta = i2s_meta;
 
 		ret = k_msgq_put(ctrl_blk.in.audio_q, (void *)&rx_audio_block, K_NO_WAIT);
 		ERR_CHK_MSG(ret, "Unable to put RX audio block into queue");
@@ -770,11 +767,11 @@ static void audio_datapath_i2s_start(void)
 	if (IS_ENABLED(CONFIG_STREAM_BIDIRECTIONAL) || (CONFIG_AUDIO_DEV == HEADSET)) {
 		ctrl_blk.out.cons_blk_idx = PREV_IDX(ctrl_blk.out.cons_blk_idx);
 		tx_buf_0 = (uint8_t *)&ctrl_blk.out
-				     .fifo[ctrl_blk.out.cons_blk_idx * BLK_STEREO_NUM_SAMPS];
+				   .fifo[ctrl_blk.out.cons_blk_idx * BLK_STEREO_NUM_SAMPS];
 
 		ctrl_blk.out.cons_blk_idx = PREV_IDX(ctrl_blk.out.cons_blk_idx);
 		tx_buf_1 = (uint8_t *)&ctrl_blk.out
-				     .fifo[ctrl_blk.out.cons_blk_idx * BLK_STEREO_NUM_SAMPS];
+				   .fifo[ctrl_blk.out.cons_blk_idx * BLK_STEREO_NUM_SAMPS];
 	}
 
 	/* Start I2S */

applications/nrf5340_audio/src/audio/sw_codec_select.c

@@ -250,15 +250,30 @@ int sw_codec_decode(struct net_buf const *const audio_frame, void **decoded_data
 				}
 			}
 
-			/* For now, i2s is only stereo, so in order to send
-			 * just one channel, we need to insert 0 for the
-			 * other channel
-			 */
-			ret = pscm_zero_pad(pcm_in_data_ptrs[0], pcm_size_mono,
-					    m_config.decoder.audio_ch, CONFIG_AUDIO_BIT_DEPTH_BITS,
-					    pcm_data_stereo, &pcm_size_stereo);
-			if (ret) {
-				return ret;
+			if (IS_ENABLED(CONFIG_STREAM_BIDIRECTIONAL) &&
+			    (CONFIG_AUDIO_DEV == GATEWAY)) {
+				/* If we are receieving mono audio on the gateway, we send it out
+				 * as stereo, so we need to pad the mono data to stereo.
+				 */
+				ret = pscm_copy_pad(pcm_in_data_ptrs[0], pcm_size_mono,
+						    CONFIG_AUDIO_BIT_DEPTH_BITS, pcm_data_stereo,
+						    &pcm_size_stereo);
+				if (ret) {
+					LOG_ERR("Failed to copy pad mono to stereo: %d", ret);
+					return ret;
+				}
+			} else {
+				/* For now, i2s is only stereo, so in order to send
+				 * just one channel, we need to insert 0 for the
+				 * other channel
+				 */
+				ret = pscm_zero_pad(pcm_in_data_ptrs[0], pcm_size_mono,
+						    m_config.decoder.audio_ch,
+						    CONFIG_AUDIO_BIT_DEPTH_BITS, pcm_data_stereo,
+						    &pcm_size_stereo);
+				if (ret) {
+					return ret;
+				}
 			}
 			break;
 		}

applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf

@@ -7,7 +7,6 @@
 CONFIG_PM=n
 
 CONFIG_MAIN_STACK_SIZE=10240
-CONFIG_MBEDTLS_CFG_FILE="mcuboot-mbedtls-cfg.h"
 
 CONFIG_BOOT_SWAP_SAVE_ENCTLV=n
 CONFIG_BOOT_ENCRYPT_IMAGE=n