sky2: gigabit full duplex autonegotiate
Subsystems (2)
PATCH 1/8 sky2: gigabit full duplex autonegotiate
(vger gagged on the quilt version of these patches)
Look at the registers correctly, when doing gigabit full duplex. Need to look for link partner result.
Signed-off-by Stephen Hemminger <[email protected]>
--- drivers/net/sky2.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/net/sky2.c +20 -9
@@ -1624,22 +1624,33 @@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", - sky2->netdev->name); -return -1 ; - } -if (!(aux &PHY_M_PS_SPDUP_RES )) { printk(KERN_ERR PFX "%s: speed/duplex mismatch", 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 (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 ; + } + +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 )