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

Commit 9ce0e8d7 authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

igb/igbvf: don't give up 



The driver shouldn't just give up if it fails to get the hardware
mailbox lock. This can happen in a situation where the PF-VF
communication channel is heavily loaded and causes complete
communications failure between the PF and VF drivers.

Add a counter and a delay. The driver will now retry ten times, waiting
one millisecond between retries.

Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 37a5d163

drivers/net/ethernet/intel/igb/e1000_mbx.c

+12 −6
Original line number Diff line number Diff line
@@ -322,14 +322,20 @@ static s32 igb_obtain_mbx_lock_pf(struct e1000_hw *hw, u16 vf_number) 
{

	s32 ret_val = -E1000_ERR_MBX;

	u32 p2v_mailbox;

	int count = 10;



	do {

		/* Take ownership of the buffer */

		wr32(E1000_P2VMAILBOX(vf_number), E1000_P2VMAILBOX_PFU);



		/* reserve mailbox for vf use */

		p2v_mailbox = rd32(E1000_P2VMAILBOX(vf_number));

	if (p2v_mailbox & E1000_P2VMAILBOX_PFU)

		if (p2v_mailbox & E1000_P2VMAILBOX_PFU) {

			ret_val = 0;

			break;

		}

		udelay(1000);

	} while (count-- > 0);



	return ret_val;

}

drivers/net/ethernet/intel/igbvf/mbx.c

+13 −7
Original line number Diff line number Diff line
@@ -234,13 +234,19 @@ static s32 e1000_check_for_rst_vf(struct e1000_hw *hw) 
static s32 e1000_obtain_mbx_lock_vf(struct e1000_hw *hw)

{

	s32 ret_val = -E1000_ERR_MBX;

	int count = 10;



	do {

		/* Take ownership of the buffer */

		ew32(V2PMAILBOX(0), E1000_V2PMAILBOX_VFU);



		/* reserve mailbox for VF use */

	if (e1000_read_v2p_mailbox(hw) & E1000_V2PMAILBOX_VFU)

		ret_val = E1000_SUCCESS;

		if (e1000_read_v2p_mailbox(hw) & E1000_V2PMAILBOX_VFU) {

			ret_val = 0;

			break;

		}

		udelay(1000);

	} while (count-- > 0);



	return ret_val;

}