From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 48A0EA0A02 for ; Mon, 17 May 2021 18:11:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 40A6441101; Mon, 17 May 2021 18:11:35 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 6F5D140041 for ; Mon, 17 May 2021 18:11:34 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifq9-0007bd-Vh; Mon, 17 May 2021 16:11:34 +0000 From: Christian Ehrhardt To: Satheesh Paul Cc: Jerin Jacob , dpdk stable Date: Mon, 17 May 2021 18:07:34 +0200 Message-Id: <20210517161039.3132619-25-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/octeontx2: fix VLAN filter' has been queued to stable release 19.11.9 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.11.9 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/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/8fa55fd7b899c8f521a036b00f50b0ed5c0a3e1e Thanks. Christian Ehrhardt --- >From 8fa55fd7b899c8f521a036b00f50b0ed5c0a3e1e Mon Sep 17 00:00:00 2001 From: Satheesh Paul Date: Tue, 9 Feb 2021 15:31:13 +0530 Subject: [PATCH] net/octeontx2: fix VLAN filter [ upstream commit c8238116ece889fe356c54930bca791091ab1938 ] This patch fixes incorrect MCAM key preparation when creating MCAM entry to allow VLAN IDs after vlan filtering is enabled on port. Fixes: ba1b3b081edf ("net/octeontx2: support VLAN offloads") Signed-off-by: Satheesh Paul Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_vlan.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c index 7357b06695..f5161e17a1 100644 --- a/drivers/net/octeontx2/otx2_vlan.c +++ b/drivers/net/octeontx2/otx2_vlan.c @@ -306,12 +306,12 @@ nix_vlan_mcam_config(struct rte_eth_dev *eth_dev, (0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ)) << mkex->lb_lt_offset; - mcam_data = ((uint32_t)vlan_id << 16); - mcam_mask = (BIT_ULL(16) - 1) << 16; + mcam_data = (uint16_t)vlan_id; + mcam_mask = (BIT_ULL(16) - 1); otx2_mbox_memcpy(key_data + mkex->lb_xtract.key_off, - &mcam_data, mkex->lb_xtract.len + 1); + &mcam_data, mkex->lb_xtract.len); otx2_mbox_memcpy(key_mask + mkex->lb_xtract.key_off, - &mcam_mask, mkex->lb_xtract.len + 1); + &mcam_mask, mkex->lb_xtract.len); } /* Adds LB STAG flag to MCAM KW */ -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:30.543948669 +0200 +++ 0025-net-octeontx2-fix-VLAN-filter.patch 2021-05-17 17:40:29.143809256 +0200 @@ -1 +1 @@ -From c8238116ece889fe356c54930bca791091ab1938 Mon Sep 17 00:00:00 2001 +From 8fa55fd7b899c8f521a036b00f50b0ed5c0a3e1e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c8238116ece889fe356c54930bca791091ab1938 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org