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 70978C31E4B for ; Fri, 14 Jun 2019 20:36:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 432B92184C for ; Fri, 14 Jun 2019 20:36:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544572; bh=/yQeeyD7gBoPK46UwJ8kUqctJX0XgxCOmwqBo84VXqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KvQDP8XeaQBe+boqhzYIGfSCvwcS9hXIcqn4Rh1ew6dypA1ABmVjRVxhceY8Qj69y 2wAe7q2E8vawC12phTTsTdyjwxgm7RckIUMucEbXKX3eC7OFQAWuC1hqL0uUgC+s4e k863uUqAfro3Va3Uuak7p6+m00ecAhXupVbaoF9Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727142AbfFNU3o (ORCPT ); Fri, 14 Jun 2019 16:29:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:51796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727034AbfFNU3i (ORCPT ); Fri, 14 Jun 2019 16:29:38 -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 C7F4B217F9; Fri, 14 Jun 2019 20:29:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544177; bh=/yQeeyD7gBoPK46UwJ8kUqctJX0XgxCOmwqBo84VXqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RRlhRbZe5PdAz17QbtfG9tbigs1AZ5+NEL/DoUx4yKH5aiiJZj89lqWlUXCz734JT LzMNBdehTt+uAs5eYt6PjJR29hgPbZT0a+iXRgpRVkhd2SKjonB5WCGAdWbChmOHoD 75RqqudOpEW9xdJxtqNIpwcopX7u4XCUgwgMLOcY= 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 5.1 35/59] net: hns: Fix loopback test failed at copper ports Date: Fri, 14 Jun 2019 16:28:19 -0400 Message-Id: <20190614202843.26941-35-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614202843.26941-1-sashal@kernel.org> References: <20190614202843.26941-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 ce15d2350db9..188c3f6791b5 100644 --- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c @@ -339,6 +339,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; @@ -365,6 +366,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