From patchwork Fri May 2 19:43:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 345248 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C9D1B140141 for ; Sat, 3 May 2014 05:43:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752438AbaEBTna (ORCPT ); Fri, 2 May 2014 15:43:30 -0400 Received: from cmexedge2.ext.emulex.com ([138.239.224.100]:26294 "EHLO CMEXEDGE2.ext.emulex.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136AbaEBTn3 (ORCPT ); Fri, 2 May 2014 15:43:29 -0400 Received: from CMEXHTCAS1.ad.emulex.com (138.239.115.217) by CMEXEDGE2.ext.emulex.com (138.239.224.100) with Microsoft SMTP Server (TLS) id 14.3.174.1; Fri, 2 May 2014 12:44:00 -0700 Received: from emulex.com (138.239.131.156) by smtp.emulex.com (138.239.115.207) with Microsoft SMTP Server (TLS) id 14.3.174.1; Fri, 2 May 2014 12:43:28 -0700 Date: Fri, 2 May 2014 14:43:26 -0500 From: Ajit Khaparde To: Subject: [PATCH net 1/2] be2net: Poll for link status till 5s in ethtool diag test Message-ID: <20140502194326.GA20099@emulex.com> Reply-To: Ajit Khaparde MIME-Version: 1.0 Content-Disposition: inline X-URL: http://www.emulex.com Organization: Emulex Corp User-Agent: "Ajit's Mutt" X-OS: Linux i686 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Suresh Reddy After the loopback test is finished, it takes a few seconds for link to come back up. Poll for link status every 1 second interval for 5 seconds, only in cases when the link was UP before PHY loopback test was issued. Signed-off-by: Suresh Reddy Signed-off-by: Ajit Khaparde --- drivers/net/ethernet/emulex/benet/be_ethtool.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c index 15ba96c..b4be712 100644 --- a/drivers/net/ethernet/emulex/benet/be_ethtool.c +++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c @@ -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;