Commit e661414c authored Jul 19, 2018 by Sergey Nemov Committed by Jeff Kirsher Aug 07, 2018

i40e: Remove duplicated prepare call in i40e_shutdown



Function call to i40e_prep_for_reset() is duplicated in
i40e_shutdown routine and gets called before
i40e_enable_mc_magic_wake() which blocks it from being executed
correctly on system reboot or shutdown because adminq is already
disabled by first i40e_prep_for_reset() call.

Two register write calls are also duplicated.

Signed-off-by: Sergey Nemov <sergey.nemov@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent de7de576

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -14353,12 +14353,6 @@ static void i40e_shutdown(struct pci_dev *pdev)

		set_bit(__I40E_SUSPENDED, pf->state);
		set_bit(__I40E_DOWN, pf->state);
		rtnl_lock();
		i40e_prep_for_reset(pf, true);
		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));

		del_timer_sync(&pf->service_timer);
		cancel_work_sync(&pf->service_task);

Admin message