Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0ed5459 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] sky2: gigabit full duplex negotiation



Look at the registers correctly, when doing gigabit full duplex.
Need to look for link partner result.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 0ba8821b
Loading
Loading
Loading
Loading
+20 −9
Original line number Diff line number Diff line
@@ -1624,22 +1624,33 @@ static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux)
		return -1;
	}

	if (hw->chip_id != CHIP_ID_YUKON_FE &&
	    gm_phy_read(hw, port, PHY_MARV_1000T_STAT) & PHY_B_1000S_MSF) {
		printk(KERN_ERR PFX "%s: master/slave fault",
	if (!(aux & PHY_M_PS_SPDUP_RES)) {
		printk(KERN_ERR PFX "%s: speed/duplex mismatch",
		       sky2->netdev->name);
		return -1;
	}

	if (!(aux & PHY_M_PS_SPDUP_RES)) {
		printk(KERN_ERR PFX "%s: speed/duplex mismatch",
	sky2->speed = sky2_phy_speed(hw, aux);
	if (sky2->speed == SPEED_1000) {
		u16 ctl2 = gm_phy_read(hw, port, PHY_MARV_1000T_CTRL);
		u16 lpa2 = gm_phy_read(hw, port, PHY_MARV_1000T_STAT);
		if (lpa2  & PHY_B_1000S_MSF) {
			printk(KERN_ERR PFX "%s: master/slave fault",
			       sky2->netdev->name);
			return -1;
		}

	sky2->duplex = (aux & PHY_M_PS_FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF;

	sky2->speed = sky2_phy_speed(hw, aux);
		if ((ctl2 & PHY_M_1000C_AFD) && (lpa2 & PHY_B_1000S_LP_FD))
			sky2->duplex = DUPLEX_FULL;
		else
			sky2->duplex = DUPLEX_HALF;
	} else {
		u16 adv = gm_phy_read(hw, port, PHY_MARV_AUNE_ADV);
		if ((aux & adv) & PHY_AN_FULL)
			sky2->duplex = DUPLEX_FULL;
		else
			sky2->duplex = DUPLEX_HALF;
	}

	/* Pause bits are offset (9..8) */
	if (hw->chip_id == CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)