samples: matter: Enabled use of OT without Zephyr L2

Pulled Matter change that enabled by default usage of openthread
without Zephyr L2 networking.

Signed-off-by: Kamil Kasperczyk <[email protected]>

Author: kkasperczyk-no

doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst

@@ -172,7 +172,12 @@ Gazell
 Matter
 ------
 
-* Added FastTrack Recertification and Portfolio Certification programs.
+* Added:
+
+  * FastTrack Recertification and Portfolio Certification programs.
+  * Matter-over-Thread apps can now use the OpenThread API directly, instead of using intermediate Zephyr L2 layer.
+    This change significantly reduces memory usage in Matter applications.
+    On the :zephyr:board:`nrf54l15dk`, it saves approximately 15 kB of RAM and 40 kB of flash.
 
 * Updated:
 
@@ -515,6 +520,7 @@ Matter samples
 * Added:
 
   * Support for the NFC onboarding for the ``nrf54l15dk/nrf54l15/cpuapp/ns`` board target.
+  * Disabled usage of Zephyr L2 networking layer in favor of using the OpenThread API directly in the Matter over Thread applications.
 
 * Updated:
 

samples/matter/common/src/app/matter_init.cpp

@@ -52,6 +52,7 @@
 
 #ifdef CONFIG_OPENTHREAD
 #include <platform/OpenThread/GenericNetworkCommissioningThreadDriver.h>
+#include <openthread.h>
 #endif
 
 #include <app/InteractionModelEngine.h>
@@ -194,6 +195,18 @@ CHIP_ERROR InitNetworkingStack()
 	return error;
 }
 
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+void LockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().LockThreadStack();
+}
+
+void UnlockOpenThreadTask(void)
+{
+    chip::DeviceLayer::ThreadStackMgr().UnlockThreadStack();
+}
+#endif /* CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT */
+
 #elif defined(CONFIG_CHIP_WIFI)
 
 CHIP_ERROR InitNetworkingStack()
@@ -205,7 +218,7 @@ CHIP_ERROR InitNetworkingStack()
 	return CHIP_NO_ERROR;
 }
 #else
-#error "No valid L2 network backend selected");
+#error "No valid networking backend selected");
 #endif /* CONFIG_OPENTHREAD */
 
 #define VerifyInitResultOrReturn(ec, msg)                                                                              \
@@ -238,7 +251,7 @@ void DoInitChipServer(intptr_t /* unused */)
 		VerifyInitResultOrReturn(sInitResult, "Custom pre server initialization failed");
 	}
 
-	/* Initialize L2 networking backend. */
+	/* Initialize networking backend. */
 	sInitResult = InitNetworkingStack();
 	VerifyInitResultOrReturn(sInitResult, "Cannot initialize IPv6 networking stack");
 
@@ -291,6 +304,15 @@ void DoInitChipServer(intptr_t /* unused */)
 	/* The default CommissionableDataProvider is set internally in the GenericConfigurationManagerImpl::Init(). */
 #endif
 
+#if CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT
+	// Set up OpenThread configuration when OpenThread is included
+	chip::Inet::EndPointStateOpenThread::OpenThreadEndpointInitParam nativeParams;
+	nativeParams.lockCb = LockOpenThreadTask;
+	nativeParams.unlockCb = UnlockOpenThreadTask;
+	nativeParams.openThreadInstancePtr = chip::DeviceLayer::ThreadStackMgrImpl().OTInstance();
+	sLocalInitData.mServerInitParams->endpointNativeParams = static_cast<void *>(&nativeParams);
+#endif /* CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT */
+
 #ifdef CONFIG_NCS_SAMPLE_MATTER_SETTINGS_SHELL
 	VerifyOrReturn(Nrf::PersistentStorageShell::Init(),
 		       LOG_ERR("Matter settings shell has been enabled, but it cannot be initialized."));

west.yml

@@ -157,7 +157,7 @@ manifest:
     - name: matter
       repo-path: sdk-connectedhomeip
       path: modules/lib/matter
-      revision: b1a600e3613187046a9a3cfa61886ad3e73c9885
+      revision: pull/621/head
       west-commands: scripts/west/west-commands.yml
       submodules:
         - name: nlio