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

Commit 939b701a authored by Sebastian Basierski's avatar Sebastian Basierski Committed by Jeff Kirsher
Browse files

ixgbe: fix driver behaviour after issuing VFLR 



Since VFLR doesn't clear VFMBMEM (VF Mailbox Memory)
and is not re-enabling queues correctly we should fix
this behavior.

Signed-off-by: default avatarSebastian Basierski <sebastianx.basierski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent fabf1bce

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

+26 −0
Original line number Diff line number Diff line
@@ -693,8 +693,13 @@ static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter, 
static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf)

{

	struct ixgbe_hw *hw = &adapter->hw;

	struct ixgbe_ring_feature *vmdq = &adapter->ring_feature[RING_F_VMDQ];

	struct vf_data_storage *vfinfo = &adapter->vfinfo[vf];

	u32 q_per_pool = __ALIGN_MASK(1, ~vmdq->mask);

	u8 num_tcs = adapter->hw_tcs;

	u32 reg_val;

	u32 queue;

	u32 word;



	/* remove VLAN filters beloning to this VF */

	ixgbe_clear_vf_vlans(adapter, vf);
@@ -731,6 +736,27 @@ static inline void ixgbe_vf_reset_event(struct ixgbe_adapter *adapter, u32 vf) 


	/* reset VF api back to unknown */

	adapter->vfinfo[vf].vf_api = ixgbe_mbox_api_10;



	/* Restart each queue for given VF */

	for (queue = 0; queue < q_per_pool; queue++) {

		unsigned int reg_idx = (vf * q_per_pool) + queue;



		reg_val = IXGBE_READ_REG(hw, IXGBE_PVFTXDCTL(reg_idx));



		/* Re-enabling only configured queues */

		if (reg_val) {

			reg_val |= IXGBE_TXDCTL_ENABLE;

			IXGBE_WRITE_REG(hw, IXGBE_PVFTXDCTL(reg_idx), reg_val);

			reg_val &= ~IXGBE_TXDCTL_ENABLE;

			IXGBE_WRITE_REG(hw, IXGBE_PVFTXDCTL(reg_idx), reg_val);

		}

	}



	/* Clear VF's mailbox memory */

	for (word = 0; word < IXGBE_VFMAILBOX_SIZE; word++)

		IXGBE_WRITE_REG_ARRAY(hw, IXGBE_PFMBMEM(vf), word, 0);



	IXGBE_WRITE_FLUSH(hw);

}



static int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,

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

+1 −0
Original line number Diff line number Diff line
@@ -2518,6 +2518,7 @@ enum { 
/* Translated register #defines */

#define IXGBE_PVFTDH(P)		(0x06010 + (0x40 * (P)))

#define IXGBE_PVFTDT(P)		(0x06018 + (0x40 * (P)))

#define IXGBE_PVFTXDCTL(P)	(0x06028 + (0x40 * (P)))

#define IXGBE_PVFTDWBAL(P)	(0x06038 + (0x40 * (P)))

#define IXGBE_PVFTDWBAH(P)	(0x0603C + (0x40 * (P)))