The patch titled
e1000: Allow NVM to setup LPLU for IGP2 and IGP3
has been removed from the -mm tree. Its filename is
e1000-allow-nvm-to-setup-lplu-for-igp2-and-igp3.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: e1000: Allow NVM to setup LPLU for IGP2 and IGP3
From: "Kok, Auke" <auke-jan.h.kok@xxxxxxxxx>
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@xxxxxxxxx>
Signed-off-by: Auke Kok <auke-jan.h.kok@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/e1000/e1000_hw.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff -puN drivers/net/e1000/e1000_hw.c~e1000-allow-nvm-to-setup-lplu-for-igp2-and-igp3 drivers/net/e1000/e1000_hw.c
--- a/drivers/net/e1000/e1000_hw.c~e1000-allow-nvm-to-setup-lplu-for-igp2-and-igp3
+++ a/drivers/net/e1000/e1000_hw.c
@@ -1324,11 +1324,14 @@ e1000_copper_link_igp_setup(struct e1000
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 */
_
Patches currently in -mm which might be from auke-jan.h.kok@xxxxxxxxx are
git-netdev-all.patch
e1000-memory-leak-in-e1000_set_ringparam.patch
e1000-ring-buffers-resources-cleanup.patch
e1000-irq-resources-cleanup.patch
e1000-e1000_probe-resources-cleanup.patch
ixgb-add-pci-error-recovery-callbacks.patch
e100-disable-device-on-pci-error.patch
e1000-disable-device-on-pci-error.patch
e1000_7033_dump_ring.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
