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

Commit 9b735984 authored by Greg Rose's avatar Greg Rose Committed by Jeff Kirsher
Browse files

ixgbe: Make the bridge mode setting sticky 



The internal bridge mode setting needs to be sticky so that it can be
configured correctly after a device reset.  This change is required now
that the driver supports setting the bridge mode to VEB or VEPA.

Signed-off-by: default avatarGreg Rose <gregory.v.rose@intel.com>
Acked-by: default avatarJohn Fastabend <john.r.fastabend@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Tested-by: default avatarSibai Li <Sibai.li@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2afaa00d

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ struct ixgbe_adapter { 
#define IXGBE_FLAG2_RSS_FIELD_IPV6_UDP		(u32)(1 << 9)

#define IXGBE_FLAG2_PTP_ENABLED			(u32)(1 << 10)

#define IXGBE_FLAG2_PTP_PPS_ENABLED		(u32)(1 << 11)

#define IXGBE_FLAG2_BRIDGE_MODE_VEB		(u32)(1 << 12)



	/* Tx fast path data */

	int num_tx_queues;

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+8 −4
Original line number Diff line number Diff line
@@ -3247,6 +3247,8 @@ static void ixgbe_configure_virtualization(struct ixgbe_adapter *adapter) 
	IXGBE_WRITE_REG(hw, IXGBE_VFRE(reg_offset ^ 1), reg_offset - 1);

	IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset), (~0) << vf_shift);

	IXGBE_WRITE_REG(hw, IXGBE_VFTE(reg_offset ^ 1), reg_offset - 1);

	if (adapter->flags2 & IXGBE_FLAG2_BRIDGE_MODE_VEB)

		IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);



	/* Map PF MAC address in RAR Entry 0 to first pool following VFs */

	hw->mac.ops.set_vmdq(hw, 0, VMDQ_P(0));
@@ -7039,11 +7041,13 @@ static int ixgbe_ndo_bridge_setlink(struct net_device *dev, 
			continue;



		mode = nla_get_u16(attr);

		if (mode == BRIDGE_MODE_VEPA)

		if (mode == BRIDGE_MODE_VEPA) {

			reg = 0;

		else if (mode == BRIDGE_MODE_VEB)

			adapter->flags2 &= ~IXGBE_FLAG2_BRIDGE_MODE_VEB;

		} else if (mode == BRIDGE_MODE_VEB) {

			reg = IXGBE_PFDTXGSWC_VT_LBEN;

		else

			adapter->flags2 |= IXGBE_FLAG2_BRIDGE_MODE_VEB;

		} else

			return -EINVAL;



		IXGBE_WRITE_REG(&adapter->hw, IXGBE_PFDTXGSWC, reg);
@@ -7064,7 +7068,7 @@ static int ixgbe_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, 
	if (!(adapter->flags & IXGBE_FLAG_SRIOV_ENABLED))

		return 0;



	if (IXGBE_READ_REG(&adapter->hw, IXGBE_PFDTXGSWC) & 1)

	if (adapter->flags2 & IXGBE_FLAG2_BRIDGE_MODE_VEB)

		mode = BRIDGE_MODE_VEB;

	else

		mode = BRIDGE_MODE_VEPA;

drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ void ixgbe_enable_sriov(struct ixgbe_adapter *adapter, 


	/* Initialize default switching mode VEB */

	IXGBE_WRITE_REG(hw, IXGBE_PFDTXGSWC, IXGBE_PFDTXGSWC_VT_LBEN);

	adapter->flags2 |= IXGBE_FLAG2_BRIDGE_MODE_VEB;



	/* If call to enable VFs succeeded then allocate memory

	 * for per VF control structures.