diff options
Diffstat (limited to 'pkgs/patches-linux-5.15/784-v5.19-2-net-dsa-mv88e6xxx-populate-supported_interfaces-and-.patch')
| -rw-r--r-- | pkgs/patches-linux-5.15/784-v5.19-2-net-dsa-mv88e6xxx-populate-supported_interfaces-and-.patch | 548 |
1 files changed, 548 insertions, 0 deletions
diff --git a/pkgs/patches-linux-5.15/784-v5.19-2-net-dsa-mv88e6xxx-populate-supported_interfaces-and-.patch b/pkgs/patches-linux-5.15/784-v5.19-2-net-dsa-mv88e6xxx-populate-supported_interfaces-and-.patch new file mode 100644 index 0000000..7793bea --- /dev/null +++ b/pkgs/patches-linux-5.15/784-v5.19-2-net-dsa-mv88e6xxx-populate-supported_interfaces-and-.patch @@ -0,0 +1,548 @@ +From 25845d4c0a9932a9b9308139f2e5f9de580e2243 Mon Sep 17 00:00:00 2001 +From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk> +Date: Thu, 3 Feb 2022 13:30:42 +0000 +Subject: [PATCH 2/6] net: dsa: mv88e6xxx: populate supported_interfaces and + mac_capabilities +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Populate the supported interfaces and MAC capabilities for the +Marvell MV88E6xxx DSA switches in preparation to using these for the +validation functionality. + +Patch co-authored by Marek. + +Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> +Signed-off-by: Marek Behún <kabel@kernel.org> [ fixed 6341 and 6393x ] +Reviewed-by: Andrew Lunn <andrew@lunn.ch> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/dsa/mv88e6xxx/chip.c | 275 ++++++++++++++++++++++++++++++- + drivers/net/dsa/mv88e6xxx/chip.h | 2 + + drivers/net/dsa/mv88e6xxx/port.h | 5 + + 3 files changed, 279 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c +index d2751f73246b..c86a08274ca3 100644 +--- a/drivers/net/dsa/mv88e6xxx/chip.c ++++ b/drivers/net/dsa/mv88e6xxx/chip.c +@@ -685,11 +685,251 @@ static void mv88e6xxx_validate(struct dsa_switch *ds, int port, + + linkmode_and(supported, supported, mask); + linkmode_and(state->advertising, state->advertising, mask); ++} ++ ++static const u8 mv88e6185_phy_interface_modes[] = { ++ [MV88E6185_PORT_STS_CMODE_GMII_FD] = PHY_INTERFACE_MODE_GMII, ++ [MV88E6185_PORT_STS_CMODE_MII_100_FD_PS] = PHY_INTERFACE_MODE_MII, ++ [MV88E6185_PORT_STS_CMODE_MII_100] = PHY_INTERFACE_MODE_MII, ++ [MV88E6185_PORT_STS_CMODE_MII_10] = PHY_INTERFACE_MODE_MII, ++ [MV88E6185_PORT_STS_CMODE_SERDES] = PHY_INTERFACE_MODE_1000BASEX, ++ [MV88E6185_PORT_STS_CMODE_1000BASE_X] = PHY_INTERFACE_MODE_1000BASEX, ++ [MV88E6185_PORT_STS_CMODE_PHY] = PHY_INTERFACE_MODE_SGMII, ++}; ++ ++static void mv88e6185_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config) ++{ ++ u8 cmode = chip->ports[port].cmode; ++ ++ if (cmode <= ARRAY_SIZE(mv88e6185_phy_interface_modes) && ++ mv88e6185_phy_interface_modes[cmode]) ++ __set_bit(mv88e6185_phy_interface_modes[cmode], ++ config->supported_interfaces); + +- /* We can only operate at 2500BaseX or 1000BaseX. If requested +- * to advertise both, only report advertising at 2500BaseX. ++ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | ++ MAC_1000FD; ++} ++ ++static const u8 mv88e6xxx_phy_interface_modes[] = { ++ [MV88E6XXX_PORT_STS_CMODE_MII_PHY] = PHY_INTERFACE_MODE_MII, ++ [MV88E6XXX_PORT_STS_CMODE_MII] = PHY_INTERFACE_MODE_MII, ++ [MV88E6XXX_PORT_STS_CMODE_GMII] = PHY_INTERFACE_MODE_GMII, ++ [MV88E6XXX_PORT_STS_CMODE_RMII_PHY] = PHY_INTERFACE_MODE_RMII, ++ [MV88E6XXX_PORT_STS_CMODE_RMII] = PHY_INTERFACE_MODE_RMII, ++ [MV88E6XXX_PORT_STS_CMODE_100BASEX] = PHY_INTERFACE_MODE_100BASEX, ++ [MV88E6XXX_PORT_STS_CMODE_1000BASEX] = PHY_INTERFACE_MODE_1000BASEX, ++ [MV88E6XXX_PORT_STS_CMODE_SGMII] = PHY_INTERFACE_MODE_SGMII, ++ /* higher interface modes are not needed here, since ports supporting ++ * them are writable, and so the supported interfaces are filled in the ++ * corresponding .phylink_set_interfaces() implementation below + */ +- phylink_helper_basex_speed(state); ++}; ++ ++static void mv88e6xxx_translate_cmode(u8 cmode, unsigned long *supported) ++{ ++ if (cmode < ARRAY_SIZE(mv88e6xxx_phy_interface_modes) && ++ mv88e6xxx_phy_interface_modes[cmode]) ++ __set_bit(mv88e6xxx_phy_interface_modes[cmode], supported); ++ else if (cmode == MV88E6XXX_PORT_STS_CMODE_RGMII) ++ phy_interface_set_rgmii(supported); ++} ++ ++static void mv88e6250_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config) ++{ ++ unsigned long *supported = config->supported_interfaces; ++ ++ /* Translate the default cmode */ ++ mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported); ++ ++ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100; ++} ++ ++static int mv88e6352_get_port4_serdes_cmode(struct mv88e6xxx_chip *chip) ++{ ++ u16 reg, val; ++ int err; ++ ++ err = mv88e6xxx_port_read(chip, 4, MV88E6XXX_PORT_STS, ®); ++ if (err) ++ return err; ++ ++ /* If PHY_DETECT is zero, then we are not in auto-media mode */ ++ if (!(reg & MV88E6XXX_PORT_STS_PHY_DETECT)) ++ return 0xf; ++ ++ val = reg & ~MV88E6XXX_PORT_STS_PHY_DETECT; ++ err = mv88e6xxx_port_write(chip, 4, MV88E6XXX_PORT_STS, val); ++ if (err) ++ return err; ++ ++ err = mv88e6xxx_port_read(chip, 4, MV88E6XXX_PORT_STS, &val); ++ if (err) ++ return err; ++ ++ /* Restore PHY_DETECT value */ ++ err = mv88e6xxx_port_write(chip, 4, MV88E6XXX_PORT_STS, reg); ++ if (err) ++ return err; ++ ++ return val & MV88E6XXX_PORT_STS_CMODE_MASK; ++} ++ ++static void mv88e6352_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config) ++{ ++ unsigned long *supported = config->supported_interfaces; ++ int err, cmode; ++ ++ /* Translate the default cmode */ ++ mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported); ++ ++ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | ++ MAC_1000FD; ++ ++ /* Port 4 supports automedia if the serdes is associated with it. */ ++ if (port == 4) { ++ mv88e6xxx_reg_lock(chip); ++ err = mv88e6352_g2_scratch_port_has_serdes(chip, port); ++ if (err < 0) ++ dev_err(chip->dev, "p%d: failed to read scratch\n", ++ port); ++ if (err <= 0) ++ goto unlock; ++ ++ cmode = mv88e6352_get_port4_serdes_cmode(chip); ++ if (cmode < 0) ++ dev_err(chip->dev, "p%d: failed to read serdes cmode\n", ++ port); ++ else ++ mv88e6xxx_translate_cmode(cmode, supported); ++unlock: ++ mv88e6xxx_reg_unlock(chip); ++ } ++} ++ ++static void mv88e6341_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config) ++{ ++ unsigned long *supported = config->supported_interfaces; ++ ++ /* Translate the default cmode */ ++ mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported); ++ ++ /* No ethtool bits for 200Mbps */ ++ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | ++ MAC_1000FD; ++ ++ /* The C_Mode field is programmable on port 5 */ ++ if (port == 5) { ++ __set_bit(PHY_INTERFACE_MODE_SGMII, supported); ++ __set_bit(PHY_INTERFACE_MODE_1000BASEX, supported); ++ __set_bit(PHY_INTERFACE_MODE_2500BASEX, supported); ++ ++ config->mac_capabilities |= MAC_2500FD; ++ } ++} ++ ++static void mv88e6390_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config) ++{ ++ unsigned long *supported = config->supported_interfaces; ++ ++ /* Translate the default cmode */ ++ mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported); ++ ++ /* No ethtool bits for 200Mbps */ ++ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | ++ MAC_1000FD; ++ ++ /* The C_Mode field is programmable on ports 9 and 10 */ ++ if (port == 9 || port == 10) { ++ __set_bit(PHY_INTERFACE_MODE_SGMII, supported); ++ __set_bit(PHY_INTERFACE_MODE_1000BASEX, supported); ++ __set_bit(PHY_INTERFACE_MODE_2500BASEX, supported); ++ ++ config->mac_capabilities |= MAC_2500FD; ++ } ++} ++ ++static void mv88e6390x_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config) ++{ ++ unsigned long *supported = config->supported_interfaces; ++ ++ mv88e6390_phylink_get_caps(chip, port, config); ++ ++ /* For the 6x90X, ports 2-7 can be in automedia mode. ++ * (Note that 6x90 doesn't support RXAUI nor XAUI). ++ * ++ * Port 2 can also support 1000BASE-X in automedia mode if port 9 is ++ * configured for 1000BASE-X, SGMII or 2500BASE-X. ++ * Port 3-4 can also support 1000BASE-X in automedia mode if port 9 is ++ * configured for RXAUI, 1000BASE-X, SGMII or 2500BASE-X. ++ * ++ * Port 5 can also support 1000BASE-X in automedia mode if port 10 is ++ * configured for 1000BASE-X, SGMII or 2500BASE-X. ++ * Port 6-7 can also support 1000BASE-X in automedia mode if port 10 is ++ * configured for RXAUI, 1000BASE-X, SGMII or 2500BASE-X. ++ * ++ * For now, be permissive (as the old code was) and allow 1000BASE-X ++ * on ports 2..7. ++ */ ++ if (port >= 2 && port <= 7) ++ __set_bit(PHY_INTERFACE_MODE_1000BASEX, supported); ++ ++ /* The C_Mode field can also be programmed for 10G speeds */ ++ if (port == 9 || port == 10) { ++ __set_bit(PHY_INTERFACE_MODE_XAUI, supported); ++ __set_bit(PHY_INTERFACE_MODE_RXAUI, supported); ++ ++ config->mac_capabilities |= MAC_10000FD; ++ } ++} ++ ++static void mv88e6393x_phylink_get_caps(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config) ++{ ++ unsigned long *supported = config->supported_interfaces; ++ bool is_6191x = ++ chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6191X; ++ ++ mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported); ++ ++ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 | ++ MAC_1000FD; ++ ++ /* The C_Mode field can be programmed for ports 0, 9 and 10 */ ++ if (port == 0 || port == 9 || port == 10) { ++ __set_bit(PHY_INTERFACE_MODE_SGMII, supported); ++ __set_bit(PHY_INTERFACE_MODE_1000BASEX, supported); ++ ++ /* 6191X supports >1G modes only on port 10 */ ++ if (!is_6191x || port == 10) { ++ __set_bit(PHY_INTERFACE_MODE_2500BASEX, supported); ++ __set_bit(PHY_INTERFACE_MODE_5GBASER, supported); ++ __set_bit(PHY_INTERFACE_MODE_10GBASER, supported); ++ /* FIXME: USXGMII is not supported yet */ ++ /* __set_bit(PHY_INTERFACE_MODE_USXGMII, supported); */ ++ ++ config->mac_capabilities |= MAC_2500FD | MAC_5000FD | ++ MAC_10000FD; ++ } ++ } ++} ++ ++static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port, ++ struct phylink_config *config) ++{ ++ struct mv88e6xxx_chip *chip = ds->priv; ++ ++ chip->info->ops->phylink_get_caps(chip, port, config); ++ ++ /* Internal ports need GMII for PHYLIB */ ++ if (mv88e6xxx_phy_is_internal(ds, port)) ++ __set_bit(PHY_INTERFACE_MODE_GMII, ++ config->supported_interfaces); + } + + static void mv88e6xxx_mac_config(struct dsa_switch *ds, int port, +@@ -3599,6 +3839,7 @@ static const struct mv88e6xxx_ops mv88e6085_ops = { + .rmu_disable = mv88e6085_g1_rmu_disable, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + .set_max_frame_size = mv88e6185_g1_set_max_frame_size, + }; +@@ -3633,6 +3874,7 @@ static const struct mv88e6xxx_ops mv88e6095_ops = { + .reset = mv88e6185_g1_reset, + .vtu_getnext = mv88e6185_g1_vtu_getnext, + .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + .set_max_frame_size = mv88e6185_g1_set_max_frame_size, + }; +@@ -3680,6 +3922,7 @@ static const struct mv88e6xxx_ops mv88e6097_ops = { + .rmu_disable = mv88e6085_g1_rmu_disable, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + .set_max_frame_size = mv88e6185_g1_set_max_frame_size, + }; +@@ -3717,6 +3960,7 @@ static const struct mv88e6xxx_ops mv88e6123_ops = { + .atu_set_hash = mv88e6165_g1_atu_set_hash, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + .set_max_frame_size = mv88e6185_g1_set_max_frame_size, + }; +@@ -3758,6 +4002,7 @@ static const struct mv88e6xxx_ops mv88e6131_ops = { + .reset = mv88e6185_g1_reset, + .vtu_getnext = mv88e6185_g1_vtu_getnext, + .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -3822,6 +4067,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { + .serdes_get_stats = mv88e6390_serdes_get_stats, + .serdes_get_regs_len = mv88e6390_serdes_get_regs_len, + .serdes_get_regs = mv88e6390_serdes_get_regs, ++ .phylink_get_caps = mv88e6341_phylink_get_caps, + .phylink_validate = mv88e6341_phylink_validate, + }; + +@@ -3864,6 +4110,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = { + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, + .avb_ops = &mv88e6165_avb_ops, + .ptp_ops = &mv88e6165_ptp_ops, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + .set_max_frame_size = mv88e6185_g1_set_max_frame_size, + }; +@@ -3900,6 +4147,7 @@ static const struct mv88e6xxx_ops mv88e6165_ops = { + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, + .avb_ops = &mv88e6165_avb_ops, + .ptp_ops = &mv88e6165_ptp_ops, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -3942,6 +4190,7 @@ static const struct mv88e6xxx_ops mv88e6171_ops = { + .atu_set_hash = mv88e6165_g1_atu_set_hash, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -3997,6 +4246,7 @@ static const struct mv88e6xxx_ops mv88e6172_ops = { + .serdes_get_regs_len = mv88e6352_serdes_get_regs_len, + .serdes_get_regs = mv88e6352_serdes_get_regs, + .gpio_ops = &mv88e6352_gpio_ops, ++ .phylink_get_caps = mv88e6352_phylink_get_caps, + .phylink_validate = mv88e6352_phylink_validate, + }; + +@@ -4039,6 +4289,7 @@ static const struct mv88e6xxx_ops mv88e6175_ops = { + .atu_set_hash = mv88e6165_g1_atu_set_hash, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -4097,6 +4348,7 @@ static const struct mv88e6xxx_ops mv88e6176_ops = { + .serdes_get_regs_len = mv88e6352_serdes_get_regs_len, + .serdes_get_regs = mv88e6352_serdes_get_regs, + .gpio_ops = &mv88e6352_gpio_ops, ++ .phylink_get_caps = mv88e6352_phylink_get_caps, + .phylink_validate = mv88e6352_phylink_validate, + }; + +@@ -4136,6 +4388,7 @@ static const struct mv88e6xxx_ops mv88e6185_ops = { + .reset = mv88e6185_g1_reset, + .vtu_getnext = mv88e6185_g1_vtu_getnext, + .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + .set_max_frame_size = mv88e6185_g1_set_max_frame_size, + }; +@@ -4198,6 +4451,7 @@ static const struct mv88e6xxx_ops mv88e6190_ops = { + .serdes_get_regs_len = mv88e6390_serdes_get_regs_len, + .serdes_get_regs = mv88e6390_serdes_get_regs, + .gpio_ops = &mv88e6352_gpio_ops, ++ .phylink_get_caps = mv88e6390_phylink_get_caps, + .phylink_validate = mv88e6390_phylink_validate, + }; + +@@ -4259,6 +4513,7 @@ static const struct mv88e6xxx_ops mv88e6190x_ops = { + .serdes_get_regs_len = mv88e6390_serdes_get_regs_len, + .serdes_get_regs = mv88e6390_serdes_get_regs, + .gpio_ops = &mv88e6352_gpio_ops, ++ .phylink_get_caps = mv88e6390x_phylink_get_caps, + .phylink_validate = mv88e6390x_phylink_validate, + }; + +@@ -4319,6 +4574,7 @@ static const struct mv88e6xxx_ops mv88e6191_ops = { + .serdes_get_regs = mv88e6390_serdes_get_regs, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6390_phylink_get_caps, + .phylink_validate = mv88e6390_phylink_validate, + }; + +@@ -4379,6 +4635,7 @@ static const struct mv88e6xxx_ops mv88e6240_ops = { + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6352_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6352_phylink_get_caps, + .phylink_validate = mv88e6352_phylink_validate, + }; + +@@ -4419,6 +4676,7 @@ static const struct mv88e6xxx_ops mv88e6250_ops = { + .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .avb_ops = &mv88e6352_avb_ops, + .ptp_ops = &mv88e6250_ptp_ops, ++ .phylink_get_caps = mv88e6250_phylink_get_caps, + .phylink_validate = mv88e6065_phylink_validate, + }; + +@@ -4481,6 +4739,7 @@ static const struct mv88e6xxx_ops mv88e6290_ops = { + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6390_phylink_get_caps, + .phylink_validate = mv88e6390_phylink_validate, + }; + +@@ -4525,6 +4784,7 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6352_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -4567,6 +4827,7 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6352_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -4633,6 +4894,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { + .serdes_get_stats = mv88e6390_serdes_get_stats, + .serdes_get_regs_len = mv88e6390_serdes_get_regs_len, + .serdes_get_regs = mv88e6390_serdes_get_regs, ++ .phylink_get_caps = mv88e6341_phylink_get_caps, + .phylink_validate = mv88e6341_phylink_validate, + }; + +@@ -4675,6 +4937,7 @@ static const struct mv88e6xxx_ops mv88e6350_ops = { + .atu_set_hash = mv88e6165_g1_atu_set_hash, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -4719,6 +4982,7 @@ static const struct mv88e6xxx_ops mv88e6351_ops = { + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, + .avb_ops = &mv88e6352_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6185_phylink_get_caps, + .phylink_validate = mv88e6185_phylink_validate, + }; + +@@ -4782,6 +5046,7 @@ static const struct mv88e6xxx_ops mv88e6352_ops = { + .serdes_get_stats = mv88e6352_serdes_get_stats, + .serdes_get_regs_len = mv88e6352_serdes_get_regs_len, + .serdes_get_regs = mv88e6352_serdes_get_regs, ++ .phylink_get_caps = mv88e6352_phylink_get_caps, + .phylink_validate = mv88e6352_phylink_validate, + }; + +@@ -4847,6 +5112,7 @@ static const struct mv88e6xxx_ops mv88e6390_ops = { + .serdes_get_stats = mv88e6390_serdes_get_stats, + .serdes_get_regs_len = mv88e6390_serdes_get_regs_len, + .serdes_get_regs = mv88e6390_serdes_get_regs, ++ .phylink_get_caps = mv88e6390_phylink_get_caps, + .phylink_validate = mv88e6390_phylink_validate, + }; + +@@ -4911,6 +5177,7 @@ static const struct mv88e6xxx_ops mv88e6390x_ops = { + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6390x_phylink_get_caps, + .phylink_validate = mv88e6390x_phylink_validate, + }; + +@@ -4975,6 +5242,7 @@ static const struct mv88e6xxx_ops mv88e6393x_ops = { + .gpio_ops = &mv88e6352_gpio_ops, + .avb_ops = &mv88e6390_avb_ops, + .ptp_ops = &mv88e6352_ptp_ops, ++ .phylink_get_caps = mv88e6393x_phylink_get_caps, + .phylink_validate = mv88e6393x_phylink_validate, + }; + +@@ -6244,6 +6512,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { + .teardown = mv88e6xxx_teardown, + .port_setup = mv88e6xxx_port_setup, + .port_teardown = mv88e6xxx_port_teardown, ++ .phylink_get_caps = mv88e6xxx_get_caps, + .phylink_validate = mv88e6xxx_validate, + .phylink_mac_link_state = mv88e6xxx_serdes_pcs_get_state, + .phylink_mac_config = mv88e6xxx_mac_config, +diff --git a/drivers/net/dsa/mv88e6xxx/chip.h b/drivers/net/dsa/mv88e6xxx/chip.h +index 8271b8aa7b71..5b0ee59b3c94 100644 +--- a/drivers/net/dsa/mv88e6xxx/chip.h ++++ b/drivers/net/dsa/mv88e6xxx/chip.h +@@ -609,6 +609,8 @@ struct mv88e6xxx_ops { + const struct mv88e6xxx_ptp_ops *ptp_ops; + + /* Phylink */ ++ void (*phylink_get_caps)(struct mv88e6xxx_chip *chip, int port, ++ struct phylink_config *config); + void (*phylink_validate)(struct mv88e6xxx_chip *chip, int port, + unsigned long *mask, + struct phylink_link_state *state); +diff --git a/drivers/net/dsa/mv88e6xxx/port.h b/drivers/net/dsa/mv88e6xxx/port.h +index 03382b66f800..ea6adfcfb42c 100644 +--- a/drivers/net/dsa/mv88e6xxx/port.h ++++ b/drivers/net/dsa/mv88e6xxx/port.h +@@ -42,6 +42,11 @@ + #define MV88E6XXX_PORT_STS_TX_PAUSED 0x0020 + #define MV88E6XXX_PORT_STS_FLOW_CTL 0x0010 + #define MV88E6XXX_PORT_STS_CMODE_MASK 0x000f ++#define MV88E6XXX_PORT_STS_CMODE_MII_PHY 0x0001 ++#define MV88E6XXX_PORT_STS_CMODE_MII 0x0002 ++#define MV88E6XXX_PORT_STS_CMODE_GMII 0x0003 ++#define MV88E6XXX_PORT_STS_CMODE_RMII_PHY 0x0004 ++#define MV88E6XXX_PORT_STS_CMODE_RMII 0x0005 + #define MV88E6XXX_PORT_STS_CMODE_RGMII 0x0007 + #define MV88E6XXX_PORT_STS_CMODE_100BASEX 0x0008 + #define MV88E6XXX_PORT_STS_CMODE_1000BASEX 0x0009 +-- +2.35.1 + |