From: Selvamani Rajagopal OPEN Alliance 10BASE-T1x Serial Interface specification, table 6 allows vendors to use any memory map select (MMS) value between 10 and 15. This new API interface enables vendor to map one of thes MMS values to MDIO_MMD_VEND1. Reviewed-by: Andrew Lunn Signed-off-by: Selvamani Rajagopal --- changes in v8 - No change changes in v7 - No change changes in v6 - No change changes in v5 - no change changes in v4 - no change changes in v3 - no change changes in v2 - Moved the handling of vendor specific MMS mapping to separate patch - new patch --- drivers/net/ethernet/oa_tc6/oa_tc6.c | 20 +++++++++++++++++--- drivers/net/ethernet/oa_tc6/oa_tc6_std_def.h | 1 + include/linux/oa_tc6.h | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/oa_tc6/oa_tc6.c b/drivers/net/ethernet/oa_tc6/oa_tc6.c index 5cbe049f76ef..c1774fe84ba4 100644 --- a/drivers/net/ethernet/oa_tc6/oa_tc6.c +++ b/drivers/net/ethernet/oa_tc6/oa_tc6.c @@ -250,6 +250,18 @@ static int oa_tc6_update_standard_capability(struct oa_tc6 *tc6) return 0; } +/** + * oa_tc6_set_vend1_mms - Add vendor specific MDIO_MMD to OA TC6 MMS + * mapper value. + * @tc6: oa_tc6 struct. + * @mms: vendor defined MMS value for VEND1 mdio device. + */ +void oa_tc6_set_vend1_mms(struct oa_tc6 *tc6, int mms) +{ + tc6->vend1_mms = mms; +} +EXPORT_SYMBOL_GPL(oa_tc6_set_vend1_mms); + static __be32 oa_tc6_prepare_ctrl_header(u32 addr, u8 length, enum oa_tc6_register_op reg_op) { @@ -577,7 +589,7 @@ static int oa_tc6_mdiobus_write(struct mii_bus *bus, int addr, int regnum, val); } -static int oa_tc6_get_phy_c45_mms(int devnum) +static int oa_tc6_get_phy_c45_mms(struct oa_tc6 *tc6, int devnum) { switch (devnum) { case MDIO_MMD_PCS: @@ -590,6 +602,8 @@ static int oa_tc6_get_phy_c45_mms(int devnum) return OA_TC6_PHY_C45_AUTO_NEG_MMS5; case MDIO_MMD_POWER_UNIT: return OA_TC6_PHY_C45_POWER_UNIT_MMS6; + case MDIO_MMD_VEND1: + return tc6->vend1_mms; default: return -EOPNOTSUPP; } @@ -603,7 +617,7 @@ int oa_tc6_mdiobus_read_c45(struct mii_bus *bus, int addr, int devnum, int mms; int ret; - mms = oa_tc6_get_phy_c45_mms(devnum); + mms = oa_tc6_get_phy_c45_mms(tc6, devnum); if (mms < 0) return mms; @@ -621,7 +635,7 @@ int oa_tc6_mdiobus_write_c45(struct mii_bus *bus, int addr, int devnum, struct oa_tc6 *tc6 = bus->priv; int mms; - mms = oa_tc6_get_phy_c45_mms(devnum); + mms = oa_tc6_get_phy_c45_mms(tc6, devnum); if (mms < 0) return mms; diff --git a/drivers/net/ethernet/oa_tc6/oa_tc6_std_def.h b/drivers/net/ethernet/oa_tc6/oa_tc6_std_def.h index 06fe88f1ed7c..192cc2eaa041 100644 --- a/drivers/net/ethernet/oa_tc6/oa_tc6_std_def.h +++ b/drivers/net/ethernet/oa_tc6/oa_tc6_std_def.h @@ -127,6 +127,7 @@ struct oa_tc6 { u64 tx_hwtstamp_err; u8 ts_ttsc_pending; u8 ttsc_current_id; + int vend1_mms; }; enum oa_tc6_header_type { diff --git a/include/linux/oa_tc6.h b/include/linux/oa_tc6.h index 365abdbf60d3..88e7d5491b20 100644 --- a/include/linux/oa_tc6.h +++ b/include/linux/oa_tc6.h @@ -114,5 +114,6 @@ void oa_tc6_get_ts_stats(struct oa_tc6 *tc6, struct ethtool_ts_stats *stats); int oa_tc6_hwtstamp_set(struct oa_tc6 *tc6, struct kernel_hwtstamp_config *cfg); +void oa_tc6_set_vend1_mms(struct oa_tc6 *tc6, int mms); void oa_tc6_ptp_unregister(struct oa_tc6 *tc6); #endif /* _LINUX_OA_TC6_H */ -- 2.43.0