Fix multicast filtering on STM32 (#431)

Jamie Smith · web-flow · commit 86f430b39447 · 2025-01-27T23:44:23.000-08:00
diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/stm32f2_eth_conf.c b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F2/stm32f2_eth_conf.c
@@ -37,7 +37,7 @@ void _eth_config_mac(ETH_HandleTypeDef *heth)
         .BroadcastFramesReception = ETH_BROADCASTFRAMESRECEPTION_ENABLE,
         .DestinationAddrFilter = ETH_DESTINATIONADDRFILTER_NORMAL,
         .PromiscuousMode = ETH_PROMISCUOUS_MODE_DISABLE,
-        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_NONE, // Disable multicast filter
+        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_PERFECTHASHTABLE,
         .UnicastFramesFilter = ETH_UNICASTFRAMESFILTER_PERFECT,
         .HashTableHigh = 0x0U,
         .HashTableLow = 0x0U,
diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/stm32f4_eth_conf.c b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_ARCH_MAX/stm32f4_eth_conf.c
@@ -37,7 +37,7 @@ void _eth_config_mac(ETH_HandleTypeDef *heth)
         .BroadcastFramesReception = ETH_BROADCASTFRAMESRECEPTION_ENABLE,
         .DestinationAddrFilter = ETH_DESTINATIONADDRFILTER_NORMAL,
         .PromiscuousMode = ETH_PROMISCUOUS_MODE_DISABLE,
-        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_NONE, // Disable multicast filter
+        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_PERFECTHASHTABLE,
         .UnicastFramesFilter = ETH_UNICASTFRAMESFILTER_PERFECT,
         .HashTableHigh = 0x0U,
         .HashTableLow = 0x0U,
diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/stm32f4_eth_conf.c b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/stm32f4_eth_conf.c
@@ -37,7 +37,7 @@ void _eth_config_mac(ETH_HandleTypeDef *heth)
         .BroadcastFramesReception = ETH_BROADCASTFRAMESRECEPTION_ENABLE,
         .DestinationAddrFilter = ETH_DESTINATIONADDRFILTER_NORMAL,
         .PromiscuousMode = ETH_PROMISCUOUS_MODE_DISABLE,
-        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_NONE, // Disable multicast filter
+        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_PERFECTHASHTABLE,
         .UnicastFramesFilter = ETH_UNICASTFRAMESFILTER_PERFECT,
         .HashTableHigh = 0x0U,
         .HashTableLow = 0x0U,
diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/stm32f4_eth_conf.c b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F439ZI/stm32f4_eth_conf.c
@@ -37,7 +37,7 @@ void _eth_config_mac(ETH_HandleTypeDef *heth)
         .BroadcastFramesReception = ETH_BROADCASTFRAMESRECEPTION_ENABLE,
         .DestinationAddrFilter = ETH_DESTINATIONADDRFILTER_NORMAL,
         .PromiscuousMode = ETH_PROMISCUOUS_MODE_DISABLE,
-        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_NONE, // Disable multicast filter
+        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_PERFECTHASHTABLE,
         .UnicastFramesFilter = ETH_UNICASTFRAMESFILTER_PERFECT,
         .HashTableHigh = 0x0U,
         .HashTableLow = 0x0U,
diff --git a/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/stm32f7_eth_conf.c b/connectivity/drivers/emac/TARGET_STM/TARGET_STM32F7/stm32f7_eth_conf.c
@@ -39,7 +39,7 @@ void _eth_config_mac(ETH_HandleTypeDef *heth)
         .BroadcastFramesReception = ETH_BROADCASTFRAMESRECEPTION_ENABLE,
         .DestinationAddrFilter = ETH_DESTINATIONADDRFILTER_NORMAL,
         .PromiscuousMode = ETH_PROMISCUOUS_MODE_DISABLE,
-        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_NONE, // Disable multicast filter
+        .MulticastFramesFilter = ETH_MULTICASTFRAMESFILTER_PERFECTHASHTABLE,
         .UnicastFramesFilter = ETH_UNICASTFRAMESFILTER_PERFECT,
         .HashTableHigh = 0x0,
         .HashTableLow = 0x0,
diff --git a/connectivity/drivers/emac/TARGET_STM/stm32xx_emac.cpp b/connectivity/drivers/emac/TARGET_STM/stm32xx_emac.cpp
@@ -299,9 +299,6 @@ bool STM32_EMAC::low_level_init_successful()
     // Set MAC address
     writeMACAddress(MACAddr, &EthHandle.Instance->MACA0HR, &EthHandle.Instance->MACA0LR);
 
-    // Enable multicast hash and perfect filter
-    EthHandle.Instance->MACFFR = ETH_MACFFR_HM | ETH_MACFFR_HPF;
-
     uint32_t TempRegisterValue;
     if (HAL_ETH_ReadPHYRegister(&EthHandle, 2, &TempRegisterValue) != HAL_OK) {
         tr_error("HAL_ETH_ReadPHYRegister 2 issue");
@@ -1076,13 +1073,13 @@ void STM32_EMAC::populateMcastFilterRegs() {
 
 #if defined(ETH_IP_VERSION_V2)
     uint32_t volatile * hashRegs[] = {
-        &EthHandle.Instance->MACHT1R,
-        &EthHandle.Instance->MACHT0R
+        &EthHandle.Instance->MACHT0R,
+        &EthHandle.Instance->MACHT1R
     };
 #else
     uint32_t volatile * hashRegs[] = {
-        &EthHandle.Instance->MACHTHR,
-        &EthHandle.Instance->MACHTLR
+        &EthHandle.Instance->MACHTLR,
+        &EthHandle.Instance->MACHTHR
     };
 #endif
 
