From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0C015A04F5 for ; Wed, 11 Dec 2019 22:29:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 032B81BE83; Wed, 11 Dec 2019 22:29:25 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 1E64A1BE83 for ; Wed, 11 Dec 2019 22:29:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vWrA1Of9TRoENjcoqAVkbFYyKx1HNuCTAybSyH11160=; b=iLd4PUngnY6XYe59Z0rfkt2w3dtI63oE3l0f8gpvgvs8d86ahpx1pmsRK2GSSJmBlDSOA0 GYqSTgSVUfvQqldSNtdnYoUMQzddq1OPYfOAe7EmSVXoCeh8Xo9wV7WaAeUBI+hNPVKpaU /qyjaMM9Wy757E7mRLXDklsnZ7wxuhA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-107-WBayt6icMCuxISYKBQRchA-1; Wed, 11 Dec 2019 16:29:20 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF56F18543A0; Wed, 11 Dec 2019 21:29:18 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id E198710013A1; Wed, 11 Dec 2019 21:29:17 +0000 (UTC) From: Kevin Traynor To: Lunyuan Cui Cc: Wenzhuo Lu , dpdk stable Date: Wed, 11 Dec 2019 21:26:55 +0000 Message-Id: <20191211212702.27851-63-ktraynor@redhat.com> In-Reply-To: <20191211212702.27851-1-ktraynor@redhat.com> References: <20191211212702.27851-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: WBayt6icMCuxISYKBQRchA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/ixgbe: fix link status' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/17/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/258c3b55257d9d58ee= 71c62111d176114a0d9552 Thanks. Kevin. --- >From 258c3b55257d9d58ee71c62111d176114a0d9552 Mon Sep 17 00:00:00 2001 From: Lunyuan Cui Date: Mon, 18 Nov 2019 15:37:44 +0000 Subject: [PATCH] net/ixgbe: fix link status [ upstream commit c3f2fbff78cf5bd4f213b4f281251d401b09943f ] The link status for 82599eb got from link status register was not correct. Check the enable/disable flag of tx laser, set the link status down if tx laser disabled. Then, we can get correct status. But after port reset, tx laser register will be reset enable. Link status will always be up. So set tx laser disable when port resets. When hw->mac.autotry_restart is true, whether tx laser is disable or enable, it will be set enable in ixgbe_flap_tx_laser_multispeed_fiber(). hw->mac.autotry_restart can be set true in both port init and port start. Because we don't need this treatment before port starts, set hw->mac.autotry_restart false when port init. Fixes: 0408f47ba4d6 ("net/ixgbe: fix busy polling while fiber link update") Signed-off-by: Lunyuan Cui Acked-by: Wenzhuo Lu --- drivers/net/ixgbe/ixgbe_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_eth= dev.c index d099bc120..25460b072 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -1174,4 +1174,5 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void = *init_params __rte_unused) #else =09diag =3D ixgbe_init_hw(hw); +=09hw->mac.autotry_restart =3D false; #endif /* RTE_LIBRTE_IXGBE_BYPASS */ =20 @@ -1279,4 +1280,6 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void = *init_params __rte_unused) =09ixgbe_enable_intr(eth_dev); =20 +=09ixgbe_dev_set_link_down(eth_dev); + =09/* initialize filter info */ =09memset(filter_info, 0, --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:17.613157020 +0000 +++ 0063-net-ixgbe-fix-link-status.patch=092019-12-11 21:24:12.739649730 +0= 000 @@ -1 +1 @@ -From c3f2fbff78cf5bd4f213b4f281251d401b09943f Mon Sep 17 00:00:00 2001 +From 258c3b55257d9d58ee71c62111d176114a0d9552 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c3f2fbff78cf5bd4f213b4f281251d401b09943f ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 118bc7475..2c6fd0f13 100644 +index d099bc120..25460b072 100644 @@ -31 +32 @@ -@@ -1191,4 +1191,5 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void= *init_params __rte_unused) +@@ -1174,4 +1174,5 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void= *init_params __rte_unused) @@ -37 +38 @@ -@@ -1301,4 +1302,6 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void= *init_params __rte_unused) +@@ -1279,4 +1280,6 @@ eth_ixgbe_dev_init(struct rte_eth_dev *eth_dev, void= *init_params __rte_unused)