net: dsa: microchip: add PTP support for KSZ9563/KSZ8563 and LAN937x
Subsystems (5)
v8 cover net: dsa: microchip: add PTP support for KSZ9563/KSZ8563 and LAN937x
KSZ9563/KSZ8563 and LAN937x switch are capable for supporting IEEE 1588 PTP protocol. LAN937x has the same PTP register set similar to KSZ9563, hence the implementation has been made common for the KSZ switches. KSZ9563 does not support two step timestamping but LAN937x supports both. Tested the 1step & 2step p2p timestamping in LAN937x and p2p1step timestamping in KSZ9563.
This patch series is based on the Christian Eggers PTP support for KSZ9563. Applied the Christian patch and updated as per the latest refactoring of KSZ series code. The features added on top are PTP packet Interrupt implementation based on nested handler, LAN937x two step timestamping and programmable per_out pins.
Patch v7 -> v8
- set skb->ip_summed = CHECKSUM_NONE after updating the checksum
Patch v6 -> v7
- Corrected the misplaced spaces and tabs
- Added mutex lock in do_aux_work
- Replaced 0/1 with false/true for ts_en
- SKB_TX_INPROGRESS flag is set before dsa_enqueue_skb
- Removed the fallthrough keyword
- pdelay_resp header correction is performed based on KSZ_SKB_CB(skb)->update_correction instead of clone
Patch v5 -> v6
- Rebased to latest net-next and renamed from RFC to patch net-next.
Patch v4 -> v5
- Replaced irq_domain_add_simple with irq_doamin_add_linear
- Used the helper diff_by_scaled_ppm() for adjfine.
Patch v3 -> v4
- removed IRQF_TRIGGER_FALLING from the request_threaded_irq of ptp msg
- addressed review comments on patch 10 periodic output
- added sign off in patch 6 & 9
- reverted to set PTP_1STEP bit for lan937x which is missed during v3 regression
Patch v2-> v3
- used port_rxtstamp for reconstructing the absolute timestamp instead of tagger function pointer.
- Reverted to setting of 802.1As bit.
Patch v1 -> v2
- GPIO perout enable bit is different for LAN937x and KSZ9x. Added new patch for configuring LAN937x programmable pins.
- PTP enabled in hardware based on both tx and rx timestamping of all the user ports.
- Replaced setting of 802.1AS bit with P2P bit in PTP_MSG_CONF1 register.
RFC v2 -> Patch v1
- Changed the patch author based on past patch submission
- Changed the commit message prefix as net: dsa: microchip: ptp Individual patch changes are listed in correspondig commits.
RFC v1 -> v2
- Added the p2p1step timestamping and conditional execution of 2 step for LAN937x only.
- Added the periodic output support
Arun Ramadoss (5):
net: dsa: microchip: ptp: add 4 bytes in tail tag when ptp enabled
net: dsa: microchip: ptp: enable interrupt for timestamping
net: dsa: microchip: ptp: add support for perout programmable pins
net: dsa: microchip: ptp: lan937x: add 2 step timestamping
net: dsa: microchip: ptp: lan937x: Enable periodic output in LED pins
Christian Eggers (8):
net: dsa: microchip: ptp: add the posix clock support
net: dsa: microchip: ptp: Initial hardware time stamping support
net: dsa: microchip: ptp: manipulating absolute time using ptp hw
clock
net: ptp: add helper for one-step P2P clocks
net: dsa: microchip: ptp: add packet reception timestamping
net: dsa: microchip: ptp: add packet transmission timestamping
net: dsa: microchip: ptp: move pdelay_rsp correction field to tail tag
net: dsa: microchip: ptp: add periodic output signal
MAINTAINERS | 1 + drivers/net/dsa/microchip/Kconfig | 11 + drivers/net/dsa/microchip/Makefile | 5 + drivers/net/dsa/microchip/ksz_common.c | 44 +- drivers/net/dsa/microchip/ksz_common.h | 48 + drivers/net/dsa/microchip/ksz_ptp.c | 1199 +++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 86 ++ drivers/net/dsa/microchip/ksz_ptp_reg.h | 142 +++ include/linux/dsa/ksz_common.h | 53 + include/linux/ptp_classify.h | 73 ++ net/dsa/tag_ksz.c | 201 +++- 11 files changed, 1845 insertions(+), 18 deletions(-) create mode 100644 drivers/net/dsa/microchip/ksz_ptp.c create mode 100644 drivers/net/dsa/microchip/ksz_ptp.h create mode 100644 drivers/net/dsa/microchip/ksz_ptp_reg.h create mode 100644 include/linux/dsa/ksz_common.h
base-commit: cbdbb58b6c796e48ad6346e07bf3ae65cf4dc69b
Signature · 1 line
2.36.1
PATCH v8 1/13 net: dsa: microchip: ptp: add the posix clock support
From: Christian Eggers <[email protected]>
This patch implement routines (adjfine, adjtime, gettime and settime) for manipulating the chip's PTP clock. It registers the ptp caps to posix clock register.
---
v4 -> v5
- Used the diff_by_scaled_ppm helper function in adjfine
v2 -> v3
- Reverted back to setting 802_1as bit.
- Also set the p2p bit which is required for the updating correction field.
v1 -> v2
- added arri in copyright message
- Deleted setting 8021_1as bit and added P2P bit in ksz_ptp_clock_register()
- Renamed error_return label to unlock
- Assigned the ptp_clock_info directly instead of const struct
- moved the semicolon in ksz_rmw16 after 0x%x:
- moved ts_info to next patch
RFC v2 -> Patch v1
- Repharsed the Kconfig help text
- Removed IS_ERR_OR_NULL check in ptp_clock_unregister
- Add the check for ptp_data->clock in ksz_ptp_ts_info
- Renamed MAX_DRIFT_CORR to KSZ_MAX_DRIFT_CORR
- Removed the comments
- Variables declaration in reverse christmas tree
- Added the ptp_clock_optional
--- drivers/net/dsa/microchip/Kconfig | 11 ++ drivers/net/dsa/microchip/Makefile | 5 + drivers/net/dsa/microchip/ksz_common.c | 13 +- drivers/net/dsa/microchip/ksz_common.h | 16 ++ drivers/net/dsa/microchip/ksz_ptp.c | 236 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 42 +++++ drivers/net/dsa/microchip/ksz_ptp_reg.h | 52 ++++++ 7 files changed, 374 insertions(+), 1 deletion(-) create mode 100644 drivers/net/dsa/microchip/ksz_ptp.c create mode 100644 drivers/net/dsa/microchip/ksz_ptp.h create mode 100644 drivers/net/dsa/microchip/ksz_ptp_reg.h
drivers/net/dsa/microchip/Kconfig +11 -0
@@ -11,6 +11,7 @@ menuconfig NET_DSA_MICROCHIP_KSZ_COMMON config NET_DSA_MICROCHIP_KSZ9477_I2C tristate "KSZ series I2C connected switch driver" depends on NET_DSA_MICROCHIP_KSZ_COMMON && I2C + depends on PTP_1588_CLOCK_OPTIONAL select REGMAP_I2C help Select to enable support for registering switches configured through I2C.
@@ -18,10 +19,20 @@ config NET_DSA_MICROCHIP_KSZ9477_I2C config NET_DSA_MICROCHIP_KSZ_SPI tristate "KSZ series SPI connected switch driver" depends on NET_DSA_MICROCHIP_KSZ_COMMON && SPI + depends on PTP_1588_CLOCK_OPTIONAL select REGMAP_SPI help Select to enable support for registering switches configured through SPI. +config NET_DSA_MICROCHIP_KSZ_PTP + bool "Support for the PTP clock on the KSZ9563/LAN937x Ethernet Switch" + depends on NET_DSA_MICROCHIP_KSZ_COMMON && PTP_1588_CLOCK + help + Select to enable support for timestamping & PTP clock manipulation in + KSZ8563/KSZ9563/LAN937x series of switches. KSZ9563/KSZ8563 supports + only one step timestamping. LAN937x switch supports both one step and + two step timestamping. + config NET_DSA_MICROCHIP_KSZ8863_SMI tristate "KSZ series SMI connected switch driver" depends on NET_DSA_MICROCHIP_KSZ_COMMON
drivers/net/dsa/microchip/Makefile +5 -0
@@ -4,6 +4,11 @@ ksz_switch-objs := ksz_common.o ksz_switch-objs += ksz9477.o ksz_switch-objs += ksz8795.o ksz_switch-objs += lan937x_main.o + +ifdef CONFIG_NET_DSA_MICROCHIP_KSZ_PTP +ksz_switch-objs += ksz_ptp.o +endif + obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C) += ksz9477_i2c.o obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ_SPI) += ksz_spi.o obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI) += ksz8863_smi.o
drivers/net/dsa/microchip/ksz_common.c +12 -1
@@ -25,6 +25,7 @@#include <net/switchdev.h> #include "ksz_common.h" +#include "ksz_ptp.h" #include "ksz8.h" #include "ksz9477.h" #include "lan937x.h"
@@ -2102,10 +2103,16 @@ static int ksz_setup(struct dsa_switch *ds) } } + ret =ksz_ptp_clock_register (ds); +if (ret) { +dev_err (dev->dev,"Failed to register PTP clock: %d\n" , ret); + goto out_pirq; + } + ret =ksz_mdio_register (dev);if (ret <0 ) {dev_err (dev->dev,"failed to register the mdio" ); - goto out_pirq; + goto out_ptp_clock_unregister; }/* start switch */
@@ -2114,6 +2121,8 @@ static int ksz_setup(struct dsa_switch *ds)return 0 ; +out_ptp_clock_unregister: +ksz_ptp_clock_unregister (ds); out_pirq:if (dev->irq >0 )dsa_switch_for_each_user_port (dp, dev->ds)
@@ -2130,6 +2139,8 @@ static void ksz_teardown(struct dsa_switch *ds)struct ksz_device *dev = ds->priv;struct dsa_port *dp; +ksz_ptp_clock_unregister (ds); +if (dev->irq >0 ) {dsa_switch_for_each_user_port (dp, dev->ds)ksz_irq_free (&dev->ports[dp->index].pirq);
drivers/net/dsa/microchip/ksz_common.h +16 -0
@@ -15,6 +15,8 @@#include <net/dsa.h> #include <linux/irq.h> +#include "ksz_ptp.h" +#define KSZ_MAX_NUM_PORTS 8struct ksz_device ;
@@ -140,6 +142,7 @@ struct ksz_device {u16 port_mask;struct mutex lock_irq;/* IRQ Access */ struct ksz_irq girq; +struct ksz_ptp_data ptp_data; };/* List of supported models */
@@ -443,6 +446,19 @@ static inline int ksz_write32(struct ksz_device *dev, u32 reg, u32 value)return ret; } +static inline int ksz_rmw16 (struct ksz_device *dev,u32 reg,u16 mask, +u16 value) +{ +int ret; + + ret =regmap_update_bits (dev->regmap[1 ], reg, mask, value); +if (ret) +dev_err (dev->dev,"can't rmw 16bit reg 0x%x: %pe\n" , reg, +ERR_PTR (ret)); + +return ret; +} +static inline int ksz_write64 (struct ksz_device *dev,u32 reg,u64 value) {u32 val[2 ];
drivers/net/dsa/microchip/ksz_ptp.c new file +236 -0
236 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_ptp.h new file +42 -0
42 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_ptp_reg.h new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v8 2/13 net: dsa: microchip: ptp: Initial hardware time stamping support
In reply to Arun RamadossFrom: Christian Eggers <[email protected]>
This patch adds the routine for get_ts_info, hwstamp_get, set. This enables the PTP support towards userspace applications such as linuxptp.
---
v6 -> v7
- corrected the spaces and tabs misplacement
v1 -> v2
- Declared the ksz_hwtstamp_get/set to NULL as macro if ptp is not enabled
- Removed mutex lock in hwtstamp_set()
RFC v2 -> Patch v1
- moved tagger set and get function to separate patch
- Removed unnecessary comments
--- drivers/net/dsa/microchip/ksz_common.c | 3 + drivers/net/dsa/microchip/ksz_common.h | 3 + drivers/net/dsa/microchip/ksz_ptp.c | 101 +++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 11 +++ 4 files changed, 118 insertions(+)
drivers/net/dsa/microchip/ksz_common.c +3 -0
@@ -2977,6 +2977,9 @@ static const struct dsa_switch_ops ksz_switch_ops = { .get_pause_stats = ksz_get_pause_stats, .port_change_mtu = ksz_change_mtu, .port_max_mtu = ksz_max_mtu, + .get_ts_info = ksz_get_ts_info, + .port_hwtstamp_get = ksz_hwtstamp_get, + .port_hwtstamp_set = ksz_hwtstamp_set, };struct ksz_device *ksz_switch_alloc (struct device *base,void *priv)
drivers/net/dsa/microchip/ksz_common.h +3 -0
@@ -102,6 +102,9 @@ struct ksz_port {struct ksz_device *ksz_dev;struct ksz_irq pirq;u8 num; +#if IS_ENABLED (CONFIG_NET_DSA_MICROCHIP_KSZ_PTP ) +struct hwtstamp_config tstamp_config; +#endif };struct ksz_device {
drivers/net/dsa/microchip/ksz_ptp.c +101 -0
107 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_ptp.h +11 -0
@@ -23,6 +23,11 @@ int ksz_ptp_clock_register(struct dsa_switch *ds);void ksz_ptp_clock_unregister (struct dsa_switch *ds); +int ksz_get_ts_info (struct dsa_switch *ds,int port, +struct ethtool_ts_info *ts); +int ksz_hwtstamp_get (struct dsa_switch *ds,int port,struct ifreq *ifr); +int ksz_hwtstamp_set (struct dsa_switch *ds,int port,struct ifreq *ifr); +#else struct ksz_ptp_data {
@@ -37,6 +42,12 @@ static inline int ksz_ptp_clock_register(struct dsa_switch *ds)static inline void ksz_ptp_clock_unregister (struct dsa_switch *ds) { } +#define ksz_get_ts_info NULL + +#define ksz_hwtstamp_get NULL + +#define ksz_hwtstamp_set NULL +#endif /* End of CONFIG_NET_DSA_MICROCHIP_KSZ_PTP */ #endif
Signature · 1 line
2.36.1
PATCH v8 3/13 net: dsa: microchip: ptp: add 4 bytes in tail tag when ptp enabled
In reply to Arun RamadossWhen the PTP is enabled in hardware bit 6 of PTP_MSG_CONF1 register, the transmit frame needs additional 4 bytes before the tail tag. It is needed for all the transmission packets irrespective of PTP packets or not.
The 4-byte timestamp field is 0 for frames other than Pdelay_Resp. For the one-step Pdelay_Resp, the switch needs the receive timestamp of the Pdelay_Req message so that it can put the turnaround time in the correction field.
Since PTP has to be enabled for both Transmission and reception timestamping, driver needs to track of the tx and rx setting of the all the user ports in the switch.
Two flags hw_tx_en and hw_rx_en are added in ksz_port to track the timestampping setting of each port. When any one of ports has tx or rx timestampping enabled, bit 6 of PTP_MSG_CONF1 is set and it is indicated to tag_ksz.c through tagger bytes. This flag adds 4 additional bytes to the tail tag. When tx and rx timestamping of all the ports are disabled, then 4 bytes are not added.
Tested using hwstamp -i <interface>
---
v1 - v2
- check patch warning for line exceeding 80
- Removed the tagger_get_state function
- Added the 4 additional bytes to tail tag based on the all the ports tx and rx timestamping
Patch v1
- Patch is new
--- MAINTAINERS | 1 + drivers/net/dsa/microchip/ksz_common.h | 2 + drivers/net/dsa/microchip/ksz_ptp.c | 34 ++++++++- include/linux/dsa/ksz_common.h | 22 ++++++ net/dsa/tag_ksz.c | 95 ++++++++++++++++++++++++-- 5 files changed, 145 insertions(+), 9 deletions(-) create mode 100644 include/linux/dsa/ksz_common.h
MAINTAINERS +1 -0
@@ -13710,6 +13710,7 @@ S: Maintained F: Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml F: Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml F: drivers/net/dsa/microchip/* +F: include/linux/dsa/ksz_common.h F: include/linux/platform_data/microchip-ksz.h F: net/dsa/tag_ksz.c
drivers/net/dsa/microchip/ksz_common.h +2 -0
@@ -104,6 +104,8 @@ struct ksz_port {u8 num;#if IS_ENABLED (CONFIG_NET_DSA_MICROCHIP_KSZ_PTP )struct hwtstamp_config tstamp_config; +bool hwts_tx_en; +bool hwts_rx_en;#endif };
drivers/net/dsa/microchip/ksz_ptp.c +32 -2
@@ -5,6 +5,7 @@* Copyright (C) 2022 Microchip Technology Inc. */ +#include <linux/dsa/ksz_common.h> #include <linux/kernel.h> #include <linux/ptp_classify.h> #include <linux/ptp_clock_kernel.h>
@@ -24,6 +25,27 @@#define KSZ_PTP_INC_NS 40ULL/* HW clock is incremented every 40 ns (by 40) */ #define KSZ_PTP_SUBNS_BITS 32 +static int ksz_ptp_enable_mode (struct ksz_device *dev) +{ +struct ksz_tagger_data *tagger_data =ksz_tagger_data (dev->ds); +struct ksz_port *prt; +struct dsa_port *dp; +bool tag_en = false; + +dsa_switch_for_each_user_port (dp, dev->ds) { + prt = &dev->ports[dp->index]; +if (prt->hwts_tx_en || prt->hwts_rx_en) { + tag_en = true; +break ; + } + } + + tagger_data->hwtstamp_set_state (dev->ds, tag_en); + +return ksz_rmw16 (dev,REG_PTP_MSG_CONF1 ,PTP_ENABLE , + tag_en ?PTP_ENABLE :0 ); +} +/* The function is return back the capability of timestamping feature when * requested through ethtool -T <interface> utility */
@@ -67,6 +89,7 @@ int ksz_hwtstamp_get(struct dsa_switch *ds, int port, struct ifreq *ifr) }static int ksz_set_hwtstamp_config (struct ksz_device *dev, +struct ksz_port *prt,struct hwtstamp_config *config) {if (config->flags)
@@ -74,7 +97,10 @@ static int ksz_set_hwtstamp_config(struct ksz_device *dev,switch (config->tx_type) {case HWTSTAMP_TX_OFF : + prt->hwts_tx_en = false; +break ;case HWTSTAMP_TX_ONESTEP_P2P : + prt->hwts_tx_en = true;break ;default :return -ERANGE ;
@@ -82,25 +108,29 @@ static int ksz_set_hwtstamp_config(struct ksz_device *dev,switch (config->rx_filter) {case HWTSTAMP_FILTER_NONE : + prt->hwts_rx_en = false;break ;case HWTSTAMP_FILTER_PTP_V2_L4_EVENT :case HWTSTAMP_FILTER_PTP_V2_L4_SYNC : config->rx_filter =HWTSTAMP_FILTER_PTP_V2_L4_EVENT ; + prt->hwts_rx_en = true;break ;case HWTSTAMP_FILTER_PTP_V2_L2_EVENT :case HWTSTAMP_FILTER_PTP_V2_L2_SYNC : config->rx_filter =HWTSTAMP_FILTER_PTP_V2_L2_EVENT ; + prt->hwts_rx_en = true;break ;case HWTSTAMP_FILTER_PTP_V2_EVENT :case HWTSTAMP_FILTER_PTP_V2_SYNC : config->rx_filter =HWTSTAMP_FILTER_PTP_V2_EVENT ; + prt->hwts_rx_en = true;break ;default : config->rx_filter =HWTSTAMP_FILTER_NONE ;return -ERANGE ; } -return 0 ; +return ksz_ptp_enable_mode (dev); }int ksz_hwtstamp_set (struct dsa_switch *ds,int port,struct ifreq *ifr)
@@ -116,7 +146,7 @@ int ksz_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr)if (ret)return ret; - ret =ksz_set_hwtstamp_config (dev, &config); + ret =ksz_set_hwtstamp_config (dev, prt, &config);if (ret)return ret;
include/linux/dsa/ksz_common.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Microchip switch tag common header +* +* Copyright (C) 2022 Microchip Technology Inc. +*/ + +#ifndef _NET_DSA_KSZ_COMMON_H_ +#define _NET_DSA_KSZ_COMMON_H_ + +#include <net/dsa.h> + +struct ksz_tagger_data { +void (*hwtstamp_set_state)(struct dsa_switch *ds,bool on); +}; + +static inline struct ksz_tagger_data * +ksz_tagger_data (struct dsa_switch *ds) +{ +return ds->tagger_data; +} + +#endif /* _NET_DSA_KSZ_COMMON_H_ */
net/dsa/tag_ksz.c +88 -7
167 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v8 4/13 net: dsa: microchip: ptp: manipulating absolute time using ptp hw clock
In reply to Arun RamadossFrom: Christian Eggers <[email protected]>
This patch is used for reconstructing the absolute time from the 32bit hardware time stamping value. The do_aux ioctl is used for reading the ptp hardware clock and store it to global variable.
The timestamped value in tail tag during rx and register during tx are 32 bit value (2 bit seconds and 30 bit nanoseconds). The time taken to read entire ptp clock will be time consuming. In order to speed up, the software clock is maintained. This clock time will be added to 32 bit timestamp to get the absolute time stamp.
---
v6 -> v7
- Added the mutex lock in the do_aux_work() to avoid race condition
v1 -> v2
- Used ksz_ptp_gettime instead of _ksz_ptp_gettime in do_aux_work()
- Removed the spin_lock_bh in the ksz_ptp_start_clock()
RFC v1
- This patch is based on Christian Eggers Initial hardware timestamping support
--- drivers/net/dsa/microchip/ksz_ptp.c | 60 ++++++++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_ptp.h | 3 ++ 2 files changed, 62 insertions(+), 1 deletion(-)
drivers/net/dsa/microchip/ksz_ptp.c +59 -1
@@ -28,9 +28,11 @@static int ksz_ptp_enable_mode (struct ksz_device *dev) {struct ksz_tagger_data *tagger_data =ksz_tagger_data (dev->ds); +struct ksz_ptp_data *ptp_data = &dev->ptp_data;struct ksz_port *prt;struct dsa_port *dp;bool tag_en = false; +int ret;dsa_switch_for_each_user_port (dp, dev->ds) { prt = &dev->ports[dp->index];
@@ -40,6 +42,14 @@ static int ksz_ptp_enable_mode(struct ksz_device *dev) } } +if (tag_en) { + ret =ptp_schedule_worker (ptp_data->clock,0 ); +if (ret) +return ret; + }else { +ptp_cancel_worker_sync (ptp_data->clock); + } + tagger_data->hwtstamp_set_state (dev->ds, tag_en); return ksz_rmw16(dev, REG_PTP_MSG_CONF1, PTP_ENABLE,
@@ -221,6 +231,12 @@ static int ksz_ptp_settime(struct ptp_clock_info *ptp, goto unlock; ret =ksz_rmw16 (dev,REG_PTP_CLK_CTRL ,PTP_LOAD_TIME ,PTP_LOAD_TIME ); +if (ret) + goto unlock; + +spin_lock_bh (&ptp_data->clock_lock); + ptp_data->clock_time = *ts; +spin_unlock_bh (&ptp_data->clock_lock); unlock:mutex_unlock (&ptp_data->lock);
@@ -271,6 +287,7 @@ static int ksz_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) {struct ksz_ptp_data *ptp_data =ptp_caps_to_data (ptp);struct ksz_device *dev =ptp_data_to_ksz_dev (ptp_data); +struct timespec64 delta64 =ns_to_timespec64 (delta);s32 sec, nsec;u16 data16;int ret;
@@ -303,15 +320,54 @@ static int ksz_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) data16 |=PTP_STEP_DIR ; ret =ksz_write16 (dev,REG_PTP_CLK_CTRL , data16); +if (ret) + goto unlock; + +spin_lock_bh (&ptp_data->clock_lock); + ptp_data->clock_time =timespec64_add (ptp_data->clock_time, delta64); +spin_unlock_bh (&ptp_data->clock_lock); unlock:mutex_unlock (&ptp_data->lock);return ret; } +/* Function is pointer to the do_aux_work in the ptp_clock capability */ +static long ksz_ptp_do_aux_work (struct ptp_clock_info *ptp) +{ +struct ksz_ptp_data *ptp_data =ptp_caps_to_data (ptp); +struct ksz_device *dev =ptp_data_to_ksz_dev (ptp_data); +struct timespec64 ts; +int ret; + +mutex_lock (&ptp_data->lock); + ret =_ksz_ptp_gettime (dev, &ts); +if (ret) + goto out; + +spin_lock_bh (&ptp_data->clock_lock); + ptp_data->clock_time = ts; +spin_unlock_bh (&ptp_data->clock_lock); + +out: +mutex_unlock (&ptp_data->lock); + +return HZ ;/* reschedule in 1 second */ +} +static int ksz_ptp_start_clock (struct ksz_device *dev) { -return ksz_rmw16 (dev,REG_PTP_CLK_CTRL ,PTP_CLK_ENABLE ,PTP_CLK_ENABLE ); +struct ksz_ptp_data *ptp_data = &dev->ptp_data; +int ret; + + ret =ksz_rmw16 (dev,REG_PTP_CLK_CTRL ,PTP_CLK_ENABLE ,PTP_CLK_ENABLE ); +if (ret) +return ret; + + ptp_data->clock_time.tv_sec =0 ; + ptp_data->clock_time.tv_nsec =0 ; + +return 0 ; }int ksz_ptp_clock_register (struct dsa_switch *ds)
@@ -322,6 +378,7 @@ int ksz_ptp_clock_register(struct dsa_switch *ds) ptp_data = &dev->ptp_data;mutex_init (&ptp_data->lock); +spin_lock_init (&ptp_data->clock_lock); ptp_data->caps.owner =THIS_MODULE ;snprintf (ptp_data->caps.name,16 ,"Microchip Clock" );
@@ -330,6 +387,7 @@ int ksz_ptp_clock_register(struct dsa_switch *ds) ptp_data->caps.settime64 = ksz_ptp_settime; ptp_data->caps.adjfine = ksz_ptp_adjfine; ptp_data->caps.adjtime = ksz_ptp_adjtime; + ptp_data->caps.do_aux_work = ksz_ptp_do_aux_work; ret =ksz_ptp_start_clock (dev);if (ret)
drivers/net/dsa/microchip/ksz_ptp.h +3 -0
@@ -17,6 +17,9 @@ struct ksz_ptp_data {struct ptp_clock *clock;/* Serializes all operations on the PTP hardware clock */ struct mutex lock; +/* lock for accessing the clock_time */ +spinlock_t clock_lock; +struct timespec64 clock_time; };int ksz_ptp_clock_register (struct dsa_switch *ds);
Signature · 1 line
2.36.1
PATCH v8 5/13 net: dsa: microchip: ptp: enable interrupt for timestamping
In reply to Arun RamadossPTP Interrupt mask and status register differ from the global and port interrupt mechanism by two methods. One is that for global/port interrupt enabling we have to clear the bit but for ptp interrupt we have to set the bit. And other is bit12:0 is reserved in ptp interrupt registers. This forced to not use the generic implementation of global/port interrupt method routine. This patch implement the ptp interrupt mechanism to read the timestamp register for sync, pdelay_req and pdelay_resp.
---
v4 -> v5
- Replaced the irq_domain_add_simple with irq_domain_add_linear
- Updated the error path to free_irq
v3 -> v4
- Removed IRQF_TRIGGER_FALLING flag in the request_threaded_irq
RFC v2 -> Patch v1
- Moved the acking of interrupts before calling the handle_nested_irq to avoid race condition between deferred xmit and Irq threads
--- drivers/net/dsa/microchip/ksz_common.c | 15 +- drivers/net/dsa/microchip/ksz_common.h | 11 ++ drivers/net/dsa/microchip/ksz_ptp.c | 207 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 9 ++ drivers/net/dsa/microchip/ksz_ptp_reg.h | 19 +++ 5 files changed, 259 insertions(+), 2 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +13 -2
@@ -2100,13 +2100,17 @@ static int ksz_setup(struct dsa_switch *ds) ret =ksz_pirq_setup (dev, dp->index);if (ret) goto out_girq; + + ret =ksz_ptp_irq_setup (ds, dp->index); +if (ret) + goto out_pirq; } } ret =ksz_ptp_clock_register (ds);if (ret) {dev_err (dev->dev,"Failed to register PTP clock: %d\n" , ret); - goto out_pirq; + goto out_ptpirq; } ret =ksz_mdio_register (dev);
@@ -2123,6 +2127,10 @@ static int ksz_setup(struct dsa_switch *ds) out_ptp_clock_unregister:ksz_ptp_clock_unregister (ds); +out_ptpirq: +if (dev->irq >0 ) +dsa_switch_for_each_user_port (dp, dev->ds) +ksz_ptp_irq_free (ds, dp->index); out_pirq:if (dev->irq >0 )dsa_switch_for_each_user_port (dp, dev->ds)
@@ -2142,8 +2150,11 @@ static void ksz_teardown(struct dsa_switch *ds)ksz_ptp_clock_unregister (ds);if (dev->irq >0 ) { -dsa_switch_for_each_user_port (dp, dev->ds) +dsa_switch_for_each_user_port (dp, dev->ds) { +ksz_ptp_irq_free (ds, dp->index); +ksz_irq_free (&dev->ports[dp->index].pirq); + }ksz_irq_free (&dev->girq); }
drivers/net/dsa/microchip/ksz_common.h +11 -0
@@ -20,6 +20,7 @@#define KSZ_MAX_NUM_PORTS 8struct ksz_device ; +struct ksz_port ;struct vlan_table {u32 table[3 ];
@@ -83,6 +84,13 @@ struct ksz_irq {struct ksz_device *dev; }; +struct ksz_ptp_irq { +struct ksz_port *port; +u16 ts_reg; +char name[16 ]; +int num; +}; +struct ksz_port {bool remove_tag;/* Remove Tag flag set, for ksz8795 only */ bool learning;
@@ -106,6 +114,8 @@ struct ksz_port {struct hwtstamp_config tstamp_config;bool hwts_tx_en;bool hwts_rx_en; +struct ksz_irq ptpirq; +struct ksz_ptp_irq ptpmsg_irq[3 ];#endif };
@@ -612,6 +622,7 @@ static inline int is_lan937x(struct ksz_device *dev)#define REG_PORT_INT_MASK 0x001F#define PORT_SRC_PHY_INT 1 +#define PORT_SRC_PTP_INT 2#define KSZ8795_HUGE_PACKET_SIZE 2000#define KSZ8863_HUGE_PACKET_SIZE 1916
drivers/net/dsa/microchip/ksz_ptp.c +207 -0
225 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_ptp.h +9 -0
@@ -30,6 +30,8 @@ int ksz_get_ts_info(struct dsa_switch *ds, int port, struct ethtool_ts_info *ts);int ksz_hwtstamp_get (struct dsa_switch *ds,int port,struct ifreq *ifr);int ksz_hwtstamp_set (struct dsa_switch *ds,int port,struct ifreq *ifr); +int ksz_ptp_irq_setup (struct dsa_switch *ds,u8 p); +void ksz_ptp_irq_free (struct dsa_switch *ds,u8 p);#else
@@ -45,6 +47,13 @@ static inline int ksz_ptp_clock_register(struct dsa_switch *ds)static inline void ksz_ptp_clock_unregister (struct dsa_switch *ds) { } +static inline int ksz_ptp_irq_setup (struct dsa_switch *ds,u8 p) +{ +return 0 ; +} + +static inline void ksz_ptp_irq_free (struct dsa_switch *ds,u8 p) {} +#define ksz_get_ts_info NULL#define ksz_hwtstamp_get NULL
drivers/net/dsa/microchip/ksz_ptp_reg.h +19 -0
@@ -49,4 +49,23 @@#define PTP_MASTER BIT(1)#define PTP_1STEP BIT(0) +/* Port PTP Register */ +#define REG_PTP_PORT_RX_DELAY__2 0x0C00 +#define REG_PTP_PORT_TX_DELAY__2 0x0C02 +#define REG_PTP_PORT_ASYM_DELAY__2 0x0C04 + +#define REG_PTP_PORT_XDELAY_TS 0x0C08 +#define REG_PTP_PORT_SYNC_TS 0x0C0C +#define REG_PTP_PORT_PDRESP_TS 0x0C10 + +#define REG_PTP_PORT_TX_INT_STATUS__2 0x0C14 +#define REG_PTP_PORT_TX_INT_ENABLE__2 0x0C16 + +#define PTP_PORT_SYNC_INT BIT(15) +#define PTP_PORT_XDELAY_REQ_INT BIT(14) +#define PTP_PORT_PDELAY_RESP_INT BIT(13) +#define KSZ_SYNC_MSG 2 +#define KSZ_XDREQ_MSG 1 +#define KSZ_PDRES_MSG 0 +#endif
Signature · 1 line
2.36.1
PATCH v8 6/13 net: ptp: add helper for one-step P2P clocks
In reply to Arun RamadossFrom: Christian Eggers <[email protected]>
For P2P delay measurement, the ingress time stamp of the PDelay_Req is required for the correction field of the PDelay_Resp. The application echoes back the correction field of the PDelay_Req when sending the PDelay_Resp.
Some hardware (like the ZHAW InES PTP time stamping IP core) subtracts the ingress timestamp autonomously from the correction field, so that the hardware only needs to add the egress timestamp on tx. Other hardware (like the Microchip KSZ9563) reports the ingress time stamp via an interrupt and requires that the software provides this time stamp via tail-tag on tx.
In order to avoid introducing a further application interface for this, the driver can simply emulate the behavior of the InES device and subtract the ingress time stamp in software from the correction field.
On egress, the correction field can either be kept as it is (and the time stamp field in the tail-tag is set to zero) or move the value from the correction field back to the tail-tag.
Changing the correction field requires updating the UDP checksum (if UDP is used as transport).
---
v7 -> v8
- set skb->ip_summed = CHECKSUM_NONE
v1 -> v2
- Fixed compilation issue when PTP_CLASSIFY not selected in menuconfig as reported by kernel test robot <[email protected]>
--- include/linux/ptp_classify.h | 73 ++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+)
include/linux/ptp_classify.h +73 -0
@@ -10,8 +10,12 @@#ifndef _PTP_CLASSIFY_H_#define _PTP_CLASSIFY_H_ +#include <asm/unaligned.h> #include <linux/ip.h> +#include <linux/ktime.h> #include <linux/skbuff.h> +#include <linux/udp.h> +#include <net/checksum.h> #define PTP_CLASS_NONE 0x00/* not a PTP event message */ #define PTP_CLASS_V1 0x01/* protocol version 1 */
@@ -129,6 +133,69 @@ static inline u8 ptp_get_msgtype(const struct ptp_header *hdr,return msgtype; } +/** +* ptp_check_diff8 - Computes new checksum (when altering a 64-bit field) +* @old: old field value +* @new: new field value +* @oldsum: previous checksum +* +* This function can be used to calculate a new checksum when only a single +* field is changed. Similar as ip_vs_check_diff*() in ip_vs.h. +* +* Return: Updated checksum +*/ +static inline __wsum ptp_check_diff8 (__be64 old,__be64 new,__wsum oldsum) +{ +__be64 diff[2 ] = { ~old, new }; + +return csum_partial (diff,sizeof (diff), oldsum); +} + +/** +* ptp_header_update_correction - Update PTP header's correction field +* @skb: packet buffer +* @type: type of the packet (see ptp_classify_raw()) +* @hdr: ptp header +* @correction: new correction value +* +* This updates the correction field of a PTP header and updates the UDP +* checksum (if UDP is used as transport). It is needed for hardware capable of +* one-step P2P that does not already modify the correction field of Pdelay_Req +* event messages on ingress. +*/ +static inline +void ptp_header_update_correction (struct sk_buff *skb,unsigned int type, +struct ptp_header *hdr,s64 correction) +{ +__be64 correction_old; +struct udphdr *uhdr; + +/* previous correction value is required for checksum update. */ +memcpy (&correction_old, &hdr->correction,sizeof (correction_old)); + +/* write new correction value */ +put_unaligned_be64 ((u64 )correction, &hdr->correction); + +switch (type &PTP_CLASS_PMASK ) { +case PTP_CLASS_IPV4 : +case PTP_CLASS_IPV6 : +/* locate udp header */ + uhdr = (struct udphdr *)((char *)hdr -sizeof (struct udphdr )); +break ; +default : +return ; + } + +/* update checksum */ + uhdr->check =csum_fold (ptp_check_diff8 (correction_old, + hdr->correction, + ~csum_unfold (uhdr->check))); +if (!uhdr->check) + uhdr->check =CSUM_MANGLED_0 ; + + skb->ip_summed =CHECKSUM_NONE ; +} +/** * ptp_msg_is_sync - Evaluates whether the given skb is a PTP Sync message * @skb: packet buffer
@@ -166,5 +233,11 @@ static inline bool ptp_msg_is_sync(struct sk_buff *skb, unsigned int type) {return false; } + +static inline +void ptp_header_update_correction (struct sk_buff *skb,unsigned int type, +struct ptp_header *hdr,s64 correction) +{ +}#endif #endif /* _PTP_CLASSIFY_H_ */
Signature · 1 line
2.36.1
PATCH v8 7/13 net: dsa: microchip: ptp: add packet reception timestamping
In reply to Arun RamadossFrom: Christian Eggers <[email protected]>
Rx Timestamping is done through 4 additional bytes in tail tag. Whenever the ptp packet is received, the 4 byte hardware time stamped value is added before 1 byte tail tag. Also, bit 7 in tail tag indicates it as PTP frame. This 4 byte value is extracted from the tail tag and reconstructed to absolute time and assigned to skb hwtstamp. If the packet received in PDelay_Resp, then partial ingress timestamp is subtracted from the correction field. Since user space tools expects to be done in hardware.
---
v3 - v4
- replaced 0 with false in return value of port_rxtstamp
v2 - v3
- Replaced tagger_data->meta_timestamper handler with port_rxtstamp routine
v1 - v2
- Checkpatch warning line limit to 80chars
RFC v2 -> Patch v1
- Fixed compilation issue
--- drivers/net/dsa/microchip/ksz_common.c | 1 + drivers/net/dsa/microchip/ksz_ptp.c | 63 ++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 4 ++ include/linux/dsa/ksz_common.h | 21 +++++++++ net/dsa/tag_ksz.c | 25 +++++++--- 5 files changed, 108 insertions(+), 6 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +1 -0
@@ -2991,6 +2991,7 @@ static const struct dsa_switch_ops ksz_switch_ops = { .get_ts_info = ksz_get_ts_info, .port_hwtstamp_get = ksz_hwtstamp_get, .port_hwtstamp_set = ksz_hwtstamp_set, + .port_rxtstamp = ksz_port_rxtstamp, };struct ksz_device *ksz_switch_alloc (struct device *base,void *priv)
drivers/net/dsa/microchip/ksz_ptp.c +63 -0
69 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_ptp.h +4 -0
@@ -30,6 +30,8 @@ int ksz_get_ts_info(struct dsa_switch *ds, int port, struct ethtool_ts_info *ts);int ksz_hwtstamp_get (struct dsa_switch *ds,int port,struct ifreq *ifr);int ksz_hwtstamp_set (struct dsa_switch *ds,int port,struct ifreq *ifr); +bool ksz_port_rxtstamp (struct dsa_switch *ds,int port,struct sk_buff *skb, +unsigned int type);int ksz_ptp_irq_setup (struct dsa_switch *ds,u8 p);void ksz_ptp_irq_free (struct dsa_switch *ds,u8 p);
@@ -60,6 +62,8 @@ static inline void ksz_ptp_irq_free(struct dsa_switch *ds, u8 p) {}#define ksz_hwtstamp_set NULL +#define ksz_port_rxtstamp NULL +#endif /* End of CONFIG_NET_DSA_MICROCHIP_KSZ_PTP */ #endif
include/linux/dsa/ksz_common.h +21 -0
@@ -9,10 +9,31 @@#include <net/dsa.h> +/* All time stamps from the KSZ consist of 2 bits for seconds and 30 bits for +* nanoseconds. This is NOT the same as 32 bits for nanoseconds. +*/ +#define KSZ_TSTAMP_SEC_MASK GENMASK(31, 30) +#define KSZ_TSTAMP_NSEC_MASK GENMASK(29, 0) + +static inline ktime_t ksz_decode_tstamp (u32 tstamp) +{ +u64 ns =FIELD_GET (KSZ_TSTAMP_SEC_MASK , tstamp) *NSEC_PER_SEC + +FIELD_GET (KSZ_TSTAMP_NSEC_MASK , tstamp); + +return ns_to_ktime (ns); +} +struct ksz_tagger_data {void (*hwtstamp_set_state)(struct dsa_switch *ds,bool on); }; +struct ksz_skb_cb { +u32 tstamp; +}; + +#define KSZ_SKB_CB (skb) \ + ((struct ksz_skb_cb *)((skb)->cb)) +static inline struct ksz_tagger_data *ksz_tagger_data (struct dsa_switch *ds) {
net/dsa/tag_ksz.c +19 -6
@@ -151,10 +151,11 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795, KSZ8795_NAME);* tag0 : Prioritization (not used now) * tag1 : each bit represents port (eg, 0x01=port1, 0x02=port2, 0x10=port5) * -* For Egress (KSZ9477 -> Host), 1 byte is added before FCS. +* For Egress (KSZ9477 -> Host), 1/5 bytes is added before FCS. * --------------------------------------------------------------------------- -* DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|FCS(4bytes) +* DA(6bytes)|SA(6bytes)|....|Data(nbytes)|ts(4bytes)|tag0(1byte)|FCS(4bytes) * --------------------------------------------------------------------------- +* ts : time stamp (Present only if bit 7 of tag0 is set) * tag0 : zero-based value represents port * (eg, 0x00=port1, 0x02=port3, 0x06=port7) */
@@ -166,6 +167,15 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795, KSZ8795_NAME);#define KSZ9477_TAIL_TAG_OVERRIDE BIT(9)#define KSZ9477_TAIL_TAG_LOOKUP BIT(10) +static void ksz_rcv_timestamp (struct sk_buff *skb,u8 *tag) +{ +u8 *tstamp_raw = tag -KSZ_PTP_TAG_LEN ; +ktime_t tstamp; + + tstamp =ksz_decode_tstamp (get_unaligned_be32 (tstamp_raw)); +KSZ_SKB_CB (skb)->tstamp = tstamp; +} +/* Time stamp tag *needs* to be inserted if PTP is enabled in hardware. * Regardless of Whether it is a PTP frame or not. */
@@ -216,8 +226,10 @@ static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev)unsigned int len =KSZ_EGRESS_TAG_LEN ;/* Extra 4-bytes PTP timestamp */ -if (tag[0 ] &KSZ9477_PTP_TAG_INDICATION ) - len +=KSZ9477_PTP_TAG_LEN ; +if (tag[0 ] &KSZ9477_PTP_TAG_INDICATION ) { +ksz_rcv_timestamp (skb, tag); + len +=KSZ_PTP_TAG_LEN ; + }return ksz_common_rcv (skb, dev, port, len); }
@@ -284,10 +296,11 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ9893, KSZ9893_NAME);* tag0 : represents tag override, lookup and valid * tag1 : each bit represents port (eg, 0x01=port1, 0x02=port2, 0x80=port8) * -* For rcv, 1 byte is added before FCS. +* For rcv, 1/5 bytes is added before FCS. * --------------------------------------------------------------------------- -* DA(6bytes)|SA(6bytes)|....|Data(nbytes)|tag0(1byte)|FCS(4bytes) +* DA(6bytes)|SA(6bytes)|....|Data(nbytes)|ts(4bytes)|tag0(1byte)|FCS(4bytes) * --------------------------------------------------------------------------- +* ts : time stamp (Present only if bit 7 of tag0 is set) * tag0 : zero-based value represents port * (eg, 0x00=port1, 0x02=port3, 0x07=port8) */
Signature · 1 line
2.36.1
PATCH v8 8/13 net: dsa: microchip: ptp: add packet transmission timestamping
In reply to Arun RamadossFrom: Christian Eggers <[email protected]>
This patch adds the routines for transmission of ptp packets. When the ptp pdelay_req packet to be transmitted, it uses the deferred xmit worker to schedule the packets.
During irq_setup, interrupt for Sync, Pdelay_req and Pdelay_rsp are enabled. So interrupt is triggered for all three packets. But for p2p1step, we require only time stamp of Pdelay_req packet. Hence to avoid posting of the completion from ISR routine for Sync and Pdelay_resp packets, ts_en flag is introduced. This controls which packets need to processed for timestamp.
After the packet is transmitted, ISR is triggered. The time at which packet transmitted is recorded to separate register.
This value is reconstructed to absolute time and posted to the user application through socket error queue.
---
v6 -> v7
- Replaced 0/1 with false/true for ts_en
- corrected the spaces in port_txtstamp()
- Set SKB_TX_INPROGRESS flag before dsa_enqueue_skb()
v1 -> v2
- Declared the deferred xmit and ksz_port_txtstamp function as null in ptp disabled case
RFC v2 -> Patch v1
- separated the pdelay_rsp message correction update in different patch
--- drivers/net/dsa/microchip/ksz_common.c | 14 +++ drivers/net/dsa/microchip/ksz_common.h | 3 + drivers/net/dsa/microchip/ksz_ptp.c | 115 ++++++++++++++++++++++++- drivers/net/dsa/microchip/ksz_ptp.h | 6 ++ include/linux/dsa/ksz_common.h | 8 ++ net/dsa/tag_ksz.c | 54 +++++++++++- 6 files changed, 196 insertions(+), 4 deletions(-)
drivers/net/dsa/microchip/ksz_common.c +14 -0
@@ -6,6 +6,7 @@*/ #include <linux/delay.h> +#include <linux/dsa/ksz_common.h> #include <linux/export.h> #include <linux/gpio/consumer.h> #include <linux/kernel.h>
@@ -2539,6 +2540,17 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds,return proto; } +static int ksz_connect_tag_protocol (struct dsa_switch *ds, +enum dsa_tag_protocol proto) +{ +struct ksz_tagger_data *tagger_data; + + tagger_data =ksz_tagger_data (ds); + tagger_data->xmit_work_fn = ksz_port_deferred_xmit; + +return 0 ; +} +static int ksz_port_vlan_filtering (struct dsa_switch *ds,int port,bool flag,struct netlink_ext_ack *extack) {
@@ -2954,6 +2966,7 @@ static int ksz_switch_detect(struct ksz_device *dev)static const struct dsa_switch_ops ksz_switch_ops = { .get_tag_protocol = ksz_get_tag_protocol, + .connect_tag_protocol = ksz_connect_tag_protocol, .get_phy_flags = ksz_get_phy_flags, .setup = ksz_setup, .teardown = ksz_teardown,
@@ -2991,6 +3004,7 @@ static const struct dsa_switch_ops ksz_switch_ops = { .get_ts_info = ksz_get_ts_info, .port_hwtstamp_get = ksz_hwtstamp_get, .port_hwtstamp_set = ksz_hwtstamp_set, + .port_txtstamp = ksz_port_txtstamp, .port_rxtstamp = ksz_port_rxtstamp, };
drivers/net/dsa/microchip/ksz_common.h +3 -0
@@ -87,6 +87,7 @@ struct ksz_irq {struct ksz_ptp_irq {struct ksz_port *port;u16 ts_reg; +bool ts_en;char name[16 ];int num; };
@@ -116,6 +117,8 @@ struct ksz_port {bool hwts_rx_en;struct ksz_irq ptpirq;struct ksz_ptp_irq ptpmsg_irq[3 ]; +ktime_t tstamp_msg; +struct completion tstamp_msg_comp;#endif };
drivers/net/dsa/microchip/ksz_ptp.c +114 -1
148 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_ptp.h +6 -0
@@ -30,6 +30,8 @@ int ksz_get_ts_info(struct dsa_switch *ds, int port, struct ethtool_ts_info *ts);int ksz_hwtstamp_get (struct dsa_switch *ds,int port,struct ifreq *ifr);int ksz_hwtstamp_set (struct dsa_switch *ds,int port,struct ifreq *ifr); +void ksz_port_txtstamp (struct dsa_switch *ds,int port,struct sk_buff *skb); +void ksz_port_deferred_xmit (struct kthread_work *work);bool ksz_port_rxtstamp (struct dsa_switch *ds,int port,struct sk_buff *skb,unsigned int type);int ksz_ptp_irq_setup (struct dsa_switch *ds,u8 p);
@@ -64,6 +66,10 @@ static inline void ksz_ptp_irq_free(struct dsa_switch *ds, u8 p) {}#define ksz_port_rxtstamp NULL +#define ksz_port_txtstamp NULL + +#define ksz_port_deferred_xmit NULL +#endif /* End of CONFIG_NET_DSA_MICROCHIP_KSZ_PTP */ #endif
include/linux/dsa/ksz_common.h +8 -0
@@ -23,11 +23,19 @@ static inline ktime_t ksz_decode_tstamp(u32 tstamp)return ns_to_ktime (ns); } +struct ksz_deferred_xmit_work { +struct dsa_port *dp; +struct sk_buff *skb; +struct kthread_work work; +}; +struct ksz_tagger_data { +void (*xmit_work_fn)(struct kthread_work *work);void (*hwtstamp_set_state)(struct dsa_switch *ds,bool on); };struct ksz_skb_cb { +struct sk_buff *clone;u32 tstamp; };
net/dsa/tag_ksz.c +51 -3
102 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v8 9/13 net: dsa: microchip: ptp: move pdelay_rsp correction field to tail tag
In reply to Arun RamadossFrom: Christian Eggers <[email protected]>
For PDelay_Resp messages we will likely have a negative value in the correction field. The switch hardware cannot correctly update such values (produces an off by one error in the UDP checksum), so it must be moved to the time stamp field in the tail tag. Format of the correction field is 48 bit ns + 16 bit fractional ns. After updating the correction field, clone is no longer required hence it is freed.
---
v6 -> v7
- Reverted the fallthrough keyword
- updated pdelay_resp correction without skb clone
- removed local variable update_correction in tag_ksz.c
v2 -> v3
- used update_correction variable in skb->cb instead of ptp_msg_type
v1 -> v2
- added fallthrough keyword in switch case to suppress checkpatch warning
RFC v3 -> Patch v1
- Patch is separated from transmission logic patch
--- drivers/net/dsa/microchip/ksz_ptp.c | 4 ++++ include/linux/dsa/ksz_common.h | 2 ++ net/dsa/tag_ksz.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-)
drivers/net/dsa/microchip/ksz_ptp.c +4 -0
@@ -267,6 +267,10 @@ void ksz_port_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)switch (ptp_msg_type) {case PTP_MSGTYPE_PDELAY_REQ :break ; +case PTP_MSGTYPE_PDELAY_RESP : +KSZ_SKB_CB (skb)->ptp_type = type; +KSZ_SKB_CB (skb)->update_correction = true; +return ;default :return ;
include/linux/dsa/ksz_common.h +2 -0
@@ -36,6 +36,8 @@ struct ksz_tagger_data {struct ksz_skb_cb {struct sk_buff *clone; +unsigned int ptp_type; +bool update_correction;u32 tstamp; };
net/dsa/tag_ksz.c +28 -1
@@ -7,6 +7,7 @@#include <linux/dsa/ksz_common.h> #include <linux/etherdevice.h> #include <linux/list.h> +#include <linux/ptp_classify.h> #include <net/dsa.h> #include "tag.h"
@@ -195,13 +196,39 @@ static void ksz_rcv_timestamp(struct sk_buff *skb, u8 *tag)static void ksz_xmit_timestamp (struct dsa_port *dp,struct sk_buff *skb) {struct ksz_tagger_private *priv; +struct ptp_header *ptp_hdr; +unsigned int ptp_type; +u32 tstamp_raw =0 ; +s64 correction; priv =ksz_tagger_private (dp->ds);if (!test_bit (KSZ_HWTS_EN , &priv->state))return ; -put_unaligned_be32 (0 ,skb_put (skb,KSZ_PTP_TAG_LEN )); +if (!KSZ_SKB_CB (skb)->update_correction) + goto output_tag; + + ptp_type =KSZ_SKB_CB (skb)->ptp_type; + + ptp_hdr =ptp_parse_header (skb, ptp_type); +if (!ptp_hdr) + goto output_tag; + + correction = (s64 )get_unaligned_be64 (&ptp_hdr->correction); + +if (correction <0 ) { +struct timespec64 ts; + + ts =ns_to_timespec64 (-correction >>16 ); + tstamp_raw = ((ts.tv_sec &3 ) <<30 ) | ts.tv_nsec; + +/* Set correction field to 0 and update UDP checksum */ +ptp_header_update_correction (skb, ptp_type, ptp_hdr,0 ); + } + +output_tag: +put_unaligned_be32 (tstamp_raw,skb_put (skb,KSZ_PTP_TAG_LEN )); }/* Defer transmit if waiting for egress time stamp is required. */
Signature · 1 line
2.36.1
PATCH v8 10/13 net: dsa: microchip: ptp: add periodic output signal
In reply to Arun RamadossFrom: Christian Eggers <[email protected]>
LAN937x and KSZ PTP supported switches has Three Trigger output unit. This TOU can used to generate the periodic signal for PTP. TOU has the cycle width register of 32 bit in size and period width register of 24 bit, each value is of 8ns so the pulse width can be maximum 125ms.
Tested using ./testptp -d /dev/ptp0 -p 1000000000 -w 100000000 for generating the 10ms pulse width
---
v3 -> v4
- Added KSZ_MAX_PULSE_WIDTH macro for constant 125000000
- Reordered the ksz_perout_restart to avoid function definition
- moved the dev_info inside ksz_perout_restart
- used helper function to calculate the min pulse width
- replaced spaces with tabs in ksz_ptp_reg.h
v2 -> v3
- No change
v1 -> v2
- In ksz_ptp_enable function, removed the check request->index since it is handled in upper layer. For the default case use -EOPNOSUPP instead of -EINVAL.
--- drivers/net/dsa/microchip/ksz_common.h | 13 ++ drivers/net/dsa/microchip/ksz_ptp.c | 289 ++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 8 + drivers/net/dsa/microchip/ksz_ptp_reg.h | 63 ++++++ 4 files changed, 373 insertions(+)
drivers/net/dsa/microchip/ksz_common.h +13 -0
@@ -477,6 +477,19 @@ static inline int ksz_rmw16(struct ksz_device *dev, u32 reg, u16 mask,return ret; } +static inline int ksz_rmw32 (struct ksz_device *dev,u32 reg,u32 mask, +u32 value) +{ +int ret; + + ret =regmap_update_bits (dev->regmap[2 ], reg, mask, value); +if (ret) +dev_err (dev->dev,"can't rmw 32bit reg 0x%x: %pe\n" , reg, +ERR_PTR (ret)); + +return ret; +} +static inline int ksz_write64 (struct ksz_device *dev,u32 reg,u64 value) {u32 val[2 ];
drivers/net/dsa/microchip/ksz_ptp.c +289 -0
331 lines not on this page · raw message
drivers/net/dsa/microchip/ksz_ptp.h +8 -0
@@ -12,6 +12,11 @@#include <linux/ptp_clock_kernel.h> +enum ksz_ptp_tou_mode { +KSZ_PTP_TOU_IDLE , +KSZ_PTP_TOU_PEROUT , +}; +struct ksz_ptp_data {struct ptp_clock_info caps;struct ptp_clock *clock;
@@ -20,6 +25,9 @@ struct ksz_ptp_data {/* lock for accessing the clock_time */ spinlock_t clock_lock;struct timespec64 clock_time; +enum ksz_ptp_tou_mode tou_mode; +struct timespec64 perout_target_time_first;/* start of first pulse */ +struct timespec64 perout_period; };int ksz_ptp_clock_register (struct dsa_switch *ds);
drivers/net/dsa/microchip/ksz_ptp_reg.h +63 -0
69 lines not on this page · raw message
Signature · 1 line
2.36.1
PATCH v8 11/13 net: dsa: microchip: ptp: add support for perout programmable pins
In reply to Arun RamadossThere are two programmable pins available for Trigger output unit to generate periodic pulses. This patch add verify_pin for the available 2 pins and configure it with respect to GPIO index for the TOU unit.
Tested using testptp
./testptp -i 0 -L 0,2
./testptp -i 0 -d /dev/ptp0 -p 1000000000
./testptp -i 1 -L 1,2
./testptp -i 1 -d /dev/ptp0 -p 100000000
---
v1 - v2
- checkpatch warning to limit 80 chars
Patch v1
- patch is new
--- drivers/net/dsa/microchip/ksz_ptp.c | 35 +++++++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 3 +++ 2 files changed, 38 insertions(+)
drivers/net/dsa/microchip/ksz_ptp.c +35 -0
@@ -171,6 +171,10 @@ static int ksz_ptp_enable_perout(struct ksz_device *dev, ptp_data->tou_mode != KSZ_PTP_TOU_IDLE)return -EBUSY ; + pin =ptp_find_pin (ptp_data->clock,PTP_PF_PEROUT , request->index); +if (pin <0 ) +return -EINVAL ; + data32 =FIELD_PREP (PTP_GPIO_INDEX , pin) |FIELD_PREP (PTP_TOU_INDEX , request->index); ret = ksz_rmw32(dev, REG_PTP_UNIT_INDEX__4,
@@ -779,6 +783,23 @@ static int ksz_ptp_enable(struct ptp_clock_info *ptp,return ret; } +static int ksz_ptp_verify_pin (struct ptp_clock_info *ptp,unsigned int pin, +enum ptp_pin_function func,unsigned int chan) +{ +int ret =0 ; + +switch (func) { +case PTP_PF_NONE : +case PTP_PF_PEROUT : +break ; +default : + ret =-1 ; +break ; + } + +return ret; +} +/* Function is pointer to the do_aux_work in the ptp_clock capability */ static long ksz_ptp_do_aux_work (struct ptp_clock_info *ptp) {
@@ -822,6 +843,7 @@ int ksz_ptp_clock_register(struct dsa_switch *ds)struct ksz_device *dev = ds->priv;struct ksz_ptp_data *ptp_data;int ret; +u8 i; ptp_data = &dev->ptp_data;mutex_init (&ptp_data->lock);
@@ -836,12 +858,25 @@ int ksz_ptp_clock_register(struct dsa_switch *ds) ptp_data->caps.adjtime = ksz_ptp_adjtime; ptp_data->caps.do_aux_work = ksz_ptp_do_aux_work; ptp_data->caps.enable = ksz_ptp_enable; + ptp_data->caps.verify = ksz_ptp_verify_pin; + ptp_data->caps.n_pins =KSZ_PTP_N_GPIO ; ptp_data->caps.n_per_out =3 ; ret =ksz_ptp_start_clock (dev);if (ret)return ret; +for (i =0 ; i <KSZ_PTP_N_GPIO ; i++) { +struct ptp_pin_desc *ptp_pin = &ptp_data->pin_config[i]; + +snprintf (ptp_pin->name, +sizeof (ptp_pin->name),"ksz_ptp_pin_%02d" , i); + ptp_pin->index = i; + ptp_pin->func =PTP_PF_NONE ; + } + + ptp_data->caps.pin_config = ptp_data->pin_config; +/* Currently only P2P mode is supported. When 802_1AS bit is set, it * forwards all PTP packets to host port and none to other ports. */
drivers/net/dsa/microchip/ksz_ptp.h +3 -0
@@ -12,6 +12,8 @@#include <linux/ptp_clock_kernel.h> +#define KSZ_PTP_N_GPIO 2 +enum ksz_ptp_tou_mode {KSZ_PTP_TOU_IDLE ,KSZ_PTP_TOU_PEROUT ,
@@ -20,6 +22,7 @@ enum ksz_ptp_tou_mode {struct ksz_ptp_data {struct ptp_clock_info caps;struct ptp_clock *clock; +struct ptp_pin_desc pin_config[KSZ_PTP_N_GPIO ];/* Serializes all operations on the PTP hardware clock */ struct mutex lock;/* lock for accessing the clock_time */
Signature · 1 line
2.36.1
PATCH v8 12/13 net: dsa: microchip: ptp: lan937x: add 2 step timestamping
In reply to Arun RamadossLAN937x series of switches support 2 step timestamping mechanism. There are timestamp correction calculation performed in ksz_rcv_timestamp and ksz_xmit_timestamp which are applicable only for p2p1step. To check whether the 2 step is enabled or not in tag_ksz.c introduced the helper function in taggger_data to query it from ksz_ptp.c. Based on whether 2 step is enabled or not, timestamp calculation are performed.
---
v6 -> v7
- s/1/true in hwtstamp_config()
v3 -> v4
- P2P_1step bit is set which is required for P2P. It is missed during patch v3 regression.
v2 -> v3
- Reverted setting PTP_1Step bit as we are setting 802_1AS bit
v1 -> v2
- declard is_ptp_twostep as macro NULL for ptp disabled case
- Moved the patch in series to have continuity for lan937x updates 9/11 to 12/13
- enable PTP_1STEP bit based on tx timestamping
Patch v1
- Patch is new.
--- drivers/net/dsa/microchip/ksz_ptp.c | 43 +++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 3 deletions(-)
drivers/net/dsa/microchip/ksz_ptp.c +40 -3
@@ -283,6 +283,9 @@ int ksz_get_ts_info(struct dsa_switch *ds, int port, struct ethtool_ts_info *ts) ts->tx_types =BIT (HWTSTAMP_TX_OFF ) |BIT (HWTSTAMP_TX_ONESTEP_P2P ); +if (is_lan937x (dev)) + ts->tx_types |=BIT (HWTSTAMP_TX_ON ); + ts->rx_filters =BIT (HWTSTAMP_FILTER_NONE ) |BIT (HWTSTAMP_FILTER_PTP_V2_L4_EVENT ) | BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
@@ -310,6 +313,8 @@ static int ksz_set_hwtstamp_config(struct ksz_device *dev,struct ksz_port *prt, struct hwtstamp_config *config) { + int ret; +if (config->flags)return -EINVAL ;
@@ -325,6 +330,25 @@ static int ksz_set_hwtstamp_config(struct ksz_device *dev, prt->ptpmsg_irq[KSZ_XDREQ_MSG ].ts_en = true; prt->ptpmsg_irq[KSZ_PDRES_MSG ].ts_en = false; prt->hwts_tx_en = true; + + ret =ksz_rmw16 (dev,REG_PTP_MSG_CONF1 ,PTP_1STEP ,PTP_1STEP ); +if (ret) +return ret; + +break ; +case HWTSTAMP_TX_ON : +if (!is_lan937x (dev)) +return -ERANGE ; + + prt->ptpmsg_irq[KSZ_SYNC_MSG ].ts_en = true; + prt->ptpmsg_irq[KSZ_XDREQ_MSG ].ts_en = true; + prt->ptpmsg_irq[KSZ_PDRES_MSG ].ts_en = true; + prt->hwts_tx_en = true; + + ret =ksz_rmw16 (dev,REG_PTP_MSG_CONF1 ,PTP_1STEP ,0 ); +if (ret) +return ret; +break ;default :return -ERANGE ;
@@ -412,14 +436,20 @@ bool ksz_port_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb,struct skb_shared_hwtstamps *hwtstamps =skb_hwtstamps (skb);struct ksz_device *dev = ds->priv;struct ptp_header *ptp_hdr; +struct ksz_port *prt;u8 ptp_msg_type;ktime_t tstamp;s64 correction; + prt = &dev->ports[port]; + tstamp =KSZ_SKB_CB (skb)->tstamp;memset (hwtstamps,0 ,sizeof (*hwtstamps)); hwtstamps->hwtstamp =ksz_tstamp_reconstruct (dev, tstamp); +if (prt->tstamp_config.tx_type !=HWTSTAMP_TX_ONESTEP_P2P ) + goto out; + ptp_hdr =ptp_parse_header (skb, type);if (!ptp_hdr) goto out;
@@ -467,12 +497,19 @@ void ksz_port_txtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb) ptp_msg_type =ptp_get_msgtype (hdr, type);switch (ptp_msg_type) { +case PTP_MSGTYPE_SYNC : +if (prt->tstamp_config.tx_type ==HWTSTAMP_TX_ONESTEP_P2P ) +return ; +break ;case PTP_MSGTYPE_PDELAY_REQ :break ;case PTP_MSGTYPE_PDELAY_RESP : -KSZ_SKB_CB (skb)->ptp_type = type; -KSZ_SKB_CB (skb)->update_correction = true; -return ; +if (prt->tstamp_config.tx_type ==HWTSTAMP_TX_ONESTEP_P2P ) { +KSZ_SKB_CB (skb)->ptp_type = type; +KSZ_SKB_CB (skb)->update_correction = true; +return ; + } +break ;default :return ;
Signature · 1 line
2.36.1
PATCH v8 13/13 net: dsa: microchip: ptp: lan937x: Enable periodic output in LED pins
In reply to Arun RamadossThere is difference in implementation of per_out pins between KSZ9563 and LAN937x. In KSZ9563, Timestamping control register (0x052C) bit 6, if 1 - timestamp input and 0 - trigger output. But it is opposite for LAN937x 1 - trigger output and 0 - timestamp input.
As per per_out gpio pins, KSZ9563 has four Led pins and two dedicated gpio pins. But in LAN937x dedicated gpio pins are removed instead there are up to 10 LED pins out of which LED_0 and LED_1 can be mapped to PTP tou 0, 1 or 2. This patch sets the bit 6 in 0x052C register and configure the LED override and source register for LAN937x series of switches alone.
--- drivers/net/dsa/microchip/ksz_ptp.c | 26 +++++++++++++++++++++++++ drivers/net/dsa/microchip/ksz_ptp_reg.h | 8 ++++++++ 2 files changed, 34 insertions(+)
drivers/net/dsa/microchip/ksz_ptp.c +26 -0
@@ -32,6 +32,28 @@#define KSZ_PTP_INT_START 13 +static int ksz_ptp_tou_gpio (struct ksz_device *dev) +{ +int ret; + +if (!is_lan937x (dev)) +return 0 ; + + ret =ksz_rmw32 (dev,REG_PTP_CTRL_STAT__4 ,GPIO_OUT , +GPIO_OUT ); +if (ret) +return ret; + + ret =ksz_rmw32 (dev,REG_SW_GLOBAL_LED_OVR__4 ,LED_OVR_1 |LED_OVR_2 , +LED_OVR_1 |LED_OVR_2 ); +if (ret) +return ret; + +return ksz_rmw32 (dev,REG_SW_GLOBAL_LED_SRC__4 , +LED_SRC_PTP_GPIO_1 |LED_SRC_PTP_GPIO_2 , +LED_SRC_PTP_GPIO_1 |LED_SRC_PTP_GPIO_2 ); +} +static int ksz_ptp_tou_reset (struct ksz_device *dev,u8 unit) {u32 data;
@@ -224,6 +246,10 @@ static int ksz_ptp_enable_perout(struct ksz_device *dev,if (ret)return ret; + ret =ksz_ptp_tou_gpio (dev); +if (ret) +return ret; + ret =ksz_ptp_tou_start (dev, request->index);if (ret)return ret;
drivers/net/dsa/microchip/ksz_ptp_reg.h +8 -0
@@ -6,6 +6,14 @@#ifndef __KSZ_PTP_REGS_H#define __KSZ_PTP_REGS_H +#define REG_SW_GLOBAL_LED_OVR__4 0x0120 +#define LED_OVR_2 BIT(1) +#define LED_OVR_1 BIT(0) + +#define REG_SW_GLOBAL_LED_SRC__4 0x0128 +#define LED_SRC_PTP_GPIO_1 BIT(3) +#define LED_SRC_PTP_GPIO_2 BIT(2) +/* 5 - PTP Clock */ #define REG_PTP_CLK_CTRL 0x0500
Signature · 1 line
2.36.1
Quoted 11 lines · On Tue, 10 Jan 2023 14:19:17 +0530 Arun Ramadoss wrote:
KSZ9563/KSZ8563 and LAN937x switch are capable for supporting IEEE 1588 PTP protocol. LAN937x has the same PTP register set similar to KSZ9563, hence the implementation has been made common for the KSZ switches. KSZ9563 does not support two step timestamping but LAN937x supports both. Tested the 1step & 2step p2p timestamping in LAN937x and p2p1step timestamping in KSZ9563.
This patch series is based on the Christian Eggers PTP support for KSZ9563. Applied the Christian patch and updated as per the latest refactoring of KSZ series code. The features added on top are PTP packet Interrupt implementation based on nested handler, LAN937x two step timestamping and programmable
per_outpins.
Applied, thanks!