dump

Signed-off-by: Håkon Amundsen <[email protected]>

Author: hakonfam

soc/nordic/nrf54h/CMakeLists.txt

@@ -18,4 +18,4 @@ zephyr_linker_sources(SECTIONS SORT_KEY zzz_place_align_at_end align.ld)
 
 add_subdirectory(bicr)
 add_subdirectory(gpd)
-add_subdirectory(ironside_boot_report)
+add_subdirectory(ironside_se)

soc/nordic/nrf54h/Kconfig

@@ -74,4 +74,4 @@ config SOC_NRF54H20_CPUFLPR
 
 rsource "bicr/Kconfig"
 rsource "gpd/Kconfig"
-rsource "ironside_boot_report/Kconfig"
+rsource "ironside_se/Kconfig"

soc/nordic/nrf54h/ironside_boot_report/Kconfig

@@ -1,5 +1,5 @@
 # Copyright (c) 2025 Nordic Semiconductor
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_IRONSIDE_BOOT_REPORT ironside_boot_report.c)
+zephyr_library_sources_ifdef(CONFIG_SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT ironside_se_boot_report.c)
 zephyr_include_directories(include)

soc/nordic/nrf54h/ironside_boot_report/ironside_boot_report.c

@@ -0,0 +1,31 @@
+# Copyright (c) 2025 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT
+	bool "Nordic IRONside SE boot report"
+	default y if SOC_NRF54H20_CPUAPP
+	depends on SOC_NRF54H20_IRON
+	help
+	  This option enables parsing of the Boot Report populated by Nordic IRONside SE.
+
+if SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT
+
+config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_MAGIC
+	hex
+	default 0xe176928d
+	help
+	  Constant used to check if an Nordic IRONside SE boot report has been written.
+
+config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_LOCAL_DOMAIN_CONTEXT_SIZE
+	int
+	default 32
+	help
+	  Size of the local domain context in bytes
+
+config SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_RANDOM_DATA_SIZE
+	int
+	default 32
+	help
+	  Size of the random data in bytes
+
+endif

soc/nordic/nrf54h/ironside_boot_report/CMakeLists.txt renamed to soc/nordic/nrf54h/ironside_se/CMakeLists.txt

@@ -3,15 +3,19 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_BOOT_REPORT_H_
-#define ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_BOOT_REPORT_H_
+#ifndef ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_SE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_SE_BOOT_REPORT_H_
+#define ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_SE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_SE_BOOT_REPORT_H_
 
 #include <stdint.h>
 #include <stddef.h>
 
+#define IRONSIDE_SE_BOOT_REPORT_LOCAL_DOMAIN_CONTEXT_SIZE                                          \
+	CONFIG_SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_LOCAL_DOMAIN_CONTEXT_SIZE
+#define IRONSIDE_SE_BOOT_REPORT_RANDOM_DATA_SIZE                                                   \
+	CONFIG_SOC_NRF54H20_IRONSIDE_SE_BOOT_REPORT_RANDOM_DATA_SIZE
 
 /** @brief UICR error description contained in the boot report. */
-struct ironside_boot_report_uicr_error {
+struct ironside_se_boot_report_uicr_error {
 	/** The type of error. A value of 0 indicates no error */
 	uint32_t error_type;
 	/** Error descrpitions specific to each type of UICR error */
@@ -44,7 +48,7 @@ struct ironside_boot_report_uicr_error {
 };
 
 /** @brief IRONside boot report. */
-struct ironside_boot_report {
+struct ironside_se_boot_report {
 	/** Magic value used to identify valid boot report */
 	uint32_t magic;
 	/** Firmware version of IRONside SE. 8bit MAJOR.MINOR.PATCH.TWEAK */
@@ -57,12 +61,12 @@ struct ironside_boot_report {
 	char ironside_recovery_extraversion[12];
 	/** Copy of SICR.UROT.UPDATE.STATUS.*/
 	uint32_t ironside_update_status;
-	/** See @ref ironside_boot_report_uicr_error */
-	struct ironside_boot_report_uicr_error uicr_error_description;
+	/** See @ref ironside_se_boot_report_uicr_error */
+	struct ironside_se_boot_report_uicr_error uicr_error_description;
 	/** Data passed from booting local domain to local domain being booted */
-	uint8_t local_domain_context[32];
+	uint8_t local_domain_context[IRONSIDE_SE_BOOT_REPORT_LOCAL_DOMAIN_CONTEXT_SIZE];
 	/** CSPRNG data */
-	uint8_t random_data[32];
+	uint8_t random_data[IRONSIDE_SE_BOOT_REPORT_RANDOM_DATA_SIZE];
 	/** Reserved for Future Use */
 	uint32_t rfu[64];
 };
@@ -76,6 +80,6 @@ struct ironside_boot_report {
  * @retval -EFAULT if the magic field in the report is incorrect.
  * @retval -EINVAL if @ref report is NULL.
  */
-int ironside_boot_report_get(const struct ironside_boot_report **report);
+int ironside_se_boot_report_get(const struct ironside_se_boot_report **report);
 
-#endif /* ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_BOOT_REPORT_H_ */
+#endif /* ZEPHYR_SOC_NORDIC_NRF54H_IRONSIDE_SE_BOOT_REPORT_INCLUDE_NRF_IRONSIDE_SE_BOOT_REPORT_H_ */

soc/nordic/nrf54h/ironside_se/Kconfig

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2025 Nordic Semiconductor ASA
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <errno.h>
+#include <zephyr/devicetree.h>
+#include <nrf/ironside_se_boot_report.h>
+
+#define IRONSIDE_SE_BOOT_REPORT_ADDR  DT_REG_ADDR(DT_NODELABEL(cpuapp_ironside_se_boot_report))
+#define IRONSIDE_SE_BOOT_REPORT_MAGIC CONFIG_SOC_NRF54H_IRONSIDE_SE_BOOT_REPORT_MAGIC
+
+int ironside_se_boot_report_get(const struct ironside_se_boot_report **report)
+{
+	const struct ironside_se_boot_report *tmp_report =
+		(const struct ironside_se_boot_report *)IRONSIDE_SE_BOOT_REPORT_ADDR;
+
+	if (tmp_report->magic != IRONSIDE_SE_BOOT_REPORT_MAGIC) {
+		return -EINVAL;
+	}
+
+	*report = tmp_report;
+
+	return 0;
+}