aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/hw.h
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2009-12-08 02:28:20 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-08 23:10:12 -0500
commit3421eecdee750bafc78b12ac25b3e980195265eb (patch)
tree40df8a228f3971487a3f48bd1e880df1f88d5861 /drivers/net/e1000e/hw.h
parent0781895067444db98050a1537bafbc7a0235ec9f (diff)
e1000e: only perform ESB2 MDIC workaround on certain configurations
A workaround added for all ESB2 devices (adds a delay for all MDIC accesses which resolves an issue with the MDIC ready bit being set prematurely) is applicable only to devices in which the MAC-PHY interconnect is not operating in a certain mode with in-band MDIO. Check the control register for the operating mode and enable the workaround accordingly. 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/hw.h')
-rw-r--r--drivers/net/e1000e/hw.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 5ed17889e64d..2784cf44a6f3 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -900,6 +900,10 @@ struct e1000_dev_spec_82571 {
900 u32 smb_counter; 900 u32 smb_counter;
901}; 901};
902 902
903struct e1000_dev_spec_80003es2lan {
904 bool mdic_wa_enable;
905};
906
903struct e1000_shadow_ram { 907struct e1000_shadow_ram {
904 u16 value; 908 u16 value;
905 bool modified; 909 bool modified;
@@ -928,6 +932,7 @@ struct e1000_hw {
928 932
929 union { 933 union {
930 struct e1000_dev_spec_82571 e82571; 934 struct e1000_dev_spec_82571 e82571;
935 struct e1000_dev_spec_80003es2lan e80003es2lan;
931 struct e1000_dev_spec_ich8lan ich8lan; 936 struct e1000_dev_spec_ich8lan ich8lan;
932 } dev_spec; 937 } dev_spec;
933}; 938};