CompositeEMAC inits!

Author: multiplemonomials

connectivity/drivers/emac/TARGET_STM/STM32EthMACv2.cpp

@@ -23,6 +23,8 @@
 
 using namespace std::chrono_literals;
 
+#define TRACE_GROUP "STEMACv2"
+
 // Defined in stm32_eth_init.c
 extern "C" void EthInitPinmappings();
 extern "C" void EthDeinitPinmappings();
@@ -114,6 +116,11 @@ namespace mbed {
         base->DMACSR = ETH_DMACSR_RPS;
     }
 
+    void STM32EthMacV2::RxDMA::stopDMA() {
+        // Disable Rx DMA
+        base->DMACTCR &= ~ETH_DMACRCR_SR;
+    }
+
     void STM32EthMacV2::RxDMA::returnDescriptor(const size_t descIdx, uint8_t * const buffer) {
         auto & desc = rxDescs[descIdx];
 
@@ -395,6 +402,8 @@ namespace mbed {
         // Get result
         result = base->MACMDIODR & ETH_MACMDIODR_MD_Msk;
 
+        tr_debug("MDIO read devAddr %" PRIu8 ", regAddr 0x%" PRIx8 " -> 0x%" PRIx16, devAddr, regAddr, result);
+
         return ErrCode::SUCCESS;
     }
 
@@ -427,6 +436,8 @@ namespace mbed {
             return ErrCode::TIMEOUT;
         }
 
+        tr_debug("MDIO write devAddr %" PRIu8 ", regAddr 0x%" PRIx8 " <- 0x%" PRIx16, devAddr, regAddr, data);
+
         return ErrCode::SUCCESS;
     }
 
@@ -472,6 +483,28 @@ namespace mbed {
         return ErrCode::SUCCESS;
     }
 
+    void STM32EthMacV2::MACDriver::setPassAllMcast(bool pass) {
+        if(pass)
+        {
+            base->MACPFR |= ETH_MACPFR_PM;
+        }
+        else
+        {
+            base->MACPFR &= ~ETH_MACPFR_PM;
+        }
+    }
+
+    void STM32EthMacV2::MACDriver::setPromiscuous(bool enable) {
+        if(enable)
+        {
+            base->MACPFR |= ETH_MACPFR_PR;
+        }
+        else
+        {
+            base->MACPFR &= ~ETH_MACPFR_PR;
+        }
+    }
+
     STM32EthMacV2 * STM32EthMacV2::instance = nullptr;
 
     STM32EthMacV2::STM32EthMacV2():
@@ -514,5 +547,11 @@ namespace mbed {
                    "STM32 EMAC v2: Hardware reports fatal DMA error\n");
         }
     }
+}
 
+// Provide default EMAC driver
+MBED_WEAK EMAC &EMAC::get_default_instance()
+{
+    static mbed::STM32EthMacV2 emac;
+    return emac;
 }

connectivity/drivers/emac/TARGET_STM/mbed_lib.json5

@@ -173,6 +173,10 @@ class CompositeEMAC : public EMAC
         /**
          * @brief Add a multicast MAC address that should be accepted by the MAC.
          *
+         * \note Only a maximum of \c nsapi.emac-max-mcast-subscribes multicast addresses will be subscribed to
+         * at once by the upper layer. If the application tried to subscribe to more than that, CEMAC will fall
+         * back to enabling pass all mcast.
+         *
          * @param mac MAC address to accept
          *
          * @return Error code or success
@@ -193,7 +197,7 @@ class CompositeEMAC : public EMAC
          *
          * @param pass True to pass all mcasts, false otherwise
          */
-        virtual void setPassAllMcast(bool pass);
+        virtual void setPassAllMcast(bool pass) = 0;
 
         /**
          * @brief Set promiscuous mode (where the Eth MAC passes all traffic up to the application, regardless
@@ -203,7 +207,7 @@ class CompositeEMAC : public EMAC
          *
          * @param enable True to pass all traffic, false otherwise
          */
-        virtual void setPromiscuous(bool enable);
+        virtual void setPromiscuous(bool enable) = 0;
     };
 
     /**
@@ -342,10 +346,10 @@ class CompositeEMAC : public EMAC
     EMACMemoryManager * memory_manager = nullptr;
 
     // Instances of each of the 4 component classes
-    MACDriver & mac;
-    PhyDriver & phy;
-    TxDMA & txDMA;
+    PhyDriver * phy = nullptr;
     RxDMA & rxDMA;
+    TxDMA & txDMA;
+    MACDriver & mac;
 
     // State of the MAC
     enum class PowerState {