]> git.baikalelectronics.ru Git - kernel.git/commit
e1000e: Relax condition to trigger reset for ME workaround
authorPunit Agrawal <punit1.agrawal@toshiba.co.jp>
Fri, 15 May 2020 04:31:27 +0000 (13:31 +0900)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 29 May 2020 03:18:04 +0000 (20:18 -0700)
commitddd9cb5c9864da8d79804d81912012c5e973f102
tree5846e5c502b6ea3295220562360f8b084bec77fe
parent25c37fce85e104057acbb9879fbef8ecad8440b0
e1000e: Relax condition to trigger reset for ME workaround

It's an error if the value of the RX/TX tail descriptor does not match
what was written. The error condition is true regardless the duration
of the interference from ME. But the driver only performs the reset if
E1000_ICH_FWSM_PCIM2PCI_COUNT (2000) iterations of 50us delay have
transpired. The extra condition can lead to inconsistency between the
state of hardware as expected by the driver.

Fix this by dropping the check for number of delay iterations.

While at it, also make __ew32_prepare() static as it's not used
anywhere else.

CC: stable <stable@vger.kernel.org>
Signed-off-by: Punit Agrawal <punit1.agrawal@toshiba.co.jp>
Reviewed-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/e1000e/e1000.h
drivers/net/ethernet/intel/e1000e/netdev.c