| Message ID | 20111104151717.0f4666ac@nehalam.linuxnetplumber.net |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Stephen Hemminger <shemminger@vyatta.com> Date: Fri, 4 Nov 2011 15:17:17 -0700 > Changes to support other Optima types, introduced an accidental > regression that caused 88E8059 to come up in 10Mbit/sec. > > The Yukon Optima supports a reverse auto-negotiation feature that > was incorrectly setup, and not needed. The feature could be used to > allow wake-on-lan at higher speeds. But doing it correctly would require > other changes to initialization. > > Reported-by: Pavel Mateja <pavel@netsafe.cz> > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> > > --- > This version is for current driver organization (post 3.1). > Same fix applies but to drivers/net/sky2.c in -stable. Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/drivers/net/ethernet/marvell/sky2.c 2011-11-02 15:38:11.677011133 -0700 +++ b/drivers/net/ethernet/marvell/sky2.c 2011-11-04 15:01:51.310888300 -0700 @@ -366,17 +366,6 @@ static void sky2_phy_init(struct sky2_hw gm_phy_write(hw, port, PHY_MARV_FE_SPEC_2, spec); } } else { - if (hw->chip_id >= CHIP_ID_YUKON_OPT) { - u16 ctrl2 = gm_phy_read(hw, port, PHY_MARV_EXT_CTRL_2); - - /* enable PHY Reverse Auto-Negotiation */ - ctrl2 |= 1u << 13; - - /* Write PHY changes (SW-reset must follow) */ - gm_phy_write(hw, port, PHY_MARV_EXT_CTRL_2, ctrl2); - } - - /* disable energy detect */ ctrl &= ~PHY_M_PC_EN_DET_MSK;
Changes to support other Optima types, introduced an accidental regression that caused 88E8059 to come up in 10Mbit/sec. The Yukon Optima supports a reverse auto-negotiation feature that was incorrectly setup, and not needed. The feature could be used to allow wake-on-lan at higher speeds. But doing it correctly would require other changes to initialization. Reported-by: Pavel Mateja <pavel@netsafe.cz> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> --- This version is for current driver organization (post 3.1). Same fix applies but to drivers/net/sky2.c in -stable. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html