Memfault Firmware SDK 0.33.3 (Build 517561)

Author: Memfault Inc

CHANGES.md

@@ -1,3 +1,11 @@
+### Changes between Memfault SDK 0.33.2 and SDK 0.33.3 - Sept 14, 2022
+
+#### :chart_with_upwards_trend: Improvements
+
+- Zephyr port updates:
+  - Add a call to `LOG_PANIC()` before running the Memfault fault handler, to
+    flush any deferred logs before the reboot
+
 ### Changes between Memfault SDK 0.33.1 and SDK 0.33.2 - Sept 7, 2022
 
 #### :chart_with_upwards_trend: Improvements

VERSION

@@ -1,2 +1,2 @@
-BUILD ID: 512901
-GIT COMMIT: a0c2c2f58
+BUILD ID: 517561
+GIT COMMIT: a436bb3d2

components/include/memfault/version.h

@@ -19,7 +19,7 @@ typedef struct {
   uint8_t patch;
 } sMfltSdkVersion;
 
-#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 33, .patch = 2 }
+#define MEMFAULT_SDK_VERSION   { .major = 0, .minor = 33, .patch = 3 }
 
 #ifdef __cplusplus
 }

ports/zephyr/Kconfig

@@ -92,16 +92,6 @@ config MEMFAULT_HTTP_ENABLE
           Enables support for querying the Memfault API for OTA updates
           and posting Memfault chunks
 
-config MEMFAULT_ZEPHYR_FATAL_HANDLER
-        bool "Enable running the Zephyr fatal handler after Memfault coredump capture"
-        default y
-        help
-          This enables the Zephyr fatal handler to run after Memfault's fault
-          handler. It's useful to view the Zephyr fatal output (few breadcrumbs
-          about the crash) on the console when debugging with an attached
-          device. Explicitly disabling it can save a few dozen bytes of code
-          space.
-
 config MEMFAULT_PLATFORM_LOG_FALLBACK_TO_PRINTK
         bool "Fallback to printk for platform logging"
         default y if ! LOG

ports/zephyr/v2.4/memfault_fault_handler.c

@@ -41,25 +41,10 @@ extern void sys_arch_reboot(int type);
 // Intercept zephyr/kernel/fatal.c:z_fatal_error()
 void __wrap_z_fatal_error(unsigned int reason, const z_arch_esf_t *esf);
 
-#if CONFIG_MEMFAULT_ZEPHYR_FATAL_HANDLER
-extern void __real_z_fatal_error(unsigned int reason, const z_arch_esf_t *esf);
-
-// This struct stores the crash info for later passing to __real_z_fatal_error
-static struct save_crash_info {
-  bool valid;
-  unsigned int reason;
-  z_arch_esf_t esf;
-} s_save_crash_info;
-
-// stash the reason and esf for later use by zephyr unwinder
-static void prv_save_crash_info(unsigned int reason, const z_arch_esf_t *esf) {
-  s_save_crash_info.valid = true;
-  s_save_crash_info.reason = reason;
-  s_save_crash_info.esf = *esf;
-}
-#endif
-
 void __wrap_z_fatal_error(unsigned int reason, const z_arch_esf_t *esf) {
+  // flush logs prior to capturing coredump & rebooting
+  LOG_PANIC();
+
   const struct __extra_esf_info *extra_info = &esf->extra_info;
   const _callee_saved_t *callee_regs = extra_info->callee;
 
@@ -82,37 +67,14 @@ void __wrap_z_fatal_error(unsigned int reason, const z_arch_esf_t *esf) {
     .exc_return = exc_return,
   };
 
-#if CONFIG_MEMFAULT_ZEPHYR_FATAL_HANDLER
-  prv_save_crash_info(reason, esf);
-#endif
-
   memfault_fault_handler(&reg, kMfltRebootReason_HardFault);
 }
 
-#if CONFIG_MEMFAULT_ZEPHYR_FATAL_HANDLER
-void memfault_zephyr_z_fatal_error(void) {
-  if (s_save_crash_info.valid) {
-    unsigned int reason = K_ERR_KERNEL_OOPS;
-    z_arch_esf_t *esf = NULL;
-    if (s_save_crash_info.valid) {
-      reason = s_save_crash_info.reason;
-      esf = &s_save_crash_info.esf;
-    }
-
-    __real_z_fatal_error(reason, esf);
-  }
-}
-#endif
-
 MEMFAULT_WEAK
 MEMFAULT_NORETURN
 void memfault_platform_reboot(void) {
   memfault_platform_halt_if_debugging();
 
-#if CONFIG_MEMFAULT_ZEPHYR_FATAL_HANDLER
-  memfault_zephyr_z_fatal_error();
-#endif
-
   sys_arch_reboot(0);
   CODE_UNREACHABLE;
 }

scripts/mflt-build-id/poetry.lock

@@ -19,7 +19,7 @@ pyelftools = ">=0.26,<=0.28"
 pytest = "^6"
 pytest-cov = "^2"
 pytest-timeout = "^2.0"
-snapshottest = "1.0.0a0"
+snapshottest = {git = "https://github.com/memfault/snapshottest.git", rev = "1.0.0a0+memfault0"}
 wasmer = "0.3.0"
 
 [tool.black]