Fix a couple issues with the power down test

Author: multiplemonomials

connectivity/drivers/emac/include/GenericEthDMA.h

@@ -167,7 +167,7 @@ namespace mbed {
                 txReclaimIndex = (txReclaimIndex + 1) % MBED_CONF_NSAPI_EMAC_TX_NUM_DESCS;
                 ++txDescsOwnedByApplication;
 
-                tr_info("Reclaimed descriptor %zu", txReclaimIndex);
+                tr_debug("Reclaimed descriptor %zu", txReclaimIndex);
 
                 returnedAnyDescriptors = true;
             }
@@ -212,7 +212,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
@@ -382,6 +382,8 @@ namespace mbed {
     public:
         CompositeEMAC::ErrCode init() override {
             rxPoolPayloadSize = memory_manager->get_pool_alloc_unit(RX_BUFFER_ALIGN);
+            rxBuildIndex = 0;
+            rxNextIndex = 0;
 
             // At the start, we own all the descriptors
             rxDescsOwnedByApplication = RX_NUM_DESCS;
@@ -432,7 +434,7 @@ namespace mbed {
                 rxBuildIndex = (rxBuildIndex + 1) % RX_NUM_DESCS;
             }
 
-            tr_info("buildRxDescriptors(): Returned %zu descriptors.", origRxDescsOwnedByApplication - rxDescsOwnedByApplication);
+            tr_debug("buildRxDescriptors(): Returned %zu descriptors.", origRxDescsOwnedByApplication - rxDescsOwnedByApplication);
         }
 
         bool rxHasPackets_ISR() override {
@@ -585,7 +587,7 @@ namespace mbed {
             }
 #endif
 
-            tr_info("Returning packet of length %lu, start %p from Rx descriptors %zu-%zu\n",
+            tr_debug("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

@@ -56,6 +56,12 @@ void test_emac_power_down_and_power_up()
     emac_if_link_state_change_cb(false);
 
     TEST_ASSERT_TRUE(EmacTestNetworkStack::get_instance().get_emac()->power_up());
+
+    // Currently EMACs may expect set_hwaddr() to be called after power up as this API is not well defined.
+    EmacTestNetworkStack::get_instance().get_emac()->set_hwaddr(EmacTestNetworkStack::get_instance().get_mac_addr());
+
+    // Wait for link to come back up before continuing
+    worker_loop_link_up_wait();
 }
 
 #endif // defined(MBED_CONF_RTOS_PRESENT)

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

@@ -27,21 +27,21 @@
 
 using namespace utest::v1;
 
+static bool send_request;
+static int no_response_cnt;
+static int retries;
+static int test_step = 0;
+
 void test_emac_unicast_cb(int opt)
 {
-    static bool send_request = true;
-    static int no_response_cnt = 0;
-    static int retries = 0;
-    static int test_step = 0;
-
     // Timeout
     if (opt == TIMEOUT && send_request) {
         CTP_MSG_SEND(100, emac_if_get_echo_server_addr(0), emac_if_get_own_addr(), emac_if_get_own_addr(), 0);
         send_request = false;
         no_response_cnt = 0;
     } else if (opt == TIMEOUT) {
         if (++no_response_cnt > 5) {
-            if (++retries > 3) {
+            if (++retries > 300) {
                 printf("too many retries\r\n\r\n");
                 SET_ERROR_FLAGS(TEST_FAILED);
                 END_TEST_LOOP;
@@ -65,6 +65,16 @@ void test_emac_unicast_cb(int opt)
 
 void test_emac_unicast()
 {
+    if(test_step != 0) {
+        printf("Got here!\n");
+    }
+
+    // Reset flags
+    send_request = true;
+    no_response_cnt = 0;
+    retries = 0;
+    test_step = 0;
+
     RESET_ALL_ERROR_FLAGS;
     SET_TRACE_LEVEL(TRACE_SEND | TRACE_ETH_FRAMES | TRACE_SUCCESS | TRACE_FAILURE);
 

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

@@ -47,8 +47,6 @@ 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 power down and power up", test_emac_power_down_and_power_up),
-    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),
@@ -57,7 +55,9 @@ Case cases[] = {
     (MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == WIFI))
     Case("EMAC multicast filter", test_emac_multicast_filter),
 #endif // !(MBED_CONF_NETWORK_EMAC_NO_SUPPORT_FOR_MULTICAST_FILTER == 1)
-    Case("EMAC memory", test_emac_memory)
+    Case("EMAC memory", test_emac_memory),
+    Case("EMAC power down and power up", test_emac_power_down_and_power_up),
+    Case("EMAC unicast again after power cycle", test_emac_unicast),
 };
 
 Specification specification(test_setup, cases);