]> www.infradead.org Git - users/jedix/linux-maple.git/commit
e1000e: update workaround for 82579 intermittently disabled during S0->Sx
authorBruce Allan <bruce.w.allan@intel.com>
Fri, 16 Dec 2011 00:46:33 +0000 (00:46 +0000)
committerJoe Jin <joe.jin@oracle.com>
Thu, 17 May 2012 07:06:38 +0000 (15:06 +0800)
commitd93509215da4cc8f8c06e2b33144b331556c1847
tree9638e169cd18238dcc99f509bafa35c61a5ab47d
parent5432ffdab8af58d1ef43a1126b5fbd833b967b97
e1000e: update workaround for 82579 intermittently disabled during S0->Sx

The workaround which toggles the LANPHYPC (LAN PHY Power Control) value bit
to force the MAC-Phy interconnect into PCIe mode from SMBus mode during
driver load and resume should always be done except if PHY resets are
blocked by the Manageability Engine (ME).  Previously, the toggle was done
only if PHY resets are blocked and the ME was disabled.

The rest of the patch is just indentation changes as a consequence of the
updated workaround.

(cherry picked from commit 90b82984a4ce689d7b1d7132e50bc61ac6f8b74f)
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/e1000e/ich8lan.c