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 174204F9C for ; Tue, 20 Nov 2018 20:15:55 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7EBD0308214B; Tue, 20 Nov 2018 19:15:54 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DFD7600C3; Tue, 20 Nov 2018 19:15:53 +0000 (UTC) From: Kevin Traynor To: Rasesh Mody Cc: dpdk stable Date: Tue, 20 Nov 2018 19:12:42 +0000 Message-Id: <20181120191252.30277-52-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 20 Nov 2018 19:15:54 +0000 (UTC) Subject: [dpdk-stable] patch 'net/qede: fix ethernet type in HW 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: Tue, 20 Nov 2018 19:15:55 -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 11/23/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 3b7ad81c76a8e48197f6bb5898d5f43523b3053a Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Sat, 8 Sep 2018 13:30:53 -0700 Subject: [PATCH] net/qede: fix ethernet type in HW registers [ upstream commit d5df6159dddadedc1bdc12ec5f1a92a813dc94d3 ] Fix to program the HW registers with proper ether type. Fixes: 36f45bce2537 ("net/qede/base: fix to support OVLAN mode") Signed-off-by: Rasesh Mody --- drivers/net/qede/base/ecore_dev.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c index 31f1f3ee5..d43c12b86 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -2411,4 +2411,5 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev *p_dev, struct ecore_hwfn *p_hwfn; enum _ecore_status_t rc = ECORE_SUCCESS; + u16 ether_type; int i; @@ -2443,4 +2444,23 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev *p_dev, return rc; + if (IS_PF(p_dev) && (OSAL_TEST_BIT(ECORE_MF_8021Q_TAGGING, + &p_dev->mf_bits) || + OSAL_TEST_BIT(ECORE_MF_8021AD_TAGGING, + &p_dev->mf_bits))) { + if (OSAL_TEST_BIT(ECORE_MF_8021Q_TAGGING, + &p_dev->mf_bits)) + ether_type = ETHER_TYPE_VLAN; + else + ether_type = ETHER_TYPE_QINQ; + STORE_RT_REG(p_hwfn, PRS_REG_TAG_ETHERTYPE_0_RT_OFFSET, + ether_type); + STORE_RT_REG(p_hwfn, NIG_REG_TAG_ETHERTYPE_0_RT_OFFSET, + ether_type); + STORE_RT_REG(p_hwfn, PBF_REG_TAG_ETHERTYPE_0_RT_OFFSET, + ether_type); + STORE_RT_REG(p_hwfn, DORQ_REG_TAG1_ETHERTYPE_RT_OFFSET, + ether_type); + } + ecore_set_spq_block_timeout(p_hwfn, p_params->spq_timeout_ms); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.698303087 +0000 +++ 0052-net-qede-fix-ethernet-type-in-HW-registers.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,12 +1,13 @@ -From d5df6159dddadedc1bdc12ec5f1a92a813dc94d3 Mon Sep 17 00:00:00 2001 +From 3b7ad81c76a8e48197f6bb5898d5f43523b3053a Mon Sep 17 00:00:00 2001 From: Rasesh Mody Date: Sat, 8 Sep 2018 13:30:53 -0700 Subject: [PATCH] net/qede: fix ethernet type in HW registers +[ upstream commit d5df6159dddadedc1bdc12ec5f1a92a813dc94d3 ] + Fix to program the HW registers with proper ether type. Fixes: 36f45bce2537 ("net/qede/base: fix to support OVLAN mode") -Cc: stable@dpdk.org Signed-off-by: Rasesh Mody --- @@ -14,7 +15,7 @@ 1 file changed, 20 insertions(+) diff --git a/drivers/net/qede/base/ecore_dev.c b/drivers/net/qede/base/ecore_dev.c -index 958d7a067..6302abc1a 100644 +index 31f1f3ee5..d43c12b86 100644 --- a/drivers/net/qede/base/ecore_dev.c +++ b/drivers/net/qede/base/ecore_dev.c @@ -2411,4 +2411,5 @@ enum _ecore_status_t ecore_hw_init(struct ecore_dev *p_dev,