From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 9FFE5A0096 for ; Wed, 8 May 2019 18:03:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9690E37AF; Wed, 8 May 2019 18:03:19 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 38B3C559A for ; Wed, 8 May 2019 18:03:18 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A02AC3078AB3; Wed, 8 May 2019 16:03:17 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99D0B60CA4; Wed, 8 May 2019 16:03:16 +0000 (UTC) From: Kevin Traynor To: Beilei Xing Cc: Qi Zhang , dpdk stable Date: Wed, 8 May 2019 17:02:24 +0100 Message-Id: <20190508160233.2648-27-ktraynor@redhat.com> In-Reply-To: <20190508160233.2648-1-ktraynor@redhat.com> References: <20190508160233.2648-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 08 May 2019 16:03:17 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix link speed for X722' has been queued to LTS release 18.11.2 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/14/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 rebasing (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/2236b9e8fd48daf67bac584d0ce3d754a014994e Thanks. Kevin Traynor --- >From 2236b9e8fd48daf67bac584d0ce3d754a014994e Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Tue, 30 Apr 2019 14:56:37 +0800 Subject: [PATCH] net/i40e: fix link speed for X722 [ upstream commit f2310dddf41c19c9c1d77dbd857d4fab1fb368b7 ] If disable LSC when launching testpmd with X722, shown link speed is 20G but not 10G. It's caused by wrongly parsed link speed. Correct it according to X722 datasheet. Fixes: eef2daf2e199 ("net/i40e: fix link update no wait") Signed-off-by: Beilei Xing Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 45 ++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index c29d972d6..af5e844b3 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2672,9 +2672,9 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) #define I40E_REG_MACC_25GB 0x00020000 #define I40E_REG_SPEED_MASK 0x38000000 -#define I40E_REG_SPEED_100MB 0x00000000 -#define I40E_REG_SPEED_1GB 0x08000000 -#define I40E_REG_SPEED_10GB 0x10000000 -#define I40E_REG_SPEED_20GB 0x20000000 -#define I40E_REG_SPEED_25_40GB 0x18000000 +#define I40E_REG_SPEED_0 0x00000000 +#define I40E_REG_SPEED_1 0x08000000 +#define I40E_REG_SPEED_2 0x10000000 +#define I40E_REG_SPEED_3 0x18000000 +#define I40E_REG_SPEED_4 0x20000000 uint32_t link_speed; uint32_t reg_val; @@ -2690,24 +2690,33 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) /* Parse the link status */ switch (link_speed) { - case I40E_REG_SPEED_100MB: + case I40E_REG_SPEED_0: link->link_speed = ETH_SPEED_NUM_100M; break; - case I40E_REG_SPEED_1GB: + case I40E_REG_SPEED_1: link->link_speed = ETH_SPEED_NUM_1G; break; - case I40E_REG_SPEED_10GB: - link->link_speed = ETH_SPEED_NUM_10G; - break; - case I40E_REG_SPEED_20GB: - link->link_speed = ETH_SPEED_NUM_20G; + case I40E_REG_SPEED_2: + if (hw->mac.type == I40E_MAC_X722) + link->link_speed = ETH_SPEED_NUM_2_5G; + else + link->link_speed = ETH_SPEED_NUM_10G; break; - case I40E_REG_SPEED_25_40GB: - reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC); + case I40E_REG_SPEED_3: + if (hw->mac.type == I40E_MAC_X722) { + link->link_speed = ETH_SPEED_NUM_5G; + } else { + reg_val = I40E_READ_REG(hw, I40E_PRTMAC_MACC); - if (reg_val & I40E_REG_MACC_25GB) - link->link_speed = ETH_SPEED_NUM_25G; + if (reg_val & I40E_REG_MACC_25GB) + link->link_speed = ETH_SPEED_NUM_25G; + else + link->link_speed = ETH_SPEED_NUM_40G; + } + break; + case I40E_REG_SPEED_4: + if (hw->mac.type == I40E_MAC_X722) + link->link_speed = ETH_SPEED_NUM_10G; else - link->link_speed = ETH_SPEED_NUM_40G; - + link->link_speed = ETH_SPEED_NUM_20G; break; default: -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 16:33:58.839585167 +0100 +++ 0027-net-i40e-fix-link-speed-for-X722.patch 2019-05-08 16:33:57.441577237 +0100 @@ -1 +1 @@ -From f2310dddf41c19c9c1d77dbd857d4fab1fb368b7 Mon Sep 17 00:00:00 2001 +From 2236b9e8fd48daf67bac584d0ce3d754a014994e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f2310dddf41c19c9c1d77dbd857d4fab1fb368b7 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 62865c5fd..2eea5232a 100644 +index c29d972d6..af5e844b3 100644 @@ -24 +25 @@ -@@ -2671,9 +2671,9 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) +@@ -2672,9 +2672,9 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) @@ -39 +40 @@ -@@ -2689,24 +2689,33 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link) +@@ -2690,24 +2690,33 @@ update_link_reg(struct i40e_hw *hw, struct rte_eth_link *link)