net: dsa: mv88e6xxx: fill phylink's supported interfaces to make SFP modules work under DSA ports
Subsystems (4)
cover net: dsa: mv88e6xxx: fill phylink's supported interfaces to make SFP modules work under DSA ports
Hi Russell,
this series applies on your net-queue branch.
It adds a new DSA switch operation which is used to determine a DSA switch port's supported PHY interface modes to fill in phylink's config supported_interfaces member to make SFP modules work under DSA ports.
This operation is then implemented for mv88e6xxx.
I was thinking whether this method should be renamed to something like serdes_supported_interfaces or what, so that it is clear that we are not interested in RGMII and other non-SERDES modes...
BTW: You once complained that you don't like that this needs again to add a new op to DSA switch and for mv88e6xxx driver to add a new op for the each chip... So maybe phylink_validate code can be refactored to do this?
My opinion is that it is cleaner if we just add another op, but I am open to other opinions.
Marek
Marek Behún (2):
net: dsa: fill phylink's config supported_interfaces member
net: dsa: mv88e6xxx: implement .phylink_get_interfaces operation
drivers/net/dsa/mv88e6xxx/chip.c | 57 ++++++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 2 ++ include/net/dsa.h | 2 ++ net/dsa/slave.c | 4 +++ 4 files changed, 65 insertions(+)
base-commit: a32e90737c1c92653767d3c95c63c16b9b72c6c2
prerequisite-patch-id: 74af250a98f8d7d48da6b7655000995dd9d9310b
prerequisite-patch-id: 1ab9d0fedae2be621a821aac01ebf680627279d3
prerequisite-patch-id: 24af4837bacf2f8c9afcedd497a7d61c7cb7cdf1
Signature · 1 line
2.26.2
PATCH 1/2 net: dsa: fill phylink's config supported_interfaces member
Add a new DSA switch operation, phylink_get_interfaces, which should fill in which PHY_INTERFACE_MODE_* are supported by given port.
Use this before phylink_create to fill phylink's config supported_interfaces member.
This allows for phylink to determine which PHY_INTERFACE_MODE to use with SFP modules.
--- include/net/dsa.h | 2 ++ net/dsa/slave.c | 4 ++++ 2 files changed, 6 insertions(+)
include/net/dsa.h +2 -0
@@ -438,6 +438,8 @@ struct dsa_switch_ops {/* * PHYLINK integration */ +void (*phylink_get_interfaces)(struct dsa_switch *ds,int port, +unsigned long *supported_interfaces);void (*phylink_validate)(struct dsa_switch *ds,int port,unsigned long *supported,struct phylink_link_state *state);
net/dsa/slave.c +4 -0
@@ -1639,6 +1639,10 @@ static int dsa_slave_phy_setup(struct net_device *slave_dev) dp->pl_config.poll_fixed_state = true; } +if (ds->ops->phylink_get_interfaces) + ds->ops->phylink_get_interfaces (ds, dp->index, + dp->pl_config.supported_interfaces); + dp->pl =phylink_create (&dp->pl_config,of_fwnode_handle (port_dn), mode, &dsa_port_phylink_mac_ops);if (IS_ERR (dp->pl)) {
Signature · 1 line
2.26.2
PATCH 2/2 net: dsa: mv88e6xxx: implement .phylink_get_interfaces operation
In reply to Marek BehúnImplement the .phylink_get_interfaces method for mv88e6xxx driver.
We are currently only interested in SGMII, 1000base-x and 2500base-x modes (for the SFP code). USXGMII and 10gbase-r can be added later for Amethyst. XAUI and RXAUI are irrelevant for SFP (but maybe not for QSFP?).
--- drivers/net/dsa/mv88e6xxx/chip.c | 57 ++++++++++++++++++++++++++++++++ drivers/net/dsa/mv88e6xxx/chip.h | 2 ++ 2 files changed, 59 insertions(+)
drivers/net/dsa/mv88e6xxx/chip.c +57 -0
@@ -659,6 +659,50 @@ static void mv88e6xxx_validate(struct dsa_switch *ds, int port,phylink_helper_basex_speed (state); } +static void mv88e6352_phylink_get_interfaces (struct mv88e6xxx_chip *chip, +int port, +unsigned long *supported) +{ +if (mv88e6xxx_serdes_get_lane (chip, port)) { +/* FIXME: does code for 6352 family support changing between +* SGMII and 1000base-x? +*/ +__set_bit (PHY_INTERFACE_MODE_SGMII , supported); +__set_bit (PHY_INTERFACE_MODE_1000BASEX , supported); + } +} + +static void mv88e6341_phylink_get_interfaces (struct mv88e6xxx_chip *chip, +int port, +unsigned long *supported) +{ +if (port ==5 ) { +__set_bit (PHY_INTERFACE_MODE_SGMII , supported); +__set_bit (PHY_INTERFACE_MODE_1000BASEX , supported); +__set_bit (PHY_INTERFACE_MODE_2500BASEX , supported); + } +} + +static void mv88e6390_phylink_get_interfaces (struct mv88e6xxx_chip *chip, +int port, +unsigned long *supported) +{ +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); + } +} + +static void mv88e6xxx_get_interfaces (struct dsa_switch *ds,int port, +unsigned long *supported) +{ +struct mv88e6xxx_chip *chip = ds->priv; + +if (chip->info->ops->phylink_get_interfaces) + chip->info->ops->phylink_get_interfaces (chip, port, supported); +} +static void mv88e6xxx_mac_config (struct dsa_switch *ds,int port,unsigned int mode,const struct phylink_link_state *state)
@@ -3664,6 +3708,7 @@ static const struct mv88e6xxx_ops mv88e6141_ops = { .serdes_irq_enable = mv88e6390_serdes_irq_enable, .serdes_irq_status = mv88e6390_serdes_irq_status, .gpio_ops = &mv88e6352_gpio_ops, + .phylink_get_interfaces = mv88e6341_phylink_get_interfaces, .phylink_validate = mv88e6341_phylink_validate, };
@@ -3832,6 +3877,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_interfaces = mv88e6352_phylink_get_interfaces, .phylink_validate = mv88e6352_phylink_validate, };
@@ -3928,6 +3974,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_interfaces = mv88e6352_phylink_get_interfaces, .phylink_validate = mv88e6352_phylink_validate, };
@@ -4022,6 +4069,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_interfaces = mv88e6390_phylink_get_interfaces, .phylink_validate = mv88e6390_phylink_validate, };
@@ -4081,6 +4129,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_interfaces = mv88e6390_phylink_get_interfaces, .phylink_validate = mv88e6390x_phylink_validate, };
@@ -4139,6 +4188,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_interfaces = mv88e6390_phylink_get_interfaces, .phylink_validate = mv88e6390_phylink_validate, };
@@ -4197,6 +4247,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_interfaces = mv88e6352_phylink_get_interfaces, .phylink_validate = mv88e6352_phylink_validate, };
@@ -4295,6 +4346,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_interfaces = mv88e6390_phylink_get_interfaces, .phylink_validate = mv88e6390_phylink_validate, };
@@ -4432,6 +4484,7 @@ static const struct mv88e6xxx_ops mv88e6341_ops = { .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6390_avb_ops, .ptp_ops = &mv88e6352_ptp_ops, + .phylink_get_interfaces = mv88e6341_phylink_get_interfaces, .phylink_validate = mv88e6341_phylink_validate, };
@@ -4575,6 +4628,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_interfaces = mv88e6352_phylink_get_interfaces, .phylink_validate = mv88e6352_phylink_validate, };
@@ -4638,6 +4692,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_interfaces = mv88e6390_phylink_get_interfaces, .phylink_validate = mv88e6390_phylink_validate, };
@@ -4700,6 +4755,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_interfaces = mv88e6390_phylink_get_interfaces, .phylink_validate = mv88e6390x_phylink_validate, };
@@ -5566,6 +5622,7 @@ static const struct dsa_switch_ops mv88e6xxx_switch_ops = { .get_tag_protocol = mv88e6xxx_get_tag_protocol, .setup = mv88e6xxx_setup, .teardown = mv88e6xxx_teardown, + .phylink_get_interfaces = mv88e6xxx_get_interfaces, .phylink_validate = mv88e6xxx_validate, .phylink_mac_link_state = mv88e6xxx_serdes_pcs_get_state, .phylink_mac_config = mv88e6xxx_mac_config,
drivers/net/dsa/mv88e6xxx/chip.h +2 -0
@@ -550,6 +550,8 @@ struct mv88e6xxx_ops {const struct mv88e6xxx_ptp_ops *ptp_ops;/* Phylink */ +void (*phylink_get_interfaces)(struct mv88e6xxx_chip *chip,int port, +unsigned long *supported);void (*phylink_validate)(struct mv88e6xxx_chip *chip,int port,unsigned long *mask,struct phylink_link_state *state);
Signature · 1 line
2.26.2