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

e1000e: Incorrect function pointer set for force_speed_duplex on 82577

Browse Source 
The force_speed_duplex function pointer was incorrectly set.  Instead of
calling the 82577-specific version it was calling the m88 version which,
among other incorrect things, reset the PHY causing autonegotiation to be
re-enabled in the PHY resulting in the link defaulting to half-duplex.
The 82577-specific force_speed_duplex function also had an issue where
it disabled Auto-MDI-X which caused the link to not come up.

Signed-off-by: Bruce Allan <bruce.w.allan@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:
Bruce Allan
2010-05-10 15:01:30 +00:00
committed by David S. Miller
parent 8b802a7e94
commit eab50ffb22
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/e1000e/ich8lan.c
View File

@@ -330,6 +330,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_hw *hw)
phy->ops.get_cable_length = e1000_get_cable_length_82577; phy->ops.get_cable_length = e1000_get_cable_length_82577;
phy->ops.get_info = e1000_get_phy_info_82577; phy->ops.get_info = e1000_get_phy_info_82577;
phy->ops.commit = e1000e_phy_sw_reset; phy->ops.commit = e1000e_phy_sw_reset;
break;
case e1000_phy_82578: case e1000_phy_82578:
phy->ops.check_polarity = e1000_check_polarity_m88; phy->ops.check_polarity = e1000_check_polarity_m88;
phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88; phy->ops.force_speed_duplex = e1000e_phy_force_speed_duplex_m88;

21
drivers/net/e1000e/phy.c
View File

@@ -3116,9 +3116,7 @@ s32 e1000_check_polarity_82577(struct e1000_hw *hw)
* e1000_phy_force_speed_duplex_82577 - Force speed/duplex for I82577 PHY * e1000_phy_force_speed_duplex_82577 - Force speed/duplex for I82577 PHY
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* *
* Calls the PHY setup function to force speed and duplex. Clears the * Calls the PHY setup function to force speed and duplex.
* auto-crossover to force MDI manually. Waits for link and returns
* successful if link up is successful, else -E1000_ERR_PHY (-2).
**/ **/
s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw) s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
{ {
@@ -3137,23 +3135,6 @@ s32 e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw)
if (ret_val) if (ret_val)
goto out; goto out;
/*
* Clear Auto-Crossover to force MDI manually. 82577 requires MDI
* forced whenever speed and duplex are forced.
*/
ret_val = phy->ops.read_reg(hw, I82577_PHY_CTRL_2, &phy_data);
if (ret_val)
goto out;
phy_data &= ~I82577_PHY_CTRL2_AUTO_MDIX;
phy_data &= ~I82577_PHY_CTRL2_FORCE_MDI_MDIX;
ret_val = phy->ops.write_reg(hw, I82577_PHY_CTRL_2, phy_data);
if (ret_val)
goto out;
e_dbg("I82577_PHY_CTRL_2: %X\n", phy_data);
udelay(1); udelay(1);
if (phy->autoneg_wait_to_complete) { if (phy->autoneg_wait_to_complete) {