diff mbox

[dpdk-dev,01/39] net/ixgbe/base: fix delta check for setting VFTA

Message ID 1472312902-16963-2-git-send-email-xiao.w.wang@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Bruce Richardson
Headers

Commit Message

Xiao Wang Aug. 27, 2016, 3:47 p.m. UTC 
  The delta value rather than vfta_delta pointer should be checked.

Fixes: b978f7b38c14 ("net/ixgbe/base: simplify VLAN management")

Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
---
 drivers/net/ixgbe/base/ixgbe_82598.c  | 6 +++---
 drivers/net/ixgbe/base/ixgbe_api.c    | 7 ++++---
 drivers/net/ixgbe/base/ixgbe_common.c | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

Comments

Ferruh Yigit Sept. 19, 2016, 5 p.m. UTC | #1 
On 8/27/2016 4:47 PM, Xiao Wang wrote:
> The delta value rather than vfta_delta pointer should be checked.
> 
> Fixes: b978f7b38c14 ("net/ixgbe/base: simplify VLAN management")
> 
> Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
> ---
>  drivers/net/ixgbe/base/ixgbe_82598.c  | 6 +++---
>  drivers/net/ixgbe/base/ixgbe_api.c    | 7 ++++---
>  drivers/net/ixgbe/base/ixgbe_common.c | 2 +-
>  3 files changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/base/ixgbe_82598.c b/drivers/net/ixgbe/base/ixgbe_82598.c
> index db80880..724dcbb 100644
> --- a/drivers/net/ixgbe/base/ixgbe_82598.c
> +++ b/drivers/net/ixgbe/base/ixgbe_82598.c
> @@ -995,19 +995,19 @@ STATIC s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
>   *  @vlan: VLAN id to write to VLAN filter
>   *  @vind: VMDq output index that maps queue to VLAN id in VFTA
>   *  @vlan_on: boolean flag to turn on/off VLAN in VFTA
> - *  @bypass_vlvf: boolean flag - unused
> + *  @vlvf_bypass: boolean flag - unused

bypass_vlvf -> vlvf_bypass belongs to different patch

>   *
>   *  Turn on/off specified VLAN in the VLAN filter table.
>   **/
>  s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind,
> -			 bool vlan_on, bool bypass_vlvf)
> +			 bool vlan_on, bool vlvf_bypass)
>  {
>  	u32 regindex;
>  	u32 bitindex;
>  	u32 bits;
>  	u32 vftabyte;
>  
> -	UNREFERENCED_1PARAMETER(bypass_vlvf);
> +	UNREFERENCED_1PARAMETER(vlvf_bypass);
>  
>  	DEBUGFUNC("ixgbe_set_vfta_82598");
>  
> diff --git a/drivers/net/ixgbe/base/ixgbe_api.c b/drivers/net/ixgbe/base/ixgbe_api.c
> index 1786867..5b721af 100644
> --- a/drivers/net/ixgbe/base/ixgbe_api.c
> +++ b/drivers/net/ixgbe/base/ixgbe_api.c
> @@ -1090,7 +1090,7 @@ s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on,
>  		   bool vlvf_bypass)
>  {
>  	return ixgbe_call_func(hw, hw->mac.ops.set_vfta, (hw, vlan, vind,
> -				  vlan_on, vlvf_bypass), IXGBE_NOT_IMPLEMENTED);
> +			       vlan_on, vlvf_bypass), IXGBE_NOT_IMPLEMENTED);
>  }
>  
>  /**
> @@ -1100,7 +1100,7 @@ s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on,
>   *  @vind: VMDq output index that maps queue to VLAN id in VLVFB
>   *  @vlan_on: boolean flag to turn on/off VLAN in VLVF
>   *  @vfta_delta: pointer to the difference between the current value of VFTA
> - *               and the desired value
> + *		 and the desired value
>   *  @vfta: the desired value of the VFTA
>   *  @vlvf_bypass: boolean flag indicating updating the default pool is okay
>   *
> @@ -1110,7 +1110,7 @@ s32 ixgbe_set_vlvf(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on,
>  		   u32 *vfta_delta, u32 vfta, bool vlvf_bypass)
>  {
>  	return ixgbe_call_func(hw, hw->mac.ops.set_vlvf, (hw, vlan, vind,
> -				vlan_on, vfta_delta, vfta, vlvf_bypass),
> +			       vlan_on, vfta_delta, vfta, vlvf_bypass),
>  			       IXGBE_NOT_IMPLEMENTED);
>  }
>  
> @@ -1659,6 +1659,7 @@ void ixgbe_init_swfw_semaphore(struct ixgbe_hw *hw)
>  		hw->mac.ops.init_swfw_sync(hw);
>  }
>  
> +

unrelated whitespace modifications


>  void ixgbe_disable_rx(struct ixgbe_hw *hw)
>  {
>  	if (hw->mac.ops.disable_rx)
> diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
> index 811875a..161bf32 100644
> --- a/drivers/net/ixgbe/base/ixgbe_common.c
> +++ b/drivers/net/ixgbe/base/ixgbe_common.c
> @@ -3967,7 +3967,7 @@ s32 ixgbe_set_vlvf_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
>  		 * we run the risk of stray packets leaking into
>  		 * the PF via the default pool
>  		 */
> -		if (vfta_delta)
> +		if (*vfta_delta)

This seems only update mentioned in patch commit log.

What about extracting all other clean up modifications into a new patch,
other patches also have similar fixes, all can go into that cleanup patch?

>  			IXGBE_WRITE_REG(hw, IXGBE_VFTA(vlan / 32), vfta);
>  
>  		/* disable VLVF and clear remaining bit from pool */
>
Xiao Wang Sept. 22, 2016, 3:58 p.m. UTC | #2 
Hi Ferruh,

> -----Original Message-----
> From: Yigit, Ferruh
> Sent: Tuesday, September 20, 2016 1:01 AM
> To: Wang, Xiao W <xiao.w.wang@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>
> Cc: dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH 01/39] net/ixgbe/base: fix delta check for
> setting VFTA
> 
> On 8/27/2016 4:47 PM, Xiao Wang wrote:
> > The delta value rather than vfta_delta pointer should be checked.
> >
> > Fixes: b978f7b38c14 ("net/ixgbe/base: simplify VLAN management")
> >
> > Signed-off-by: Xiao Wang <xiao.w.wang@intel.com>
> > ---
> >  drivers/net/ixgbe/base/ixgbe_82598.c  | 6 +++---
> >  drivers/net/ixgbe/base/ixgbe_api.c    | 7 ++++---
> >  drivers/net/ixgbe/base/ixgbe_common.c | 2 +-
> >  3 files changed, 8 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/net/ixgbe/base/ixgbe_82598.c
> b/drivers/net/ixgbe/base/ixgbe_82598.c
> > index db80880..724dcbb 100644
> > --- a/drivers/net/ixgbe/base/ixgbe_82598.c
> > +++ b/drivers/net/ixgbe/base/ixgbe_82598.c
> > @@ -995,19 +995,19 @@ STATIC s32 ixgbe_clear_vmdq_82598(struct
> ixgbe_hw *hw, u32 rar, u32 vmdq)
> >   *  @vlan: VLAN id to write to VLAN filter
> >   *  @vind: VMDq output index that maps queue to VLAN id in VFTA
> >   *  @vlan_on: boolean flag to turn on/off VLAN in VFTA
> > - *  @bypass_vlvf: boolean flag - unused
> > + *  @vlvf_bypass: boolean flag - unused
> 
> bypass_vlvf -> vlvf_bypass belongs to different patch
> 
> >   *
> >   *  Turn on/off specified VLAN in the VLAN filter table.
> >   **/
> >  s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind,
> > -			 bool vlan_on, bool bypass_vlvf)
> > +			 bool vlan_on, bool vlvf_bypass)
> >  {
> >  	u32 regindex;
> >  	u32 bitindex;
> >  	u32 bits;
> >  	u32 vftabyte;
> >
> > -	UNREFERENCED_1PARAMETER(bypass_vlvf);
> > +	UNREFERENCED_1PARAMETER(vlvf_bypass);
> >
> >  	DEBUGFUNC("ixgbe_set_vfta_82598");
> >
> > diff --git a/drivers/net/ixgbe/base/ixgbe_api.c
> b/drivers/net/ixgbe/base/ixgbe_api.c
> > index 1786867..5b721af 100644
> > --- a/drivers/net/ixgbe/base/ixgbe_api.c
> > +++ b/drivers/net/ixgbe/base/ixgbe_api.c
> > @@ -1090,7 +1090,7 @@ s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan,
> u32 vind, bool vlan_on,
> >  		   bool vlvf_bypass)
> >  {
> >  	return ixgbe_call_func(hw, hw->mac.ops.set_vfta, (hw, vlan, vind,
> > -				  vlan_on, vlvf_bypass),
> IXGBE_NOT_IMPLEMENTED);
> > +			       vlan_on, vlvf_bypass),
> IXGBE_NOT_IMPLEMENTED);
> >  }
> >
> >  /**
> > @@ -1100,7 +1100,7 @@ s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan,
> u32 vind, bool vlan_on,
> >   *  @vind: VMDq output index that maps queue to VLAN id in VLVFB
> >   *  @vlan_on: boolean flag to turn on/off VLAN in VLVF
> >   *  @vfta_delta: pointer to the difference between the current value of VFTA
> > - *               and the desired value
> > + *		 and the desired value
> >   *  @vfta: the desired value of the VFTA
> >   *  @vlvf_bypass: boolean flag indicating updating the default pool is okay
> >   *
> > @@ -1110,7 +1110,7 @@ s32 ixgbe_set_vlvf(struct ixgbe_hw *hw, u32 vlan,
> u32 vind, bool vlan_on,
> >  		   u32 *vfta_delta, u32 vfta, bool vlvf_bypass)
> >  {
> >  	return ixgbe_call_func(hw, hw->mac.ops.set_vlvf, (hw, vlan, vind,
> > -				vlan_on, vfta_delta, vfta, vlvf_bypass),
> > +			       vlan_on, vfta_delta, vfta, vlvf_bypass),
> >  			       IXGBE_NOT_IMPLEMENTED);
> >  }
> >
> > @@ -1659,6 +1659,7 @@ void ixgbe_init_swfw_semaphore(struct ixgbe_hw
> *hw)
> >  		hw->mac.ops.init_swfw_sync(hw);
> >  }
> >
> > +
> 
> unrelated whitespace modifications
> 
> 
> >  void ixgbe_disable_rx(struct ixgbe_hw *hw)
> >  {
> >  	if (hw->mac.ops.disable_rx)
> > diff --git a/drivers/net/ixgbe/base/ixgbe_common.c
> b/drivers/net/ixgbe/base/ixgbe_common.c
> > index 811875a..161bf32 100644
> > --- a/drivers/net/ixgbe/base/ixgbe_common.c
> > +++ b/drivers/net/ixgbe/base/ixgbe_common.c
> > @@ -3967,7 +3967,7 @@ s32 ixgbe_set_vlvf_generic(struct ixgbe_hw *hw,
> u32 vlan, u32 vind,
> >  		 * we run the risk of stray packets leaking into
> >  		 * the PF via the default pool
> >  		 */
> > -		if (vfta_delta)
> > +		if (*vfta_delta)
> 
> This seems only update mentioned in patch commit log.
> 
> What about extracting all other clean up modifications into a new patch,
> other patches also have similar fixes, all can go into that cleanup patch?

Good advice, I will put all the minor misc modifications into a separate patch.
Thanks.

> 
> >  			IXGBE_WRITE_REG(hw, IXGBE_VFTA(vlan / 32), vfta);
> >
> >  		/* disable VLVF and clear remaining bit from pool */
> >
>
Xiao Wang Sept. 25, 2016, 8:59 a.m. UTC | #3 
v2: - Moved minor changes into a cleanup patch.
    - Removed some unofficial names in commit log.
	- Rewrote the commit log of patch 05/40 to describe what the patch
      actually does.
    - Improved the wording of some commit log.

Update ixgbe base driver, including the following changes:

* add X550em_a 10G PHY support
* support flow control auto negotiation for X550em_a 1G PHY
* add X550em_a FW ALEF support
* increase mailbox version to ixgbe_mbox_api_13
* add two MAC ops for Hyper-V support
* some functional fixes

Xiao Wang (40):
  net/ixgbe/base: fix delta check for setting VFTA
  net/ixgbe/base: remove X550em SFP iXFI setup
  net/ixgbe/base: change endianness of PHY data
  net/ixgbe/base: add X550em_a 10G PHY support
  net/ixgbe/base: move vf_update_xcast_mode to base code
  net/ixgbe/base: introduce new ops init functions
  net/ixgbe/base: separate PHY probe code
  net/ixgbe/base: fully initialize X550em_a 1G PHYs
  net/ixgbe/base: add macros for VF promiscuous mode
  net/ixgbe/base: add FC setup for X550em_a fiber
  net/ixgbe/base: add FC autoneg for X550em_a fiber
  net/ixgbe/base: clear page register in error path
  net/ixgbe/base: configure DMAC for 10Mb operation
  net/ixgbe/base: fix function comments about X550
  net/ixgbe/base: report setting LPE register error
  net/ixgbe/base: bump mailbox version
  net/ixgbe/base: access IOSF by host interface
  net/ixgbe/base: fix check on NACK
  net/ixgbe/base: define X550 PCIe serial MAC addr
  net/ixgbe/base: bypass checking link for crosstalk
  net/ixgbe/base: support X550em_a SGMII FC autoneg
  net/ixgbe/base: add macros for GENEVE UDP port
  net/ixgbe/base: add bound check in LED functions
  net/ixgbe/base: use default check link function
  net/ixgbe/base: set default autoneg speed at reset
  net/ixgbe/base: add missing FDIRSCTPM mask setting
  net/ixgbe/base: commonize mailbox write and read
  net/ixgbe/base: reduce delay for SWFW semaphore
  net/ixgbe/base: report autoneg supported for X550
  net/ixgbe/base: remove X550em_a 100Mbps support
  net/ixgbe/base: unify link speed value
  net/ixgbe/base: separate ops init from PHY init
  net/ixgbe/base: add X550em_a FW ALEF support
  net/ixgbe/base: add two MAC ops for Hyper-V
  net/ixgbe/base: hold semaphore for shadow RAM access
  net/ixgbe/base: update X550em_a backplane speed
  net/ixgbe/base: clean code of flow control autoneg
  net/ixgbe/base: do not skip PHY configuration
  net/ixgbe/base: clean up
  net/ixgbe/base: add base driver update brief

 doc/guides/rel_notes/release_16_11.rst |    9 +
 drivers/net/ixgbe/base/README          |    2 +-
 drivers/net/ixgbe/base/ixgbe_82598.c   |    6 +-
 drivers/net/ixgbe/base/ixgbe_82599.c   |   16 +-
 drivers/net/ixgbe/base/ixgbe_api.c     |   11 +-
 drivers/net/ixgbe/base/ixgbe_api.h     |    2 +
 drivers/net/ixgbe/base/ixgbe_common.c  |  258 +++++--
 drivers/net/ixgbe/base/ixgbe_common.h  |    3 +-
 drivers/net/ixgbe/base/ixgbe_mbx.h     |    7 +-
 drivers/net/ixgbe/base/ixgbe_osdep.h   |    1 +
 drivers/net/ixgbe/base/ixgbe_phy.c     |  100 ++-
 drivers/net/ixgbe/base/ixgbe_phy.h     |   71 +-
 drivers/net/ixgbe/base/ixgbe_type.h    |   73 +-
 drivers/net/ixgbe/base/ixgbe_vf.c      |  103 ++-
 drivers/net/ixgbe/base/ixgbe_vf.h      |    3 +-
 drivers/net/ixgbe/base/ixgbe_x540.c    |   10 +-
 drivers/net/ixgbe/base/ixgbe_x550.c    | 1262 +++++++++++++++++++++-----------
 drivers/net/ixgbe/base/ixgbe_x550.h    |   61 +-
 drivers/net/ixgbe/ixgbe_ethdev.c       |   43 +-
 19 files changed, 1360 insertions(+), 681 deletions(-)
Wenzhuo Lu Sept. 26, 2016, 2:06 a.m. UTC | #4 
Hi,


> -----Original Message-----
> From: Wang, Xiao W
> Sent: Sunday, September 25, 2016 5:00 PM
> To: Lu, Wenzhuo
> Cc: dev@dpdk.org; Yigit, Ferruh; Wang, Xiao W
> Subject: [PATCH v2 00/40] net/ixgbe: base code update
> 
> v2: - Moved minor changes into a cleanup patch.
>     - Removed some unofficial names in commit log.
> 	- Rewrote the commit log of patch 05/40 to describe what the patch
>       actually does.
>     - Improved the wording of some commit log.
> 
> Update ixgbe base driver, including the following changes:
> 
> * add X550em_a 10G PHY support
> * support flow control auto negotiation for X550em_a 1G PHY
> * add X550em_a FW ALEF support
> * increase mailbox version to ixgbe_mbox_api_13
> * add two MAC ops for Hyper-V support
> * some functional fixes
> 
> Xiao Wang (40):
>   net/ixgbe/base: fix delta check for setting VFTA
>   net/ixgbe/base: remove X550em SFP iXFI setup
>   net/ixgbe/base: change endianness of PHY data
>   net/ixgbe/base: add X550em_a 10G PHY support
>   net/ixgbe/base: move vf_update_xcast_mode to base code
>   net/ixgbe/base: introduce new ops init functions
>   net/ixgbe/base: separate PHY probe code
>   net/ixgbe/base: fully initialize X550em_a 1G PHYs
>   net/ixgbe/base: add macros for VF promiscuous mode
>   net/ixgbe/base: add FC setup for X550em_a fiber
>   net/ixgbe/base: add FC autoneg for X550em_a fiber
>   net/ixgbe/base: clear page register in error path
>   net/ixgbe/base: configure DMAC for 10Mb operation
>   net/ixgbe/base: fix function comments about X550
>   net/ixgbe/base: report setting LPE register error
>   net/ixgbe/base: bump mailbox version
>   net/ixgbe/base: access IOSF by host interface
>   net/ixgbe/base: fix check on NACK
>   net/ixgbe/base: define X550 PCIe serial MAC addr
>   net/ixgbe/base: bypass checking link for crosstalk
>   net/ixgbe/base: support X550em_a SGMII FC autoneg
>   net/ixgbe/base: add macros for GENEVE UDP port
>   net/ixgbe/base: add bound check in LED functions
>   net/ixgbe/base: use default check link function
>   net/ixgbe/base: set default autoneg speed at reset
>   net/ixgbe/base: add missing FDIRSCTPM mask setting
>   net/ixgbe/base: commonize mailbox write and read
>   net/ixgbe/base: reduce delay for SWFW semaphore
>   net/ixgbe/base: report autoneg supported for X550
>   net/ixgbe/base: remove X550em_a 100Mbps support
>   net/ixgbe/base: unify link speed value
>   net/ixgbe/base: separate ops init from PHY init
>   net/ixgbe/base: add X550em_a FW ALEF support
>   net/ixgbe/base: add two MAC ops for Hyper-V
>   net/ixgbe/base: hold semaphore for shadow RAM access
>   net/ixgbe/base: update X550em_a backplane speed
>   net/ixgbe/base: clean code of flow control autoneg
>   net/ixgbe/base: do not skip PHY configuration
>   net/ixgbe/base: clean up
>   net/ixgbe/base: add base driver update brief
> 
>  doc/guides/rel_notes/release_16_11.rst |    9 +
>  drivers/net/ixgbe/base/README          |    2 +-
>  drivers/net/ixgbe/base/ixgbe_82598.c   |    6 +-
>  drivers/net/ixgbe/base/ixgbe_82599.c   |   16 +-
>  drivers/net/ixgbe/base/ixgbe_api.c     |   11 +-
>  drivers/net/ixgbe/base/ixgbe_api.h     |    2 +
>  drivers/net/ixgbe/base/ixgbe_common.c  |  258 +++++--
>  drivers/net/ixgbe/base/ixgbe_common.h  |    3 +-
>  drivers/net/ixgbe/base/ixgbe_mbx.h     |    7 +-
>  drivers/net/ixgbe/base/ixgbe_osdep.h   |    1 +
>  drivers/net/ixgbe/base/ixgbe_phy.c     |  100 ++-
>  drivers/net/ixgbe/base/ixgbe_phy.h     |   71 +-
>  drivers/net/ixgbe/base/ixgbe_type.h    |   73 +-
>  drivers/net/ixgbe/base/ixgbe_vf.c      |  103 ++-
>  drivers/net/ixgbe/base/ixgbe_vf.h      |    3 +-
>  drivers/net/ixgbe/base/ixgbe_x540.c    |   10 +-
>  drivers/net/ixgbe/base/ixgbe_x550.c    | 1262 +++++++++++++++++++++---------
> --
>  drivers/net/ixgbe/base/ixgbe_x550.h    |   61 +-
>  drivers/net/ixgbe/ixgbe_ethdev.c       |   43 +-
>  19 files changed, 1360 insertions(+), 681 deletions(-)
> 
> --
> 1.9.3
Series-Acked-by: Wenzhuo Lu <Wenzhuo.lu@intel.com>
Bruce Richardson Sept. 28, 2016, 3:31 p.m. UTC | #5 
On Mon, Sep 26, 2016 at 02:06:17AM +0000, Lu, Wenzhuo wrote:
> Hi,
> 
> 
> > -----Original Message-----
> > From: Wang, Xiao W
> > Sent: Sunday, September 25, 2016 5:00 PM
> > To: Lu, Wenzhuo
> > Cc: dev@dpdk.org; Yigit, Ferruh; Wang, Xiao W
> > Subject: [PATCH v2 00/40] net/ixgbe: base code update
> > 
> > v2: - Moved minor changes into a cleanup patch.
> >     - Removed some unofficial names in commit log.
> > 	- Rewrote the commit log of patch 05/40 to describe what the patch
> >       actually does.
> >     - Improved the wording of some commit log.
> > 
> > Update ixgbe base driver, including the following changes:
> > 
> > * add X550em_a 10G PHY support
> > * support flow control auto negotiation for X550em_a 1G PHY
> > * add X550em_a FW ALEF support
> > * increase mailbox version to ixgbe_mbox_api_13
> > * add two MAC ops for Hyper-V support
> > * some functional fixes
> > 
> > Xiao Wang (40):
> >   net/ixgbe/base: fix delta check for setting VFTA
> >   net/ixgbe/base: remove X550em SFP iXFI setup
> >   net/ixgbe/base: change endianness of PHY data
> >   net/ixgbe/base: add X550em_a 10G PHY support
> >   net/ixgbe/base: move vf_update_xcast_mode to base code
> >   net/ixgbe/base: introduce new ops init functions
> >   net/ixgbe/base: separate PHY probe code
> >   net/ixgbe/base: fully initialize X550em_a 1G PHYs
> >   net/ixgbe/base: add macros for VF promiscuous mode
> >   net/ixgbe/base: add FC setup for X550em_a fiber
> >   net/ixgbe/base: add FC autoneg for X550em_a fiber
> >   net/ixgbe/base: clear page register in error path
> >   net/ixgbe/base: configure DMAC for 10Mb operation
> >   net/ixgbe/base: fix function comments about X550
> >   net/ixgbe/base: report setting LPE register error
> >   net/ixgbe/base: bump mailbox version
> >   net/ixgbe/base: access IOSF by host interface
> >   net/ixgbe/base: fix check on NACK
> >   net/ixgbe/base: define X550 PCIe serial MAC addr
> >   net/ixgbe/base: bypass checking link for crosstalk
> >   net/ixgbe/base: support X550em_a SGMII FC autoneg
> >   net/ixgbe/base: add macros for GENEVE UDP port
> >   net/ixgbe/base: add bound check in LED functions
> >   net/ixgbe/base: use default check link function
> >   net/ixgbe/base: set default autoneg speed at reset
> >   net/ixgbe/base: add missing FDIRSCTPM mask setting
> >   net/ixgbe/base: commonize mailbox write and read
> >   net/ixgbe/base: reduce delay for SWFW semaphore
> >   net/ixgbe/base: report autoneg supported for X550
> >   net/ixgbe/base: remove X550em_a 100Mbps support
> >   net/ixgbe/base: unify link speed value
> >   net/ixgbe/base: separate ops init from PHY init
> >   net/ixgbe/base: add X550em_a FW ALEF support
> >   net/ixgbe/base: add two MAC ops for Hyper-V
> >   net/ixgbe/base: hold semaphore for shadow RAM access
> >   net/ixgbe/base: update X550em_a backplane speed
> >   net/ixgbe/base: clean code of flow control autoneg
> >   net/ixgbe/base: do not skip PHY configuration
> >   net/ixgbe/base: clean up
> >   net/ixgbe/base: add base driver update brief
> > 
> >  doc/guides/rel_notes/release_16_11.rst |    9 +
> >  drivers/net/ixgbe/base/README          |    2 +-
> >  drivers/net/ixgbe/base/ixgbe_82598.c   |    6 +-
> >  drivers/net/ixgbe/base/ixgbe_82599.c   |   16 +-
> >  drivers/net/ixgbe/base/ixgbe_api.c     |   11 +-
> >  drivers/net/ixgbe/base/ixgbe_api.h     |    2 +
> >  drivers/net/ixgbe/base/ixgbe_common.c  |  258 +++++--
> >  drivers/net/ixgbe/base/ixgbe_common.h  |    3 +-
> >  drivers/net/ixgbe/base/ixgbe_mbx.h     |    7 +-
> >  drivers/net/ixgbe/base/ixgbe_osdep.h   |    1 +
> >  drivers/net/ixgbe/base/ixgbe_phy.c     |  100 ++-
> >  drivers/net/ixgbe/base/ixgbe_phy.h     |   71 +-
> >  drivers/net/ixgbe/base/ixgbe_type.h    |   73 +-
> >  drivers/net/ixgbe/base/ixgbe_vf.c      |  103 ++-
> >  drivers/net/ixgbe/base/ixgbe_vf.h      |    3 +-
> >  drivers/net/ixgbe/base/ixgbe_x540.c    |   10 +-
> >  drivers/net/ixgbe/base/ixgbe_x550.c    | 1262 +++++++++++++++++++++---------
> > --
> >  drivers/net/ixgbe/base/ixgbe_x550.h    |   61 +-
> >  drivers/net/ixgbe/ixgbe_ethdev.c       |   43 +-
> >  19 files changed, 1360 insertions(+), 681 deletions(-)
> > 
> > --
> > 1.9.3
> Series-Acked-by: Wenzhuo Lu <Wenzhuo.lu@intel.com>
> 

Applied to dpdk-next-net/rel_16_11

Thanks,
/Bruce
diff mbox

Patch

diff --git a/drivers/net/ixgbe/base/ixgbe_82598.c b/drivers/net/ixgbe/base/ixgbe_82598.c
index db80880..724dcbb 100644
--- a/drivers/net/ixgbe/base/ixgbe_82598.c
+++ b/drivers/net/ixgbe/base/ixgbe_82598.c
@@ -995,19 +995,19 @@  STATIC s32 ixgbe_clear_vmdq_82598(struct ixgbe_hw *hw, u32 rar, u32 vmdq)
  *  @vlan: VLAN id to write to VLAN filter
  *  @vind: VMDq output index that maps queue to VLAN id in VFTA
  *  @vlan_on: boolean flag to turn on/off VLAN in VFTA
- *  @bypass_vlvf: boolean flag - unused
+ *  @vlvf_bypass: boolean flag - unused
  *
  *  Turn on/off specified VLAN in the VLAN filter table.
  **/
 s32 ixgbe_set_vfta_82598(struct ixgbe_hw *hw, u32 vlan, u32 vind,
-			 bool vlan_on, bool bypass_vlvf)
+			 bool vlan_on, bool vlvf_bypass)
 {
 	u32 regindex;
 	u32 bitindex;
 	u32 bits;
 	u32 vftabyte;
 
-	UNREFERENCED_1PARAMETER(bypass_vlvf);
+	UNREFERENCED_1PARAMETER(vlvf_bypass);
 
 	DEBUGFUNC("ixgbe_set_vfta_82598");
 
diff --git a/drivers/net/ixgbe/base/ixgbe_api.c b/drivers/net/ixgbe/base/ixgbe_api.c
index 1786867..5b721af 100644
--- a/drivers/net/ixgbe/base/ixgbe_api.c
+++ b/drivers/net/ixgbe/base/ixgbe_api.c
@@ -1090,7 +1090,7 @@  s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on,
 		   bool vlvf_bypass)
 {
 	return ixgbe_call_func(hw, hw->mac.ops.set_vfta, (hw, vlan, vind,
-				  vlan_on, vlvf_bypass), IXGBE_NOT_IMPLEMENTED);
+			       vlan_on, vlvf_bypass), IXGBE_NOT_IMPLEMENTED);
 }
 
 /**
@@ -1100,7 +1100,7 @@  s32 ixgbe_set_vfta(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on,
  *  @vind: VMDq output index that maps queue to VLAN id in VLVFB
  *  @vlan_on: boolean flag to turn on/off VLAN in VLVF
  *  @vfta_delta: pointer to the difference between the current value of VFTA
- *               and the desired value
+ *		 and the desired value
  *  @vfta: the desired value of the VFTA
  *  @vlvf_bypass: boolean flag indicating updating the default pool is okay
  *
@@ -1110,7 +1110,7 @@  s32 ixgbe_set_vlvf(struct ixgbe_hw *hw, u32 vlan, u32 vind, bool vlan_on,
 		   u32 *vfta_delta, u32 vfta, bool vlvf_bypass)
 {
 	return ixgbe_call_func(hw, hw->mac.ops.set_vlvf, (hw, vlan, vind,
-				vlan_on, vfta_delta, vfta, vlvf_bypass),
+			       vlan_on, vfta_delta, vfta, vlvf_bypass),
 			       IXGBE_NOT_IMPLEMENTED);
 }
 
@@ -1659,6 +1659,7 @@  void ixgbe_init_swfw_semaphore(struct ixgbe_hw *hw)
 		hw->mac.ops.init_swfw_sync(hw);
 }
 
+
 void ixgbe_disable_rx(struct ixgbe_hw *hw)
 {
 	if (hw->mac.ops.disable_rx)
diff --git a/drivers/net/ixgbe/base/ixgbe_common.c b/drivers/net/ixgbe/base/ixgbe_common.c
index 811875a..161bf32 100644
--- a/drivers/net/ixgbe/base/ixgbe_common.c
+++ b/drivers/net/ixgbe/base/ixgbe_common.c
@@ -3967,7 +3967,7 @@  s32 ixgbe_set_vlvf_generic(struct ixgbe_hw *hw, u32 vlan, u32 vind,
 		 * we run the risk of stray packets leaking into
 		 * the PF via the default pool
 		 */
-		if (vfta_delta)
+		if (*vfta_delta)
 			IXGBE_WRITE_REG(hw, IXGBE_VFTA(vlan / 32), vfta);
 
 		/* disable VLVF and clear remaining bit from pool */