From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F01C6C31E4B for ; Fri, 14 Jun 2019 20:33:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BCD4B2084D for ; Fri, 14 Jun 2019 20:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544406; bh=XK1Y/gF1lEGEygM8Omg+UyFwJyKw0AkoKJKhnoWC3Wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=VdQdmWvsSqHgvQdPdWIFZepOn2FpheLXkrhRXGB3Mf3gjT9P71Uy6pDtJe6AuL1gh ac9cqtvWRAiMXugocdA/G3k1ka+3UO/jCy4H5YsFKToHk39GtZ8+JtjYg1UhdPwEgT 1uxr+3U8++8VyVZDdJejfCUZADFORKoCD4amKm/s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727673AbfFNUa3 (ORCPT ); Fri, 14 Jun 2019 16:30:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:53454 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726838AbfFNUa3 (ORCPT ); Fri, 14 Jun 2019 16:30:29 -0400 Received: from sasha-vm.mshome.net (unknown [131.107.159.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B7F8D2184E; Fri, 14 Jun 2019 20:30:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544228; bh=XK1Y/gF1lEGEygM8Omg+UyFwJyKw0AkoKJKhnoWC3Wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q2Vpn1NGw/+GHhdvw78yM6A6seO15X/fFbbIVmF1N3NqDeK3KBkDNFrfZ4q+0wuDu bHTDipkDqxZvQEOSBM97qyBN6H0W10yHwdmHIkc8NOwpGwJOyhpMikSmUthPMP2Cl7 v4TQA4EUGE0U/9uFAXh0iROr1ezXBiEVTSc+p6Ho= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yonglong Liu , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 13/27] net: hns: Fix loopback test failed at copper ports Date: Fri, 14 Jun 2019 16:30:02 -0400 Message-Id: <20190614203018.27686-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614203018.27686-1-sashal@kernel.org> References: <20190614203018.27686-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Yonglong Liu [ Upstream commit 2e1f164861e500f4e068a9d909bbd3fcc7841483 ] When doing a loopback test at copper ports, the serdes loopback and the phy loopback will fail, because of the adjust link had not finished, and phy not ready. Adds sleep between adjust link and test process to fix it. Signed-off-by: Yonglong Liu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c index 14df03f60e05..523d52fbaafe 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -338,6 +338,7 @@ static int __lb_setup(struct net_device *ndev, static int __lb_up(struct net_device *ndev, enum hnae_loop loop_mode) { +#define NIC_LB_TEST_WAIT_PHY_LINK_TIME 300 struct hns_nic_priv *priv = netdev_priv(ndev); struct hnae_handle *h = priv->ae_handle; int speed, duplex; @@ -364,6 +365,9 @@ static int __lb_up(struct net_device *ndev, h->dev->ops->adjust_link(h, speed, duplex); + /* wait adjust link done and phy ready */ + msleep(NIC_LB_TEST_WAIT_PHY_LINK_TIME); + return 0; } -- 2.20.1