mgmt: mcumgr: grp: os: Add active b0 slot bootloader info query #19714

nordicjm · 2024-12-30T09:16:15Z

Allows querying the active b0 slot via MCUmgr so that the correct
update image can be loaded to a device

However, FW_INFO is flawed in that it does no image verification at all and just checks the struct, the whole image could have been marked as invalid by b0 and so the application can return the wrong result

NordicBuilder · 2024-12-30T09:17:24Z

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

Name	Old Revision	New Revision	Diff
zephyr	nrfconnect/sdk-zephyr@`76a46cb`	nrfconnect/sdk-zephyr@`763e6a8` (`main`)	nrfconnect/[email protected]

✅ All manifest checks OK

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

NordicBuilder · 2024-12-30T09:17:46Z

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 16ea1c38b318987a4821c42467b6a3a5788e1ca7
zephyr: PR head: 763e6a8ab82bd1a346a9b14a4b8fc7509c8441b6

more details

sdk-nrf:

PR head: 16ea1c38b318987a4821c42467b6a3a5788e1ca7
merge base: 01b2deb38dd845f10c4b9c3e4bd94030dd9a93db
target head (main): 01b2deb38dd845f10c4b9c3e4bd94030dd9a93db
Diff

zephyr:

PR head: 763e6a8ab82bd1a346a9b14a4b8fc7509c8441b6
merge base: 76a46cb2baf310a06bbdb0b1d7d99394ec04a671
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 (14)

cmake
│  ├── sysbuild
│  │  │ b0_mcuboot_signing.cmake
subsys
│  ├── CMakeLists.txt
│  ├── Kconfig
│  ├── mgmt
│  │  ├── mcumgr
│  │  │  ├── CMakeLists.txt
│  │  │  ├── Kconfig
│  │  │  ├── grp
│  │  │  │  ├── CMakeLists.txt
│  │  │  │  ├── Kconfig
│  │  │  │  ├── os_mgmt
│  │  │  │  │  ├── CMakeLists.txt
│  │  │  │  │  ├── Kconfig
│  │  │  │  │  ├── src
│  │  │  │  │  │  │ os_mgmt_b0_active_slot.c
sysbuild
│  │ CMakeLists.txt
west.yml
zephyr
│  ├── include
│  │  ├── zephyr
│  │  │  ├── mgmt
│  │  │  │  ├── mcumgr
│  │  │  │  │  ├── grp
│  │  │  │  │  │  ├── os_mgmt
│  │  │  │  │  │  │  │ os_mgmt.h
│  ├── subsys
│  │  ├── mgmt
│  │  │  ├── mcumgr
│  │  │  │  ├── grp
│  │  │  │  │  ├── os_mgmt
│  │  │  │  │  │  ├── src
│  │  │  │  │  │  │  │ os_mgmt.c

Outputs:

Toolchain

Version: 342151af73
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:342151af73_912848a074

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

◻️ Toolchain - Skipped: existing toolchain is used
✅ Build twister
❌ Integration tests
- ✅ test-sdk-audio
- ✅ desktop52_verification
- ✅ test-fw-nrfconnect-boot
- ✅ test-fw-nrfconnect-apps
- ✅ test_ble_nrf_config
- ✅ test-fw-nrfconnect-ble_mesh
- ✅ test-fw-nrfconnect-ble_samples
- ✅ test-fw-nrfconnect-chip
- ✅ test-fw-nrfconnect-nfc
- ✅ test-fw-nrfconnect-nrf-iot_libmodem-nrf
- ✅ test-fw-nrfconnect-nrf-iot_serial_lte_modem
- ✅ test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
- ✅ test-fw-nrfconnect-nrf-iot_samples
- ✅ test-fw-nrfconnect-nrf-iot_lwm2m
- ✅ doc-internal
- ✅ test-fw-nrfconnect-nrf-iot_thingy91
- ✅ test-fw-nrfconnect-nrf_crypto
- ✅ test-fw-nrfconnect-rpc
- ✅ test-fw-nrfconnect-rs
- ✅ test-fw-nrfconnect-fem
- ✅ test-fw-nrfconnect-tfm
- ✅ test-fw-nrfconnect-thread
- ✅ test-fw-nrfconnect-zigbee
- ✅ test-sdk-find-my
- ✅ test-fw-nrfconnect-nrf-iot_mosh
- ❌ test-fw-nrfconnect-nrf-iot_positioning
- ✅ test-sdk-sidewalk
- ✅ test-sdk-wifi
- ✅ test-low-level
- ✅ test-sdk-pmic-samples
- ✅ test-sdk-mcuboot
- ✅ test-sdk-dfu
- ✅ test-fw-nrfconnect-ps
- ✅ test-secdom-samples-public
- ⚠️ test-fw-nrfconnect-fw-update

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

NordicBuilder · 2024-12-30T09:36:35Z

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 Publish GitHub Action.

philips77 · 2025-01-08T11:56:16Z

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_b0_active_slot.c

+		return MGMT_CB_ERROR_RC;
+	}
+
+	/* If no parameter is recognized then just introduce the bootloader. */


This comment seems copy-pasted.

Comment removed

NordicBuilder · 2025-01-09T16:17:08Z

Memory footprint analysis revealed the following potential issues

sample.matter.template.debug[nrf7002dk/nrf5340/cpuapp]: High ROM usage: 912194[B] - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)
sample.matter.template.release[nrf7002dk/nrf5340/cpuapp]: High ROM usage: 821134[B] - link (cc: @kkasperczyk-no @ArekBalysNordic @markaj-nordic)

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

tejlmand · 2025-01-21T08:08:16Z

cmake/sysbuild/b0_mcuboot_signing.cmake

@@ -138,7 +138,7 @@ if(SB_CONFIG_BOOTLOADER_MCUBOOT)

    if(SB_CONFIG_SECURE_BOOT_BUILD_S1_VARIANT_IMAGE)
      ncs_secure_boot_mcuboot_sign(s1_image "${bin_files}" "${signed_targets}" "")
-      set(extra_bin_data "signed_by_mcuboot_and_b0_s1_image.binload_address=$<TARGET_PROPERTY:partition_manager,PM_S1_ADDRESS>")
+      set(extra_bin_data "signed_by_mcuboot_and_b0_s1_image.binload_address=$<TARGET_PROPERTY:partition_manager,PM_S1_ADDRESS>;signed_by_mcuboot_and_b0_s1_image.binslot=1")


minor nit.

Very long line before, and even much longer now 😞

de-nordic · 2025-01-21T16:05:50Z

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_b0_active_slot.c

+			uint32_t active_slot;
+			bool ok;
+
+			if (!s1_info || (s0_info && s0_info->version >= s1_info->version)) {


is the !s1_info needed?

it's possible that there is no s1 image loaded in which case s1 would be a null pointer so the check is needed.

de-nordic · 2025-01-21T16:09:55Z

subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt_b0_active_slot.c

+				active_slot = 0;
+			} else if (!s0_info || (s1_info && s1_info->version > s0_info->version)) {
+				active_slot = 1;
+			}


Assuming that at this point we can have both s0_info and s1_info and the above else and else if have not been triggered, with the !s0_info and !s1_info, we have no processing of situation where both s0_info && s1_info, in which case active_slot is left uninitialized.

there must be an s0_info or s1_info for b0 to be able to boot the image so one of the conditions must run, if there is no s0_info and no s1_info and b0 has booted the image then something is very wrong

Right, my bad.

This can be used by the application to know if MCUboot and b0 are enabled, though the slot itself cannot be used from the application Signed-off-by: Jamie McCrae <[email protected]>

Includes an update to add a new MCUmgr OS group error code Signed-off-by: Jamie McCrae <[email protected]>

Allows querying the active b0 slot via MCUmgr so that the correct update image can be loaded to a device Signed-off-by: Jamie McCrae <[email protected]>

Adds slot numbers to the manifest used when building MCUboot updates for b0 Signed-off-by: Jamie McCrae <[email protected]>

nordicjm requested review from a team as code owners December 30, 2024 09:16

github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Dec 30, 2024

nordicjm requested review from nvlsianpu and de-nordic December 30, 2024 09:16

NordicBuilder added manifest-zephyr DNM labels Dec 30, 2024

nordicjm force-pushed the activeb0mcuboot branch from 8f0fa94 to d55e7c9 Compare December 30, 2024 09:19

nordicjm force-pushed the activeb0mcuboot branch from d55e7c9 to 133ff8e Compare December 30, 2024 10:04

philips77 reviewed Jan 8, 2025

View reviewed changes

nordicjm force-pushed the activeb0mcuboot branch from c1a739f to 94441a8 Compare January 9, 2025 14:06

nordicjm requested a review from philips77 January 9, 2025 14:06

nordicjm force-pushed the activeb0mcuboot branch from 94441a8 to a4df296 Compare January 21, 2025 08:01

tejlmand approved these changes Jan 21, 2025

View reviewed changes

michalek-no approved these changes Jan 21, 2025

View reviewed changes

de-nordic reviewed Jan 21, 2025

View reviewed changes

de-nordic approved these changes Jan 23, 2025

View reviewed changes

nordicjm added 4 commits January 23, 2025 13:07

sysbuild: Add MCUboot update ID to application

4b198dd

This can be used by the application to know if MCUboot and b0 are enabled, though the slot itself cannot be used from the application Signed-off-by: Jamie McCrae <[email protected]>

manifest: Update sdk-zephyr

aca0c1c

Includes an update to add a new MCUmgr OS group error code Signed-off-by: Jamie McCrae <[email protected]>

mgmt: mcumgr: grp: os: Add active b0 slot bootloader info query

a3094d1

Allows querying the active b0 slot via MCUmgr so that the correct update image can be loaded to a device Signed-off-by: Jamie McCrae <[email protected]>

cmake: sysbuild: b0: Add slot numbers to MCUboot update

16ea1c3

Adds slot numbers to the manifest used when building MCUboot updates for b0 Signed-off-by: Jamie McCrae <[email protected]>

nordicjm force-pushed the activeb0mcuboot branch from a4df296 to 16ea1c3 Compare January 23, 2025 13:07

NordicBuilder removed the DNM label Jan 23, 2025

carlescufi merged commit c73baaf into nrfconnect:main Jan 24, 2025
12 of 14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

mgmt: mcumgr: grp: os: Add active b0 slot bootloader info query #19714

mgmt: mcumgr: grp: os: Add active b0 slot bootloader info query #19714

nordicjm commented Dec 30, 2024 •

edited by fundakol

Loading

NordicBuilder commented Dec 30, 2024 •

edited

Loading

NordicBuilder commented Dec 30, 2024 •

edited

Loading

NordicBuilder commented Dec 30, 2024

philips77 Jan 8, 2025

nordicjm Jan 9, 2025

NordicBuilder commented Jan 9, 2025 •

edited

Loading

tejlmand Jan 21, 2025

de-nordic Jan 21, 2025

nordicjm Jan 23, 2025

de-nordic Jan 21, 2025

nordicjm Jan 23, 2025

de-nordic Jan 23, 2025

mgmt: mcumgr: grp: os: Add active b0 slot bootloader info query #19714

mgmt: mcumgr: grp: os: Add active b0 slot bootloader info query #19714

Conversation

nordicjm commented Dec 30, 2024 • edited by fundakol Loading

NordicBuilder commented Dec 30, 2024 • edited Loading

NordicBuilder commented Dec 30, 2024 • edited Loading

CI Information

Inputs:

Sources:

Github labels

Outputs:

Toolchain

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

NordicBuilder commented Dec 30, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NordicBuilder commented Jan 9, 2025 • edited Loading

Memory footprint analysis revealed the following potential issues

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nordicjm commented Dec 30, 2024 •

edited by fundakol

Loading

NordicBuilder commented Dec 30, 2024 •

edited

Loading

NordicBuilder commented Dec 30, 2024 •

edited

Loading

NordicBuilder commented Jan 9, 2025 •

edited

Loading