mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-23 03:00:04 +07:00
Merge branch 'net-phy-support-1000Base-X-auto-negotiation-for-BCM54616S'
Tao Ren says: ==================== net: phy: support 1000Base-X auto-negotiation for BCM54616S This patch series aims at supporting auto negotiation when BCM54616S is running in 1000Base-X mode: without the patch series, BCM54616S PHY driver would report incorrect link speed in 1000Base-X mode. Patch #1 (of 3) modifies assignment to OR when dealing with dev_flags in phy_attach_direct function, so that dev_flags updated in BCM54616S PHY's probe callback won't be lost. Patch #2 (of 3) adds several genphy_c37_* functions to support clause 37 1000Base-X auto-negotiation, and these functions are called in BCM54616S PHY driver. Patch #3 (of 3) detects BCM54616S PHY's operation mode and calls according genphy_c37_* functions to configure auto-negotiation and parse link attributes (speed, duplex, and etc.) in 1000Base-X mode. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
2ebc499a0f
@ -359,9 +359,9 @@ static int bcm5482_config_init(struct phy_device *phydev)
|
||||
/*
|
||||
* Select 1000BASE-X register set (primary SerDes)
|
||||
*/
|
||||
reg = bcm_phy_read_shadow(phydev, BCM5482_SHD_MODE);
|
||||
bcm_phy_write_shadow(phydev, BCM5482_SHD_MODE,
|
||||
reg | BCM5482_SHD_MODE_1000BX);
|
||||
reg = bcm_phy_read_shadow(phydev, BCM54XX_SHD_MODE);
|
||||
bcm_phy_write_shadow(phydev, BCM54XX_SHD_MODE,
|
||||
reg | BCM54XX_SHD_MODE_1000BX);
|
||||
|
||||
/*
|
||||
* LED1=ACTIVITYLED, LED3=LINKSPD[2]
|
||||
@ -427,12 +427,47 @@ static int bcm5481_config_aneg(struct phy_device *phydev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int bcm54616s_probe(struct phy_device *phydev)
|
||||
{
|
||||
int val, intf_sel;
|
||||
|
||||
val = bcm_phy_read_shadow(phydev, BCM54XX_SHD_MODE);
|
||||
if (val < 0)
|
||||
return val;
|
||||
|
||||
/* The PHY is strapped in RGMII-fiber mode when INTERF_SEL[1:0]
|
||||
* is 01b, and the link between PHY and its link partner can be
|
||||
* either 1000Base-X or 100Base-FX.
|
||||
* RGMII-1000Base-X is properly supported, but RGMII-100Base-FX
|
||||
* support is still missing as of now.
|
||||
*/
|
||||
intf_sel = (val & BCM54XX_SHD_INTF_SEL_MASK) >> 1;
|
||||
if (intf_sel == 1) {
|
||||
val = bcm_phy_read_shadow(phydev, BCM54616S_SHD_100FX_CTRL);
|
||||
if (val < 0)
|
||||
return val;
|
||||
|
||||
/* Bit 0 of the SerDes 100-FX Control register, when set
|
||||
* to 1, sets the MII/RGMII -> 100BASE-FX configuration.
|
||||
* When this bit is set to 0, it sets the GMII/RGMII ->
|
||||
* 1000BASE-X configuration.
|
||||
*/
|
||||
if (!(val & BCM54616S_100FX_MODE))
|
||||
phydev->dev_flags |= PHY_BCM_FLAGS_MODE_1000BX;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int bcm54616s_config_aneg(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
|
||||
/* Aneg firsly. */
|
||||
ret = genphy_config_aneg(phydev);
|
||||
if (phydev->dev_flags & PHY_BCM_FLAGS_MODE_1000BX)
|
||||
ret = genphy_c37_config_aneg(phydev);
|
||||
else
|
||||
ret = genphy_config_aneg(phydev);
|
||||
|
||||
/* Then we can set up the delay. */
|
||||
bcm54xx_config_clock_delay(phydev);
|
||||
@ -440,6 +475,18 @@ static int bcm54616s_config_aneg(struct phy_device *phydev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int bcm54616s_read_status(struct phy_device *phydev)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (phydev->dev_flags & PHY_BCM_FLAGS_MODE_1000BX)
|
||||
err = genphy_c37_read_status(phydev);
|
||||
else
|
||||
err = genphy_read_status(phydev);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int brcm_phy_setbits(struct phy_device *phydev, int reg, int set)
|
||||
{
|
||||
int val;
|
||||
@ -631,6 +678,8 @@ static struct phy_driver broadcom_drivers[] = {
|
||||
.config_aneg = bcm54616s_config_aneg,
|
||||
.ack_interrupt = bcm_phy_ack_intr,
|
||||
.config_intr = bcm_phy_config_intr,
|
||||
.read_status = bcm54616s_read_status,
|
||||
.probe = bcm54616s_probe,
|
||||
}, {
|
||||
.phy_id = PHY_ID_BCM5464,
|
||||
.phy_id_mask = 0xfffffff0,
|
||||
|
||||
@ -1270,7 +1270,7 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
||||
phydev_err(phydev, "error creating 'phy_standalone' sysfs entry\n");
|
||||
}
|
||||
|
||||
phydev->dev_flags = flags;
|
||||
phydev->dev_flags |= flags;
|
||||
|
||||
phydev->interface = interface;
|
||||
|
||||
@ -1607,6 +1607,40 @@ static int genphy_config_advert(struct phy_device *phydev)
|
||||
return changed;
|
||||
}
|
||||
|
||||
/**
|
||||
* genphy_c37_config_advert - sanitize and advertise auto-negotiation parameters
|
||||
* @phydev: target phy_device struct
|
||||
*
|
||||
* Description: Writes MII_ADVERTISE with the appropriate values,
|
||||
* after sanitizing the values to make sure we only advertise
|
||||
* what is supported. Returns < 0 on error, 0 if the PHY's advertisement
|
||||
* hasn't changed, and > 0 if it has changed. This function is intended
|
||||
* for Clause 37 1000Base-X mode.
|
||||
*/
|
||||
static int genphy_c37_config_advert(struct phy_device *phydev)
|
||||
{
|
||||
u16 adv = 0;
|
||||
|
||||
/* Only allow advertising what this PHY supports */
|
||||
linkmode_and(phydev->advertising, phydev->advertising,
|
||||
phydev->supported);
|
||||
|
||||
if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
|
||||
phydev->advertising))
|
||||
adv |= ADVERTISE_1000XFULL;
|
||||
if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
|
||||
phydev->advertising))
|
||||
adv |= ADVERTISE_1000XPAUSE;
|
||||
if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
|
||||
phydev->advertising))
|
||||
adv |= ADVERTISE_1000XPSE_ASYM;
|
||||
|
||||
return phy_modify_changed(phydev, MII_ADVERTISE,
|
||||
ADVERTISE_1000XFULL | ADVERTISE_1000XPAUSE |
|
||||
ADVERTISE_1000XHALF | ADVERTISE_1000XPSE_ASYM,
|
||||
adv);
|
||||
}
|
||||
|
||||
/**
|
||||
* genphy_config_eee_advert - disable unwanted eee mode advertisement
|
||||
* @phydev: target phy_device struct
|
||||
@ -1715,6 +1749,54 @@ int __genphy_config_aneg(struct phy_device *phydev, bool changed)
|
||||
}
|
||||
EXPORT_SYMBOL(__genphy_config_aneg);
|
||||
|
||||
/**
|
||||
* genphy_c37_config_aneg - restart auto-negotiation or write BMCR
|
||||
* @phydev: target phy_device struct
|
||||
*
|
||||
* Description: If auto-negotiation is enabled, we configure the
|
||||
* advertising, and then restart auto-negotiation. If it is not
|
||||
* enabled, then we write the BMCR. This function is intended
|
||||
* for use with Clause 37 1000Base-X mode.
|
||||
*/
|
||||
int genphy_c37_config_aneg(struct phy_device *phydev)
|
||||
{
|
||||
int err, changed;
|
||||
|
||||
if (phydev->autoneg != AUTONEG_ENABLE)
|
||||
return genphy_setup_forced(phydev);
|
||||
|
||||
err = phy_modify(phydev, MII_BMCR, BMCR_SPEED1000 | BMCR_SPEED100,
|
||||
BMCR_SPEED1000);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
changed = genphy_c37_config_advert(phydev);
|
||||
if (changed < 0) /* error */
|
||||
return changed;
|
||||
|
||||
if (!changed) {
|
||||
/* Advertisement hasn't changed, but maybe aneg was never on to
|
||||
* begin with? Or maybe phy was isolated?
|
||||
*/
|
||||
int ctl = phy_read(phydev, MII_BMCR);
|
||||
|
||||
if (ctl < 0)
|
||||
return ctl;
|
||||
|
||||
if (!(ctl & BMCR_ANENABLE) || (ctl & BMCR_ISOLATE))
|
||||
changed = 1; /* do restart aneg */
|
||||
}
|
||||
|
||||
/* Only restart aneg if we are advertising something different
|
||||
* than we were before.
|
||||
*/
|
||||
if (changed > 0)
|
||||
return genphy_restart_aneg(phydev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(genphy_c37_config_aneg);
|
||||
|
||||
/**
|
||||
* genphy_aneg_done - return auto-negotiation status
|
||||
* @phydev: target phy_device struct
|
||||
@ -1886,6 +1968,63 @@ int genphy_read_status(struct phy_device *phydev)
|
||||
}
|
||||
EXPORT_SYMBOL(genphy_read_status);
|
||||
|
||||
/**
|
||||
* genphy_c37_read_status - check the link status and update current link state
|
||||
* @phydev: target phy_device struct
|
||||
*
|
||||
* Description: Check the link, then figure out the current state
|
||||
* by comparing what we advertise with what the link partner
|
||||
* advertises. This function is for Clause 37 1000Base-X mode.
|
||||
*/
|
||||
int genphy_c37_read_status(struct phy_device *phydev)
|
||||
{
|
||||
int lpa, err, old_link = phydev->link;
|
||||
|
||||
/* Update the link, but return if there was an error */
|
||||
err = genphy_update_link(phydev);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
/* why bother the PHY if nothing can have changed */
|
||||
if (phydev->autoneg == AUTONEG_ENABLE && old_link && phydev->link)
|
||||
return 0;
|
||||
|
||||
phydev->duplex = DUPLEX_UNKNOWN;
|
||||
phydev->pause = 0;
|
||||
phydev->asym_pause = 0;
|
||||
|
||||
if (phydev->autoneg == AUTONEG_ENABLE && phydev->autoneg_complete) {
|
||||
lpa = phy_read(phydev, MII_LPA);
|
||||
if (lpa < 0)
|
||||
return lpa;
|
||||
|
||||
linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
|
||||
phydev->lp_advertising, lpa & LPA_LPACK);
|
||||
linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseX_Full_BIT,
|
||||
phydev->lp_advertising, lpa & LPA_1000XFULL);
|
||||
linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT,
|
||||
phydev->lp_advertising, lpa & LPA_1000XPAUSE);
|
||||
linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
|
||||
phydev->lp_advertising,
|
||||
lpa & LPA_1000XPAUSE_ASYM);
|
||||
|
||||
phy_resolve_aneg_linkmode(phydev);
|
||||
} else if (phydev->autoneg == AUTONEG_DISABLE) {
|
||||
int bmcr = phy_read(phydev, MII_BMCR);
|
||||
|
||||
if (bmcr < 0)
|
||||
return bmcr;
|
||||
|
||||
if (bmcr & BMCR_FULLDPLX)
|
||||
phydev->duplex = DUPLEX_FULL;
|
||||
else
|
||||
phydev->duplex = DUPLEX_HALF;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(genphy_c37_read_status);
|
||||
|
||||
/**
|
||||
* genphy_soft_reset - software reset the PHY via BMCR_RESET bit
|
||||
* @phydev: target phy_device struct
|
||||
|
||||
@ -200,9 +200,15 @@
|
||||
#define BCM5482_SHD_SSD 0x14 /* 10100: Secondary SerDes control */
|
||||
#define BCM5482_SHD_SSD_LEDM 0x0008 /* SSD LED Mode enable */
|
||||
#define BCM5482_SHD_SSD_EN 0x0001 /* SSD enable */
|
||||
#define BCM5482_SHD_MODE 0x1f /* 11111: Mode Control Register */
|
||||
#define BCM5482_SHD_MODE_1000BX 0x0001 /* Enable 1000BASE-X registers */
|
||||
|
||||
/* 10011: SerDes 100-FX Control Register */
|
||||
#define BCM54616S_SHD_100FX_CTRL 0x13
|
||||
#define BCM54616S_100FX_MODE BIT(0) /* 100-FX SerDes Enable */
|
||||
|
||||
/* 11111: Mode Control Register */
|
||||
#define BCM54XX_SHD_MODE 0x1f
|
||||
#define BCM54XX_SHD_INTF_SEL_MASK GENMASK(2, 1) /* INTERF_SEL[1:0] */
|
||||
#define BCM54XX_SHD_MODE_1000BX BIT(0) /* Enable 1000-X registers */
|
||||
|
||||
/*
|
||||
* EXPANSION SHADOW ACCESS REGISTERS. (PHY REG 0x15, 0x16, and 0x17)
|
||||
|
||||
@ -1106,6 +1106,10 @@ int genphy_read_mmd_unsupported(struct phy_device *phdev, int devad,
|
||||
int genphy_write_mmd_unsupported(struct phy_device *phdev, int devnum,
|
||||
u16 regnum, u16 val);
|
||||
|
||||
/* Clause 37 */
|
||||
int genphy_c37_config_aneg(struct phy_device *phydev);
|
||||
int genphy_c37_read_status(struct phy_device *phydev);
|
||||
|
||||
/* Clause 45 PHY */
|
||||
int genphy_c45_restart_aneg(struct phy_device *phydev);
|
||||
int genphy_c45_check_and_restart_aneg(struct phy_device *phydev, bool restart);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user