Commit 1d96b12b authored by Scott Feldman's avatar Scott Feldman Committed by Stephen Hemminger

[e1000] make function our of setting media type

* Consolidate code and make function out of setting media type.
parent 8bef0b6b
...@@ -249,6 +249,46 @@ e1000_set_mac_type(struct e1000_hw *hw) ...@@ -249,6 +249,46 @@ e1000_set_mac_type(struct e1000_hw *hw)
return E1000_SUCCESS; return E1000_SUCCESS;
} }
/*****************************************************************************
* Set media type and TBI compatibility.
*
* hw - Struct containing variables accessed by shared code
* **************************************************************************/
void
e1000_set_media_type(struct e1000_hw *hw)
{
uint32_t status;
DEBUGFUNC("e1000_set_media_type");
if(hw->mac_type != e1000_82543) {
/* tbi_compatibility is only valid on 82543 */
hw->tbi_compatibility_en = FALSE;
}
switch (hw->device_id) {
case E1000_DEV_ID_82545GM_SERDES:
case E1000_DEV_ID_82546GB_SERDES:
hw->media_type = e1000_media_type_internal_serdes;
break;
default:
if(hw->mac_type >= e1000_82543) {
status = E1000_READ_REG(hw, STATUS);
if(status & E1000_STATUS_TBIMODE) {
hw->media_type = e1000_media_type_fiber;
/* tbi_compatibility not valid on fiber */
hw->tbi_compatibility_en = FALSE;
} else {
hw->media_type = e1000_media_type_copper;
}
} else {
/* This is an 82542 (fiber only) */
hw->media_type = e1000_media_type_fiber;
}
}
}
/****************************************************************************** /******************************************************************************
* Reset the transmit and receive units; mask and clear all interrupts. * Reset the transmit and receive units; mask and clear all interrupts.
* *
...@@ -404,7 +444,7 @@ e1000_reset_hw(struct e1000_hw *hw) ...@@ -404,7 +444,7 @@ e1000_reset_hw(struct e1000_hw *hw)
int32_t int32_t
e1000_init_hw(struct e1000_hw *hw) e1000_init_hw(struct e1000_hw *hw)
{ {
uint32_t ctrl, status; uint32_t ctrl;
uint32_t i; uint32_t i;
int32_t ret_val; int32_t ret_val;
uint16_t pcix_cmd_word; uint16_t pcix_cmd_word;
...@@ -421,25 +461,8 @@ e1000_init_hw(struct e1000_hw *hw) ...@@ -421,25 +461,8 @@ e1000_init_hw(struct e1000_hw *hw)
return ret_val; return ret_val;
} }
/* Set the Media Type and exit with error if it is not valid. */ /* Set the media type and TBI compatibility */
if(hw->mac_type != e1000_82543) { e1000_set_media_type(hw);
/* tbi_compatibility is only valid on 82543 */
hw->tbi_compatibility_en = FALSE;
}
if(hw->mac_type >= e1000_82543) {
status = E1000_READ_REG(hw, STATUS);
if(status & E1000_STATUS_TBIMODE) {
hw->media_type = e1000_media_type_fiber;
/* tbi_compatibility not valid on fiber */
hw->tbi_compatibility_en = FALSE;
} else {
hw->media_type = e1000_media_type_copper;
}
} else {
/* This is an 82542 (fiber only) */
hw->media_type = e1000_media_type_fiber;
}
/* Disabling VLAN filtering. */ /* Disabling VLAN filtering. */
DEBUGOUT("Initializing the IEEE VLAN\n"); DEBUGOUT("Initializing the IEEE VLAN\n");
......
...@@ -625,18 +625,7 @@ e1000_sw_init(struct e1000_adapter *adapter) ...@@ -625,18 +625,7 @@ e1000_sw_init(struct e1000_adapter *adapter)
(hw->mac_type == e1000_82547_rev_2)) (hw->mac_type == e1000_82547_rev_2))
hw->phy_init_script = 1; hw->phy_init_script = 1;
/* Media type - copper or fiber */ e1000_set_media_type(hw);
if(hw->mac_type >= e1000_82543) {
uint32_t status = E1000_READ_REG(hw, STATUS);
if(status & E1000_STATUS_TBIMODE)
hw->media_type = e1000_media_type_fiber;
else
hw->media_type = e1000_media_type_copper;
} else {
hw->media_type = e1000_media_type_fiber;
}
if(hw->mac_type < e1000_82543) if(hw->mac_type < e1000_82543)
hw->report_tx_early = 0; hw->report_tx_early = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment