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 7CE60A04F5 for ; Wed, 11 Dec 2019 22:27:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 754EF374C; Wed, 11 Dec 2019 22:27:46 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 68CD71BE82 for ; Wed, 11 Dec 2019 22:27:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576099664; 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=89nrp+knLrm+Y4ClOVgTuBuweAo/FBgaVSvg5aRd5JI=; b=KPCgD4lU/RyUM/6xz8x4LZQaeHuWhmKy31zNpaz7Dili+3zIRu3kP0W4kob/AlbtZaoCer hltZcaRXCSJ4hgd408tfLUsfV05Pe1mVwsf5o+36umSxhn++OV21JF8jMQ6lKiqvk+PMdU unnUwW80JVP7S5iMMBWeZv0m2Yl3Ryc= 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-380-5NdqzcEjN9CP_W-cDS1sjg-1; Wed, 11 Dec 2019 16:27:41 -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 D5B9DDBE6; Wed, 11 Dec 2019 21:27:40 +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 8A07310013A1; Wed, 11 Dec 2019 21:27:39 +0000 (UTC) From: Kevin Traynor To: Xiao Zhang Cc: Wei Zhao , Xiaolong Ye , dpdk stable Date: Wed, 11 Dec 2019 21:25:58 +0000 Message-Id: <20191211212702.27851-6-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: 5NdqzcEjN9CP_W-cDS1sjg-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/c904c37a6c43bab8f8= 74706aefbbd5bc3a42a4a4 Thanks. Kevin. --- >From c904c37a6c43bab8f874706aefbbd5bc3a42a4a4 Mon Sep 17 00:00:00 2001 From: Xiao Zhang Date: Tue, 29 Oct 2019 13:33:23 +0800 Subject: [PATCH] net/ixgbe: fix link status [ upstream commit 1ca05831b9be946001ebabba2b3fdb0456684d9a ] The link status for 82599eb got from link status register was not correct, check the enable/disable flag of tx laser when getting the link status, set the link status down if tx laser disabled since the tx laser flag could be set correctly when up/down the link status. Fixes: dc66e5fd01b9 ("net/ixgbe: improve link state check on VF") Signed-off-by: Xiao Zhang Reviewed-by: Wei Zhao Acked-by: Xiaolong Ye --- drivers/net/ixgbe/ixgbe_ethdev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_eth= dev.c index 3d4e62b5a..d099bc120 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2944,4 +2944,5 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev) =09=09/* Turn on the laser */ =09=09ixgbe_enable_tx_laser(hw); +=09=09ixgbe_dev_link_update(dev, 0); =09} =20 @@ -2974,4 +2975,5 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev) =09=09/* Turn off the laser */ =09=09ixgbe_disable_tx_laser(hw); +=09=09ixgbe_dev_link_update(dev, 0); =09} =20 @@ -4087,4 +4089,5 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, =09int diag; =09int wait =3D 1; +=09u32 esdp_reg; =20 =09memset(&link, 0, sizeof(link)); @@ -4114,4 +4117,8 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, =09} =20 +=09esdp_reg =3D IXGBE_READ_REG(hw, IXGBE_ESDP); +=09if ((esdp_reg & IXGBE_ESDP_SDP3)) +=09=09link_up =3D 0; + =09if (link_up =3D=3D 0) { =09=09if (ixgbe_get_media_type(hw) =3D=3D ixgbe_media_type_fiber) { --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-11 21:24:13.261655241 +0000 +++ 0006-net-ixgbe-fix-link-status.patch=092019-12-11 21:24:12.579653036 +0= 000 @@ -1 +1 @@ -From 1ca05831b9be946001ebabba2b3fdb0456684d9a Mon Sep 17 00:00:00 2001 +From c904c37a6c43bab8f874706aefbbd5bc3a42a4a4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1ca05831b9be946001ebabba2b3fdb0456684d9a ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 9c386f5c9..30c0379d4 100644 +index 3d4e62b5a..d099bc120 100644 @@ -25 +26 @@ -@@ -2913,4 +2913,5 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev) +@@ -2944,4 +2944,5 @@ ixgbe_dev_set_link_up(struct rte_eth_dev *dev) @@ -31 +32 @@ -@@ -2943,4 +2944,5 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev) +@@ -2974,4 +2975,5 @@ ixgbe_dev_set_link_down(struct rte_eth_dev *dev) @@ -37 +38 @@ -@@ -4117,4 +4119,5 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -4087,4 +4089,5 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, @@ -43 +44 @@ -@@ -4144,4 +4147,8 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev, +@@ -4114,4 +4117,8 @@ ixgbe_dev_link_update_share(struct rte_eth_dev *dev,