Hirschmann Hellcreek DSA driver
Subsystems (5)
Kurt Kanzenbach
maintainerv8 cover Hirschmann Hellcreek DSA driver
Hi,
this series adds a DSA driver for the Hirschmann Hellcreek TSN switch IP. Characteristics of that IP:
* Full duplex Ethernet interface at 100/1000 Mbps on three ports
* IEEE 802.1Q-compliant Ethernet Switch
* IEEE 802.1Qbv Time-Aware scheduling support
* IEEE 1588 and IEEE 802.1AS support
That IP is used e.g. in
https://www.arrow.com/en/campaigns/arrow-kairos
Due to the hardware setup the switch driver is implemented using DSA. A special tagging protocol is leveraged. Furthermore, this driver supports PTP and hardware timestamping.
This work is part of the AccessTSN project: https://www.accesstsn.com/
The previous versions can be found here:
* https://lkml.kernel.org/netdev/[email protected]/
* https://lkml.kernel.org/netdev/[email protected]/
* https://lkml.kernel.org/netdev/[email protected]/
* https://lkml.kernel.org/netdev/[email protected]/
* https://lkml.kernel.org/netdev/[email protected]/
* https://lkml.kernel.org/netdev/[email protected]/
* https://lkml.kernel.org/netdev/[email protected]/
* https://lkml.kernel.org/netdev/[email protected]/
Changes since v7:
* Simplify tagging code (rebase to net-next)
* Pass info instead of ptr (Florian Fainelli)
* Fix yamllint warnings (Rob Herring)
Changes since v6:
* Add .tail_tag = true (Vladimir Oltean)
* Fix vlan_filtering=0 bridges (Vladimir Oltean)
* Enforce restrictions (Vladimir Oltean)
* Sort stuff alphabetically (Vladimir Oltean)
* Rename hellcreek.yaml to hirschmann,hellcreek.yaml
* Typo fixes
Changes since v5:
* Implement configure_vlan_while_not_filtering behavior (Vladimir Oltean)
* Minor cleanups
Changes since v4:
* Fix W=1 compiler warnings (kernel test robot)
* Add tags
Changes since v3:
* Drop TAPRIO support (David Miller)
=> Switch to mutexes due to the lack of hrtimers
* Use more specific compatible strings and add platform data (Andrew Lunn)
* Fix Kconfig ordering (Andrew Lunn)
Changes since v2:
* Make it compile by getting all requirements merged first (Jakub Kicinski, David Miller)
* Use "tsn" for TSN register set (Rob Herring)
* Fix DT binding issues (Rob Herring)
Changes since v1:
* Code simplifications (Florian Fainelli, Vladimir Oltean)
* Fix issues with hellcreek.yaml bindings (Florian Fainelli)
* Clear reserved field in ptp v2 event messages (Richard Cochran)
* Make use of generic ptp parsing function (Richard Cochran, Vladimir Oltean)
* Fix Kconfig (Florian Fainelli)
* Add tags (Florian Fainelli, Rob Herring, Richard Cochran)
Changes since RFC ordered by reviewers:
* Andrew Lunn
* Use dev_dbg for debug messages
* Get rid of __ function names where possible
* Use reverse xmas tree variable ordering
* Remove redundant/useless checks
* Improve comments e.g. for PTP
* Fix Kconfig ordering
* Make LED handling more generic and provide info via DT
* Setup advertisement of PHYs according to hardware
* Drop debugfs patch
* Jakub Kicinski
* Fix compiler warnings
* Florian Fainelli
* Switch to YAML DT bindings
* Richard Cochran
* Fix typo
* Add missing NULL checks
Kamil Alkhouri (2):
net: dsa: hellcreek: Add PTP clock support
net: dsa: hellcreek: Add support for hardware timestamping
Kurt Kanzenbach (5):
net: dsa: Add tag handling for Hirschmann Hellcreek switches
net: dsa: Add DSA driver for Hirschmann Hellcreek switches
net: dsa: hellcreek: Add PTP status LEDs
dt-bindings: Add vendor prefix for Hirschmann
dt-bindings: net: dsa: Add documentation for Hellcreek switches
Vladimir Oltean (1):
net: dsa: Give drivers the chance to veto certain upper devices
.../net/dsa/hirschmann,hellcreek.yaml | 127 ++ .../devicetree/bindings/vendor-prefixes.yaml | 2 + drivers/net/dsa/Kconfig | 2 + drivers/net/dsa/Makefile | 1 + drivers/net/dsa/hirschmann/Kconfig | 9 + drivers/net/dsa/hirschmann/Makefile | 5 + drivers/net/dsa/hirschmann/hellcreek.c | 1339 +++++++++++++++++ drivers/net/dsa/hirschmann/hellcreek.h | 286 ++++ .../net/dsa/hirschmann/hellcreek_hwtstamp.c | 479 ++++++ .../net/dsa/hirschmann/hellcreek_hwtstamp.h | 58 + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 452 ++++++ drivers/net/dsa/hirschmann/hellcreek_ptp.h | 76 + .../platform_data/hirschmann-hellcreek.h | 23 + include/net/dsa.h | 8 + net/dsa/Kconfig | 6 + net/dsa/Makefile | 1 + net/dsa/slave.c | 12 + net/dsa/tag_hellcreek.c | 66 + 18 files changed, 2952 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml create mode 100644 drivers/net/dsa/hirschmann/Kconfig create mode 100644 drivers/net/dsa/hirschmann/Makefile create mode 100644 drivers/net/dsa/hirschmann/hellcreek.c create mode 100644 drivers/net/dsa/hirschmann/hellcreek.h create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.c create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.h create mode 100644 include/linux/platform_data/hirschmann-hellcreek.h create mode 100644 net/dsa/tag_hellcreek.c
Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 1/8 net: dsa: Add tag handling for Hirschmann Hellcreek switches
The Hirschmann Hellcreek TSN switches have a special tagging protocol for frames exchanged between the CPU port and the master interface. The format is a one byte trailer indicating the destination or origin port.
It's quite similar to the Micrel KSZ tagging. That's why the implementation is based on that code.
--- include/net/dsa.h | 2 ++ net/dsa/Kconfig | 6 ++++ net/dsa/Makefile | 1 + net/dsa/tag_hellcreek.c | 66 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+) create mode 100644 net/dsa/tag_hellcreek.c
include/net/dsa.h +2 -0
@@ -45,6 +45,7 @@ struct phylink_link_state;#define DSA_TAG_PROTO_OCELOT_VALUE 15#define DSA_TAG_PROTO_AR9331_VALUE 16#define DSA_TAG_PROTO_RTL4_A_VALUE 17 +#define DSA_TAG_PROTO_HELLCREEK_VALUE 18enum dsa_tag_protocol {DSA_TAG_PROTO_NONE =DSA_TAG_PROTO_NONE_VALUE ,
@@ -65,6 +66,7 @@ enum dsa_tag_protocol {DSA_TAG_PROTO_OCELOT =DSA_TAG_PROTO_OCELOT_VALUE ,DSA_TAG_PROTO_AR9331 =DSA_TAG_PROTO_AR9331_VALUE ,DSA_TAG_PROTO_RTL4_A =DSA_TAG_PROTO_RTL4_A_VALUE , + DSA_TAG_PROTO_HELLCREEK = DSA_TAG_PROTO_HELLCREEK_VALUE, };struct packet_type ;
net/dsa/Kconfig +6 -0
@@ -56,6 +56,12 @@ config NET_DSA_TAG_BRCM_PREPEND Broadcom switches which places the tag before the Ethernet header (prepended). +config NET_DSA_TAG_HELLCREEK + tristate "Tag driver for Hirschmann Hellcreek TSN switches" + help + Say Y or M if you want to enable support for tagging frames + for the Hirschmann Hellcreek TSN switches. + config NET_DSA_TAG_GSWIP tristate "Tag driver for Lantiq / Intel GSWIP switches" help
net/dsa/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-$(CONFIG_NET_DSA_TAG_BRCM_COMMON) += tag_brcm.o obj-$(CONFIG_NET_DSA_TAG_DSA) += tag_dsa.o obj-$(CONFIG_NET_DSA_TAG_EDSA) += tag_edsa.o obj-$(CONFIG_NET_DSA_TAG_GSWIP) += tag_gswip.o +obj-$(CONFIG_NET_DSA_TAG_HELLCREEK) += tag_hellcreek.o obj-$(CONFIG_NET_DSA_TAG_KSZ) += tag_ksz.o obj-$(CONFIG_NET_DSA_TAG_RTL4_A) += tag_rtl4_a.o obj-$(CONFIG_NET_DSA_TAG_LAN9303) += tag_lan9303.o
net/dsa/tag_hellcreek.c new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH net-next v8 1/8] net: dsa: Add tag handling for Hirschmann Hellcreek switches
Quoted 18 lines · Kurt Kanzenbach
The Hirschmann Hellcreek TSN switches have a special tagging protocol for frames exchanged between the CPU port and the master interface. The format is a one byte trailer indicating the destination or origin port.
It's quite similar to the Micrel KSZ tagging. That's why the implementation is based on that code.
Signed-off-by Kurt Kanzenbach <[email protected]>---
net/dsa/tag_hellcreek.c new file +3
-0@@ -0,0 +1,66 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* +* net/dsa/tag_hellcreek.c - Hirschmann Hellcreek switch tag format handling
net/dsa/tag_hellcreek.c line 13
Quoted 10 lines
net/dsa/tag_hellcreek.c new file +10
-0+* +* Copyright (C) 2019,2020 Linutronix GmbH +* Author Kurt Kanzenbach <[email protected]> +* +* Based on tag_ksz.c. +*/ + +#include <linux/etherdevice.h> +#include <linux/list.h> +#include <linux/slab.h>
You probably don't need these includes any longer, but you don't have to resend this series just to remove them, you could do that afterwards.
Quoted 56 lines
net/dsa/tag_hellcreek.c new file +53
-0+#include <net/dsa.h> + +#include "dsa_priv.h" + +#define HELLCREEK_TAG_LEN 1 + +static struct sk_buff *hellcreek_xmit (struct sk_buff *skb, +struct net_device *dev) +{ +struct dsa_port *dp =dsa_slave_to_port (dev); +u8 *tag; + +/* Tag encoding */ + tag =skb_put (skb,HELLCREEK_TAG_LEN ); + *tag =BIT (dp->index); + +return skb; +} + +static struct sk_buff *hellcreek_rcv (struct sk_buff *skb, +struct net_device *dev, +struct packet_type *pt) +{ +/* Tag decoding */ +u8 *tag =skb_tail_pointer (skb) -HELLCREEK_TAG_LEN ; +unsigned int port = tag[0 ] &0x03 ; + + skb->dev =dsa_master_find_slave (dev,0 , port); +if (!skb->dev) { +netdev_warn (dev,"Failed to get source port: %d\n" , port); +return NULL ; + } + +pskb_trim_rcsum (skb, skb->len -HELLCREEK_TAG_LEN ); + + skb->offload_fwd_mark = true; + +return skb; +} + +static const struct dsa_device_ops hellcreek_netdev_ops = { + .name ="hellcreek" , + .proto =DSA_TAG_PROTO_HELLCREEK , + .xmit = hellcreek_xmit, + .rcv = hellcreek_rcv, + .overhead =HELLCREEK_TAG_LEN , + .tail_tag = true, +}; + +MODULE_LICENSE ("Dual MIT/GPL" ); +MODULE_ALIAS_DSA_TAG_DRIVER (DSA_TAG_PROTO_HELLCREEK ); + +module_dsa_tag_driver (hellcreek_netdev_ops);Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 2/8 net: dsa: Give drivers the chance to veto certain upper devices
In reply to Kurt KanzenbachFrom: Vladimir Oltean <[email protected]>
Some switches rely on unique pvids to ensure port separation in standalone mode, because they don't have a port forwarding matrix configurable in hardware. So, setups like a group of 2 uppers with the same VLAN, swp0.100 and swp1.100, will cause traffic tagged with VLAN 100 to be autonomously forwarded between these switch ports, in spite of there being no bridge between swp0 and swp1.
These drivers need to prevent this from happening. They need to have VLAN filtering enabled in standalone mode (so they'll drop frames tagged with unknown VLANs) and they can only accept an 8021q upper on a port as long as it isn't installed on any other port too. So give them the chance to veto bad user requests.
--- include/net/dsa.h | 6 ++++++ net/dsa/slave.c | 12 ++++++++++++ 2 files changed, 18 insertions(+)
include/net/dsa.h +6 -0
@@ -536,6 +536,12 @@ struct dsa_switch_ops {void (*get_regs)(struct dsa_switch *ds,int port,struct ethtool_regs *regs,void *p); +/* +* Upper device tracking. +*/ +int (*port_prechangeupper)(struct dsa_switch *ds,int port, +struct netdev_notifier_changeupper_info *info); +/* * Bridge integration */
net/dsa/slave.c +12 -0
@@ -2032,10 +2032,22 @@ static int dsa_slave_netdevice_event(struct notifier_block *nb,switch (event) {case NETDEV_PRECHANGEUPPER : {struct netdev_notifier_changeupper_info *info = ptr; +struct dsa_switch *ds; +struct dsa_port *dp; +int err;if (!dsa_slave_dev_check (dev))return dsa_prevent_bridging_8021q_upper (dev, ptr); + dp =dsa_slave_to_port (dev); + ds = dp->ds; + +if (ds->ops->port_prechangeupper) { + err = ds->ops->port_prechangeupper (ds, dp->index, info); +if (err) +return notifier_from_errno (err); + } +if (is_vlan_dev (info->upper_dev))return dsa_slave_check_8021q_upper (dev, ptr);break ;
Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 3/8 net: dsa: Add DSA driver for Hirschmann Hellcreek switches
In reply to Kurt KanzenbachAdd a basic DSA driver for Hirschmann Hellcreek switches. Those switches are implementing features needed for Time Sensitive Networking (TSN) such as support for the Time Precision Protocol and various shapers like the Time Aware Shaper.
This driver includes basic support for networking:
* VLAN handling
* FDB handling
* Port statistics
* STP
* Phylink
--- drivers/net/dsa/Kconfig | 2 + drivers/net/dsa/Makefile | 1 + drivers/net/dsa/hirschmann/Kconfig | 8 + drivers/net/dsa/hirschmann/Makefile | 2 + drivers/net/dsa/hirschmann/hellcreek.c | 1253 +++++++++++++++++ drivers/net/dsa/hirschmann/hellcreek.h | 249 ++++ .../platform_data/hirschmann-hellcreek.h | 23 + 7 files changed, 1538 insertions(+) create mode 100644 drivers/net/dsa/hirschmann/Kconfig create mode 100644 drivers/net/dsa/hirschmann/Makefile create mode 100644 drivers/net/dsa/hirschmann/hellcreek.c create mode 100644 drivers/net/dsa/hirschmann/hellcreek.h create mode 100644 include/linux/platform_data/hirschmann-hellcreek.h
drivers/net/dsa/Kconfig +2 -0
@@ -24,6 +24,8 @@ config NET_DSA_LOOP This enables support for a fake mock-up switch chip which exercises the DSA APIs. +source "drivers/net/dsa/hirschmann/Kconfig" + config NET_DSA_LANTIQ_GSWIP tristate "Lantiq / Intel GSWIP" depends on HAS_IOMEM && NET_DSA
drivers/net/dsa/Makefile +1 -0
@@ -18,6 +18,7 @@ obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx-core.o obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM) += vitesse-vsc73xx-platform.o obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o obj-y += b53/ +obj-y += hirschmann/ obj-y += microchip/ obj-y += mv88e6xxx/ obj-y += ocelot/
drivers/net/dsa/hirschmann/Kconfig new file +8 -0
@@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 +config NET_DSA_HIRSCHMANN_HELLCREEK + tristate "Hirschmann Hellcreek TSN Switch support" + depends on HAS_IOMEM + depends on NET_DSA + select NET_DSA_TAG_HELLCREEK + help + This driver adds support for Hirschmann Hellcreek TSN switches.
drivers/net/dsa/hirschmann/Makefile new file +2 -0
@@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK) += hellcreek.o
drivers/net/dsa/hirschmann/hellcreek.c new file +1253 -0
1,253 lines not on this page · raw message
drivers/net/dsa/hirschmann/hellcreek.h new file +249 -0
249 lines not on this page · raw message
include/linux/platform_data/hirschmann-hellcreek.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: (GPL-2.0 or MIT) */ +/* +* Hirschmann Hellcreek TSN switch platform data. +* +* Copyright (C) 2020 Linutronix GmbH +* Author Kurt Kanzenbach <[email protected]> +*/ + +#ifndef _HIRSCHMANN_HELLCREEK_H_ +#define _HIRSCHMANN_HELLCREEK_H_ + +#include <linux/types.h> + +struct hellcreek_platform_data { +int num_ports;/* Amount of switch ports */ +int is_100_mbits;/* Is it configured to 100 or 1000 mbit/s */ +int qbv_support;/* Qbv support on front TSN ports */ +int qbv_on_cpu_port;/* Qbv support on the CPU port */ +int qbu_support;/* Qbu support on front TSN ports */ +u16 module_id;/* Module identificaton */ +}; + +#endif /* _HIRSCHMANN_HELLCREEK_H_ */
Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 4/8 net: dsa: hellcreek: Add PTP clock support
In reply to Kurt KanzenbachFrom: Kamil Alkhouri <[email protected]>
The switch has internal PTP hardware clocks. Add support for it. There are three clocks:
* Synchronized
* Syntonized
* Free running
Currently the synchronized clock is exported to user space which is a good default for the beginning. The free running clock might be exported later e.g. for implementing 802.1AS-2011/2020 Time Aware Bridges (TAB). The switch also supports cross time stamping for that purpose.
The implementation adds support setting/getting the time as well as offset and frequency adjustments. However, the clock only holds a partial timeofday timestamp. This is why we track the seconds completely in software (see overflow work and last_ts).
Furthermore, add the PTP multicast addresses into the FDB to forward that packages only to the CPU port where they are processed by a PTP program.
--- drivers/net/dsa/hirschmann/Kconfig | 1 + drivers/net/dsa/hirschmann/Makefile | 4 +- drivers/net/dsa/hirschmann/hellcreek.c | 71 ++++++ drivers/net/dsa/hirschmann/hellcreek.h | 8 + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 283 +++++++++++++++++++++ drivers/net/dsa/hirschmann/hellcreek_ptp.h | 69 +++++ 6 files changed, 435 insertions(+), 1 deletion(-) create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.c create mode 100644 drivers/net/dsa/hirschmann/hellcreek_ptp.h
drivers/net/dsa/hirschmann/Kconfig +1 -0
@@ -3,6 +3,7 @@ config NET_DSA_HIRSCHMANN_HELLCREEK tristate "Hirschmann Hellcreek TSN Switch support" depends on HAS_IOMEM depends on NET_DSA + depends on PTP_1588_CLOCK select NET_DSA_TAG_HELLCREEK help This driver adds support for Hirschmann Hellcreek TSN switches.
drivers/net/dsa/hirschmann/Makefile +3 -1
@@ -1,2 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK) += hellcreek.o +obj-$(CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK) += hellcreek_sw.o +hellcreek_sw-objs := hellcreek.o +hellcreek_sw-objs += hellcreek_ptp.o
drivers/net/dsa/hirschmann/hellcreek.c +71 -0
116 lines not on this page · raw message
drivers/net/dsa/hirschmann/hellcreek.h +8 -0
@@ -15,6 +15,7 @@#include <linux/device.h> #include <linux/kernel.h> #include <linux/mutex.h> +#include <linux/workqueue.h> #include <linux/platform_data/hirschmann-hellcreek.h> #include <linux/ptp_clock_kernel.h> #include <linux/timecounter.h>
@@ -237,12 +238,19 @@ struct hellcreek {const struct hellcreek_platform_data *pdata;struct device *dev;struct dsa_switch *ds; +struct ptp_clock *ptp_clock; +struct ptp_clock_info ptp_clock_info;struct hellcreek_port *ports; +struct delayed_work overflow_work;struct mutex reg_lock;/* Switch IP register lock */ struct mutex vlan_lock;/* VLAN bitmaps lock */ +struct mutex ptp_lock;/* PTP IP register lock */ void __iomem *base; +void __iomem *ptp_base;u16 swcfg;/* swcfg shadow */ u8 *vidmbrcfg;/* vidmbrcfg shadow */ +u64 seconds;/* PTP seconds */ +u64 last_ts;/* Used for overflow detection */ size_t fdb_entries; };
drivers/net/dsa/hirschmann/hellcreek_ptp.c new file +283 -0
283 lines not on this page · raw message
drivers/net/dsa/hirschmann/hellcreek_ptp.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 5/8 net: dsa: hellcreek: Add support for hardware timestamping
In reply to Kurt KanzenbachFrom: Kamil Alkhouri <[email protected]>
The switch has the ability to take hardware generated time stamps per port for PTPv2 event messages in Rx and Tx direction. That is useful for achieving needed time synchronization precision for TSN devices/switches. So add support for it.
There are two directions:
* RX
The switch has a single register per port to capture a timestamp. That mechanism is not used due to correlation problems. If the software processing is too slow and a PTPv2 event message is received before the previous one has been processed, false timestamps will be captured. Therefore, the switch can do "inline" timestamping which means it can insert the nanoseconds part of the timestamp directly into the PTPv2 event message. The reserved field (4 bytes) is leveraged for that. This might not be in accordance with (older) PTP standards, but is the only way to get reliable results.
* TX
In Tx direction there is no correlation problem, because the software and the driver has to ensure that only one event message is "on the fly". However, the switch provides also a mechanism to check whether a timestamp is lost. That can only happen when a timestamp is read and at this point another message is timestamped. So, that lost bit is checked just in case to indicate to the user that the driver or the software is somewhat buggy.
--- drivers/net/dsa/hirschmann/Makefile | 1 + drivers/net/dsa/hirschmann/hellcreek.c | 15 + drivers/net/dsa/hirschmann/hellcreek.h | 25 + .../net/dsa/hirschmann/hellcreek_hwtstamp.c | 479 ++++++++++++++++++ .../net/dsa/hirschmann/hellcreek_hwtstamp.h | 58 +++ drivers/net/dsa/hirschmann/hellcreek_ptp.c | 48 +- drivers/net/dsa/hirschmann/hellcreek_ptp.h | 4 + 7 files changed, 616 insertions(+), 14 deletions(-) create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c create mode 100644 drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h
drivers/net/dsa/hirschmann/Makefile +1 -0
@@ -2,3 +2,4 @@ obj-$(CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK) += hellcreek_sw.o hellcreek_sw-objs := hellcreek.o hellcreek_sw-objs += hellcreek_ptp.o +hellcreek_sw-objs += hellcreek_hwtstamp.o
drivers/net/dsa/hirschmann/hellcreek.c +15 -0
@@ -26,6 +26,7 @@#include "hellcreek.h" #include "hellcreek_ptp.h" +#include "hellcreek_hwtstamp.h" static const struct hellcreek_counter hellcreek_counter[] = { {0x00 ,"RxFiltered" , },
@@ -1139,6 +1140,7 @@ static const struct dsa_switch_ops hellcreek_ds_ops = { .get_sset_count = hellcreek_get_sset_count, .get_strings = hellcreek_get_strings, .get_tag_protocol = hellcreek_get_tag_protocol, + .get_ts_info = hellcreek_get_ts_info, .phylink_validate = hellcreek_phylink_validate, .port_bridge_join = hellcreek_port_bridge_join, .port_bridge_leave = hellcreek_port_bridge_leave,
@@ -1147,8 +1149,12 @@ static const struct dsa_switch_ops hellcreek_ds_ops = { .port_fdb_add = hellcreek_fdb_add, .port_fdb_del = hellcreek_fdb_del, .port_fdb_dump = hellcreek_fdb_dump, + .port_hwtstamp_set = hellcreek_port_hwtstamp_set, + .port_hwtstamp_get = hellcreek_port_hwtstamp_get, .port_prechangeupper = hellcreek_port_prechangeupper, + .port_rxtstamp = hellcreek_port_rxtstamp, .port_stp_state_set = hellcreek_port_stp_state_set, + .port_txtstamp = hellcreek_port_txtstamp, .port_vlan_add = hellcreek_vlan_add, .port_vlan_del = hellcreek_vlan_del, .port_vlan_filtering = hellcreek_vlan_filtering,
@@ -1270,10 +1276,18 @@ static int hellcreek_probe(struct platform_device *pdev) goto err_ptp_setup; } + ret =hellcreek_hwtstamp_setup (hellcreek); +if (ret) { +dev_err (dev,"Failed to setup hardware timestamping!\n" ); + goto err_tstamp_setup; + } +platform_set_drvdata (pdev, hellcreek);return 0 ; +err_tstamp_setup: +hellcreek_ptp_free (hellcreek); err_ptp_setup:dsa_unregister_switch (hellcreek->ds);
@@ -1284,6 +1298,7 @@ static int hellcreek_remove(struct platform_device *pdev) {struct hellcreek *hellcreek =platform_get_drvdata (pdev); +hellcreek_hwtstamp_free (hellcreek);hellcreek_ptp_free (hellcreek);dsa_unregister_switch (hellcreek->ds);platform_set_drvdata (pdev,NULL );
drivers/net/dsa/hirschmann/hellcreek.h +25 -0
@@ -214,12 +214,37 @@ struct hellcreek_counter {struct hellcreek ; +/* State flags for hellcreek_port_hwtstamp::state */ +enum { +HELLCREEK_HWTSTAMP_ENABLED , +HELLCREEK_HWTSTAMP_TX_IN_PROGRESS , +}; + +/* A structure to hold hardware timestamping information per port */ +struct hellcreek_port_hwtstamp { +/* Timestamping state */ +unsigned long state; + +/* Resources for receive timestamping */ +struct sk_buff_head rx_queue;/* For synchronization messages */ + +/* Resources for transmit timestamping */ +unsigned long tx_tstamp_start; +struct sk_buff *tx_skb; + +/* Current timestamp configuration */ +struct hwtstamp_config tstamp_config; +}; +struct hellcreek_port {struct hellcreek *hellcreek;unsigned long *vlan_dev_bitmap;int port;u16 ptcfg;/* ptcfg shadow */ u64 *counter_values; + +/* Per-port timestamping resources */ +struct hellcreek_port_hwtstamp port_hwtstamp; };struct hellcreek_fdb_entry {
drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c new file +479 -0
479 lines not on this page · raw message
drivers/net/dsa/hirschmann/hellcreek_hwtstamp.h new file +58 -0
58 lines not on this page · raw message
drivers/net/dsa/hirschmann/hellcreek_ptp.c +34 -14
71 lines not on this page · raw message
drivers/net/dsa/hirschmann/hellcreek_ptp.h +4 -0
@@ -59,6 +59,10 @@int hellcreek_ptp_setup (struct hellcreek *hellcreek);void hellcreek_ptp_free (struct hellcreek *hellcreek); +u16 hellcreek_ptp_read (struct hellcreek *hellcreek,unsigned int offset); +void hellcreek_ptp_write (struct hellcreek *hellcreek,u16 data, +unsigned int offset); +u64 hellcreek_ptp_gettime_seconds (struct hellcreek *hellcreek,u64 ns);#define ptp_to_hellcreek (ptp) \ container_of(ptp, struct hellcreek, ptp_clock_info)
Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 6/8 net: dsa: hellcreek: Add PTP status LEDs
In reply to Kurt KanzenbachThe switch has two controllable I/Os which are usually connected to LEDs. This is useful to immediately visually see the PTP status.
These provide two signals:
* is_gm
This LED can be activated if the current device is the grand master in that PTP domain.
* sync_good
This LED can be activated if the current device is in sync with the network time.
Expose these via the LED framework to be controlled via user space e.g. linuxptp.
--- drivers/net/dsa/hirschmann/hellcreek.h | 4 + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 149 +++++++++++++++++++++ drivers/net/dsa/hirschmann/hellcreek_ptp.h | 3 + 3 files changed, 156 insertions(+)
drivers/net/dsa/hirschmann/hellcreek.h +4 -0
@@ -16,6 +16,7 @@#include <linux/kernel.h> #include <linux/mutex.h> #include <linux/workqueue.h> +#include <linux/leds.h> #include <linux/platform_data/hirschmann-hellcreek.h> #include <linux/ptp_clock_kernel.h> #include <linux/timecounter.h>
@@ -267,6 +268,8 @@ struct hellcreek {struct ptp_clock_info ptp_clock_info;struct hellcreek_port *ports;struct delayed_work overflow_work; +struct led_classdev led_is_gm; +struct led_classdev led_sync_good;struct mutex reg_lock;/* Switch IP register lock */ struct mutex vlan_lock;/* VLAN bitmaps lock */ struct mutex ptp_lock;/* PTP IP register lock */
@@ -276,6 +279,7 @@ struct hellcreek {u8 *vidmbrcfg;/* vidmbrcfg shadow */ u64 seconds;/* PTP seconds */ u64 last_ts;/* Used for overflow detection */ +u16 status_out;/* ptp.status_out shadow */ size_t fdb_entries; };
drivers/net/dsa/hirschmann/hellcreek_ptp.c +149 -0
170 lines not on this page · raw message
drivers/net/dsa/hirschmann/hellcreek_ptp.h +3 -0
@@ -70,4 +70,7 @@ u64 hellcreek_ptp_gettime_seconds(struct hellcreek *hellcreek, u64 ns);#define dw_overflow_to_hellcreek (dw) \ container_of(dw, struct hellcreek, overflow_work) +#define led_to_hellcreek (ldev, led) \ + container_of(ldev, struct hellcreek, led) +#endif /* _HELLCREEK_PTP_H_ */
Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 7/8 dt-bindings: Add vendor prefix for Hirschmann
In reply to Kurt KanzenbachHirschmann is building devices for automation and networking. Add them to the vendor prefixes.
--- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/vendor-prefixes.yaml +2 -0
@@ -441,6 +441,8 @@ patternProperties: description: HiDeep Inc. "^himax,.*": description: Himax Technologies, Inc. + "^hirschmann,.*": + description: Hirschmann Automation and Control GmbH "^hisilicon,.*": description: Hisilicon Limited. "^hit,.*":
Signature · 1 line
2.20.1
Kurt Kanzenbach
maintainerPATCH v8 8/8 dt-bindings: net: dsa: Add documentation for Hellcreek switches
In reply to Kurt KanzenbachAdd basic documentation and example.
--- .../net/dsa/hirschmann,hellcreek.yaml | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml
Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml new file +127 -0
@@ -0,0 +1,127 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/hirschmann,hellcreek.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Hirschmann Hellcreek TSN Switch Device Tree Bindings + +allOf: + - $ref: dsa.yaml# + +maintainers: + - Andrew Lunn <[email protected]> + - Florian Fainelli <[email protected]> + - Vivien Didelot <[email protected]> + - Kurt Kanzenbach <[email protected]> + +description: + The Hellcreek TSN Switch IP is a 802.1Q Ethernet compliant switch. It supports + the Precision Time Protocol, Hardware Timestamping as well the Time Aware + Shaper. + +properties: + compatible: + items: + - const: hirschmann,hellcreek-de1soc-r1 + + reg: + description: + The physical base address and size of TSN and PTP memory base + minItems: 2 + maxItems: 2 + + reg-names: + items: + - const: tsn + - const: ptp + + leds: + type: object + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^led@[01]$": + type: object + description: Hellcreek leds + $ref: ../../leds/common.yaml# + + properties: + reg: + items: + - enum: [0, 1] + description: Led number + + label: true + + default-state: true + + required: + - reg + + additionalProperties: false + + additionalProperties: false + +required: + - compatible + - reg + - reg-names + - ethernet-ports + - leds + +unevaluatedProperties: false + +examples: + - | + switch0: switch@ff240000 { + compatible = "hirschmann,hellcreek-de1soc-r1"; + reg = <0xff240000 0x1000>, + <0xff250000 0x1000>; + reg-names = "tsn", "ptp"; + dsa,member = <0 0>; + + ethernet-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "cpu"; + ethernet = <&gmac0>; + }; + + port@2 { + reg = <2>; + label = "lan0"; + phy-handle = <&phy1>; + }; + + port@3 { + reg = <3>; + label = "lan1"; + phy-handle = <&phy2>; + }; + }; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@0 { + reg = <0>; + label = "sync_good"; + default-state = "on"; + }; + + led@1 { + reg = <1>; + label = "is_gm"; + default-state = "off"; + }; + }; + };
Signature · 1 line
2.20.1
Quoted 7 lines · On Tue, 3 Nov 2020 08:10:53 +0100 Kurt Kanzenbach wrote:
this series adds a DSA driver for the Hirschmann Hellcreek TSN switch IP. Characteristics of that IP:
* Full duplex Ethernet interface at 100/1000 Mbps on three ports
* IEEE 802.1Q-compliant Ethernet Switch
* IEEE 802.1Qbv Time-Aware scheduling support
* IEEE 1588 and IEEE 802.1AS support
Applied, thanks everyone!