From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D2A951B4B6 for ; Thu, 29 Nov 2018 14:23:06 +0100 (CET) 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 mx1.redhat.com (Postfix) with ESMTPS id 4464D89AC4; Thu, 29 Nov 2018 13:23:06 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 688A81001F50; Thu, 29 Nov 2018 13:23:04 +0000 (UTC) From: Kevin Traynor To: Beilei Xing Cc: Qi Zhang , dpdk stable Date: Thu, 29 Nov 2018 13:20:41 +0000 Message-Id: <20181129132128.7609-41-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 29 Nov 2018 13:23:06 +0000 (UTC) Subject: [dpdk-stable] patch 'net/i40e: fix X710 Rx after reading some registers' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Thu, 29 Nov 2018 13:23:07 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 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/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 73595fdc79e2250ad0954337845190e17027b9e5 Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Thu, 15 Nov 2018 11:17:02 +0800 Subject: [PATCH] net/i40e: fix X710 Rx after reading some registers [ upstream commit 199efc4ac5409403d24a0f21fe382bbce86638ac ] There's an issue that X710 can't receive any packet after reading some special registers. That's because these registers are only valid for X722, read access for non-X722 will cause ECC error. Fixes: d9efd0136ac1 ("i40e: add EEPROM and registers dumping") Signed-off-by: Beilei Xing Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 53b40fa1f..a26c72829 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -11468,4 +11468,30 @@ i40e_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) } +/** + * This function is used to check if the register is valid. + * Below is the valid registers list for X722 only: + * 0x2b800--0x2bb00 + * 0x38700--0x38a00 + * 0x3d800--0x3db00 + * 0x208e00--0x209000 + * 0x20be00--0x20c000 + * 0x263c00--0x264000 + * 0x265c00--0x266000 + */ +static inline int i40e_valid_regs(enum i40e_mac_type type, uint32_t reg_offset) +{ + if ((type != I40E_MAC_X722) && + ((reg_offset >= 0x2b800 && reg_offset <= 0x2bb00) || + (reg_offset >= 0x38700 && reg_offset <= 0x38a00) || + (reg_offset >= 0x3d800 && reg_offset <= 0x3db00) || + (reg_offset >= 0x208e00 && reg_offset <= 0x209000) || + (reg_offset >= 0x20be00 && reg_offset <= 0x20c000) || + (reg_offset >= 0x263c00 && reg_offset <= 0x264000) || + (reg_offset >= 0x265c00 && reg_offset <= 0x266000))) + return 0; + else + return 1; +} + static int i40e_get_regs(struct rte_eth_dev *dev, struct rte_dev_reg_info *regs) @@ -11509,6 +11535,9 @@ static int i40e_get_regs(struct rte_eth_dev *dev, arr_idx2 * reg_info->stride2; reg_offset += reg_info->base_addr; - ptr_data[reg_offset >> 2] = - I40E_READ_REG(hw, reg_offset); + if (!i40e_valid_regs(hw->mac.type, reg_offset)) + ptr_data[reg_offset >> 2] = 0; + else + ptr_data[reg_offset >> 2] = + I40E_READ_REG(hw, reg_offset); } } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:36.076210238 +0000 +++ 0040-net-i40e-fix-X710-Rx-after-reading-some-registers.patch 2018-11-29 13:11:34.000000000 +0000 @@ -1,15 +1,16 @@ -From 199efc4ac5409403d24a0f21fe382bbce86638ac Mon Sep 17 00:00:00 2001 +From 73595fdc79e2250ad0954337845190e17027b9e5 Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Thu, 15 Nov 2018 11:17:02 +0800 Subject: [PATCH] net/i40e: fix X710 Rx after reading some registers +[ upstream commit 199efc4ac5409403d24a0f21fe382bbce86638ac ] + There's an issue that X710 can't receive any packet after reading some special registers. That's because these registers are only valid for X722, read access for non-X722 will cause ECC error. Fixes: d9efd0136ac1 ("i40e: add EEPROM and registers dumping") -Cc: stable@dpdk.org Signed-off-by: Beilei Xing Acked-by: Qi Zhang @@ -18,10 +19,10 @@ 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c -index 790ecc3cc..3628d7f2a 100644 +index 53b40fa1f..a26c72829 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c -@@ -11610,4 +11610,30 @@ i40e_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -11468,4 +11468,30 @@ i40e_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id) } +/** @@ -52,7 +53,7 @@ + static int i40e_get_regs(struct rte_eth_dev *dev, struct rte_dev_reg_info *regs) -@@ -11651,6 +11677,9 @@ static int i40e_get_regs(struct rte_eth_dev *dev, +@@ -11509,6 +11535,9 @@ static int i40e_get_regs(struct rte_eth_dev *dev, arr_idx2 * reg_info->stride2; reg_offset += reg_info->base_addr; - ptr_data[reg_offset >> 2] =