Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 41 insertions, 31 deletions

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index aaea41ef794d..8bdcd5f24eff 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
   Intel PRO/1000 Linux driver
-  Copyright(c) 1999 - 2008 Intel Corporation.
+  Copyright(c) 1999 - 2009 Intel Corporation.
 
   This program is free software; you can redistribute it and/or modify it
   under the terms and conditions of the GNU General Public License,
@@ -219,7 +219,7 @@ enum e1e_registers {
         E1000_HICR      = 0x08F00, /* Host Interface Control */
 };
 
-/* RSS registers */
+#define E1000_MAX_PHY_ADDR              4
 
 /* IGP01E1000 Specific Registers */
 #define IGP01E1000_PHY_PORT_CONFIG      0x10 /* Port Config */
@@ -302,6 +302,8 @@ enum e1e_registers {
 #define E1000_KMRNCTRLSTA_OFFSET_SHIFT  16
 #define E1000_KMRNCTRLSTA_REN           0x00200000
 #define E1000_KMRNCTRLSTA_DIAG_OFFSET   0x3    /* Kumeran Diagnostic */
+#define E1000_KMRNCTRLSTA_TIMEOUTS      0x4    /* Kumeran Timeouts */
+#define E1000_KMRNCTRLSTA_INBAND_PARAM  0x9    /* Kumeran InBand Parameters */
 #define E1000_KMRNCTRLSTA_DIAG_NELPBK   0x1000 /* Nearend Loopback mode */
 #define E1000_KMRNCTRLSTA_K1_CONFIG     0x7
 #define E1000_KMRNCTRLSTA_K1_ENABLE     0x140E
@@ -356,6 +358,7 @@ enum e1e_registers {
 #define E1000_DEV_ID_80003ES2LAN_COPPER_SPT     0x10BA
 #define E1000_DEV_ID_80003ES2LAN_SERDES_SPT     0x10BB
 
+#define E1000_DEV_ID_ICH8_82567V_3              0x1501
 #define E1000_DEV_ID_ICH8_IGP_M_AMT             0x1049
 #define E1000_DEV_ID_ICH8_IGP_AMT               0x104A
 #define E1000_DEV_ID_ICH8_IGP_C                 0x104B
@@ -386,6 +389,9 @@ enum e1e_registers {
 
 #define E1000_FUNC_1 1
 
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN0   0
+#define E1000_ALT_MAC_ADDRESS_OFFSET_LAN1   3
+
 enum e1000_mac_type {
         e1000_82571,
         e1000_82572,
@@ -741,48 +747,54 @@ struct e1000_mac_operations {
         s32  (*check_for_link)(struct e1000_hw *);
         s32  (*cleanup_led)(struct e1000_hw *);
         void (*clear_hw_cntrs)(struct e1000_hw *);
+        void (*clear_vfta)(struct e1000_hw *);
         s32  (*get_bus_info)(struct e1000_hw *);
+        void (*set_lan_id)(struct e1000_hw *);
         s32  (*get_link_up_info)(struct e1000_hw *, u16 *, u16 *);
         s32  (*led_on)(struct e1000_hw *);
         s32  (*led_off)(struct e1000_hw *);
-        void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32, u32, u32);
+        void (*update_mc_addr_list)(struct e1000_hw *, u8 *, u32);
         s32  (*reset_hw)(struct e1000_hw *);
         s32  (*init_hw)(struct e1000_hw *);
         s32  (*setup_link)(struct e1000_hw *);
         s32  (*setup_physical_interface)(struct e1000_hw *);
         s32  (*setup_led)(struct e1000_hw *);
+        void (*write_vfta)(struct e1000_hw *, u32, u32);
+        s32  (*read_mac_addr)(struct e1000_hw *);
 };
 
 /* Function pointers for the PHY. */
 struct e1000_phy_operations {
-        s32  (*acquire_phy)(struct e1000_hw *);
+        s32  (*acquire)(struct e1000_hw *);
+        s32  (*cfg_on_link_up)(struct e1000_hw *);
         s32  (*check_polarity)(struct e1000_hw *);
         s32  (*check_reset_block)(struct e1000_hw *);
-        s32  (*commit_phy)(struct e1000_hw *);
+        s32  (*commit)(struct e1000_hw *);
         s32  (*force_speed_duplex)(struct e1000_hw *);
         s32  (*get_cfg_done)(struct e1000_hw *hw);
         s32  (*get_cable_length)(struct e1000_hw *);
-        s32  (*get_phy_info)(struct e1000_hw *);
-        s32  (*read_phy_reg)(struct e1000_hw *, u32, u16 *);
-        s32  (*read_phy_reg_locked)(struct e1000_hw *, u32, u16 *);
-        void (*release_phy)(struct e1000_hw *);
-        s32  (*reset_phy)(struct e1000_hw *);
+        s32  (*get_info)(struct e1000_hw *);
+        s32  (*read_reg)(struct e1000_hw *, u32, u16 *);
+        s32  (*read_reg_locked)(struct e1000_hw *, u32, u16 *);
+        void (*release)(struct e1000_hw *);
+        s32  (*reset)(struct e1000_hw *);
         s32  (*set_d0_lplu_state)(struct e1000_hw *, bool);
         s32  (*set_d3_lplu_state)(struct e1000_hw *, bool);
-        s32  (*write_phy_reg)(struct e1000_hw *, u32, u16);
-        s32  (*write_phy_reg_locked)(struct e1000_hw *, u32, u16);
-        s32  (*cfg_on_link_up)(struct e1000_hw *);
+        s32  (*write_reg)(struct e1000_hw *, u32, u16);
+        s32  (*write_reg_locked)(struct e1000_hw *, u32, u16);
+        void (*power_up)(struct e1000_hw *);
+        void (*power_down)(struct e1000_hw *);
 };
 
 /* Function pointers for the NVM. */
 struct e1000_nvm_operations {
-        s32  (*acquire_nvm)(struct e1000_hw *);
-        s32  (*read_nvm)(struct e1000_hw *, u16, u16, u16 *);
-        void (*release_nvm)(struct e1000_hw *);
-        s32  (*update_nvm)(struct e1000_hw *);
+        s32  (*acquire)(struct e1000_hw *);
+        s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
+        void (*release)(struct e1000_hw *);
+        s32  (*update)(struct e1000_hw *);
         s32  (*valid_led_default)(struct e1000_hw *, u16 *);
-        s32  (*validate_nvm)(struct e1000_hw *);
-        s32  (*write_nvm)(struct e1000_hw *, u16, u16, u16 *);
+        s32  (*validate)(struct e1000_hw *);
+        s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
 };
 
 struct e1000_mac_info {
@@ -807,10 +819,15 @@ struct e1000_mac_info {
         u16 ifs_ratio;
         u16 ifs_step_size;
         u16 mta_reg_count;
+
+        /* Maximum size of the MTA register table in all supported adapters */
+        #define MAX_MTA_REG 128
+        u32 mta_shadow[MAX_MTA_REG];
         u16 rar_entry_count;
 
         u8  forced_speed_duplex;
 
+        bool adaptive_ifs;
         bool arc_subsystem_valid;
         bool autoneg;
         bool autoneg_failed;
@@ -889,10 +906,13 @@ struct e1000_fc_info {
 
 struct e1000_dev_spec_82571 {
         bool laa_is_present;
-        bool alt_mac_addr_is_present;
         u32 smb_counter;
 };
 
+struct e1000_dev_spec_80003es2lan {
+        bool  mdic_wa_enable;
+};
+
 struct e1000_shadow_ram {
         u16  value;
         bool modified;
@@ -921,19 +941,9 @@ struct e1000_hw {
 
         union {
                 struct e1000_dev_spec_82571     e82571;
+                struct e1000_dev_spec_80003es2lan e80003es2lan;
                 struct e1000_dev_spec_ich8lan   ich8lan;
         } dev_spec;
 };
 
-#ifdef DEBUG
-#define hw_dbg(hw, format, arg...) \
-        printk(KERN_DEBUG "%s: " format, e1000e_get_hw_dev_name(hw), ##arg)
-#else
-static inline int __attribute__ ((format (printf, 2, 3)))
-hw_dbg(struct e1000_hw *hw, const char *format, ...)
-{
-        return 0;
-}
-#endif
-
 #endif