Re: [Patch net-next v6 02/13] net: dsa: microchip: ptp: Initial hardware time stamping support

From: Vladimir Oltean
Date: Tue Jan 03 2023 - 11:36:09 EST

Next message: Shanker Donthineni: "Re: [PATCH 1/1] efi: rtc: Enable SET/GET WAKEUP services as optional"
Previous message: Sean Christopherson: "Re: [PATCH] KVM: Destroy target device if coalesced MMIO unregistration fails"
In reply to: Arun Ramadoss: "[Patch net-next v6 02/13] net: dsa: microchip: ptp: Initial hardware time stamping support"
Next in thread: Arun Ramadoss: "[Patch net-next v6 03/13] net: dsa: microchip: ptp: add 4 bytes in tail tag when ptp enabled"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On Mon, Jan 02, 2023 at 10:34:48AM +0530, Arun Ramadoss wrote:
> From: Christian Eggers <ceggers@xxxxxxx>
>
> This patch adds the routine for get_ts_info, hwstamp_get, set. This enables
> the PTP support towards userspace applications such as linuxptp.
>
> Signed-off-by: Christian Eggers <ceggers@xxxxxxx>
> Co-developed-by: Arun Ramadoss <arun.ramadoss@xxxxxxxxxxxxx>
> Signed-off-by: Arun Ramadoss <arun.ramadoss@xxxxxxxxxxxxx>
> ---
> 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(+)
>
> diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c
> index 3e2ebadeade9..1819f75eb007 100644
> --- a/drivers/net/dsa/microchip/ksz_common.c
> +++ b/drivers/net/dsa/microchip/ksz_common.c
> @@ -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,

Most of ksz_switch_ops are aligned using tabs, you are introducing these
using spaces.

> };
>
> struct ksz_device *ksz_switch_alloc(struct device *base, void *priv)
> diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h
> index 23ed7fa72a3c..a5ce7ec30ba2 100644
> --- a/drivers/net/dsa/microchip/ksz_common.h
> +++ b/drivers/net/dsa/microchip/ksz_common.h
> @@ -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 {
> diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchip/ksz_ptp.c
> index fb1efb60ef71..280200b37012 100644
> --- a/drivers/net/dsa/microchip/ksz_ptp.c
> +++ b/drivers/net/dsa/microchip/ksz_ptp.c
> @@ -24,6 +24,107 @@
> #define KSZ_PTP_INC_NS 40ULL /* HW clock is incremented every 40 ns (by 40) */
> #define KSZ_PTP_SUBNS_BITS 32
>
> +/* The function is return back the capability of timestamping feature when
> + * requested through ethtool -T <interface> utility
> + */
> +int ksz_get_ts_info(struct dsa_switch *ds, int port, struct ethtool_ts_info *ts)
> +{
> + struct ksz_device *dev = ds->priv;

There is a tab here between *dev and = which is probably unintended.

> + struct ksz_ptp_data *ptp_data;
> +
> + ptp_data = &dev->ptp_data;
> +
> + if (!ptp_data->clock)
> + return -ENODEV;
> +
> + ts->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
> + SOF_TIMESTAMPING_RX_HARDWARE |
> + SOF_TIMESTAMPING_RAW_HARDWARE;
> +
> + ts->tx_types = BIT(HWTSTAMP_TX_OFF) | BIT(HWTSTAMP_TX_ONESTEP_P2P);
> +
> + ts->rx_filters = BIT(HWTSTAMP_FILTER_NONE) |
> + BIT(HWTSTAMP_FILTER_PTP_V2_L4_EVENT) |
> + BIT(HWTSTAMP_FILTER_PTP_V2_L2_EVENT) |
> + BIT(HWTSTAMP_FILTER_PTP_V2_EVENT);
> +
> + ts->phc_index = ptp_clock_index(ptp_data->clock);
> +
> + return 0;
> +}
> +
> +int ksz_hwtstamp_get(struct dsa_switch *ds, int port, struct ifreq *ifr)
> +{
> + struct ksz_device *dev = ds->priv;
> + struct hwtstamp_config *config;
> + struct ksz_port *prt;
> +
> + prt = &dev->ports[port];
> + config = &prt->tstamp_config;
> +
> + return copy_to_user(ifr->ifr_data, config, sizeof(*config)) ?
> + -EFAULT : 0;
> +}
> +
> +static int ksz_set_hwtstamp_config(struct ksz_device *dev,
> + struct hwtstamp_config *config)
> +{
> + if (config->flags)
> + return -EINVAL;
> +
> + switch (config->tx_type) {
> + case HWTSTAMP_TX_OFF:
> + case HWTSTAMP_TX_ONESTEP_P2P:
> + break;
> + default:
> + return -ERANGE;
> + }
> +
> + switch (config->rx_filter) {
> + case HWTSTAMP_FILTER_NONE:
> + break;
> + case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
> + case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
> + config->rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;
> + break;
> + case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
> + case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
> + config->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
> + break;
> + case HWTSTAMP_FILTER_PTP_V2_EVENT:
> + case HWTSTAMP_FILTER_PTP_V2_SYNC:
> + config->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;
> + break;
> + default:
> + config->rx_filter = HWTSTAMP_FILTER_NONE;
> + return -ERANGE;
> + }
> +
> + return 0;
> +}
> +
> +int ksz_hwtstamp_set(struct dsa_switch *ds, int port, struct ifreq *ifr)
> +{
> + struct ksz_device *dev = ds->priv;
> + struct hwtstamp_config config;
> + struct ksz_port *prt;
> + int ret;
> +
> + prt = &dev->ports[port];
> +
> + ret = copy_from_user(&config, ifr->ifr_data, sizeof(config));
> + if (ret)
> + return ret;
> +
> + ret = ksz_set_hwtstamp_config(dev, &config);
> + if (ret)
> + return ret;
> +
> + memcpy(&prt->tstamp_config, &config, sizeof(config));
> +
> + return copy_to_user(ifr->ifr_data, &config, sizeof(config));
> +}
> +
> static int _ksz_ptp_gettime(struct ksz_device *dev, struct timespec64 *ts)
> {
> u32 nanoseconds;
> diff --git a/drivers/net/dsa/microchip/ksz_ptp.h b/drivers/net/dsa/microchip/ksz_ptp.h
> index 8930047da764..7bb3fde2dd14 100644
> --- a/drivers/net/dsa/microchip/ksz_ptp.h
> +++ b/drivers/net/dsa/microchip/ksz_ptp.h
> @@ -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
> --
> 2.36.1
>

Next message: Shanker Donthineni: "Re: [PATCH 1/1] efi: rtc: Enable SET/GET WAKEUP services as optional"
Previous message: Sean Christopherson: "Re: [PATCH] KVM: Destroy target device if coalesced MMIO unregistration fails"
In reply to: Arun Ramadoss: "[Patch net-next v6 02/13] net: dsa: microchip: ptp: Initial hardware time stamping support"
Next in thread: Arun Ramadoss: "[Patch net-next v6 03/13] net: dsa: microchip: ptp: add 4 bytes in tail tag when ptp enabled"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]