Commit 27d240fd authored Nov 04, 2011 by stephen hemminger Committed by David S. Miller Nov 04, 2011

sky2: fix regression on Yukon Optima



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>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4b6cc728

drivers/net/ethernet/marvell/sky2.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -366,17 +366,6 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
		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;