Merge pull request #2805 from particle-iot/fix/gen4-wifi-stab

avtolstoy · web-flow · commit f195ed05a5a0 · 2024-08-13T00:22:07.000+07:00
[Gen 4] WiFi stuff
diff --git a/hal/network/ncp_client/realtek/rtl_ncp_client.cpp b/hal/network/ncp_client/realtek/rtl_ncp_client.cpp
@@ -56,6 +56,7 @@ extern "C" {
 #include "bt_intf.h"
 
 extern "C" void rtw_efuse_boot_write(void);
+extern "C" uint32_t rltk_wlan_get_link_err(void);
 
 void wifi_set_country_code(void) {
     uint8_t channel_plan;
@@ -300,6 +301,84 @@ NcpConnectionState RealtekNcpClient::connectionState() {
     return connState_;
 }
 
+void RealtekNcpClient::parseDisconnectReason(char* buf, size_t bufLen) {
+    uint16_t reason = 0;
+    if (buf) {
+        reason = *(uint16_t*)(buf + 6 /* skip MAC */);
+    }
+    uint32_t linkErr = rltk_wlan_get_link_err();
+
+    const char* msg = "";
+    const char* extraMsg = "";
+    const char* reasonMsg = "";
+
+    // From wifi_link_err_parse()
+    if(linkErr & BIT(0)) {
+        msg = "received deauth";
+    } else if(linkErr & BIT(1)) {
+        msg = "received deassoc";
+    } else if (linkErr & BIT(2)) {
+        msg = "scan stage, no beacon while connecting";
+    } else if(linkErr & BIT(3)) {
+        msg = "auth stage, auth timeout";
+        if (reason == 65531) {
+            extraMsg = "request has been declined";
+        }
+    } else if(linkErr & BIT(4)) {
+        msg = "assoc stage, assoc timeout";
+    } else if(linkErr & (BIT(5) | BIT(6) | BIT(7))) {
+        msg = "4handshake stage, 4-way waiting timeout";
+    } else if(linkErr & BIT(8)) {
+        msg = "assoc stage, assoc reject (assoc rsp status > 0)";
+    } else if(linkErr & BIT(9)) {
+        msg = "auth stage, auth fail (auth rsp status > 0)";
+    } else if(linkErr & BIT(10)){
+        msg = "scan stage, scan timeout";
+    } else if(linkErr & BIT(11)) {
+        msg = "auth stage, WPA3 auth fail";
+        if (reason == 65531) {
+            extraMsg = "request has been declined";
+        } else {
+            extraMsg = "password error";
+        }
+    }
+
+    if(linkErr & (BIT(0) | BIT(1))) {
+        if(linkErr & BIT(20)) {
+            msg = "handshake done, connected stage, recv deauth/deassoc";
+        } else if(linkErr & BIT(19)) {
+            msg = "handshake processing, 4handshake stage, recv deauth/deassoc";
+        } else if(linkErr & BIT(18)) {
+            msg = "assoc successed, 4handshake stage, recv deauth/deassoc";
+        } else if(linkErr & BIT(17)) {
+            msg = "auth successed, assoc stage, recv deauth/deassoc";
+        } else if(linkErr & BIT(16)) {
+            msg = "scan done, found ssid, auth stage, recv deauth/deassoc";
+        } else {
+            msg = "connected stage, recv deauth/deassoc";
+        }
+    }
+
+    switch(reason) {
+        case 17:
+            reasonMsg = "auth stage, ap auth full";
+            break;
+        case 65530:
+            reasonMsg = "SA query timeout";
+            break;
+        case 65534:
+            reasonMsg = "connected stage, ap changed";
+            break;
+        case 65535:
+            reasonMsg = "connected stage, loss beacon";
+            break;
+        default:
+            break;
+    }
+
+    LOG(WARN, "Disconnect linkError=%08x reason=%04x: %s %s %s", linkErr, reason, msg, extraMsg, reasonMsg);
+}
+
 int RealtekNcpClient::connect(const char* ssid, const MacAddress& bssid, WifiSecurity sec, const WifiCredentials& cred) {
     CHECK_FALSE(needsReset_, SYSTEM_ERROR_BUSY);
     int rtlError = RTW_ERROR;
@@ -310,12 +389,13 @@ int RealtekNcpClient::connect(const char* ssid, const MacAddress& bssid, WifiSec
 
             connectionState(NcpConnectionState::CONNECTING);
 
-            wifi_reg_event_handler(WIFI_EVENT_DISCONNECT, [](char* buf, int buf_len, int flags, void* userdata) -> void {
+            wifi_reg_event_handler(WIFI_EVENT_DISCONNECT, [](char* buf, int bufLen, int flags, void* userdata) -> void {
                 RealtekNcpClient* client = (RealtekNcpClient*)userdata;
                 if (client->connectionState() == NcpConnectionState::CONNECTED) {
                     LOG(TRACE, "Disconnected");
                     client->connectionState(NcpConnectionState::DISCONNECTED);
                 }
+                client->parseDisconnectReason(buf, (size_t)bufLen);
             }, (void*)this);
 
             LOG(INFO, "Try to connect to ssid: %s", ssid);
@@ -357,7 +437,7 @@ int RealtekNcpClient::getNetworkInfo(WifiNetworkInfo* info) {
         info->channel(channel_num);
     }
 
-	char ssid_buf[33] = {};//32 octets for SSID, plus null terminator
+    char ssid_buf[33] = {};//32 octets for SSID, plus null terminator
     rtlError = wext_get_ssid(WLAN0_NAME, (unsigned char *) ssid_buf);
     if (rtlError < 0) {
         LOG(WARN, "wext_get_ssid err: %d", rtlError);
diff --git a/hal/network/ncp_client/realtek/rtl_ncp_client.h b/hal/network/ncp_client/realtek/rtl_ncp_client.h
@@ -81,6 +81,7 @@ class RealtekNcpClient: public WifiNcpClient {
 
     int rltkOn();
     int rltkOff();
+    void parseDisconnectReason(char* buf, size_t bufLen);
 };
 
 inline void RealtekNcpClient::lock() {
diff --git a/hal/src/rtl872x/ble_hal.cpp b/hal/src/rtl872x/ble_hal.cpp
@@ -437,19 +437,14 @@ class BleGap {
         CHECK_TRUE(cmdQueue_, SYSTEM_ERROR_INVALID_STATE);
         if (os_queue_put(cmdQueue_, &cmd, BLE_ENQUEUE_TIMEOUT_MS, nullptr)) {
             LOG(ERROR, "os_queue_put() failed.");
-            SPARK_ASSERT(false);
+            if (cmd != BLE_CMD_EXIT_THREAD) {
+                SPARK_ASSERT(false);
+            }
+            return SYSTEM_ERROR_TIMEOUT;
         }
         return SYSTEM_ERROR_NONE;
     }
 
-    bool isQueueAvailable() const {
-        uint8_t command;
-        if (!os_queue_peek(cmdQueue_, &command, 0, nullptr)) {
-            return true;
-        }
-        return false;
-    }
-
     void lockMode(bool lock) {
         bleInLockedMode_ = lock;
     }
@@ -676,6 +671,9 @@ class BleGap {
     static constexpr uint8_t BLE_CMD_THREAD_PRIORITY = OS_THREAD_PRIORITY_NETWORK - 1; // IMPORTANT: below network for coexistence to work!
     static constexpr uint16_t BLE_CMD_THREAD_STACK_SIZE = 2048;
     static constexpr uint8_t BLE_CMD_QUEUE_SIZE = 0x20;
+
+    volatile bool bleCommandThreadExit_ = false;
+    static constexpr system_tick_t BLE_WAIT_CMD_THREAD_TRY_LOCK = 10;
 };
 
 
@@ -1020,14 +1018,27 @@ void BleEventDispatcher::bleEventDispatchThread(void *context) {
 
 void BleGap::bleCommandThread(void *context) {
     BleGap* gap = (BleGap*)context;
+    uint8_t command = 0;
     while (true) {
-        uint8_t command;
+        bool locked = false;
         if (!os_queue_peek(gap->cmdQueue_, &command, CONCURRENT_WAIT_FOREVER, nullptr)) {
             LOCAL_DEBUG("---> Enter ble cmd thread, cmd: %d", command);
             if (command == BLE_CMD_STOP_ADV || command == BLE_CMD_STOP_ADV_NOTIFY) {
                 if (gap->isAdvertising()) {
                     LOCAL_DEBUG( "stopAdvertising in ble cmd thread");
-                    BleLock lk;
+                    // FIXME: duplication, but for now works as a workaround
+                    while (!(locked = s_bleMutex.lock(BLE_WAIT_CMD_THREAD_TRY_LOCK)) && !gap->bleCommandThreadExit_) {
+                        // Nothing
+                    }
+                    SCOPE_GUARD({
+                        if (locked) {
+                            s_bleMutex.unlock();
+                        }
+                    });
+                    if (gap->bleCommandThreadExit_) {
+                        LOCAL_DEBUG("Exit ble cmd thread");
+                        break;
+                    }
                     gap->stopAdvertising();
                     LOCAL_DEBUG("notifyAdvStop in ble cmd thread");
                     if (command == BLE_CMD_STOP_ADV_NOTIFY) {
@@ -1036,7 +1047,19 @@ void BleGap::bleCommandThread(void *context) {
                 }
             } else if (command == BLE_CMD_START_ADV) {
                 LOCAL_DEBUG("startAdvertising in ble cmd thread");
-                BleLock lk;
+                // FIXME: duplication, but for now works as a workaround
+                while (!(locked = s_bleMutex.lock(BLE_WAIT_CMD_THREAD_TRY_LOCK)) && !gap->bleCommandThreadExit_) {
+                    // Nothing
+                }
+                SCOPE_GUARD({
+                    if (locked) {
+                        s_bleMutex.unlock();
+                    }
+                });
+                if (gap->bleCommandThreadExit_) {
+                    LOCAL_DEBUG("Exit ble cmd thread");
+                    break;
+                }
                 gap->startAdvertising();
             } else if (command == BLE_CMD_EXIT_THREAD) {
                 LOCAL_DEBUG("Exit ble cmd thread");
@@ -1046,6 +1069,8 @@ void BleGap::bleCommandThread(void *context) {
             os_queue_take(gap->cmdQueue_, &command, 0, nullptr);
         }
     }
+    // Just in case clean up the queue on exit
+    while (!os_queue_take(gap->cmdQueue_, &command, 0, nullptr));
     os_thread_exit(nullptr);
 }
 
@@ -1181,14 +1206,14 @@ int BleGap::stop(bool restore) {
     if (btStackStarted_) {
         // Abort any commands, e.g. the re-adv command after disconnection.
         if (cmdThread_ && !os_thread_is_current(cmdThread_)) {
-            if (isQueueAvailable()) {
-                LOCAL_DEBUG(" >>>>>>>>>>>> s_bleMutex.unlock() <<<<<<<<<<<<<<");
-                s_bleMutex.unlock();
-            }
-            if (enqueue(BLE_CMD_EXIT_THREAD) == SYSTEM_ERROR_NONE) {
-                os_thread_join(cmdThread_);
-                cmdThread_ = nullptr;
+            bleCommandThreadExit_ = true;
+            // It's fine even if this call below fails, but just in case loop here
+            while (enqueue(BLE_CMD_EXIT_THREAD)) {
+                // Nothing
             }
+            os_thread_join(cmdThread_);
+            cmdThread_ = nullptr;
+            bleCommandThreadExit_ = false;
         }
         if (cmdQueue_) {
             if (!cmdThread_) {
