Pull request project-chip#1639: Pull request project-chip#1608: Cherry-pick:Adjust the default discovery timeout when BLE extend announcement is enabled. (project-chip#32300)

Merge in WMN_TOOLS/matter from cherry-pick/default_ble_discovery to RC_2.3.0-1.3-alpha.3

Squashed commit of the following:

commit 20312119b856eacabcde4beec9703a8dbb880957
Author: Junior Martinez <Junior.Martinez@silabs.com>
Date:   Tue Mar 5 20:39:44 2024 +0000

    Pull request project-chip#1608: Cherry-pick:Adjust the default discovery timeout when BLE extend announcement is enabled. (project-chip#32300)

    Merge in WMN_TOOLS/matter from cherry-pick/ble_extend_adjustment_discovery_timeout to RC_2.3.0-1.3

    Squashed commit of the following:

    commit 5bcef0704cf5b2c29657f0cd433260fab599c502
    Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
    Date:   Mon Feb 26 08:53:11 2024 -0500

        Adjust the default discovery timeout when BLE extend announcement is enabled. (project-chip#32300)

        * add build arg to enable BLE extended advertisement feature

        * Set a increased based value for the Discovery timeout when BLE extended advertising is set

Author: mkardous-silabs

src/include/platform/CHIPDeviceConfig.h

@@ -715,8 +715,19 @@ static_assert(CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING_INTERVAL_MIN < CHIP_DEVICE_
  * Time in seconds that a factory new device will advertise commissionable node discovery.
  */
 #ifndef CHIP_DEVICE_CONFIG_DISCOVERY_TIMEOUT_SECS
+#if CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
+/**
+ * By default, the extended announcement, when enabled, starts its extended advertising 15 mins
+ * after the standard slow advertisement. Time at which the default discovery time would close the
+ * commissioning window and stop the BLE.
+ * Therefore, when CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING is enabled bump the default Discovery timeout
+ * to the maximum allowed by the spec. 48h.
+ */
+#define CHIP_DEVICE_CONFIG_DISCOVERY_TIMEOUT_SECS (60 * 60 * 48)
+#else
 #define CHIP_DEVICE_CONFIG_DISCOVERY_TIMEOUT_SECS (15 * 60)
-#endif
+#endif // CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING
+#endif // CHIP_DEVICE_CONFIG_DISCOVERY_TIMEOUT_SECS
 
 /**
  * CHIP_DEVICE_CONFIG_MAX_DISCOVERED_NODES

src/platform/silabs/CHIPDevicePlatformConfig.h

@@ -140,6 +140,8 @@
 
 #define CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE 25
 
+#define CHIP_DEVICE_CONFIG_BLE_EXT_ADVERTISING SL_MATTER_BLE_EXTENDED_ADV
+
 /*
     ICD Configuration Defines
 */

third_party/silabs/efr32_sdk.gni

@@ -46,6 +46,9 @@ declare_args() {
   # Enable Segger System View
   use_system_view = false
 
+  # Enable the BLE extended advertisement
+  sl_matter_ble_extended_adv = false
+
   # ICD Openthread Configuration flags
   sl_ot_idle_interval_ms = 15000  # 15s Idle Intervals
   sl_ot_active_interval_ms = 200  # 200ms Active Intervals
@@ -300,6 +303,7 @@ template("efr32_sdk") {
       "SL_RAIL_LIB_MULTIPROTOCOL_SUPPORT=1",
       "SL_RAIL_UTIL_PA_CONFIG_HEADER=<sl_rail_util_pa_config.h>",
       "RADIO_CONFIG_DMP_SUPPORT=1",
+      "SL_MATTER_BLE_EXTENDED_ADV=${sl_matter_ble_extended_adv}",
 
       #"__STACK_SIZE=0",
     ]