Ethernet working on STM32H5!

Author: multiplemonomials

connectivity/drivers/emac/TARGET_STM/TARGET_STM32H5/TARGET_NUCLEO_H563ZI/CMakeLists.txt

@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_sources(mbed-emac
-    PUBLIC
-        stm32h7_eth_init.c
+    PRIVATE
+        stm32h5_eth_init.c
 )

connectivity/drivers/emac/TARGET_STM/TARGET_STM32H5/TARGET_NUCLEO_H563ZI/stm32h7_eth_init.c renamed to connectivity/drivers/emac/TARGET_STM/TARGET_STM32H5/TARGET_NUCLEO_H563ZI/stm32h5_eth_init.c

@@ -1,5 +1,5 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2022, STMicroelectronics
+ * Copyright (c) 2025, STMicroelectronics
  * All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
@@ -32,88 +32,55 @@
 #include "platform/mbed_critical.h"
 #include "PinNames.h"
 
-#define RMII_MDC_Pin GPIO_PIN_1
-#define RMII_MDC_GPIO_Port GPIOC
-#define RMII_REF_CLK_Pin GPIO_PIN_1
-#define RMII_REF_CLK_GPIO_Port GPIOA
-#define RMII_MDIO_Pin GPIO_PIN_2
-#define RMII_MDIO_GPIO_Port GPIOA
-#define RMII_CRS_DV_Pin GPIO_PIN_7
-#define RMII_CRS_DV_GPIO_Port GPIOA
-#define RMII_RXD0_Pin GPIO_PIN_4
-#define RMII_RXD0_GPIO_Port GPIOC
-#define RMII_RXD1_Pin GPIO_PIN_5
-#define RMII_RXD1_GPIO_Port GPIOC
-#define RMII_TXD1_Pin GPIO_PIN_13
-#define RMII_TXD1_GPIO_Port GPIOB
-#define TMS_Pin GPIO_PIN_13
-#define TMS_GPIO_Port GPIOA
-#define TCK_Pin GPIO_PIN_14
-#define TCK_GPIO_Port GPIOA
-#define RMII_TX_EN_Pin GPIO_PIN_11
-#define RMII_TX_EN_GPIO_Port GPIOG
-#define RMII_TXD0_Pin GPIO_PIN_13
-#define RMII_TXD0_GPIO_Port GPIOG
-
 /**
  * Override HAL Eth Init function
  */
 void EthInitPinmappings(void)
 {
-    GPIO_InitTypeDef GPIO_InitStruct;
-
-    /* GPIO Ports Clock Enable */
-    __HAL_RCC_GPIOH_CLK_ENABLE();
-    __HAL_RCC_GPIOC_CLK_ENABLE();
-    __HAL_RCC_GPIOA_CLK_ENABLE();
-    __HAL_RCC_GPIOB_CLK_ENABLE();
-    __HAL_RCC_GPIOG_CLK_ENABLE();
+    GPIO_InitTypeDef GPIO_InitStruct = {0};
 
-    /* Enable Peripheral clock */
+    /* Peripheral clock enable */
     __HAL_RCC_ETH_CLK_ENABLE();
     __HAL_RCC_ETHTX_CLK_ENABLE();
     __HAL_RCC_ETHRX_CLK_ENABLE();
 
+    __HAL_RCC_GPIOC_CLK_ENABLE();
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
+    __HAL_RCC_GPIOG_CLK_ENABLE();
     /**ETH GPIO Configuration
-        PC1     ------> ETH_MDC
-        PA1     ------> ETH_REF_CLK
-        PA2     ------> ETH_MDIO
-        PA7     ------> ETH_CRS_DV
-        PC4     ------> ETH_RXD0
-        PC5     ------> ETH_RXD1
-        PB13     ------> ETH_TXD1
-        PG11     ------> ETH_TX_EN
-        PG13     ------> ETH_TXD0
+    PC1     ------> ETH_MDC
+    PA1     ------> ETH_REF_CLK
+    PA2     ------> ETH_MDIO
+    PA7     ------> ETH_CRS_DV
+    PC4     ------> ETH_RXD0
+    PC5     ------> ETH_RXD1
+    PB15     ------> ETH_TXD1
+    PG11     ------> ETH_TX_EN
+    PG13     ------> ETH_TXD0
     */
-    GPIO_InitStruct.Pin = RMII_MDC_Pin;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Pull = GPIO_NOPULL;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-    GPIO_InitStruct.Alternate = GPIO_AF11_ETH;
-    HAL_GPIO_Init(RMII_MDC_GPIO_Port, &GPIO_InitStruct);
-
-    GPIO_InitStruct.Pin = RMII_REF_CLK_Pin | RMII_MDIO_Pin | RMII_CRS_DV_Pin;
+    GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF11_ETH;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
-    GPIO_InitStruct.Pin = RMII_RXD0_Pin | RMII_RXD1_Pin;
+    GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_7;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF11_ETH;
-    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
-    GPIO_InitStruct.Pin = RMII_TXD1_Pin;
+    GPIO_InitStruct.Pin = GPIO_PIN_15;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
     GPIO_InitStruct.Alternate = GPIO_AF11_ETH;
-    HAL_GPIO_Init(RMII_TXD1_GPIO_Port, &GPIO_InitStruct);
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
-    GPIO_InitStruct.Pin = RMII_TX_EN_Pin | RMII_TXD0_Pin;
+    GPIO_InitStruct.Pin = GPIO_PIN_11|GPIO_PIN_13;
     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
     GPIO_InitStruct.Pull = GPIO_NOPULL;
     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
@@ -126,18 +93,29 @@ void EthInitPinmappings(void)
  */
 void EthDeinitPinmappings()
 {
-    /* Disable Peripheral clock */
+    /* Peripheral clock disable */
     __HAL_RCC_ETH_CLK_DISABLE();
     __HAL_RCC_ETHTX_CLK_DISABLE();
     __HAL_RCC_ETHRX_CLK_DISABLE();
 
-    HAL_GPIO_DeInit(GPIOC, RMII_MDC_Pin | RMII_RXD0_Pin | RMII_RXD1_Pin);
+    /**ETH GPIO Configuration
+    PC1     ------> ETH_MDC
+    PA1     ------> ETH_REF_CLK
+    PA2     ------> ETH_MDIO
+    PA7     ------> ETH_CRS_DV
+    PC4     ------> ETH_RXD0
+    PC5     ------> ETH_RXD1
+    PB15     ------> ETH_TXD1
+    PG11     ------> ETH_TX_EN
+    PG13     ------> ETH_TXD0
+    */
+    HAL_GPIO_DeInit(GPIOC, GPIO_PIN_1|GPIO_PIN_4|GPIO_PIN_5);
 
-    HAL_GPIO_DeInit(GPIOA, RMII_REF_CLK_Pin | RMII_MDIO_Pin | RMII_CRS_DV_Pin);
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_7);
 
-    HAL_GPIO_DeInit(RMII_TXD1_GPIO_Port, RMII_TXD1_Pin);
+    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_15);
 
-    HAL_GPIO_DeInit(GPIOG, RMII_TX_EN_Pin | RMII_TXD0_Pin);
+    HAL_GPIO_DeInit(GPIOG, GPIO_PIN_11|GPIO_PIN_13);
 }
 
 // Get Ethernet PHY reset pin

connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H723ZG/CMakeLists.txt

@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_sources(mbed-emac
-    INTERFACE
+    PRIVATE
         stm32h7_eth_init.c
 )

connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI2/CMakeLists.txt

@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_sources(mbed-emac
-    PUBLIC
+    PRIVATE
         stm32h7_eth_init.c
 )

connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_NUCLEO_H743ZI2/stm32h7_eth_init.c

@@ -32,8 +32,6 @@
 #include "platform/mbed_critical.h"
 #include "PinNames.h"
 
-#define MCO_Pin GPIO_PIN_0
-#define MCO_GPIO_Port GPIOH
 #define RMII_MDC_Pin GPIO_PIN_1
 #define RMII_MDC_GPIO_Port GPIOC
 #define RMII_REF_CLK_Pin GPIO_PIN_1
@@ -48,10 +46,6 @@
 #define RMII_RXD1_GPIO_Port GPIOC
 #define RMII_TXD1_Pin GPIO_PIN_13
 #define RMII_TXD1_GPIO_Port GPIOB
-#define TMS_Pin GPIO_PIN_13
-#define TMS_GPIO_Port GPIOA
-#define TCK_Pin GPIO_PIN_14
-#define TCK_GPIO_Port GPIOA
 #define RMII_TX_EN_Pin GPIO_PIN_11
 #define RMII_TX_EN_GPIO_Port GPIOG
 #define RMII_TXD0_Pin GPIO_PIN_13

connectivity/drivers/emac/TARGET_STM/TARGET_STM32H7/TARGET_PORTENTA_H7/CMakeLists.txt

@@ -2,6 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_sources(mbed-emac
-    PUBLIC
+    PRIVATE
         stm32h7_eth_init.c
 )

connectivity/drivers/emac/include/GenericEthDMA.h

@@ -154,6 +154,8 @@ namespace mbed {
                 txReclaimIndex = (txReclaimIndex + 1) % MBED_CONF_NSAPI_EMAC_TX_NUM_DESCS;
                 ++txDescsOwnedByApplication;
 
+                tr_debug("Reclaimed descriptor %zu", txReclaimIndex);
+
                 returnedAnyDescriptors = true;
             }
 
@@ -459,37 +461,39 @@ namespace mbed {
                     break;
                 }
 
-                if (descriptor.isErrorDesc() ||
-                    (!descriptor.isFirstDesc() && !firstDescIdx.has_value())) {
-                    // Context or error descriptor, or a non-first-descriptor before a first descriptor
+                if (!firstDescIdx.has_value() && (descriptor.isErrorDesc() || !descriptor.isFirstDesc())) {
+                    // Error or non-first-descriptor before a first descriptor
                     // (could be caused by incomplete packets/junk in the DMA buffer).
                     // Ignore, free associated memory, and schedule for rebuild.
                     memory_manager->free(rxDescStackBufs[descIdx]);
                     rxDescStackBufs[descIdx] = nullptr;
                     ++rxDescsOwnedByApplication;
                     ++rxNextIndex;
 
-                    // We should only get one of these error descriptors before the start of the packet, not
-                    // during it.
-                    if(descriptor.isErrorDesc()) {
-                        MBED_ASSERT(!firstDescIdx.has_value());
-                    }
-
                     continue;
                 }
+                else if(firstDescIdx.has_value() && (descriptor.isErrorDesc() || descriptor.isFirstDesc()))
+                {
+                    // Already seen a first descriptor, but we have an error descriptor or another first descriptor.
+                    // So, delete the in-progress packet up to this point.
+
+                    // Clean up the old first descriptor and any descriptors between there and here
+                    const size_t endIdx = descriptor.isFirstDesc() ? descIdx : (descIdx + 1) % RX_NUM_DESCS;
 
-                if (descriptor.isFirstDesc()) {
-                    // We should see first descriptor only once and before last descriptor. If this rule is violated, it's likely
-                    // because we ran out of descriptors during receive earlier and the MAC tossed out the rest of the packet.
-                    if(firstDescIdx.has_value()) {
-                        // Clean up the old first descriptor and any descriptors between there and here
-                        for(size_t descToCleanIdx = *firstDescIdx; descToCleanIdx != descIdx; descToCleanIdx = (descToCleanIdx + 1) % RX_NUM_DESCS) {
-                            memory_manager->free(rxDescStackBufs[descToCleanIdx]);
-                            rxDescStackBufs[descToCleanIdx] = nullptr;
-                            ++rxDescsOwnedByApplication;
-                            ++rxNextIndex;
-                        }
+                    for(size_t descToCleanIdx = *firstDescIdx; descToCleanIdx != endIdx; descToCleanIdx = (descToCleanIdx + 1) % RX_NUM_DESCS) {
+                        memory_manager->free(rxDescStackBufs[descToCleanIdx]);
+                        rxDescStackBufs[descToCleanIdx] = nullptr;
+                        ++rxDescsOwnedByApplication;
+                        ++rxNextIndex;
                     }
+
+                    if(!descriptor.isErrorDesc())
+                    {
+                        firstDescIdx = descIdx;
+                    }
+                }
+                else if(descriptor.isFirstDesc())
+                {
                     firstDescIdx = descIdx;
                 }
 

connectivity/lwipstack/include/lwipstack/LWIPMemoryManager.h

@@ -31,8 +31,6 @@ class LWIPMemoryManager final : public EMACMemoryManager {
 
     uint32_t get_pool_alloc_unit(uint32_t align) const override;
 
-    uint32_t get_pool_size() const override;
-
     void free(net_stack_mem_buf_t *buf) override;
 
     uint32_t get_total_len(const net_stack_mem_buf_t *buf) const override;

connectivity/lwipstack/source/LWIPMemoryManager.cpp

@@ -51,11 +51,6 @@ uint32_t LWIPMemoryManager::get_pool_alloc_unit(uint32_t align) const
     return alloc_unit;
 }
 
-uint32_t LWIPMemoryManager::get_pool_size() const
-{
-    return PBUF_POOL_SIZE;
-}
-
 void LWIPMemoryManager::free(net_stack_mem_buf_t *buf)
 {
     pbuf_free(static_cast<struct pbuf *>(buf));

connectivity/nanostack/mbed-mesh-api/source/NanostackMemoryManager.cpp

@@ -65,11 +65,6 @@ uint32_t NanostackMemoryManager::get_pool_alloc_unit(uint32_t align) const
     return MBED_CONF_NSAPI_EMAC_RX_POOL_BUF_SIZE;
 }
 
-uint32_t NanostackMemoryManager::get_pool_size() const
-{
-    return MBED_CONF_NSAPI_EMAC_RX_POOL_NUM_BUFS;
-}
-
 void NanostackMemoryManager::free(emac_mem_buf_t *mem)
 {
     ns_dyn_mem_free(mem);