Merge remote-tracking branch 'origin/develop' into ledger-sync-merged…

…/sc-120056
particle-iot · Dec 11, 2023 · 0627355 · 0627355
2 parents 0873de2 + 3185fa5
commit 0627355
Show file tree

Hide file tree

Showing 330 changed files with 14,305 additions and 2,606 deletions.
diff --git a/.buildpackrc b/.buildpackrc
@@ -15,10 +15,10 @@ export BUILDPACK_VARIATION=manifest
 export RELEASE_PLATFORMS=( )
 
 # Platforms for which this firmware is considered experimental
-export PRERELEASE_PLATFORMS=( argon boron bsom b5som tracker esomx p2 trackerm )
+export PRERELEASE_PLATFORMS=( argon boron bsom b5som tracker esomx p2 trackerm msom)
 # Note: a single platform should be only in release or prerelease list. If
 # added to both it will be considered a prerelease
 
 # Platforms which require modules to be prebuilt
-export MODULAR_PLATFORMS=( argon boron bsom b5som tracker esomx p2 trackerm )
+export MODULAR_PLATFORMS=( argon boron bsom b5som tracker esomx p2 trackerm msom)
 
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -14,7 +14,7 @@ orbs:
 
 aliases:
   - &tasks ["compile:all clean:all", "compile:user clean:user", "compile:debug clean:debug"]
-  - &platforms ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2", "trackerm"]
+  - &platforms ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2", "trackerm", "msom"]
 
 # Define a job to be invoked later in a workflow.
 # See: https://circleci.com/docs/2.0/configuration-reference/#jobs
@@ -104,7 +104,7 @@ jobs:
           platform: << parameters.platform >>
   build-for-darwin:
     macos:
-      xcode: "13.2.1"
+      xcode: "14.2"
     parameters:
       tasks:
         type: string
@@ -475,7 +475,7 @@ workflows:
             - particle-ci-private
           matrix:
             parameters:
-              platform: ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2", "trackerm", "unit-test newhal gcc"]
+              platform: ["argon", "boron", "esomx", "bsom", "b5som", "tracker", "p2", "trackerm", "msom", "unit-test newhal gcc"]
       - combine-binaries:
           requires:
             - build-and-test

diff --git a/.workbench/manifest.json b/.workbench/manifest.json
@@ -2,11 +2,11 @@
     "version": "1.0.0",
     "toolchains": [
         {
-            "platforms": [12, 13, 15, 23, 25, 26, 28, 32],
+            "platforms": [12, 13, 15, 23, 25, 26, 28, 32, 35],
             "firmware": "deviceOS@source",
             "compilers": "[email protected]",
             "tools": "[email protected]",
-            "scripts": "buildscripts@1.11.0",
+            "scripts": "buildscripts@1.15.0",
             "debuggers": "[email protected]"
         }
     ]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,116 @@
+## 5.6.0
+
+### FEATURES
+
+- [msom] ACM basic support [#2689](https://github.com/particle-iot/device-os/pull/2689)
+
+### ENHANCEMENTS
+
+- [wiring] Add 64-bit string conversions [#2693](https://github.com/particle-iot/device-os/pull/2693)
+- [wiring] json: 64-bit support [#2695](https://github.com/particle-iot/device-os/pull/2695)
+- [msom] increase NCP baudrate to 921600, doubling throughput [#2706](https://github.com/particle-iot/device-os/pull/2706)
+- [network] Wiznet Ethernet performance improvements [#2708](https://github.com/particle-iot/device-os/pull/2708)
+
+### BUGFIXES
+
+- [gen3] hal: fixes the issue that UARTE RX may loss data [#2698](https://github.com/particle-iot/device-os/pull/2698)
+- [rtl872x] correctly handle SecureFault [#2699](https://github.com/particle-iot/device-os/pull/2699)
+- Fixes ncp-client not waiting for modem ready on cold boot [#2700](https://github.com/particle-iot/device-os/pull/2700)
+- [system] still pump system loop when SPARK_WLAN_SLEEP=1; Try to drain ISR task queue quicker [#2702](https://github.com/particle-iot/device-os/pull/2702)
+- [rtl872x] Fix unintentional pin changes for Serial1 RTS/CTS [#2703](https://github.com/particle-iot/device-os/pull/2703)
+- [rtl872x] fix multiple BLE issues [#2710](https://github.com/particle-iot/device-os/pull/2710)
+- Asset OTA fixes [#2711](https://github.com/particle-iot/device-os/pull/2711)
+
+
+### INTERNAL
+
+- [services] add long long support to printf/scanf [#2694](https://github.com/particle-iot/device-os/pull/2694)
+- fix printf/scanf for floating point numbers, add tests [#2696](https://github.com/particle-iot/device-os/pull/2696
+- [msom] support 16MB GD flash [#2701](https://github.com/particle-iot/device-os/pull/2701)
+- [msom] Support burnin tests [#2704](https://github.com/particle-iot/device-os/pull/2704)
+- [gen3] reduce flash usage [#2705](https://github.com/particle-iot/device-os/pull/2705)
+- Erase factory reset app after test runner completes [#2709](https://github.com/particle-iot/device-os/pull/2709)
+- Fix dual stack UDP bind behavior with LWIP_IPV6_DEFINES_ONLY [#2712](https://github.com/particle-iot/device-os/pull/2712)
+- Update WB makefile version [#2713](https://github.com/particle-iot/device-os/pull/2713)
+
+## 5.5.0
+
+### FEATURES
+
+- Asset OTA [#2668](https://github.com/particle-iot/device-os/pull/2668)
+- [M SoM] Platform support [#2681](https://github.com/particle-iot/device-os/pull/2681)
+- [rtl872x] Experimental WPA3 support [#2673](https://github.com/particle-iot/device-os/pull/2673)
+- [WiFi] Hidden SSID support [#2673](https://github.com/particle-iot/device-os/pull/2673)
+- [rtl872x] GPIO drive strength configuration support [#2680](https://github.com/particle-iot/device-os/pull/2680)
+
+### ENHANCEMENTS
+
+- [WiFi] WiFI interface power state notifications [#2669](https://github.com/particle-iot/device-os/pull/2669)
+- [rtl872x] Improve `SPI1` (P2 / Tracker M) and `SPI` (M SoM) behavior at 50MHz by changing RXD sample delay [#2677](https://github.com/particle-iot/device-os/pull/2677)
+- [rtl872x] Improve USB Serial TX performance [#2672](https://github.com/particle-iot/device-os/pull/2672)
+- [Cellular] Enables UPSV=1 low power mode for R510 when idle for >=9.2s [#2674](https://github.com/particle-iot/device-os/pull/2674)
+- [rtl872x] Fix logic level overshoot on SPI, I2C, PWM pins [#2680](https://github.com/particle-iot/device-os/pull/2680)
+- [rtl872x] Revert the QSPI flash speed to 80MHz [#2684](https://github.com/particle-iot/device-os/pull/2684)
+- Update the key used for validating the ServerMoved signature [#2688](https://github.com/particle-iot/device-os/pull/2688)
+- [rtl872x] remove the delay in UART flush() [#2686](https://github.com/particle-iot/device-os/pull/2686)
+
+### BUGFIXES
+
+- [rtl872x] Fix incorrect I2C read timeout [#2671](https://github.com/particle-iot/device-os/pull/2671)
+- [rtl872x] Do not initialize RTC after waking up from HIBERNATE sleep [#2667](https://github.com/particle-iot/device-os/pull/2667)
+- [rtl872x] Disable pull resistors when pin is configure as `OUTPUT` [#2666](https://github.com/particle-iot/device-os/pull/2666)
+- [rtl872x] Disable SWDIO/SWDCLK pins when going into sleep [#2666](https://github.com/particle-iot/device-os/pull/2666)
+- [rtl872x] Disable brown-out detector [#2679](https://github.com/particle-iot/device-os/pull/2679)
+- [rtl872x] Avoid glitch on I2C pins when reconfiguring I2C peripheral [#2682](https://github.com/particle-iot/device-os/pull/2682)
+- [msom] Fix ethernet cs, reset, interrupt GPIO pins for M2 eval [#2690](https://github.com/particle-iot/device-os/pull/2690)
+
+### INTERNAL
+
+- [WiFi] Resolve `wiring/sleep20` test failures [#2669](https://github.com/particle-iot/device-os/pull/2669)
+- [nrf52840] Add factory reset test (`ota/factory_reset`) [#2662](https://github.com/particle-iot/device-os/pull/2662)
+
+## 5.5.0-rc.1
+
+### FEATURES
+
+- Asset OTA [#2668](https://github.com/particle-iot/device-os/pull/2668)
+- [M SoM] Platform support [#2681](https://github.com/particle-iot/device-os/pull/2681)
+- [rtl872x] Experimental WPA3 support [#2673](https://github.com/particle-iot/device-os/pull/2673)
+- [WiFi] Hidden SSID support [#2673](https://github.com/particle-iot/device-os/pull/2673)
+- [rtl872x] GPIO drive strength configuration support [#2680](https://github.com/particle-iot/device-os/pull/2680)
+
+### ENHANCEMENTS
+
+- [WiFi] WiFI interface power state notifications [#2669](https://github.com/particle-iot/device-os/pull/2669)
+- [rtl872x] Improve `SPI1` (P2 / Tracker M) and `SPI` (M SoM) behavior at 50MHz by changing RXD sample delay [#2677](https://github.com/particle-iot/device-os/pull/2677)
+- [rtl872x] Improve USB Serial TX performance [#2672](https://github.com/particle-iot/device-os/pull/2672)
+- [Cellular] Enables UPSV=1 low power mode for R510 when idle for >=9.2s [#2674](https://github.com/particle-iot/device-os/pull/2674)
+- [rtl872x] Fix logic level overshoot on SPI, I2C, PWM pins [#2680](https://github.com/particle-iot/device-os/pull/2680)
+- [rtl872x] Revert the QSPI flash speed to 80MHz [#2684](https://github.com/particle-iot/device-os/pull/2684)
+
+### BUGFIXES
+
+- [rtl872x] Fix incorrect I2C read timeout [#2671](https://github.com/particle-iot/device-os/pull/2671)
+- [rtl872x] Do not initialize RTC after waking up from HIBERNATE sleep [#2667](https://github.com/particle-iot/device-os/pull/2667)
+- [rtl872x] Disable pull resistors when pin is configure as `OUTPUT` [#2666](https://github.com/particle-iot/device-os/pull/2666)
+- [rtl872x] Disable SWDIO/SWDCLK pins when going into sleep [#2666](https://github.com/particle-iot/device-os/pull/2666)
+- [rtl872x] Disable brown-out detector [#2679](https://github.com/particle-iot/device-os/pull/2679)
+- [rtl872x] Avoid glitch on I2C pins when reconfiguring I2C peripheral [#2682](https://github.com/particle-iot/device-os/pull/2682)
+
+### INTERNAL
+
+- [WiFi] Resolve `wiring/sleep20` test failures [#2669](https://github.com/particle-iot/device-os/pull/2669)
+- [nrf52840] Add factory reset test (`ota/factory_reset`) [#2662](https://github.com/particle-iot/device-os/pull/2662)
+
+## 5.4.1
+
+### ENHANCEMENTS
+- [rtl872x] dynamically enable Wi-Fi stack on demand [#2664](https://github.com/particle-iot/device-os/pull/2664)
+
+### BUGFIXES
+- [rtl872x] linker: stop relying on .dynalib + .psram_text being contiguous and properly and similarly aligned within LMA and VMA, just copy them separately [#2665](https://github.com/particle-iot/device-os/pull/2665)
+- [rtl872x] fix BLE race condition [#2664](https://github.com/particle-iot/device-os/pull/2664)
+
 ## 5.4.0
 
 ### ENHANCEMENTS
@@ -260,6 +373,29 @@
 - [tests] Fix broken tone and servo tests for p2 platform, also EEPROM_03 for all. [#2469](https://github.com/particle-iot/device-os/pull/2469)
 - [workbench] Stop ignoring device os scripts directory [#2471](https://github.com/particle-iot/device-os/pull/2471)
 
+## 4.2.0
+
+### ENHANCEMENTS
+
+- [Cellular] Enables UPSV=1 low power mode for R510 when idle for >=9.2s [#2674](https://github.com/particle-iot/device-os/pull/2674)
+- [services] add long long support to printf/scanf [#2694](https://github.com/particle-iot/device-os/pull/2694) [#2696](https://github.com/particle-iot/device-os/pull/2696)
+- [wiring] Add 64-bit String conversions [#2693](https://github.com/particle-iot/device-os/pull/2693) [#2657](https://github.com/particle-iot/device-os/pull/2657)
+- [wiring] json: 64-bit support [#2695](https://github.com/particle-iot/device-os/pull/2693) [#2657](https://github.com/particle-iot/device-os/pull/2695)
+
+### BUGFIXES
+
+- Fixes clean target for applications with large number of fils + P2 PSRAM size calculation issues [#2661](https://github.com/particle-iot/device-os/pull/2661)
+- [gen3] hal: fixes the issue that UARTE RX may lose data [#2698](https://github.com/particle-iot/device-os/pull/2698)
+- [quectel] Fixes ncp-client not waiting for modem ready on cold boot [#2700](https://github.com/particle-iot/device-os/pull/2700)
+
+### INTERNAL
+
+- [bootloader] remove nanopb dependency [#2607](https://github.com/particle-iot/device-os/pull/2607)
+- test] resolve sleep20 test failures. [#2669](https://github.com/particle-iot/device-os/pull/2669)
+- [nrf] Add Factory Reset Tests [#2662](https://github.com/particle-iot/device-os/pull/2662)
+- Update the key used for validating the ServerMoved signature [#2688](https://github.com/particle-iot/device-os/pull/2688)
+- [ci] fix macos builds [#2683](https://github.com/particle-iot/device-os/pull/2683)
+
 ## 4.1.0
 
 ### FEATURES

diff --git a/bootloader/prebootloader/src/rtl872x/part1/rtl_support.c b/bootloader/prebootloader/src/rtl872x/part1/rtl_support.c
@@ -316,9 +316,11 @@ void rtlLowLevelInit() {
     InterruptRegister((IRQ_FUN)bodIrqHandler, BOR2_IRQ_LP, 0, 0);
     InterruptEn(BOR2_IRQ_LP, 0);
     BOR_ThresholdSet(BOR_TH_LOW7, BOR_TH_HIGH7);
-    BOR_ModeSet(BOR_INTR, ENABLE);
-    // XXX: Does this work? Enable BOD reset as well
-    BOR_ModeSet(BOR_RESET, ENABLE);
+    // BOR_ModeSet(BOR_INTR, ENABLE);
+    // // XXX: Does this work? Enable BOD reset as well
+    // BOR_ModeSet(BOR_RESET, ENABLE);
+    BOR_ModeSet(BOR_INTR, DISABLE);
+    BOR_ModeSet(BOR_RESET, DISABLE);
 
     boot_ram_function_enable();
 

diff --git a/bootloader/prebootloader/src/rtl872x/part1/sleep_handler.cpp b/bootloader/prebootloader/src/rtl872x/part1/sleep_handler.cpp
@@ -249,8 +249,21 @@ void configureDeepSleepWakeupSource(const hal_sleep_config_t* config) {
 
 // Copy and paste from SOCPS_DeepSleep_RAM()
 void enterDeepSleep() {
+    // There is a user LED connected on D7, which is PA27 (SWD-DAT). There is an internal
+    // pull-up resister on this I/O, which will turn on the user LED when enter the hibernate mode.
+#if PLATFORM_ID == PLATFORM_P2
+    if (HAL_READ32(SYSTEM_CTRL_BASE_LP, REG_SWD_PMUX_EN) & BIT_LSYS_SWD_PMUX_EN) {
+        // Disable SWD
+        Pinmux_Swdoff();
+        // Configure it as input pulldown
+        GPIOA_BASE->PORT[0].DDR &= (~(1 << 27));
+        PAD_PullCtrl(27, GPIO_PuPd_DOWN);
+    }
+#endif
+
 	/* pin power leakage */
 	pinmap_deepsleep();
+
 	/* clear wake event */
 	SOCPS_ClearWakeEvent();
 	/* Enable low power mode */
@@ -323,11 +336,35 @@ void sleepProcess(void) {
                 SOCPS_SWRLDO_Suspend(ENABLE);
                 SOCPS_SleepInit();
                 configureSleepWakeupSource(config);
+
+#if PLATFORM_ID == PLATFORM_P2
+                // There is a user LED connected on D7, which is PA27 (SWD-DAT). There is an internal
+                // pull-up resister on this I/O, which will turn on the user LED when enter the stop/ulp mode.
+                bool swdEnabled = false;
+                if (HAL_READ32(SYSTEM_CTRL_BASE_LP, REG_SWD_PMUX_EN) & BIT_LSYS_SWD_PMUX_EN) {
+                    // Disable SWD
+                    Pinmux_Swdoff();
+                    // Configure it as input pulldown
+                    GPIOA_BASE->PORT[0].DDR &= (~(1 << 27));
+                    PAD_PullCtrl(27, GPIO_PuPd_DOWN);
+                    swdEnabled = true;
+                }
+#endif
+
                 SOCPS_SleepCG();
                 SOCPS_SWRLDO_Suspend(DISABLE);
 
                 SOCPS_AONTimerCmd(DISABLE);
 
+#if PLATFORM_ID == PLATFORM_P2
+                if (swdEnabled) {
+                    PAD_PullCtrl(27, GPIO_PuPd_UP);
+                    uint32_t temp = HAL_READ32(SYSTEM_CTRL_BASE_LP, REG_SWD_PMUX_EN);	
+                    temp |= BIT_LSYS_SWD_PMUX_EN;
+                    HAL_WRITE32(SYSTEM_CTRL_BASE_LP, REG_SWD_PMUX_EN, temp);
+                }
+#endif
+
                 // Figure out the wakeup reason
                 uint32_t wakeReason = 0;
                 uint32_t sleepEnd = SYSTIMER_GetPassTime(0);

diff --git a/bootloader/src/msom/include.mk b/bootloader/src/msom/include.mk
@@ -0,0 +1,2 @@
+INCLUDE_DIRS += $(BOOTLOADER_MODULE_PATH)/src/$(PLATFORM_NAME)
+include $(BOOTLOADER_MODULE_PATH)/src/rtl872x/include.mk
diff --git a/bootloader/src/msom/sources.mk b/bootloader/src/msom/sources.mk
@@ -0,0 +1,2 @@
+BOOTLOADER_SRC_PATH = $(BOOTLOADER_MODULE_PATH)/src/${PLATFORM_NAME}
+include $(BOOTLOADER_MODULE_PATH)/src/rtl872x/sources.mk
diff --git a/bootloader/src/nRF52840/inflate_impl.cpp b/bootloader/src/nRF52840/inflate_impl.cpp
@@ -48,4 +48,8 @@ void inflate_free_ctx(inflate_ctx* ctx, char* buf) {
     g_alloced = false;
 }
 
+int inflate_reset_impl(inflate_ctx* ctx) {
+    return 0;
+}
+
 #endif // HAL_PLATFORM_COMPRESSED_OTA
diff --git a/bootloader/src/nRF52840/sources.mk b/bootloader/src/nRF52840/sources.mk
@@ -19,8 +19,9 @@ CPPSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/src/nRF52840/,int
 CPPSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/src/nRF52840/,dct_hal.cpp)
 CPPSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/src/nRF52840/,nrf_system_error.cpp)
 # FIXME
-CPPSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/src/nRF52840/,inflate.cpp)
+CPPSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/shared/,inflate.cpp)
 CPPSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/src/nRF52840/littlefs/,*.cpp)
+CPPSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/shared/,filesystem.cpp)
 CSRC += $(call target_files,$(BOOTLOADER_MODULE_PATH)/../hal/src/nRF52840/littlefs/,*.c)
 
 LDFLAGS += -T$(BOOTLOADER_SRC_PATH)/linker.ld

diff --git a/bootloader/src/rtl872x/inflate_impl.cpp b/bootloader/src/rtl872x/inflate_impl.cpp
@@ -48,4 +48,8 @@ void inflate_free_ctx(inflate_ctx* ctx, char* buf) {
     g_alloced = false;
 }
 
+int inflate_reset_impl(inflate_ctx* ctx) {
+    return 0;
+}
+
 #endif // HAL_PLATFORM_COMPRESSED_OTA
diff --git a/bootloader/src/rtl872x/rtl_it.c b/bootloader/src/rtl872x/rtl_it.c
@@ -22,13 +22,23 @@
 #include "hw_config.h"
 #include "button_hal.h"
 #include "hal_platform_config.h"
+#include "interrupts_irq.h"
 
 extern void Timing_Decrement(void);
 
 void HardFault_Handler(void) __attribute__(( naked ));
 void MemManage_Handler(void) __attribute__(( naked ));
 void BusFault_Handler(void) __attribute__(( naked ));
 void UsageFault_Handler(void) __attribute__(( naked ));
+void SecureFault_Handler(void) __attribute__(( naked ));
+
+static __attribute__((always_inline)) inline bool is_address_in_rom(uint32_t addr) {
+    // XXX: we don't have ROM linker symbols, should probably add them
+    if (addr >= 0x10100000 && addr < (0x101C8000 + 0x10000)) {
+        return true;
+    }
+    return false;
+}
 
 __attribute__((externally_visible)) void prvGetRegistersFromStack(uint32_t *pulFaultStackAddress, uint32_t panicCode ) {
     /* These are volatile to try and prevent the compiler/linker optimising them
@@ -81,6 +91,10 @@ __attribute__((externally_visible)) void prvGetRegistersFromStack(uint32_t *pulF
             PANIC(panicCode, "UsageFault");
             break; 
         }
+        case SecureFault: {
+            PANIC(panicCode, "SecureFault");
+            break;
+        }
         default: {
             // Shouldn't enter this case
             PANIC(panicCode, "Unknown");
@@ -94,6 +108,7 @@ __attribute__((externally_visible)) void prvGetRegistersFromStack(uint32_t *pulF
     }
 }
 
+
 __attribute__(( naked )) void Fault_Handler(uint32_t panic_code) {
     __asm volatile
     (
@@ -128,6 +143,30 @@ void UsageFault_Handler(void) {
     Fault_Handler(UsageFault);
 }
 
+void SecureFault_Handler_NS(void) {
+    Fault_Handler(SecureFault);
+}
+
+__attribute__((always_inline)) inline
+void jump_to_nonsecure(u32 Addr) {
+    __ASM volatile ("MOV r0, %0\n\t"
+        "BLXNS   r0\n\t" : : "r" (Addr));
+}
+
+__attribute__((used, section(".secure.ram.text")))
+void SecureFault_Handler(void) {
+    volatile uint32_t handler = (uint32_t)&SecureFault_Handler_NS;
+    if (SCB_NS->VTOR) {
+        volatile uint32_t handler_ns = ((uint32_t*)SCB_NS->VTOR)[IRQN_TO_IDX(SecureFault_IRQn)];
+        volatile bool in_rom = is_address_in_rom(handler_ns);
+        if (!in_rom) {
+            handler = handler_ns;
+        }
+    }
+    volatile uint32_t ptr = cmse_nsfptr_create(handler);
+    jump_to_nonsecure(ptr);
+}
+
 void SysTick_Handler(void)
 {
     System1MsTick();

diff --git a/bootloader/src/rtl872x/rtl_it.h b/bootloader/src/rtl872x/rtl_it.h
@@ -31,6 +31,7 @@ void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
+void SecureFault_Handler(void);
 
 #ifdef __cplusplus
 }