lkml.org 
[lkml]   [2016]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 60/69] ixgbe: Force VLNCTRL.VFE to be set in all VMDq paths
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alexander Duyck <alexander.h.duyck@intel.com>

    commit f60439bc21e3337429838e477903214f5bd8277f upstream.

    When I was adding the code for enabling VLAN promiscuous mode with SR-IOV
    enabled I had inadvertently left the VLNCTRL.VFE bit unchanged as I has
    assumed there was code in another path that was setting it when we enabled
    SR-IOV. This wasn't the case and as a result we were just disabling VLAN
    filtering for all the VFs apparently.

    Also the previous patches were always clearing CFIEN which was always set
    to 0 by the hardware anyway so I am dropping the redundant bit clearing.

    Fixes: 16369564915a ("ixgbe: Add support for VLAN promiscuous with SR-IOV")
    Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 18 ++++++++++++------
    1 file changed, 12 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
    @@ -4100,6 +4100,8 @@ static void ixgbe_vlan_promisc_enable(st
    struct ixgbe_hw *hw = &adapter->hw;
    u32 vlnctrl, i;

    + vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
    +
    switch (hw->mac.type) {
    case ixgbe_mac_82599EB:
    case ixgbe_mac_X540:
    @@ -4112,8 +4114,7 @@ static void ixgbe_vlan_promisc_enable(st
    /* fall through */
    case ixgbe_mac_82598EB:
    /* legacy case, we can just disable VLAN filtering */
    - vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
    - vlnctrl &= ~(IXGBE_VLNCTRL_VFE | IXGBE_VLNCTRL_CFIEN);
    + vlnctrl &= ~IXGBE_VLNCTRL_VFE;
    IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
    return;
    }
    @@ -4125,6 +4126,10 @@ static void ixgbe_vlan_promisc_enable(st
    /* Set flag so we don't redo unnecessary work */
    adapter->flags2 |= IXGBE_FLAG2_VLAN_PROMISC;

    + /* For VMDq and SR-IOV we must leave VLAN filtering enabled */
    + vlnctrl |= IXGBE_VLNCTRL_VFE;
    + IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
    +
    /* Add PF to all active pools */
    for (i = IXGBE_VLVF_ENTRIES; --i;) {
    u32 reg_offset = IXGBE_VLVFB(i * 2 + VMDQ_P(0) / 32);
    @@ -4191,6 +4196,11 @@ static void ixgbe_vlan_promisc_disable(s
    struct ixgbe_hw *hw = &adapter->hw;
    u32 vlnctrl, i;

    + /* Set VLAN filtering to enabled */
    + vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
    + vlnctrl |= IXGBE_VLNCTRL_VFE;
    + IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
    +
    switch (hw->mac.type) {
    case ixgbe_mac_82599EB:
    case ixgbe_mac_X540:
    @@ -4202,10 +4212,6 @@ static void ixgbe_vlan_promisc_disable(s
    break;
    /* fall through */
    case ixgbe_mac_82598EB:
    - vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL);
    - vlnctrl &= ~IXGBE_VLNCTRL_CFIEN;
    - vlnctrl |= IXGBE_VLNCTRL_VFE;
    - IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);
    return;
    }


    \
     
     \ /
      Last update: 2016-09-28 11:14    [W:4.926 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site