Fix some bugs, Tx DMA working but no packets are getting transmitted

Author: multiplemonomials

connectivity/drivers/emac/TARGET_STM/STM32EthMACv1.cpp

@@ -40,7 +40,7 @@ void STM32EthMACv1::TxDMA::startDMA() {
     txDescs[TX_NUM_DESCS - 1].endOfRing = true;
 
     // Set descriptor list address register
-    base->DMARDLAR = reinterpret_cast<ptrdiff_t>(&txDescs[0]);
+    base->DMATDLAR = reinterpret_cast<ptrdiff_t>(&txDescs[0]);
 
     // Start Tx DMA
     base->DMAOMR |= ETH_DMAOMR_ST_Msk;
@@ -254,7 +254,7 @@ CompositeEMAC::ErrCode STM32EthMACv1::MACDriver::init() {
     ETH_SetMDIOClockRange(base);
 
     // Configure MAC settings
-    base->MACCR |= ETH_MACCR_APCS_Msk; // Strip padding and CRC from frames
+    base->MACCR |= (1 << 25); // Strip CRC from frames. CSTF bit definition missing from CMSIS header for some reason?
     base->MACFFR = ETH_MACFFR_HPF_Msk | ETH_MACFFR_HM_Msk; // Use perfect and hash filters for multicast
 
     // Configure DMA settings. Default STM32CubeHAL settings used.
@@ -278,6 +278,8 @@ CompositeEMAC::ErrCode STM32EthMACv1::MACDriver::init() {
     // trigger if we run out of Rx descriptors, and we don't want to fatal error
     // in that case.
     base->DMAIER = ETH_DMAIER_NISE | ETH_DMAIER_RIE | ETH_DMAIER_TIE | ETH_DMAIER_FBEIE | ETH_DMAIER_AISE;
+
+    return CompositeEMAC::ErrCode::SUCCESS;
 }
 
 CompositeEMAC::ErrCode STM32EthMACv1::MACDriver::deinit() {
@@ -361,7 +363,7 @@ CompositeEMAC::ErrCode STM32EthMACv1::MACDriver::mdioRead(uint8_t devAddr, uint8
     // Get result
     result = base->MACMIIDR;
 
-    tr_info("MDIO read devAddr %" PRIu8 ", regAddr 0x%" PRIx8 " -> 0x%" PRIx16, devAddr, regAddr, result);
+    tr_debug("MDIO read devAddr %" PRIu8 ", regAddr 0x%" PRIx8 " -> 0x%" PRIx16, devAddr, regAddr, result);
 
     return ErrCode::SUCCESS;
 }
@@ -459,6 +461,8 @@ void STM32EthMACv1::MACDriver::setPromiscuous(bool enable) {
     }
 }
 
+STM32EthMACv1 * STM32EthMACv1::instance = nullptr;
+
 STM32EthMACv1::STM32EthMACv1():
 CompositeEMAC(txDMA, rxDMA, macDriver),
 base(ETH),
@@ -495,15 +499,14 @@ void STM32EthMACv1::irqHandler() {
     if(dma_flag & ETH_DMASR_FBES_Msk)
     {
         MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER_ETHERNET, EIO), \
-               "STM32 EMAC v2: Hardware reports fatal DMA error\n");
+               "STM32 EMAC v1: Hardware reports fatal DMA error\n");
     }
 }
+}
 
 // Provide default EMAC driver
 MBED_WEAK EMAC &EMAC::get_default_instance()
 {
     static mbed::STM32EthMACv1 emac;
     return emac;
-}
-
-}
+}

connectivity/drivers/emac/include/GenericEthDMA.h

@@ -147,7 +147,7 @@ namespace mbed {
                 txReclaimIndex = (txReclaimIndex + 1) % MBED_CONF_NSAPI_EMAC_TX_NUM_DESCS;
                 ++txDescsOwnedByApplication;
 
-                tr_debug("Reclaimed descriptor %zu", txReclaimIndex);
+                tr_info("Reclaimed descriptor %zu", txReclaimIndex);
 
                 returnedAnyDescriptors = true;
             }
@@ -234,31 +234,38 @@ namespace mbed {
                 SCB_CleanDCache_by_Addr(memory_manager->get_ptr(currBuf), memory_manager->get_len(currBuf));
 #endif
 
-                // Move to next buffer
-                currBuf = memory_manager->get_next(currBuf);
-                if(currBuf == nullptr)
+                // Get next buffer
+                const auto nextBuf = memory_manager->get_next(currBuf);
+                if(nextBuf == nullptr)
                 {
-                    // Last descriptor, store buffer address for freeing
+                    // Last descriptor, store head buffer address for freeing
                     descStackBuffers[txSendIndex] = buf;
                 }
                 else
                 {
                     descStackBuffers[txSendIndex] = nullptr;
                 }
 
+                // Get the pointer and length of the packet because this might not be doable in a critical section
+                const auto bufferPtr = static_cast<uint8_t *>(memory_manager->get_ptr(currBuf));
+                const auto bufferLen = memory_manager->get_len(currBuf);
+
                 // Enter a critical section, because we could run into weird corner cases if the
                 // interrupt executes while we are half done configuring this descriptor and updating
                 // the counters.
                 core_util_critical_section_enter();
 
                 // Configure settings.
-                giveToDMA(txSendIndex, static_cast<uint8_t *>(memory_manager->get_ptr(currBuf)), memory_manager->get_len(currBuf), descCount == 0, currBuf == nullptr);
+                giveToDMA(txSendIndex, bufferPtr, bufferLen, descCount == 0, nextBuf == nullptr);
 
                 // Update descriptor count and index
                 --txDescsOwnedByApplication;
                 txSendIndex = (txSendIndex + 1) % MBED_CONF_NSAPI_EMAC_TX_NUM_DESCS;
 
                 core_util_critical_section_exit();
+
+                // Move to next buffer
+                currBuf = nextBuf;
             }
 
             return CompositeEMAC::ErrCode::SUCCESS;
@@ -558,9 +565,8 @@ namespace mbed {
             }
 #endif
 
-            tr_debug("Returning packet of length %lu, start %p from Rx descriptors %zu-%zu (%p-%p)\n",
-                   memory_manager->get_total_len(headBuffer), memory_manager->get_ptr(headBuffer), *firstDescIdx, *lastDescIdx,
-                   &rxDescs[*firstDescIdx], &rxDescs[*lastDescIdx]);
+            tr_info("Returning packet of length %lu, start %p from Rx descriptors %zu-%zu\n",
+                   memory_manager->get_total_len(headBuffer), memory_manager->get_ptr(headBuffer), *firstDescIdx, *lastDescIdx);
 
             return headBuffer;
         }

connectivity/drivers/emac/sources/CompositeEMAC.cpp

@@ -221,7 +221,7 @@ namespace mbed {
             return false;
         }
 
-        // Init DMA rungs
+        // Init DMA rings
         if(txDMA.init() != ErrCode::SUCCESS || rxDMA.init() != ErrCode::SUCCESS) {
             tr_err("power_up(): Failed to init DMA!");
             return false;