ab_split: Log bootloader version and counter value

Extend the app with a logic that reads the current security counter
and bootloader version values from the bootloader info.

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

samples/dfu/ab_split/prj.conf

@@ -100,3 +100,7 @@ CONFIG_CLOCK_CONTROL_NRF_SHELL=n
 CONFIG_DEVICE_SHELL=n
 CONFIG_DEVMEM_SHELL=n
 CONFIG_FLASH_SHELL=n
+
+# Read bootloader version and security counters values from the retained RAM
+CONFIG_RETENTION_BOOTLOADER_INFO=y
+CONFIG_RETENTION_BOOTLOADER_INFO_TYPE_MCUBOOT=y

samples/dfu/ab_split/src/main.c

@@ -10,12 +10,57 @@
 #include <common.h>
 #include "ab_utils.h"
 
+#ifdef CONFIG_RETENTION_BOOTLOADER_INFO
+#include <zephyr/retention/blinfo.h>
+#include <bootutil/image.h>
+#endif
+
 #define LOG_LEVEL LOG_LEVEL_DBG
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(ab_sample);
 
+#ifdef CONFIG_RETENTION_BOOTLOADER_INFO
+static void blinfo_bootloader_version(void)
+{
+	struct image_version version = {0x00};
+
+	int ret = blinfo_lookup(BLINFO_BOOTLOADER_VERSION, (char *)&version,
+				sizeof(struct image_version));
+
+	if (ret < 0) {
+		LOG_INF("blinfo_lookup error: %d", ret);
+	} else {
+		LOG_INF("Bootloader version: %d.%d.%d+%d", version.iv_major,
+			version.iv_minor, version.iv_revision, version.iv_build_num);
+	}
+}
+
+#ifdef CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION
+static void blinfo_security_counter(void)
+{
+	uint32_t counter = 0;
+
+	int ret = blinfo_lookup(BLINFO_SECURITY_COUNTER_IMAGE_0, (char *)&counter,
+				sizeof(counter));
+
+	if (ret < 0) {
+		LOG_INF("blinfo_lookup error: %d", ret);
+	} else {
+		LOG_INF("Security counter: %d", counter);
+	}
+}
+#endif /* CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION */
+#endif /* CONFIG_RETENTION_BOOTLOADER_INFO */
+
 int main(void)
 {
+#ifdef CONFIG_RETENTION_BOOTLOADER_INFO
+	blinfo_bootloader_version();
+#ifdef CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION
+	blinfo_security_counter();
+#endif /* CONFIG_MCUBOOT_HARDWARE_DOWNGRADE_PREVENTION */
+#endif
+
 #ifdef CONFIG_MCUMGR_TRANSPORT_BT
 	start_smp_bluetooth_adverts();
 #endif

samples/dfu/ab_split/sysbuild/mcuboot/prj.conf

@@ -30,3 +30,8 @@ CONFIG_PICOLIBC=y
 CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE=0
 
 CONFIG_NCS_APPLICATION_BOOT_BANNER_STRING="MCUboot"
+
+# Expose bootloader version and security counter through retention
+CONFIG_BOOT_SHARE_DATA=y
+CONFIG_BOOT_SHARE_DATA_BOOTINFO=y
+CONFIG_BOOT_SHARE_BACKEND_RETENTION=y

samples/dfu/ab_split/sysbuild/nrf54h20dk_nrf54h20_memory_map.dtsi

@@ -7,6 +7,7 @@
 / {
 	chosen {
 		nrf,bootloader-request = &boot_request;
+		zephyr,bootloader-info = &boot_info0;
 	};
 };
 
@@ -15,7 +16,7 @@
 		cpuapp_retained_mem: memory@e1ad000 {
 			compatible = "zephyr,memory-region";
 			reg = <0xe1ad000 DT_SIZE_K(4)>;
-			zephyr,memory-region = "RetainedMem";
+			zephyr,memory-region = "RetainedNvm";
 			status = "okay";
 
 			retainedmem {
@@ -34,4 +35,28 @@
 			};
 		};
 	};
+
+	sram@22007FC0 {
+		compatible = "zephyr,memory-region", "mmio-sram";
+		reg = <0x22007FC0 0x40>;
+		zephyr,memory-region = "RetainedMem";
+		status = "okay";
+
+		retainedmem {
+			compatible = "zephyr,retained-ram";
+			status = "okay";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			boot_info0: boot_info@0 {
+				compatible = "zephyr,retention";
+				status = "okay";
+				reg = <0x0 0x40>;
+			};
+		};
+	};
+};
+
+&cpuapp_ram0 {
+	reg = <0x22000000 0x7FC0>;
 };