From: Jeff Kirsher <jeffrey.t.kirsher@intel•com>
To: davem@davemloft•net
Cc: netdev@vger•kernel.org, gospo@redhat•com,
Alexander Duyck <alexander.h.duyck@intel•com>,
Jeff Kirsher <jeffrey.t.kirsher@intel•com>
Subject: [net-next-2.6 PATCH 12/15] igb: move the generic copper link setup code into e1000_phy.c
Date: Mon, 05 Oct 2009 09:35:03 -0700 [thread overview]
Message-ID: <20091005163502.32487.1493.stgit@localhost.localdomain> (raw)
In-Reply-To: <20091005163058.32487.10125.stgit@localhost.localdomain>
From: Alexander Duyck <alexander.h.duyck@intel•com>
This patch moves the generic portion of the copper link setup into a
seperate function in e1000_phy.c. This helps to reduce the size of
copper_link_setup_82575 and make it a bit more readable.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel•com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel•com>
---
drivers/net/igb/e1000_82575.c | 40 +--------------------------
drivers/net/igb/e1000_phy.c | 61 ++++++++++++++++++++++++++++++++++++++++-
drivers/net/igb/e1000_phy.h | 2 +
3 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
index 45063c2..5d345e3 100644
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
@@ -907,7 +907,6 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
{
u32 ctrl;
s32 ret_val;
- bool link;
ctrl = rd32(E1000_CTRL);
ctrl |= E1000_CTRL_SLU;
@@ -940,44 +939,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
if (ret_val)
goto out;
- if (hw->mac.autoneg) {
- /*
- * Setup autoneg and flow control advertisement
- * and perform autonegotiation.
- */
- ret_val = igb_copper_link_autoneg(hw);
- if (ret_val)
- goto out;
- } else {
- /*
- * PHY will be set to 10H, 10F, 100H or 100F
- * depending on user settings.
- */
- hw_dbg("Forcing Speed and Duplex\n");
- ret_val = hw->phy.ops.force_speed_duplex(hw);
- if (ret_val) {
- hw_dbg("Error Forcing Speed and Duplex\n");
- goto out;
- }
- }
-
- /*
- * Check link status. Wait up to 100 microseconds for link to become
- * valid.
- */
- ret_val = igb_phy_has_link(hw, COPPER_LINK_UP_LIMIT, 10, &link);
- if (ret_val)
- goto out;
-
- if (link) {
- hw_dbg("Valid link established!!!\n");
- /* Config the MAC and PHY after link is up */
- igb_config_collision_dist(hw);
- ret_val = igb_config_fc_after_link_up(hw);
- } else {
- hw_dbg("Unable to establish link!!!\n");
- }
-
+ ret_val = igb_setup_copper_link(hw);
out:
return ret_val;
}
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c
index d4c928c..b27275d 100644
--- a/drivers/net/igb/e1000_phy.c
+++ b/drivers/net/igb/e1000_phy.c
@@ -669,7 +669,7 @@ out:
* and restart the negotiation process between the link partner. If
* autoneg_wait_to_complete, then wait for autoneg to complete before exiting.
**/
-s32 igb_copper_link_autoneg(struct e1000_hw *hw)
+static s32 igb_copper_link_autoneg(struct e1000_hw *hw)
{
struct e1000_phy_info *phy = &hw->phy;
s32 ret_val;
@@ -893,6 +893,65 @@ out:
}
/**
+ * igb_setup_copper_link - Configure copper link settings
+ * @hw: pointer to the HW structure
+ *
+ * Calls the appropriate function to configure the link for auto-neg or forced
+ * speed and duplex. Then we check for link, once link is established calls
+ * to configure collision distance and flow control are called. If link is
+ * not established, we return -E1000_ERR_PHY (-2).
+ **/
+s32 igb_setup_copper_link(struct e1000_hw *hw)
+{
+ s32 ret_val;
+ bool link;
+
+
+ if (hw->mac.autoneg) {
+ /*
+ * Setup autoneg and flow control advertisement and perform
+ * autonegotiation.
+ */
+ ret_val = igb_copper_link_autoneg(hw);
+ if (ret_val)
+ goto out;
+ } else {
+ /*
+ * PHY will be set to 10H, 10F, 100H or 100F
+ * depending on user settings.
+ */
+ hw_dbg("Forcing Speed and Duplex\n");
+ ret_val = hw->phy.ops.force_speed_duplex(hw);
+ if (ret_val) {
+ hw_dbg("Error Forcing Speed and Duplex\n");
+ goto out;
+ }
+ }
+
+ /*
+ * Check link status. Wait up to 100 microseconds for link to become
+ * valid.
+ */
+ ret_val = igb_phy_has_link(hw,
+ COPPER_LINK_UP_LIMIT,
+ 10,
+ &link);
+ if (ret_val)
+ goto out;
+
+ if (link) {
+ hw_dbg("Valid link established!!!\n");
+ igb_config_collision_dist(hw);
+ ret_val = igb_config_fc_after_link_up(hw);
+ } else {
+ hw_dbg("Unable to establish link!!!\n");
+ }
+
+out:
+ return ret_val;
+}
+
+/**
* igb_phy_force_speed_duplex_igp - Force speed/duplex for igp PHY
* @hw: pointer to the HW structure
*
diff --git a/drivers/net/igb/e1000_phy.h b/drivers/net/igb/e1000_phy.h
index 4c49803..adb9436 100644
--- a/drivers/net/igb/e1000_phy.h
+++ b/drivers/net/igb/e1000_phy.h
@@ -43,7 +43,6 @@ enum e1000_smart_speed {
s32 igb_check_downshift(struct e1000_hw *hw);
s32 igb_check_reset_block(struct e1000_hw *hw);
-s32 igb_copper_link_autoneg(struct e1000_hw *hw);
s32 igb_copper_link_setup_igp(struct e1000_hw *hw);
s32 igb_copper_link_setup_m88(struct e1000_hw *hw);
s32 igb_phy_force_speed_duplex_igp(struct e1000_hw *hw);
@@ -57,6 +56,7 @@ s32 igb_phy_sw_reset(struct e1000_hw *hw);
s32 igb_phy_hw_reset(struct e1000_hw *hw);
s32 igb_read_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 *data);
s32 igb_set_d3_lplu_state(struct e1000_hw *hw, bool active);
+s32 igb_setup_copper_link(struct e1000_hw *hw);
s32 igb_write_phy_reg_igp(struct e1000_hw *hw, u32 offset, u16 data);
s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations,
u32 usec_interval, bool *success);
next prev parent reply other threads:[~2009-10-05 16:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-05 16:31 [net-next-2.6 PATCH 01/15] igb: remove unused temp variable from stats clearing path Jeff Kirsher
2009-10-05 16:31 ` [net-next-2.6 PATCH 02/15] igb: update comments for serdes config and update to handle duplex Jeff Kirsher
2009-10-06 22:20 ` David Miller
2009-10-05 16:32 ` [net-next-2.6 PATCH 03/15] igb: update the approach taken to acquiring and releasing the phy lock Jeff Kirsher
2009-10-06 22:20 ` David Miller
2009-10-05 16:32 ` [net-next-2.6 PATCH 04/15] igb: add locking to reads of the i2c interface Jeff Kirsher
2009-10-06 22:20 ` David Miller
2009-10-05 16:32 ` [net-next-2.6 PATCH 05/15] igb: add combined function for setting rar and pool bits Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:33 ` [net-next-2.6 PATCH 06/15] igb: make use of the uta to allow for promiscous mode filter Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:33 ` [net-next-2.6 PATCH 07/15] igb: add support for 82576NS SerDes adapter Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:33 ` [net-next-2.6 PATCH 08/15] igb: add function to handle mailbox lock Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:34 ` [net-next-2.6 PATCH 09/15] igb: fix a few items where weren't correctly setup for mbx timeout Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:34 ` [net-next-2.6 PATCH 10/15] igb: change how we handle alternate mac addresses Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:34 ` [net-next-2.6 PATCH 11/15] igb: remove microwire support from igb Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:35 ` Jeff Kirsher [this message]
2009-10-06 22:21 ` [net-next-2.6 PATCH 12/15] igb: move the generic copper link setup code into e1000_phy.c David Miller
2009-10-05 16:35 ` [net-next-2.6 PATCH 13/15] igb: add code to retry a phy read in the event of failure on link check Jeff Kirsher
2009-10-06 22:21 ` David Miller
2009-10-05 16:35 ` [net-next-2.6 PATCH 14/15] igb: add additional error handling to the phy code Jeff Kirsher
2009-10-06 22:22 ` David Miller
2009-10-05 16:36 ` [net-next-2.6 PATCH 15/15] igb: add flushes between RAR writes when setting mac address Jeff Kirsher
2009-10-06 22:22 ` David Miller
2009-10-06 22:20 ` [net-next-2.6 PATCH 01/15] igb: remove unused temp variable from stats clearing path David Miller
2009-10-06 22:20 ` David Miller
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=20091005163502.32487.1493.stgit@localhost.localdomain \
--to=jeffrey.t.kirsher@intel$(echo .)com \
--cc=alexander.h.duyck@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=gospo@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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