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=-8.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 34C45C43613 for ; Mon, 24 Jun 2019 10:12:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0DA59205C9 for ; Mon, 24 Jun 2019 10:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371135; bh=GQIqOJoLrWOHgb9iG6OJt8URd/S+GLaWZyR0/LD9Jvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1j9NTksjOFyw/20D68pwvcqDAmwFo5I9u327Uh3vyRmf9fEyoWrPa4U7wQlR7ZT1p SjzdUaAaWn/yHTApT35ZieEu2TH5NHx/SgHV9txhAhUddhNflPrZY3PqJEXkejhJFx gnlqBMNaln/tVGGtsH/Nd6wMcqMcB1lfofCykFjc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730456AbfFXKMN (ORCPT ); Mon, 24 Jun 2019 06:12:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:38290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730055AbfFXKGM (ORCPT ); Mon, 24 Jun 2019 06:06:12 -0400 Received: from localhost (f4.8f.5177.ip4.static.sl-reverse.com [119.81.143.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F3080208E3; Mon, 24 Jun 2019 10:06:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561370771; bh=GQIqOJoLrWOHgb9iG6OJt8URd/S+GLaWZyR0/LD9Jvo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iI+8TDsyf+gczjSB7UAzK9O6kGknqcX1TsmyaILYQTznokqE4vwc8R2W6RQQ6b67R Vbvuv7phdMnWN01y/wKEXJ+VwclAYoW3ajL3kSLgsl3wmNKH/ix2ETVIvr1ZK07W1n s1rTR6Osh/IxrIiOH68MMACw+Wq4ladFNbsPKGbg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yonglong Liu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 50/90] net: hns: Fix loopback test failed at copper ports Date: Mon, 24 Jun 2019 17:56:40 +0800 Message-Id: <20190624092317.482478718@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092313.788773607@linuxfoundation.org> References: <20190624092313.788773607@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ 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