[dpdk-dev] lib/librte_pmd_i40e: i40e vlan filter set fix

Message ID 1411883352-22166-1-git-send-email-huawei.xie@intel.com (mailing list archive)
State Changes Requested, archived
Headers

Commit Message

Huawei Xie Sept. 28, 2014, 5:49 a.m. UTC
the right shift bits should be 5 rather than 4.
    vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F)

Signed-off-by: Huawei Xie <huawei.xie@intel.com>
CC: Jing Chen <jing.d.chen@intel.com>
CC: Helin Zhang <helin.zhang@intel.com>

---
 lib/librte_pmd_i40e/i40e_ethdev.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
  

Comments

Chen, Jing D Oct. 11, 2014, 7:20 a.m. UTC | #1
> -----Original Message-----
> From: Xie, Huawei
> Sent: Sunday, September 28, 2014 1:49 PM
> To: dev@dpdk.org
> Cc: Xie, Huawei; Chen, Jing D; Zhang, Helin
> Subject: [PATCH] lib/librte_pmd_i40e: i40e vlan filter set fix
> 
> the right shift bits should be 5 rather than 4.
>     vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F)
> 
> Signed-off-by: Huawei Xie <huawei.xie@intel.com>
> CC: Jing Chen <jing.d.chen@intel.com>
> CC: Helin Zhang <helin.zhang@intel.com>
> 
> ---
>  lib/librte_pmd_i40e/i40e_ethdev.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c
> b/lib/librte_pmd_i40e/i40e_ethdev.c
> index 9009bd4..9c9d831 100644
> --- a/lib/librte_pmd_i40e/i40e_ethdev.c
> +++ b/lib/librte_pmd_i40e/i40e_ethdev.c
> @@ -3786,14 +3786,11 @@ i40e_set_vlan_filter(struct i40e_vsi *vsi,
>  {
>  	uint32_t vid_idx, vid_bit;
> 
> -#define UINT32_BIT_MASK      0x1F
> -#define VALID_VLAN_BIT_MASK  0xFFF
>  	/* VFTA is 32-bits size array, each element contains 32 vlan bits, Find
> the
>  	 *  element first, then find the bits it belongs to
>  	 */
> -	vid_idx = (uint32_t) ((vlan_id & VALID_VLAN_BIT_MASK) >>
> -		  sizeof(uint32_t));
> -	vid_bit = (uint32_t) (1 << (vlan_id & UINT32_BIT_MASK));
> +	vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F);
> +	vid_bit = (uint32_t) (1 << (vlan_id & 0x1F));
> 
>  	if (on)
>  		vsi->vfta[vid_idx] |= vid_bit;
> --
> 1.8.1.4

Please try to use macro to replace numbers.
  
Huawei Xie Nov. 6, 2014, 12:22 a.m. UTC | #2
Thomas, comments for this patch?

> -----Original Message-----
> From: Xie, Huawei
> Sent: Saturday, September 27, 2014 10:49 PM
> To: dev@dpdk.org
> Cc: Xie, Huawei; Chen, Jing D; Zhang, Helin
> Subject: [PATCH] lib/librte_pmd_i40e: i40e vlan filter set fix
> 
> the right shift bits should be 5 rather than 4.
>     vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F)
> 
> Signed-off-by: Huawei Xie <huawei.xie@intel.com>
> CC: Jing Chen <jing.d.chen@intel.com>
> CC: Helin Zhang <helin.zhang@intel.com>
> 
> ---
>  lib/librte_pmd_i40e/i40e_ethdev.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c
> b/lib/librte_pmd_i40e/i40e_ethdev.c
> index 9009bd4..9c9d831 100644
> --- a/lib/librte_pmd_i40e/i40e_ethdev.c
> +++ b/lib/librte_pmd_i40e/i40e_ethdev.c
> @@ -3786,14 +3786,11 @@ i40e_set_vlan_filter(struct i40e_vsi *vsi,
>  {
>  	uint32_t vid_idx, vid_bit;
> 
> -#define UINT32_BIT_MASK      0x1F
> -#define VALID_VLAN_BIT_MASK  0xFFF
>  	/* VFTA is 32-bits size array, each element contains 32 vlan bits, Find the
>  	 *  element first, then find the bits it belongs to
>  	 */
> -	vid_idx = (uint32_t) ((vlan_id & VALID_VLAN_BIT_MASK) >>
> -		  sizeof(uint32_t));
> -	vid_bit = (uint32_t) (1 << (vlan_id & UINT32_BIT_MASK));
> +	vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F);
> +	vid_bit = (uint32_t) (1 << (vlan_id & 0x1F));
> 
>  	if (on)
>  		vsi->vfta[vid_idx] |= vid_bit;
> --
> 1.8.1.4
  
Thomas Monjalon Nov. 6, 2014, 8:37 a.m. UTC | #3
2014-11-06 00:22, Xie, Huawei:
> Thomas, comments for this patch?

No, but Jing Chen made some comments that you didn't replied:
	"Please try to use macro to replace numbers."
So I wait a v2.

> > -----Original Message-----
> > From: Xie, Huawei
> > Sent: Saturday, September 27, 2014 10:49 PM
> > To: dev@dpdk.org
> > Cc: Xie, Huawei; Chen, Jing D; Zhang, Helin
> > Subject: [PATCH] lib/librte_pmd_i40e: i40e vlan filter set fix
> > 
> > the right shift bits should be 5 rather than 4.
> >     vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F)
> > 
> > Signed-off-by: Huawei Xie <huawei.xie@intel.com>
> > CC: Jing Chen <jing.d.chen@intel.com>
> > CC: Helin Zhang <helin.zhang@intel.com>
> > 
> > ---
> >  lib/librte_pmd_i40e/i40e_ethdev.c | 7 ++-----
> >  1 file changed, 2 insertions(+), 5 deletions(-)
> > 
> > diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c
> > b/lib/librte_pmd_i40e/i40e_ethdev.c
> > index 9009bd4..9c9d831 100644
> > --- a/lib/librte_pmd_i40e/i40e_ethdev.c
> > +++ b/lib/librte_pmd_i40e/i40e_ethdev.c
> > @@ -3786,14 +3786,11 @@ i40e_set_vlan_filter(struct i40e_vsi *vsi,
> >  {
> >  	uint32_t vid_idx, vid_bit;
> > 
> > -#define UINT32_BIT_MASK      0x1F
> > -#define VALID_VLAN_BIT_MASK  0xFFF
> >  	/* VFTA is 32-bits size array, each element contains 32 vlan bits, Find the
> >  	 *  element first, then find the bits it belongs to
> >  	 */
> > -	vid_idx = (uint32_t) ((vlan_id & VALID_VLAN_BIT_MASK) >>
> > -		  sizeof(uint32_t));
> > -	vid_bit = (uint32_t) (1 << (vlan_id & UINT32_BIT_MASK));
> > +	vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F);
> > +	vid_bit = (uint32_t) (1 << (vlan_id & 0x1F));
> > 
> >  	if (on)
> >  		vsi->vfta[vid_idx] |= vid_bit;
> > --
> > 1.8.1.4
  

Patch

diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/lib/librte_pmd_i40e/i40e_ethdev.c
index 9009bd4..9c9d831 100644
--- a/lib/librte_pmd_i40e/i40e_ethdev.c
+++ b/lib/librte_pmd_i40e/i40e_ethdev.c
@@ -3786,14 +3786,11 @@  i40e_set_vlan_filter(struct i40e_vsi *vsi,
 {
 	uint32_t vid_idx, vid_bit;
 
-#define UINT32_BIT_MASK      0x1F
-#define VALID_VLAN_BIT_MASK  0xFFF
 	/* VFTA is 32-bits size array, each element contains 32 vlan bits, Find the
 	 *  element first, then find the bits it belongs to
 	 */
-	vid_idx = (uint32_t) ((vlan_id & VALID_VLAN_BIT_MASK) >>
-		  sizeof(uint32_t));
-	vid_bit = (uint32_t) (1 << (vlan_id & UINT32_BIT_MASK));
+	vid_idx = (uint32_t) ((vlan_id >> 5 ) & 0x7F);
+	vid_bit = (uint32_t) (1 << (vlan_id & 0x1F));
 
 	if (on)
 		vsi->vfta[vid_idx] |= vid_bit;