Skip to content

DEV-7265: marvell10g_ptp - enable autoneg once M unit is powered up (errata) #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shmuelhazan merged 1 commit into from
May 7, 2025
Merged

DEV-7265: marvell10g_ptp - enable autoneg once M unit is powered up (errata) #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions drivers/net/phy/marvell10g_ptp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ enum {
MV_PMA_XG_EXT_STATUS_PTP_UNSUPP = BIT(12),

/* Vendor2 MMD registers */
MV_V2_SLC_CFG_GEN = 0x8000,
MV_V2_SLC_CFG_GEN_DEF_VAL = 0x7e50000f,
MV_V2_SLC_CFG_GEN_WMC_ANEG_EN = BIT(23),
MV_V2_SLC_CFG_GEN_SMC_ANEG_EN = BIT(24),
MV_V2_MODE_CFG = 0xf000,
MV_V2_MODE_CFG_M_UNIT_PWRUP = BIT(12),

Expand Down Expand Up @@ -140,12 +144,29 @@ struct mv3310_ptp_priv *mv3310_ptp_probe(struct phy_device *phydev)

int mv3310_ptp_power_up(struct phy_device *phydev)
{
int ret;

if (!mv3310_is_ptp_supported(phydev))
return 0;

/* Enable M unit used for PTP */
return phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_MODE_CFG,
MV_V2_MODE_CFG_M_UNIT_PWRUP);
ret = phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, MV_V2_MODE_CFG,
MV_V2_MODE_CFG_M_UNIT_PWRUP);
if (ret < 0)
return ret;

/* PHY Errata section 4.4: after the M unit is powered up
auto-negotiation is disabled by default. Enable:
* WMC - auto negotiation for wire mac
* SMC - auto negotiation for system mac */
ret = mv3310_write_ptp_reg(phydev, MV_V2_SLC_CFG_GEN,
MV_V2_SLC_CFG_GEN_DEF_VAL |
MV_V2_SLC_CFG_GEN_WMC_ANEG_EN |
MV_V2_SLC_CFG_GEN_SMC_ANEG_EN);
if (ret < 0)
return ret;

return 0;
}

int mv3310_ptp_power_down(struct phy_device *phydev)
Expand Down