@@ -788,9 +788,11 @@ static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type,
static void
be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
{
+#define LINK_READY_TIMEOUT 5
struct be_adapter *adapter = netdev_priv(netdev);
int status;
u8 link_status = 0;
+ int timeout = netif_carrier_ok(netdev) ? 0 : LINK_READY_TIMEOUT;
if (adapter->function_caps & BE_FUNCTION_CAPS_SUPER_NIC) {
dev_err(&adapter->pdev->dev, "Self test not supported\n");
@@ -822,7 +824,18 @@ be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
test->flags |= ETH_TEST_FL_FAILED;
}
- status = be_cmd_link_status_query(adapter, NULL, &link_status, 0);
+ /* After the loopback test is finished,
+ * it takes a few seconds for the link to comeback up.
+ * Poll for 5s before reporting a failure to the link test.
+ */
+ do {
+ status = be_cmd_link_status_query(adapter, NULL,
+ &link_status, 0);
+ if (link_status || status || ++timeout >= LINK_READY_TIMEOUT)
+ break;
+ ssleep(1);
+ } while (true);
+
if (status) {
test->flags |= ETH_TEST_FL_FAILED;
data[4] = -1;