Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0412776 authored by Greg Rose's avatar Greg Rose Committed by David S. Miller
Browse files

ixgbe: Add boolean parameter to ixgbe_set_vmolr 



Add a boolean parameter to ixgbe-set_vmolr so that the caller can
specify whether the pool should accept untagged packets.  Required
for a follow on patch to enable administrative configuration of port
VLAN for virtual functions.

Signed-off-by: default avatarGreg Rose <gregory.v.rose@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eab2abf5

drivers/net/ixgbe/ixgbe_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2722,7 +2722,7 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 
		IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset), (1 << vf_shift));

		IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), (1 << vf_shift));

		IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);

		ixgbe_set_vmolr(hw, adapter->num_vfs);

		ixgbe_set_vmolr(hw, adapter->num_vfs, true);

	}



	/* Program MRQC for the distribution of queues */

drivers/net/ixgbe/ixgbe_sriov.c

+7 −4
Original line number Diff line number Diff line
@@ -113,13 +113,16 @@ int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf) 
}





void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf)

void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe)

{

	u32 vmolr = IXGBE_READ_REG(hw, IXGBE_VMOLR(vf));

	vmolr |= (IXGBE_VMOLR_AUPE |

		  IXGBE_VMOLR_ROMPE |

	vmolr |= (IXGBE_VMOLR_ROMPE |

		  IXGBE_VMOLR_ROPE |

		  IXGBE_VMOLR_BAM);

	if (aupe)

		vmolr |= IXGBE_VMOLR_AUPE;

	else

		vmolr &= ~IXGBE_VMOLR_AUPE;

	IXGBE_WRITE_REG(hw, IXGBE_VMOLR(vf), vmolr);

}
@@ -128,7 +131,7 @@ inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf) 
	struct ixgbe_hw *hw = &adapter->hw;



	/* reset offloads to defaults */

	ixgbe_set_vmolr(hw, vf);

	ixgbe_set_vmolr(hw, vf, true);





	/* reset multicast table array for vf */

drivers/net/ixgbe/ixgbe_sriov.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int ixgbe_set_vf_multicasts(struct ixgbe_adapter *adapter, 
                            int entries, u16 *hash_list, u32 vf);

void ixgbe_restore_vf_multicasts(struct ixgbe_adapter *adapter);

int ixgbe_set_vf_vlan(struct ixgbe_adapter *adapter, int add, int vid, u32 vf);

void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf);

void ixgbe_set_vmolr(struct ixgbe_hw *hw, u32 vf, bool aupe);

void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf);

void ixgbe_vf_reset_msg(struct ixgbe_adapter *adapter, u32 vf);

void ixgbe_msg_task(struct ixgbe_adapter *adapter);