aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/igb/igb_main.c
diff options
context:
space:
mode:
authorAkeem G. Abodunrin <akeem.g.abodunrin@intel.com>2012-07-17 00:51:18 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-07-21 19:07:37 -0400
commit76886596921dd0e058f7f0a16de6151629390d15 (patch)
tree617caca908eae5e4d68e05863640cda5dd94837f /drivers/net/ethernet/intel/igb/igb_main.c
parentb724e9f2505513df1455b03efea166f7dfa0f7d5 (diff)
igb: reset PHY in the link_up process to recover PHY setting after power down.
There was a previous patch to resolve issue with 82576 losing PHY setting after PHY power down. However that previous implementation triggered speed mismatch and occasional link lost. Now, this patch resolves both initial PHY setting and speed mismatch issues. Signed-off-by: Akeem G. Abodunrin <akeem.g.abodunrin@intel.com> Tested-by: Jeff Pieper <jeffrey.e.pieper@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 8adeca9787ca..1050411e7ca3 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1500,11 +1500,12 @@ static void igb_configure(struct igb_adapter *adapter)
1500 **/ 1500 **/
1501void igb_power_up_link(struct igb_adapter *adapter) 1501void igb_power_up_link(struct igb_adapter *adapter)
1502{ 1502{
1503 igb_reset_phy(&adapter->hw);
1504
1503 if (adapter->hw.phy.media_type == e1000_media_type_copper) 1505 if (adapter->hw.phy.media_type == e1000_media_type_copper)
1504 igb_power_up_phy_copper(&adapter->hw); 1506 igb_power_up_phy_copper(&adapter->hw);
1505 else 1507 else
1506 igb_power_up_serdes_link_82575(&adapter->hw); 1508 igb_power_up_serdes_link_82575(&adapter->hw);
1507 igb_reset_phy(&adapter->hw);
1508} 1509}
1509 1510
1510/** 1511/**