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

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

ixgbe: Improve reset coordination between the PF and the VF 



Inadequate coordination between the PF driver and the VF driver results
in tx hangs in the VF driver when you perform certain actions that will
lead to a re-init of the PF.  Add feature to notify active VFs when the PF
is about to re-initialize so that the VFs can take appropriate action.

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 c9205697

drivers/net/ixgbe/ixgbe_main.c

+11 −0
Original line number Diff line number Diff line
@@ -3203,6 +3203,17 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 
	/* signal that we are down to the interrupt handler */

	set_bit(__IXGBE_DOWN, &adapter->state);



	/* disable receive for all VFs and wait one second */

	if (adapter->num_vfs) {

		for (i = 0 ; i < adapter->num_vfs; i++)

			adapter->vfinfo[i].clear_to_send = 0;



		/* ping all the active vfs to let them know we are going down */

		ixgbe_ping_all_vfs(adapter);

		/* Disable all VFTE/VFRE TX/RX */

		ixgbe_disable_tx_rx(adapter);

	}



	/* disable receives */

	rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);

	IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl & ~IXGBE_RXCTRL_RXEN);

drivers/net/ixgbe/ixgbe_sriov.c

+26 −0
Original line number Diff line number Diff line
@@ -334,3 +334,29 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter) 
	}

}



void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter)

{

	struct ixgbe_hw *hw = &adapter->hw;



	/* disable transmit and receive for all vfs */

	IXGBE_WRITE_REG(hw, IXGBE_VFTE(0), 0);

	IXGBE_WRITE_REG(hw, IXGBE_VFTE(1), 0);



	IXGBE_WRITE_REG(hw, IXGBE_VFRE(0), 0);

	IXGBE_WRITE_REG(hw, IXGBE_VFRE(1), 0);

}



void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter)

{

	struct ixgbe_hw *hw = &adapter->hw;

	u32 ping;

	int i;



	for (i = 0 ; i < adapter->num_vfs; i++) {

		ping = IXGBE_PF_CONTROL_MSG;

		if (adapter->vfinfo[i].clear_to_send)

			ping |= IXGBE_VT_MSGTYPE_CTS;

		ixgbe_write_mbx(hw, &ping, 1, i);

	}

}

drivers/net/ixgbe/ixgbe_sriov.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ void ixgbe_msg_task(struct ixgbe_adapter *adapter); 
int ixgbe_set_vf_mac(struct ixgbe_adapter *adapter,

                     int vf, unsigned char *mac_addr);

int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask);

void ixgbe_disable_tx_rx(struct ixgbe_adapter *adapter);

void ixgbe_ping_all_vfs(struct ixgbe_adapter *adapter);

void ixgbe_dump_registers(struct ixgbe_adapter *adapter);



#endif /* _IXGBE_SRIOV_H_ */