wifi: Upmerge 3 for 3.1.0 #23458

krish2718 · 2025-07-24T15:14:11Z

Wi-Fi changes for NCS 3.1.0.

NordicBuilder · 2025-07-24T15:16:01Z

The following west manifest projects have changed revision in this Pull Request:

Name	Old Revision	New Revision	Diff
zephyr	nrfconnect/sdk-zephyr@`6736396`	nrfconnect/sdk-zephyr@`9a8c5b0` (`main`)	nrfconnect/[email protected]

✅ All manifest checks OK

Note: This message is automatically posted and updated by the Manifest GitHub Action.

NordicBuilder · 2025-07-24T15:21:05Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 6

Inputs:

Sources:

sdk-nrf: PR head: b45bcff220c9d3e2a553fe66df2226db3e585dd0
zephyr: PR head: 9a8c5b0383549678c6a903190b19c62101243fde

more details

sdk-nrf:

PR head: b45bcff220c9d3e2a553fe66df2226db3e585dd0
merge base: 0bca1f32c56c7c1297d9586c18bb8094012467d0
target head (main): 0bca1f32c56c7c1297d9586c18bb8094012467d0
Diff

zephyr:

PR head: 9a8c5b0383549678c6a903190b19c62101243fde
merge base: 6736396885e1d194efac22e04dc56b2f45774a6d
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (29)

samples
│  ├── wifi
│  │  ├── shell
│  │  │  │ overlay-zperf.conf
│  │  ├── sta
│  │  │  │ overlay-zperf.conf
west.yml
zephyr
│  ├── boards
│  │  ├── nordic
│  │  │  ├── nrf7002dk
│  │  │  │  │ nrf5340_cpuapp_common_pinctrl.dtsi
│  ├── doc
│  │  ├── services
│  │  │  ├── logging
│  │  │  │  │ index.rst
│  ├── drivers
│  │  ├── serial
│  │  │  │ uart_nrfx_uarte.c
│  │  ├── spi
│  │  │  ├── spi_nrfx_spim.c
│  │  │  │ spi_nrfx_spis.c
│  │  ├── wifi
│  │  │  ├── nrf_wifi
│  │  │  │  │ Kconfig.nrfwifi
│  ├── dts
│  │  ├── bindings
│  │  │  ├── serial
│  │  │  │  │ nordic,nrf-uarte.yaml
│  │  │  ├── spi
│  │  │  │  │ nordic,nrf-spi-common.yaml
│  │  │  ├── wifi
│  │  │  │  │ nordic,wlan.yaml
│  │  ├── vendor
│  │  │  ├── nordic
│  │  │  │  │ nrf54l_05_10_15.dtsi
│  ├── include
│  │  ├── zephyr
│  │  │  ├── logging
│  │  │  │  │ log.h
│  │  │  ├── net
│  │  │  │  │ net_core.h
│  ├── modules
│  │  ├── hostap
│  │  │  ├── src
│  │  │  │  │ supp_api.h
│  │  ├── nrf_wifi
│  │  │  ├── os
│  │  │  │  │ shim.c
│  ├── subsys
│  │  ├── logging
│  │  │  │ Kconfig
│  │  ├── net
│  │  │  ├── ip
│  │  │  │  │ net_if.c
│  │  │  ├── l2
│  │  │  │  ├── wifi
│  │  │  │  │  │ Kconfig
│  ├── tests
│  │  ├── drivers
│  │  │  ├── spi
│  │  │  │  ├── spi_controller_peripheral
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_cross_domain.overlay
│  │  │  │  │  │ testcase.yaml
│  │  │  ├── uart
│  │  │  │  ├── uart_elementary
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_cross_domain.overlay
│  │  │  │  │  │ testcase.yaml
│  │  ├── subsys
│  │  │  ├── logging
│  │  │  │  ├── log_ratelimited
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── test_log_ratelimited.c
│  │  │  │  │  │ testcase.yaml
│  │ west.yml

Outputs:

Toolchain

Version: bd39d1676f
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:bd39d1676f_bba2ea5f2e

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister
- sdk-nrf test count: 15
- sdk-zephyr test count: 2731
✅ Integration tests
- ✅ test-sdk-audio
- ✅ test-fw-nrfconnect-chip
- ✅ test-fw-nrfconnect-nfc
- ✅ test-fw-nrfconnect-nrf-iot_cloud
- ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- ✅ test-fw-nrfconnect-nrf-iot_thingy91
- ✅ test-fw-nrfconnect-nrf_crypto
- ✅ test-fw-nrfconnect-rs
- ✅ test-fw-nrfconnect-fem
- ✅ test-fw-nrfconnect-thread-main
- ✅ test-sdk-find-my
- ✅ test-sdk-wifi
- ✅ test-low-level
- ✅ test-sdk-mcuboot
- ✅ test-sdk-dfu
- ⚠️ test-fw-nrfconnect-nrf_lrcs_mosh
- ⚠️ test-fw-nrfconnect-nrf_lrcs_positioning

Disabled integration tests

- desktop52_verification
- doc-internal
- test_ble_nrf_config
- test-fw-nrfconnect-apps
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-ble_samples
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_lwm2m
- test-fw-nrfconnect-nrf-iot_samples
- test-fw-nrfconnect-nrf-iot_serial_lte_modem
- test-fw-nrfconnect-ps-main
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-tfm
- test-sdk-pmic-samples
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

github-actions · 2025-07-24T15:40:06Z

You can find the documentation preview for this PR here.

Wi-Fi upmerge 3 for NCS 3.1.0. Signed-off-by: Chaitanya Tata <[email protected]>

With the newly added ratelimiting the data path prints are rate limiited but still visible on console (default interval is 1/5secs), but as we know that nRF70 has many packet drops, disable the prints altogether. Fix SHEL-3661. Signed-off-by: Chaitanya Tata <[email protected]>

NordicBuilder · 2025-07-28T08:51:18Z

Memory footprint analysis revealed the following potential issues

applications.nrf_desktop.zdebug[nrf52833dk/nrf52833]: RAM size increased by 696[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52820dongle/nrf52820]: RAM size increased by 620[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf52820dongle/nrf52820]: RAM size increased by 620[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 392[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_4llpmconn[nrf52840dongle/nrf52840]: RAM size increased by 992[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_dongle[nrf52840dk/nrf52840]: RAM size increased by 696[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease_fast_pair.keyboard[nrf52kbd/nrf52832]: RAM size increased by 480[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease_fast_pair.keyboard[nrf52kbd/nrf52832]: ROM size increased by 1636[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf52840dongle/nrf52840]: RAM size increased by 696[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf52kbd/nrf52832]: ROM size increased by 1640[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_nrf21540ek_multicore[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 392[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_fast_pair.gmouse[nrf52840gmouse/nrf52840]: RAM size increased by 480[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_fast_pair.gmouse[nrf52840gmouse/nrf52840]: ROM size increased by 2440[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease_fast_pair.gmouse[nrf54l15dk/nrf54l05/cpuapp]: RAM size increased by 280[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52840dongle/nrf52840]: RAM size increased by 696[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52840gmouse/nrf52840]: ROM size increased by 2416[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf5340dk/nrf5340/cpuapp]: RAM size increased by 392[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52kbd/nrf52832]: ROM size increased by 2272[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_dongle.usb_next[nrf52840dk/nrf52840]: RAM size increased by 696[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_mcuboot_smp[nrf52840dk/nrf52840]: RAM size increased by 376[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug.usb_next[nrf52840dongle/nrf52840]: RAM size increased by 696[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf52840gmouse/nrf52840]: ROM size increased by 1840[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug_fast_pair.gmouse.uart.kmu_provision[nrf54l15dk/nrf54l15/cpuapp]: RAM size increased by 456[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zrelease[nrf52833dk/nrf52820]: RAM size increased by 620[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug.usb_next[nrf52840gmouse/nrf52840]: ROM size increased by 2452[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52833dk/nrf52820]: RAM size increased by 620[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52833dongle/nrf52833]: RAM size increased by 696[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)
applications.nrf_desktop.zdebug[nrf52dmouse/nrf52832]: ROM size increased by 2316[B] in comparison to the main[d3f8b02] branch. - link (cc: @nrfconnect/ncs-si-bluebagel)

Note: This message is automatically posted and updated by the CI (latest/sdk-nrf/PR-23458/6)

NordicBuilder · 2025-07-28T09:21:56Z

CI Information

^{To view the history of this post, clich the 'edited' button above}
Build number: 6

Inputs:

Sources:

sdk-nrf: PR head: b45bcff220c9d3e2a553fe66df2226db3e585dd0
zephyr: PR head: 9a8c5b0383549678c6a903190b19c62101243fde

more details

sdk-nrf:

PR head: b45bcff220c9d3e2a553fe66df2226db3e585dd0
merge base: 0bca1f32c56c7c1297d9586c18bb8094012467d0
target head (main): 0bca1f32c56c7c1297d9586c18bb8094012467d0
Diff

zephyr:

PR head: 9a8c5b0383549678c6a903190b19c62101243fde
merge base: 6736396885e1d194efac22e04dc56b2f45774a6d
Diff

Github labels

Enabled	Name	Description
	ci-disabled	Disable the ci execution
	ci-all-test	Run all of ci, no test spec filtering will be done
	ci-force-downstream	Force execution of downstream even if twister fails
	ci-run-twister	Force run twister
	ci-run-zephyr-twister	Force run zephyr twister

List of changed files detected by CI (29)

samples
│  ├── wifi
│  │  ├── shell
│  │  │  │ overlay-zperf.conf
│  │  ├── sta
│  │  │  │ overlay-zperf.conf
west.yml
zephyr
│  ├── boards
│  │  ├── nordic
│  │  │  ├── nrf7002dk
│  │  │  │  │ nrf5340_cpuapp_common_pinctrl.dtsi
│  ├── doc
│  │  ├── services
│  │  │  ├── logging
│  │  │  │  │ index.rst
│  ├── drivers
│  │  ├── serial
│  │  │  │ uart_nrfx_uarte.c
│  │  ├── spi
│  │  │  ├── spi_nrfx_spim.c
│  │  │  │ spi_nrfx_spis.c
│  │  ├── wifi
│  │  │  ├── nrf_wifi
│  │  │  │  │ Kconfig.nrfwifi
│  ├── dts
│  │  ├── bindings
│  │  │  ├── serial
│  │  │  │  │ nordic,nrf-uarte.yaml
│  │  │  ├── spi
│  │  │  │  │ nordic,nrf-spi-common.yaml
│  │  │  ├── wifi
│  │  │  │  │ nordic,wlan.yaml
│  │  ├── vendor
│  │  │  ├── nordic
│  │  │  │  │ nrf54l_05_10_15.dtsi
│  ├── include
│  │  ├── zephyr
│  │  │  ├── logging
│  │  │  │  │ log.h
│  │  │  ├── net
│  │  │  │  │ net_core.h
│  ├── modules
│  │  ├── hostap
│  │  │  ├── src
│  │  │  │  │ supp_api.h
│  │  ├── nrf_wifi
│  │  │  ├── os
│  │  │  │  │ shim.c
│  ├── subsys
│  │  ├── logging
│  │  │  │ Kconfig
│  │  ├── net
│  │  │  ├── ip
│  │  │  │  │ net_if.c
│  │  │  ├── l2
│  │  │  │  ├── wifi
│  │  │  │  │  │ Kconfig
│  ├── tests
│  │  ├── drivers
│  │  │  ├── spi
│  │  │  │  ├── spi_controller_peripheral
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_cross_domain.overlay
│  │  │  │  │  │ testcase.yaml
│  │  │  ├── uart
│  │  │  │  ├── uart_elementary
│  │  │  │  │  ├── boards
│  │  │  │  │  │  │ nrf54l15dk_nrf54l15_cpuapp_cross_domain.overlay
│  │  │  │  │  │ testcase.yaml
│  │  ├── subsys
│  │  │  ├── logging
│  │  │  │  ├── log_ratelimited
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── prj.conf
│  │  │  │  │  ├── test_log_ratelimited.c
│  │  │  │  │  │ testcase.yaml
│  │ west.yml

Outputs:

Toolchain

Version: bd39d1676f
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:bd39d1676f_bba2ea5f2e

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister
- sdk-nrf test count: 15
- sdk-zephyr test count: 2731
🟡 Integration tests
- 🟡 test-sdk-audio
- ✅ test-fw-nrfconnect-chip
- ✅ test-fw-nrfconnect-nfc
- ✅ test-fw-nrfconnect-nrf-iot_cloud
- ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- ✅ test-fw-nrfconnect-nrf-iot_thingy91
- 🟡 test-fw-nrfconnect-nrf_crypto
- ✅ test-fw-nrfconnect-rs
- ✅ test-fw-nrfconnect-fem
- ✅ test-fw-nrfconnect-thread-main
- ✅ test-sdk-find-my
- ✅ test-sdk-wifi
- ✅ test-low-level
- 🟡 test-sdk-mcuboot
- ✅ test-sdk-dfu
- ⚠️ test-fw-nrfconnect-nrf_lrcs_mosh
- ⚠️ test-fw-nrfconnect-nrf_lrcs_positioning

Disabled integration tests

- desktop52_verification
- doc-internal
- test_ble_nrf_config
- test-fw-nrfconnect-apps
- test-fw-nrfconnect-ble_mesh
- test-fw-nrfconnect-ble_samples
- test-fw-nrfconnect-nrf-iot_libmodem-nrf
- test-fw-nrfconnect-nrf-iot_lwm2m
- test-fw-nrfconnect-nrf-iot_samples
- test-fw-nrfconnect-nrf-iot_serial_lte_modem
- test-fw-nrfconnect-ps-main
- test-fw-nrfconnect-rpc
- test-fw-nrfconnect-tfm
- test-sdk-pmic-samples
- test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

krish2718 requested review from a team, D-Triveni, bama-nordic, rado17 and sachinthegreen as code owners July 24, 2025 15:14

github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Jul 24, 2025

NordicBuilder added manifest-zephyr DNM labels Jul 24, 2025

rlubos approved these changes Jul 24, 2025

View reviewed changes

bama-nordic approved these changes Jul 24, 2025

View reviewed changes

krish2718 force-pushed the wifi_upmerge_3 branch from d9445d3 to a78e6ac Compare July 24, 2025 19:06

nordicjm approved these changes Jul 25, 2025

View reviewed changes

sachinthegreen approved these changes Jul 25, 2025

View reviewed changes

krish2718 added 2 commits July 28, 2025 13:00

manifest: sdk-zephyr: Wi-Fi upmerge part 3

df612bd

Wi-Fi upmerge 3 for NCS 3.1.0. Signed-off-by: Chaitanya Tata <[email protected]>

krish2718 force-pushed the wifi_upmerge_3 branch from a78e6ac to b45bcff Compare July 28, 2025 07:30

NordicBuilder removed the DNM label Jul 28, 2025

rlubos merged commit b160827 into nrfconnect:main Jul 28, 2025
13 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

wifi: Upmerge 3 for 3.1.0 #23458

wifi: Upmerge 3 for 3.1.0 #23458

Uh oh!

krish2718 commented Jul 24, 2025

Uh oh!

NordicBuilder commented Jul 24, 2025 •

edited

Loading

Uh oh!

NordicBuilder commented Jul 24, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jul 24, 2025

Uh oh!

NordicBuilder commented Jul 28, 2025

Uh oh!

NordicBuilder commented Jul 28, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

wifi: Upmerge 3 for 3.1.0 #23458

wifi: Upmerge 3 for 3.1.0 #23458

Uh oh!

Conversation

krish2718 commented Jul 24, 2025

Uh oh!

NordicBuilder commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NordicBuilder commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

Uh oh!

github-actions bot commented Jul 24, 2025

Uh oh!

NordicBuilder commented Jul 28, 2025

Memory footprint analysis revealed the following potential issues

Uh oh!

NordicBuilder commented Jul 28, 2025

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

NordicBuilder commented Jul 24, 2025 •

edited

Loading

NordicBuilder commented Jul 24, 2025 •

edited

Loading