subsys: add Kconfig for BLE while Zigbee and button switch

Make CHIPoBLE during the Zigbee phase, user button switching, and hold
time independently configurable.

Signed-off-by: Eduardo Montoya <eduardo.montoya@nordicsemi.no>

Author: edmont

include/zigbee/matter_coexistence.h

@@ -43,8 +43,11 @@ struct zigbee_matter_coexistence_callbacks {
 	 */
 	int (*zigbee_start)(void);
 
-	/** Hook run on the Zigbee worker thread once the Matter board has
-	 *  finished initialisation (first CHIPoBLE advertising-started event).
+	/** Hook run on the Zigbee worker thread once Matter is ready for the
+	 *  Zigbee phase (CHIPoBLE advertising started when
+	 *  @kconfig{CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE},
+	 *  otherwise after the sample calls
+	 *  @ref zigbee_matter_coexistence_signal_matter_board_init).
 	 *  Typically used to register a chained Zigbee button handler with
 	 *  the DK buttons library after @c dk_buttons_init() has completed.
 	 *  May be NULL.
@@ -69,6 +72,16 @@ struct zigbee_matter_coexistence_callbacks {
  */
 int zigbee_matter_coexistence_run(const struct zigbee_matter_coexistence_callbacks *cb);
 
+/** @brief Notify the coexistence runtime that Matter board init is complete.
+ *
+ * Call from the Matter worker thread after @c Nrf::Matter::StartServer()
+ * returns successfully when
+ * @kconfig{CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE} is
+ * disabled. Unblocks the Zigbee worker so it can chain button handlers and
+ * start the Zigbee stack.
+ */
+void zigbee_matter_coexistence_signal_matter_board_init(void);
+
 /** @brief Process button events for user-triggered protocol switching.
  *
  * Detects a long press on @p switch_button and requests a protocol switch

samples/light_bulb/src/app_task_matter.cpp

@@ -22,6 +22,11 @@
 #include <app/server/Server.h>
 #include <setup_payload/OnboardingCodesUtil.h>
 
+#if defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE) && \
+	!defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE)
+#include <zigbee/matter_coexistence.h>
+#endif
+
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
@@ -213,7 +218,14 @@ CHIP_ERROR AppTask::Init() {
 
   ReturnErrorOnFailure(sIdentifyCluster.Init());
 
-  return Nrf::Matter::StartServer();
+  ReturnErrorOnFailure(Nrf::Matter::StartServer());
+
+#if defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE) && \
+	!defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE)
+  zigbee_matter_coexistence_signal_matter_board_init();
+#endif
+
+  return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR AppTask::StartApp() {

samples/light_bulb/src/app_task_zigbee.cpp

@@ -21,6 +21,7 @@
 #include <zephyr/drivers/pwm.h>
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>
 #ifdef CONFIG_ZIGBEE_SCENES
 #include <zephyr/settings/settings.h>
 #endif

samples/light_switch/src/app_task.cpp

@@ -15,6 +15,11 @@
 
 #include <setup_payload/OnboardingCodesUtil.h>
 
+#if defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE) && \
+	!defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE)
+#include <zigbee/matter_coexistence.h>
+#endif
+
 #include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(app, CONFIG_CHIP_APP_LOG_LEVEL);
@@ -157,7 +162,14 @@ CHIP_ERROR AppTask::Init()
 
 	ReturnErrorOnFailure(sIdentifyCluster.Init());
 
-	return Nrf::Matter::StartServer();
+	ReturnErrorOnFailure(Nrf::Matter::StartServer());
+
+#if defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE) && \
+	!defined(CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE)
+	zigbee_matter_coexistence_signal_matter_board_init();
+#endif
+
+	return CHIP_NO_ERROR;
 }
 
 CHIP_ERROR AppTask::StartApp()

samples/light_switch/src/app_task_zigbee.c

@@ -16,6 +16,7 @@
 #include <zigbee/matter_coexistence.h>
 
 #include <zephyr/kernel.h>
+#include <zephyr/sys/util.h>
 #include <zephyr/device.h>
 #include <zephyr/logging/log.h>
 #include <dk_buttons_and_leds.h>

subsys/lib/zigbee_matter_coexistence/Kconfig

@@ -7,7 +7,7 @@
 menuconfig ZIGBEE_MATTER_COEXISTENCE
 	bool "Matter + Zigbee coexistence runtime for combined applications"
 	depends on CHIP && SETTINGS && ZIGBEE_ADD_ON
-	depends on BT && CHIP_ENABLE_PAIRING_AUTOSTART
+	depends on BT
 	depends on CHIP_LAST_FABRIC_REMOVED_ERASE_AND_REBOOT
 	select ZIGBEE_MATTER_PROTOCOL_STATE
 	default y
@@ -18,15 +18,51 @@ menuconfig ZIGBEE_MATTER_COEXISTENCE
 	  commissioning, and updates the persistent protocol state across
 	  reboots and factory resets.
 
-	  Requires Matter BLE commissioning: the Zigbee worker waits for
-	  Matter to start BLE advertising so the buttons library is ready
-	  before the sample chains its Zigbee button handler onto it.
-
-	  On last-fabric removal the device reboots and the
-	  Zigbee-first boot path restores Zigbee operation.
+	  On last-fabric removal the device reboots and the Zigbee-first boot
+	  path restores Zigbee operation (unless configured otherwise).
 
 if ZIGBEE_MATTER_COEXISTENCE
 
+config ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE
+	bool "Allow CHIPoBLE commissioning while Zigbee is active"
+	default y
+	depends on CHIP_ENABLE_PAIRING_AUTOSTART
+	help
+	  When enabled, Matter may start BLE commissioning advertising while
+	  the Zigbee stack owns the 802.15.4 radio. The Zigbee worker waits
+	  for the first CHIPoBLE advertising-started event before chaining
+	  sample button handlers and starting Zigbee.
+
+	  Requires CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART in the application.
+
+	  When disabled, the sample must call
+	  zigbee_matter_coexistence_signal_matter_board_init() after Matter
+	  server init completes.
+	  The Zigbee worker then proceeds without waiting for Thread
+	  or DNS-SD. Set CONFIG_CHIP_ENABLE_PAIRING_AUTOSTART=n if Matter
+	  commissioning over BLE is not needed until after a protocol switch.
+
+config ZIGBEE_MATTER_COEXISTENCE_BUTTON_SWITCH
+	bool "Enable user protocol switch on button long press"
+	default y
+	help
+	  When enabled, samples may call
+	  zigbee_matter_coexistence_process_switch_button() to switch between
+	  Zigbee and Matter using a long button press.
+
+	  When disabled, protocol changes rely on Matter commissioning events
+	  and factory reset only.
+
+config ZIGBEE_MATTER_COEXISTENCE_SWITCH_BUTTON_PRESS_TIME_SECONDS
+	int "Protocol-switch button hold time (seconds)"
+	depends on ZIGBEE_MATTER_COEXISTENCE_BUTTON_SWITCH
+	range 1 30
+	default 5
+	help
+	  Hold time required when pressing the protocol-switch button.
+	  When the timer expires, the coexistence runtime attempts to switch
+	  to the other protocol unless pairing or commissioning is in progress.
+
 config ZIGBEE_MATTER_COEXISTENCE_ZIGBEE_THREAD_STACK_SIZE
 	int "Zigbee worker thread stack size (bytes)"
 	default 2048
@@ -43,15 +79,6 @@ config ZIGBEE_MATTER_COEXISTENCE_MATTER_THREAD_PRIORITY
 	int "Matter worker thread priority"
 	default 3
 
-config ZIGBEE_MATTER_COEXISTENCE_SWITCH_BUTTON_PRESS_TIME_SECONDS
-	int "Protocol-switch button hold time (seconds)"
-	range 1 30
-	default 5
-	help
-	  Hold time required when pressing the protocol-switch button.
-	  When the timer expires, the coexistence runtime attempts to switch
-	  to the other protocol unless pairing or commissioning is in progress.
-
 module = ZIGBEE_MATTER_COEXISTENCE
 module-str = Matter/Zigbee coexistence
 source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"

subsys/lib/zigbee_matter_coexistence/coexistence.cpp

@@ -37,6 +37,11 @@ atomic_t g_switch_press_active = ATOMIC_INIT(0);
 void switch_to_thread_radio(void);
 void switch_to_zigbee_radio(void);
 
+void matter_board_init_signal(void)
+{
+	k_sem_give(&matter_init_done_sem);
+}
+
 void protocol_switch_work_handler(struct k_work *work)
 {
 	ARG_UNUSED(work);
@@ -140,12 +145,14 @@ void matter_event_handler(const chip::DeviceLayer::ChipDeviceEvent *event, intpt
 	ARG_UNUSED(arg);
 
 	switch (event->Type) {
+#ifdef CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE
 	case chip::DeviceLayer::DeviceEventType::kCHIPoBLEAdvertisingChange:
 		if (event->CHIPoBLEAdvertisingChange.Result ==
 		    chip::DeviceLayer::kActivity_Started) {
-			k_sem_give(&matter_init_done_sem);
+			matter_board_init_signal();
 		}
 		break;
+#endif /* CONFIG_ZIGBEE_MATTER_COEXISTENCE_CHIP_BLE_WHILE_ZIGBEE */
 	case chip::DeviceLayer::DeviceEventType::kSecureSessionEstablished:
 		if (protocol_state_get() == PROTOCOL_ZIGBEE &&
 		    !chip::DeviceLayer::ThreadStackMgr().IsThreadAttached()) {
@@ -182,6 +189,11 @@ void matter_event_handler(const chip::DeviceLayer::ChipDeviceEvent *event, intpt
 
 } /* namespace */
 
+extern "C" void zigbee_matter_coexistence_signal_matter_board_init(void)
+{
+	matter_board_init_signal();
+}
+
 extern "C" int zigbee_matter_coexistence_run(const struct zigbee_matter_coexistence_callbacks *cb)
 {
 	__ASSERT(cb != NULL, "Null callback table");