diff options
author | Bruce Allan <bruce.w.allan@intel.com> | 2009-10-29 13:45:45 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-29 22:48:37 -0700 |
commit | f523d2114e93c559dbcf1b49d46b339fc0eda37a (patch) | |
tree | 9155879569dea7244193e927b1218fd7d6aaf22f /drivers/net/e1000e/defines.h | |
parent | 8fbd962e39517dfb2bfd363eba4b51cdfa299593 (diff) | |
download | blackbird-op-linux-f523d2114e93c559dbcf1b49d46b339fc0eda37a.tar.gz blackbird-op-linux-f523d2114e93c559dbcf1b49d46b339fc0eda37a.zip |
e1000e: config PHY via software after resets
On PCH-based (82577/82578) and some ICH8-based parts (82566) there is an
issue with the hardware automatically configuring the PHY with contents
from the EEPROM after the PHY is reset, so do the configuration by the
driver instead. This was already similarly done for some 82566 parts in
e1000_phy_hw_reset_ich8lan() but needs to be done after other resets,
so move the PHY configuration code to its own function and call after
all PHY resets.
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000e/defines.h')
-rw-r--r-- | drivers/net/e1000e/defines.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/e1000e/defines.h b/drivers/net/e1000e/defines.h index c0f185beb8bc..4741ef9ec385 100644 --- a/drivers/net/e1000e/defines.h +++ b/drivers/net/e1000e/defines.h @@ -347,6 +347,7 @@ /* Extended Configuration Control and Size */ #define E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP 0x00000020 #define E1000_EXTCNF_CTRL_LCD_WRITE_ENABLE 0x00000001 +#define E1000_EXTCNF_CTRL_OEM_WRITE_ENABLE 0x00000008 #define E1000_EXTCNF_CTRL_SWFLAG 0x00000020 #define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_MASK 0x00FF0000 #define E1000_EXTCNF_SIZE_EXT_PCIE_LENGTH_SHIFT 16 |