wiseconnect: Restore si91x_bus_events

The Zephyr osEventFlags API has a bug when an osEventFlags is watched
from two different threads.

For WiseConnect, it means the events are not received by the thread
"si91x_bus".

WiseConnect 3.3 was not impacted because there there were a specific
osEventFlags for "si91x_bus" ("si91x_bus_events").

This patch restore use of "si91x_bus_events" to workaround the
osEventFlags bug.

Co-authored-by: Swami Das Nampalli <[email protected]>
Signed-off-by: Jérôme Pouiller <[email protected]>
Signed-off-by: Swami Das Nampalli <[email protected]>
Signed-off-by: Jérôme Pouiller <[email protected]>

Author: 2 people

wiseconnect/components/device/silabs/si91x/wireless/ahb_interface/src/rsi_hal_mcu_m4_rom.c

@@ -277,7 +277,7 @@ sl_status_t sli_m4_interrupt_isr(void)
 
     mask_ta_interrupt(TA_RSI_BUFFER_FULL_CLEAR_EVENT);
 
-    sli_si91x_set_event(SL_SI91X_TA_BUFFER_FULL_CLEAR_EVENT);
+    sl_si91x_host_set_bus_event(SL_SI91X_TA_BUFFER_FULL_CLEAR_EVENT);
 
     // Clear the interrupt
     clear_ta_to_m4_interrupt(TA_RSI_BUFFER_FULL_CLEAR_EVENT);
@@ -333,7 +333,7 @@ sl_status_t sli_receive_from_ta_done_isr(void)
   VERIFY_STATUS_AND_RETURN(status);
 
   //! Set event RX pending event to host
-  sli_si91x_set_event(SL_SI91X_NCP_HOST_BUS_RX_EVENT);
+  sl_si91x_host_set_bus_event(SL_SI91X_NCP_HOST_BUS_RX_EVENT);
 #endif
 
   return SL_STATUS_OK;

wiseconnect/components/device/silabs/si91x/wireless/ahb_interface/src/sl_platform_wireless.c

@@ -42,6 +42,7 @@
 #include "sl_rsi_utility.h"
 
 extern osEventFlagsId_t si91x_events;
+extern osEventFlagsId_t si91x_bus_events;
 extern osEventFlagsId_t si91x_async_events;
 extern uint32_t frontend_switch_control;
 extern osMutexId_t side_band_crypto_mutex;

wiseconnect/components/device/silabs/si91x/wireless/inc/sl_rsi_utility.h

@@ -274,11 +274,13 @@ sl_status_t sli_si91x_platform_deinit(void);
 // Event API
 /* Function used to set specified flags for event */
 void sli_si91x_set_event(uint32_t event_mask);
+void sl_si91x_host_set_bus_event(uint32_t event_mask);
 
 /* Function used to set specified flags for async event */
 void sli_si91x_host_set_async_event(uint32_t event_mask);
 
 uint32_t sli_si91x_wait_for_event(uint32_t event_mask, uint32_t timeout);
+uint32_t si91x_host_wait_for_bus_event(uint32_t event_mask, uint32_t timeout);
 
 /* Function used to clear flags for specific event */
 uint32_t sli_si91x_clear_event(uint32_t event_mask);

wiseconnect/components/device/silabs/si91x/wireless/socket/src/sl_si91x_socket_utility.c

@@ -1171,7 +1171,7 @@ sl_status_t sli_si91x_send_socket_command(sli_si91x_socket_t *socket,
   node_buffer->id = this_packet_id;
   sli_si91x_append_to_buffer_queue(&socket->command_queue.tx_queue, node_buffer);
   tx_socket_command_queues_status |= (1 << socket->index);
-  sli_si91x_set_event(SL_SI91X_SOCKET_COMMAND_TX_PENDING_EVENT);
+  sl_si91x_host_set_bus_event(SL_SI91X_SOCKET_COMMAND_TX_PENDING_EVENT);
   CORE_ExitAtomic(state);
 
   if (wait_period != 0) {
@@ -1257,7 +1257,7 @@ sl_status_t sli_si91x_send_socket_data(sli_si91x_socket_t *si91x_socket,
   CORE_irqState_t state = CORE_EnterAtomic();
   sli_si91x_append_to_buffer_queue(&si91x_socket->tx_data_queue, buffer);
   tx_socket_data_queues_status |= (1 << si91x_socket->index);
-  sli_si91x_set_event(SL_SI91X_SOCKET_DATA_TX_PENDING_EVENT);
+  sl_si91x_host_set_bus_event(SL_SI91X_SOCKET_DATA_TX_PENDING_EVENT);
   CORE_ExitAtomic(state);
 
   return SL_STATUS_OK;

wiseconnect/components/device/silabs/si91x/wireless/src/sl_rsi_utility.c

@@ -168,6 +168,7 @@ typedef struct sli_scan_info_s {
 osThreadId_t si91x_thread           = 0;
 osThreadId_t si91x_event_thread     = 0;
 osEventFlagsId_t si91x_events       = 0;
+osEventFlagsId_t si91x_bus_events   = 0;
 osEventFlagsId_t si91x_async_events = 0;
 osMutexId_t malloc_free_mutex       = 0;
 
@@ -1059,6 +1060,10 @@ sl_status_t sl_si91x_platform_init(void)
     si91x_events = osEventFlagsNew(NULL);
   }
 
+  if (NULL == si91x_bus_events) {
+    si91x_bus_events = osEventFlagsNew(NULL);
+  }
+
   if (NULL == si91x_async_events) {
     si91x_async_events = osEventFlagsNew(NULL);
   }
@@ -1115,6 +1120,11 @@ sl_status_t sli_si91x_platform_deinit(void)
   // Terminate Command Engine thread
   sli_wifi_command_engine_deinit();
 
+  if (NULL != si91x_bus_events) {
+    osEventFlagsDelete(si91x_bus_events);
+    si91x_bus_events = NULL;
+  }
+
   // Terminate SI91X event handler thread
   if (NULL != si91x_event_thread) {
     osThreadTerminate(si91x_event_thread);
@@ -1167,6 +1177,11 @@ void sli_si91x_set_event(uint32_t event_mask)
   osEventFlagsSet(si91x_events, event_mask);
 }
 
+void sl_si91x_host_set_bus_event(uint32_t event_mask)
+{
+  osEventFlagsSet(si91x_bus_events, event_mask);
+}
+
 sl_status_t sli_si91x_add_to_queue(sli_si91x_buffer_queue_t *queue, sl_wifi_buffer_t *buffer)
 {
   sli_si91x_append_to_buffer_queue(queue, buffer);
@@ -1764,6 +1779,16 @@ uint32_t sli_si91x_wait_for_event(uint32_t event_mask, uint32_t timeout)
   return result;
 }
 
+uint32_t si91x_host_wait_for_bus_event(uint32_t event_mask, uint32_t timeout)
+{
+  uint32_t result = osEventFlagsWait(si91x_bus_events, event_mask, osFlagsWaitAny, timeout);
+
+  if (result == (uint32_t)osErrorTimeout || result == (uint32_t)osErrorResource) {
+    return 0;
+  }
+  return result;
+}
+
 uint32_t sli_si91x_clear_event(uint32_t event_mask)
 {
   uint32_t result = osEventFlagsClear(si91x_events, event_mask);

wiseconnect/components/device/silabs/si91x/wireless/src/sl_si91x_driver.c

@@ -1186,7 +1186,7 @@ sl_status_t sli_si91x_driver_send_command_packet(uint32_t command,
   packet->node.node = NULL;
   sli_si91x_append_to_buffer_queue(&cmd_queues[command_type].tx_queue, packet);
   tx_command_queues_status |= SL_SI91X_TX_PENDING_FLAG(command_type);
-  sli_si91x_set_event(SL_SI91X_TX_PENDING_FLAG(command_type));
+  sl_si91x_host_set_bus_event(SL_SI91X_TX_PENDING_FLAG(command_type));
   CORE_ExitAtomic(state);
 
   // Check if the command should return immediately or wait for a response
@@ -1256,7 +1256,7 @@ static sl_status_t sl_si91x_driver_send_data_packet(sl_wifi_buffer_t *buffer, ui
   sli_si91x_append_to_buffer_queue(&sli_tx_data_queue, buffer);
   CORE_irqState_t state = CORE_EnterAtomic();
   tx_generic_socket_data_queues_status |= SL_SI91X_GENERIC_DATA_TX_PENDING_EVENT;
-  sli_si91x_set_event(SL_SI91X_GENERIC_DATA_TX_PENDING_EVENT);
+  sl_si91x_host_set_bus_event(SL_SI91X_GENERIC_DATA_TX_PENDING_EVENT);
   CORE_ExitAtomic(state);
 
   return SL_STATUS_OK;
@@ -1329,7 +1329,7 @@ sl_status_t sli_si91x_driver_send_async_command(uint32_t command,
   buffer->id = 0; // Does not use packet ID as async packets do not have a matching response
   sli_si91x_append_to_buffer_queue(&cmd_queues[command_type].tx_queue, buffer);
   tx_command_queues_status |= SL_SI91X_TX_PENDING_FLAG(command_type);
-  sli_si91x_set_event(SL_SI91X_TX_PENDING_FLAG(command_type));
+  sl_si91x_host_set_bus_event(SL_SI91X_TX_PENDING_FLAG(command_type));
   CORE_ExitAtomic(irqState);
 
   return SL_STATUS_OK;

wiseconnect/components/sli_si91x_wifi_event_handler/src/sli_si91x_wifi_event_handler.c

@@ -1746,12 +1746,13 @@ void sli_si91x_process_ble_events()
 
 uint32_t sli_wifi_command_engine_wait_for_event(uint32_t event_mask, uint32_t timeout)
 {
-  return sli_si91x_wait_for_event(event_mask, timeout);
+  return si91x_host_wait_for_bus_event(event_mask, timeout);
+
 }
 
 uint32_t sli_wifi_command_engine_set_event(uint32_t event_mask)
 {
-  sli_si91x_set_event(event_mask);
+  sl_si91x_host_set_bus_event(event_mask);
   return 0;
 }