net: dsa: mv88e6xxx: augment phylink support for 10G
Subsystems (4)
cover net: dsa: mv88e6xxx: augment phylink support for 10G
Hi,
This series adds phylink 10G support for the 88E6390 series switches, as suggested by Andrew Lunn.
The first patch cleans up the code to use generic definitions for the registers in a similar way to what was done with the initial conversion of 1G serdes support.
The second patch adds the necessary bits 10GBASE mode to the pcs_get_state() method.
drivers/net/dsa/mv88e6xxx/serdes.c | 55 ++++++++++++++++++++++++++++++++------ drivers/net/dsa/mv88e6xxx/serdes.h | 7 ++--- 2 files changed, 49 insertions(+), 13 deletions(-)
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up
PATCH 1/2 net: dsa: mv88e6xxx: use generic clause 45 definitions
The private MV88E6390_PCS_CONTROL_1 definitions in serdes.h reflects the IEEE 802.3 standard PCS control register 1 definitions, only offset by 0x1000 in the PHYXS register space. Rather than inventing our own, use those that already exist, and name the register MV88E6390_10G_CTRL1.
--- drivers/net/dsa/mv88e6xxx/serdes.c | 12 ++++++------ drivers/net/dsa/mv88e6xxx/serdes.h | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-)
drivers/net/dsa/mv88e6xxx/serdes.c +6 -6
@@ -534,21 +534,21 @@ static int mv88e6390_serdes_power_10g(struct mv88e6xxx_chip *chip, u8 lane,int err; err =mv88e6390_serdes_read (chip, lane,MDIO_MMD_PHYXS , -MV88E6390_PCS_CONTROL_1 , &val); +MV88E6390_10G_CTRL1 , &val);if (err)return err;if (up) - new_val = val & ~(MV88E6390_PCS_CONTROL_1_RESET | -MV88E6390_PCS_CONTROL_1_LOOPBACK | -MV88E6390_PCS_CONTROL_1_PDOWN ); + new_val = val & ~(MDIO_CTRL1_RESET | +MDIO_PCS_CTRL1_LOOPBACK | +MDIO_CTRL1_LPOWER );else - new_val = val |MV88E6390_PCS_CONTROL_1_PDOWN ; + new_val = val |MDIO_CTRL1_LPOWER ;if (val != new_val) err =mv88e6390_serdes_write (chip, lane,MDIO_MMD_PHYXS , -MV88E6390_PCS_CONTROL_1 , new_val); +MV88E6390_10G_CTRL1 , new_val);return err; }
drivers/net/dsa/mv88e6xxx/serdes.h +1 -5
@@ -40,11 +40,7 @@#define MV88E6390_PORT10_LANE3 0x17/* 10GBASE-R and 10GBASE-X4/X2 */ -#define MV88E6390_PCS_CONTROL_1 0x1000 -#define MV88E6390_PCS_CONTROL_1_RESET BIT(15) -#define MV88E6390_PCS_CONTROL_1_LOOPBACK BIT(14) -#define MV88E6390_PCS_CONTROL_1_SPEED BIT(13) -#define MV88E6390_PCS_CONTROL_1_PDOWN BIT(11) +#define MV88E6390_10G_CTRL1 (0x1000 + MDIO_CTRL1)/* 1000BASE-X and SGMII */ #define MV88E6390_SGMII_BMCR (0x2000 + MII_BMCR)
Signature · 1 line
2.20.1
PATCH 2/2 net: dsa: mv88e6xxx: 88e6390 10G serdes support
In reply to Russell King - ARM Linux adminAdd support for reading and reporting the 10G link status on the 88e6390 in addition to the 1000BASE-X/2500BASE-X/SGMII status.
--- drivers/net/dsa/mv88e6xxx/serdes.c | 43 ++++++++++++++++++++++++++++-- drivers/net/dsa/mv88e6xxx/serdes.h | 1 + 2 files changed, 42 insertions(+), 2 deletions(-)
drivers/net/dsa/mv88e6xxx/serdes.c +41 -2
@@ -748,8 +748,8 @@ int mv88e6390_serdes_pcs_config(struct mv88e6xxx_chip *chip, int port, MV88E6390_SGMII_BMCR, bmcr); } -int mv88e6390_serdes_pcs_get_state (struct mv88e6xxx_chip *chip,int port, -u8 lane,struct phylink_link_state *state) +static int mv88e6390_serdes_pcs_get_state_sgmii (struct mv88e6xxx_chip *chip, +int port,u8 lane,struct phylink_link_state *state) {u16 lpa, status;int err;
@@ -771,6 +771,45 @@ int mv88e6390_serdes_pcs_get_state(struct mv88e6xxx_chip *chip, int port,return mv88e6xxx_serdes_pcs_get_state (chip, status, lpa, state); } +static int mv88e6390_serdes_pcs_get_state_10g (struct mv88e6xxx_chip *chip, +int port,u8 lane,struct phylink_link_state *state) +{ +u16 status; +int err; + + err =mv88e6390_serdes_read (chip, lane,MDIO_MMD_PHYXS , +MV88E6390_10G_STAT1 , &status); +if (err) +return err; + + state->link = !!(status &MDIO_STAT1_LSTATUS ); +if (state->link) { + state->speed =SPEED_10000 ; + state->duplex =DUPLEX_FULL ; + } + +return 0 ; +} + +int mv88e6390_serdes_pcs_get_state (struct mv88e6xxx_chip *chip,int port, +u8 lane,struct phylink_link_state *state) +{ +switch (state->interface) { +case PHY_INTERFACE_MODE_SGMII : +case PHY_INTERFACE_MODE_1000BASEX : +case PHY_INTERFACE_MODE_2500BASEX : +return mv88e6390_serdes_pcs_get_state_sgmii (chip, port, lane, + state); +case PHY_INTERFACE_MODE_XAUI : +case PHY_INTERFACE_MODE_RXAUI : +return mv88e6390_serdes_pcs_get_state_10g (chip, port, lane, + state); + +default : +return -EOPNOTSUPP ; + } +} +int mv88e6390_serdes_pcs_an_restart (struct mv88e6xxx_chip *chip,int port,u8 lane) {
drivers/net/dsa/mv88e6xxx/serdes.h +1 -0
@@ -41,6 +41,7 @@/* 10GBASE-R and 10GBASE-X4/X2 */ #define MV88E6390_10G_CTRL1 (0x1000 + MDIO_CTRL1) +#define MV88E6390_10G_STAT1 (0x1000 + MDIO_STAT1)/* 1000BASE-X and SGMII */ #define MV88E6390_SGMII_BMCR (0x2000 + MII_BMCR)
Signature · 1 line
2.20.1
David Miller
maintainerFrom: Russell King - ARM Linux admin <[email protected]>
Date: Thu, 30 Apr 2020 09:21:04 +0100
Quoted 9 lines
This series adds phylink 10G support for the 88E6390 series switches, as suggested by Andrew Lunn.
The first patch cleans up the code to use generic definitions for the registers in a similar way to what was done with the initial conversion of 1G serdes support.
The second patch adds the necessary bits 10GBASE mode to the
pcs_get_state()method.
Series applied, thanks.