lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

igb: add link check function

Browse Source 
Add a link check function to contain all activities related to verifying
that the link is present.  The current approach is a bit cludgy and needs
to be cleaned up.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck
2009-02-06 23:16:24 +00:00
committed by David S. Miller
parent aed5dec370
commit 4d6b725e4d
1 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/net/igb/igb_main.c
View File

@@ -2260,6 +2260,46 @@ static void igb_update_phy_info(unsigned long data)
igb_get_phy_info(&adapter->hw); igb_get_phy_info(&adapter->hw);
} }
/**
* igb_has_link - check shared code for link and determine up/down
* @adapter: pointer to driver private info
**/
static bool igb_has_link(struct igb_adapter *adapter)
{
struct e1000_hw *hw = &adapter->hw;
bool link_active = false;
s32 ret_val = 0;
/* get_link_status is set on LSC (link status) interrupt or
* rx sequence error interrupt. get_link_status will stay
* false until the e1000_check_for_link establishes link
* for copper adapters ONLY
*/
switch (hw->phy.media_type) {
case e1000_media_type_copper:
if (hw->mac.get_link_status) {
ret_val = hw->mac.ops.check_for_link(hw);
link_active = !hw->mac.get_link_status;
} else {
link_active = true;
}
break;
case e1000_media_type_fiber:
ret_val = hw->mac.ops.check_for_link(hw);
link_active = !!(rd32(E1000_STATUS) & E1000_STATUS_LU);
break;
case e1000_media_type_internal_serdes:
ret_val = hw->mac.ops.check_for_link(hw);
link_active = hw->mac.serdes_has_link;
break;
default:
case e1000_media_type_unknown:
break;
}
return link_active;
}
/** /**
* igb_watchdog - Timer Call-back * igb_watchdog - Timer Call-back
* @data: pointer to adapter cast into an unsigned long * @data: pointer to adapter cast into an unsigned long
@@ -2285,25 +2325,10 @@ static void igb_watchdog_task(struct work_struct *work)
s32 ret_val; s32 ret_val;
int i; int i;
if ((netif_carrier_ok(netdev)) && link = igb_has_link(adapter);
(rd32(E1000_STATUS) & E1000_STATUS_LU)) if ((netif_carrier_ok(netdev)) && link)
goto link_up; goto link_up;
ret_val = hw->mac.ops.check_for_link(&adapter->hw);
if ((ret_val == E1000_ERR_PHY) &&
(hw->phy.type == e1000_phy_igp_3) &&
(rd32(E1000_CTRL) &
E1000_PHY_CTRL_GBE_DISABLE))
dev_info(&adapter->pdev->dev,
"Gigabit has been disabled, downgrading speed\n");
if ((hw->phy.media_type == e1000_media_type_internal_serdes) &&
!(rd32(E1000_TXCW) & E1000_TXCW_ANE))
link = mac->serdes_has_link;
else
link = rd32(E1000_STATUS) &
E1000_STATUS_LU;
if (link) { if (link) {
if (!netif_carrier_ok(netdev)) { if (!netif_carrier_ok(netdev)) {
u32 ctrl; u32 ctrl;