Add a driver for the Marvell 88Q2110 PHY
Subsystems (3)
v3 cover Add a driver for the Marvell 88Q2110 PHY
Add support for 1000BASE-T1 to the phy-c45 helper and add a first 1000BASE-T1 driver for the Marvell 88Q2110 PHY.
v3:
- Read the BASE-T1 capabilities from the ability register (Andrew)
- Fix several missing return values (Francesco)
- Poll the reset bit to be sure the soft reset was done (Andrew)
- Fix reading the latched link status wrongly (Andrew/Russell)
- Remove probe function (Francesco)
- Add defines for Marvell specific registers (Andrew)
- Move the BASE-T1 ability reading to a separate function (Andrew)
v2:
- Use the same pattern in Kconfig as for 88X2222 (Andrew)
- Sort Kconfig and Makefile entries (Andrew)
- Add generic registers to mdio.h (Andrew)
- Move generic functionality to phy-c45.c (Andrew)
- Document where proprietary registers are used (Andrew)
- Remove unnecessary c45 check (Andrew)
- Remove cable tests which were not implemented (Andrew)
- Remove comma for terminator entry (Francesco)
- Sort include files (Francesco)
- Return phy_write_mmd value in soft_reset (Francesco)
Stefan Eichenberger (5):
net: phy: add registers to support 1000BASE-T1
net: phy: c45: add support for 1000BASE-T1 forced setup
net: phy: c45: add a separate function to read BASE-T1 abilities
net: phy: c45: detect the BASE-T1 speed from the ability register
net: phy: marvell-88q2xxx: add driver for the Marvell 88Q2110 PHY
drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/marvell-88q2xxx.c | 265 ++++++++++++++++++++++++++++++ drivers/net/phy/phy-c45.c | 63 +++++-- include/linux/phy.h | 1 + include/uapi/linux/mdio.h | 18 +- 6 files changed, 339 insertions(+), 15 deletions(-) create mode 100644 drivers/net/phy/marvell-88q2xxx.c
Signature · 1 line
2.39.2
PATCH v3 1/5 net: phy: add registers to support 1000BASE-T1
Add registers and definitions to support 1000BASE-T1. This includes the PCS Control and Status registers (3.2304 and 3.2305) as well as some missing bits on the PMA/PMD extended ability register (1.18) and PMA/PMD CTRL (1.2100) register.
--- include/uapi/linux/mdio.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
include/uapi/linux/mdio.h +17 -1
@@ -82,6 +82,8 @@#define MDIO_AN_10BT1_AN_CTRL 526/* 10BASE-T1 AN control register */ #define MDIO_AN_10BT1_AN_STAT 527/* 10BASE-T1 AN status register */ #define MDIO_PMA_PMD_BT1_CTRL 2100/* BASE-T1 PMA/PMD control register */ +#define MDIO_PCS_1000BT1_CTRL 2304/* 1000BASE-T1 PCS control register */ +#define MDIO_PCS_1000BT1_STAT 2305/* 1000BASE-T1 PCS status register */ /* LASI (Link Alarm Status Interrupt) registers, defined by XENPAK MSA. */ #define MDIO_PMA_LASI_RXCTRL 0x9000/* RX_ALARM control */
@@ -332,6 +334,8 @@#define MDIO_PCS_10T1L_CTRL_RESET 0x8000/* PCS reset */ /* BASE-T1 PMA/PMD extended ability register. */ +#define MDIO_PMA_PMD_BT1_B100_ABLE 0x0001/* 100BASE-T1 Ability */ +#define MDIO_PMA_PMD_BT1_B1000_ABLE 0x0002/* 1000BASE-T1 Ability */ #define MDIO_PMA_PMD_BT1_B10L_ABLE 0x0004/* 10BASE-T1L Ability */ /* BASE-T1 auto-negotiation advertisement register [15:0] */
@@ -373,7 +377,19 @@#define MDIO_AN_10BT1_AN_STAT_LPA_EEE_T1L 0x4000/* 10BASE-T1L LP EEE ability advertisement */ /* BASE-T1 PMA/PMD control register */ -#define MDIO_PMA_PMD_BT1_CTRL_CFG_MST 0x4000/* MASTER-SLAVE config value */ +#define MDIO_PMA_PMD_BT1_CTRL_STRAP 0x000F/* Type selection (Strap) */ +#define MDIO_PMA_PMD_BT1_CTRL_STRAP_B1000 0x0001/* Select 1000BASE-T1 */ +#define MDIO_PMA_PMD_BT1_CTRL_CFG_MST 0x4000/* MASTER-SLAVE config value */ + +/* 1000BASE-T1 PCS control register */ +#define MDIO_PCS_1000BT1_CTRL_LOW_POWER 0x0800/* Low power mode */ +#define MDIO_PCS_1000BT1_CTRL_DISABLE_TX 0x4000/* Global PMA transmit disable */ +#define MDIO_PCS_1000BT1_CTRL_RESET 0x8000/* Software reset value */ + +/* 1000BASE-T1 PCS status register */ +#define MDIO_PCS_1000BT1_STAT_LINK 0x0004/* PCS Link is up */ +#define MDIO_PCS_1000BT1_STAT_FAULT 0x0080/* There is a fault condition */ +/* EEE Supported/Advertisement/LP Advertisement registers. *
Signature · 1 line
2.39.2
Re: [PATCH net-next v3 1/5] net: phy: add registers to support 1000BASE-T1
Quoted 6 lines · Stefan Eichenberger
Add registers and definitions to support 1000BASE-T1. This includes the PCS Control and Status registers (3.2304 and 3.2305) as well as some missing bits on the PMA/PMD extended ability register (1.18) and PMA/PMD CTRL (1.2100) register.
Signed-off-by Stefan Eichenberger <[email protected]>
Andrew
PATCH v3 2/5 net: phy: c45: add support for 1000BASE-T1 forced setup
In reply to Stefan EichenbergerAdd support to force 1000BASE-T1 by setting the correct control bit in the MDIO_MMD_PMA_PMD_BT1_CTRL register.
--- drivers/net/phy/phy-c45.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/phy/phy-c45.c +10 -1
@@ -108,7 +108,7 @@ EXPORT_SYMBOL_GPL(genphy_c45_pma_baset1_setup_master_slave);*/ int genphy_c45_pma_setup_forced (struct phy_device *phydev) { -int ctrl1, ctrl2, ret; +int bt1_ctrl, ctrl1, ctrl2, ret;/* Half duplex is not supported */ if (phydev->duplex !=DUPLEX_FULL )
@@ -176,6 +176,15 @@ int genphy_c45_pma_setup_forced(struct phy_device *phydev) ret =genphy_c45_pma_baset1_setup_master_slave (phydev);if (ret <0 )return ret; + + bt1_ctrl =0 ; +if (phydev->speed ==SPEED_1000 ) + bt1_ctrl =MDIO_PMA_PMD_BT1_CTRL_STRAP_B1000 ; + + ret =phy_modify_mmd (phydev,MDIO_MMD_PMAPMD ,MDIO_PMA_PMD_BT1_CTRL , +MDIO_PMA_PMD_BT1_CTRL_STRAP , bt1_ctrl); +if (ret <0 ) +return ret; }return genphy_c45_an_disable_aneg (phydev);
Signature · 1 line
2.39.2
Re: [PATCH net-next v3 2/5] net: phy: c45: add support for 1000BASE-T1 forced setup
Quoted 4 lines · Stefan Eichenberger
Add support to force 1000BASE-T1 by setting the correct control bit in the
MDIO_MMD_PMA_PMD_BT1_CTRLregister.Signed-off-by Stefan Eichenberger <[email protected]>
Andrew
PATCH v3 3/5 net: phy: c45: add a separate function to read BASE-T1 abilities
In reply to Stefan EichenbergerAdd a separate function to read the BASE-T1 abilities. Some PHYs do not indicate the availability of the extended BASE-T1 ability register, so this function must be called separately.
--- drivers/net/phy/phy-c45.c | 44 +++++++++++++++++++++++++++------------ include/linux/phy.h | 1 + 2 files changed, 32 insertions(+), 13 deletions(-)
drivers/net/phy/phy-c45.c +31 -13
@@ -881,6 +881,36 @@ int genphy_c45_an_config_eee_aneg(struct phy_device *phydev)return genphy_c45_write_eee_adv (phydev, phydev->advertising_eee); } +/** +* genphy_c45_pma_baset1_read_abilities - read supported baset1 link modes from PMA +* @phydev: target phy_device struct +* +* Read the supported link modes from the extended BASE-T1 ability register +*/ +int genphy_c45_pma_baset1_read_abilities (struct phy_device *phydev) +{ +int val; + + val =phy_read_mmd (phydev,MDIO_MMD_PMAPMD ,MDIO_PMA_PMD_BT1 ); +if (val <0 ) +return val; + +linkmode_mod_bit (ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, + phydev->supported, + val &MDIO_PMA_PMD_BT1_B10L_ABLE ); + + val =phy_read_mmd (phydev,MDIO_MMD_AN ,MDIO_AN_T1_STAT ); +if (val <0 ) +return val; + +linkmode_mod_bit (ETHTOOL_LINK_MODE_Autoneg_BIT, + phydev->supported, + val &MDIO_AN_STAT1_ABLE ); + +return 0 ; +} +EXPORT_SYMBOL_GPL (genphy_c45_pma_baset1_read_abilities); +/** * genphy_c45_pma_read_abilities - read supported link modes from PMA * @phydev: target phy_device struct
@@ -977,21 +1007,9 @@ int genphy_c45_pma_read_abilities(struct phy_device *phydev) }if (val &MDIO_PMA_EXTABLE_BT1 ) { - val =phy_read_mmd (phydev,MDIO_MMD_PMAPMD ,MDIO_PMA_PMD_BT1 ); + val =genphy_c45_pma_baset1_read_abilities (phydev);if (val <0 )return val; - -linkmode_mod_bit (ETHTOOL_LINK_MODE_10baseT1L_Full_BIT, - phydev->supported, - val &MDIO_PMA_PMD_BT1_B10L_ABLE ); - - val =phy_read_mmd (phydev,MDIO_MMD_AN ,MDIO_AN_T1_STAT ); -if (val <0 ) -return val; - -linkmode_mod_bit (ETHTOOL_LINK_MODE_Autoneg_BIT, - phydev->supported, - val &MDIO_AN_STAT1_ABLE ); } }
include/linux/phy.h +1 -0
@@ -1826,6 +1826,7 @@ int genphy_c45_an_config_aneg(struct phy_device *phydev);int genphy_c45_an_disable_aneg (struct phy_device *phydev);int genphy_c45_read_mdix (struct phy_device *phydev);int genphy_c45_pma_read_abilities (struct phy_device *phydev); +int genphy_c45_pma_baset1_read_abilities (struct phy_device *phydev);int genphy_c45_read_eee_abilities (struct phy_device *phydev);int genphy_c45_pma_baset1_read_master_slave (struct phy_device *phydev);int genphy_c45_read_status (struct phy_device *phydev);
Signature · 1 line
2.39.2
Re: [PATCH net-next v3 3/5] net: phy: c45: add a separate function to read BASE-T1 abilities
Quoted 5 lines · Stefan Eichenberger
Add a separate function to read the BASE-T1 abilities. Some PHYs do not indicate the availability of the extended BASE-T1 ability register, so this function must be called separately.
Signed-off-by Stefan Eichenberger <[email protected]>
Andrew
PATCH v3 4/5 net: phy: c45: detect the BASE-T1 speed from the ability register
In reply to Stefan EichenbergerRead the ability to do 100BASE-T1 and 1000BASE-T1 from the extended BASE-T1 ability register of the PHY.
--- drivers/net/phy/phy-c45.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/phy/phy-c45.c +8 -0
@@ -899,6 +899,14 @@ int genphy_c45_pma_baset1_read_abilities(struct phy_device *phydev) phydev->supported, val & MDIO_PMA_PMD_BT1_B10L_ABLE); +linkmode_mod_bit (ETHTOOL_LINK_MODE_100baseT1_Full_BIT, + phydev->supported, + val &MDIO_PMA_PMD_BT1_B100_ABLE ); + +linkmode_mod_bit (ETHTOOL_LINK_MODE_1000baseT1_Full_BIT, + phydev->supported, + val &MDIO_PMA_PMD_BT1_B1000_ABLE ); + val =phy_read_mmd (phydev,MDIO_MMD_AN ,MDIO_AN_T1_STAT );if (val <0 )return val;
Signature · 1 line
2.39.2
Re: [PATCH net-next v3 4/5] net: phy: c45: detect the BASE-T1 speed from the ability register
Quoted 4 lines · Stefan Eichenberger
Read the ability to do 100BASE-T1 and 1000BASE-T1 from the extended BASE-T1 ability register of the PHY.
Signed-off-by Stefan Eichenberger <[email protected]>
Andrew
PATCH v3 5/5 net: phy: marvell-88q2xxx: add driver for the Marvell 88Q2110 PHY
In reply to Stefan EichenbergerAdd a driver for the Marvell 88Q2110. This driver allows to detect the link, switch between 100BASE-T1 and 1000BASE-T1 and switch between master and slave mode. Autonegotiation supported by the PHY does not yet work.
--- drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/marvell-88q2xxx.c | 265 ++++++++++++++++++++++++++++++ 3 files changed, 272 insertions(+) create mode 100644 drivers/net/phy/marvell-88q2xxx.c
drivers/net/phy/Kconfig +6 -0
@@ -217,6 +217,12 @@ config MARVELL_10G_PHY help Support for the Marvell Alaska MV88X3310 and compatible PHYs. +config MARVELL_88Q2XXX_PHY + tristate "Marvell 88Q2XXX PHY" + help + Support for the Marvell 88Q2XXX 100/1000BASE-T1 Automotive Ethernet + PHYs. + config MARVELL_88X2222_PHY tristate "Marvell 88X2222 PHY" help
drivers/net/phy/Makefile +1 -0
@@ -66,6 +66,7 @@ obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o obj-$(CONFIG_LXT_PHY) += lxt.o obj-$(CONFIG_MARVELL_10G_PHY) += marvell10g.o obj-$(CONFIG_MARVELL_PHY) += marvell.o +obj-$(CONFIG_MARVELL_88Q2XXX_PHY) += marvell-88q2xxx.o obj-$(CONFIG_MARVELL_88X2222_PHY) += marvell-88x2222.o obj-$(CONFIG_MAXLINEAR_GPHY) += mxl-gpy.o obj-$(CONFIG_MEDIATEK_GE_PHY) += mediatek-ge.o
drivers/net/phy/marvell-88q2xxx.c new file +265 -0
265 lines not on this page · raw message
Signature · 1 line
2.39.2
Andrew Lunn
maintainerRe: [PATCH net-next v3 5/5] net: phy: marvell-88q2xxx: add driver for the Marvell 88Q2110 PHY
drivers/net/phy/marvell-88q2xxx.c line 243
Quoted 7 lines
drivers/net/phy/marvell-88q2xxx.c new file +6
-0+#define MARVELL_PHY_ID_88Q2110 0x002b0981 + +static struct phy_driver mv88q2xxx_driver[] = { + { + .phy_id =MARVELL_PHY_ID_88Q2110 , + .phy_id_mask =MARVELL_PHY_ID_MASK ,
Probably not an issue...
The ID you have above is for revision 1 of the PHY. But the mask will cause the revision to be ignored. Do you want to ignore the revision? Are there different errata for revision 0 and 1?
Andrew
Re: [PATCH net-next v3 5/5] net: phy: marvell-88q2xxx: add driver for the Marvell 88Q2110 PHY
Hi Andrew,
Quoted 10 lines · Andrew Lunn
drivers/net/phy/marvell-88q2xxx.c line 243
Quoted 7 lines
drivers/net/phy/marvell-88q2xxx.c new file +6
-0+#define MARVELL_PHY_ID_88Q2110 0x002b0981 + +static struct phy_driver mv88q2xxx_driver[] = { + { + .phy_id =MARVELL_PHY_ID_88Q2110 , + .phy_id_mask =MARVELL_PHY_ID_MASK ,Probably not an issue...
Quoted 3 lines
The ID you have above is for revision 1 of the PHY. But the mask will cause the revision to be ignored. Do you want to ignore the revision? Are there different errata for revision 0 and 1?
A0 to A2 (Rev 1-3) are the same software wise for the current scenarios. Z0 (Rev 0) might behave slightly different in the reset scenario but most likely it works as well. Unfortunately, I could not test it because I don't have such a device.
Regards,
Stefan
Re: [PATCH net-next v3 5/5] net: phy: marvell-88q2xxx: add driver for the Marvell 88Q2110 PHY
Quoted 13 lines · Stefan Eichenberger
Hi Andrew,
Quoted 10 lines · Andrew Lunn
drivers/net/phy/marvell-88q2xxx.c line 243
Quoted 7 lines
drivers/net/phy/marvell-88q2xxx.c new file +6
-0+#define MARVELL_PHY_ID_88Q2110 0x002b0981 + +static struct phy_driver mv88q2xxx_driver[] = { + { + .phy_id =MARVELL_PHY_ID_88Q2110 , + .phy_id_mask =MARVELL_PHY_ID_MASK ,Probably not an issue...
Quoted 8 lines
Quoted 3 lines
The ID you have above is for revision 1 of the PHY. But the mask will cause the revision to be ignored. Do you want to ignore the revision? Are there different errata for revision 0 and 1?
A0 to A2 (Rev 1-3) are the same software wise for the current scenarios. Z0 (Rev 0) might behave slightly different in the reset scenario but most likely it works as well. Unfortunately, I could not test it because I don't have such a device.
Thanks.
Please consider Marek comment, but:
Andrew
Re: [PATCH net-next v3 5/5] net: phy: marvell-88q2xxx: add driver for the Marvell 88Q2110 PHY
In reply to Stefan EichenbergerQuoted 1 line · On Mon, 17 Jul 2023 21:33:50 +0200 Stefan Eichenberger <[email protected]>…
+#define
MARVELL_PHY_ID_88Q21100x002b0981
Why not put the PHY ID macro to include/linux/marvell_phy.h where all Marvell PHY IDs reside?
Marek