Debugging EMAC reboot test

Author: multiplemonomials

connectivity/drivers/emac/TARGET_STM/STM32EthMACv2.cpp

@@ -138,7 +138,7 @@ namespace mbed {
 
     void STM32EthMACv2::RxDMA::stopDMA() {
         // Disable Rx DMA
-        base->DMACTCR &= ~ETH_DMACRCR_SR;
+        base->DMACRCR &= ~ETH_DMACRCR_SR;
     }
 
 #if __DCACHE_PRESENT
@@ -254,8 +254,6 @@ namespace mbed {
         // Note: Following code is based on HAL_Eth_Init() from the HAL
         /* Init the low level hardware : GPIO, CLOCK, NVIC. */
         EthInitPinmappings();
-
-
 #ifdef TARGET_STM32H7
         // Use RMII
         HAL_SYSCFG_ETHInterfaceSelect(SYSCFG_ETH_RMII);

connectivity/drivers/emac/include/GenericEthDMA.h

@@ -160,13 +160,14 @@ namespace mbed {
                 // Free any buffers associated with the descriptor
                 if (descStackBuffers[txReclaimIndex] != nullptr) {
                     memory_manager->free(descStackBuffers[txReclaimIndex]);
+                    descStackBuffers[txReclaimIndex] = nullptr;
                 }
 
                 // Update counters
                 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;
             }
@@ -211,7 +212,7 @@ namespace mbed {
                 }
             }
 
-            tr_debug("Transmitting packet of length %lu in %zu buffers and %zu descs\n",
+            tr_info("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
@@ -431,7 +432,7 @@ namespace mbed {
                 rxBuildIndex = (rxBuildIndex + 1) % RX_NUM_DESCS;
             }
 
-            tr_debug("buildRxDescriptors(): Returned %zu descriptors.", origRxDescsOwnedByApplication - rxDescsOwnedByApplication);
+            tr_info("buildRxDescriptors(): Returned %zu descriptors.", origRxDescsOwnedByApplication - rxDescsOwnedByApplication);
         }
 
         bool rxHasPackets_ISR() override {
@@ -584,7 +585,7 @@ namespace mbed {
             }
 #endif
 
-            tr_debug("Returning packet of length %lu, start %p from Rx descriptors %zu-%zu\n",
+            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/netsocket/tests/TESTS/network/emac/emac_test_initialize.cpp

@@ -47,10 +47,15 @@ void test_emac_initialize()
 /*
  * Test which powers the EMAC down and then up again
  */
-void test_emac_power_down_and_power_up() {
+void test_emac_power_down_and_power_up()
+{
     EmacTestNetworkStack::get_instance().get_emac()->power_down();
 
-    TEST_ASSERT_TRUE(EmacTestNetworkStack::get_instance().get_emac()->power_up())
+    // Note: Currently the EMAC does not deliver a link state change to down callback when powered down.
+    // Might change that in the future but for now we need to deliver the callback manually.
+    emac_if_link_state_change_cb(false);
+
+    TEST_ASSERT_TRUE(EmacTestNetworkStack::get_instance().get_emac()->power_up());
 }
 
 #endif // defined(MBED_CONF_RTOS_PRESENT)

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

@@ -47,9 +47,9 @@ utest::v1::status_t test_setup(const size_t number_of_cases)
 Case cases[] = {
     Case("EMAC initialize", test_emac_initialize),
     Case("EMAC broadcast", test_emac_broadcast), // note: this test case has the side effect of finding the CTP server MAC address and saving it
-    Case("EMAC unicast", test_emac_unicast),
     Case("EMAC power down and power up", test_emac_power_down_and_power_up),
-    Case("EMAC unicast again after power cycle", test_emac_unicast),
+    Case("EMAC broadcast again after power cycle", test_emac_broadcast),
+    Case("EMAC unicast", test_emac_unicast),
     Case("EMAC unicast frame length", test_emac_unicast_frame_len),
     Case("EMAC unicast burst", test_emac_unicast_burst),
     Case("EMAC unicast long", test_emac_unicast_long),