esp_lvgl_port: add semaphore to verify task stop

Use a sempaphore with the LVGL task so that task stoppage can be
verified in the deinit method. This change adds a new member named
'task_stop_to_ms' to lvgl_port_cfg_t that controls how long to wait
for the task to stop before returning a timeout error. This value
defaults to 3000.

components/esp_lvgl_port/esp_lvgl_port.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -72,9 +72,11 @@ typedef struct {
 
 typedef struct lvgl_port_ctx_s {
     SemaphoreHandle_t   lvgl_mux;
+    SemaphoreHandle_t   task_sem;
     esp_timer_handle_t  tick_timer;
     bool                running;
     int                 task_max_sleep_ms;
+    int                 task_stop_to_ms;
 #ifdef ESP_LVGL_PORT_USB_HOST_HID_COMPONENT
     lvgl_port_usb_hid_ctx_t hid_ctx;
 #endif
@@ -184,8 +186,15 @@ esp_err_t lvgl_port_init(const lvgl_port_cfg_t *cfg)
     if (lvgl_port_ctx.task_max_sleep_ms == 0) {
         lvgl_port_ctx.task_max_sleep_ms = 500;
     }
+    lvgl_port_ctx.task_stop_to_ms = cfg->task_stop_to_ms;
+    if (lvgl_port_ctx.task_stop_to_ms == 0) {
+        lvgl_port_ctx.task_stop_to_ms = 3000;
+    }
     lvgl_port_ctx.lvgl_mux = xSemaphoreCreateRecursiveMutex();
     ESP_GOTO_ON_FALSE(lvgl_port_ctx.lvgl_mux, ESP_ERR_NO_MEM, err, TAG, "Create LVGL mutex fail!");
+    lvgl_port_ctx.task_sem = xSemaphoreCreateBinary();
+    ESP_GOTO_ON_FALSE(lvgl_port_ctx.task_sem, ESP_ERR_NO_MEM, err, TAG, "Create LVGL task sem fail!");
+    ESP_GOTO_ON_FALSE(xSemaphoreGive(lvgl_port_ctx.task_sem), ESP_FAIL, err, TAG, "Give LVGL task sem fail!");
 
     BaseType_t res;
     if (cfg->task_affinity < 0) {
@@ -239,9 +248,14 @@ esp_err_t lvgl_port_deinit(void)
     /* Stop running task */
     if (lvgl_port_ctx.running) {
         lvgl_port_ctx.running = false;
-    } else {
-        lvgl_port_task_deinit();
+        /* Use the task semaphore to verify the task has stopped */
+        if (xSemaphoreTake(lvgl_port_ctx.task_sem, pdMS_TO_TICKS(lvgl_port_ctx.task_stop_to_ms)) != pdTRUE) {
+            ESP_LOGE(TAG, "Failed to stop LVGL task");
+            return ESP_ERR_TIMEOUT;
+        }
+        ESP_LOGI(TAG, "Stopped LVGL task");
     }
+    lvgl_port_task_deinit();
 
     return ESP_OK;
 }
@@ -682,6 +696,13 @@ void lvgl_port_flush_ready(lv_disp_t *disp)
 
 static void lvgl_port_task(void *arg)
 {
+    /* Take the task semaphore */
+    if (xSemaphoreTake(lvgl_port_ctx.task_sem, 0) != pdTRUE) {
+        ESP_LOGE(TAG, "Failed to take LVGL task sem");
+        lvgl_port_task_deinit();
+        vTaskDelete( NULL );
+    }
+
     uint32_t task_delay_ms = lvgl_port_ctx.task_max_sleep_ms;
 
     ESP_LOGI(TAG, "Starting LVGL task");
@@ -699,7 +720,8 @@ static void lvgl_port_task(void *arg)
         vTaskDelay(pdMS_TO_TICKS(task_delay_ms));
     }
 
-    lvgl_port_task_deinit();
+    /* Give semaphore back */
+    xSemaphoreGive(lvgl_port_ctx.task_sem);
 
     /* Close task */
     vTaskDelete( NULL );
@@ -710,6 +732,9 @@ static void lvgl_port_task_deinit(void)
     if (lvgl_port_ctx.lvgl_mux) {
         vSemaphoreDelete(lvgl_port_ctx.lvgl_mux);
     }
+    if (lvgl_port_ctx.task_sem) {
+        vSemaphoreDelete(lvgl_port_ctx.task_sem);
+    }
     memset(&lvgl_port_ctx, 0, sizeof(lvgl_port_ctx));
 #if LV_ENABLE_GC || !LV_MEM_CUSTOM
     /* Deinitialize LVGL */

components/esp_lvgl_port/include/esp_lvgl_port.h

@@ -48,6 +48,7 @@ typedef struct {
     int task_stack;         /*!< LVGL task stack size */
     int task_affinity;      /*!< LVGL task pinned to core (-1 is no affinity) */
     int task_max_sleep_ms;  /*!< Maximum sleep in LVGL task */
+    int task_stop_to_ms;    /*!< LVGL stop task timeout in ms */
     int timer_period_ms;    /*!< LVGL timer tick period in ms */
 } lvgl_port_cfg_t;
 
@@ -140,6 +141,7 @@ typedef struct {
         .task_stack = 4096,       \
         .task_affinity = -1,      \
         .task_max_sleep_ms = 500, \
+        .task_stop_to_ms = 3000,  \
         .timer_period_ms = 5,     \
     }
 
@@ -164,6 +166,7 @@ esp_err_t lvgl_port_init(const lvgl_port_cfg_t *cfg);
  *
  * @return
  *      - ESP_OK                    on success
+ *      - ESP_ERR_TIMEOUT           when stopping the LVGL task times out
  */
 esp_err_t lvgl_port_deinit(void);