[nrf toup] Saving boot reason on nRF54h20

-Use NRF_RESETINFO register to get boot reason Signed-off-by: Konrad Grucel <[email protected]>
nrfconnect · Dec 10, 2024 · e39f5ca · e39f5ca
1 parent 6c1a9c5
commit e39f5ca
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 1 deletion.
diff --git a/src/platform/SaveBootReasonDFUSuit.h b/src/platform/SaveBootReasonDFUSuit.h
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2021 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+ */
+
+#ifndef NRF_SAVE_BOOT_REASON_H__
+#define NRF_SAVE_BOOT_REASON_H__
+
+extern int BootReason;
+
+#endif
diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -52,16 +52,60 @@ const size_t kMaxHeapSize = CONFIG_SRAM_BASE_ADDRESS + KB(CONFIG_SRAM_SIZE) - PO
 
 #endif
 
+#ifdef CONFIG_SOC_SERIES_NRF54HX
+#include <hal/nrf_resetinfo.h>
+#endif
+
+#include <platform/SaveBootReasonDFUSuit.h>
+
 namespace chip {
 namespace DeviceLayer {
 
 namespace {
 
 BootReasonType DetermineBootReason()
 {
-#ifdef CONFIG_HWINFO
+
+#if defined(CONFIG_SOC_SERIES_NRF54HX) || defined(CONFIG_HWINFO)
     uint32_t reason;
+#endif
+    ChipLogDetail(DeviceLayer, "Software Boot reason %d", BootReason);
+#ifdef CONFIG_SOC_SERIES_NRF54HX
+    reason = nrf_resetinfo_resetreas_global_get(NRF_RESETINFO);
+
+    if (reason == RESETINFO_RESETREAS_GLOBAL_ResetValue)
+    {
+        return BootReasonType::kSoftwareReset;
+    }
+
+    if (reason & RESETINFO_RESETREAS_GLOBAL_RESETPORONLY_Msk)
+    {
+        return BootReasonType::kBrownOutReset;
+    }
+
+    if (reason & RESETINFO_RESETREAS_GLOBAL_DOG_Msk)
+    {
+        return BootReasonType::kHardwareWatchdogReset;
+    }
+
+    if ((reason & (RESETINFO_RESETREAS_GLOBAL_RESETPIN_Msk | RESETINFO_RESETREAS_GLOBAL_RESETPOR_Msk)) ==
+        (RESETINFO_RESETREAS_GLOBAL_RESETPIN_Msk | RESETINFO_RESETREAS_GLOBAL_RESETPOR_Msk))
+    {
+        return BootReasonType::kPowerOnReboot;
+    }
 
+    if ((reason & (RESETINFO_RESETREAS_GLOBAL_RESETPOR_Msk | RESETINFO_RESETREAS_GLOBAL_SECSREQ_Msk)) ==
+        (RESETINFO_RESETREAS_GLOBAL_RESETPOR_Msk | RESETINFO_RESETREAS_GLOBAL_SECSREQ_Msk))
+    {
+        if (BootReason == 5)
+        {
+            BootReason = 0;
+            return BootReasonType::kSoftwareUpdateCompleted;
+        }
+    }
+#endif
+
+#ifdef CONFIG_HWINFO
     if (hwinfo_get_reset_cause(&reason) != 0)
     {
         return BootReasonType::kUnspecified;

diff --git a/src/platform/nrfconnect/OTAImageProcessorImpl.cpp b/src/platform/nrfconnect/OTAImageProcessorImpl.cpp
@@ -46,6 +46,9 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/pm/device.h>
 
+#include <platform/SaveBootReasonDFUSuit.h>
+int __noinit BootReason;
+
 namespace chip {
 namespace {
 #ifdef CONFIG_CHIP_CERTIFICATION_DECLARATION_STORAGE
@@ -182,6 +185,8 @@ CHIP_ERROR OTAImageProcessorImpl::Apply()
                 PlatformMgr().HandleServerShuttingDown();
                 k_msleep(CHIP_DEVICE_CONFIG_SERVER_SHUTDOWN_ACTIONS_SLEEP_MS);
 #ifdef CONFIG_DFU_TARGET_SUIT
+                BootReason = 5;
+                ChipLogDetail(DeviceLayer, "Software Boot reason %d", BootReason);
                 dfu_target_suit_reboot();
 #else
                 Reboot(SoftwareRebootReason::kSoftwareUpdate);