From: Wei Fang <wei.fang@nxp.com>
To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
richardcochran@gmail.com, claudiu.manoil@nxp.com,
vladimir.oltean@nxp.com, xiaoning.wang@nxp.com,
andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com
Cc: fushi.peng@nxp.com, devicetree@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev
Subject: [PATCH net-next 05/12] ptp: netc: add external trigger stamp support
Date: Fri, 11 Jul 2025 14:57:41 +0800 [thread overview]
Message-ID: <20250711065748.250159-6-wei.fang@nxp.com> (raw)
In-Reply-To: <20250711065748.250159-1-wei.fang@nxp.com>
From: "F.S. Peng" <fushi.peng@nxp.com>
The NETC Timer is capable of recording the timestamp on receipt of an
external pulse on a GPIO pin. It supports two such external triggers.
The recorded value is saved in a 16 entry FIFO accessed by
TMR_ETTSa_H/L. An interrupt can be generated when the trigger occurs,
when the FIFO reaches a threshold, and if the FIFO overflows.
Signed-off-by: F.S. Peng <fushi.peng@nxp.com>
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
drivers/ptp/ptp_netc.c | 118 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 118 insertions(+)
diff --git a/drivers/ptp/ptp_netc.c b/drivers/ptp/ptp_netc.c
index 5ea59bb20371..b4c2f206752e 100644
--- a/drivers/ptp/ptp_netc.c
+++ b/drivers/ptp/ptp_netc.c
@@ -17,6 +17,8 @@
#define NETC_TMR_CTRL 0x0080
#define TMR_CTRL_CK_SEL GENMASK(1, 0)
#define TMR_CTRL_TE BIT(2)
+#define TMR_ETEP1 BIT(8)
+#define TMR_ETEP2 BIT(9)
#define TMR_COMP_MODE BIT(15)
#define TMR_CTRL_TCLK_PERIOD GENMASK(25, 16)
#define TMR_CTRL_FS BIT(28)
@@ -27,12 +29,26 @@
#define TMR_TEVENT_PPEN_ALL GENMASK(7, 5)
#define TMR_TEVENT_ALM1EN BIT(16)
#define TMR_TEVENT_ALM2EN BIT(17)
+#define TMR_TEVENT_ETS1_THREN BIT(20)
+#define TMR_TEVENT_ETS2_THREN BIT(21)
+#define TMR_TEVENT_ETS1EN BIT(24)
+#define TMR_TEVENT_ETS2EN BIT(25)
+#define TMR_TEVENT_ETS1_OVEN BIT(28)
+#define TMR_TEVENT_ETS2_OVEN BIT(29)
+#define TMR_TEVENT_ETS1 (TMR_TEVENT_ETS1_THREN | \
+ TMR_TEVENT_ETS1EN | TMR_TEVENT_ETS1_OVEN)
+#define TMR_TEVENT_ETS2 (TMR_TEVENT_ETS2_THREN | \
+ TMR_TEVENT_ETS2EN | TMR_TEVENT_ETS2_OVEN)
#define NETC_TMR_TEMASK 0x0088
+#define NETC_TMR_STAT 0x0094
+#define TMR_STAT_ETS1_VLD BIT(24)
+#define TMR_STAT_ETS2_VLD BIT(25)
#define NETC_TMR_CNT_L 0x0098
#define NETC_TMR_CNT_H 0x009c
#define NETC_TMR_ADD 0x00a0
#define NETC_TMR_PRSC 0x00a8
+#define NETC_TMR_ECTRL 0x00ac
#define NETC_TMR_OFF_L 0x00b0
#define NETC_TMR_OFF_H 0x00b4
@@ -50,6 +66,10 @@
#define FIPER_CTRL_PW(i) (GENMASK(4, 0) << (i) * 8)
#define FIPER_CTRL_SET_PW(i, v) (((v) & GENMASK(4, 0)) << 8 * (i))
+#define NETC_TMR_ETTS1_L 0x00e0
+#define NETC_TMR_ETTS1_H 0x00e4
+#define NETC_TMR_ETTS2_L 0x00e8
+#define NETC_TMR_ETTS2_H 0x00ec
#define NETC_TMR_CUR_TIME_L 0x00f0
#define NETC_TMR_CUR_TIME_H 0x00f4
@@ -66,6 +86,7 @@
#define NETC_TMR_DEFAULT_FIPER GENMASK(31, 0)
#define NETC_TMR_FIPER_MAX_PW GENMASK(4, 0)
#define NETC_TMR_ALARM_NUM 2
+#define NETC_TMR_DEFAULT_ETTF_THR 7
/* 1588 timer reference clock source select */
#define NETC_TMR_CCM_TIMER1 0 /* enet_timer1_clk_root, from CCM */
@@ -441,6 +462,91 @@ static int net_timer_enable_perout(struct netc_timer *priv,
return err;
}
+static void netc_timer_handle_etts_event(struct netc_timer *priv, int index,
+ bool update_event)
+{
+ u32 regoff_l, regoff_h, etts_l, etts_h, ets_vld;
+ struct ptp_clock_event event;
+
+ switch (index) {
+ case 0:
+ ets_vld = TMR_STAT_ETS1_VLD;
+ regoff_l = NETC_TMR_ETTS1_L;
+ regoff_h = NETC_TMR_ETTS1_H;
+ break;
+ case 1:
+ ets_vld = TMR_STAT_ETS2_VLD;
+ regoff_l = NETC_TMR_ETTS2_L;
+ regoff_h = NETC_TMR_ETTS2_H;
+ break;
+ default:
+ return;
+ }
+
+ if (!(netc_timer_rd(priv, NETC_TMR_STAT) & ets_vld))
+ return;
+
+ do {
+ etts_l = netc_timer_rd(priv, regoff_l);
+ etts_h = netc_timer_rd(priv, regoff_h);
+ } while (netc_timer_rd(priv, NETC_TMR_STAT) & ets_vld);
+
+ if (update_event) {
+ event.type = PTP_CLOCK_EXTTS;
+ event.index = index;
+ event.timestamp = (u64)etts_h << 32;
+ event.timestamp |= etts_l;
+ ptp_clock_event(priv->clock, &event);
+ }
+}
+
+static int netc_timer_enable_extts(struct netc_timer *priv,
+ struct ptp_clock_request *rq, int on)
+{
+ u32 ets_emask, tmr_emask, tmr_ctrl, ettp_bit;
+ unsigned long flags;
+
+ /* Reject requests to enable time stamping on both edges */
+ if ((rq->extts.flags & PTP_EXTTS_EDGES) == PTP_EXTTS_EDGES)
+ return -EOPNOTSUPP;
+
+ switch (rq->extts.index) {
+ case 0:
+ ettp_bit = TMR_ETEP1;
+ ets_emask = TMR_TEVENT_ETS1;
+ break;
+ case 1:
+ ettp_bit = TMR_ETEP2;
+ ets_emask = TMR_TEVENT_ETS2;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ spin_lock_irqsave(&priv->lock, flags);
+
+ netc_timer_handle_etts_event(priv, rq->extts.index, false);
+ tmr_emask = netc_timer_rd(priv, NETC_TMR_TEMASK);
+ if (on) {
+ tmr_ctrl = netc_timer_rd(priv, NETC_TMR_CTRL);
+ if (rq->extts.flags & PTP_FALLING_EDGE)
+ tmr_ctrl |= ettp_bit;
+ else
+ tmr_ctrl &= ~ettp_bit;
+
+ netc_timer_wr(priv, NETC_TMR_CTRL, tmr_ctrl);
+ tmr_emask |= ets_emask;
+ } else {
+ tmr_emask &= ~ets_emask;
+ }
+
+ netc_timer_wr(priv, NETC_TMR_TEMASK, tmr_emask);
+
+ spin_unlock_irqrestore(&priv->lock, flags);
+
+ return 0;
+}
+
static void netc_timer_disable_fiper(struct netc_timer *priv)
{
u32 fiper_ctrl = netc_timer_rd(priv, NETC_TMR_FIPER_CTRL);
@@ -496,6 +602,8 @@ static int netc_timer_enable(struct ptp_clock_info *ptp,
return netc_timer_enable_pps(priv, rq, on);
case PTP_CLK_REQ_PEROUT:
return net_timer_enable_perout(priv, rq, on);
+ case PTP_CLK_REQ_EXTTS:
+ return netc_timer_enable_extts(priv, rq, on);
default:
return -EOPNOTSUPP;
}
@@ -632,6 +740,9 @@ static const struct ptp_clock_info netc_timer_ptp_caps = {
.n_pins = 0,
.pps = 1,
.n_per_out = 3,
+ .n_ext_ts = 2,
+ .supported_extts_flags = PTP_RISING_EDGE | PTP_FALLING_EDGE |
+ PTP_STRICT_FLAGS,
.adjfine = netc_timer_adjfine,
.adjtime = netc_timer_adjtime,
.gettimex64 = netc_timer_gettimex64,
@@ -664,6 +775,7 @@ static void netc_timer_init(struct netc_timer *priv)
fiper_ctrl &= ~FIPER_CTRL_PG(i);
}
netc_timer_wr(priv, NETC_TMR_FIPER_CTRL, fiper_ctrl);
+ netc_timer_wr(priv, NETC_TMR_ECTRL, NETC_TMR_DEFAULT_ETTF_THR);
ktime_get_real_ts64(&now);
ns = timespec64_to_ns(&now);
@@ -834,6 +946,12 @@ static irqreturn_t netc_timer_isr(int irq, void *data)
ptp_clock_event(priv->clock, &event);
}
+ if (tmr_event & TMR_TEVENT_ETS1)
+ netc_timer_handle_etts_event(priv, 0, true);
+
+ if (tmr_event & TMR_TEVENT_ETS2)
+ netc_timer_handle_etts_event(priv, 1, true);
+
/* Clear interrupts status */
netc_timer_wr(priv, NETC_TMR_TEVENT, tmr_event);
--
2.34.1
next prev parent reply other threads:[~2025-07-11 7:17 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-11 6:57 [PATCH net-next 00/12] Add NETC Timer PTP driver and add PTP support for ENETC v4 Wei Fang
2025-07-11 6:57 ` [PATCH net-next 01/12] dt-bindings: ptp: add bindings for NETC Timer Wei Fang
2025-07-11 13:27 ` Andrew Lunn
2025-07-14 2:32 ` Wei Fang
2025-07-14 5:51 ` Krzysztof Kozlowski
2025-07-14 7:32 ` Wei Fang
2025-07-14 7:35 ` Krzysztof Kozlowski
2025-07-14 9:11 ` Wei Fang
2025-07-14 9:14 ` Krzysztof Kozlowski
2025-07-14 9:56 ` Wei Fang
2025-07-14 10:09 ` Krzysztof Kozlowski
2025-07-14 10:20 ` Krzysztof Kozlowski
2025-07-14 10:30 ` Wei Fang
2025-07-14 10:28 ` Wei Fang
2025-07-14 10:31 ` Vladimir Oltean
2025-07-14 10:43 ` Wei Fang
2025-07-14 11:37 ` Vladimir Oltean
2025-07-14 13:22 ` Wei Fang
2025-07-14 13:56 ` Vladimir Oltean
2025-07-14 14:14 ` Vladimir Oltean
2025-07-15 2:52 ` Wei Fang
2025-07-15 7:02 ` Vladimir Oltean
2025-07-15 7:11 ` Wei Fang
2025-07-14 11:24 ` Krzysztof Kozlowski
2025-07-14 13:43 ` Wei Fang
2025-07-14 14:04 ` Krzysztof Kozlowski
2025-07-11 6:57 ` [PATCH net-next 02/12] ptp: netc: add NETC Timer PTP driver support Wei Fang
2025-07-11 13:25 ` Andrew Lunn
2025-07-14 2:29 ` Wei Fang
2025-07-12 10:43 ` Vadim Fedorenko
2025-07-14 2:57 ` Wei Fang
2025-07-12 11:53 ` kernel test robot
2025-07-14 5:55 ` Krzysztof Kozlowski
2025-07-14 10:11 ` Wei Fang
2025-07-11 6:57 ` [PATCH net-next 03/12] ptp: netc: add PPS support Wei Fang
2025-07-12 16:00 ` kernel test robot
2025-07-11 6:57 ` [PATCH net-next 04/12] ptp: netc: add periodic pulse output support Wei Fang
2025-07-11 6:57 ` Wei Fang [this message]
2025-07-11 6:57 ` [PATCH net-next 06/12] ptp: netc: add debugfs support to loop back pulse signal Wei Fang
2025-07-11 13:33 ` Andrew Lunn
2025-07-14 2:33 ` Wei Fang
2025-07-11 6:57 ` [PATCH net-next 07/12] MAINTAINERS: add NETC Timer PTP clock driver section Wei Fang
2025-07-11 6:57 ` [PATCH net-next 08/12] net: enetc: save the parsed information of PTP packet to skb->cb Wei Fang
2025-07-12 10:54 ` Vadim Fedorenko
2025-07-14 3:07 ` Wei Fang
2025-07-11 6:57 ` [PATCH net-next 09/12] net: enetc: Add enetc_update_ptp_sync_msg() to process PTP sync packet Wei Fang
2025-07-12 10:58 ` Vadim Fedorenko
2025-07-11 6:57 ` [PATCH net-next 10/12] net: enetc: remove unnecessary CONFIG_FSL_ENETC_PTP_CLOCK check Wei Fang
2025-07-12 11:29 ` Vadim Fedorenko
2025-07-11 6:57 ` [PATCH net-next 11/12] net: enetc: add PTP synchronization support for ENETC v4 Wei Fang
2025-07-12 16:42 ` kernel test robot
2025-07-11 6:57 ` [PATCH net-next 12/12] net: enetc: don't update sync packet checksum if checksum offload is used Wei Fang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250711065748.250159-6-wei.fang@nxp.com \
--to=wei.fang@nxp.com \
--cc=andrew+netdev@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@google.com \
--cc=fushi.peng@nxp.com \
--cc=imx@lists.linux.dev \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
--cc=vladimir.oltean@nxp.com \
--cc=xiaoning.wang@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®