Almost working! Just missing memory freed callback

Author: multiplemonomials

connectivity/drivers/emac/TARGET_STM/STM32EthMACv2.cpp

@@ -94,7 +94,8 @@ namespace mbed {
 
         // Move tail pointer register to point to the descriptor after this descriptor.
         // This tells the MAC to transmit until it reaches the given descriptor, then stop.
-        base->DMACTDTPR = reinterpret_cast<uint32_t>(&txDescs[txSendIndex]);
+        const auto nextDescIdx = (descIdx + 1) % MBED_CONF_NSAPI_EMAC_TX_NUM_DESCS;
+        base->DMACTDTPR = reinterpret_cast<uint32_t>(&txDescs[nextDescIdx]);
     }
 
     void STM32EthMacV2::RxDMA::startDMA()
@@ -147,9 +148,9 @@ namespace mbed {
         base->DMACRDTPR = reinterpret_cast<uint32_t>(&rxDescs[nextDescIdx]);
     }
 
-    size_t STM32EthMacV2::RxDMA::getTotalLen(const size_t firstDescIdx) {
-        // Total length of the packet is in the first descriptor
-        return rxDescs[firstDescIdx].formats.fromDMA.pktLength;
+    size_t STM32EthMacV2::RxDMA::getTotalLen(const size_t firstDescIdx, const size_t lastDescIdx) {
+        // Total length of the packet is in the last descriptor
+        return rxDescs[lastDescIdx].formats.fromDMA.pktLength;
     }
 
     void STM32EthMacV2::MACDriver::ETH_SetMDIOClockRange(ETH_TypeDef * const base)
@@ -275,7 +276,8 @@ namespace mbed {
         base->MAC1USTCR = (HAL_RCC_GetHCLKFreq() / 1000000U) - 1U;
 
         // MAC configuration
-        base->MACCR = ETH_MACCR_SARC_REPADDR0; // Replace the SA field in Tx packets with the configured source address
+        base->MACCR = ETH_MACCR_SARC_REPADDR0 | // Replace the SA field in Tx packets with the configured source address
+            ETH_MACCR_CST_Msk; // Don't include the CRC when forwarding Rx packets to the application
         base->MTLTQOMR |= ETH_MTLTQOMR_TSF_Msk; // Enable store and forward mode for transmission (default in the HAL)
 
         // Enable multicast hash and perfect filter

connectivity/drivers/emac/TARGET_STM/STM32EthMACv2.h

@@ -58,7 +58,7 @@ namespace mbed {
 
             void returnDescriptor(size_t descIdx, uint8_t *buffer) override;
 
-            size_t getTotalLen(size_t firstDescIdx) override;
+            size_t getTotalLen(size_t firstDescIdx, size_t lastDescIdx) override;
 
         public:
             explicit RxDMA(ETH_TypeDef * const base):

connectivity/drivers/emac/include/GenericEthDMA.h

@@ -197,7 +197,7 @@ namespace mbed {
                 }
             }
 
-            tr_info("Transmitting packet of length %lu in %zu buffers and %zu descs\n",
+            tr_debug("Transmitting packet of length %lu in %zu buffers and %zu descs\n",
                memory_manager->get_total_len(buf), memory_manager->count_buffers(buf), neededDescs);
 
             // Step 2: Copy packet if needed
@@ -341,9 +341,9 @@ namespace mbed {
         virtual void returnDescriptor(size_t descIdx, uint8_t * buffer) = 0;
 
         /// Get the length of the packet starting at firstDescIdx and continuing until the
-        /// next descriptor with the last descriptor flag set. Descriptors have already been validated to contain a
+        /// given last descriptor. Descriptors have already been validated to contain a
         /// complete packet at this point.
-        virtual size_t getTotalLen(size_t firstDescIdx) = 0;
+        virtual size_t getTotalLen(size_t firstDescIdx, size_t lastDescIdx) = 0;
 
     public:
         CompositeEMAC::ErrCode init() override {
@@ -512,7 +512,7 @@ namespace mbed {
 
             // Set length of first buffer
             net_stack_mem_buf_t *const headBuffer = rxDescStackBufs[*firstDescIdx];
-            size_t lenRemaining = getTotalLen(*firstDescIdx);
+            size_t lenRemaining = getTotalLen(*firstDescIdx, *lastDescIdx);
             memory_manager->set_len(headBuffer, std::min(lenRemaining, rxPoolPayloadSize));
             lenRemaining -= std::min(lenRemaining, rxPoolPayloadSize);
 
@@ -546,7 +546,7 @@ namespace mbed {
             }
 #endif
 
-            tr_info("Returning packet of length %lu, start %p from Rx descriptors %zu-%zu (%p-%p)\n",
+            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]);
 

connectivity/netsocket/mbed_lib.json5

@@ -83,7 +83,7 @@
             "value": 592 // LwIP default value (assuming default TCP MSS)
         },
         "emac-rx-pool-num-bufs": {
-            "help": "Number of buffers (of size netsocket.emac-rx-pool-buf-size) in the EMAC receive pool. This controls how much memory is preallocated for Ethernet reception. A larger number means that more Ethernet packets can be received per second without dropping any. Some EMACs need up to 4 extra buffers, so this should be set such that this value minus 4 times the buffer size is at least 1514 (so we can receive one full Ethernet frame).",
+            "help": "Number of buffers (of size netsocket.emac-rx-pool-buf-size) in the EMAC receive pool. This controls how much memory is preallocated for Ethernet reception. A larger number means that more Ethernet packets can be received per second without dropping any. Some EMACs need up to 4 extra buffers, so this should be set such that (this value minus 4) times the buffer size is at least 1514 (so we can receive one full Ethernet frame).",
             "value": 7
         },
         "emac-tx-num-descs": {

connectivity/netsocket/tests/TESTS/network/emac/emac_test_initialize.cpp

@@ -36,9 +36,6 @@ void test_emac_initialize()
     worker_loop_init();
     mbed_trace_init();
 
-    // Set memory manager parameters
-    EmacTestMemoryManager::get_instance().set_alloc_unit(256); // Use a relatively small allocation unit size so packets have to be split up into a lot of buffers
-
     static NetworkInterface *network_interface = get_network_interface();
 
     // Power up the interface and emac driver

connectivity/netsocket/tests/emac_test_utils/EmacTestMemoryManager.cpp

@@ -36,8 +36,6 @@
 
 #define CHECK_ASSERT(value, fmt, ...) check_value(value, fmt, ##__VA_ARGS__)
 
-#define BUF_POOL_SIZE   (14 + 40 + 20 + 536) /* Ethernet + IP + TCP + payload */
-
 #define MEM_MNGR_TRACE "test mem mngr: "
 
 char s_trace_buffer[100] = MEM_MNGR_TRACE;
@@ -74,7 +72,7 @@ void emac_heap_error_handler(heap_fail_t event)
 EmacTestMemoryManager::EmacTestMemoryManager()
     : m_mem_mutex(),
       m_mem_buffers(),
-      m_alloc_unit(BUF_POOL_SIZE),
+      m_alloc_unit(MBED_CONF_NSAPI_EMAC_RX_POOL_BUF_SIZE),
       m_memory_available(true)
 {
 #ifdef ETHMEM_SECTION

targets/targets.json5

@@ -3111,9 +3111,7 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
             "LPTICKER",
             "CAN",
 			"SERIAL_FC",
-            "WATCHDOG",
-            "ETHERNET",
-            "EMAC"
+            "WATCHDOG"
         ],
         "is_mcu_family_target": true
     },
@@ -3128,6 +3126,10 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
         ],
         "macros_add": [
             "STM32H503xx"
+        ],
+        "device_has_remove": [
+            "ETHERNET",
+            "EMAC"
         ]
     },
 	"NUCLEO_H503RB": {
@@ -3141,7 +3143,8 @@ mode is recommended for target MCUs with small amounts of flash and RAM.",
 
             // ADC reference voltage is same as MCU VDD.
             // MCU VDD defaults to 3.3V though can be changed to 1.8V based on JP2 setting on nucleo board.
-            "default-adc-vref": 3.3
+            "default-adc-vref": 3.3,
+            "network-default-interface-type": "ETHERNET"
         },
         "device_has_remove": [
             "ANALOGOUT" // both DAC pins are in conflict with LED1 and STDIO_UART_TX