Bläddra i källkod

e1000: Allow NVM to setup LPLU for IGP2 and IGP3

Allow NVM to setup LPLU for IGP2 and IGP3. Only IGP needs LPLU D3
disabled during init here.

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Jeff Kirsher 19 år sedan
förälder
incheckning
c9c1b834c7
1 ändrade filer med 8 tillägg och 5 borttagningar
  1. 8 5
      drivers/net/e1000/e1000_hw.c

+ 8 - 5
drivers/net/e1000/e1000_hw.c

@@ -1324,11 +1324,14 @@ e1000_copper_link_igp_setup(struct e1000_hw *hw)
     E1000_WRITE_REG(hw, LEDCTL, led_ctrl);
     E1000_WRITE_REG(hw, LEDCTL, led_ctrl);
     }
     }
 
 
-    /* disable lplu d3 during driver init */
-    ret_val = e1000_set_d3_lplu_state(hw, FALSE);
-    if (ret_val) {
-        DEBUGOUT("Error Disabling LPLU D3\n");
-        return ret_val;
+    /* The NVM settings will configure LPLU in D3 for IGP2 and IGP3 PHYs */
+    if (hw->phy_type == e1000_phy_igp) {
+        /* disable lplu d3 during driver init */
+        ret_val = e1000_set_d3_lplu_state(hw, FALSE);
+        if (ret_val) {
+            DEBUGOUT("Error Disabling LPLU D3\n");
+            return ret_val;
+        }
     }
     }
 
 
     /* disable lplu d0 during driver init */
     /* disable lplu d0 during driver init */