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=ham 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 4A624C31E4B for ; Fri, 14 Jun 2019 20:34:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EC212084D for ; Fri, 14 Jun 2019 20:34:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544479; bh=Tv5YnLzcv10gj7+ERvoSbSS8XUpgwminviMYIS8JRwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QjvtW5KNdOU14Cm/RXAh3VKlijMktTlr+jPQlGy7OPJS1pD1joVUm1V9yqpiN+3OA KgJbdoHQllrQoizDLqmC3O6pvlMWZpezmBglATwJ5JAAa0EOIVe1KQ5XJg/OlAwE+t UaTfIEcTw9P5d4jr8BSYjLicM95WPVufUo4b/Qy0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727468AbfFNUaS (ORCPT ); Fri, 14 Jun 2019 16:30:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:52978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727385AbfFNUaO (ORCPT ); Fri, 14 Jun 2019 16:30:14 -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 493F82184C; Fri, 14 Jun 2019 20:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560544213; bh=Tv5YnLzcv10gj7+ERvoSbSS8XUpgwminviMYIS8JRwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=v3RV9TRPhsFkFl1+koZ7D6vu1bK9MZjT1brbCo8lbZyKYzw1fyl26v7zpP/C6B406 h4FMtpeQlfJzE2C5qdeT80eiGs8Dlg8AsnvKwKjA5n/xY9Zwk27EG/BjKRJvH5CUrT KReGWmGVBhzdtQrz0RufQ/tXWKZr4ybbbwcJqJMo= 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.19 22/39] net: hns: Fix loopback test failed at copper ports Date: Fri, 14 Jun 2019 16:29:27 -0400 Message-Id: <20190614202946.27385-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190614202946.27385-1-sashal@kernel.org> References: <20190614202946.27385-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 e2710ff48fb0..1fa0cd527ead 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