Commit 2e7256f1 authored by Sasha Neftin's avatar Sasha Neftin Committed by David S. Miller
Browse files

e1000e: Check the PCIm state 



Complete to commit def4ec6d ("e1000e: PCIm function state support")
Check the PCIm state only on CSME systems. There is no point to do this
check on non CSME systems.
This patch fixes a generation a false-positive warning:
"Error in exiting dmoff"

Fixes: def4ec6d ("e1000e: PCIm function state support")
Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarDvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd7ce282

drivers/net/ethernet/intel/e1000e/netdev.c

+13 −11
Original line number Diff line number Diff line
@@ -5223,6 +5223,7 @@ static void e1000_watchdog_task(struct work_struct *work) 
			pm_runtime_resume(netdev->dev.parent);



			/* Checking if MAC is in DMoff state*/

			if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {

				pcim_state = er32(STATUS);

				while (pcim_state & E1000_STATUS_PCIM_STATE) {

					if (tries++ == dmoff_exit_timeout) {
@@ -5236,6 +5237,7 @@ static void e1000_watchdog_task(struct work_struct *work) 
					if (!(pcim_state & E1000_STATUS_PCIM_STATE))

						e1000_phy_hw_reset(&adapter->hw);

				}

			}



			/* update snapshot of PHY registers on LSC */

			e1000_phy_read_status(adapter);