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 DC875C48BEA for ; Mon, 24 Jun 2019 10:13:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B53A520645 for ; Mon, 24 Jun 2019 10:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371218; bh=NGFx8s4u0BBPyadAYUvyyhEZ5g7UlcVWPOOwe7iXMXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QjtlBTpRGtvzl4wUXnHjscnBaMhyJHILE/MXB+Jc8FZUe4CJLwCDeklBY61UabyO9 ft1mf/hW6aA6ilCzuao/OAu9YJD87S6q/OZyBDmNPC8h9MNO+2VOyJIL6EL4yQmZXT fRj8NXCmWR6J0H5ju4YfqEaK8cRRbiSTlMD+SbQg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729718AbfFXKNh (ORCPT ); Mon, 24 Jun 2019 06:13:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:50500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729927AbfFXKNg (ORCPT ); Mon, 24 Jun 2019 06:13:36 -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 94B922146F; Mon, 24 Jun 2019 10:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561371216; bh=NGFx8s4u0BBPyadAYUvyyhEZ5g7UlcVWPOOwe7iXMXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k2onZulR11hYQ4NsttqoM296DlIR+SLf7gQEGiriHXiUrs2KXRgRVYf6sRW9on/8L KAuVGu0hVGyyyDSM0R7a+ahBbDaSGo1oepuT7erA+zsqcY4gKVtL/zBCTotMclMBGV ofvQUaGeaPJyRwNirzd9bqSv4J1iT2K00tqIiy4Q= 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 5.1 064/121] net: hns: Fix loopback test failed at copper ports Date: Mon, 24 Jun 2019 17:56:36 +0800 Message-Id: <20190624092324.063486207@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190624092320.652599624@linuxfoundation.org> References: <20190624092320.652599624@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 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