Requirement: The BSP for the k230 platform in the RT-Thread repository does not yet have a gnne driver.

Solution: Provide gnne driver for the k230 platform in the RT-Thread repository.

- Implements mutex lock mechanism for AI2D and GNNE modules.

Adds HARDLOCK_AI2D support in hardlock driver for mutual exclusion.

- Implements poll operation for device status monitoring.

- Updates documentation in bsp/README.md.

Signed-off-by: ChuanN-sudo <[email protected]>

Author: ChuanN-sudo

bsp/README.md

@@ -760,9 +760,9 @@ This document is based on the RT-Thread mainline repository and categorizes the
 
 #### 🟢 K230 (RT-Smart)
 
-| BSP Name | GPIO | UART | I2C | RTC | ADC | PWM | SDIO | HWTimer | WDT | SPI |
-|----------|------|------|-----|-----|-----|-----|------|---------|-----|-----|
-| [k230](k230) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
+| BSP Name | GPIO | UART | I2C | RTC | ADC | PWM | SDIO | HWTimer | WDT | SPI | GNNE |
+|----------|------|------|-----|-----|-----|-----|------|---------|-----|-----|------|
+| [k230](k230) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ |
 
 #### 🟢 Xuantie (RT-Smart)
 

bsp/k230/.ci/attachconfig/ci.attachconfig.yml

@@ -1,6 +1,10 @@
 scons.args: &scons
     scons_arg:
       - '--strict'
+devices.gnee:
+    <<: *scons
+    kconfig:
+      - CONFIG_BSP_USING_GNNE=n
 devices.spi:
     <<: *scons
     kconfig:

bsp/k230/board/Kconfig

@@ -1,6 +1,6 @@
 menu "Drivers Configuration"
-
-    config BSP_USING_GNEE
+        
+    config BSP_USING_GNNE
         bool "Enable GNNE"
         default n
 

bsp/k230/drivers/interdrv/gnne/SConscript

@@ -6,7 +6,7 @@ cwd     = GetCurrentDir()
 src     = Glob('*.c')
 CPPPATH = [cwd]
 
-group = DefineGroup('Gnne', src, depend = ['BSP_USING_GNEE'], CPPPATH = CPPPATH)
+group = DefineGroup('Gnne', src, depend = ['BSP_USING_GNNE'], CPPPATH = CPPPATH)
 
 objs = [group]
 

bsp/k230/drivers/interdrv/gnne/ai2d_dev.c

@@ -31,38 +31,38 @@
 
 #include <rtthread.h>
 #include <rthw.h>
+#include "drv_hardlock.h"
 
 #if defined(RT_USING_POSIX_DEVIO)
-#include <dfs_posix.h>
-#include <poll.h>
-#include <termios.h>
+    #include <dfs_posix.h>
+    #include <poll.h>
+    #include <termios.h>
 #endif
 
-#define AI2D_LOG_ENABLE
-struct ai_2d_dev_handle {
-	rt_wqueue_t *wait;
+#define AI2D_CMD_LOCK       0
+#define AI2D_CMD_TRYLOCK    1
+#define AI2D_CMD_UNLOCK     2
+static hardlock_type g_ai2d_lock = HARDLOCK_MAX;
+
+struct ai_2d_dev_handle
+{
+    rt_wqueue_t *wait;
+    rt_bool_t is_lock;
 };
 
 
-#ifdef  AI2D_LOG_ENABLE
 #define ai_2d_log(s...)    rt_kprintf(s)
-#else
-static int ai_2d_log(const char *fmt, ...)
-{
-    return 0;
-}
-#endif
 
-#define ai_2d_info(s...)	do { \
-	ai_2d_log("<ai_2d> "); \
-	ai_2d_log(s); \
-	ai_2d_log("\r\n"); \
+#define ai_2d_info(s...)    do { \
+    ai_2d_log("<ai_2d> "); \
+    ai_2d_log(s); \
+    ai_2d_log("\r\n"); \
 } while (0)
 
 #define ai_2d_err(s...) do { \
-	ai_2d_log("<err>[%s:%d] ", __func__, __LINE__); \
-	ai_2d_log(s); \
-	ai_2d_log("\r\n"); \
+    ai_2d_log("<err>[%s:%d] ", __func__, __LINE__); \
+    ai_2d_log(s); \
+    ai_2d_log("\r\n"); \
 } while (0)
 
 static struct rt_device g_ai_2d_device = {0};
@@ -74,14 +74,16 @@ static int ai_2d_device_open(struct dfs_file *file)
     struct ai_2d_dev_handle *handle;
     rt_device_t device;
 
-    handle = rt_malloc(sizeof (struct ai_2d_dev_handle));
-    if(handle == RT_NULL) {
+    handle = rt_malloc(sizeof(struct ai_2d_dev_handle));
+    if (handle == RT_NULL)
+    {
         ai_2d_err("malloc failed\n");
         return -1;
     }
     device = (rt_device_t)file->vnode->data;
     handle->wait = &device->wait_queue;
-    file->data = (void*)handle;
+    handle->is_lock = RT_FALSE;
+    file->data = (void *)handle;
     return RT_EOK;
 }
 
@@ -90,9 +92,14 @@ static int ai_2d_device_close(struct dfs_file *file)
     struct ai_2d_dev_handle *handle;
 
     handle = (struct ai_2d_dev_handle *)file->data;
-    if(handle == RT_NULL) {
+    if (handle == RT_NULL)
+    {
         ai_2d_err("try to close a invalid handle");
-		return -RT_EINVAL;
+        return -RT_EINVAL;
+    }
+    if (handle->is_lock)
+    {
+        kd_hardlock_unlock(g_ai2d_lock);
     }
     rt_free(handle);
     file->data = RT_NULL;
@@ -101,15 +108,55 @@ static int ai_2d_device_close(struct dfs_file *file)
 
 static int ai_2d_device_ioctl(struct dfs_file *file, int cmd, void *args)
 {
-    return 0;
+    struct ai_2d_dev_handle *handle;
+    int ret = -1;
+
+    handle = (struct ai_2d_dev_handle *)file->data;
+    if (g_ai2d_lock == HARDLOCK_MAX)
+        return ret;
+
+    if (cmd == AI2D_CMD_LOCK)
+    {
+        if (handle->is_lock == RT_TRUE)
+        {
+            return 0;
+        }
+        while (kd_hardlock_lock(g_ai2d_lock));
+        handle->is_lock = RT_TRUE;
+        ret = 0;
+    }
+    else if (cmd == AI2D_CMD_UNLOCK)
+    {
+        if (handle->is_lock == RT_FALSE)
+        {
+            return 0;
+        }
+        kd_hardlock_unlock(g_ai2d_lock);
+        handle->is_lock = RT_FALSE;
+        ret = 0;
+    }
+    else if (cmd == AI2D_CMD_TRYLOCK)
+    {
+        if (handle->is_lock == RT_TRUE)
+        {
+            return 0;
+        }
+        if (!kd_hardlock_lock(g_ai2d_lock))
+        {
+            handle->is_lock = RT_TRUE;
+            ret = 0;
+        }
+    }
+    return ret;
 }
 
 int ai_2d_device_poll(struct dfs_file *file, struct rt_pollreq *req)
 {
     struct ai_2d_dev_handle *handle;
     unsigned int flags;
-    handle = (struct ai_2d_dev_handle*)file->data;
-    if (!handle) {
+    handle = (struct ai_2d_dev_handle *)file->data;
+    if (!handle)
+    {
         ai_2d_err("ai_2d_dev_handle NULL!");
         return -EINVAL;
     }
@@ -118,7 +165,8 @@ int ai_2d_device_poll(struct dfs_file *file, struct rt_pollreq *req)
     return POLLIN;
 }
 
-static const struct dfs_file_ops ai_2d_input_fops = {
+static const struct dfs_file_ops ai_2d_input_fops =
+{
     .open = ai_2d_device_open,
     .close = ai_2d_device_close,
     .ioctl = ai_2d_device_ioctl,
@@ -130,14 +178,15 @@ static void irq_callback(int irq, void *data)
 {
     rt_wqueue_t *wait = (rt_wqueue_t *)data;
     volatile rt_uint32_t *write_addr = (rt_uint32_t *)((char *)gnne_base_addr + 0xca0);
-    if(gnne_base_addr == RT_NULL) {
+    if (gnne_base_addr == RT_NULL)
+    {
         ai_2d_err("ai2d interrupts while the hardware is not yet initialized\n");
     }
     write_addr[0] = 1;
     write_addr[1] = 0;
     write_addr[2] = 0;
     write_addr[3] = 0;
-	rt_wqueue_wakeup(wait, (void*)POLLIN);
+    rt_wqueue_wakeup(wait, (void *)POLLIN);
     rt_event_send(&g_ai_2d_event, 0x1);
 }
 
@@ -147,13 +196,15 @@ int ai_2d_device_init(void)
     rt_device_t ai_2d_device = &g_ai_2d_device;
 
     ret = rt_event_init(&g_ai_2d_event, "ai_2d_event", RT_IPC_FLAG_PRIO);
-    if (ret) {
+    if (ret)
+    {
         ai_2d_err("event init failed\n");
         return -ENOMEM;
     }
 
     ret = rt_device_register(ai_2d_device, "ai_2d_device", RT_DEVICE_FLAG_RDWR);
-    if(ret) {
+    if (ret)
+    {
         ai_2d_err("ai_2d_device register fail\n");
         return ret;
     }
@@ -164,9 +215,20 @@ int ai_2d_device_init(void)
 
     ai_2d_device->fops = &ai_2d_input_fops;
 
+    if (kd_request_lock(HARDLOCK_AI2D))
+    {
+        ai_2d_err("fail to request hardlock-%d\n", HARDLOCK_AI2D);
+    }
+    else
+    {
+        g_ai2d_lock  = HARDLOCK_AI2D;
+    }
+
 #ifndef RT_FASTBOOT
-    if(!ret)
+    if (!ret)
+    {
         ai_2d_info("%s OK\n", __func__);
+    }
 #endif
     return ret;
-}
+}

bsp/k230/drivers/interdrv/gnne/ai_module.c

@@ -23,6 +23,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+/*
+ * NOTE: Currently untested - nncase cannot run due to missing mmz library.
+ * The mmz library depends on MPP driver, which relies on deprecated RT-Thread
+ * kernel APIs (rt_proc_entry_create, rt_dma_chan_request, etc.) that are no
+ * longer available in the mainline kernel. Awaiting resolution.
+ */
+
 /*
  * Copyright (c) 2006-2025 RT-Thread Development Team
  *
@@ -39,5 +46,4 @@ int ai_module_init(void)
     gnne_device_init();
     ai_2d_device_init();
 }
-// INIT_DEVICE_EXPORT(ai_module_init);
-INIT_COMPONENT_EXPORT(ai_module_init);
+INIT_COMPONENT_EXPORT(ai_module_init);