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 0138EA04B5 for ; Tue, 3 Dec 2019 19:28:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E204F37AF; Tue, 3 Dec 2019 19:28:12 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 232EB1BF72 for ; Tue, 3 Dec 2019 19:28:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397690; 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=BzH3LSWuxbRKAAF53R14rywd0r3/bP2k9N0YuK3sztQ=; b=gQJMbC1E0Xq0YUOS4RiqqMMUnDHyezYwBJiOmXqU+eg4+9WeqdGJAnHy2bWJ6bAYKnJdzQ D04eg8b+5/rv8TAcEaVQRuHQo1NTX025Kad95UJ/oqrAINUjAtqpQ4avTHBiptUjsZ9UVU J7Rjl3ARzAIG1DRNUl3lRzPPVtjWR5I= 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-168-KwyQWYc4Pdak27Tkr4sfrA-1; Tue, 03 Dec 2019 13:28:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4127A107ACC4; Tue, 3 Dec 2019 18:28:06 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1BF55C3FA; Tue, 3 Dec 2019 18:28:04 +0000 (UTC) From: Kevin Traynor To: Laurent Hardy Cc: Xiaolong Ye , Qi Zhang , dpdk stable Date: Tue, 3 Dec 2019 18:26:30 +0000 Message-Id: <20191203182714.17297-21-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: KwyQWYc4Pdak27Tkr4sfrA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/i40e: set speed to undefined for default case' 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/10/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/dfcebf5c28b8b71ee5= d7f393a6cbe27acbeebc9d Thanks. Kevin. --- >From dfcebf5c28b8b71ee5d7f393a6cbe27acbeebc9d Mon Sep 17 00:00:00 2001 From: Laurent Hardy Date: Wed, 11 Sep 2019 18:02:51 +0200 Subject: [PATCH] net/i40e: set speed to undefined for default case [ upstream commit 3c8c0b68b590fe8cd7e4a4d18b997eddd5b8b286 ] During PF/VF link update, a default speed value of 100M will be set if get_link_info has failed or speed is unknown. Consequently if PF is put in no-carrier state, VFs will switch to "in carrier" state due to a link up + a link speed set to 100M (default value if no speed detected). To be consistent with linux drivers on which PF and VFs are in same carrier state, sets default speed to undefined (instead of 100M) and updates a link status of VF only if link is up and speed is different from undefined. Fixes: 4861cde46116 ("i40e: new poll mode driver") Signed-off-by: Laurent Hardy Reviewed-by: Xiaolong Ye Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 4 ++-- drivers/net/i40e/i40e_ethdev_vf.c | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.= c index b1b145f32..040bedfad 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2743,5 +2743,5 @@ update_link_aq(struct i40e_hw *hw, struct rte_eth_lin= k *link, =09=09=09=09=09=09&link_status, NULL); =09=09if (unlikely(status !=3D I40E_SUCCESS)) { -=09=09=09link->link_speed =3D ETH_SPEED_NUM_100M; +=09=09=09link->link_speed =3D ETH_SPEED_NUM_NONE; =09=09=09link->link_duplex =3D ETH_LINK_FULL_DUPLEX; =09=09=09PMD_DRV_LOG(ERR, "Failed to get link info"); @@ -2777,5 +2777,5 @@ update_link_aq(struct i40e_hw *hw, struct rte_eth_lin= k *link, =09=09break; =09default: -=09=09link->link_speed =3D ETH_SPEED_NUM_100M; +=09=09link->link_speed =3D ETH_SPEED_NUM_NONE; =09=09break; =09} diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethd= ev_vf.c index 4f6a1975f..16d67b593 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -2074,11 +2074,13 @@ i40evf_dev_link_update(struct rte_eth_dev *dev, =09=09break; =09default: -=09=09new_link.link_speed =3D ETH_SPEED_NUM_100M; +=09=09new_link.link_speed =3D ETH_SPEED_NUM_NONE; =09=09break; =09} =09/* full duplex only */ =09new_link.link_duplex =3D ETH_LINK_FULL_DUPLEX; -=09new_link.link_status =3D vf->link_up ? ETH_LINK_UP : -=09=09=09=09=09 ETH_LINK_DOWN; +=09new_link.link_status =3D vf->link_up && +=09=09=09=09new_link.link_speed !=3D ETH_SPEED_NUM_NONE +=09=09=09=09? ETH_LINK_UP +=09=09=09=09: ETH_LINK_DOWN; =09new_link.link_autoneg =3D =09=09!(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED); --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.050651247 +0000 +++ 0021-net-i40e-set-speed-to-undefined-for-default-case.patch=092019-12-0= 3 17:29:51.738750203 +0000 @@ -1 +1 @@ -From 3c8c0b68b590fe8cd7e4a4d18b997eddd5b8b286 Mon Sep 17 00:00:00 2001 +From dfcebf5c28b8b71ee5d7f393a6cbe27acbeebc9d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3c8c0b68b590fe8cd7e4a4d18b997eddd5b8b286 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index c145e6407..32d6dc117 100644 +index b1b145f32..040bedfad 100644 @@ -33 +34 @@ -@@ -2833,5 +2833,5 @@ update_link_aq(struct i40e_hw *hw, struct rte_eth_li= nk *link, +@@ -2743,5 +2743,5 @@ update_link_aq(struct i40e_hw *hw, struct rte_eth_li= nk *link, @@ -40 +41 @@ -@@ -2867,5 +2867,5 @@ update_link_aq(struct i40e_hw *hw, struct rte_eth_li= nk *link, +@@ -2777,5 +2777,5 @@ update_link_aq(struct i40e_hw *hw, struct rte_eth_li= nk *link, @@ -48 +49 @@ -index 7ffb111b8..5dba0928b 100644 +index 4f6a1975f..16d67b593 100644 @@ -51 +52 @@ -@@ -2142,11 +2142,13 @@ i40evf_dev_link_update(struct rte_eth_dev *dev, +@@ -2074,11 +2074,13 @@ i40evf_dev_link_update(struct rte_eth_dev *dev,