| Message ID | 1386754354-22039-1-git-send-email-sassmann@kpanic.de |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, 2013-12-11 at 10:32 +0100, Stefan Assmann wrote: > For i350 VLAN stripping for VMs is not enabled in the VMOLR register > but in > the DVMOLR register. Making the changes accordingly. It's not > necessary to > unset the E1000_VMOLR_STRVLAN bit on i350 as the hardware will simply > ignore > it. > > Without this change if a VLAN is configured for a VF assigned to a > guest > via (i.e.) > ip link set p1p1 vf 0 vlan 10 > the VLAN tag will not be stripped from packets going into the VM. > Which they > should be because the VM itself is not aware of the VLAN at all. > > Signed-off-by: Stefan Assmann <sassmann@kpanic.de> > --- > drivers/net/ethernet/intel/igb/e1000_82575.h | 4 ++++ > drivers/net/ethernet/intel/igb/e1000_regs.h | 1 + > drivers/net/ethernet/intel/igb/igb_main.c | 7 +++++++ > 3 files changed, 12 insertions(+) Thanks Stefan, I have added this patch to my queue.
On Wed, 2013-12-11 at 10:32 +0100, Stefan Assmann wrote: > For i350 VLAN stripping for VMs is not enabled in the VMOLR register > but in > the DVMOLR register. Making the changes accordingly. It's not > necessary to > unset the E1000_VMOLR_STRVLAN bit on i350 as the hardware will simply > ignore > it. > > Without this change if a VLAN is configured for a VF assigned to a > guest > via (i.e.) > ip link set p1p1 vf 0 vlan 10 > the VLAN tag will not be stripped from packets going into the VM. > Which they > should be because the VM itself is not aware of the VLAN at all. > > Signed-off-by: Stefan Assmann <sassmann@kpanic.de> Tested-by: Sibai Li <sibai.li@intel.com> Signed-off-by: Aaron Brown <aaron.f.brown@intel.com> > --- > drivers/net/ethernet/intel/igb/e1000_82575.h | 4 ++++ > drivers/net/ethernet/intel/igb/e1000_regs.h | 1 + > drivers/net/ethernet/intel/igb/igb_main.c | 7 +++++++ > 3 files changed, 12 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.h b/drivers/net/ethernet/intel/igb/e1000_82575.h index 8c24377..90b2fd5 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.h +++ b/drivers/net/ethernet/intel/igb/e1000_82575.h @@ -231,6 +231,10 @@ struct e1000_adv_tx_context_desc { #define E1000_VMOLR_STRVLAN 0x40000000 /* Vlan stripping enable */ #define E1000_VMOLR_STRCRC 0x80000000 /* CRC stripping enable */ +#define E1000_DVMOLR_HIDEVLAN 0x20000000 /* Hide vlan enable */ +#define E1000_DVMOLR_STRVLAN 0x40000000 /* Vlan stripping enable */ +#define E1000_DVMOLR_STRCRC 0x80000000 /* CRC stripping enable */ + #define E1000_VLVF_ARRAY_SIZE 32 #define E1000_VLVF_VLANID_MASK 0x00000FFF #define E1000_VLVF_POOLSEL_SHIFT 12 diff --git a/drivers/net/ethernet/intel/igb/e1000_regs.h b/drivers/net/ethernet/intel/igb/e1000_regs.h index 82632c6..34f7275 100644 --- a/drivers/net/ethernet/intel/igb/e1000_regs.h +++ b/drivers/net/ethernet/intel/igb/e1000_regs.h @@ -349,6 +349,7 @@ #define E1000_P2VMAILBOX(_n) (0x00C00 + (4 * (_n))) #define E1000_VMBMEM(_n) (0x00800 + (64 * (_n))) #define E1000_VMOLR(_n) (0x05AD0 + (4 * (_n))) +#define E1000_DVMOLR(_n) (0x0C038 + (64 * (_n))) #define E1000_VLVF(_n) (0x05D00 + (4 * (_n))) /* VLAN Virtual Machine * Filter - RW */ #define E1000_VMVIR(_n) (0x03700 + (4 * (_n))) diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 3bc10bd..0596db7 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -3496,6 +3496,13 @@ static inline void igb_set_vmolr(struct igb_adapter *adapter, vmolr = rd32(E1000_VMOLR(vfn)); vmolr |= E1000_VMOLR_STRVLAN; /* Strip vlan tags */ + if (hw->mac.type == e1000_i350) { + u32 dvmolr; + + dvmolr = rd32(E1000_DVMOLR(vfn)); + dvmolr |= E1000_DVMOLR_STRVLAN; + wr32(E1000_DVMOLR(vfn), dvmolr); + } if (aupe) vmolr |= E1000_VMOLR_AUPE; /* Accept untagged packets */ else
For i350 VLAN stripping for VMs is not enabled in the VMOLR register but in the DVMOLR register. Making the changes accordingly. It's not necessary to unset the E1000_VMOLR_STRVLAN bit on i350 as the hardware will simply ignore it. Without this change if a VLAN is configured for a VF assigned to a guest via (i.e.) ip link set p1p1 vf 0 vlan 10 the VLAN tag will not be stripped from packets going into the VM. Which they should be because the VM itself is not aware of the VLAN at all. Signed-off-by: Stefan Assmann <sassmann@kpanic.de> --- drivers/net/ethernet/intel/igb/e1000_82575.h | 4 ++++ drivers/net/ethernet/intel/igb/e1000_regs.h | 1 + drivers/net/ethernet/intel/igb/igb_main.c | 7 +++++++ 3 files changed, 12 insertions(+)