netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Kok, Auke" <auke-jan.h.kok@intel.com>
To: "Garzik, Jeff" <jgarzik@pobox.com>
Cc: netdev@vger.kernel.org, akpm@osdl.org, "Brandeburg,
	Jesse" <jesse.brandeburg@intel.com>,
	"Kok, Auke" <auke-jan.h.kok@intel.com>,
	"Kok, Auke" <auke@foo-projects.org>,
	"Ronciak, John" <john.ronciak@intel.com>
Subject: [PATCH 07/13] e1000: Allow NVM to setup LPLU for IGP2 and IGP3
Date: Wed, 16 Aug 2006 14:56:31 -0700	[thread overview]
Message-ID: <20060816215630.27080.11706.stgit@gitlost.site> (raw)
In-Reply-To: <20060816215336.27080.56147.stgit@gitlost.site>


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>
---

 drivers/net/e1000/e1000_hw.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 583518a..3728f33 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/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 */



--
Auke Kok <auke-jan.h.kok@intel.com>

  parent reply	other threads:[~2006-08-16 21:48 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-16 21:53 [PATCH 00/13] e100, e1000, ixgb fixes Kok, Auke
2006-08-16 21:56 ` [PATCH 01/13] e100: Fix MDIO/MDIO-X Kok, Auke
2006-08-16 21:56 ` [PATCH 02/13] e100: increment version to 3.5.10-k4 Kok, Auke
2006-08-16 21:56 ` [PATCH 03/13] e1000: Same cosmetic fix as earlier sent out for IPV4 Kok, Auke
2006-08-16 21:56 ` [PATCH 04/13] e1000: Remove 0x1000 as supported device Kok, Auke
2006-08-16 21:56 ` [PATCH 05/13] e1000: Explicitly power up the PHY during loopback testing Kok, Auke
2006-08-16 21:56 ` [PATCH 06/13] e1000: explicit locking for two ethtool path functions Kok, Auke
2006-08-16 21:56 ` Kok, Auke [this message]
2006-08-16 21:56 ` [PATCH 08/13] e1000: Force full DMA clocking for 10/100 speed Kok, Auke
2006-08-16 21:56 ` [PATCH 09/13] e1000: Disable aggressive clocking on esb2 with SERDES port Kok, Auke
2006-08-16 21:56 ` [PATCH 10/13] e1000: Increment driver version to 7.1.9-k6 Kok, Auke
2006-08-16 21:56 ` [PATCH 11/13] ixgb: Add CX4 PHY type detection and subdevice ID Kok, Auke
2006-08-16 21:56 ` [PATCH 12/13] ixgb: fix cache miss due to miscalculation Kok, Auke
2006-08-16 21:56 ` [PATCH 13/13] ixgb: Increment version to 1.0.109-k4 Kok, Auke
2006-08-24  4:47 ` [PATCH 00/13] e100, e1000, ixgb fixes Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060816215630.27080.11706.stgit@gitlost.site \
    --to=auke-jan.h.kok@intel.com \
    --cc=akpm@osdl.org \
    --cc=auke@foo-projects.org \
    --cc=jesse.brandeburg@intel.com \
    --cc=jgarzik@pobox.com \
    --cc=john.ronciak@intel.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).