1 files changed, 18 insertions, 14 deletions

diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
index e3f4aeefeae2..d59a99ae44be 100644
--- a/drivers/net/e1000e/es2lan.c
+++ b/drivers/net/e1000e/es2lan.c
@@ -178,6 +178,10 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
          * for setting word_size.
          */
         size += NVM_WORD_SIZE_BASE_SHIFT;
+
+        /* EEPROM access above 16k is unsupported */
+        if (size > 14)
+                size = 14;
         nvm->word_size  = 1 << size;
 
         return 0;
@@ -234,7 +238,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
         return 0;
 }
 
-static s32 e1000_get_invariants_80003es2lan(struct e1000_adapter *adapter)
+static s32 e1000_get_variants_80003es2lan(struct e1000_adapter *adapter)
 {
         struct e1000_hw *hw = &adapter->hw;
         s32 rc;
@@ -788,16 +792,16 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
         ret_val = e1000e_setup_link(hw);
 
         /* Set the transmit descriptor write-back policy */
-        reg_data = er32(TXDCTL);
+        reg_data = er32(TXDCTL(0));
         reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
-        ew32(TXDCTL, reg_data);
+        ew32(TXDCTL(0), reg_data);
 
         /* ...for both queues. */
-        reg_data = er32(TXDCTL1);
+        reg_data = er32(TXDCTL(1));
         reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
                    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
-        ew32(TXDCTL1, reg_data);
+        ew32(TXDCTL(1), reg_data);
 
         /* Enable retransmit on late collisions */
         reg_data = er32(TCTL);
@@ -842,29 +846,29 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
         u32 reg;
 
         /* Transmit Descriptor Control 0 */
-        reg = er32(TXDCTL);
+        reg = er32(TXDCTL(0));
         reg |= (1 << 22);
-        ew32(TXDCTL, reg);
+        ew32(TXDCTL(0), reg);
 
         /* Transmit Descriptor Control 1 */
-        reg = er32(TXDCTL1);
+        reg = er32(TXDCTL(1));
         reg |= (1 << 22);
-        ew32(TXDCTL1, reg);
+        ew32(TXDCTL(1), reg);
 
         /* Transmit Arbitration Control 0 */
-        reg = er32(TARC0);
+        reg = er32(TARC(0));
         reg &= ~(0xF << 27); /* 30:27 */
         if (hw->phy.media_type != e1000_media_type_copper)
                 reg &= ~(1 << 20);
-        ew32(TARC0, reg);
+        ew32(TARC(0), reg);
 
         /* Transmit Arbitration Control 1 */
-        reg = er32(TARC1);
+        reg = er32(TARC(1));
         if (er32(TCTL) & E1000_TCTL_MULR)
                 reg &= ~(1 << 28);
         else
                 reg |= (1 << 28);
-        ew32(TARC1, reg);
+        ew32(TARC(1), reg);
 }
 
 /**
@@ -1239,7 +1243,7 @@ struct e1000_info e1000_es2_info = {
                                   | FLAG_DISABLE_FC_PAUSE_TIME /* errata */
                                   | FLAG_TIPG_MEDIUM_FOR_80003ESLAN,
         .pba                    = 38,
-        .get_invariants         = e1000_get_invariants_80003es2lan,
+        .get_variants           = e1000_get_variants_80003es2lan,
         .mac_ops                = &es2_mac_ops,
         .phy_ops                = &es2_phy_ops,
         .nvm_ops                = &es2_nvm_ops,