| Message ID | 20210604085600.3014532-1-steen.hegelund@microchip.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Adding the Sparx5 Switch Driver | expand |
Hi Steen, On Fri, 2021-06-04 at 10:55 +0200, Steen Hegelund wrote: > This adds the Sparx5 basic SwitchDev driver framework with IO range > mapping, switch device detection and core clock configuration. > > Support for ports, phylink, netdev, mactable etc. are in the following > patches. > > Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com> > Signed-off-by: Bjarni Jonasson <bjarni.jonasson@microchip.com> > Signed-off-by: Lars Povlsen <lars.povlsen@microchip.com> > --- > drivers/net/ethernet/microchip/Kconfig | 2 + > drivers/net/ethernet/microchip/Makefile | 2 + > drivers/net/ethernet/microchip/sparx5/Kconfig | 9 + > .../net/ethernet/microchip/sparx5/Makefile | 8 + > .../ethernet/microchip/sparx5/sparx5_main.c | 746 +++ > .../ethernet/microchip/sparx5/sparx5_main.h | 273 + > .../microchip/sparx5/sparx5_main_regs.h | 4642 +++++++++++++++++ > 7 files changed, 5682 insertions(+) > create mode 100644 drivers/net/ethernet/microchip/sparx5/Kconfig > create mode 100644 drivers/net/ethernet/microchip/sparx5/Makefile > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.c > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.h > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h > [...] > diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > new file mode 100644 > index 000000000000..73beb85bc52d > --- /dev/null > +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > @@ -0,0 +1,746 @@ [...] > +static int mchp_sparx5_probe(struct platform_device *pdev) > +{ [...] > + > + sparx5->reset = devm_reset_control_get_shared(&pdev->dev, "switch"); > + if (IS_ERR(sparx5->reset)) { Could you use devm_reset_control_get_optional_shared() instead of ignoring this error? That would just return NULL if there's no "switch" reset specified in the device tree. > + dev_warn(sparx5->dev, "Could not obtain reset control: %ld\n", > + PTR_ERR(sparx5->reset)); > + sparx5->reset = NULL; > + } else { > + reset_control_reset(sparx5->reset); > + } If this is the only place the reset is used, I'd remove it from struct sparx5 and use a local variable instead. regards Philipp
Hi Philipp, Thanks for your comments. On Fri, 2021-06-04 at 11:28 +0200, Philipp Zabel wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > Hi Steen, > > On Fri, 2021-06-04 at 10:55 +0200, Steen Hegelund wrote: > > This adds the Sparx5 basic SwitchDev driver framework with IO range > > mapping, switch device detection and core clock configuration. > > > > Support for ports, phylink, netdev, mactable etc. are in the following > > patches. > > > > Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com> > > Signed-off-by: Bjarni Jonasson <bjarni.jonasson@microchip.com> > > Signed-off-by: Lars Povlsen <lars.povlsen@microchip.com> > > --- > > drivers/net/ethernet/microchip/Kconfig | 2 + > > drivers/net/ethernet/microchip/Makefile | 2 + > > drivers/net/ethernet/microchip/sparx5/Kconfig | 9 + > > .../net/ethernet/microchip/sparx5/Makefile | 8 + > > .../ethernet/microchip/sparx5/sparx5_main.c | 746 +++ > > .../ethernet/microchip/sparx5/sparx5_main.h | 273 + > > .../microchip/sparx5/sparx5_main_regs.h | 4642 +++++++++++++++++ > > 7 files changed, 5682 insertions(+) > > create mode 100644 drivers/net/ethernet/microchip/sparx5/Kconfig > > create mode 100644 drivers/net/ethernet/microchip/sparx5/Makefile > > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.h > > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h > > > [...] > > diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > new file mode 100644 > > index 000000000000..73beb85bc52d > > --- /dev/null > > +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > @@ -0,0 +1,746 @@ > [...] > > +static int mchp_sparx5_probe(struct platform_device *pdev) > > +{ > [...] > > + > > + sparx5->reset = devm_reset_control_get_shared(&pdev->dev, "switch"); > > + if (IS_ERR(sparx5->reset)) { > > Could you use devm_reset_control_get_optional_shared() instead of > ignoring this error? That would just return NULL if there's no "switch" > reset specified in the device tree. Yes. That sounds like a good idea. I assume that the devm_reset_control_get_optional_shared() would also return null if another driver has already performed the reset? > > > + dev_warn(sparx5->dev, "Could not obtain reset control: %ld\n", > > + PTR_ERR(sparx5->reset)); > > + sparx5->reset = NULL; > > + } else { > > + reset_control_reset(sparx5->reset); > > + } > > If this is the only place the reset is used, I'd remove it from struct > sparx5 and use a local variable instead. Yes. I will do that. > > regards > Philipp Best
On Mon, 2021-06-07 at 09:34 +0200, Steen Hegelund wrote: > Hi Philipp, > > Thanks for your comments. > > On Fri, 2021-06-04 at 11:28 +0200, Philipp Zabel wrote: > > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > > > Hi Steen, > > > > On Fri, 2021-06-04 at 10:55 +0200, Steen Hegelund wrote: > > > This adds the Sparx5 basic SwitchDev driver framework with IO range > > > mapping, switch device detection and core clock configuration. > > > > > > Support for ports, phylink, netdev, mactable etc. are in the following > > > patches. > > > > > > Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com> > > > Signed-off-by: Bjarni Jonasson <bjarni.jonasson@microchip.com> > > > Signed-off-by: Lars Povlsen <lars.povlsen@microchip.com> > > > --- > > > drivers/net/ethernet/microchip/Kconfig | 2 + > > > drivers/net/ethernet/microchip/Makefile | 2 + > > > drivers/net/ethernet/microchip/sparx5/Kconfig | 9 + > > > .../net/ethernet/microchip/sparx5/Makefile | 8 + > > > .../ethernet/microchip/sparx5/sparx5_main.c | 746 +++ > > > .../ethernet/microchip/sparx5/sparx5_main.h | 273 + > > > .../microchip/sparx5/sparx5_main_regs.h | 4642 +++++++++++++++++ > > > 7 files changed, 5682 insertions(+) > > > create mode 100644 drivers/net/ethernet/microchip/sparx5/Kconfig > > > create mode 100644 drivers/net/ethernet/microchip/sparx5/Makefile > > > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.h > > > create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h > > > > > [...] > > > diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > > b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > > new file mode 100644 > > > index 000000000000..73beb85bc52d > > > --- /dev/null > > > +++ b/drivers/net/ethernet/microchip/sparx5/sparx5_main.c > > > @@ -0,0 +1,746 @@ > > [...] > > > +static int mchp_sparx5_probe(struct platform_device *pdev) > > > +{ > > [...] > > > + > > > + sparx5->reset = devm_reset_control_get_shared(&pdev->dev, "switch"); > > > + if (IS_ERR(sparx5->reset)) { > > > > Could you use devm_reset_control_get_optional_shared() instead of > > ignoring this error? That would just return NULL if there's no "switch" > > reset specified in the device tree. > > Yes. That sounds like a good idea. I assume that the devm_reset_control_get_optional_shared() > would also return null if another driver has already performed the reset? It returns the same (shared) reset control. But the following reset_control_reset() [1] is a no-op if the control has already triggered once. If multiple drivers need to coordinate to trigger the reset more than once (for example once after suspend/resume), both have to use reset_control_rearm() [2]. [1] https://www.kernel.org/doc/html/latest/driver-api/reset.html#c.reset_control_reset [2] https://www.kernel.org/doc/html/latest/driver-api/reset.html#c.reset_control_rearm regards Philipp
This series provides the Microchip Sparx5 Switch Driver The Sparx5 Carrier Ethernet and Industrial switch family delivers 64 Ethernet ports and up to 200 Gbps of switching bandwidth. It provides a rich set of Ethernet switching features such as hierarchical QoS, hardware-based OAM and service activation testing, protection switching, IEEE 1588, and Synchronous Ethernet. Using provider bridging (Q-in-Q) and MPLS/MPLS-TP technology, it delivers MEF CE 2.0 Ethernet virtual connections (EVCs) and features advanced TCAM classification in both ingress and egress. Per-EVC features include advanced L3-aware classification, a rich set of statistics, OAM for end-to-end performance monitoring, and dual-rate policing and shaping. Time sensitive networking (TSN) is supported through a comprehensive set of features including frame preemption, cut-through, frame replication and elimination for reliability, enhanced scheduling: credit-based shaping, time-aware shaping, cyclic queuing, and forwarding, and per-stream policing and filtering. Together with IEEE 1588 and IEEE 802.1AS support, this guarantees low-latency deterministic networking for Fronthaul, Carrier, and Industrial Ethernet. The Sparx5 switch family consists of following SKUs: - VSC7546 Sparx5-64 up to 64 Gbps of bandwidth with the following primary port configurations: - 6 *10G - 16 * 2.5G + 2 * 10G - 24 * 1G + 4 * 10G - VSC7549 Sparx5-90 up to 90 Gbps of bandwidth with the following primary port configurations: - 9 * 10G - 16 * 2.5G + 4 * 10G - 48 * 1G + 4 * 10G - VSC7552 Sparx5-128 up to 128 Gbps of bandwidth with the following primary port configurations: - 12 * 10G - 16 * 2.5G + 8 * 10G - 48 * 1G + 8 * 10G - VSC7556 Sparx5-160 up to 160 Gbps of bandwidth with the following primary port configurations: - 16 * 10G - 10 * 10G + 2 * 25G - 16 * 2.5G + 10 * 10G - 48 * 1G + 10 * 10G - VSC7558 Sparx5-200 up to 200 Gbps of bandwidth with the following primary port configurations: - 20 * 10G - 8 * 25G In addition, the device supports one 10/100/1000/2500/5000 Mbps SGMII/SerDes node processor interface (NPI) Ethernet port. The Sparx5 support is developed on the PCB134 and PCB135 evaluation boards. - PCB134 main networking features: - 12x SFP+ front 10G module slots (connected to Sparx5 through SFI). - 8x SFP28 front 25G module slots (connected to Sparx5 through SFI high speed). - Optional, one additional 10/100/1000BASE-T (RJ45) Ethernet port (on-board VSC8211 PHY connected to Sparx5 through SGMII). - PCB135 main networking features: - 48x1G (10/100/1000M) RJ45 front ports using 12xVSC8514 QuadPHY’s each connected to VSC7558 through QSGMII. - 4x10G (1G/2.5G/5G/10G) RJ45 front ports using the AQR407 10G QuadPHY each port connects to VSC7558 through SFI. - 4x SFP28 25G module slots on back connected to VSC7558 through SFI high speed. - Optional, one additional 1G (10/100/1000M) RJ45 port using an on-board VSC8211 PHY, which can be connected to VSC7558 NPI port through SGMII using a loopback add-on PCB) This series provides support for: - SFPs and DAC cables via PHYLINK with a number of 5G, 10G and 25G devices and media types. - Port module configuration for 10M to 25G speeds with SGMII, QSGMII, 1000BASEX, 2500BASEX and 10GBASER as appropriate for these modes. - SerDes configuration via the Sparx5 SerDes driver (see below). - Host mode providing register based injection and extraction. - Switch mode providing MAC/VLAN table learning and Layer2 switching offloaded to the Sparx5 switch. - STP state, VLAN support, host/bridge port mode, Forwarding DB, and configuration and statistics via ethtool. More support will be added at a later stage. The Sparx5 Chip Register Model can be browsed at this location: https://github.com/microchip-ung/sparx-5_reginfo and the datasheet is available here: https://ww1.microchip.com/downloads/en/DeviceDoc/SparX-5_Family_L2L3_Enterprise_10G_Ethernet_Switches_Datasheet_00003822B.pdf The series depends on the following series currently on its way into the kernel: - Sparx5 Reset Driver Link: https://lore.kernel.org/r/20210416084054.2922327-1-steen.hegelund@microchip.com/ ChangeLog: v3: - basic driver: - removed unneeded braces - release reference to ports node after use - use dev_err_probe to handle DEFER - update error value when bailing out (a few cases) - updated formatting of port struct and grouping of bool values - simplified the spx5_rmw and spx5_inst_rmw inline functions - host mode (netdev): - removed lockless flag - added port timer init - host mode (packet - manual injection): - updated error counters in error situations - implemented timer handling of watermark threshold: stop and restart netif queues. - fixed error message handling (rate limited) - fixed comment style error - used DIV_ROUND_UP macro - removed a debug message for open ports v2: - Updated bindings: - drop minItems for the reg property - Statistics implementation: - Reorganized statistics into ethtool groups: eth-phy, eth-mac, eth-ctrl, rmon as defined by the IEEE 802.3 categories and RFC 2819. - The remaining statistics are provided by the classic ethtool statistics command. - Hostmode support: - Removed netdev renaming - Validate ethernet address in sparx5_set_mac_address() Steen Hegelund (10): dt-bindings: net: sparx5: Add sparx5-switch bindings net: sparx5: add the basic sparx5 driver net: sparx5: add hostmode with phylink support net: sparx5: add port module support net: sparx5: add mactable support net: sparx5: add vlan support net: sparx5: add switching support net: sparx5: add calendar bandwidth allocation support net: sparx5: add ethtool configuration and statistics support arm64: dts: sparx5: Add the Sparx5 switch node .../bindings/net/microchip,sparx5-switch.yaml | 226 + arch/arm64/boot/dts/microchip/sparx5.dtsi | 94 +- .../dts/microchip/sparx5_pcb134_board.dtsi | 481 +- .../dts/microchip/sparx5_pcb135_board.dtsi | 621 ++- drivers/net/ethernet/microchip/Kconfig | 2 + drivers/net/ethernet/microchip/Makefile | 2 + drivers/net/ethernet/microchip/sparx5/Kconfig | 9 + .../net/ethernet/microchip/sparx5/Makefile | 10 + .../microchip/sparx5/sparx5_calendar.c | 596 +++ .../microchip/sparx5/sparx5_ethtool.c | 1227 +++++ .../microchip/sparx5/sparx5_mactable.c | 500 ++ .../ethernet/microchip/sparx5/sparx5_main.c | 869 +++ .../ethernet/microchip/sparx5/sparx5_main.h | 366 ++ .../microchip/sparx5/sparx5_main_regs.h | 4642 +++++++++++++++++ .../ethernet/microchip/sparx5/sparx5_netdev.c | 249 + .../ethernet/microchip/sparx5/sparx5_packet.c | 320 ++ .../microchip/sparx5/sparx5_phylink.c | 195 + .../ethernet/microchip/sparx5/sparx5_port.c | 1129 ++++ .../ethernet/microchip/sparx5/sparx5_port.h | 98 + .../microchip/sparx5/sparx5_switchdev.c | 508 ++ .../ethernet/microchip/sparx5/sparx5_vlan.c | 224 + 21 files changed, 12284 insertions(+), 84 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/microchip,sparx5-switch.yaml create mode 100644 drivers/net/ethernet/microchip/sparx5/Kconfig create mode 100644 drivers/net/ethernet/microchip/sparx5/Makefile create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_mactable.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main.h create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_main_regs.h create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_packet.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_phylink.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_port.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_port.h create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_switchdev.c create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_vlan.c