From nobody Fri Sep 19 07:13:12 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B478DC43217 for ; Mon, 28 Nov 2022 10:34:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230399AbiK1Kes (ORCPT ); Mon, 28 Nov 2022 05:34:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230377AbiK1KeF (ORCPT ); Mon, 28 Nov 2022 05:34:05 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 389E71AD9F; Mon, 28 Nov 2022 02:34:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1669631645; x=1701167645; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bvM6X9bOd1PO38tem0r/LfnbOxF8+mEKu+0OPpFDaMU=; b=f4si6kM3pCYFV404OQbzUqG1qvz4WFkJhgNF7YGPU5iMXtRcuf2Us9r/ eDLLnYw6XVI82Vl982YfxT5OWaXXQINps6O9+OFzX5oTmeDZdoJoW2hLK mzwrF69tdWtpmONWFte5oP3iRT/epZexTpEAIhxxz3Nyhj2Y54JUYP/p8 4+bheeCUSXIfFz3o4aFMojtiWBRRwcTLqW2zH9nOw6vabZQvrRE0XG8ZP DSztF1ik8ZHOnqfyswlnlAriH3tErXxCSKE7qUffrqh8O3V0m0d9a0t1d pXXTVB8EcuoIrblr5F/JW90PqhqjSFLKLiPLT1PjqeN2CsSIVxJO1iNTl g==; X-IronPort-AV: E=Sophos;i="5.96,200,1665471600"; d="scan'208";a="185453976" Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa4.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 28 Nov 2022 03:34:02 -0700 Received: from chn-vm-ex03.mchp-main.com (10.10.85.151) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Mon, 28 Nov 2022 03:33:58 -0700 Received: from CHE-LT-I17769U.microchip.com (10.10.115.15) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Mon, 28 Nov 2022 03:33:52 -0700 From: Arun Ramadoss To: , CC: , , , , , , , , , , , , , Subject: [Patch net-next v1 07/12] net: dsa: microchip: ptp: add packet reception timestamping Date: Mon, 28 Nov 2022 16:02:22 +0530 Message-ID: <20221128103227.23171-8-arun.ramadoss@microchip.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20221128103227.23171-1-arun.ramadoss@microchip.com> References: <20221128103227.23171-1-arun.ramadoss@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Christian Eggers This patch adds the routines for timestamping received ptp packets. Whenever the ptp packet is received, the 4 byte hardware time stamped value is append to its packet. This 4 byte value is extracted from the tail tag and reconstructed to absolute time and assigned to skb hwtstamp. Signed-off-by: Christian Eggers Co-developed-by: Arun Ramadoss Signed-off-by: Arun Ramadoss --- RFC v2 -> Patch v1 - Fixed compilation issue --- drivers/net/dsa/microchip/ksz_common.c | 13 +++++ drivers/net/dsa/microchip/ksz_ptp.c | 28 +++++++++++ drivers/net/dsa/microchip/ksz_ptp.h | 6 +++ include/linux/dsa/ksz_common.h | 15 ++++++ net/dsa/tag_ksz.c | 68 +++++++++++++++++++++++--- 5 files changed, 124 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/micro= chip/ksz_common.c index 9bfd7dd5cd31..306bdc1469d2 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -5,6 +5,7 @@ * Copyright (C) 2017-2019 Microchip Technology Inc. */ =20 +#include #include #include #include @@ -2453,6 +2454,17 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(st= ruct dsa_switch *ds, return proto; } =20 +static int ksz_connect_tag_protocol(struct dsa_switch *ds, + enum dsa_tag_protocol proto) +{ + struct ksz_tagger_data *tagger_data; + + tagger_data =3D ksz_tagger_data(ds); + tagger_data->meta_tstamp_handler =3D ksz_tstamp_reconstruct; + + return 0; +} + static int ksz_port_vlan_filtering(struct dsa_switch *ds, int port, bool flag, struct netlink_ext_ack *extack) { @@ -2849,6 +2861,7 @@ static int ksz_switch_detect(struct ksz_device *dev) =20 static const struct dsa_switch_ops ksz_switch_ops =3D { .get_tag_protocol =3D ksz_get_tag_protocol, + .connect_tag_protocol =3D ksz_connect_tag_protocol, .get_phy_flags =3D ksz_get_phy_flags, .setup =3D ksz_setup, .teardown =3D ksz_teardown, diff --git a/drivers/net/dsa/microchip/ksz_ptp.c b/drivers/net/dsa/microchi= p/ksz_ptp.c index 515a40c9f107..d878e922c275 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.c +++ b/drivers/net/dsa/microchip/ksz_ptp.c @@ -353,6 +353,34 @@ static int ksz_ptp_start_clock(struct ksz_device *dev) return 0; } =20 +ktime_t ksz_tstamp_reconstruct(struct dsa_switch *ds, ktime_t tstamp) +{ + struct ksz_device *dev =3D ds->priv; + struct timespec64 ptp_clock_time; + struct ksz_ptp_data *ptp_data; + struct timespec64 diff; + struct timespec64 ts; + + ptp_data =3D &dev->ptp_data; + ts =3D ktime_to_timespec64(tstamp); + + spin_lock_bh(&ptp_data->clock_lock); + ptp_clock_time =3D ptp_data->clock_time; + spin_unlock_bh(&ptp_data->clock_lock); + + /* calculate full time from partial time stamp */ + ts.tv_sec =3D (ptp_clock_time.tv_sec & ~3) | ts.tv_sec; + + /* find nearest possible point in time */ + diff =3D timespec64_sub(ts, ptp_clock_time); + if (diff.tv_sec > 2) + ts.tv_sec -=3D 4; + else if (diff.tv_sec < -2) + ts.tv_sec +=3D 4; + + return timespec64_to_ktime(ts); +} + static const struct ptp_clock_info ksz_ptp_caps =3D { .owner =3D THIS_MODULE, .name =3D "Microchip Clock", diff --git a/drivers/net/dsa/microchip/ksz_ptp.h b/drivers/net/dsa/microchi= p/ksz_ptp.h index 5cec8f2e8420..13c06c24b488 100644 --- a/drivers/net/dsa/microchip/ksz_ptp.h +++ b/drivers/net/dsa/microchip/ksz_ptp.h @@ -30,6 +30,7 @@ int ksz_hwtstamp_get(struct dsa_switch *ds, int port, str= uct 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); +ktime_t ksz_tstamp_reconstruct(struct dsa_switch *ds, ktime_t tstamp); =20 #else =20 @@ -66,6 +67,11 @@ static inline int ksz_ptp_irq_setup(struct dsa_switch *d= s, u8 p) =20 static inline void ksz_ptp_irq_free(struct dsa_switch *ds, u8 p) {} =20 +static inline ktime_t ksz_tstamp_reconstruct(struct dsa_switch *ds, ktime_= t tstamp) +{ + return 0; +} + #endif /* End of CONFIG_NET_DSA_MICROCHIP_KSZ_PTP */ =20 #endif diff --git a/include/linux/dsa/ksz_common.h b/include/linux/dsa/ksz_common.h index 62996860b887..0be0cd903727 100644 --- a/include/linux/dsa/ksz_common.h +++ b/include/linux/dsa/ksz_common.h @@ -9,9 +9,24 @@ =20 #include =20 +/* 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 =3D 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 { bool (*hwtstamp_get_state)(struct dsa_switch *ds); void (*hwtstamp_set_state)(struct dsa_switch *ds, bool on); + ktime_t (*meta_tstamp_handler)(struct dsa_switch *ds, ktime_t tstamp); }; =20 static inline struct ksz_tagger_data * diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c index 828af38f0598..41ce5ff5ed41 100644 --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c @@ -7,6 +7,7 @@ #include #include #include +#include #include =20 #include "tag.h" @@ -157,10 +158,11 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795, KS= Z8795_NAME); * tag0 : Prioritization (not used now) * tag1 : each bit represents port (eg, 0x01=3Dport1, 0x02=3Dport2, 0x10= =3Dport5) * - * 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(4byt= es) * -----------------------------------------------------------------------= ---- + * ts : time stamp (Present only if bit 7 of tag0 is set) * tag0 : zero-based value represents port * (eg, 0x00=3Dport1, 0x02=3Dport3, 0x06=3Dport7) */ @@ -172,6 +174,57 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ8795, KSZ= 8795_NAME); #define KSZ9477_TAIL_TAG_OVERRIDE BIT(9) #define KSZ9477_TAIL_TAG_LOOKUP BIT(10) =20 +static void ksz_rcv_timestamp(struct sk_buff *skb, u8 *tag, + struct net_device *dev, unsigned int port) +{ + struct skb_shared_hwtstamps *hwtstamps =3D skb_hwtstamps(skb); + struct dsa_switch *ds =3D dev->dsa_ptr->ds; + u8 *tstamp_raw =3D tag - KSZ_PTP_TAG_LEN; + struct ksz_tagger_data *tagger_data; + struct ptp_header *ptp_hdr; + unsigned int ptp_type; + u8 ptp_msg_type; + ktime_t tstamp; + s64 correction; + + tagger_data =3D ksz_tagger_data(ds); + if (!tagger_data->meta_tstamp_handler) + return; + + /* convert time stamp and write to skb */ + tstamp =3D ksz_decode_tstamp(get_unaligned_be32(tstamp_raw)); + memset(hwtstamps, 0, sizeof(*hwtstamps)); + hwtstamps->hwtstamp =3D tagger_data->meta_tstamp_handler(ds, tstamp); + + if (skb_headroom(skb) < ETH_HLEN) + return; + + __skb_push(skb, ETH_HLEN); + ptp_type =3D ptp_classify_raw(skb); + __skb_pull(skb, ETH_HLEN); + + if (ptp_type =3D=3D PTP_CLASS_NONE) + return; + + ptp_hdr =3D ptp_parse_header(skb, ptp_type); + if (!ptp_hdr) + return; + + ptp_msg_type =3D ptp_get_msgtype(ptp_hdr, ptp_type); + if (ptp_msg_type !=3D PTP_MSGTYPE_PDELAY_REQ) + return; + + /* Only subtract the partial time stamp from the correction field. When + * the hardware adds the egress time stamp to the correction field of + * the PDelay_Resp message on tx, also only the partial time stamp will + * be added. + */ + correction =3D (s64)get_unaligned_be64(&ptp_hdr->correction); + correction -=3D ktime_to_ns(tstamp) << 16; + + ptp_header_update_correction(skb, ptp_type, ptp_hdr, correction); +} + /* Time stamp tag is only inserted if PTP is enabled in hardware. */ static void ksz_xmit_timestamp(struct dsa_port *dp, struct sk_buff *skb) { @@ -220,8 +273,10 @@ static struct sk_buff *ksz9477_rcv(struct sk_buff *skb= , struct net_device *dev) unsigned int len =3D KSZ_EGRESS_TAG_LEN; =20 /* Extra 4-bytes PTP timestamp */ - if (tag[0] & KSZ9477_PTP_TAG_INDICATION) - len +=3D KSZ9477_PTP_TAG_LEN; + if (tag[0] & KSZ9477_PTP_TAG_INDICATION) { + ksz_rcv_timestamp(skb, tag, dev, port); + len +=3D KSZ_PTP_TAG_LEN; + } =20 return ksz_common_rcv(skb, dev, port, len); } @@ -287,10 +342,11 @@ MODULE_ALIAS_DSA_TAG_DRIVER(DSA_TAG_PROTO_KSZ9893, KS= Z9893_NAME); * tag0 : represents tag override, lookup and valid * tag1 : each bit represents port (eg, 0x01=3Dport1, 0x02=3Dport2, 0x80= =3Dport8) * - * 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(4byt= es) * -----------------------------------------------------------------------= ---- + * ts : time stamp (Present only if bit 7 of tag0 is set) * tag0 : zero-based value represents port * (eg, 0x00=3Dport1, 0x02=3Dport3, 0x07=3Dport8) */ --=20 2.36.1