Update Linker command files and NV regions

adabreuti · adabreuti · commit 6ffdd59c79b2 · 2024-06-24T10:32:59.000-06:00
diff --git a/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp b/src/platform/cc13xx_26xx/ThreadStackManagerImpl.cpp
@@ -204,6 +204,14 @@ void ThreadStackManagerImpl::GetExtAddress(otExtAddress & aExtAddr)
     memcpy(aExtAddr.m8, extAddr->m8, OT_EXT_ADDRESS_SIZE);
 }
 
+bool ThreadStackManagerImpl::IsThreadAttached(){
+    return _IsThreadAttached();
+}
+
+bool ThreadStackManagerImpl::IsThreadEnabled(){
+    return _IsThreadEnabled();
+}
+
 } // namespace DeviceLayer
 } // namespace chip
 
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn b/src/platform/cc13xx_26xx/cc13x4_26x4/BUILD.gn
@@ -46,6 +46,8 @@ static_library("cc13x4_26x4") {
     "KeyValueStoreManagerImpl.h",
     "PlatformManagerImpl.h",
     "SystemPlatformConfig.h",
+    "../DefaultTestEventTriggerDelegate.cpp",
+    "../DefaultTestEventTriggerDelegate.h"
   ]
 
   deps = [ "${chip_root}/src/platform/logging:headers" ]
@@ -58,6 +60,7 @@ static_library("cc13x4_26x4") {
 
   public_deps = [
     "${chip_root}/src/crypto",
+    "${chip_root}/src/app:test-event-trigger",
     "${chip_root}/src/platform:platform_base",
   ]
 
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/OTAImageProcessorImpl.cpp b/src/platform/cc13xx_26xx/cc13x4_26x4/OTAImageProcessorImpl.cpp
@@ -103,8 +103,7 @@ bool OTAImageProcessorImpl::IsFirstImageRun()
 
     requestor = GetRequestorInstance();
 
-    return (requestor->GetTargetVersion() == runningSwVer) &&
-        (requestor->GetCurrentUpdateState() == chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum::kApplying);
+    return (requestor->GetCurrentUpdateState() == chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum::kApplying);
 }
 
 /* makes room for the new block if needed */
@@ -167,7 +166,7 @@ static bool writeExtFlashImgPages(NVS_Handle handle, ssize_t offset, MutableByte
 }
 
 /* Erase the MCUBoot slot */
-#define BOOT_SLOT_SIZE (0x000F6000) /* must match flash_map_backend */
+#define BOOT_SLOT_SIZE (0x000F2000) /* must match flash_map_backend */
 static bool eraseExtSlot(NVS_Handle handle)
 {
     int_fast16_t status;
@@ -200,6 +199,22 @@ static bool eraseExtHeader(NVS_Handle handle)
 
 CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()
 {
+    OTARequestorInterface * requestor = chip::GetRequestorInstance();
+    if (requestor == nullptr)
+    {
+        return CHIP_ERROR_INTERNAL;
+    }
+
+    uint32_t currentVersion;
+    uint32_t targetVersion = requestor->GetTargetVersion();
+    ReturnErrorOnFailure(DeviceLayer::ConfigurationMgr().GetSoftwareVersion(currentVersion));
+    if (currentVersion != targetVersion)
+    {
+        ChipLogError(SoftwareUpdate, "Current software version = %" PRIu32 ", expected software version = %" PRIu32, currentVersion,
+                     targetVersion);
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+
     return CHIP_NO_ERROR;
 }
 
@@ -268,6 +283,7 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)
     }
 
     /* reset SoC to kick MCUBoot */
+    ChipLogProgress(SoftwareUpdate,"Resetting device to kick off MCUBoot");
     SysCtrlSystemReset();
 }
 
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/ThreadStackManagerImpl.h b/src/platform/cc13xx_26xx/cc13x4_26x4/ThreadStackManagerImpl.h
@@ -95,6 +95,8 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     void _ProcMessage(otInstance * aInstance);
     void GetExtAddress(otExtAddress & aExtAddr);
     CHIP_ERROR GetBufferInfo(void);
+    bool IsThreadAttached(void);
+    bool IsThreadEnabled(void);
 
 private:
     // ===== Methods that implement the ThreadStackManager abstract interface.
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos.lds b/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos.lds
@@ -212,9 +212,9 @@ SECTIONS {
     /* End of executable code/data, NVS is not part of the OTA image */
     PROVIDE (_flash_end_address = .);
 
-    /* 5 pages of NV Memory (0x800 each) offset by 1 page for BIM/CCFG */
+    /* 12 pages of NV Memory (0x800 each) offset by 1 page for BIM/CCFG */
     /*.nvs (NOLOAD) : ALIGN(0x2000) { */
-    .nvs (0xFB800) (NOLOAD) : AT (0xFB800) ALIGN(0x800) {
+    .nvs (0xF8800) (NOLOAD) : AT (0xF8000) ALIGN(0x800) {
         *(.nvs)
     } > REGION_TEXT
 
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos_factory_data.lds b/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos_factory_data.lds
@@ -222,9 +222,9 @@ SECTIONS {
     /* End of executable code/data, NVS is not part of the OTA image */
     PROVIDE (_flash_end_address = .);
 
-    /* 5 pages of NV Memory (0x800 each) offset by 1 page for BIM/CCFG */
+    /* 12 pages of NV Memory (0x800 each) offset by 1 page for BIM/CCFG */
     /*.nvs (NOLOAD) : ALIGN(0x2000) { */
-    .nvs (0xFB000) (NOLOAD) : AT (0xFB000) ALIGN(0x800) {
+    .nvs (0xF8800) (NOLOAD) : AT (0xF8800) ALIGN(0x800) {
         *(.nvs)
     } > REGION_TEXT
 
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos_ota.lds b/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos_ota.lds
@@ -28,11 +28,13 @@ MEMORY
     MCUBOOT_HDR (RX) : ORIGIN = 0x00006000, LENGTH = 0x00000080
     FLASH (RX)       : ORIGIN = 0x00006080, LENGTH = 0x000F8780
     /*
-     * NVS is the last 5 pages of slot, this area is not erased 
+     * NVS is the last 12 pages of slot, this area is not erased 
      * during OTA. The slot size for the primary and secondary slots
-     * is therefore 0xF6000 (MCUBoot Header + all the remaining space)
+     * is therefore 0xF2000 (MCUBoot Header + all the remaining space
+     * leaves 0xF2800 of space, but the slot size needs to be divisible
+     * by 4k so the slot size therefore becomes 0xF2000)
      */
-    /* FLASH_NVS (RX)   : ORIGIN = 0x000FC000, LENGTH = 0x00002800 */
+    /* FLASH_NVS (RX)   : ORIGIN = 0x000F8800, LENGTH = 0x00006000 */
     FLASH_FACTORY_DATA (R) : ORIGIN = 0x000FE800, LENGTH = 0x900
     /*
      * Customer Configuration Area and Bootloader Backdoor configuration in
@@ -231,8 +233,8 @@ SECTIONS {
     /* End of executable code/data, NVS is not part of the OTA image */
     PROVIDE (_flash_end_address = .);
 
-    /* 5 pages of NV Memory (0x800 each) at the end of Flash */
-    .nvs (0xFC000) (NOLOAD) : AT (0xFC000) ALIGN(0x800) {
+    /* 12 pages of NV Memory (0x800 each) at the end of Flash */
+    .nvs (0xF8800) (NOLOAD) : AT (0xF8800) ALIGN(0x800) {
         *(.nvs)
     } > REGION_TEXT
 
diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos_ota_factory_data.lds b/src/platform/cc13xx_26xx/cc13x4_26x4/cc13x4_cc26x4_freertos_ota_factory_data.lds
@@ -28,11 +28,13 @@ MEMORY
     MCUBOOT_HDR (RX) : ORIGIN = 0x00006000, LENGTH = 0x00000080
     FLASH (RX)       : ORIGIN = 0x00006080, LENGTH = 0x000F8780
     /*
-     * NVS is the last 5 pages of slot, this area is not erased 
+     * NVS is the last 12 pages of slot, this area is not erased 
      * during OTA. The slot size for the primary and secondary slots
-     * is therefore 0xF6000 (MCUBoot Header + all the remaining space)
+     * is therefore 0xF2000 (MCUBoot Header + all the remaining space
+     * leaves 0xF2800 of space, but the slot size needs to be divisible
+     * by 4k so the slot size therefore becomes 0xF2000)
      */
-    /* FLASH_NVS (RX)   : ORIGIN = 0x000FC000, LENGTH = 0x00002800 */
+    /* FLASH_NVS (RX)   : ORIGIN = 0x000F8800, LENGTH = 0x00006000 */
     FLASH_FACTORY_DATA (R) : ORIGIN = 0x000FE800, LENGTH = 0x900
     /*
      * Customer Configuration Area and Bootloader Backdoor configuration in
@@ -231,8 +233,8 @@ SECTIONS {
     /* End of executable code/data, NVS is not part of the OTA image */
     PROVIDE (_flash_end_address = .);
 
-    /* 5 pages of NV Memory (0x800 each) at the end of Flash */
-    .nvs (0xFC000) (NOLOAD) : AT (0xFC000) ALIGN(0x800) {
+    /* 12 pages of NV Memory (0x800 each) at the end of Flash */
+    .nvs (0xF8800) (NOLOAD) : AT (0xF8800) ALIGN(0x800) {
         *(.nvs)
     } > REGION_TEXT
 
diff --git a/third_party/ti_simplelink_sdk/mcuboot/flash_map_backend.h b/third_party/ti_simplelink_sdk/mcuboot/flash_map_backend.h
@@ -77,7 +77,7 @@
 #define BOOT_SECONDARY_2_BASE_ADDRESS (BOOT_SECONDARY_1_BASE_ADDRESS + BOOT_SECONDARY_1_SIZE)
 #define BOOT_SECONDARY_2_SIZE BOOT_SLOT_2_SIZE
 #else
-#define BOOT_SLOT_1_SIZE 0x000F6000
+#define BOOT_SLOT_1_SIZE 0x000F2000
 
 /* Internal Flash locations */
 #define BOOTLOADER_BASE_ADDRESS 0x00000000
diff --git a/third_party/ti_simplelink_sdk/mcuboot/mcuboot_config/mcuboot_config.h b/third_party/ti_simplelink_sdk/mcuboot/mcuboot_config/mcuboot_config.h
@@ -27,7 +27,7 @@
 #define MCUBOOT_DOWNGRADE_PREVENTION
 #define MCUBOOT_HAVE_LOGGING 1
 #define MCUBOOT_IMAGE_NUMBER 1
-#define MCUBOOT_MAX_IMG_SECTORS 492
+#define MCUBOOT_MAX_IMG_SECTORS 484
 #define MCUBOOT_OVERWRITE_ONLY
 #define MCUBOOT_SIGN_EC256
 #define MCUBOOT_USE_FLASH_AREA_GET_SECTORS
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni b/third_party/ti_simplelink_sdk/ti_simplelink_executable.gni
@@ -176,7 +176,7 @@ template("ti_simplelink_executable") {
           "--align",
           "4",
           "--slot-size",
-          "0x000F6000",  # must match the flash_map_backend definitions
+          "0x000F2000",  # must match the flash_map_backend definitions
           "--version",
           matter_software_ver_str,
           "--pad-header",
diff --git a/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni b/third_party/ti_simplelink_sdk/ti_simplelink_sdk.gni
@@ -347,8 +347,8 @@ template("ti_simplelink_sdk") {
       configs -= [ "${build_root}/config/compiler:std_default" ]
       configs += [ ":${sdk_target_name}_posix_config" ]
       sources = [
+        "${chip_root}/src/platform/cc13xx_26xx/nvocmp.c",
         "${ti_simplelink_sdk_root}/source/ti/common/nv/crc.c",
-        "${ti_simplelink_sdk_root}/source/ti/common/nv/nvocmp.c",
       ]
 
       public_configs = [ ":${sdk_target_name}_config" ]
@@ -398,7 +398,7 @@ template("ti_simplelink_sdk") {
 
     defines += [
       "ONE_BLE_LIB_SIZE_OPTIMIZATION",
-      "NVOCMP_NVPAGES=5",
+      "NVOCMP_NVPAGES=12",
       "NVOCMP_NWSAMEITEM=1",
       "CC13X2P",
       "SYSCFG",

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ static_library("cc13x4_26x4") {`
`46`	`46`	`"KeyValueStoreManagerImpl.h",`
`47`	`47`	`"PlatformManagerImpl.h",`
`48`	`48`	`"SystemPlatformConfig.h",`
	`49`	`+ "../DefaultTestEventTriggerDelegate.cpp",`
	`50`	`+ "../DefaultTestEventTriggerDelegate.h"`
`49`	`51`	`]`
`50`	`52`
`51`	`53`	`deps = [ "${chip_root}/src/platform/logging:headers" ]`
`@@ -58,6 +60,7 @@ static_library("cc13x4_26x4") {`
`58`	`60`
`59`	`61`	`public_deps = [`
`60`	`62`	`"${chip_root}/src/crypto",`
	`63`	`+ "${chip_root}/src/app:test-event-trigger",`
`61`	`64`	`"${chip_root}/src/platform:platform_base",`
`62`	`65`	`]`
`63`	`66`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ bool OTAImageProcessorImpl::IsFirstImageRun()`
`103`	`103`
`104`	`104`	`requestor = GetRequestorInstance();`
`105`	`105`
`106`		`- return (requestor->GetTargetVersion() == runningSwVer) &&`
`107`		`- (requestor->GetCurrentUpdateState() == chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum::kApplying);`
	`106`	`+ return (requestor->GetCurrentUpdateState() == chip::app::Clusters::OtaSoftwareUpdateRequestor::OTAUpdateStateEnum::kApplying);`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`/* makes room for the new block if needed */`
`@@ -167,7 +166,7 @@ static bool writeExtFlashImgPages(NVS_Handle handle, ssize_t offset, MutableByte`
`167`	`166`	`}`
`168`	`167`
`169`	`168`	`/* Erase the MCUBoot slot */`
`170`		`-#define BOOT_SLOT_SIZE (0x000F6000) /* must match flash_map_backend */`
	`169`	`+#define BOOT_SLOT_SIZE (0x000F2000) /* must match flash_map_backend */`
`171`	`170`	`static bool eraseExtSlot(NVS_Handle handle)`
`172`	`171`	`{`
`173`	`172`	`int_fast16_t status;`
`@@ -200,6 +199,22 @@ static bool eraseExtHeader(NVS_Handle handle)`
`200`	`199`
`201`	`200`	`CHIP_ERROR OTAImageProcessorImpl::ConfirmCurrentImage()`
`202`	`201`	`{`
	`202`	`+ OTARequestorInterface * requestor = chip::GetRequestorInstance();`
	`203`	`+ if (requestor == nullptr)`
	`204`	`+ {`
	`205`	`+ return CHIP_ERROR_INTERNAL;`
	`206`	`+ }`
	`207`	`+`
	`208`	`+ uint32_t currentVersion;`
	`209`	`+ uint32_t targetVersion = requestor->GetTargetVersion();`
	`210`	`+ ReturnErrorOnFailure(DeviceLayer::ConfigurationMgr().GetSoftwareVersion(currentVersion));`
	`211`	`+ if (currentVersion != targetVersion)`
	`212`	`+ {`
	`213`	`+ ChipLogError(SoftwareUpdate, "Current software version = %" PRIu32 ", expected software version = %" PRIu32, currentVersion,`
	`214`	`+ targetVersion);`
	`215`	`+ return CHIP_ERROR_INCORRECT_STATE;`
	`216`	`+ }`
	`217`	`+`
`203`	`218`	`return CHIP_NO_ERROR;`
`204`	`219`	`}`
`205`	`220`
`@@ -268,6 +283,7 @@ void OTAImageProcessorImpl::HandleApply(intptr_t context)`
`268`	`283`	`}`
`269`	`284`
`270`	`285`	`/* reset SoC to kick MCUBoot */`
	`286`	`+ ChipLogProgress(SoftwareUpdate,"Resetting device to kick off MCUBoot");`
`271`	`287`	`SysCtrlSystemReset();`
`272`	`288`	`}`
`273`	`289`