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

Commit 02b42498 authored by Catherine Sullivan's avatar Catherine Sullivan Committed by Jeff Kirsher
Browse files

i40e: Move function calls to i40e_shutdown instead of i40e_suspend 



We should be stopping the service task and flow director on
shutdown not on suspension.

Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9f7c9448

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

+13 −3
Original line number Diff line number Diff line
@@ -10450,6 +10450,19 @@ 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));



	del_timer_sync(&pf->service_timer);

	cancel_work_sync(&pf->service_task);

	i40e_fdir_teardown(pf);



	rtnl_lock();

	i40e_prep_for_reset(pf);

	rtnl_unlock();



	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) {
@@ -10470,9 +10483,6 @@ static int i40e_suspend(struct pci_dev *pdev, pm_message_t state) 


	set_bit(__I40E_SUSPENDED, &pf->state);

	set_bit(__I40E_DOWN, &pf->state);

	del_timer_sync(&pf->service_timer);

	cancel_work_sync(&pf->service_task);

	i40e_fdir_teardown(pf);



	rtnl_lock();

	i40e_prep_for_reset(pf);