Pull request project-chip#2097: Cherry-pick: Increase the max supported KVS entries.

Merge in WMN_TOOLS/matter from cherry-pick/increase_kvs_entries to RC_2.3.1-1.3

Squashed commit of the following:

commit 7f0c9bc82e79b6a7ca7d7993529f34f259b01ec3
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date:   Tue Sep 10 15:01:55 2024 -0400

    Cherry-pick: Increase the max supported KVS entries.

Author: rcasallas-silabs

src/platform/silabs/KeyValueStoreManagerImpl.cpp

@@ -88,9 +88,9 @@ uint16_t KeyValueStoreManagerImpl::hashKvsKeyString(const char * key) const
 CHIP_ERROR KeyValueStoreManagerImpl::MapKvsKeyToNvm3(const char * key, uint16_t hash, uint32_t & nvm3Key, bool isSlotNeeded) const
 {
     CHIP_ERROR err;
-    char * strPrefix          = nullptr;
-    uint8_t firstEmptyKeySlot = kMaxEntries;
-    for (uint8_t keyIndex = 0; keyIndex < kMaxEntries; keyIndex++)
+    char * strPrefix           = nullptr;
+    uint16_t firstEmptyKeySlot = kMaxEntries;
+    for (uint16_t keyIndex = 0; keyIndex < kMaxEntries; keyIndex++)
     {
         if (mKvsKeyMap[keyIndex] == hash)
         {
@@ -170,7 +170,7 @@ void KeyValueStoreManagerImpl::ScheduleKeyMapSave(void)
                                       sizeof(mKvsKeyMap));
 #else
     SystemLayer().StartTimer(
-        std::chrono::duration_cast<System::Clock::Timeout>(System::Clock::Seconds32(SILABS_KVS_SAVE_DELAY_SECONDS)),
+        std::chrono::duration_cast<System::Clock::Timeout>(System::Clock::Seconds32(SL_KVS_SAVE_DELAY_SECONDS)),
         KeyValueStoreManagerImpl::OnScheduledKeyMapSave, NULL);
 #endif // defined(SLI_SI91X_MCU_INTERFACE) && CHIP_CONFIG_ENABLE_ICD_SERVER
 }
@@ -253,7 +253,7 @@ CHIP_ERROR KeyValueStoreManagerImpl::_Delete(const char * key)
 void KeyValueStoreManagerImpl::ErasePartition(void)
 {
     // Iterate over all the Matter Kvs nvm3 records and delete each one...
-    for (uint32_t nvm3Key = SilabsConfig::kMinConfigKey_MatterKvs; nvm3Key <= SilabsConfig::kMaxConfigKey_MatterKvs; nvm3Key++)
+    for (uint32_t nvm3Key = SilabsConfig::kMinConfigKey_MatterKvs; nvm3Key <= SilabsConfig::kConfigKey_KvsLastKeySlot; nvm3Key++)
     {
         SilabsConfig::ClearConfigValue(nvm3Key);
     }

src/platform/silabs/SilabsConfig.h

@@ -35,9 +35,11 @@
 #endif
 
 // Delay before Key/Value is actually saved in NVM
-#define SILABS_KVS_SAVE_DELAY_SECONDS 5
+#ifndef SL_KVS_SAVE_DELAY_SECONDS
+#define SL_KVS_SAVE_DELAY_SECONDS 2
+#endif
 
-static_assert((KVS_MAX_ENTRIES <= 255), "Implementation supports up to 255 Kvs entries");
+static_assert((KVS_MAX_ENTRIES <= 511), "Implementation supports up to 511 Kvs entries");
 static_assert((KVS_MAX_ENTRIES >= 30), "Mininimal Kvs entries requirement is not met");
 
 namespace chip {
@@ -89,7 +91,8 @@ class SilabsConfig
     // Persistent counter values set at runtime. Retained during factory reset.
     static constexpr uint8_t kMatterCounter_KeyBase = 0x74;
     // Persistent config values set at runtime. Cleared during factory reset.
-    static constexpr uint8_t kMatterKvs_KeyBase = 0x75;
+    static constexpr uint8_t kMatterKvs_KeyBase       = 0x75;
+    static constexpr uint8_t kMatterKvs_ExtendedRange = 0x76;
 
     // Key definitions for well-known configuration values.
     // Factory config keys
@@ -161,7 +164,8 @@ class SilabsConfig
     // Matter KVS storage Keys
     static constexpr Key kConfigKey_KvsStringKeyMap = SilabsConfigKey(kMatterKvs_KeyBase, 0x00);
     static constexpr Key kConfigKey_KvsFirstKeySlot = SilabsConfigKey(kMatterKvs_KeyBase, 0x01);
-    static constexpr Key kConfigKey_KvsLastKeySlot  = SilabsConfigKey(kMatterKvs_KeyBase, KVS_MAX_ENTRIES);
+    static constexpr Key kConfigKey_KvsLastKeySlot =
+        SilabsConfigKey(kMatterKvs_KeyBase + (KVS_MAX_ENTRIES >> 8), KVS_MAX_ENTRIES & UINT8_MAX);
 
     // Set key id limits for each group.
     static constexpr Key kMinConfigKey_MatterFactory = SilabsConfigKey(kMatterFactory_KeyBase, 0x00);
@@ -174,7 +178,9 @@ class SilabsConfig
     static constexpr Key kMaxConfigKey_MatterCounter = SilabsConfigKey(kMatterCounter_KeyBase, 0x1F);
 
     static constexpr Key kMinConfigKey_MatterKvs = kConfigKey_KvsStringKeyMap;
-    static constexpr Key kMaxConfigKey_MatterKvs = kConfigKey_KvsLastKeySlot;
+    static constexpr Key kMaxConfigKey_MatterKvs = SilabsConfigKey(kMatterKvs_ExtendedRange, 0xFF);
+    static_assert(kConfigKey_KvsLastKeySlot <= kMaxConfigKey_MatterKvs,
+                  "Configured KVS_MAX_ENTRIES overflows the reserved KVS Key range");
 
     static CHIP_ERROR Init(void);
     static void DeInit(void);

third_party/silabs/SiWx917_sdk.gni

@@ -173,7 +173,7 @@ template("siwx917_sdk") {
                                     # 1->SOC and 0->NCP
       "RSI_WLAN_API_ENABLE",
       "NVM3_DEFAULT_NVM_SIZE=40960",
-      "NVM3_DEFAULT_MAX_OBJECT_SIZE=4092",
+      "NVM3_DEFAULT_MAX_OBJECT_SIZE=${sl_nvm3_max_object_size}",
       "NVM3_LOCK_OVERRIDE=1",
       "KVS_MAX_ENTRIES=${kvs_max_entries}",
       "${silabs_mcu}=1",

third_party/silabs/efr32_sdk.gni

@@ -38,6 +38,7 @@ declare_args() {
   # enable by default for thread/non-wifi-ncp builds
   enable_openthread_cli = !(use_rs9116 || use_wf200 || use_SiWx917)
   kvs_max_entries = 255
+  sl_nvm3_max_object_size = 4092
 
   # Use Silabs factory data provider example.
   # Users can implement their own.
@@ -286,7 +287,7 @@ template("efr32_sdk") {
       "HARD_FAULT_LOG_ENABLE",
       "CORTEXM3_EFM32_MICRO",
       "NVM3_DEFAULT_NVM_SIZE=40960",
-      "NVM3_DEFAULT_MAX_OBJECT_SIZE=4092",
+      "NVM3_DEFAULT_MAX_OBJECT_SIZE=${sl_nvm3_max_object_size}",
       "KVS_MAX_ENTRIES=${kvs_max_entries}",
       "EFR32_OPENTHREAD_API",
       "PHY=EMBER_PHY_RAIL",