Commit 7235448c authored by Mitch A Williams's avatar Mitch A Williams Committed by Jeff Kirsher
Browse files

i40evf: enable interrupt 0 appropriately 



Don't enable vector 0 in the ISR, just schedule the adminq task and let
it enable the vector. This prevents the task from being called
reentrantly. Make sure that the vector is enabled on all exit paths of
the adminq task, including error exits.

Change-ID: I53f3d14f91ed7a9e90291ea41c681122a5eca5b5
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Acked-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 4870e176

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+4 −8
Original line number Diff line number Diff line
@@ -313,10 +313,6 @@ static irqreturn_t i40evf_msix_aq(int irq, void *data) 
	val = val | I40E_PFINT_DYN_CTL0_CLEARPBA_MASK;

	wr32(hw, I40E_VFINT_DYN_CTL01, val);



	/* re-enable interrupt causes */

	wr32(hw, I40E_VFINT_ICR0_ENA1, ena_mask);

	wr32(hw, I40E_VFINT_DYN_CTL01, I40E_VFINT_DYN_CTL01_INTENA_MASK);



	/* schedule work on the private workqueue */

	schedule_work(&adapter->adminq_task);
@@ -1620,12 +1616,12 @@ static void i40evf_adminq_task(struct work_struct *work) 
	u16 pending;



	if (adapter->flags & I40EVF_FLAG_PF_COMMS_FAILED)

		return;

		goto out;



	event.buf_len = I40EVF_MAX_AQ_BUF_SIZE;

	event.msg_buf = kzalloc(event.buf_len, GFP_KERNEL);

	if (!event.msg_buf)

		return;

		goto out;



	v_msg = (struct i40e_virtchnl_msg *)&event.desc;

	do {
@@ -1675,10 +1671,10 @@ static void i40evf_adminq_task(struct work_struct *work) 
	if (oldval != val)

		wr32(hw, hw->aq.asq.len, val);



	kfree(event.msg_buf);

out:

	/* re-enable Admin queue interrupt cause */

	i40evf_misc_irq_enable(adapter);



	kfree(event.msg_buf);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE