Add IRQ support

IRQs will send a work queue callback instad of actually doing
anything.  Disable all IRQs when the work noted, and then reset
it when done.

Author: earlephilhower

cores/rp2040/freertos/variantHooks.cpp

@@ -556,20 +556,28 @@ void __USBStart() {
 }
 
 
-
-
-
-extern "C" void __lwip(__lwip_op op, void *req) {
+extern "C" void __lwip(__lwip_op op, void *req, bool fromISR) {
     LWIPWork w;
-    TaskStatus_t t;
-    vTaskGetInfo(nullptr, &t, pdFALSE, eInvalid); // TODO - can we speed this up???
-    w.op = op;
-    w.req = req;
-    w.wakeup = t.xHandle;
-    if (!xQueueSend(__lwipQueue, &w, portMAX_DELAY)) {
-        panic("LWIP task send failed");
+    if (fromISR) {
+        w.op = op;
+        w.req = req;
+        w.wakeup = 0; // Don't try and wake up a task when done, we're not in one!
+        BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+        if (!xQueueSendFromISR(__lwipQueue, &w, &xHigherPriorityTaskWoken)) {
+            panic("LWIP task send failed");
+        }
+        portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
+    } else {
+        TaskStatus_t t;
+        vTaskGetInfo(nullptr, &t, pdFALSE, eInvalid); // TODO - can we speed this up???
+        w.op = op;
+        w.req = req;
+        w.wakeup = t.xHandle;
+        if (!xQueueSend(__lwipQueue, &w, portMAX_DELAY)) {
+            panic("LWIP task send failed");
+        }
+        ulTaskNotifyTakeIndexed(TASK_NOTIFY_LWIP_WAKEUP, pdTRUE, portMAX_DELAY);
     }
-    ulTaskNotifyTakeIndexed(TASK_NOTIFY_LWIP_WAKEUP, pdTRUE, portMAX_DELAY);
 }
 
 extern "C" bool __isLWIPThread() {
@@ -585,7 +593,8 @@ static void lwipThread(void *params) {
 
     while (true) {
         if (xQueueReceive(__lwipQueue, &w, portMAX_DELAY)) {
-            switch (w.op) {
+            switch (w.op)
+            {
                 case __lwip_init:
                 {
                     __real_lwip_init();
@@ -943,7 +952,9 @@ static void lwipThread(void *params) {
                 }
             }
             // Work done, return value set, just tickle the calling task
-            xTaskNotifyGiveIndexed(w.wakeup, TASK_NOTIFY_LWIP_WAKEUP);
+            if (w.wakeup) {
+                xTaskNotifyGiveIndexed(w.wakeup, TASK_NOTIFY_LWIP_WAKEUP);
+            }
         }
     }
 }

cores/rp2040/lwip_wrap.cpp

@@ -37,7 +37,7 @@ recursive_mutex_t __lwipMutex;
 
 extern "C" {
 
-    extern void __lwip(__lwip_op op, void *req) __attribute((weak));
+    extern void __lwip(__lwip_op op, void *req, bool fromISR = false);
     extern bool __isLWIPThread();
 
     static XoshiroCpp::Xoshiro256PlusPlus *_lwip_rng = nullptr;
@@ -820,7 +820,6 @@ 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;
         }
@@ -829,17 +828,21 @@ extern "C" {
         return __real_ethernet_input(p, netif);
     }
 
-    void lwip_callback(void (*cb)(void *), void *cbData) {
+    void lwip_callback(void (*cb)(void *), void *cbData, bool fromISR) {
 #ifdef __FREERTOS
-        if (!__isLWIPThread()) {
+        if (fromISR) {
+            // In ISR we can't check what the current thread is
+            __callback_req req = { cb, cbData };
+            __lwip(__callback, &req, fromISR);
+            return;
+        } else if (!__isLWIPThread()) {
             __callback_req req = { cb, cbData };
-            __lwip(__callback, &req);
+            __lwip(__callback, &req, fromISR);
             return;
         }
 #endif
         cb(cbData);
         return;
     }
 
-
 }; // extern "C"

libraries/lwIP_Ethernet/src/LwipEthernet.cpp

@@ -238,13 +238,13 @@ static void stage2(void *cbData) {
     // 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();
+//        handlePacket.second();
     }
     // Do LWIP stuff as needed
     sys_check_timeouts();
 }
 
-extern "C" void lwip_callback(void (*cb)(void *), void *cbData);
+extern "C" void lwip_callback(void (*cb)(void *), void *cbData, bool fromISR);
 static void ethernetTask(void *param) {
     (void) param;
     while (true) {
@@ -253,7 +253,7 @@ static void ethernetTask(void *param) {
             sleep_ms = _pollingPeriod;
         }
         vTaskDelay(sleep_ms / portTICK_PERIOD_MS);
-        lwip_callback(stage2, nullptr);
+        lwip_callback(stage2, nullptr, false);
 #if 0
         // Scan the installed Ethernet drivers
         for (auto handlePacket : _handlePacketList) {

libraries/lwIP_Ethernet/src/LwipIntfDev.h

@@ -72,6 +72,9 @@ enum EthernetLinkStatus {
     LinkOFF
 };
 
+extern "C" void lwip_callback(void (*cb)(void *), void *cbData, bool fromISR);
+
+
 template<class RawDev>
 class LwipIntfDev: public LwipIntf, public RawDev {
 public:
@@ -211,6 +214,7 @@ class LwipIntfDev: public LwipIntf, public RawDev {
     uint32_t _packetsReceived = 0;
     uint32_t _packetsSent = 0;
 
+    static void _lwipCallback(void *param);
 };
 
 
@@ -468,12 +472,23 @@ void LwipIntfDev<RawDev>::end() {
 }
 
 template<class RawDev>
-void LwipIntfDev<RawDev>::_irq(void *param) {
+void LwipIntfDev<RawDev>::_lwipCallback(void *param) {
     LwipIntfDev *d = static_cast<LwipIntfDev*>(param);
-    //ethernet_arch_lwip_begin();
     d->handlePackets();
     sys_check_timeouts();
+    ethernet_arch_lwip_gpio_unmask();
+}
+
+template<class RawDev>
+void LwipIntfDev<RawDev>::_irq(void *param) {
+    LwipIntfDev *d = static_cast<LwipIntfDev*>(param);
+    ethernet_arch_lwip_gpio_mask(); // Disable other IRQs until we're done processing this one
+    lwip_callback(_lwipCallback, param, true);
+    //ethernet_arch_lwip_begin();
+//    d->handlePackets();
+//    sys_check_timeouts();
     //ethernet_arch_lwip_end();
+
 }
 
 template<class RawDev>
@@ -489,7 +504,6 @@ EthernetLinkStatus LwipIntfDev<RawDev>::linkStatus() {
 template<class RawDev>
 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);
@@ -501,7 +515,6 @@ err_t LwipIntfDev<RawDev>::linkoutput_s(netif* netif, struct pbuf* pbuf) {
                     /*success*/ len == pbuf->len);
     }
 #endif
-    printf("sent len %d\n", len);
 //    ethernet_arch_lwip_end();
     return len == pbuf->len ? ERR_OK : ERR_MEM;
 }