| Message ID | 20190724192549.24615-4-opensource@vdorst.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: dsa: MT7530: Convert to PHYLINK and add support for port 5 | expand |
From: René van Dorst <opensource@vdorst.com> Date: Wed, 24 Jul 2019 21:25:49 +0200 > @@ -1167,6 +1236,10 @@ mt7530_setup(struct dsa_switch *ds) > u32 id, val; > struct device_node *dn; > struct mt7530_dummy_poll p; > + phy_interface_t interface; > + struct device_node *mac_np; > + struct device_node *phy_node; > + const __be32 *_id; Reverse christmas tree here please. Thank you.
On 7/24/2019 9:25 PM, René van Dorst wrote: > Adding support for port 5. > > Port 5 can muxed/interface to: > - internal 5th GMAC of the switch; can be used as 2nd CPU port or as > extra port with an external phy for a 6th ethernet port. > - internal PHY of port 0 or 4; Used in most applications so that port 0 > or 4 is the WAN port and interfaces with the 2nd GMAC of the SOC. > > Signed-off-by: René van Dorst <opensource@vdorst.com> [snip] > + /* Setup port 5 */ > + priv->p5_intf_sel = P5_DISABLED; > + interface = PHY_INTERFACE_MODE_NA; > + > + if (!dsa_is_unused_port(ds, 5)) { > + priv->p5_intf_sel = P5_INTF_SEL_GMAC5; > + interface = of_get_phy_mode(ds->ports[5].dn); > + } else { > + /* Scan the ethernet nodes. Look for GMAC1, Lookup used phy */ > + for_each_child_of_node(dn, mac_np) { > + if (!of_device_is_compatible(mac_np, > + "mediatek,eth-mac")) > + continue; > + _id = of_get_property(mac_np, "reg", NULL); > + if (be32_to_cpup(_id) != 1) > + continue; > + > + interface = of_get_phy_mode(mac_np); > + phy_node = of_parse_phandle(mac_np, "phy-handle", 0); > + > + if (phy_node->parent == priv->dev->of_node->parent) { > + _id = of_get_property(phy_node, "reg", NULL); > + id = be32_to_cpup(_id); > + if (id == 0) > + priv->p5_intf_sel = P5_INTF_SEL_PHY_P0; > + if (id == 4) > + priv->p5_intf_sel = P5_INTF_SEL_PHY_P4; Can you use of_mdio_parse_addr() here?
Quoting Florian Fainelli <f.fainelli@gmail.com>: > On 7/24/2019 9:25 PM, René van Dorst wrote: >> Adding support for port 5. >> >> Port 5 can muxed/interface to: >> - internal 5th GMAC of the switch; can be used as 2nd CPU port or as >> extra port with an external phy for a 6th ethernet port. >> - internal PHY of port 0 or 4; Used in most applications so that port 0 >> or 4 is the WAN port and interfaces with the 2nd GMAC of the SOC. >> >> Signed-off-by: René van Dorst <opensource@vdorst.com> > > [snip] > >> + /* Setup port 5 */ >> + priv->p5_intf_sel = P5_DISABLED; >> + interface = PHY_INTERFACE_MODE_NA; >> + >> + if (!dsa_is_unused_port(ds, 5)) { >> + priv->p5_intf_sel = P5_INTF_SEL_GMAC5; >> + interface = of_get_phy_mode(ds->ports[5].dn); >> + } else { >> + /* Scan the ethernet nodes. Look for GMAC1, Lookup used phy */ >> + for_each_child_of_node(dn, mac_np) { >> + if (!of_device_is_compatible(mac_np, >> + "mediatek,eth-mac")) >> + continue; >> + _id = of_get_property(mac_np, "reg", NULL); >> + if (be32_to_cpup(_id) != 1) >> + continue; >> + >> + interface = of_get_phy_mode(mac_np); >> + phy_node = of_parse_phandle(mac_np, "phy-handle", 0); >> + >> + if (phy_node->parent == priv->dev->of_node->parent) { >> + _id = of_get_property(phy_node, "reg", NULL); >> + id = be32_to_cpup(_id); >> + if (id == 0) >> + priv->p5_intf_sel = P5_INTF_SEL_PHY_P0; >> + if (id == 4) >> + priv->p5_intf_sel = P5_INTF_SEL_PHY_P4; > Hi Florian, > Can you use of_mdio_parse_addr() here? Yes that function be used. Thanks for mention this function. I see that I can refactor this scan routine a bit more. Also I missing a of_node_put(phy_node) at the end. > -- > Florian Greats, René
Quoting David Miller <davem@davemloft.net>: > From: René van Dorst <opensource@vdorst.com> > Date: Wed, 24 Jul 2019 21:25:49 +0200 > >> @@ -1167,6 +1236,10 @@ mt7530_setup(struct dsa_switch *ds) >> u32 id, val; >> struct device_node *dn; >> struct mt7530_dummy_poll p; >> + phy_interface_t interface; >> + struct device_node *mac_np; >> + struct device_node *phy_node; >> + const __be32 *_id; > Hi David, > Reverse christmas tree here please. > > Thank you. OK, I shall change that. I spin a new version. Greats, René
On Wed, Jul 24, 2019 at 09:25:49PM +0200, René van Dorst wrote: > Adding support for port 5. > > Port 5 can muxed/interface to: > - internal 5th GMAC of the switch; can be used as 2nd CPU port or as > extra port with an external phy for a 6th ethernet port. > - internal PHY of port 0 or 4; Used in most applications so that port 0 > or 4 is the WAN port and interfaces with the 2nd GMAC of the SOC. ... > @@ -1381,15 +1506,19 @@ static void mt7530_phylink_validate(struct dsa_switch *ds, int port, > phylink_set_port_modes(mask); > phylink_set(mask, Autoneg); > > - if (state->interface != PHY_INTERFACE_MODE_TRGMII) { > + if (state->interface == PHY_INTERFACE_MODE_TRGMII) { > + phylink_set(mask, 1000baseT_Full); > + } else { > phylink_set(mask, 10baseT_Half); > phylink_set(mask, 10baseT_Full); > phylink_set(mask, 100baseT_Half); > phylink_set(mask, 100baseT_Full); > - phylink_set(mask, 1000baseT_Half); > - } > > - phylink_set(mask, 1000baseT_Full); > + if (state->interface != PHY_INTERFACE_MODE_MII) { > + phylink_set(mask, 1000baseT_Half); > + phylink_set(mask, 1000baseT_Full); > + } > + } As port 5 could use an external PHY, and it supports gigabit speeds, consider that the PHY may provide not only copper but also fiber connectivity, so port 5 should probably also have 1000baseX modes too, which would allow such a PHY to bridge the switch to fiber.
Quoting Russell King - ARM Linux admin <linux@armlinux.org.uk>: > On Wed, Jul 24, 2019 at 09:25:49PM +0200, René van Dorst wrote: >> Adding support for port 5. >> >> Port 5 can muxed/interface to: >> - internal 5th GMAC of the switch; can be used as 2nd CPU port or as >> extra port with an external phy for a 6th ethernet port. >> - internal PHY of port 0 or 4; Used in most applications so that port 0 >> or 4 is the WAN port and interfaces with the 2nd GMAC of the SOC. > > ... > >> @@ -1381,15 +1506,19 @@ static void mt7530_phylink_validate(struct >> dsa_switch *ds, int port, >> phylink_set_port_modes(mask); >> phylink_set(mask, Autoneg); >> >> - if (state->interface != PHY_INTERFACE_MODE_TRGMII) { >> + if (state->interface == PHY_INTERFACE_MODE_TRGMII) { >> + phylink_set(mask, 1000baseT_Full); >> + } else { >> phylink_set(mask, 10baseT_Half); >> phylink_set(mask, 10baseT_Full); >> phylink_set(mask, 100baseT_Half); >> phylink_set(mask, 100baseT_Full); >> - phylink_set(mask, 1000baseT_Half); >> - } >> >> - phylink_set(mask, 1000baseT_Full); >> + if (state->interface != PHY_INTERFACE_MODE_MII) { >> + phylink_set(mask, 1000baseT_Half); >> + phylink_set(mask, 1000baseT_Full); >> + } >> + } > Hi Russell, Thanks for your review and many useful comments and explanations. > As port 5 could use an external PHY, and it supports gigabit speeds, > consider that the PHY may provide not only copper but also fiber > connectivity, so port 5 should probably also have 1000baseX modes > too, which would allow such a PHY to bridge the switch to fiber. I shall add the 1000baseX modes. My device, Ubiquiti EdgeRouter X SFP, has this setup. Port 5 is connected to a at8033 phy which acts as a RGMII-SerDes converter for the SFP cage. According to the datasheet it only support 100BASE-FX and 1000BASE-X. With bootstrap resistors the PHY is put in RGMII-SerDes 1000BASE-X mode. The problem I had is that the current mainline driver doesn't support this mode so I had to hack it in myself [0][1]. I probably doing the wrong thing with my phy driver. Driver works for me, it detects a link and sets-up a 1gbit link. So I can test port 5. But the driver may report all the wrong values to PHYLIB/PHYLINK. But now that I learned more about it I can revise the driver. By reading your previous emails, my setup could official not support the FiberStore SFP-GB-GE-T module, because it requests a SGMII interface. But my PHY only supports 1000BaseX and my code currently doesn't error out. dmesg output of this module: [ 3.382637] sfp sfp_lan5: module FiberStore SFP-GB-GE-T rev B sn <snip> dc 19-12-17 [ 3.402048] sfp sfp_lan5: unknown/unspecified connector, encoding 8b10b, nominal bitrate 1.3Gbps +0% -0% [ 3.421268] sfp sfp_lan5: 1000BaseSX- 1000BaseLX- 1000BaseCX- 1000BaseT+ 100BaseLX- 100BaseFX- BaseBX10- BasePX- [ 3.441867] sfp sfp_lan5: 10GBaseSR- 10GBaseLR- 10GBaseLRM- 10GBaseER- [ 3.455208] sfp sfp_lan5: Copper length: 100m [ 3.464225] sfp sfp_lan5: Options: txdisable [ 3.473066] sfp sfp_lan5: Diagnostics: [ 3.481034] sfp sfp_lan5: Unknown/unsupported extended compliance code: 0x01 [ 3.495069] Atheros 8031 ethernet mdio-bus:07: SFP interface sgmii What is the best way to do it in case of SGMII interface request? Return that we don't support SGMII or report that we only support 1 mode and no auto-negotiation? Greats, René > > -- > RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ > FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up > According to speedtest.net: 11.9Mbps down 500kbps up [0]: https://github.com/vDorst/linux-1/commit/dad5d6ec65cfa99c204e9756b3fc234071709292 [1]: https://github.com/vDorst/linux-1/commit/a3aa74e84796604ab8619cfaf1c299c115a8736f
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 73a2204bf81a..785ce825aeb1 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -633,6 +633,75 @@ mt7530_get_sset_count(struct dsa_switch *ds, int port, int sset) return ARRAY_SIZE(mt7530_mib); } +static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface) +{ + struct mt7530_priv *priv = ds->priv; + u8 tx_delay = 0; + int val; + + mutex_lock(&priv->reg_mutex); + + val = mt7530_read(priv, MT7530_MHWTRAP); + + val |= MHWTRAP_MANUAL | MHWTRAP_P5_MAC_SEL | MHWTRAP_P5_DIS; + val &= ~MHWTRAP_P5_RGMII_MODE & ~MHWTRAP_PHY0_SEL; + + switch (priv->p5_intf_sel) { + case P5_INTF_SEL_PHY_P0: + /* MT7530_P5_MODE_GPHY_P0: 2nd GMAC -> P5 -> P0 */ + val |= MHWTRAP_PHY0_SEL; + /* fall through */ + case P5_INTF_SEL_PHY_P4: + /* MT7530_P5_MODE_GPHY_P4: 2nd GMAC -> P5 -> P4 */ + val &= ~MHWTRAP_P5_MAC_SEL & ~MHWTRAP_P5_DIS; + + /* Setup the MAC by default for the cpu port */ + mt7530_write(priv, MT7530_PMCR_P(5), 0x56300); + break; + case P5_INTF_SEL_GMAC5: + /* MT7530_P5_MODE_GMAC: P5 -> External phy or 2nd GMAC */ + val &= ~MHWTRAP_P5_DIS; + break; + case P5_DISABLED: + interface = PHY_INTERFACE_MODE_NA; + break; + default: + dev_err(ds->dev, "Unsupported p5_intf_sel %d\n", + priv->p5_intf_sel); + goto unlock_exit; + } + + /* Setup RGMII settings */ + if (phy_interface_mode_is_rgmii(interface)) { + val |= MHWTRAP_P5_RGMII_MODE; + + /* P5 RGMII RX Clock Control: delay setting for 1000M */ + mt7530_write(priv, MT7530_P5RGMIIRXCR, CSR_RGMII_EDGE_ALIGN); + + /* Don't set delay in DSA mode */ + if (!dsa_is_dsa_port(priv->ds, 5) && + (interface == PHY_INTERFACE_MODE_RGMII_TXID || + interface == PHY_INTERFACE_MODE_RGMII_ID)) + tx_delay = 4; /* n * 0.5 ns */ + + /* P5 RGMII TX Clock Control: delay x */ + mt7530_write(priv, MT7530_P5RGMIITXCR, + CSR_RGMII_TXC_CFG(0x10 + tx_delay)); + + /* reduce P5 RGMII Tx driving, 8mA */ + mt7530_write(priv, MT7530_IO_DRV_CR, + P5_IO_CLK_DRV(1) | P5_IO_DATA_DRV(1)); + } + + mt7530_write(priv, MT7530_MHWTRAP, val); + + dev_info(ds->dev, "Setup P5, HWTRAP=0x%x, intf_sel=%s, phy-mode=%s\n", + val, p5_intf_modes(priv->p5_intf_sel), phy_modes(interface)); + +unlock_exit: + mutex_unlock(&priv->reg_mutex); +} + static int mt7530_cpu_port_enable(struct mt7530_priv *priv, int port) @@ -1167,6 +1236,10 @@ mt7530_setup(struct dsa_switch *ds) u32 id, val; struct device_node *dn; struct mt7530_dummy_poll p; + phy_interface_t interface; + struct device_node *mac_np; + struct device_node *phy_node; + const __be32 *_id; /* The parent node of master netdev which holds the common system * controller also is the container for two GMACs nodes representing @@ -1254,6 +1327,40 @@ mt7530_setup(struct dsa_switch *ds) mt7530_port_disable(ds, i); } + /* Setup port 5 */ + priv->p5_intf_sel = P5_DISABLED; + interface = PHY_INTERFACE_MODE_NA; + + if (!dsa_is_unused_port(ds, 5)) { + priv->p5_intf_sel = P5_INTF_SEL_GMAC5; + interface = of_get_phy_mode(ds->ports[5].dn); + } else { + /* Scan the ethernet nodes. Look for GMAC1, Lookup used phy */ + for_each_child_of_node(dn, mac_np) { + if (!of_device_is_compatible(mac_np, + "mediatek,eth-mac")) + continue; + _id = of_get_property(mac_np, "reg", NULL); + if (be32_to_cpup(_id) != 1) + continue; + + interface = of_get_phy_mode(mac_np); + phy_node = of_parse_phandle(mac_np, "phy-handle", 0); + + if (phy_node->parent == priv->dev->of_node->parent) { + _id = of_get_property(phy_node, "reg", NULL); + id = be32_to_cpup(_id); + if (id == 0) + priv->p5_intf_sel = P5_INTF_SEL_PHY_P0; + if (id == 4) + priv->p5_intf_sel = P5_INTF_SEL_PHY_P4; + } + break; + } + } + + mt7530_setup_port5(ds, interface); + /* Flush the FDB table */ ret = mt7530_fdb_cmd(priv, MT7530_FDB_FLUSH, NULL); if (ret < 0) @@ -1267,7 +1374,7 @@ static void mt7530_phylink_mac_config(struct dsa_switch *ds, int port, const struct phylink_link_state *state) { struct mt7530_priv *priv = ds->priv; - u32 mcr_cur, mcr_new; + u32 mcr_cur, mcr_new = 0; switch (port) { case 0: /* Internal phy */ @@ -1278,7 +1385,19 @@ static void mt7530_phylink_mac_config(struct dsa_switch *ds, int port, if (state->interface != PHY_INTERFACE_MODE_GMII) return; break; - /* case 5: Port 5 is not supported! */ + case 5: /* 2nd cpu port with phy of port 0 or 4 / external phy */ + if (!phy_interface_mode_is_rgmii(state->interface) && + state->interface != PHY_INTERFACE_MODE_MII && + state->interface != PHY_INTERFACE_MODE_GMII) + return; + if (priv->p5_intf_sel != P5_INTF_SEL_GMAC5) { + priv->p5_intf_sel = P5_INTF_SEL_GMAC5; + mt7530_setup_port5(ds, state->interface); + } + /* We are connected to external phy */ + if (dsa_is_user_port(ds, 5)) + mcr_new |= PMCR_EXT_PHY; + break; case 6: /* 1st cpu port */ if (state->interface != PHY_INTERFACE_MODE_RGMII && state->interface != PHY_INTERFACE_MODE_TRGMII) @@ -1304,7 +1423,7 @@ static void mt7530_phylink_mac_config(struct dsa_switch *ds, int port, } mcr_cur = mt7530_read(priv, MT7530_PMCR_P(port)); - mcr_new = mcr_cur; + mcr_new |= mcr_cur; mcr_new &= ~(PMCR_FORCE_SPEED_1000 | PMCR_FORCE_SPEED_100 | PMCR_FORCE_FDX | PMCR_TX_FC_EN | PMCR_RX_FC_EN); mcr_new |= PMCR_IFG_XMIT(1) | PMCR_MAC_MODE | PMCR_BACKOFF_EN | @@ -1365,7 +1484,13 @@ static void mt7530_phylink_validate(struct dsa_switch *ds, int port, state->interface != PHY_INTERFACE_MODE_GMII) goto unsupported; break; - /* case 5: Port 5 not supported! */ + case 5: /* 2nd cpu port with phy of port 0 or 4 / external phy */ + if (state->interface != PHY_INTERFACE_MODE_NA && + !phy_interface_mode_is_rgmii(state->interface) && + state->interface != PHY_INTERFACE_MODE_MII && + state->interface != PHY_INTERFACE_MODE_GMII) + goto unsupported; + break; case 6: /* 1st cpu port */ if (state->interface != PHY_INTERFACE_MODE_NA && state->interface != PHY_INTERFACE_MODE_RGMII && @@ -1381,15 +1506,19 @@ static void mt7530_phylink_validate(struct dsa_switch *ds, int port, phylink_set_port_modes(mask); phylink_set(mask, Autoneg); - if (state->interface != PHY_INTERFACE_MODE_TRGMII) { + if (state->interface == PHY_INTERFACE_MODE_TRGMII) { + phylink_set(mask, 1000baseT_Full); + } else { phylink_set(mask, 10baseT_Half); phylink_set(mask, 10baseT_Full); phylink_set(mask, 100baseT_Half); phylink_set(mask, 100baseT_Full); - phylink_set(mask, 1000baseT_Half); - } - phylink_set(mask, 1000baseT_Full); + if (state->interface != PHY_INTERFACE_MODE_MII) { + phylink_set(mask, 1000baseT_Half); + phylink_set(mask, 1000baseT_Full); + } + } phylink_set(mask, Pause); phylink_set(mask, Asym_Pause); diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h index 107dd04acede..0f7276a2270a 100644 --- a/drivers/net/dsa/mt7530.h +++ b/drivers/net/dsa/mt7530.h @@ -186,6 +186,7 @@ enum mt7530_vlan_port_attr { /* Register for port MAC control register */ #define MT7530_PMCR_P(x) (0x3000 + ((x) * 0x100)) #define PMCR_IFG_XMIT(x) (((x) & 0x3) << 18) +#define PMCR_EXT_PHY BIT(17) #define PMCR_MAC_MODE BIT(16) #define PMCR_FORCE_MODE BIT(15) #define PMCR_TX_EN BIT(14) @@ -245,6 +246,7 @@ enum mt7530_vlan_port_attr { /* Register for hw trap modification */ #define MT7530_MHWTRAP 0x7804 +#define MHWTRAP_PHY0_SEL BIT(20) #define MHWTRAP_MANUAL BIT(16) #define MHWTRAP_P5_MAC_SEL BIT(13) #define MHWTRAP_P6_DIS BIT(8) @@ -402,6 +404,30 @@ struct mt7530_port { u16 pvid; }; +/* Port 5 interface select definitions */ +enum p5_interface_select { + P5_DISABLED = 0, + P5_INTF_SEL_PHY_P0, + P5_INTF_SEL_PHY_P4, + P5_INTF_SEL_GMAC5, +}; + +static const char *p5_intf_modes(unsigned int p5_interface) +{ + switch (p5_interface) { + case P5_DISABLED: + return "DISABLED"; + case P5_INTF_SEL_PHY_P0: + return "PHY P0"; + case P5_INTF_SEL_PHY_P4: + return "PHY P4"; + case P5_INTF_SEL_GMAC5: + return "GMAC5"; + default: + return "unknown"; + } +} + /* struct mt7530_priv - This is the main data structure for holding the state * of the driver * @dev: The device pointer @@ -418,6 +444,7 @@ struct mt7530_port { * @reg_mutex: The lock for protecting among process accessing * registers * @p6_interface Holding the current port 6 interface + * @p5_intf_sel: Holding the current port 5 interface select */ struct mt7530_priv { struct device *dev; @@ -431,6 +458,7 @@ struct mt7530_priv { unsigned int id; bool mcm; phy_interface_t p6_interface; + unsigned int p5_intf_sel; struct mt7530_port ports[MT7530_NUM_PORTS]; /* protect among processes for registers access*/
Adding support for port 5. Port 5 can muxed/interface to: - internal 5th GMAC of the switch; can be used as 2nd CPU port or as extra port with an external phy for a 6th ethernet port. - internal PHY of port 0 or 4; Used in most applications so that port 0 or 4 is the WAN port and interfaces with the 2nd GMAC of the SOC. Signed-off-by: René van Dorst <opensource@vdorst.com> rfc->v1: * Removed unnecessary info print suggested by Andrew Lunn * Added support for MII mode for port 5 --- drivers/net/dsa/mt7530.c | 145 ++++++++++++++++++++++++++++++++++++--- drivers/net/dsa/mt7530.h | 28 ++++++++ 2 files changed, 165 insertions(+), 8 deletions(-)