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

Commit e147758d authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: disconnect irqs on shutdown 



Combine the ICR0 shutdown with the standard interrupt shutdown, and
add the interrupt clearing to the PCI shutdown path.

This prevents the driver from allowing stray interrupts or causing
system logs from un-handled interrupts.

Change-ID: I48f6ab95cad7f8ca77c1f26c92a51cc1034ced43
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 85e76d03

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

+8 −6
Original line number Diff line number Diff line
@@ -3842,6 +3842,12 @@ static void i40e_clear_interrupt_scheme(struct i40e_pf *pf) 
{

	int i;



	i40e_stop_misc_vector(pf);

	if (pf->flags & I40E_FLAG_MSIX_ENABLED) {

		synchronize_irq(pf->msix_entries[0].vector);

		free_irq(pf->msix_entries[0].vector, pf);

	}



	i40e_put_lump(pf->irq_pile, 0, I40E_PILE_VALID_BIT-1);

	for (i = 0; i < pf->num_alloc_vsi; i++)

		if (pf->vsi[i])
@@ -9578,12 +9584,6 @@ static void i40e_remove(struct pci_dev *pdev) 
	if (pf->vsi[pf->lan_vsi])

		i40e_vsi_release(pf->vsi[pf->lan_vsi]);



	i40e_stop_misc_vector(pf);

	if (pf->flags & I40E_FLAG_MSIX_ENABLED) {

		synchronize_irq(pf->msix_entries[0].vector);

		free_irq(pf->msix_entries[0].vector, pf);

	}



	/* shutdown and destroy the HMC */

	if (pf->hw.hmc.hmc_obj) {

		ret_code = i40e_shutdown_lan_hmc(&pf->hw);
@@ -9737,6 +9737,8 @@ static void i40e_shutdown(struct pci_dev *pdev) 
	wr32(hw, I40E_PFPM_APM, (pf->wol_en ? I40E_PFPM_APM_APME_MASK : 0));

	wr32(hw, I40E_PFPM_WUFC, (pf->wol_en ? I40E_PFPM_WUFC_MAG_MASK : 0));



	i40e_clear_interrupt_scheme(pf);



	if (system_state == SYSTEM_POWER_OFF) {

		pci_wake_from_d3(pdev, pf->wol_en);

		pci_set_power_state(pdev, PCI_D3hot);