* [dpdk-stable] [dpdk-dev] [PATCH] net/octeontx2: fix vlan filter on port
@ 2021-02-09 10:01 psatheesh
2021-03-08 13:34 ` Jerin Jacob
0 siblings, 1 reply; 2+ messages in thread
From: psatheesh @ 2021-02-09 10:01 UTC (permalink / raw)
To: Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K; +Cc: dev, Satheesh Paul, stable
From: Satheesh Paul <psatheesh@marvell.com>
This patch fixes incorrect MCAM key preparation when creating
MCAM entry to allow VLAN IDs after vlan filtering is enabled on port.
Fixes: ba1b3b081e ("net/octeontx2: support VLAN offloads")
Cc: stable@dpdk.org
Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
---
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 7357b0669..f5161e17a 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.25.4
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [dpdk-stable] [dpdk-dev] [PATCH] net/octeontx2: fix vlan filter on port
2021-02-09 10:01 [dpdk-stable] [dpdk-dev] [PATCH] net/octeontx2: fix vlan filter on port psatheesh
@ 2021-03-08 13:34 ` Jerin Jacob
0 siblings, 0 replies; 2+ messages in thread
From: Jerin Jacob @ 2021-03-08 13:34 UTC (permalink / raw)
To: Satheesh Paul
Cc: Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, dpdk-dev,
dpdk stable, Ferruh Yigit
On Tue, Feb 9, 2021 at 3:31 PM <psatheesh@marvell.com> wrote:
>
> From: Satheesh Paul <psatheesh@marvell.com>
>
> This patch fixes incorrect MCAM key preparation when creating
> MCAM entry to allow VLAN IDs after vlan filtering is enabled on port.
>
> Fixes: ba1b3b081e ("net/octeontx2: support VLAN offloads")
> Cc: stable@dpdk.org
>
Changed vlan to VLAN in the subject.
Acked-by: Jerin Jacob <jerinj@marvell.com>
Applied to dpdk-next-net-mrvl/for-main. Thanks
> Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> ---
> 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 7357b0669..f5161e17a 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.25.4
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-08 13:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-09 10:01 [dpdk-stable] [dpdk-dev] [PATCH] net/octeontx2: fix vlan filter on port psatheesh
2021-03-08 13:34 ` Jerin Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).