timer: remove useless check on x86 TSC reliability

[dpdk.git] / app / test-pmd / testpmd.c

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2a57978..5701f31 100644 (file)
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2209,8 +2209,8 @@ start_port(portid_t pid)
                        RTE_PORT_HANDLING, RTE_PORT_STARTED) == 0)
                        printf("Port %d can not be set into started\n", pi);
 
-               rte_eth_macaddr_get(pi, &mac_addr);
-               printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
+               if (eth_macaddr_get_print_err(pi, &mac_addr) == 0)
+                       printf("Port %d: %02X:%02X:%02X:%02X:%02X:%02X\n", pi,
                                mac_addr.addr_bytes[0], mac_addr.addr_bytes[1],
                                mac_addr.addr_bytes[2], mac_addr.addr_bytes[3],
                                mac_addr.addr_bytes[4], mac_addr.addr_bytes[5]);
@@ -2361,6 +2361,12 @@ reset_port(portid_t pid)
        if (port_id_is_invalid(pid, ENABLED_WARN))
                return;
 
+       if ((pid == (portid_t)RTE_PORT_ALL && !all_ports_stopped()) ||
+               (pid != (portid_t)RTE_PORT_ALL && !port_is_stopped(pid))) {
+               printf("Can not reset port(s), please stop port(s) first.\n");
+               return;
+       }
+
        printf("Resetting ports...\n");
 
        RTE_ETH_FOREACH_DEV(pi) {
@@ -2625,6 +2631,7 @@ check_all_ports_link_status(uint32_t port_mask)
        portid_t portid;
        uint8_t count, all_ports_up, print_flag = 0;
        struct rte_eth_link link;
+       int ret;
 
        printf("Checking link statuses...\n");
        fflush(stdout);
@@ -2634,7 +2641,14 @@ check_all_ports_link_status(uint32_t port_mask)
                        if ((port_mask & (1 << portid)) == 0)
                                continue;
                        memset(&link, 0, sizeof(link));
-                       rte_eth_link_get_nowait(portid, &link);
+                       ret = rte_eth_link_get_nowait(portid, &link);
+                       if (ret < 0) {
+                               all_ports_up = 0;
+                               if (print_flag == 1)
+                                       printf("Port %u link get failed: %s\n",
+                                               portid, rte_strerror(-ret));
+                               continue;
+                       }
                        /* print link status if flag set */
                        if (print_flag == 1) {
                                if (link.link_status)
@@ -2976,7 +2990,9 @@ init_port_config(void)
 
                rxtx_port_config(port);
 
-               rte_eth_macaddr_get(pid, &port->eth_addr);
+               ret = eth_macaddr_get_print_err(pid, &port->eth_addr);
+               if (ret != 0)
+                       return;
 
                map_port_queue_stats_mapping_registers(pid, port);
 #if defined RTE_LIBRTE_IXGBE_PMD && defined RTE_LIBRTE_IXGBE_BYPASS
@@ -3179,7 +3195,10 @@ init_port_dcb_config(portid_t pid,
        for (i = 0; i < RTE_DIM(vlan_tags); i++)
                rx_vft_set(pid, vlan_tags[i], 1);
 
-       rte_eth_macaddr_get(pid, &rte_port->eth_addr);
+       retval = eth_macaddr_get_print_err(pid, &rte_port->eth_addr);
+       if (retval != 0)
+               return retval;
+
        map_port_queue_stats_mapping_registers(pid, rte_port);
 
        rte_port->dcb_flag = 1;