[Zephyr][platform] Minimal adjustments in generic Zephyr platform abstraction layer (project-chip#71633)

* [Zephyr][platform] Updating the generic Zephyr platform layer to be compatible with Zephyr 4.4 baseline

Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com>

* Restyled by clang-format

* Update comments in files to address review comments

Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com>

* Restyled by clang-format

---------

Signed-off-by: Dina Benamar <dina.benamarelmaaroufi@nxp.com>
Co-authored-by: Restyled.io <commits@restyled.io>

Author: dinabenamar

config/zephyr/chip-module/CMakeLists.txt

@@ -59,10 +59,12 @@ if(CONFIG_CHIP)
         endif()
     endif()
 
-    # For ARM targets, use nosys.specs which provides stub implementations of
-    # system calls for embedded environments without full OS support
-    if (CONFIG_ARM)
-        matter_add_cflags(--specs=nosys.specs)
+    if(CONFIG_NEWLIB_LIBC)
+        # For ARM targets, use nosys.specs which provides stub implementations of
+        # system calls for embedded environments without full OS support
+        if (CONFIG_ARM)
+            matter_add_cflags(--specs=nosys.specs)
+        endif()
     endif()
 
     if(CONFIG_MBEDTLS)

src/platform/Zephyr/PlatformManagerImpl.cpp

@@ -49,7 +49,8 @@ PlatformManagerImpl PlatformManagerImpl::sInstance{ sChipThreadStack };
 
 static k_timer sOperationalHoursSavingTimer;
 
-#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR) &&    \
+    !defined(CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY)
 static bool sChipStackEntropySourceAdded = false;
 static int app_entropy_source(void * data, unsigned char * output, size_t len, size_t * olen)
 {
@@ -121,16 +122,19 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
 {
     CHIP_ERROR err;
 
-#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR) &&    \
+    !defined(CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY)
     // Minimum required from source before entropy is released ( with mbedtls_entropy_func() ) (in bytes)
     const size_t kThreshold = 16;
 #endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+       // && !defined(CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY)
 
     // Initialize the configuration system.
     err = Internal::ZephyrConfig::Init();
     SuccessOrExit(err);
 
-#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+#if !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR) &&    \
+    !defined(CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY)
     if (!sChipStackEntropySourceAdded)
     {
         // Add entropy source based on Zephyr entropy driver
@@ -139,6 +143,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack(void)
         sChipStackEntropySourceAdded = true;
     }
 #endif // !defined(CONFIG_NRF_SECURITY) && !defined(CONFIG_MBEDTLS_ZEPHYR_ENTROPY) && !defined(CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR)
+       // && !defined(CONFIG_MBEDTLS_PSA_DRIVER_GET_ENTROPY)
 
     // Call _InitChipStack() on the generic implementation base class to finish the initialization process.
     err = Internal::GenericPlatformManagerImpl_Zephyr<PlatformManagerImpl>::_InitChipStack();

src/platform/Zephyr/SysHeapMalloc.cpp

@@ -168,6 +168,9 @@ EXTERNALLY_VISIBLE void * WRAP(calloc)(size_t num, size_t size) ALIAS("_ZN4chip1
 EXTERNALLY_VISIBLE void * WRAP(realloc)(void * mem, size_t size) ALIAS("_ZN4chip11DeviceLayer6Malloc7ReallocEPvj");
 EXTERNALLY_VISIBLE void WRAP(free)(void * mem) ALIAS("_ZN4chip11DeviceLayer6Malloc4FreeEPv");
 
+#if defined(CONFIG_NEWLIB_LIBC)
+/* Newlib-only reentrant hooks */
+
 EXTERNALLY_VISIBLE void * WRAP(_malloc_r)(_reent *, size_t size)
 {
     return WRAP(malloc)(size);
@@ -188,6 +191,8 @@ EXTERNALLY_VISIBLE void WRAP(_free_r)(_reent *, void * mem)
     WRAP(free)(mem);
 }
 
+#endif // CONFIG_NEWLIB_LIBC
+
 } // extern "C"
 
 #endif // CONFIG_CHIP_MALLOC_SYS_HEAP_OVERRIDE