[Telink] Zephyr v3.7 update changes

Adopted changes for Telink B9x board series for upcoming update of Zephyr version. Fixed err output from InitChipStack in mainCommon. Tested advertisement tested manually.
project-chip · Dec 2, 2024 · 3663762 · 3663762
1 parent 4c69001
commit 3663762
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 8 deletions.
diff --git a/config/telink/chip-module/Kconfig.defaults b/config/telink/chip-module/Kconfig.defaults
@@ -80,12 +80,30 @@ config SYSTEM_WORKQUEUE_STACK_SIZE
     default 616 if PM
 
 config HEAP_MEM_POOL_SIZE
-    default 256
+    default 1280
 
 config COMMON_LIBC_MALLOC_ARENA_SIZE
     default 20716 if SOC_RISCV_TELINK_TL321X || SOC_SERIES_RISCV_TELINK_B9X_RETENTION
     default 12288
 
+choice LIBC_IMPLEMENTATION
+	default NEWLIB_LIBC
+endchoice
+
+config MBEDTLS_ENTROPY_ENABLED
+    bool
+    default y
+
+config MBEDTLS_ZEPHYR_ENTROPY
+    bool
+    default y
+
+config MBEDTLS_CTR_DRBG_ENABLED
+	default y
+
+config MBEDTLS_CIPHER_AES_ENABLED
+	default y
+
 config NET_IPV6_MLD
     default n if PM
     default y

diff --git a/examples/platform/telink/common/src/mainCommon.cpp b/examples/platform/telink/common/src/mainCommon.cpp
@@ -174,6 +174,6 @@ int main(void)
     err = GetAppTask().StartApp();
 
 exit:
-    LOG_ERR("Exit err %" CHIP_ERROR_FORMAT, err.Format());
+    LOG_ERR("Exit err %d" , err.Format());
     return (err == CHIP_NO_ERROR) ? EXIT_SUCCESS : EXIT_FAILURE;
 }
diff --git a/examples/platform/telink/zephyr_ext/zephyr_key_matrix.c b/examples/platform/telink/zephyr_ext/zephyr_key_matrix.c
@@ -47,7 +47,8 @@ static void key_matrix_poll(struct key_matrix_data * key_matrix, bool init)
 /* Key matrix scan worker */
 static void key_matrix_scan_work(struct k_work * item)
 {
-    struct key_matrix_data * key_matrix = CONTAINER_OF(item, struct key_matrix_data, work);
+    struct key_matrix_data * key_matrix =
+        CONTAINER_OF(k_work_delayable_from_work(item), struct key_matrix_data, work);
 
     (void) k_work_schedule(&key_matrix->work, K_MSEC(KEY_MATRIX_SCAN_PERIOD_MS));
     key_matrix_poll(key_matrix, false);

diff --git a/examples/platform/telink/zephyr_ext/zephyr_key_pool.c b/examples/platform/telink/zephyr_ext/zephyr_key_pool.c
@@ -75,7 +75,8 @@ static void key_pool_poll(struct key_pool_data * key_pool, bool init)
 /* Key pool scan worker */
 static void key_pool_event_work(struct k_work * item)
 {
-    struct key_pool_data * key_pool = CONTAINER_OF(item, struct key_pool_data, work);
+    struct key_pool_data * key_pool =
+        CONTAINER_OF(k_work_delayable_from_work(item), struct key_pool_data, work);
 
     key_pool_poll(key_pool, false);
 }

diff --git a/examples/platform/telink/zephyr_ext/zephyr_led_pool.c b/examples/platform/telink/zephyr_ext/zephyr_led_pool.c
@@ -80,7 +80,8 @@ static void led_pool_aux_update(const struct led_pool_data * led_pool)
 /* Led pool worker */
 static void led_pool_event_work(struct k_work * item)
 {
-    struct led_pool_data * led_pool = CONTAINER_OF(item, struct led_pool_data, work);
+    struct led_pool_data * led_pool =
+        CONTAINER_OF(k_work_delayable_from_work(item), struct led_pool_data, work);
 
     led_pool_aux_update(led_pool);
     (void) k_work_reschedule(&led_pool->work, led_pool_aux_timeout(led_pool));

diff --git a/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.c b/examples/platform/telink/zephyr_ext/zephyr_pwm_pool.c
@@ -140,7 +140,8 @@ static void pwm_pool_aux_update(const struct pwm_pool_data * pwm_pool)
 /* Pwm pool worker */
 static void pwm_pool_event_work(struct k_work * item)
 {
-    struct pwm_pool_data * pwm_pool = CONTAINER_OF(item, struct pwm_pool_data, work);
+    struct pwm_pool_data * pwm_pool =
+        CONTAINER_OF(k_work_delayable_from_work(item), struct pwm_pool_data, work);
 
     pwm_pool_aux_update(pwm_pool);
     (void) k_work_reschedule(&pwm_pool->work, pwm_pool_aux_timeout(pwm_pool));

diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp
@@ -40,13 +40,25 @@
 #include <zephyr/bluetooth/addr.h>
 #include <zephyr/bluetooth/gatt.h>
 #include <zephyr/drivers/flash.h>
-#include <zephyr/random/rand32.h>
+#include <zephyr/random/random.h>
 #include <zephyr/storage/flash_map.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 
 extern "C" {
-extern __attribute__((noinline)) void telink_bt_blc_mac_init(uint8_t * bt_mac);
+
+#ifdef CONFIG_BT_B9X
+
+extern __attribute__((noinline)) int b9x_bt_blc_mac_init(uint8_t *bt_mac);
+/**
+ * @brief bt mac initialization
+ */
+__attribute__((noinline)) void telink_bt_blc_mac_init(uint8_t *bt_mac)
+{
+	b9x_bt_blc_mac_init(bt_mac);
+}
+#endif
+
 }
 
 #if defined(CONFIG_PM) && !defined(CONFIG_CHIP_ENABLE_PM_DURING_BLE)

diff --git a/src/platform/telink/SystemPlatformConfig.h b/src/platform/telink/SystemPlatformConfig.h
@@ -62,3 +62,6 @@ struct ChipDeviceEvent;
 #endif
 
 // ========== Platform-specific Configuration Overrides =========
+
+// Disable Zephyr Socket extensions module, as the Zephyr RTOS now implements recvmsg()
+#define CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKET_EXTENSIONS 0