Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upmerge 16.05.2024 #15351

Merged
merged 39 commits into from
May 28, 2024
Merged

Upmerge 16.05.2024 #15351

merged 39 commits into from
May 28, 2024

Conversation

rlubos
Copy link
Contributor

@rlubos rlubos commented May 16, 2024 •
edited
Loading

Pull upmerged sdk-zephyr and sdk-mcuboot repositories.

test-sdk-nrf: sdk-nrf-pr-15351
test_ble: DRGN-22017_upmerge-16-05-2024
test_rs: KRKNWK-19014-upmerge-20240516
test-sdk-sidewalk: sdk-nrf-pr-15351

@rlubos rlubos added CI-all-test Run All integration tests CI-force-downstream labels May 16, 2024
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels May 16, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented May 16, 2024 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
find-my https://github.com/nrfconnect/sdk-find-my/commit/8e41fe781000e0b03dc2d75f129599b374b8d7cd https://github.com/nrfconnect/sdk-find-my/commit/813003d38bf5fab56daed9e055ddf0d03d2489a3 (main) nrfconnect/[email protected]
matter nrfconnect/sdk-connectedhomeip@78d81b4 nrfconnect/sdk-connectedhomeip@28ebd43 (master) nrfconnect/[email protected]
mcuboot nrfconnect/sdk-mcuboot@f67a11a nrfconnect/sdk-mcuboot@f1e1675 (main) nrfconnect/[email protected]
sidewalk nrfconnect/sdk-sidewalk@94f3d07 nrfconnect/sdk-sidewalk@50a9f47 nrfconnect/[email protected]
trusted-firmware-m nrfconnect/sdk-trusted-firmware-m@39a386c nrfconnect/sdk-trusted-firmware-m@92a5b4f (main) nrfconnect/[email protected]
zephyr nrfconnect/sdk-zephyr@41095df nrfconnect/sdk-zephyr@a1769ab (main) nrfconnect/[email protected]

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

@NordicBuilder
Copy link
Contributor

NordicBuilder commented May 16, 2024 •
edited
Loading

Test specification

CI/Jenkins/NRF

  • Integration Platforms

CI/Jenkins/integration

Test Module File based changes Manually selected West overwrite
desktop52_verification X X
test-fw-nrfconnect-apps X X
test-fw-nrfconnect-ble X X
test-fw-nrfconnect-ble_mesh X X
test-fw-nrfconnect-ble_samples X X
test-fw-nrfconnect-boot X X
test-fw-nrfconnect-chip X X
test-fw-nrfconnect-fem X X
test-fw-nrfconnect-nfc X X
test-fw-nrfconnect-nrf-iot_cloud X X
test-fw-nrfconnect-nrf-iot_libmodem-nrf X X
test-fw-nrfconnect-nrf-iot_lwm2m X X
test-fw-nrfconnect-nrf-iot_mosh X X
test-fw-nrfconnect-nrf-iot_nrf_provisioning X
test-fw-nrfconnect-nrf-iot_positioning X X
test-fw-nrfconnect-nrf-iot_samples X X
test-fw-nrfconnect-nrf-iot_serial_lte_modem X X
test-fw-nrfconnect-nrf-iot_thingy91 X X
test-fw-nrfconnect-nrf-iot_zephyr_lwm2m X X
test-fw-nrfconnect-nrf_crypto X X
test-fw-nrfconnect-proprietary_esb X X
test-fw-nrfconnect-rpc X X
test-fw-nrfconnect-rs X X
test-fw-nrfconnect-tfm X X
test-fw-nrfconnect-thread X X
test-fw-nrfconnect-zigbee X X
test-low-level X X
test-sdk-audio X X
test-sdk-dfu X X
test-sdk-find-my X X
test-sdk-mcuboot X X
test-sdk-pmic-samples X X
test-sdk-sidewalk X X
test-sdk-wifi X X

test-fw-nrfconnect-boot: added because there was no .github/test-spec.yml in 'mcuboot'
test-fw-nrfconnect-chip: added because there was no .github/test-spec.yml in 'matter'
test-fw-nrfconnect-tfm: added because there was no .github/test-spec.yml in 'trusted-firmware-m'
test-sdk-find-my: added because there was no .github/test-spec.yml in 'find-my'
test-sdk-mcuboot: added because there was no .github/test-spec.yml in 'mcuboot'
test-sdk-sidewalk: added because there was no .github/test-spec.yml in 'sidewalk'
All integration tests: added because 'CI-all-test' was added manually

Detailed information of selected test modules

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

@github-actions github-actions bot added the doc-required PR must not be merged without tech writer approval. label May 16, 2024
@rlubos rlubos force-pushed the upmerge-16-05-2024 branch 3 times, most recently from f6fc4a9 to f475937 Compare May 16, 2024 13:45
@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

@MarekPieta
Copy link
Contributor

MarekPieta commented May 17, 2024 •
edited
Loading

Spotted a BLE VS commands related issue while testing nRF Desktop (BLE TX power set/get returned with unsupported error). Aligned here: rlubos#20
Waiting for reviews from codeowners

Jędrzej Ciupis and others added 23 commits May 28, 2024 14:49
@rlubos
boards: shields: disable NCS_BOOT_BANNER for nRF22xx shields
8734032 
Boot banner must be disabled for nRF2220 and nRF2240 front-end modules
to avoid conflicts between TWIM and UART instances on initialization.

Signed-off-by: Jędrzej Ciupis <[email protected]>
@rlubos
debug: etb_trace: Covert SOC_ON_EXIT_CPU_IDLE handler to C
c6ebff7 
Upstream commit 4760aad changed CPU
idle handler from asm to C, so align with that change.

Signed-off-by: Robert Lubos <[email protected]>
@krish2718 @rlubos
samples: wifi: sta: Fix RAM overflow for nRF52840
80db85c 
Reduce WPA supplicant stack size to accommodate RAM requirements for
nRF52840.

Signed-off-by: Chaitanya Tata <[email protected]>
@krish2718 @rlubos
scripts: Quarantine Wi-Fi on nRF54L15
62b36e8 
nRF54L15 has low RAM, so, till we optimize Wi-Fi RAM requirements,
temporarily quarantine this twister combination.

Signed-off-by: Chaitanya Tata <[email protected]>
@MarekPieta @rlubos
applications: nrf_desktop: Align RRAM configuration for nRF54L15 PDK
44b6c2a 
Change aligns RRAM configuration for nRF54L15 PDK. The application does
not use cpuflpr core, so whole memory can be used by cpuapp.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
@koffes @rlubos
Applications: nrf5340_audio: Upmerge fixes
c052a60 
OCT-3020
Resolved build issues

Signed-off-by: Kristoffer Rist Skøien <[email protected]>
@rlubos
scripts: Extend Zephyr tests/samples quarantine
8d3647f 
See comments along the quarantine entries for reasoning.

Signed-off-by: Robert Lubos <[email protected]>
@krish2718 @rlubos
samples: wifi: shell: Increase net management buffers
50b0fed 
Despite increasing the timeout, sometimes we still see failures in
pushing a net management event, so, increase the queue size to fix such
scenarios.

Fixes SHEL-2773.

Signed-off-by: Chaitanya Tata <[email protected]>
@SebastianBoe @rlubos
boards: 54l: ns: Delete the deprecated nrf54l15_cpuapp_ns.dtsi
3fedac2 
After some reorganization this file is no longer in use.

Signed-off-by: Sebastian Bøe <[email protected]>
@koffes @rlubos
Applications: nrf5340_audio: Upmerge fixes2
88b4d53 
OCT-3020
Resolved BIS+ACL tester upmerge issues

Signed-off-by: Kristoffer Rist Skøien <[email protected]>
@PerMac @rlubos
requirements: Updated pylint version
48493db 
Pylint requires min version 3 to work

Signed-off-by: Maciej Perkowski <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: cellular: fmfu_smp_svr: Enable CRC in the sample
a55423b 
Enable CONFIG_CRC, which is a dependency for mcumgr UART transport.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
samples: Use default nrf54l15pdk/nrf54l15/cpuapp revision in twister
8ea9e77 
Revision 0.3.0 is now the default revision of
nrf54l15pdk/nrf54l15/cpuapp board, hence no longer recognisable by
twister if provided explicitly. Update yaml files accordingly to reflect
that.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
applications: nrf_desktop: Change watchdog instance for nrf54l15
72d9ef5 
The default watchdog instance for nrf54l15 is now wdt31.

Signed-off-by: Robert Lubos <[email protected]>
@krish2718 @rlubos
scripts: Qurantine nRF54H Wi-Fi test
6c477e0 
This needs a revised memory layout for Wi-Fi to easily extend RAM and
FLAH, so, on hold for now to unblock upmerge.

Fixes SHEL-2777.

Signed-off-by: Chaitanya Tata <[email protected]>
@rlubos
lib: net: softap_wifi_provision: Align with SFM API changes
c30ea28 
From the upstream migration guide:

The SMF_CREATE_STATE macro now always takes 5 arguments. The amount
of arguments is now independent of the values of
CONFIG_SMF_ANCESTOR_SUPPORT and CONFIG_SMF_INITIAL_TRANSITION.
If the additional arguments are not used, they have to be set to NULL

Signed-off-by: Robert Lubos <[email protected]>
@tomchy @rlubos
suit: flash_companion: Adjust minimal configuration
ec5957f 
Adjust Kconfigs to match the new set of options and dependencies.

Ref: NCSDK-NONE

Signed-off-by: Tomasz Chyrowicz <[email protected]>
@kkasperczyk-no @rlubos
samples: matter: Disabled NCS boot banner in the sysbuild mcuboot
540f98f 
Disabled NCS boot banner for the sysbuild mcuboot config
to decrease the flash usage and fit the assumed partition size.

Signed-off-by: Kamil Kasperczyk <[email protected]>
@rlubos
samples: Don't use deprecated NET_SOCKETS_POSIX_NAMES
a50bde9 
Switch to POSIX_API instead. Fix build issues corresponding to this
change.

Signed-off-by: Robert Lubos <[email protected]>
@MarekPieta @rlubos
samples: fast_pair: input_device: Fix build failures on nRF5340 DK
24ddd07 
Change brings back hci_ipc configuration used for child images to fix
build errors on nRF5340 DK.

Jira: NCSDK-27508

Signed-off-by: Marek Pieta <[email protected]>
@grochu @rlubos
samples: bluetooth: Remove uses of auto name in advertising
a76b81c 
The adv options to automatically add the name in the advertising and
scan response data are deprecated.

Update the samples that used those options to explicitly include
the name in the advertising and scan response data.

Signed-off-by: Michał Grochala <[email protected]>
Signed-off-by: Robert Lubos <[email protected]>
@rlubos
doc: release-notes-changelog: Update Zephyr SHAs used in the upmerge
38309fe 
Update upstream Zephyr SHA to ea02b93.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos
scripts: Quarantine iso_time_sync on nrf54l15pdk
cf31f50 
GPIOTE cannot be used with LED0 on nrf54l15pdk/nrf54l15/cpuapp in
version 0.3.0.

Signed-off-by: Robert Lubos <[email protected]>
@NordicBuilder NordicBuilder removed the DNM label May 28, 2024
@rlubos
samples: bluetooth: connection_event_trigger: Increase BT_RX_STACK_SIZE
0d202c3 
The stack size needs to be increased after the upmerge, as the sample
reports stack overflow when printing logs.

Signed-off-by: Robert Lubos <[email protected]>
@rlubos rlubos merged commit 30ba749 into nrfconnect:main May 28, 2024
45 of 48 checks passed
glarsennordic
glarsennordic reviewed May 28, 2024
View reviewed changes
Copy link
Contributor

@glarsennordic glarsennordic left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I just found what looks like a breaking change, and this was just merged, I am submitting my review before it is complete

Edit: I didn't find any other issues in the last few commits after this

samples/wifi/sta/sample.yaml
@@ -29,6 +29,7 @@ tests:
extra_configs:
- CONFIG_NET_TX_STACK_SIZE=3700
- CONFIG_NET_RX_STACK_SIZE=3700
- CONFIG_WPA_SUPP_THREAD_STACK_SIZE=6144
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this also be applied to a prj.conf somewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@krish2718 Should it? I guess it'd make sense?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally yes, but this was mainly a hot fix for nRF52840, I will check if this is applicable to other boards as well and update modules/hostap if its only nRF52840 then will need to add a board specific overlay. Thanks @glarsennordic .

subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c
@@ -798,22 +798,24 @@ static void reset_entry(void *o)
static const struct smf_state state[] = {
[STATE_INIT] = SMF_CREATE_STATE(init_entry,
init_run,
NULL),
NULL, NULl, NULl),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Argh. Sorry. I was reviewing as you merged, just noticed this.

It seems these NULLs have a lower-case L

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How in the world CI didn't catch this... Will fix

@rlubos rlubos deleted the upmerge-16-05-2024 branch May 29, 2024 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krish2718 krish2718 krish2718 left review comments

@glarsennordic glarsennordic glarsennordic left review comments

@MarkusLassila MarkusLassila MarkusLassila approved these changes

@kkasperczyk-no kkasperczyk-no kkasperczyk-no approved these changes

@balaji-nordic balaji-nordic balaji-nordic approved these changes

@jfischer-no jfischer-no jfischer-no approved these changes

@grochu grochu grochu approved these changes

@jayteemo jayteemo jayteemo approved these changes

@SeppoTakalo SeppoTakalo SeppoTakalo approved these changes

@plskeggs plskeggs plskeggs approved these changes

@carlescufi carlescufi Awaiting requested review from carlescufi

@tejlmand tejlmand Awaiting requested review from tejlmand

@Vge0rge Vge0rge Awaiting requested review from Vge0rge

@SebastianBoe SebastianBoe Awaiting requested review from SebastianBoe

@edmont edmont Awaiting requested review from edmont

@ludvigsj ludvigsj Awaiting requested review from ludvigsj

@pdunaj pdunaj Awaiting requested review from pdunaj

@coderbyheart coderbyheart Awaiting requested review from coderbyheart coderbyheart is a code owner

@hakonfam hakonfam Awaiting requested review from hakonfam

@sigvartmh sigvartmh Awaiting requested review from sigvartmh

@lemrey lemrey Awaiting requested review from lemrey

@magnev magnev Awaiting requested review from magnev

@tomchy tomchy Awaiting requested review from tomchy

@gregersrygg gregersrygg Awaiting requested review from gregersrygg

Assignees
No one assigned
Labels
CI-all-test Run All integration tests CI-force-downstream doc-required PR must not be merged without tech writer approval. manifest manifest-find-my manifest-matter manifest-mcuboot manifest-sidewalk manifest-trusted-firmware-m manifest-zephyr upmerge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.