HW semaphore`

Author: earlephilhower

cores/rp2040/freertos/variantHooks.cpp

@@ -253,7 +253,7 @@ void startFreeRTOS(void) {
     // LWIP runs on core 0 only
     __lwipQueue = xQueueCreate(16, sizeof(LWIPWork));
     //__hwMutex = xSemaphoreCreateMutex();
-    xTaskCreate(lwipThread, "LWIP", 1024, 0, configMAX_PRIORITIES / 2 - 1, &__lwipTask);
+    xTaskCreate(lwipThread, "LWIP", 1024, 0, configMAX_PRIORITIES - 1, &__lwipTask);
     vTaskCoreAffinitySet(__lwipTask, 1 << 0);
 
     // Initialise and run the freeRTOS scheduler. Execution should never return here.
@@ -586,6 +586,7 @@ static void lwipThread(void *params) {
 
     while (true) {
         if (xQueueReceive(__lwipQueue, &w, portMAX_DELAY)) {
+            printf("+LWIPTHREAD %p\n", w.wakeup);
             switch (w.op) {
                 case __lwip_init:
                 {
@@ -938,6 +939,7 @@ static void lwipThread(void *params) {
                 }
             }
             // Work done, return value set, just tickle the calling task
+            printf("-LWIPTHREAD %p\n", w.wakeup);
             xTaskNotifyGiveIndexed(w.wakeup, TASK_NOTIFY_LWIP_WAKEUP);
         }
     }

cores/rp2040/lwip_wrap.cpp

@@ -820,6 +820,7 @@ extern "C" {
         if (!__isLWIPThread()) {
             err_t ret;
             __ethernet_input_req req = { p, netif, &ret };
+            printf("__ethernet_input_req\n");
             __lwip(__ethernet_input, &req);
             return ret;
         }

libraries/lwIP_Ethernet/src/LwipEthernet.cpp

@@ -228,26 +228,36 @@ static void update_next_timeout(async_context_t *context, async_when_pending_wor
     async_context_add_at_time_worker_in_ms(context, &ethernet_timeout_worker, _pollingPeriod);
 }
 
-TaskHandle_t sctTask;
 
-void sct(void *param) {
+// We have a background pump which calls sys_check_timeouts on a periodic basis
+// and polls all Ethernet interfaces
+static TaskHandle_t _ethernetTask;;
+
+static void ethernetTask(void *param) {
     (void) param;
     while (true) {
-        vTaskDelay(100);
-        ethernet_arch_lwip_gpio_mask(); // Ensure non-polled devices won't interrupt us
+        uint32_t sleep_ms = sys_timeouts_sleeptime();
+        if (sleep_ms > _pollingPeriod) {
+            sleep_ms = _pollingPeriod;
+        }
+        vTaskDelay(sleep_ms / portTICK_PERIOD_MS);
+        // Scan the installed Ethernet drivers
         for (auto handlePacket : _handlePacketList) {
+            // Note that each NIC needs to use its own mutex to ensure LWIP isn't doing something with it at the time we want to poll
             handlePacket.second();
         }
+        // Do LWIP stuff as needed
         sys_check_timeouts();
-        ethernet_arch_lwip_gpio_unmask();
     }
 }
+
 void __startEthernetContext() {
     if (__ethernetContextInitted) {
         return;
     }
-//    xTaskCreate(sct, "SCT", 256, nullptr, 1, &sctTask);
-#if 1
+    xTaskCreate(ethernetTask, "Ethernet", 256, nullptr, 1, &_ethernetTask);
+//    vTaskCoreAffinitySet(_ethernetTask, 1 << 0);
+#if 0
 //#if defined(PICO_CYW43_SUPPORTED)
 //    if (rp2040.isPicoW()) {
 //        _context = cyw43_arch_async_context();

libraries/lwIP_Ethernet/src/LwipIntfDev.h

@@ -46,6 +46,9 @@
 #include "LwipEthernet.h"
 #include "wl_definitions.h"
 
+#include "FreeRTOS.h"
+#include "semphr.h"
+
 #ifndef DEFAULT_MTU
 #define DEFAULT_MTU 1500
 #endif
@@ -75,6 +78,7 @@ class LwipIntfDev: public LwipIntf, public RawDev {
     LwipIntfDev(int8_t cs = SS, SPIClass& spi = SPI, int8_t intr = -1) :
         RawDev(cs, spi, intr), _spiUnit(spi), _mtu(DEFAULT_MTU), _intrPin(intr), _started(false), _default(false) {
         memset(&_netif, 0, sizeof(_netif));
+        _hwMutex = xSemaphoreCreateMutex();
     }
 
     //The argument order for ESP is not the same as for Arduino. However, there is compatibility code under the hood
@@ -181,6 +185,7 @@ class LwipIntfDev: public LwipIntf, public RawDev {
 public:
     // called on a regular basis or on interrupt
     err_t handlePackets();
+    SemaphoreHandle_t _hwMutex;
 protected:
     // members
     SPIClass& _spiUnit;
@@ -205,6 +210,7 @@ class LwipIntfDev: public LwipIntf, public RawDev {
 
     uint32_t _packetsReceived = 0;
     uint32_t _packetsSent = 0;
+
 };
 
 
@@ -485,7 +491,9 @@ err_t LwipIntfDev<RawDev>::linkoutput_s(netif* netif, struct pbuf* pbuf) {
     LwipIntfDev* lid = (LwipIntfDev*)netif->state;
     printf("presend %d\n", pbuf->len);
 //    ethernet_arch_lwip_begin();
+    xSemaphoreTake(lid->_hwMutex, portMAX_DELAY);
     uint16_t len = lid->sendFrame((const uint8_t*)pbuf->payload, pbuf->len);
+    xSemaphoreGive(lid->_hwMutex);
     lid->_packetsSent++;
 #if PHY_HAS_CAPTURE
     if (phy_capture) {
@@ -573,11 +581,14 @@ err_t LwipIntfDev<RawDev>::handlePackets() {
         {
             return ERR_OK;
         }
-
+printf("handlePackets1\n");
+        xSemaphoreTake(_hwMutex, portMAX_DELAY);
         uint16_t tot_len = RawDev::readFrameSize();
         if (!tot_len) {
+            xSemaphoreGive(_hwMutex);
             return ERR_OK;
         }
+printf("handlePackets2\n");
 
         // from doc: use PBUF_RAM for TX, PBUF_POOL from RX
         // however:
@@ -588,15 +599,18 @@ err_t LwipIntfDev<RawDev>::handlePackets() {
         // TODO: tweak the wiznet driver to allow copying partial chunk
         //       of received data and use PBUF_POOL.
         pbuf* pbuf = pbuf_alloc(PBUF_RAW, tot_len, PBUF_RAM);
+        printf("pballoc ret %p\n", pbuf);
         if (!pbuf || pbuf->len < tot_len) {
             if (pbuf) {
                 pbuf_free(pbuf);
             }
             RawDev::discardFrame(tot_len);
+            xSemaphoreGive(_hwMutex);
             return ERR_BUF;
         }
 
         uint16_t len = RawDev::readFrameData((uint8_t*)pbuf->payload, tot_len);
+        xSemaphoreGive(_hwMutex);
         if (len != tot_len) {
             // tot_len is given by readFrameSize()
             // and is supposed to be honoured by readFrameData()