New DSA driver for VSC9953 Seville switch
Subsystems (6)
Vladimir Oltean
maintainerv3 cover New DSA driver for VSC9953 Seville switch
From: Vladimir Oltean <[email protected]>
Looking at the Felix and Ocelot drivers, Maxim asked if it would be possible to use them as a base for a new driver for the Seville switch inside NXP T1040. Turns out, it is! The result is that the mscc_felix driver was extended to probe on Seville.
The biggest challenge seems to be getting register read/write API generic enough to cover such wild bitfield variations between hardware generations.
There is a trivial dependency patch on the regmap core which is in Mark Brown's for-next tree:
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git/commit/?h=for-next&id=8baebfc2aca26e3fa67ab28343671b82be42b22c
I didn't know what to do with it, so I just added it here as well, as 01/13, so that net-next builds wouldn't break.
Maxim Kochetkov (4):
soc/mscc: ocelot: add MII registers description
net: mscc: ocelot: convert SYS_PAUSE_CFG register access to regfield
net: mscc: ocelot: extend watermark encoding function
net: dsa: felix: introduce support for Seville VSC9953 switch
Vladimir Oltean (9):
regmap: add helper for per-port regfield initialization
net: dsa: felix: set proper link speed in felix_phylink_mac_config
net: mscc: ocelot: convert port registers to regmap
net: mscc: ocelot: convert QSYS_SWITCH_PORT_MODE and SYS_PORT_MODE to
regfields
net: dsa: felix: create a template for the DSA tags on xmit
net: mscc: ocelot: split writes to pause frame enable bit and to
thresholds
net: mscc: ocelot: disable flow control on NPI interface
net: dsa: felix: support half-duplex link modes
net: dsa: felix: move probing to felix_vsc9959.c
.../devicetree/bindings/net/dsa/ocelot.txt | 106 +- drivers/net/dsa/ocelot/Kconfig | 12 +- drivers/net/dsa/ocelot/Makefile | 3 +- drivers/net/dsa/ocelot/felix.c | 272 ++-- drivers/net/dsa/ocelot/felix.h | 24 +- drivers/net/dsa/ocelot/felix_vsc9959.c | 308 ++++- drivers/net/dsa/ocelot/seville_vsc9953.c | 1106 +++++++++++++++++ drivers/net/ethernet/mscc/ocelot.c | 86 +- drivers/net/ethernet/mscc/ocelot.h | 9 +- drivers/net/ethernet/mscc/ocelot_board.c | 21 +- drivers/net/ethernet/mscc/ocelot_io.c | 18 +- drivers/net/ethernet/mscc/ocelot_regs.c | 61 +- include/linux/regmap.h | 8 + include/soc/mscc/ocelot.h | 68 +- include/soc/mscc/ocelot_dev.h | 78 -- include/soc/mscc/ocelot_qsys.h | 13 - include/soc/mscc/ocelot_sys.h | 23 - net/dsa/tag_ocelot.c | 21 +- 18 files changed, 1820 insertions(+), 417 deletions(-) create mode 100644 drivers/net/dsa/ocelot/seville_vsc9953.c
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 1/13 regmap: add helper for per-port regfield initialization
From: Vladimir Oltean <[email protected]>
Similar to the standalone regfields, add an initializer for the users who need to set .id_size and .id_offset in order to use the regmap_fields_update_bits_base API.
--- include/linux/regmap.h | 8 ++++++++ 1 file changed, 8 insertions(+)
include/linux/regmap.h +8 -0
@@ -1134,6 +1134,14 @@ struct reg_field { .msb = _msb, \ } +#define REG_FIELD_ID (_reg, _lsb, _msb, _size, _offset) { \ + .reg = _reg, \ + .lsb = _lsb, \ + .msb = _msb, \ + .id_size = _size, \ + .id_offset = _offset, \ + } +struct regmap_field *regmap_field_alloc (struct regmap *regmap,struct reg_field reg_field);void regmap_field_free (struct regmap_field *field);
Signature · 1 line
2.25.1
Mark Brown
maintainerRe: [PATCH v3 net-next 01/13] regmap: add helper for per-port regfield initialization
Quoted 9 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Similar to the standalone regfields, add an initializer for the users who need to set .id_size and .id_offset in order to use the
regmap_fields_update_bits_baseAPI.Signed-off-by Vladimir Oltean <[email protected]>Signed-off-by Mark Brown <[email protected]>
Please either just wait till after the merge window or ask for a pull request like I said when I applied the patch.
Vladimir Oltean
maintainerRe: [PATCH v3 net-next 01/13] regmap: add helper for per-port regfield initialization
Hi Mark,
Quoted 8 lines · Mark Brown
Quoted 6 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Similar to the standalone regfields, add an initializer for the users who need to set .id_size and .id_offset in order to use the
regmap_fields_update_bits_baseAPI.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Vladimir Oltean <[email protected]>Signed-off-by Mark Brown <[email protected]>Please either just wait till after the merge window or ask for a pull request like I said when I applied the patch.
The trouble with waiting is that I'll then have to wait for another release cycle until I can send device tree patches to Shawn Guo's devicetree branch. So this seemed to me as the path of least friction. In my mind I am not exactly sure what the pull request does to improve the work flow. My simplified idea was that you would send a pull request upstream, then David would send a pull request upstream (or the other way around), and poof, this common commit would disappear from one of the pull requests.
But apparently that is now how things work, so could you please create a pull request for David with this patch?
Thanks!
-Vladimir
Re: [PATCH v3 net-next 01/13] regmap: add helper for per-port regfield initialization
Quoted 15 lines · Vladimir Oltean
Hi Mark,
Quoted 12 lines · Mark Brown
Quoted 9 lines · Vladimir Oltean
From: Vladimir Oltean <[email protected]>
Similar to the standalone regfields, add an initializer for the users who need to set .id_size and .id_offset in order to use the
regmap_fields_update_bits_baseAPI.Signed-off-by Vladimir Oltean <[email protected]>Signed-off-by Mark Brown <[email protected]>
Quoted 6 lines
Quoted 2 lines
Please either just wait till after the merge window or ask for a pull request like I said when I applied the patch.
The trouble with waiting is that I'll then have to wait for another release cycle until I can send device tree patches to Shawn Guo's devicetree branch. So this seemed to me as the path of least friction.
You can actually have the device tree changes and the driver changes in the same release as there is no build time dependency.
Quoted 5 lines
In my mind I am not exactly sure what the pull request does to improve the work flow. My simplified idea was that you would send a pull request upstream, then David would send a pull request upstream (or the other way around), and poof, this common commit would disappear from one of the pull requests.
No, this would make you commit appear twice in the history with different hashes. If you want to have what you suggest, Dave needs to first take Mark's PR so both PR will have the same commit hash.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Mark Brown
maintainerRe: [PATCH v3 net-next 01/13] regmap: add helper for per-port regfield initialization
Quoted 11 lines · Alexandre Belloni
Quoted 5 lines · Vladimir Oltean
In my mind I am not exactly sure what the pull request does to improve the work flow. My simplified idea was that you would send a pull request upstream, then David would send a pull request upstream (or the other way around), and poof, this common commit would disappear from one of the pull requests.
No, this would make you commit appear twice in the history with different hashes. If you want to have what you suggest, Dave needs to first take Mark's PR so both PR will have the same commit hash.
Right, in general you shouldn't resend patches which have already been applied especially not to other maintainers. It causes confusion like we saw earlier with Dave applying the patch again (fortunately it seems that he reverted it). As well as the duplicated commits this is often a source of merge confilicts if any changes are made on top of the patch.
I've now sent my pull request for this cycle so it should appear in v5.8-rc1 but in case Dave is still applying stuff even after the merge window opened:
The following changes since commit 8f3d9f354286745c751374f5f1fcafee6b3f3136:
Linux 5.7-rc1 (2020-04-12 12:35:55 -0700)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git tags/regmap-per-port-field
for you to fetch changes up to 8baebfc2aca26e3fa67ab28343671b82be42b22c:
regmap: add helper for per-port regfield initialization (2020-05-29 13:44:30 +0100)
----------------------------------------------------------------
regmap: Add per-port field initialization helpers
----------------------------------------------------------------
Vladimir Oltean (1):
regmap: add helper for per-port regfield initialization
include/linux/regmap.h | 8 ++++++++ 1 file changed, 8 insertions(+)
Vladimir Oltean
maintainerPATCH v3 2/13 net: dsa: felix: set proper link speed in felix_phylink_mac_config
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
state->speed holds a value of 10, 100, 1000 or 2500, but SYS_MAC_FC_CFG_FC_LINK_SPEE and DEV_CLOCK_CFG_LINK_SPEED expect a value in the range 0, 1, 2 or 3.
Even truncated to 2 bits, we are still writing incorrect values to the registers, but for some reason Felix still works.
On Seville (which we're introducing now), however, we need to set correct values for the link speed into the MAC registers. Do that now.
---
Changes in v3:
None.
Changes in v2:
Patch is new.
drivers/net/dsa/ocelot/felix.c | 40 +++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-)
drivers/net/dsa/ocelot/felix.c +32 -8
@@ -208,18 +208,39 @@ static void felix_phylink_mac_config(struct dsa_switch *ds, int port,struct ocelot *ocelot = ds->priv;struct ocelot_port *ocelot_port = ocelot->ports[port];struct felix *felix =ocelot_to_felix (ocelot); -u32 mac_fc_cfg; +u32 clock_cfg, mac_fc_cfg; + +switch (state->speed) { +case SPEED_10 : + mac_fc_cfg =SYS_MAC_FC_CFG_FC_LINK_SPEED (3 ); + clock_cfg =DEV_CLOCK_CFG_LINK_SPEED (3 ); +break ; +case SPEED_100 : + mac_fc_cfg =SYS_MAC_FC_CFG_FC_LINK_SPEED (2 ); + clock_cfg =DEV_CLOCK_CFG_LINK_SPEED (2 ); +break ; +case SPEED_1000 : + mac_fc_cfg =SYS_MAC_FC_CFG_FC_LINK_SPEED (1 ); + clock_cfg =DEV_CLOCK_CFG_LINK_SPEED (1 ); +break ; +case SPEED_2500 : + mac_fc_cfg =SYS_MAC_FC_CFG_FC_LINK_SPEED (1 ); + clock_cfg =DEV_CLOCK_CFG_LINK_SPEED (0 ); +break ; +case SPEED_UNKNOWN : + mac_fc_cfg =SYS_MAC_FC_CFG_FC_LINK_SPEED (0 ); + clock_cfg =DEV_CLOCK_CFG_LINK_SPEED (0 ); +break ; +default : +dev_err (ocelot->dev,"Unsupported speed on port %d: %d\n" , + port, state->speed); +return ; + }/* Take port out of reset by clearing the MAC_TX_RST, MAC_RX_RST and * PORT_RST bits in CLOCK_CFG */ -ocelot_port_writel (ocelot_port,DEV_CLOCK_CFG_LINK_SPEED (state->speed), -DEV_CLOCK_CFG ); - -/* Flow control. Link speed is only used here to evaluate the time -* specification in incoming pause frames. -*/ - mac_fc_cfg =SYS_MAC_FC_CFG_FC_LINK_SPEED (state->speed); +ocelot_port_writel (ocelot_port, clock_cfg,DEV_CLOCK_CFG );/* handle Rx pause in all cases, with 2500base-X this is used for rate * adaptation.
@@ -231,6 +252,9 @@ static void felix_phylink_mac_config(struct dsa_switch *ds, int port,SYS_MAC_FC_CFG_PAUSE_VAL_CFG (0xffff ) |SYS_MAC_FC_CFG_FC_LATENCY_CFG (0x7 ) |SYS_MAC_FC_CFG_ZERO_PAUSE_ENA ; +/* Flow control. Link speed is only used here to evaluate the time +* specification in incoming pause frames. +*/ ocelot_write_rix (ocelot, mac_fc_cfg,SYS_MAC_FC_CFG , port);ocelot_write_rix (ocelot,0 ,ANA_POL_FLOWC , port);
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 3/13 net: mscc: ocelot: convert port registers to regmap
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
At the moment, there are some minimal register differences between VSC7514 Ocelot and VSC9959 Felix. To be precise, the PCS1G registers are missing from Felix because it was integrated with an NXP PCS.
But with VSC9953 Seville (not yet introduced), the register differences are more pronounced. The MAC registers are located at different offsets within the DEV_GMII target. So we need to refactor the driver to keep a regmap even for per-port registers. The callers of the ocelot_port_readl and ocelot_port_writel were kept unchanged, only the implementation is now more generic.
---
Changes in v3:
None.
Changes in v2:
None.
drivers/net/dsa/ocelot/felix.c | 13 ++-- drivers/net/dsa/ocelot/felix_vsc9959.c | 47 +++++++++++++- drivers/net/ethernet/mscc/ocelot.c | 5 +- drivers/net/ethernet/mscc/ocelot.h | 3 +- drivers/net/ethernet/mscc/ocelot_board.c | 8 +-- drivers/net/ethernet/mscc/ocelot_io.c | 16 ++++- drivers/net/ethernet/mscc/ocelot_regs.c | 45 +++++++++++++- include/soc/mscc/ocelot.h | 42 ++++++++++++- include/soc/mscc/ocelot_dev.h | 78 ------------------------ 9 files changed, 158 insertions(+), 99 deletions(-)
drivers/net/dsa/ocelot/felix.c +7 -6
@@ -502,7 +502,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)for (port =0 ; port < num_phys_ports; port++) {struct ocelot_port *ocelot_port; -void __iomem *port_regs; +struct regmap *target; ocelot_port = devm_kzalloc(ocelot->dev, sizeof(struct ocelot_port),
@@ -519,17 +519,18 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports) res.start += switch_base; res.end += switch_base; - port_regs =devm_ioremap_resource (ocelot->dev, &res); -if (IS_ERR (port_regs)) { + target =ocelot_regmap_init (ocelot, &res); +if (IS_ERR (target)) {dev_err (ocelot->dev, -"failed to map registers for port %d\n" , port); +"Failed to map memory space for port %d\n" , + port);kfree (port_phy_modes); -return PTR_ERR (port_regs); +return PTR_ERR (target); } ocelot_port->phy_mode = port_phy_modes[port]; ocelot_port->ocelot = ocelot; - ocelot_port->regs = port_regs; + ocelot_port->target = target; ocelot->ports[port] = ocelot_port; }
drivers/net/dsa/ocelot/felix_vsc9959.c +45 -2
62 lines not on this page · raw message
drivers/net/ethernet/mscc/ocelot.c +2 -3
@@ -2109,8 +2109,7 @@ void ocelot_init_port(struct ocelot *ocelot, int port) }EXPORT_SYMBOL (ocelot_init_port); -int ocelot_probe_port (struct ocelot *ocelot,u8 port, -void __iomem *regs, +int ocelot_probe_port (struct ocelot *ocelot,int port,struct regmap *target,struct phy_device *phy) {struct ocelot_port_private *priv;
@@ -2128,7 +2127,7 @@ int ocelot_probe_port(struct ocelot *ocelot, u8 port, priv->chip_port = port; ocelot_port = &priv->port; ocelot_port->ocelot = ocelot; - ocelot_port->regs = regs; + ocelot_port->target = target; ocelot->ports[port] = ocelot_port; dev->netdev_ops = &ocelot_port_netdev_ops;
drivers/net/ethernet/mscc/ocelot.h +1 -2
@@ -67,8 +67,7 @@ void ocelot_port_writel(struct ocelot_port *port, u32 val, u32 reg);#define ocelot_field_read (ocelot, reg, val) regmap_field_read((ocelot)->regfields[(reg)], (val))int ocelot_chip_init (struct ocelot *ocelot,const struct ocelot_ops *ops); -int ocelot_probe_port (struct ocelot *ocelot,u8 port, -void __iomem *regs, +int ocelot_probe_port (struct ocelot *ocelot,int port,struct regmap *target,struct phy_device *phy); void ocelot_set_cpu_port(struct ocelot *ocelot, int cpu,
drivers/net/ethernet/mscc/ocelot_board.c +4 -4
@@ -506,9 +506,9 @@ static int mscc_ocelot_probe(struct platform_device *pdev)struct device_node *phy_node;phy_interface_t phy_mode;struct phy_device *phy; +struct regmap *target;struct resource *res;struct phy *serdes; -void __iomem *regs;char res_name[8 ];u32 port;
@@ -519,8 +519,8 @@ static int mscc_ocelot_probe(struct platform_device *pdev) res =platform_get_resource_byname (pdev,IORESOURCE_MEM , res_name); - regs =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (regs)) + target =ocelot_regmap_init (ocelot, res); +if (IS_ERR (target))continue ; phy_node =of_parse_phandle (portnp,"phy-handle" ,0 );
@@ -532,7 +532,7 @@ static int mscc_ocelot_probe(struct platform_device *pdev)if (!phy)continue ; - err =ocelot_probe_port (ocelot, port, regs, phy); + err =ocelot_probe_port (ocelot, port, target, phy);if (err) {of_node_put (portnp); goto out_put_ports;
drivers/net/ethernet/mscc/ocelot_io.c +14 -2
@@ -49,13 +49,25 @@ EXPORT_SYMBOL(__ocelot_rmw_ix);u32 ocelot_port_readl (struct ocelot_port *port,u32 reg) { -return readl (port->regs + reg); +struct ocelot *ocelot = port->ocelot; +u16 target = reg >>TARGET_OFFSET ; +u32 val; + +WARN_ON (!target); + +regmap_read (port->target, ocelot->map[target][reg ®_MASK ], &val); +return val; }EXPORT_SYMBOL (ocelot_port_readl);void ocelot_port_writel (struct ocelot_port *port,u32 val,u32 reg) { -writel (val, port->regs + reg); +struct ocelot *ocelot = port->ocelot; +u16 target = reg >>TARGET_OFFSET ; + +WARN_ON (!target); + +regmap_write (port->target, ocelot->map[target][reg ®_MASK ], val); }EXPORT_SYMBOL (ocelot_port_writel);
drivers/net/ethernet/mscc/ocelot_regs.c +44 -1
57 lines not on this page · raw message
include/soc/mscc/ocelot.h +41 -1
60 lines not on this page · raw message
include/soc/mscc/ocelot_dev.h +0 -78
213 lines not on this page · raw message
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 4/13 soc/mscc: ocelot: add MII registers description
In reply to Vladimir OlteanFrom: Maxim Kochetkov <[email protected]>
Add the register definitions for the MSCC MIIM MDIO controller in preparation for seville_vsc9959.c to create its accessors for the internal MDIO bus.
Since we've introduced elements to ocelot_regfields that are not instantiated by felix and ocelot, we need to define the size of the regfields arrays explicitly, otherwise ocelot_regfields_init, which iterates up to REGFIELD_MAX, will fault on the undefined regfield entries (if we're lucky).
---
Changes in v3:
None.
Changes in v2:
Initialize regfields array with correct size.
drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +- drivers/net/ethernet/mscc/ocelot_regs.c | 2 +- include/soc/mscc/ocelot.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/net/dsa/ocelot/felix_vsc9959.c +1 -1
@@ -469,7 +469,7 @@ static const struct resource vsc9959_imdio_res = { .name = "imdio", }; -static const struct reg_field vsc9959_regfields[] = { +static const struct reg_field vsc9959_regfields[REGFIELD_MAX ] = { [ANA_ADVLEARN_VLAN_CHK ] =REG_FIELD (ANA_ADVLEARN ,6 ,6 ), [ANA_ADVLEARN_LEARN_MIRROR ] =REG_FIELD (ANA_ADVLEARN ,0 ,5 ), [ANA_ANEVENTS_FLOOD_DISCARD ] =REG_FIELD (ANA_ANEVENTS ,30 ,30 ),
drivers/net/ethernet/mscc/ocelot_regs.c +1 -1
@@ -299,7 +299,7 @@ static const u32 *ocelot_regmap[TARGET_MAX] = { [DEV_GMII] = ocelot_dev_gmii_regmap, }; -static const struct reg_field ocelot_regfields[] = { +static const struct reg_field ocelot_regfields[REGFIELD_MAX ] = { [ANA_ADVLEARN_VLAN_CHK ] =REG_FIELD (ANA_ADVLEARN ,11 ,11 ), [ANA_ADVLEARN_LEARN_MIRROR ] =REG_FIELD (ANA_ADVLEARN ,0 ,10 ), [ANA_ANEVENTS_MSTI_DROP ] =REG_FIELD (ANA_ANEVENTS ,27 ,27 ),
include/soc/mscc/ocelot.h +5 -0
@@ -394,6 +394,9 @@ enum ocelot_reg {PTP_CLK_CFG_ADJ_CFG ,PTP_CLK_CFG_ADJ_FREQ ,GCB_SOFT_RST =GCB <<TARGET_OFFSET , +GCB_MIIM_MII_STATUS , +GCB_MIIM_MII_CMD , +GCB_MIIM_MII_DATA ,DEV_CLOCK_CFG =DEV_GMII <<TARGET_OFFSET ,DEV_PORT_MISC , DEV_EVENTS,
@@ -481,6 +484,8 @@ enum ocelot_regfield {SYS_RESET_CFG_MEM_ENA ,SYS_RESET_CFG_MEM_INIT ,GCB_SOFT_RST_SWC_RST , +GCB_MIIM_MII_STATUS_PENDING , +GCB_MIIM_MII_STATUS_BUSY , REGFIELD_MAX };
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 5/13 net: mscc: ocelot: convert QSYS_SWITCH_PORT_MODE and SYS_PORT_MODE to regfields
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Currently Felix and Ocelot share the same bit layout in these per-port registers, but Seville does not. So we need reg_fields for that.
Actually since these are per-port registers, we need to also specify the number of ports, and register size per port, and use the regmap API for multiple ports.
There's a more subtle point to be made about the QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG register field, which we are not writing any longer. Using the previous API (ocelot_write_rix), we were only writing 1 for Felix and Ocelot, which was their hardware-default value, so we weren't changing its value in practice. So the equivalent with ocelot_fields_write would be to simply not do anything at all for the SCH_NEXT_CFG field. Actually this is even required if we want to support Seville too, since Seville does not have the register field at all.
---
Changes in v3:
Clarified in the commit message why we're no longer writing to the QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG register field.
Changes in v2:
None.
drivers/net/dsa/ocelot/felix.c | 11 +++---- drivers/net/dsa/ocelot/felix_vsc9959.c | 11 +++++++ drivers/net/ethernet/mscc/ocelot.c | 44 ++++++++++++------------- drivers/net/ethernet/mscc/ocelot.h | 6 ---- drivers/net/ethernet/mscc/ocelot_io.c | 2 ++ drivers/net/ethernet/mscc/ocelot_regs.c | 11 +++++++ include/soc/mscc/ocelot.h | 15 +++++++++ include/soc/mscc/ocelot_qsys.h | 13 -------- include/soc/mscc/ocelot_sys.h | 13 -------- 9 files changed, 66 insertions(+), 60 deletions(-)
drivers/net/dsa/ocelot/felix.c +5 -6
@@ -284,8 +284,7 @@ static void felix_phylink_mac_link_down(struct dsa_switch *ds, int port,struct ocelot_port *ocelot_port = ocelot->ports[port];ocelot_port_writel (ocelot_port,0 ,DEV_MAC_ENA_CFG ); -ocelot_rmw_rix (ocelot,0 ,QSYS_SWITCH_PORT_MODE_PORT_ENA , -QSYS_SWITCH_PORT_MODE , port); +ocelot_fields_write (ocelot, port,QSYS_SWITCH_PORT_MODE_PORT_ENA ,0 ); } static void felix_phylink_mac_link_up(struct dsa_switch *ds, int port,
@@ -311,10 +310,10 @@ static void felix_phylink_mac_link_up(struct dsa_switch *ds, int port, ANA_PORT_PORT_CFG, port);/* Core: Enable port for frame transfer */ -ocelot_write_rix (ocelot,QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE | -QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG (1 ) | -QSYS_SWITCH_PORT_MODE_PORT_ENA , -QSYS_SWITCH_PORT_MODE , port); +ocelot_fields_write (ocelot, port, +QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE ,1 ); +ocelot_fields_write (ocelot, port, +QSYS_SWITCH_PORT_MODE_PORT_ENA ,1 ); }static void felix_port_qos_map_init (struct ocelot *ocelot,int port)
drivers/net/dsa/ocelot/felix_vsc9959.c +11 -0
@@ -503,6 +503,17 @@ static const struct reg_field vsc9959_regfields[REGFIELD_MAX] = { [ANA_TABLES_MACTINDX_M_INDEX] = REG_FIELD(ANA_TABLES_MACTINDX, 0, 10), [SYS_RESET_CFG_CORE_ENA] = REG_FIELD(SYS_RESET_CFG, 0, 0), [GCB_SOFT_RST_SWC_RST ] =REG_FIELD (GCB_SOFT_RST ,0 ,0 ), + /* Replicated per number of ports (7), register size 4 per port */ + [QSYS_SWITCH_PORT_MODE_PORT_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 14, 14, 7, 4), + [QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 11, 13, 7, 4), + [QSYS_SWITCH_PORT_MODE_YEL_RSRVD] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 10, 10, 7, 4), + [QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 9, 9, 7, 4), + [QSYS_SWITCH_PORT_MODE_TX_PFC_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 1, 8, 7, 4), + [QSYS_SWITCH_PORT_MODE_TX_PFC_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 0, 0, 7, 4), + [SYS_PORT_MODE_DATA_WO_TS] = REG_FIELD_ID(SYS_PORT_MODE, 5, 6, 7, 4), + [SYS_PORT_MODE_INCL_INJ_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 3, 4, 7, 4), + [SYS_PORT_MODE_INCL_XTR_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 1, 2, 7, 4), + [SYS_PORT_MODE_INCL_HDR_ERR] = REG_FIELD_ID(SYS_PORT_MODE, 0, 0, 7, 4), };static const struct ocelot_stat_layout vsc9959_stats_layout[] = {
drivers/net/ethernet/mscc/ocelot.c +22 -22
67 lines not on this page · raw message
drivers/net/ethernet/mscc/ocelot.h +0 -6
@@ -63,9 +63,6 @@ struct ocelot_port_private {u32 ocelot_port_readl (struct ocelot_port *port,u32 reg);void ocelot_port_writel (struct ocelot_port *port,u32 val,u32 reg); -#define ocelot_field_write (ocelot, reg, val) regmap_field_write((ocelot)->regfields[(reg)], (val)) -#define ocelot_field_read (ocelot, reg, val) regmap_field_read((ocelot)->regfields[(reg)], (val)) -int ocelot_chip_init (struct ocelot *ocelot,const struct ocelot_ops *ops);int ocelot_probe_port (struct ocelot *ocelot,int port,struct regmap *target,struct phy_device *phy);
@@ -78,7 +75,4 @@ extern struct notifier_block ocelot_netdevice_nb;extern struct notifier_block ocelot_switchdev_nb;extern struct notifier_block ocelot_switchdev_blocking_nb; -#define ocelot_field_write (ocelot, reg, val) regmap_field_write((ocelot)->regfields[(reg)], (val)) -#define ocelot_field_read (ocelot, reg, val) regmap_field_read((ocelot)->regfields[(reg)], (val)) -#endif
drivers/net/ethernet/mscc/ocelot_io.c +2 -0
@@ -89,6 +89,8 @@ int ocelot_regfields_init(struct ocelot *ocelot, regfield.reg = ocelot->map[target][reg ®_MASK ]; regfield.lsb = regfields[i].lsb; regfield.msb = regfields[i].msb; + regfield.id_size = regfields[i].id_size; + regfield.id_offset = regfields[i].id_offset; ocelot->regfields[i] = devm_regmap_field_alloc(ocelot->dev,
drivers/net/ethernet/mscc/ocelot_regs.c +11 -0
@@ -341,6 +341,17 @@ static const struct reg_field ocelot_regfields[REGFIELD_MAX] = { [SYS_RESET_CFG_CORE_ENA] = REG_FIELD(SYS_RESET_CFG, 2, 2), [SYS_RESET_CFG_MEM_ENA] = REG_FIELD(SYS_RESET_CFG, 1, 1), [SYS_RESET_CFG_MEM_INIT ] =REG_FIELD (SYS_RESET_CFG ,0 ,0 ), + /* Replicated per number of ports (11), register size 4 per port */ + [QSYS_SWITCH_PORT_MODE_PORT_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 14, 14, 11, 4), + [QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 11, 13, 11, 4), + [QSYS_SWITCH_PORT_MODE_YEL_RSRVD] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 10, 10, 11, 4), + [QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 9, 9, 11, 4), + [QSYS_SWITCH_PORT_MODE_TX_PFC_ENA] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 1, 8, 11, 4), + [QSYS_SWITCH_PORT_MODE_TX_PFC_MODE] = REG_FIELD_ID(QSYS_SWITCH_PORT_MODE, 0, 0, 11, 4), + [SYS_PORT_MODE_DATA_WO_TS] = REG_FIELD_ID(SYS_PORT_MODE, 5, 6, 11, 4), + [SYS_PORT_MODE_INCL_INJ_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 3, 4, 11, 4), + [SYS_PORT_MODE_INCL_XTR_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 1, 2, 11, 4), + [SYS_PORT_MODE_INCL_HDR_ERR] = REG_FIELD_ID(SYS_PORT_MODE, 0, 0, 11, 4), };static const struct ocelot_stat_layout ocelot_stats_layout[] = {
include/soc/mscc/ocelot.h +15 -0
@@ -475,11 +475,21 @@ enum ocelot_regfield {ANA_TABLES_MACACCESS_B_DOM ,ANA_TABLES_MACTINDX_BUCKET ,ANA_TABLES_MACTINDX_M_INDEX , +QSYS_SWITCH_PORT_MODE_PORT_ENA , +QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG , +QSYS_SWITCH_PORT_MODE_YEL_RSRVD , +QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE , +QSYS_SWITCH_PORT_MODE_TX_PFC_ENA , +QSYS_SWITCH_PORT_MODE_TX_PFC_MODE ,QSYS_TIMED_FRAME_ENTRY_TFRM_VLD ,QSYS_TIMED_FRAME_ENTRY_TFRM_FP ,QSYS_TIMED_FRAME_ENTRY_TFRM_PORTNO ,QSYS_TIMED_FRAME_ENTRY_TFRM_TM_SEL ,QSYS_TIMED_FRAME_ENTRY_TFRM_TM_T , +SYS_PORT_MODE_DATA_WO_TS , +SYS_PORT_MODE_INCL_INJ_HDR , +SYS_PORT_MODE_INCL_XTR_HDR , +SYS_PORT_MODE_INCL_HDR_ERR ,SYS_RESET_CFG_CORE_ENA ,SYS_RESET_CFG_MEM_ENA , SYS_RESET_CFG_MEM_INIT,
@@ -623,6 +633,11 @@ struct ocelot_policer {#define ocelot_rmw_rix (ocelot, val, m, reg, ri) __ocelot_rmw_ix(ocelot, val, m, reg, reg##_RSZ * (ri))#define ocelot_rmw (ocelot, val, m, reg) __ocelot_rmw_ix(ocelot, val, m, reg, 0) +#define ocelot_field_write (ocelot, reg, val) regmap_field_write((ocelot)->regfields[(reg)], (val)) +#define ocelot_field_read (ocelot, reg, val) regmap_field_read((ocelot)->regfields[(reg)], (val)) +#define ocelot_fields_write (ocelot, id, reg, val) regmap_fields_write((ocelot)->regfields[(reg)], (id), (val)) +#define ocelot_fields_read (ocelot, id, reg, val) regmap_fields_read((ocelot)->regfields[(reg)], (id), (val)) +/* I/O */ u32 ocelot_port_readl (struct ocelot_port *port,u32 reg);void ocelot_port_writel (struct ocelot_port *port,u32 val,u32 reg);
include/soc/mscc/ocelot_qsys.h +0 -13
@@ -13,19 +13,6 @@#define QSYS_PORT_MODE_DEQUEUE_DIS BIT(1)#define QSYS_PORT_MODE_DEQUEUE_LATE BIT(0) -#define QSYS_SWITCH_PORT_MODE_RSZ 0x4 - -#define QSYS_SWITCH_PORT_MODE_PORT_ENA BIT(14) -#define QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG (x) (((x) << 11) & GENMASK(13, 11)) -#define QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG_M GENMASK(13, 11) -#define QSYS_SWITCH_PORT_MODE_SCH_NEXT_CFG_X (x) (((x) & GENMASK(13, 11)) >> 11) -#define QSYS_SWITCH_PORT_MODE_YEL_RSRVD BIT(10) -#define QSYS_SWITCH_PORT_MODE_INGRESS_DROP_MODE BIT(9) -#define QSYS_SWITCH_PORT_MODE_TX_PFC_ENA (x) (((x) << 1) & GENMASK(8, 1)) -#define QSYS_SWITCH_PORT_MODE_TX_PFC_ENA_M GENMASK(8, 1) -#define QSYS_SWITCH_PORT_MODE_TX_PFC_ENA_X (x) (((x) & GENMASK(8, 1)) >> 1) -#define QSYS_SWITCH_PORT_MODE_TX_PFC_MODE BIT(0) -#define QSYS_STAT_CNT_CFG_TX_GREEN_CNT_MODE BIT(5)#define QSYS_STAT_CNT_CFG_TX_YELLOW_CNT_MODE BIT(4)#define QSYS_STAT_CNT_CFG_DROP_GREEN_CNT_MODE BIT(3)
include/soc/mscc/ocelot_sys.h +0 -13
@@ -12,19 +12,6 @@#define SYS_COUNT_TX_OCTETS_RSZ 0x4 -#define SYS_PORT_MODE_RSZ 0x4 - -#define SYS_PORT_MODE_DATA_WO_TS (x) (((x) << 5) & GENMASK(6, 5)) -#define SYS_PORT_MODE_DATA_WO_TS_M GENMASK(6, 5) -#define SYS_PORT_MODE_DATA_WO_TS_X (x) (((x) & GENMASK(6, 5)) >> 5) -#define SYS_PORT_MODE_INCL_INJ_HDR (x) (((x) << 3) & GENMASK(4, 3)) -#define SYS_PORT_MODE_INCL_INJ_HDR_M GENMASK(4, 3) -#define SYS_PORT_MODE_INCL_INJ_HDR_X (x) (((x) & GENMASK(4, 3)) >> 3) -#define SYS_PORT_MODE_INCL_XTR_HDR (x) (((x) << 1) & GENMASK(2, 1)) -#define SYS_PORT_MODE_INCL_XTR_HDR_M GENMASK(2, 1) -#define SYS_PORT_MODE_INCL_XTR_HDR_X (x) (((x) & GENMASK(2, 1)) >> 1) -#define SYS_PORT_MODE_INJ_HDR_ERR BIT(0) -#define SYS_FRONT_PORT_MODE_RSZ 0x4#define SYS_FRONT_PORT_MODE_HDX_MODE BIT(0)
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 6/13 net: dsa: felix: create a template for the DSA tags on xmit
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
With this patch we try to kill 2 birds with 1 stone.
First of all, some switches that use tag_ocelot.c don't have the exact same bitfield layout for the DSA tags. The destination ports field is different for Seville VSC9953 for example. So the choices are to either duplicate tag_ocelot.c into a new tag_seville.c (sub-optimal) or somehow take into account a supposed ocelot->dest_ports_offset when packing this field into the DSA injection header (again not ideal).
Secondly, tag_ocelot.c already needs to memset a 128-bit area to zero and call some packing() functions of dubious performance in the fastpath. And most of the values it needs to pack are pretty much constant (BYPASS=1, SRC_PORT=CPU, DEST=port index). So it would be good if we could improve that.
The proposed solution is to allocate a memory area per port at probe time, initialize that with the statically defined bits as per chip hardware revision, and just perform a simpler memcpy in the fastpath.
Other alternatives have been analyzed, such as:
- Create a separate tag_seville.c: too much code duplication for just 1 bit field difference.
- Create a separate DSA_TAG_PROTO_SEVILLE under tag_ocelot.c, just like tag_brcm.c, which would have a separate .xmit function. Again, too much code duplication for just 1 bit field difference.
- Allocate the template from the init function of the tag_ocelot.c module, instead of from the driver: couldn't figure out a method of accessing the correct port template corresponding to the correct tagger in the .xmit function.
---
Changes in v3:
None.
Changes in v2:
Created a function pointer such that Seville could reuse more code.
drivers/net/dsa/ocelot/felix.c | 13 +++++++++++++ drivers/net/dsa/ocelot/felix.h | 1 + drivers/net/dsa/ocelot/felix_vsc9959.c | 20 ++++++++++++++++++++ include/soc/mscc/ocelot.h | 2 ++ net/dsa/tag_ocelot.c | 21 ++++++++------------- 5 files changed, 44 insertions(+), 13 deletions(-)
drivers/net/dsa/ocelot/felix.c +13 -0
@@ -502,6 +502,7 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)for (port =0 ; port < num_phys_ports; port++) {struct ocelot_port *ocelot_port;struct regmap *target; +u8 *template; ocelot_port = devm_kzalloc(ocelot->dev, sizeof(struct ocelot_port),
@@ -527,10 +528,22 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)return PTR_ERR (target); } + template =devm_kzalloc (ocelot->dev,OCELOT_TAG_LEN , +GFP_KERNEL ); +if (!template) { +dev_err (ocelot->dev, +"Failed to allocate memory for DSA tag\n" ); +kfree (port_phy_modes); +return -ENOMEM ; + } + ocelot_port->phy_mode = port_phy_modes[port]; ocelot_port->ocelot = ocelot; ocelot_port->target = target; + ocelot_port->xmit_template = template; ocelot->ports[port] = ocelot_port; + + felix->info->xmit_template_populate (ocelot, port); }kfree (port_phy_modes);
drivers/net/dsa/ocelot/felix.h +1 -0
@@ -40,6 +40,7 @@ struct felix_info { enum tc_setup_type type, void *type_data);void (*port_sched_speed_set)(struct ocelot *ocelot,int port,u32 speed); +void (*xmit_template_populate)(struct ocelot *ocelot,int port); };extern struct felix_info felix_info_vsc9959;
drivers/net/dsa/ocelot/felix_vsc9959.c +20 -0
@@ -8,6 +8,7 @@#include <soc/mscc/ocelot_ptp.h> #include <soc/mscc/ocelot_sys.h> #include <soc/mscc/ocelot.h> +#include <linux/packing.h> #include <net/pkt_sched.h> #include <linux/iopoll.h> #include <linux/pci.h>
@@ -1446,6 +1447,24 @@ static int vsc9959_port_setup_tc(struct dsa_switch *ds, int port, } } +static void vsc9959_xmit_template_populate (struct ocelot *ocelot,int port) +{ +struct ocelot_port *ocelot_port = ocelot->ports[port]; +u8 *template = ocelot_port->xmit_template; +u64 bypass, dest, src; + +/* Set the source port as the CPU port module and not the +* NPI port +*/ + src = ocelot->num_phys_ports; + dest =BIT (port); + bypass = true; + +packing (template, &bypass,127 ,127 ,OCELOT_TAG_LEN ,PACK ,0 ); +packing (template, &dest,68 ,56 ,OCELOT_TAG_LEN ,PACK ,0 ); +packing (template, &src,46 ,43 ,OCELOT_TAG_LEN ,PACK ,0 ); +} +struct felix_info felix_info_vsc9959 = { .target_io_res = vsc9959_target_io_res, .port_io_res = vsc9959_port_io_res,
@@ -1472,4 +1491,5 @@ struct felix_info felix_info_vsc9959 = { .prevalidate_phy_mode = vsc9959_prevalidate_phy_mode, .port_setup_tc = vsc9959_port_setup_tc, .port_sched_speed_set = vsc9959_sched_speed_set, + .xmit_template_populate = vsc9959_xmit_template_populate, };
include/soc/mscc/ocelot.h +2 -0
@@ -549,6 +549,8 @@ struct ocelot_port {u8 ts_id;phy_interface_t phy_mode; + +u8 *xmit_template; };struct ocelot {
net/dsa/tag_ocelot.c +8 -13
@@ -137,11 +137,10 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb, struct net_device *netdev) {struct dsa_port *dp =dsa_slave_to_port (netdev); -u64 bypass, dest, src, qos_class, rew_op;struct dsa_switch *ds = dp->ds; -int port = dp->index;struct ocelot *ocelot = ds->priv; -struct ocelot_port *ocelot_port = ocelot->ports[port]; +struct ocelot_port *ocelot_port; +u64 qos_class, rew_op;u8 *injection;if (unlikely (skb_cow_head (skb,OCELOT_TAG_LEN ) <0 )) {
@@ -149,19 +148,15 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb,return NULL ; } - injection =skb_push (skb,OCELOT_TAG_LEN ); + ocelot_port = ocelot->ports[dp->index]; -memset (injection,0 ,OCELOT_TAG_LEN ); + injection =skb_push (skb,OCELOT_TAG_LEN ); -/* Set the source port as the CPU port module and not the NPI port */ - src = ocelot->num_phys_ports; - dest =BIT (port); - bypass = true; +memcpy (injection, ocelot_port->xmit_template,OCELOT_TAG_LEN ); +/* Fix up the fields which are not statically determined +* in the template +*/ qos_class = skb->priority; - -packing (injection, &bypass,127 ,127 ,OCELOT_TAG_LEN ,PACK ,0 ); -packing (injection, &dest,68 ,56 ,OCELOT_TAG_LEN ,PACK ,0 ); -packing (injection, &src,46 ,43 ,OCELOT_TAG_LEN ,PACK ,0 );packing (injection, &qos_class,19 ,17 ,OCELOT_TAG_LEN ,PACK ,0 );if (ocelot->ptp && (skb_shinfo (skb)->tx_flags &SKBTX_HW_TSTAMP )) {
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 7/13 net: mscc: ocelot: split writes to pause frame enable bit and to thresholds
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
We don't want ocelot_port_set_maxlen to enable pause frame TX, just to adjust the pause thresholds.
Move the unconditional enabling of pause TX to ocelot_init_port. There is no good place to put such setting because it shouldn't be unconditional. But at the moment it is, we're not changing that.
---
Changes in v3:
None.
Changes in v2:
None.
drivers/net/ethernet/mscc/ocelot.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/net/ethernet/mscc/ocelot.c +12 -7
@@ -2013,6 +2013,7 @@ void ocelot_port_set_maxlen(struct ocelot *ocelot, int port, size_t sdu) {struct ocelot_port *ocelot_port = ocelot->ports[port];int maxlen = sdu +ETH_HLEN +ETH_FCS_LEN ; +int pause_start, pause_stop;int atop_wm;if (port == ocelot->npi) {
@@ -2026,13 +2027,13 @@ void ocelot_port_set_maxlen(struct ocelot *ocelot, int port, size_t sdu)ocelot_port_writel (ocelot_port, maxlen,DEV_MAC_MAXLEN_CFG ); -/* Set Pause WM hysteresis -* 152 = 6 * maxlen / OCELOT_BUFFER_CELL_SZ -* 101 = 4 * maxlen / OCELOT_BUFFER_CELL_SZ -*/ -ocelot_write_rix (ocelot,SYS_PAUSE_CFG_PAUSE_ENA | -SYS_PAUSE_CFG_PAUSE_STOP (101 ) | -SYS_PAUSE_CFG_PAUSE_START (152 ),SYS_PAUSE_CFG , port); +/* Set Pause watermark hysteresis */ + pause_start =6 * maxlen /OCELOT_BUFFER_CELL_SZ ; + pause_stop =4 * maxlen /OCELOT_BUFFER_CELL_SZ ; +ocelot_rmw_rix (ocelot,SYS_PAUSE_CFG_PAUSE_START (pause_start), +SYS_PAUSE_CFG_PAUSE_START_M ,SYS_PAUSE_CFG , port); +ocelot_rmw_rix (ocelot,SYS_PAUSE_CFG_PAUSE_STOP (pause_stop), +SYS_PAUSE_CFG_PAUSE_STOP_M ,SYS_PAUSE_CFG , port);/* Tail dropping watermark */ atop_wm = (ocelot->shared_queue_sz - 9 * maxlen) /
@@ -2095,6 +2096,10 @@ void ocelot_init_port(struct ocelot *ocelot, int port)ocelot_port_writel (ocelot_port,0 ,DEV_MAC_FC_MAC_HIGH_CFG );ocelot_port_writel (ocelot_port,0 ,DEV_MAC_FC_MAC_LOW_CFG ); +/* Enable transmission of pause frames */ +ocelot_rmw_rix (ocelot,SYS_PAUSE_CFG_PAUSE_ENA ,SYS_PAUSE_CFG_PAUSE_ENA , +SYS_PAUSE_CFG , port); +/* Drop frames with multicast source address */ ocelot_rmw_gix(ocelot, ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA, ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 8/13 net: mscc: ocelot: disable flow control on NPI interface
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
The Ocelot switches do not support flow control on Ethernet interfaces where a DSA tag must be added. If pause frames are enabled, they will be encapsulated in the DSA tag just like regular frames, and the DSA master will not recognize them.
---
Changes in v3:
None.
Changes in v2:
None.
drivers/net/ethernet/mscc/ocelot.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/net/ethernet/mscc/ocelot.c +4 -0
@@ -2202,6 +2202,10 @@ void ocelot_configure_cpu(struct ocelot *ocelot, int npi, extraction);ocelot_fields_write (ocelot, npi,SYS_PORT_MODE_INCL_INJ_HDR , injection); + +/* Disable transmission of pause frames */ +ocelot_rmw_rix (ocelot,0 ,SYS_PAUSE_CFG_PAUSE_ENA , +SYS_PAUSE_CFG , npi); }/* Enable CPU port module */
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 9/13 net: mscc: ocelot: convert SYS_PAUSE_CFG register access to regfield
In reply to Vladimir OlteanFrom: Maxim Kochetkov <[email protected]>
Seville has a different bitwise layout than Ocelot and Felix.
---
Changes in v3:
None.
Changes in v2:
None.
drivers/net/dsa/ocelot/felix_vsc9959.c | 3 +++ drivers/net/ethernet/mscc/ocelot.c | 14 ++++++-------- drivers/net/ethernet/mscc/ocelot_regs.c | 3 +++ include/soc/mscc/ocelot.h | 3 +++ include/soc/mscc/ocelot_sys.h | 10 ---------- 5 files changed, 15 insertions(+), 18 deletions(-)
drivers/net/dsa/ocelot/felix_vsc9959.c +3 -0
@@ -515,6 +515,9 @@ static const struct reg_field vsc9959_regfields[REGFIELD_MAX] = { [SYS_PORT_MODE_INCL_INJ_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 3, 4, 7, 4), [SYS_PORT_MODE_INCL_XTR_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 1, 2, 7, 4), [SYS_PORT_MODE_INCL_HDR_ERR] = REG_FIELD_ID(SYS_PORT_MODE, 0, 0, 7, 4), + [SYS_PAUSE_CFG_PAUSE_START] = REG_FIELD_ID(SYS_PAUSE_CFG, 10, 18, 7, 4), + [SYS_PAUSE_CFG_PAUSE_STOP] = REG_FIELD_ID(SYS_PAUSE_CFG, 1, 9, 7, 4), + [SYS_PAUSE_CFG_PAUSE_ENA] = REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 7, 4), };static const struct ocelot_stat_layout vsc9959_stats_layout[] = {
drivers/net/ethernet/mscc/ocelot.c +6 -8
@@ -2030,10 +2030,10 @@ void ocelot_port_set_maxlen(struct ocelot *ocelot, int port, size_t sdu)/* Set Pause watermark hysteresis */ pause_start =6 * maxlen /OCELOT_BUFFER_CELL_SZ ; pause_stop =4 * maxlen /OCELOT_BUFFER_CELL_SZ ; -ocelot_rmw_rix (ocelot,SYS_PAUSE_CFG_PAUSE_START (pause_start), -SYS_PAUSE_CFG_PAUSE_START_M ,SYS_PAUSE_CFG , port); -ocelot_rmw_rix (ocelot,SYS_PAUSE_CFG_PAUSE_STOP (pause_stop), -SYS_PAUSE_CFG_PAUSE_STOP_M ,SYS_PAUSE_CFG , port); +ocelot_fields_write (ocelot, port,SYS_PAUSE_CFG_PAUSE_START , + pause_start); +ocelot_fields_write (ocelot, port,SYS_PAUSE_CFG_PAUSE_STOP , + pause_stop);/* Tail dropping watermark */ atop_wm = (ocelot->shared_queue_sz - 9 * maxlen) /
@@ -2097,8 +2097,7 @@ void ocelot_init_port(struct ocelot *ocelot, int port)ocelot_port_writel (ocelot_port,0 ,DEV_MAC_FC_MAC_LOW_CFG );/* Enable transmission of pause frames */ -ocelot_rmw_rix (ocelot,SYS_PAUSE_CFG_PAUSE_ENA ,SYS_PAUSE_CFG_PAUSE_ENA , -SYS_PAUSE_CFG , port); +ocelot_fields_write (ocelot, port,SYS_PAUSE_CFG_PAUSE_ENA ,1 );/* Drop frames with multicast source address */ ocelot_rmw_gix(ocelot, ANA_PORT_DROP_CFG_DROP_MC_SMAC_ENA,
@@ -2204,8 +2203,7 @@ void ocelot_configure_cpu(struct ocelot *ocelot, int npi, injection);/* Disable transmission of pause frames */ -ocelot_rmw_rix (ocelot,0 ,SYS_PAUSE_CFG_PAUSE_ENA , -SYS_PAUSE_CFG , npi); +ocelot_fields_write (ocelot, npi,SYS_PAUSE_CFG_PAUSE_ENA ,0 ); }/* Enable CPU port module */
drivers/net/ethernet/mscc/ocelot_regs.c +3 -0
@@ -352,6 +352,9 @@ static const struct reg_field ocelot_regfields[REGFIELD_MAX] = { [SYS_PORT_MODE_INCL_INJ_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 3, 4, 11, 4), [SYS_PORT_MODE_INCL_XTR_HDR] = REG_FIELD_ID(SYS_PORT_MODE, 1, 2, 11, 4), [SYS_PORT_MODE_INCL_HDR_ERR] = REG_FIELD_ID(SYS_PORT_MODE, 0, 0, 11, 4), + [SYS_PAUSE_CFG_PAUSE_START] = REG_FIELD_ID(SYS_PAUSE_CFG, 10, 18, 11, 4), + [SYS_PAUSE_CFG_PAUSE_STOP] = REG_FIELD_ID(SYS_PAUSE_CFG, 1, 9, 11, 4), + [SYS_PAUSE_CFG_PAUSE_ENA] = REG_FIELD_ID(SYS_PAUSE_CFG, 0, 1, 11, 4), };static const struct ocelot_stat_layout ocelot_stats_layout[] = {
include/soc/mscc/ocelot.h +3 -0
@@ -496,6 +496,9 @@ enum ocelot_regfield {GCB_SOFT_RST_SWC_RST ,GCB_MIIM_MII_STATUS_PENDING ,GCB_MIIM_MII_STATUS_BUSY , +SYS_PAUSE_CFG_PAUSE_START , +SYS_PAUSE_CFG_PAUSE_STOP , +SYS_PAUSE_CFG_PAUSE_ENA , REGFIELD_MAX };
include/soc/mscc/ocelot_sys.h +0 -10
@@ -43,16 +43,6 @@#define SYS_TIMESTAMP_OFFSET_TIMESTAMP_OFFSET (x) ((x) & GENMASK(5, 0))#define SYS_TIMESTAMP_OFFSET_TIMESTAMP_OFFSET_M GENMASK(5, 0) -#define SYS_PAUSE_CFG_RSZ 0x4 - -#define SYS_PAUSE_CFG_PAUSE_START (x) (((x) << 10) & GENMASK(18, 10)) -#define SYS_PAUSE_CFG_PAUSE_START_M GENMASK(18, 10) -#define SYS_PAUSE_CFG_PAUSE_START_X (x) (((x) & GENMASK(18, 10)) >> 10) -#define SYS_PAUSE_CFG_PAUSE_STOP (x) (((x) << 1) & GENMASK(9, 1)) -#define SYS_PAUSE_CFG_PAUSE_STOP_M GENMASK(9, 1) -#define SYS_PAUSE_CFG_PAUSE_STOP_X (x) (((x) & GENMASK(9, 1)) >> 1) -#define SYS_PAUSE_CFG_PAUSE_ENA BIT(0) -#define SYS_PAUSE_TOT_CFG_PAUSE_TOT_START (x) (((x) << 9) & GENMASK(17, 9))#define SYS_PAUSE_TOT_CFG_PAUSE_TOT_START_M GENMASK(17, 9)#define SYS_PAUSE_TOT_CFG_PAUSE_TOT_START_X (x) (((x) & GENMASK(17, 9)) >> 9)
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 10/13 net: mscc: ocelot: extend watermark encoding function
In reply to Vladimir OlteanFrom: Maxim Kochetkov <[email protected]>
The ocelot_wm_encode function deals with setting thresholds for pause frame start and stop. In Ocelot and Felix the register layout is the same, but for Seville, it isn't. The easiest way to accommodate Seville hardware configuration is to introduce a function pointer for setting this up.
---
Changes in v3:
None.
Changes in v2:
None.
drivers/net/dsa/ocelot/felix_vsc9959.c | 13 +++++++++++++ drivers/net/ethernet/mscc/ocelot.c | 16 ++-------------- drivers/net/ethernet/mscc/ocelot_board.c | 13 +++++++++++++ include/soc/mscc/ocelot.h | 1 + 4 files changed, 29 insertions(+), 14 deletions(-)
drivers/net/dsa/ocelot/felix_vsc9959.c +13 -0
@@ -1163,8 +1163,21 @@ static int vsc9959_prevalidate_phy_mode(struct ocelot *ocelot, int port, } } +/* Watermark encode +* Bit 8: Unit; 0:1, 1:16 +* Bit 7-0: Value to be multiplied with unit +*/ +static u16 vsc9959_wm_enc (u16 value) +{ +if (value >=BIT (8 )) +return BIT (8 ) | (value /16 ); + +return value; +} +static const struct ocelot_ops vsc9959_ops = { .reset = vsc9959_reset, + .wm_enc = vsc9959_wm_enc, };static int vsc9959_mdio_bus_alloc (struct ocelot *ocelot)
drivers/net/ethernet/mscc/ocelot.c +2 -14
@@ -396,18 +396,6 @@ static void ocelot_vlan_init(struct ocelot *ocelot) } } -/* Watermark encode -* Bit 8: Unit; 0:1, 1:16 -* Bit 7-0: Value to be multiplied with unit -*/ -static u16 ocelot_wm_enc (u16 value) -{ -if (value >=BIT (8 )) -return BIT (8 ) | (value /16 ); - -return value; -} -void ocelot_adjust_link (struct ocelot *ocelot,int port,struct phy_device *phydev) {
@@ -2038,9 +2026,9 @@ void ocelot_port_set_maxlen(struct ocelot *ocelot, int port, size_t sdu)/* Tail dropping watermark */ atop_wm = (ocelot->shared_queue_sz -9 * maxlen) /OCELOT_BUFFER_CELL_SZ ; -ocelot_write_rix (ocelot,ocelot_wm_enc (9 * maxlen), +ocelot_write_rix (ocelot, ocelot->ops->wm_enc (9 * maxlen),SYS_ATOP , port); -ocelot_write (ocelot,ocelot_wm_enc (atop_wm),SYS_ATOP_TOT_CFG ); +ocelot_write (ocelot, ocelot->ops->wm_enc (atop_wm),SYS_ATOP_TOT_CFG ); }EXPORT_SYMBOL (ocelot_port_set_maxlen);
drivers/net/ethernet/mscc/ocelot_board.c +13 -0
@@ -240,8 +240,21 @@ static int ocelot_reset(struct ocelot *ocelot)return 0 ; } +/* Watermark encode +* Bit 8: Unit; 0:1, 1:16 +* Bit 7-0: Value to be multiplied with unit +*/ +static u16 ocelot_wm_enc (u16 value) +{ +if (value >=BIT (8 )) +return BIT (8 ) | (value /16 ); + +return value; +} +static const struct ocelot_ops ocelot_ops = { .reset = ocelot_reset, + .wm_enc = ocelot_wm_enc, };static const struct vcap_field vsc7514_vcap_is2_keys[] = {
include/soc/mscc/ocelot.h +1 -0
@@ -526,6 +526,7 @@ struct ocelot;struct ocelot_ops {int (*reset)(struct ocelot *ocelot); +u16 (*wm_enc)(u16 value); };struct ocelot_acl_block {
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 11/13 net: dsa: felix: support half-duplex link modes
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Ping tested:
[ 11.808455] mscc_felix 0000:00:00.5 swp0: Link is Up - 1Gbps/Full - flow control rx/tx [ 11.816497] IPv6: ADDRCONF(NETDEV_CHANGE): swp0: link becomes ready
[root@LS1028ARDB ~] # ethtool -s swp0 advertise 0x4
[ 18.844591] mscc_felix 0000:00:00.5 swp0: Link is Down [ 22.048337] mscc_felix 0000:00:00.5 swp0: Link is Up - 100Mbps/Half - flow control off
[root@LS1028ARDB ~] # ip addr add 192.168.1.1/24 dev swp0
[root@LS1028ARDB ~] # ping 192.168.1.2
PING 192.168.1.2 (192.168.1.2): 56 data bytes (...)
^C--- 192.168.1.2 ping statistics ---
3 packets transmitted, 3 packets received, 0% packet loss round-trip min/avg/max = 0.383/0.611/1.051 ms
[root@LS1028ARDB ~] # ethtool -s swp0 advertise 0x10
[ 355.637747] mscc_felix 0000:00:00.5 swp0: Link is Down [ 358.788034] mscc_felix 0000:00:00.5 swp0: Link is Up - 1Gbps/Half - flow control off
[root@LS1028ARDB ~] # ping 192.168.1.2
PING 192.168.1.2 (192.168.1.2): 56 data bytes (...)
^C
--- 192.168.1.2 ping statistics ---
16 packets transmitted, 16 packets received, 0% packet loss round-trip min/avg/max = 0.301/0.384/1.138 ms
---
Patch resent from:
https://patchwork.ozlabs.org/project/netdev/patch/[email protected]/
Changes in v3:
None.
Changes in v2:
Added spaces before the ping output in the commit message.
drivers/net/dsa/ocelot/felix.c | 4 +++- drivers/net/dsa/ocelot/felix_vsc9959.c | 13 ++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/net/dsa/ocelot/felix.c +3 -1
@@ -167,14 +167,16 @@ static void felix_phylink_validate(struct dsa_switch *ds, int port,return ; } -/* No half-duplex. */ phylink_set_port_modes (mask);phylink_set (mask, Autoneg);phylink_set (mask, Pause);phylink_set (mask, Asym_Pause); phylink_set(mask, 10baseT_Full); + phylink_set(mask, 10baseT_Half); phylink_set(mask, 100baseT_Full); + phylink_set(mask, 100baseT_Half); phylink_set(mask, 1000baseT_Full); + phylink_set(mask, 1000baseT_Half); if (state->interface == PHY_INTERFACE_MODE_INTERNAL || state->interface == PHY_INTERFACE_MODE_2500BASEX ||
drivers/net/dsa/ocelot/felix_vsc9959.c +8 -5
@@ -875,12 +875,12 @@ static void vsc9959_pcs_init_sgmii(struct phy_device *pcs,phy_write (pcs,MII_BMCR ,BMCR_ANRESTART |BMCR_ANENABLE ); }else { +u16 duplex =0 ;int speed; -if (state->duplex ==DUPLEX_HALF ) { -phydev_err (pcs,"Half duplex not supported\n" ); -return ; - } +if (state->duplex ==DUPLEX_FULL ) + duplex =BMCR_FULLDPLX ; +switch (state->speed) {case SPEED_1000 : speed =ENETC_PCS_SPEED_1000 ;
@@ -906,7 +906,7 @@ static void vsc9959_pcs_init_sgmii(struct phy_device *pcs,/* Yes, not a mistake: speed is given by IF_MODE. */ phy_write (pcs,MII_BMCR ,BMCR_RESET |BMCR_SPEED1000 | -BMCR_FULLDPLX ); + duplex); } }
@@ -983,8 +983,11 @@ static void vsc9959_pcs_init(struct ocelot *ocelot, int port,ARRAY_SIZE (phy_basic_ports_array), pcs->supported);linkmode_set_bit (ETHTOOL_LINK_MODE_10baseT_Full_BIT, pcs->supported); +linkmode_set_bit (ETHTOOL_LINK_MODE_10baseT_Half_BIT, pcs->supported);linkmode_set_bit (ETHTOOL_LINK_MODE_100baseT_Full_BIT, pcs->supported); +linkmode_set_bit (ETHTOOL_LINK_MODE_100baseT_Half_BIT, pcs->supported);linkmode_set_bit (ETHTOOL_LINK_MODE_1000baseT_Full_BIT, pcs->supported); +linkmode_set_bit (ETHTOOL_LINK_MODE_1000baseT_Half_BIT, pcs->supported);if (pcs->interface ==PHY_INTERFACE_MODE_2500BASEX || pcs->interface ==PHY_INTERFACE_MODE_USXGMII ) linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT,
Signature · 1 line
2.25.1
Vladimir Oltean
maintainerPATCH v3 12/13 net: dsa: felix: move probing to felix_vsc9959.c
In reply to Vladimir OlteanFrom: Vladimir Oltean <[email protected]>
Felix is not actually meant to be a DSA driver only for the switch inside NXP LS1028A, but an umbrella for all Vitesse / Microsemi / Microchip switches that are register-compatible with Ocelot and that are using in DSA mode (with an NPI Ethernet port).
For the dsa_switch_ops exported by the felix driver to be generic enough to be used by other non-PCI switches, we need to move the PCI-specific probing to the low-level translation module felix_vsc9959.c. This way, other switches can have their own probing functions, as platform devices or otherwise.
This patch also removes the "Felix instance table", which did not stand the test of time and is unnecessary at this point.
---
Changes in v3:
Added comment at the beginning of felix.c.
Added a centralized __init felix_init and __exit felix_exit that deals with registering the drivers for each individual switch. This is done in order to avoid build errors when compiled as module.
Changes in v2:
Patch is new.
drivers/net/dsa/ocelot/felix.c | 195 +++---------------------- drivers/net/dsa/ocelot/felix.h | 15 +- drivers/net/dsa/ocelot/felix_vsc9959.c | 187 +++++++++++++++++++++++- 3 files changed, 206 insertions(+), 191 deletions(-)
drivers/net/dsa/ocelot/felix.c +18 -177
@@ -1,5 +1,9 @@// SPDX-License-Identifier: GPL-2.0 /* Copyright 2019 NXP Semiconductors +* +* This is an umbrella module for all network switches that are +* register-compatible with Ocelot and that perform I/O to their host CPU +* through an NPI (Node Processor Interface) Ethernet port. */ #include <uapi/linux/if_bridge.h> #include <soc/mscc/ocelot_vcap.h>
@@ -158,37 +162,10 @@ static void felix_phylink_validate(struct dsa_switch *ds, int port, struct phylink_link_state *state) {struct ocelot *ocelot = ds->priv; -struct ocelot_port *ocelot_port = ocelot->ports[port]; -__ETHTOOL_DECLARE_LINK_MODE_MASK (mask) = {0 , }; - -if (state->interface !=PHY_INTERFACE_MODE_NA && - state->interface != ocelot_port->phy_mode) { -bitmap_zero (supported, __ETHTOOL_LINK_MODE_MASK_NBITS); -return ; - } - -phylink_set_port_modes (mask); -phylink_set (mask, Autoneg); -phylink_set (mask, Pause); -phylink_set (mask, Asym_Pause); - phylink_set(mask, 10baseT_Full); - phylink_set(mask, 10baseT_Half); - phylink_set(mask, 100baseT_Full); - phylink_set(mask, 100baseT_Half); - phylink_set(mask, 1000baseT_Full); - phylink_set(mask, 1000baseT_Half); - -if (state->interface ==PHY_INTERFACE_MODE_INTERNAL || - state->interface ==PHY_INTERFACE_MODE_2500BASEX || - state->interface ==PHY_INTERFACE_MODE_USXGMII ) { - phylink_set(mask, 2500baseT_Full); - phylink_set(mask, 2500baseX_Full); - } +struct felix *felix =ocelot_to_felix (ocelot); -bitmap_and (supported, supported, mask, - __ETHTOOL_LINK_MODE_MASK_NBITS); -bitmap_and (state->advertising, state->advertising, mask, - __ETHTOOL_LINK_MODE_MASK_NBITS); +if (felix->info->phylink_validate) + felix->info->phylink_validate (ocelot, port, supported, state); } static int felix_phylink_mac_pcs_get_state(struct dsa_switch *ds, int port,
@@ -438,7 +415,6 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports) {struct ocelot *ocelot = &felix->ocelot;phy_interface_t *port_phy_modes; -resource_size_t switch_base;struct resource res;int port, i, err;
@@ -469,9 +445,6 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)return err; } - switch_base =pci_resource_start (felix->pdev, - felix->info->switch_pci_bar); -for (i =0 ; i <TARGET_MAX ; i++) {struct regmap *target;
@@ -480,8 +453,8 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)memcpy (&res, &felix->info->target_io_res[i],sizeof (res)); res.flags =IORESOURCE_MEM ; - res.start += switch_base; - res.end += switch_base; + res.start += felix->switch_base; + res.end += felix->switch_base; target =ocelot_regmap_init (ocelot, &res);if (IS_ERR (target)) {
@@ -518,8 +491,8 @@ static int felix_init_structs(struct felix *felix, int num_phys_ports)memcpy (&res, &felix->info->port_io_res[port],sizeof (res)); res.flags =IORESOURCE_MEM ; - res.start += switch_base; - res.end += switch_base; + res.start += felix->switch_base; + res.end += felix->switch_base; target =ocelot_regmap_init (ocelot, &res);if (IS_ERR (target)) {
@@ -786,7 +759,7 @@ static int felix_port_setup_tc(struct dsa_switch *ds, int port,return -EOPNOTSUPP ; } -static const struct dsa_switch_ops felix_switch_ops = { +const struct dsa_switch_ops felix_switch_ops = { .get_tag_protocol = felix_get_tag_protocol, .setup = felix_setup, .teardown = felix_teardown,
@@ -827,149 +800,17 @@ static const struct dsa_switch_ops felix_switch_ops = { .port_setup_tc = felix_port_setup_tc, }; -static struct felix_info *felix_instance_tbl[] = { - [FELIX_INSTANCE_VSC9959 ] = &felix_info_vsc9959, -}; - -static irqreturn_t felix_irq_handler (int irq,void *data) -{ -struct ocelot *ocelot = (struct ocelot *)data; - -/* The INTB interrupt is used for both PTP TX timestamp interrupt -* and preemption status change interrupt on each port. -* -* - Get txtstamp if have -* - TODO: handle preemption. Without handling it, driver may get -* interrupt storm. -*/ - -ocelot_get_txtstamp (ocelot); - -return IRQ_HANDLED ; -} - -static int felix_pci_probe (struct pci_dev *pdev, -const struct pci_device_id *id) +static int __init felix_init (void ) { -enum felix_instance instance = id->driver_data; -struct dsa_switch *ds; -struct ocelot *ocelot; -struct felix *felix; -int err; - -if (pdev->dev.of_node && !of_device_is_available (pdev->dev.of_node)) { -dev_info (&pdev->dev,"device is disabled, skipping\n" ); -return -ENODEV ; - } - - err =pci_enable_device (pdev); -if (err) { -dev_err (&pdev->dev,"device enable failed\n" ); - goto err_pci_enable; - } - -/* set up for high or low dma */ - err =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (64 )); -if (err) { - err =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (32 )); -if (err) { -dev_err (&pdev->dev, -"DMA configuration failed: 0x%x\n" , err); - goto err_dma; - } - } - - felix =kzalloc (sizeof (struct felix ),GFP_KERNEL ); -if (!felix) { - err = -ENOMEM ; -dev_err (&pdev->dev,"Failed to allocate driver memory\n" ); - goto err_alloc_felix; - } - -pci_set_drvdata (pdev, felix); - ocelot = &felix->ocelot; - ocelot->dev = &pdev->dev; - felix->pdev = pdev; - felix->info = felix_instance_tbl[instance]; - -pci_set_master (pdev); - - err =devm_request_threaded_irq (&pdev->dev, pdev->irq,NULL , - &felix_irq_handler,IRQF_ONESHOT , -"felix-intb" , ocelot); -if (err) { -dev_err (&pdev->dev,"Failed to request irq\n" ); - goto err_alloc_irq; - } - - ocelot->ptp =1 ; - - ds =kzalloc (sizeof (struct dsa_switch ),GFP_KERNEL ); -if (!ds) { - err = -ENOMEM ; -dev_err (&pdev->dev,"Failed to allocate DSA switch\n" ); - goto err_alloc_ds; - } - - ds->dev = &pdev->dev; - ds->num_ports = felix->info->num_ports; - ds->num_tx_queues = felix->info->num_tx_queues; - ds->ops = &felix_switch_ops; - ds->priv = ocelot; - felix->ds = ds; - - err =dsa_register_switch (ds); -if (err) { -dev_err (&pdev->dev,"Failed to register DSA switch: %d\n" , err); - goto err_register_ds; - } - -return 0 ; - -err_register_ds: -kfree (ds); -err_alloc_ds: -err_alloc_irq: -err_alloc_felix: -kfree (felix); -err_dma: -pci_disable_device (pdev); -err_pci_enable: -return err; +return pci_register_driver (&felix_vsc9959_pci_driver); } +module_init (felix_init); -static void felix_pci_remove (struct pci_dev *pdev) +static void __exit felix_exit(void) { -struct felix *felix; - - felix =pci_get_drvdata (pdev); - -dsa_unregister_switch (felix->ds); - -kfree (felix->ds); -kfree (felix); - -pci_disable_device (pdev); +pci_unregister_driver (&felix_vsc9959_pci_driver); } - -static struct pci_device_id felix_ids[] = { - { -/* NXP LS1028A */ -PCI_DEVICE (PCI_VENDOR_ID_FREESCALE ,0xEEF0 ), - .driver_data =FELIX_INSTANCE_VSC9959 , - }, - {0 , } -}; -MODULE_DEVICE_TABLE (pci, felix_ids); - -static struct pci_driver felix_pci_driver = { - .name =KBUILD_MODNAME , - .id_table = felix_ids, - .probe = felix_pci_probe, - .remove = felix_pci_remove, -}; - -module_pci_driver (felix_pci_driver); +module_exit (felix_exit);MODULE_DESCRIPTION ("Felix Switch driver" );MODULE_LICENSE ("GPL v2" );
drivers/net/dsa/ocelot/felix.h +8 -7
@@ -34,6 +34,9 @@ struct felix_info {void (*pcs_an_restart)(struct ocelot *ocelot,int port);void (*pcs_link_state)(struct ocelot *ocelot,int port,struct phylink_link_state *state); +void (*phylink_validate)(struct ocelot *ocelot,int port, +unsigned long *supported, +struct phylink_link_state *state);int (*prevalidate_phy_mode)(struct ocelot *ocelot,int port,phy_interface_t phy_mode); int (*port_setup_tc)(struct dsa_switch *ds, int port,
@@ -43,20 +46,18 @@ struct felix_info { void (*xmit_template_populate)(struct ocelot *ocelot, int port); }; -extern struct felix_info felix_info_vsc9959; - -enum felix_instance { -FELIX_INSTANCE_VSC9959 =0 , -}; +extern const struct dsa_switch_ops felix_switch_ops; +extern struct pci_driver felix_vsc9959_pci_driver;/* DSA glue / front-end for struct ocelot */ struct felix {struct dsa_switch *ds; -struct pci_dev *pdev; -struct felix_info *info; +const struct felix_info *info;struct ocelot ocelot;struct mii_bus *imdio;struct phy_device **pcs; +resource_size_t switch_base; +resource_size_t imdio_base; };#endif
drivers/net/dsa/ocelot/felix_vsc9959.c +180 -7
221 lines not on this page · raw message
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerRe: [PATCH v3 net-next 12/13] net: dsa: felix: move probing to felix_vsc9959.c
Quoted 13 lines · On Sun, 31 May 2020 15:26:39 +0300 Vladimir Oltean wrote:
From: Vladimir Oltean <[email protected]>
Felix is not actually meant to be a DSA driver only for the switch inside NXP LS1028A, but an umbrella for all Vitesse / Microsemi / Microchip switches that are register-compatible with Ocelot and that are using in DSA mode (with an NPI Ethernet port).
For the
dsa_switch_opsexported by the felix driver to be generic enough to be used by other non-PCI switches, we need to move the PCI-specific probing to the low-level translation modulefelix_vsc9959.c. This way, other switches can have their own probing functions, as platform devices or otherwise.
Quoted 5 lines
This patch also removes the "Felix instance table", which did not stand the test of time and is unnecessary at this point.
Signed-off-by Vladimir Oltean <[email protected]>Reviewed-by Florian Fainelli <[email protected]>
drivers/net/dsa/ocelot/felix_vsc9959.c:1520:25: warning: symbol 'felix_info_vsc9959' was not declared. Should it be static?
Vladimir Oltean
maintainerPATCH v3 13/13 net: dsa: felix: introduce support for Seville VSC9953 switch
In reply to Vladimir OlteanFrom: Maxim Kochetkov <[email protected]>
This is another switch from Vitesse / Microsemi / Microchip, that has 10 port (8 external, 2 internal) and is integrated into the Freescale / NXP T1040 PowerPC SoC. It is very similar to Felix from NXP LS1028A, except that this is a platform device and Felix is a PCI device, and it doesn't support IEEE 1588 and TSN.
Like Felix, this driver configures its own PCS on the internal MDIO bus using a phy_device abstraction for it (yes, it will be refactored to use a raw mdio_device, like other phylink drivers do, but let's keep it like that for now). But unlike Felix, the MDIO bus and the PCS are not from the same vendor. The PCS is the same QorIQ/Layerscape PCS as found in Felix/ENETC/DPAA*, but the internal MDIO bus that is used to access it is actually an instantiation of drivers/net/phy/mdio-mscc-miim.c. But it would be difficult to reuse that driver (it doesn't even use regmap, and it's less than 200 lines of code), so we hand-roll here some internal MDIO bus accessors within seville_vsc9953.c, which serves the purpose of driving the PCS absolutely fine.
Also, same as Felix, the PCS doesn't support dynamic reconfiguration of SerDes protocol, so we need to do pre-validation of PHY mode from device tree and not let phylink change it.
---
Changes in v3:
Register this driver from felix.c.
Make the driver name for seville "mscc_seville" and for felix "mscc_felix" instead of KBUILD_MODNAME ("mscc_felix") for both.
Changes in v2:
Now supporting Seville as part of the Felix driver. This has several
advantages: a lot more code reuse (not only from felix.c, but also from the low-level felix_vsc9959.c, the PCS initialization being an example). But also a disadvantage: the common driver depends on PCI, but Seville is not a PCI device.
Added devicetree bindings documentation.
.../devicetree/bindings/net/dsa/ocelot.txt | 106 +- drivers/net/dsa/ocelot/Kconfig | 12 +- drivers/net/dsa/ocelot/Makefile | 3 +- drivers/net/dsa/ocelot/felix.c | 14 +- drivers/net/dsa/ocelot/felix.h | 8 + drivers/net/dsa/ocelot/felix_vsc9959.c | 12 +- drivers/net/dsa/ocelot/seville_vsc9953.c | 1106 +++++++++++++++++ 7 files changed, 1245 insertions(+), 16 deletions(-) create mode 100644 drivers/net/dsa/ocelot/seville_vsc9953.c
Documentation/devicetree/bindings/net/dsa/ocelot.txt +102 -4
@@ -4,10 +4,15 @@ Microchip Ocelot switch driver family Felix ----- -The VSC9959 core is currently the only switch supported by the driver, and is -found in the NXP LS1028A. It is a PCI device, part of the larger ENETC root -complex. As a result, the ethernet-switch node is a sub-node of the PCIe root -complex node and its "reg" property conforms to the parent node bindings: +Currently the switches supported by the felix driver are: + +- VSC9959 (Felix) +- VSC9953 (Seville) + +The VSC9959 switch is found in the NXP LS1028A. It is a PCI device, part of the +larger ENETC root complex. As a result, the ethernet-switch node is a sub-node +of the PCIe root complex node and its "reg" property conforms to the parent +node bindings: * reg: Specifies PCIe Device Number and Function Number of the endpoint device, in this case for the Ethernet L2Switch it is PF5 (of device 0, bus 0).
@@ -114,3 +119,96 @@ Example: }; }; }; + +The VSC9953 switch is found inside NXP T1040. It is a platform device with the +following required properties: + +- compatible: + Must be "mscc,vsc9953-switch". + +Supported PHY interface types (appropriate SerDes protocol setting changes are +needed in the RCW binary): + +* phy_mode = "internal": on ports 8 and 9 +* phy_mode = "sgmii": on ports 0, 1, 2, 3, 4, 5, 6, 7 +* phy_mode = "qsgmii": on ports 0, 1, 2, 3, 4, 5, 6, 7 +* phy_mode = "2500base-x": on ports 0, 1, 2, 3, 4, 5, 6, 7 + +Example: + +&soc { + ethernet-switch@800000 { + #address-cells = <0x1>; + #size-cells = <0x0>; + compatible = "mscc,vsc9953-switch"; + little-endian; + reg = <0x800000 0x290000>; + + ports { + #address-cells = <0x1>; + #size-cells = <0x0>; + + port@0 { + reg = <0x0>; + label = "swp0"; + }; + + port@1 { + reg = <0x1>; + label = "swp1"; + }; + + port@2 { + reg = <0x2>; + label = "swp2"; + }; + + port@3 { + reg = <0x3>; + label = "swp3"; + }; + + port@4 { + reg = <0x4>; + label = "swp4"; + }; + + port@5 { + reg = <0x5>; + label = "swp5"; + }; + + port@6 { + reg = <0x6>; + label = "swp6"; + }; + + port@7 { + reg = <0x7>; + label = "swp7"; + }; + + port@8 { + reg = <0x8>; + phy-mode = "internal"; + ethernet = <&enet0>; + + fixed-link { + speed = <2500>; + full-duplex; + }; + }; + + port@9 { + reg = <0x9>; + phy-mode = "internal"; + status = "disabled"; + + fixed-link { + speed = <2500>; + full-duplex; + }; + }; + }; + }; +};
drivers/net/dsa/ocelot/Kconfig +8 -4
@@ -8,7 +8,11 @@ config NET_DSA_MSCC_FELIX select NET_DSA_TAG_OCELOT select FSL_ENETC_MDIO help - This driver supports the VSC9959 network switch, which is a member of - the Vitesse / Microsemi / Microchip Ocelot family of switching cores. - It is embedded as a PCIe function of the NXP LS1028A ENETC integrated - endpoint. + This driver supports network switches from the the Vitesse / + Microsemi / Microchip Ocelot family of switching cores that are + connected to their host CPU via Ethernet. + The following switches are supported: + - VSC9959 (Felix): embedded as a PCIe function of the NXP LS1028A + ENETC integrated endpoint. + - VSC9953 (Seville): embedded as a platform device on the + NXP T1040 SoC.
drivers/net/dsa/ocelot/Makefile +2 -1
@@ -3,4 +3,5 @@ obj-$(CONFIG_NET_DSA_MSCC_FELIX) += mscc_felix.o mscc_felix-objs := \ felix.o \ - felix_vsc9959.o + felix_vsc9959.o \ + seville_vsc9953.o
drivers/net/dsa/ocelot/felix.c +13 -1
@@ -13,6 +13,7 @@#include <soc/mscc/ocelot_ana.h> #include <soc/mscc/ocelot_ptp.h> #include <soc/mscc/ocelot.h> +#include <linux/platform_device.h> #include <linux/packing.h> #include <linux/module.h> #include <linux/of_net.h>
@@ -802,13 +803,24 @@ const struct dsa_switch_ops felix_switch_ops = {static int __init felix_init (void ) { -return pci_register_driver (&felix_vsc9959_pci_driver); +int err; + + err =pci_register_driver (&felix_vsc9959_pci_driver); +if (err) +return err; + + err =platform_driver_register (&seville_vsc9953_driver); +if (err) +return err; + +return 0 ; }module_init (felix_init); static void __exit felix_exit(void) {pci_unregister_driver (&felix_vsc9959_pci_driver); +platform_driver_unregister (&seville_vsc9953_driver); }module_exit (felix_exit);
drivers/net/dsa/ocelot/felix.h +8 -0
@@ -48,6 +48,7 @@ struct felix_info {extern const struct dsa_switch_ops felix_switch_ops;extern struct pci_driver felix_vsc9959_pci_driver; +extern struct platform_driver seville_vsc9953_driver;/* DSA glue / front-end for struct ocelot */ struct felix {
@@ -60,4 +61,11 @@ struct felix { resource_size_t imdio_base; }; +void vsc9959_pcs_link_state (struct ocelot *ocelot,int port, +struct phylink_link_state *state); +void vsc9959_pcs_init (struct ocelot *ocelot,int port, +unsigned int link_an_mode, +const struct phylink_link_state *state); +void vsc9959_mdio_bus_free (struct ocelot *ocelot); +#endif
drivers/net/dsa/ocelot/felix_vsc9959.c +6 -6
@@ -963,9 +963,9 @@ static void vsc9959_pcs_init_usxgmii(struct phy_device *pcs, USXGMII_ADVERTISE_FDX); } -static void vsc9959_pcs_init (struct ocelot *ocelot,int port, -unsigned int link_an_mode, -const struct phylink_link_state *state) +void vsc9959_pcs_init (struct ocelot *ocelot,int port, +unsigned int link_an_mode, +const struct phylink_link_state *state) {struct felix *felix =ocelot_to_felix (ocelot);struct phy_device *pcs = felix->pcs[port];
@@ -1113,8 +1113,8 @@ static void vsc9959_pcs_link_state_usxgmii(struct phy_device *pcs, pcs->duplex =DUPLEX_HALF ; } -static void vsc9959_pcs_link_state (struct ocelot *ocelot,int port, -struct phylink_link_state *state) +void vsc9959_pcs_link_state (struct ocelot *ocelot,int port, +struct phylink_link_state *state) {struct felix *felix =ocelot_to_felix (ocelot);struct phy_device *pcs = felix->pcs[port];
@@ -1303,7 +1303,7 @@ static int vsc9959_mdio_bus_alloc(struct ocelot *ocelot)return 0 ; } -static void vsc9959_mdio_bus_free (struct ocelot *ocelot) +void vsc9959_mdio_bus_free (struct ocelot *ocelot) {struct felix *felix =ocelot_to_felix (ocelot);int port;
drivers/net/dsa/ocelot/seville_vsc9953.c new file +1106 -0
1,106 lines not on this page · raw message
Signature · 1 line
2.25.1
Jakub Kicinski
maintainerRe: [PATCH v3 net-next 13/13] net: dsa: felix: introduce support for Seville VSC9953 switch
Quoted 20 lines · On Sun, 31 May 2020 15:26:40 +0300 Vladimir Oltean wrote:
From: Maxim Kochetkov <[email protected]>
This is another switch from Vitesse / Microsemi / Microchip, that has 10 port (8 external, 2 internal) and is integrated into the Freescale / NXP T1040 PowerPC SoC. It is very similar to Felix from NXP LS1028A, except that this is a platform device and Felix is a PCI device, and it doesn't support IEEE 1588 and TSN.
Like Felix, this driver configures its own PCS on the internal MDIO bus using a
phy_deviceabstraction for it (yes, it will be refactored to use a rawmdio_device, like other phylink drivers do, but let's keep it like that for now). But unlike Felix, the MDIO bus and the PCS are not from the same vendor. The PCS is the same QorIQ/Layerscape PCS as found in Felix/ENETC/DPAA*, but the internal MDIO bus that is used to access it is actually an instantiation ofdrivers/net/phy/mdio-mscc-miim.c. But it would be difficult to reuse that driver (it doesn't even use regmap, and it's less than 200 lines of code), so we hand-roll here some internal MDIO bus accessors withinseville_vsc9953.c, which serves the purpose of driving the PCS absolutely fine.
Quoted 7 lines
Also, same as Felix, the PCS doesn't support dynamic reconfiguration of SerDes protocol, so we need to do pre-validation of PHY mode from device tree and not let phylink change it.
Signed-off-by Maxim Kochetkov <[email protected]>Signed-off-by Vladimir Oltean <[email protected]>Reviewed-by Florian Fainelli <[email protected]>
drivers/net/dsa/ocelot/seville_vsc9953.c:1003:19: warning: symbol 'seville_info_vsc9953' was not declared. Should it be static?