[NXP] Add BLE pairing and bonding after commissioning (project-chip#40704)

* [nxp][platform][common][ble] Temporary fix for multiple ble connections.

 * this bug was introduced in the initial multiple ble connections PR,
   blekw_stop_advertising should be called only when there was no successful
   connection. When a connection is made, advertising is stoped by the lib.
   If called in this case, it will cause an error which doesn't any effect,
   it just shows in the logs.
 * this will work only for the first connection, if multiple connections are
   made, the function will be called on successful connection showing the error.
   A rework of this feature is needed.

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][platform][common][ble] Add ble pairing and bonding changes

 * allow device to use random ble address when matter commissioning
   and public ble address in extra ble connections, this is needed
   for pairing and bonding. This is a workaround. Setting of ble
   advertising data at runtime is needed in the future.
 * don't send Gap_RejectPairing when pairing enabled, the pairing
   request will be acceped from the ble host code.
 * add DisconnectAndUnbond to allow disconnecting and removing ble bonding
   data when factory resetting.

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][examples][platform][common] Add FactoryReset in BLEApplicationManager

 * feature can be used by each application to implement its factory reset mechanism
   in BLEApplicationManager (e.g. erasing ble bonding data)
 * add dummy FactoryReset implementation in BLEApplicationManagerEmpty
 * add dummy FactoryReset implementation in BleZephyrManagerApp
 * call FactoryReset BLEApplicationManager in AppTaskBase::FactoryResetHandler
 * call FactoryResetHandler in ButtonBle to align with matter cli

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][examples][platform][mcxw] BLEApplicationManager changes

 * add FactoryReset function to disconnect and erase bounding data for all ble
   connections
 * move BLEApplicationManager.cpp to NXPHostBLEApplicationManager.cpp
   in common/app_ble/source directory

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][gn][examples][lock-app][mcxw71] BLE changes

 * use ble bonding nvm functions (App_NvmRead, App_NvmWrite, App_NvmErase)
   implementation
 * align extra gatt macros with cmake kconfigs
 * use common NXPHostBLEApplicationManager.cpp
   (originating from mcxw71 BLEApplicationManager.cpp)

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][cmake][config] Add multiple ble connections kconfig

 * add kconfigs for ble pairing and bonding

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][cmake][examples][platform][common] Rework CHIP_APP_BLE_MANAGER_SELECTION & add kconfigs

 * change CHIP_APP_BLE_MANAGER_CUSTOM to CHIP_APP_BLE_MANAGER_CUSTOM_BLE_ZEPHYR
 * add CHIP_APP_BLE_MANAGER_CUSTOM_NXP_BLE_HOST which currently depends on
   CHIP_NXP_MULTIPLE_BLE_CONNECTIONS and not on CHIP_CUSTOM_BLE_ADV_DATA
   as it doesn't yet have custom ble adv data
 * use common app_ble/source/NXPHostBLEApplicationManager.cpp when
   CHIP_APP_BLE_MANAGER_CUSTOM_NXP_BLE_HOST
 * add kconfigs for extra gatt db header and gatt uuid header

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][common] Update nxp_matter_support repo

Signed-off-by: Andrei Menzopol <[email protected]>

* Restyled by whitespace

* Restyled by clang-format

* Restyled by gn

* [nxp][cmake][examples][platform][common] Fix typo

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][examples][all-clusters-app][zephyr] Add BLE application manager

Signed-off-by: Andrei Menzopol <[email protected]>

* [nxp][examples][laundry-washer-app][zephyr] Add BLE application manager

Signed-off-by: Andrei Menzopol <[email protected]>

---------

Signed-off-by: Andrei Menzopol <[email protected]>
Co-authored-by: Restyled.io <[email protected]>

Author: andrei-menzopol

config/nxp/chip-cmake-freertos/CMakeLists.txt

@@ -52,6 +52,7 @@ matter_add_gn_arg_bool("nxp_use_factory_data" ${CONFIG_CHIP_FACTORY_DATA})
 matter_add_gn_arg_bool("nxp_enable_secure_whole_factory_data" ${CONFIG_CHIP_ENABLE_SECURE_WHOLE_FACTORY_DATA})
 matter_add_gn_arg_bool("nxp_enable_secure_EL2GO_factory_data" ${CONFIG_CHIP_ENABLE_EL2GO_FACTORY_DATA})
 matter_add_gn_arg_bool("nxp_enable_matter_cli" CONFIG_CHIP_LIB_SHELL)
+matter_add_gn_arg_bool("nxp_multiple_ble_connections" CONFIG_CHIP_NXP_MULTIPLE_BLE_CONNECTIONS)
 matter_add_gn_arg_bool("nxp_enable_pairing_autostart" CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART)
 matter_add_gn_arg_bool("nxp_use_low_power" CONFIG_NXP_USE_LOW_POWER)
 matter_add_gn_arg_bool("nxp_use_plain_dac_key" CONFIG_NXP_USE_PLAIN_DAC_KEY)

config/nxp/cmake/Kconfig.matter.nxp

@@ -272,6 +272,24 @@ choice CHIP_OTA_REQUEST_UPGRADE_TYPE
 
 endchoice
 
+config CHIP_NXP_MULTIPLE_BLE_CONNECTIONS
+	bool "Use Multiple BLE connections after commissioning"
+	depends on CHIP_NXP_PLATFORM_MCXW71 || CHIP_NXP_PLATFORM_MCXW72
+	help
+	  Enable app usage of Multiple BLE connections after commissioning.
+
+config CHIP_NXP_BLE_PAIRING
+	bool "Enable BLE Pairing"
+	default y if CHIP_NXP_MULTIPLE_BLE_CONNECTIONS
+	help
+	  Enable BLE Pairing for Multiple BLE connections after commissioning.
+
+config CHIP_NXP_BLE_BONDING
+	bool "Enable BLE Bonding"
+	default y if CHIP_NXP_MULTIPLE_BLE_CONNECTIONS
+	help
+	  Enable BLE Bonding for Multiple BLE connections after commissioning.
+
 config NXP_USE_SMU2_STATIC
 	bool "Use SMU2"
 	depends on CHIP_NXP_PLATFORM_MCXW71 || CHIP_NXP_PLATFORM_MCXW72

examples/all-clusters-app/nxp/zephyr/CMakeLists.txt

@@ -51,6 +51,7 @@ target_include_directories(app
     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/device_callbacks/include
     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/factory_data/include
     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_task/include
+    ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_ble/include
 )
 
 target_sources(app
@@ -67,6 +68,16 @@ target_sources(app
     ${EXAMPLE_PLATFORM_NXP_ZEPHYR_DIR}/factory_data/source/AppFactoryDataExample.cpp
 )
 
+if(CONFIG_CHIP_CUSTOM_BLE_ADV_DATA)
+    target_sources(app PRIVATE
+                    ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_ble/source/BleZephyrManagerApp.cpp
+    )
+else()
+    target_sources(app PRIVATE
+                    ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_ble/source/BLEApplicationManagerEmpty.cpp
+    )
+endif()
+
 if(CONFIG_CHIP_OTA_REQUESTOR)
     target_sources(app PRIVATE
                     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/ota_requestor/source/OTARequestorInitiatorCommon.cpp

examples/laundry-washer-app/nxp/zephyr/CMakeLists.txt

@@ -53,6 +53,7 @@ target_include_directories(app
     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/device_callbacks/include
     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/factory_data/include
     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_task/include
+    ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_ble/include
 )
 
 target_sources(app
@@ -69,6 +70,16 @@ target_sources(app
     ${EXAMPLE_PLATFORM_NXP_ZEPHYR_DIR}/factory_data/source/AppFactoryDataExample.cpp
 )
 
+if(CONFIG_CHIP_CUSTOM_BLE_ADV_DATA)
+    target_sources(app PRIVATE
+                    ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_ble/source/BleZephyrManagerApp.cpp
+    )
+else()
+    target_sources(app PRIVATE
+                    ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/app_ble/source/BLEApplicationManagerEmpty.cpp
+    )
+endif()
+
 if(CONFIG_CHIP_OTA_REQUESTOR)
     target_sources(app PRIVATE
                     ${EXAMPLE_PLATFORM_NXP_COMMON_DIR}/ota_requestor/source/OTARequestorInitiatorCommon.cpp

examples/lock-app/nxp/mcxw71/BUILD.gn

@@ -93,9 +93,10 @@ mcxw71_sdk("sdk") {
   if (nxp_multiple_ble_connections) {
     include_dirs += [ "${example_platform_dir}/app_ble/include" ]
     defines += [
-      "EXTRA_GATT_DB_HEADER=\"extra_gatt_db.h\"",
-      "EXTRA_GATT_UUID_HEADER=\"extra_gatt_uuid128.h\"",
+      "CONFIG_CHIP_APP_EXTRA_GATT_DB_HEADER=\"extra_gatt_db.h\"",
+      "CONFIG_CHIP_APP_EXTRA_GATT_UUID_HEADER=\"extra_gatt_uuid128.h\"",
     ]
+    sources += [ "${support_common_platform_dir}/ble/ble_nvm_bonding.c" ]
   }
 }
 
@@ -199,8 +200,9 @@ mcxw71_executable("lock_app") {
   }
 
   if (nxp_multiple_ble_connections) {
-    sources +=
-        [ "${example_platform_dir}/app_ble/source/BLEApplicationManager.cpp" ]
+    sources += [
+      "${common_example_dir}/app_ble/source/NXPHostBLEApplicationManager.cpp",
+    ]
   } else {
     sources += [
       "${common_example_dir}/app_ble/source/BLEApplicationManagerEmpty.cpp",

examples/platform/nxp/common/Kconfig

@@ -48,19 +48,40 @@ config CHIP_APP_BLE_MANAGER
 if CHIP_APP_BLE_MANAGER
     choice CHIP_APP_BLE_MANAGER_SELECTION
         prompt "Select Application BLE Manager"
-
-        config CHIP_APP_BLE_MANAGER_CUSTOM
-            bool "App Custom BLE Manager"
+        
+        config CHIP_APP_BLE_MANAGER_CUSTOM_BLE_ZEPHYR
+            bool "App Custom BLE Manager Zephyr"
             depends on CHIP_CUSTOM_BLE_ADV_DATA && CHIP_DEVICE_USE_ZEPHYR_BLE
             help
-                Enable application custom BLE manager.
+                Enable application custom Zephyr BLE manager.
 
+        config CHIP_APP_BLE_MANAGER_CUSTOM_NXP_BLE_HOST
+            bool "App Custom BLE Manager MCXW7x"
+            depends on CHIP_NXP_MULTIPLE_BLE_CONNECTIONS && !CHIP_DEVICE_USE_ZEPHYR_BLE
+            help
+                Enable application custom MCXW7x BLE manager.
+        
         config CHIP_APP_BLE_MANAGER_EMPTY
             bool "App BLE Manager Empty"
             help
                 Enable application BLE manager empty implementation.
 
     endchoice # CHIP_APP_BLE_MANAGER
+
+    config CHIP_APP_EXTRA_GATT_DB_HEADER
+        string "Extra application Gatt db header"
+        default "<$(CHIP_ROOT)/examples/platform/nxp/mcxw71/app_ble/include/extra_gatt_db.h>" if CHIP_NXP_PLATFORM_MCXW71 || CHIP_NXP_PLATFORM_MCXW72
+        depends on CHIP_NXP_MULTIPLE_BLE_CONNECTIONS
+        help
+        Set path to extra application Gatt db header.
+
+    config CHIP_APP_EXTRA_GATT_UUID_HEADER
+        string "Extra application Gatt UUID header"
+        default "<$(CHIP_ROOT)/examples/platform/nxp/mcxw71/app_ble/include/extra_gatt_uuid128.h>" if CHIP_NXP_PLATFORM_MCXW71 || CHIP_NXP_PLATFORM_MCXW72
+        depends on CHIP_NXP_MULTIPLE_BLE_CONNECTIONS
+        help
+        Set path to extra application Gatt UUID header.
+
 endif # CHIP_APP_BLE_MANAGER
 
 config DIAG_LOGS_DEMO

examples/platform/nxp/common/app_ble/include/BLEApplicationManager.h

@@ -33,6 +33,7 @@ class BLEApplicationManager
 public:
     void Init();
     void EnableMultipleConnectionsHandler();
+    void FactoryReset();
 
 private:
     static void EnableMultipleConnections(intptr_t arg);

examples/platform/nxp/common/app_ble/source/BLEApplicationManagerEmpty.cpp

@@ -37,3 +37,8 @@ void BLEApplicationManager::EnableMultipleConnections(intptr_t arg)
 {
     /*Empty implementation. Intentionally left blank */
 }
+
+void BLEApplicationManager::FactoryReset(void)
+{
+    /*Empty implementation. Intentionally left blank */
+}

examples/platform/nxp/common/app_ble/source/BleZephyrManagerApp.cpp

@@ -98,3 +98,8 @@ void BLEApplicationManager::Init(void)
     chip::DeviceLayer::Internal::BLEMgrImpl().SetCustomAdvertising(Span<bt_data>(advertisingData));
     chip::DeviceLayer::Internal::BLEMgrImpl().SetCustomScanResponse(Span<bt_data>(scanResponseData));
 }
+
+void BLEApplicationManager::FactoryReset(void)
+{
+    /*Empty implementation. Intentionally left blank */
+}

examples/platform/nxp/mcxw71/app_ble/source/BLEApplicationManager.cpp renamed to examples/platform/nxp/common/app_ble/source/NXPHostBLEApplicationManager.cpp

@@ -1,7 +1,7 @@
 /*
  *
  *    Copyright (c) 2024 Project CHIP Authors
- *    Copyright 2024 NXP
+ *    Copyright 2024-2025 NXP
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,9 @@
 #include "gatt_db_app_interface.h"
 #include "gatt_db_handles.h"
 
+extern "C" void btSettingsInit(void);
+extern "C" void btSettingsWipe(void);
+
 using namespace ::chip::DeviceLayer;
 using namespace ::chip::DeviceLayer::Internal;
 using namespace ::chip::NXP::App;
@@ -63,6 +66,10 @@ void BLEApplicationManager::Init(void)
     {
         ChipLogError(DeviceLayer, "Error while adding BLE write notification handle");
     }
+
+#if gAppUseBonding_d
+    btSettingsInit();
+#endif
 }
 
 void BLEApplicationManager::EnableMultipleConnectionsHandler(void)
@@ -92,3 +99,18 @@ void BLEApplicationManager::EnableMultipleConnections(intptr_t arg)
         ChipLogProgress(DeviceLayer, "Device must be commissioned before adding multiple BLE connections");
     }
 }
+
+void BLEApplicationManager::FactoryReset(void)
+{
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    err = DeviceLayer::Internal::BLEMgrImpl().DisconnectAndUnbond();
+    if (err != CHIP_NO_ERROR)
+    {
+        ChipLogError(DeviceLayer, "Error during BLEMgrImpl().DisconnectAndUnbond()");
+    }
+
+#if gAppUseBonding_d
+    btSettingsWipe();
+#endif
+}