net/octeontx2: fix port Tx VLAN insertion

Message ID 20190816041955.69877-1-ndabilpuram@marvell.com
State New
Delegated to: Jerin Jacob
Headers show
Series
  • net/octeontx2: fix port Tx VLAN insertion
Related show

Checks

Context Check Description
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS
ci/iol-Compile-Testing success Compile Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Nithin Dabilpuram Aug. 16, 2019, 4:19 a.m.
This patch fixes configuration for port Tx vlan insertion feature.
As per latest Tx KEX profile, pf_func should be at
KW[0](47:32) and not KW[1](63:48).

Fixes: 168c59cfe42b ("net/octeontx2: add flow MCAM utility functions")
Cc: kirankumark@marvell.com

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
 drivers/net/octeontx2/otx2_vlan.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jerin Jacob Sept. 13, 2019, 2:40 p.m. | #1
On Fri, Aug 16, 2019 at 9:50 AM Nithin Dabilpuram
<ndabilpuram@marvell.com> wrote:
>
> This patch fixes configuration for port Tx vlan insertion feature.
> As per latest Tx KEX profile, pf_func should be at
> KW[0](47:32) and not KW[1](63:48).
>
> Fixes: 168c59cfe42b ("net/octeontx2: add flow MCAM utility functions")
> Cc: kirankumark@marvell.com

Cc: stable@dpdk.org

>
> Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>

Acked-by: Jerin Jacob <jerinj@marvell.com>


> ---
>  drivers/net/octeontx2/otx2_vlan.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c
> index c01089b..2be7671 100644
> --- a/drivers/net/octeontx2/otx2_vlan.c
> +++ b/drivers/net/octeontx2/otx2_vlan.c
> @@ -468,9 +468,9 @@ nix_vlan_handle_default_tx_entry(struct rte_eth_dev *eth_dev,
>                 pf_func = (dev->pf_func & 0xff) << 8;
>                 pf_func |= (dev->pf_func >> 8) & 0xff;
>
> -               /* PF Func extracted to KW1[63:48] */
> -               entry.kw[1] = (uint64_t)pf_func << 48;
> -               entry.kw_mask[1] = (BIT_ULL(16) - 1) << 48;
> +               /* PF Func extracted to KW1[47:32] */
> +               entry.kw[0] = (uint64_t)pf_func << 32;
> +               entry.kw_mask[0] = (BIT_ULL(16) - 1) << 32;
>
>                 nix_set_tx_vlan_action(&entry, type, vtag_index);
>                 vlan->def_tx_mcam_ent = entry;
> --
> 2.8.4
>

Patch

diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c
index c01089b..2be7671 100644
--- a/drivers/net/octeontx2/otx2_vlan.c
+++ b/drivers/net/octeontx2/otx2_vlan.c
@@ -468,9 +468,9 @@  nix_vlan_handle_default_tx_entry(struct rte_eth_dev *eth_dev,
 		pf_func = (dev->pf_func & 0xff) << 8;
 		pf_func |= (dev->pf_func >> 8) & 0xff;
 
-		/* PF Func extracted to KW1[63:48] */
-		entry.kw[1] = (uint64_t)pf_func << 48;
-		entry.kw_mask[1] = (BIT_ULL(16) - 1) << 48;
+		/* PF Func extracted to KW1[47:32] */
+		entry.kw[0] = (uint64_t)pf_func << 32;
+		entry.kw_mask[0] = (BIT_ULL(16) - 1) << 32;
 
 		nix_set_tx_vlan_action(&entry, type, vtag_index);
 		vlan->def_tx_mcam_ent = entry;