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

Commit 2ef28cfb authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: use functions to enable and disable icr 0 



Introduce i40e_irq_dynamic_disable_icr0 and use it and its previously-
extant counterpart when appropriate.

Change-Id: Ieb4037874fba2e96fc2354b34a97a3cb8f6490f3
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Tested-by: default avatarSibai Li <sibai.li@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 36fac581

drivers/net/ethernet/intel/i40e/i40e.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -565,6 +565,7 @@ static inline void i40e_dbg_init(void) {} 
static inline void i40e_dbg_exit(void) {}

static inline void i40e_dbg_exit(void) {}

#endif /* CONFIG_DEBUG_FS*/

#endif /* CONFIG_DEBUG_FS*/

void i40e_irq_dynamic_enable(struct i40e_vsi *vsi, int vector);

void i40e_irq_dynamic_enable(struct i40e_vsi *vsi, int vector);

void i40e_irq_dynamic_disable_icr0(struct i40e_pf *pf);

void i40e_irq_dynamic_enable_icr0(struct i40e_pf *pf);

void i40e_irq_dynamic_enable_icr0(struct i40e_pf *pf);

int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);

int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);

void i40e_vlan_stripping_disable(struct i40e_vsi *vsi);

void i40e_vlan_stripping_disable(struct i40e_vsi *vsi);

drivers/net/ethernet/intel/i40e/i40e_main.c

+13 −0
Original line number Original line Diff line number Diff line
@@ -2542,6 +2542,19 @@ static void i40e_configure_msi_and_legacy(struct i40e_vsi *vsi) 
	i40e_flush(hw);

	i40e_flush(hw);

}

}





/**

 * i40e_irq_dynamic_disable_icr0 - Disable default interrupt generation for icr0

 * @pf: board private structure

 **/

void i40e_irq_dynamic_disable_icr0(struct i40e_pf *pf)

{

	struct i40e_hw *hw = &pf->hw;



	wr32(hw, I40E_PFINT_DYN_CTL0,

	     I40E_ITR_NONE << I40E_PFINT_DYN_CTLN_ITR_INDX_SHIFT);

	i40e_flush(hw);

}



/**

/**

 * i40e_irq_dynamic_enable_icr0 - Enable default interrupt generation for icr0

 * i40e_irq_dynamic_enable_icr0 - Enable default interrupt generation for icr0

 * @pf: board private structure

 * @pf: board private structure

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+6 −15
Original line number Original line Diff line number Diff line
@@ -719,15 +719,14 @@ static bool i40e_vfs_are_assigned(struct i40e_pf *pf) 
 **/

 **/

void i40e_free_vfs(struct i40e_pf *pf)

void i40e_free_vfs(struct i40e_pf *pf)

{

{

	struct i40e_hw *hw = &pf->hw;

	int i, tmp;

	int i, tmp;





	if (!pf->vf)

	if (!pf->vf)

		return;

		return;





	/* Disable interrupt 0 so we don't try to handle the VFLR. */

	/* Disable interrupt 0 so we don't try to handle the VFLR. */

	wr32(hw, I40E_PFINT_DYN_CTL0, 0);

	i40e_irq_dynamic_disable_icr0(pf);

	i40e_flush(hw);



	mdelay(10); /* let any messages in transit get finished up */

	mdelay(10); /* let any messages in transit get finished up */

	/* free up vf resources */

	/* free up vf resources */

	tmp = pf->num_alloc_vfs;

	tmp = pf->num_alloc_vfs;
@@ -749,11 +748,7 @@ void i40e_free_vfs(struct i40e_pf *pf) 
			 "unable to disable SR-IOV because VFs are assigned.\n");

			 "unable to disable SR-IOV because VFs are assigned.\n");





	/* Re-enable interrupt 0. */

	/* Re-enable interrupt 0. */

	wr32(hw, I40E_PFINT_DYN_CTL0,

	i40e_irq_dynamic_enable_icr0(pf);

	     I40E_PFINT_DYN_CTL0_INTENA_MASK |

	     I40E_PFINT_DYN_CTL0_CLEARPBA_MASK |

	     (I40E_ITR_NONE << I40E_PFINT_DYN_CTL0_ITR_INDX_SHIFT));

	i40e_flush(hw);

}

}





#ifdef CONFIG_PCI_IOV

#ifdef CONFIG_PCI_IOV
@@ -766,13 +761,12 @@ void i40e_free_vfs(struct i40e_pf *pf) 
 **/

 **/

static int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)

static int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs)

{

{

	struct i40e_hw *hw = &pf->hw;

	struct i40e_vf *vfs;

	struct i40e_vf *vfs;

	int i, ret = 0;

	int i, ret = 0;





	/* Disable interrupt 0 so we don't try to handle the VFLR. */

	/* Disable interrupt 0 so we don't try to handle the VFLR. */

	wr32(hw, I40E_PFINT_DYN_CTL0, 0);

	i40e_irq_dynamic_disable_icr0(pf);

	i40e_flush(hw);



	ret = pci_enable_sriov(pf->pdev, num_alloc_vfs);

	ret = pci_enable_sriov(pf->pdev, num_alloc_vfs);

	if (ret) {

	if (ret) {

		dev_err(&pf->pdev->dev,

		dev_err(&pf->pdev->dev,
@@ -810,10 +804,7 @@ static int i40e_alloc_vfs(struct i40e_pf *pf, u16 num_alloc_vfs) 
		i40e_free_vfs(pf);

		i40e_free_vfs(pf);

err_iov:

err_iov:

	/* Re-enable interrupt 0. */

	/* Re-enable interrupt 0. */

	wr32(hw, I40E_PFINT_DYN_CTL0,

	i40e_irq_dynamic_enable_icr0(pf);

	     I40E_PFINT_DYN_CTL0_INTENA_MASK |

	     I40E_PFINT_DYN_CTL0_CLEARPBA_MASK |

	     (I40E_ITR_NONE << I40E_PFINT_DYN_CTL0_ITR_INDX_SHIFT));

	return ret;

	return ret;

}

}