From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C1C3CA6007 for ; Thu, 8 Oct 2026 10:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=aLfGTPUcUWb9l5deLpoGs8ct/J5SWokbi6MEeKK6Nzo=; b=DTTuBJhX0Hnucxs2jdeBKWbZqo IUuSIxKB7OCYymohbx4LHNKLMjeLYuFXFQ4iAFfMV7EFMMjUq7mQyJG/aKbwFSOHEBv5ZGjvod18o qaSnlNejUvAk9CKE2ZmaVvzclQdKm5ETpAwWpgoVq1R+8HyAccj7RygV4hQS85265ZuPvEbLiGh/j gIefUmrIGo+TOAUhLsEovklYg+aTx+YOu46How3CCCN5zp27qtW8jSezXFp4n3KcIgEVmJ74V+lUs jQgb8P13GxhC9Wl5idCmCUleE5GcWgPIuvKeUQ0deAWdii3Ae77Es+kWH7z2UU05ndRqXYM9S2Pdb vTqHj29Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xElW2-0000000497q-3AQt; Thu, 08 Oct 2026 10:38:22 +0000 Received: from mail-pj2-x0b.google.com ([2607:f8b0:4864:39::b]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xElVz-0000000497T-0ESN for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2026 10:38:21 +0000 Received: by mail-pj2-x0b.google.com with SMTP id 98e67ed59e1d1-398a0a87595so3177773a91.1 for ; Thu, 08 Oct 2026 03:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jclark-com.20251104.gappssmtp.com; s=20251104; t=1791455897; x=1792060697; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=aLfGTPUcUWb9l5deLpoGs8ct/J5SWokbi6MEeKK6Nzo=; b=cke/5R3hy8xBe1vgPBmL0jGlaqidouAC6Gg2S8dp1uCd53Bc3U91e5VN70sho7mpzr F7qSNuzb5tKeOhtH5JJO2eMzYrGZjyHd2Di9Ip10FZUQ8Kkga90kR7bBQv79PoMBdjvJ GSmLvpMQDAh7uakSviY95b91ZpGTrTzfSju5ZLrx0Hu+Wzh0/ucNrIuBSpzb0Db7QF54 HNui7yBb0oE7tgj0BIjHMVTS10dahTcRqyH5dc1OoIuo6SXFKBd4kPKXzpDAXGHVFbPW BFi3hk8aV5oOJgyIWXo7CBJsUR3q6uSsDDpJ50j2qyrhc4cgqjg6eCL70aOPeOIBvr56 kgoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791455897; x=1792060697; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=aLfGTPUcUWb9l5deLpoGs8ct/J5SWokbi6MEeKK6Nzo=; b=T7tZY73anCdYfq4FLnt1mj/YX6+rICVk+2NiDMisQIRYBVwklslJ2/l/xcakc/tyxm TgxrRd2MY41wagQG9VrU5+coWng8zB2LTPcPS7NltZPgtPGSkOj3tjU6KxDxWj36E6JY U5ku6SO1CzJ37dLSBg2nW8/FY29TJ7lb2Iv/GJKq/GUbVPMUhrfGbtXWk8zdmm28p8pp 6fPCUHwGms4d+8CCOQXY2W2zHrrbY+KinQ1Gg19OinSG4395pY2Huzk1vag0aZg07zDO jFgI7dkKC5xMyBgbA/EKdCzTx5wHfWf9r4kNbGjPtyKzXoS2DJbxBFdEqBiXB5aVX8kS YBrw== X-Forwarded-Encrypted: i=1; AKwUvBwI0Go3IHfXTA9/Evqpc3LDbFtIRlGYdmByl1pYoHK76lEmxx+C9R2y6nPbM85Lo9m+V2Z+qw7cO3WcF/VCmZOK@lists.infradead.org X-Gm-Message-State: AFq9FYJ6+mL9pyymVpvVUfWFMU/zHcFJOKnLP0wANQA5KyJrfXWnEEGX lds9rKcHWTiJv4bUbFGGsWdJsn+eIlHia7FCgf/Mq7c6sxk8awRZ5jw3hrkl1z1RbQ== X-Gm-Gg: AYBFou2KKXg43dVrHTrSmu04+ormk7BbB5phHsi6y9THwxU84LE5NngkcI0iXxk/55T UeN4qX+YTaRdLtafMC21wRJKMFRrOaQpvu+mKjy/C6vOU8nNkwqInQMfFTBYfL+1S4tP8aHp8hX EIts5IRpw5VjU4PY6msMvnbb6fcR0inCSUdA3ddjzmSD+VZZCJ3PMXh/cXXNDsLDX5MaoHEtnHw +29z9Ph/9v+i/TKa5gcSyo6Qdl9xm+Ln3nzwLxbQR8WNP9q+xqubb2rYAKTAOjLpWP5tMKpx82I OKE9yiQSt/bkuE89TySNEobqfcZ9LfApbytQTvj8iF9YFc1Ij2NWEMDk1L0TvaBG/8DmUTPAUX6 OzQOal8duLziyyiJqznaKGTeBPQDqmdCXjBrSco37E0z+CQ2HrGLg9tMQSr/AuRQikQ6WDNvBib rnCN33+z4FcdFSwjQsklWVkX9PGsnIZI8jtXTDnFqcXWGjYHcJ8L1EMDXWaFfotA== X-Received: by 2002:a17:90b:4a8f:b0:39e:6a82:afda with SMTP id 98e67ed59e1d1-3a8a1b3206emr4398317a91.44.1791455897384; Thu, 08 Oct 2026 03:38:17 -0700 (PDT) Received: from cantal.lan ([58.136.72.162]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3ab0458bce8sm1008070a91.3.2026.10.08.03.38.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2026 03:38:16 -0700 (PDT) From: James Clark To: Maxime Chevallier , netdev@vger.kernel.org Cc: Andrew Lunn , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Miroslav Lichvar , Nicolai Buchwitz , Maxime Coquelin , Alexandre Torgue , linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next v2] net: stmmac: ptp: switch to gettimex64() interface Date: Thu, 8 Oct 2026 17:38:09 +0700 Message-ID: <20261008103809.1848255-1-jjc@jclark.com> X-Mailer: git-send-email 2.56.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261008_033819_387741_66E97CC2 X-CRM114-Status: GOOD ( 19.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The stmmac PTP support currently implements the gettime64 callback to retrieve the hardware clock time. Update the implementation to provide the gettimex64 callback instead, adding support for the PTP_SYS_OFFSET_EXTENDED ioctl. The system clock readings are taken around the read of the nanoseconds register in get_systime(), so get_systime() gains a ptp_system_timestamp argument. Reviewed-by: Nicolai Buchwitz Assisted-by: LLM Signed-off-by: James Clark --- Changes in v2: - Read PTP_STNSR with readl() and drop the two rmb() calls (Nicolai Buchwitz, Maxime Chevallier) - Fix the kernel-doc of stmmac_get_timex() and an over-long line in stmmac_adjust_time() (netdev CI) - Link to v1: https://lore.kernel.org/netdev/20261006103610.98277-1-jjc@jclark.com/ Tested on a Radxa ZERO 3E (RK3566, DWMAC 4/5) running net-next. Width of the interval between the two system clock readings bracketing each PHC read (2000 calls of 25 samples each): min median Before patch (PTP_SYS_OFFSET): 875 ns 1167 ns After patch (PTP_SYS_OFFSET_EXTENDED): 291 ns 583 ns On this board the 24 MHz arch timer counter advances in steps of 7 (~292 ns), so all intervals are multiples of that. drivers/net/ethernet/stmicro/stmmac/hwif.h | 5 ++++- .../ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 7 +++++-- .../net/ethernet/stmicro/stmmac/stmmac_ptp.c | 21 ++++++++++--------- .../stmicro/stmmac/stmmac_selftests.c | 4 ++-- .../net/ethernet/stmicro/stmmac/stmmac_tc.c | 3 ++- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index a8a5c8fdd5e..6efbfe50102 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -493,6 +493,8 @@ struct stmmac_ops { #define stmmac_fpe_map_preemption_class(__priv, __args...) \ stmmac_do_callback(__priv, mac, fpe_map_preemption_class, __args) +struct ptp_system_timestamp; + /* PTP and HW Timer helpers */ struct stmmac_hwtimestamp { void (*config_hw_tstamping) (void __iomem *ioaddr, u32 data); @@ -502,7 +504,8 @@ struct stmmac_hwtimestamp { int (*config_addend) (void __iomem *ioaddr, u32 addend); int (*adjust_systime) (void __iomem *ioaddr, u32 sec, u32 nsec, int add_sub, int gmac4); - void (*get_systime) (void __iomem *ioaddr, u64 *systime); + void (*get_systime)(void __iomem *ioaddr, u64 *systime, + struct ptp_system_timestamp *sts); void (*get_ptptime)(void __iomem *ioaddr, u64 *ptp_time); void (*timestamp_interrupt)(struct stmmac_priv *priv); void (*hwtstamp_correct_latency)(struct stmmac_priv *priv); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c index b9a985fa772..870c740b4a5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c @@ -183,7 +183,8 @@ static int adjust_systime(void __iomem *ioaddr, u32 sec, u32 nsec, 10, 100000); } -static void get_systime(void __iomem *ioaddr, u64 *systime) +static void get_systime(void __iomem *ioaddr, u64 *systime, + struct ptp_system_timestamp *sts) { u64 ns, sec0, sec1; @@ -191,8 +192,10 @@ static void get_systime(void __iomem *ioaddr, u64 *systime) sec1 = readl_relaxed(ioaddr + PTP_STSR); do { sec0 = sec1; + ptp_read_system_prets(sts); /* Get the TSSS value */ - ns = readl_relaxed(ioaddr + PTP_STNSR); + ns = readl(ioaddr + PTP_STNSR); + ptp_read_system_postts(sts); /* Get the TSS value */ sec1 = readl_relaxed(ioaddr + PTP_STSR); } while (sec0 != sec1); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c index 3bfcc9760dc..e54a3c88782 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c @@ -89,7 +89,8 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta) u64 cycle_time; mutex_lock(&priv->est_lock); - priv->ptp_clock_ops.gettime64(&priv->ptp_clock_ops, ¤t_time); + priv->ptp_clock_ops.gettimex64(&priv->ptp_clock_ops, + ¤t_time, NULL); current_time_ns = timespec64_to_ktime(current_time); time.tv_nsec = priv->est->btr_reserve[0]; time.tv_sec = priv->est->btr_reserve[1]; @@ -114,15 +115,15 @@ static int stmmac_adjust_time(struct ptp_clock_info *ptp, s64 delta) } /** - * stmmac_get_time - * + * stmmac_get_timex - read the PTP clock, with system timestamps if requested * @ptp: pointer to ptp_clock_info structure * @ts: pointer to hold time/result + * @sts: pointer to hold system timestamps around the read, or NULL * - * Description: this function will read the current time from the - * hardware clock and store it in @ts. + * Return: 0 */ -static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts) +static int stmmac_get_timex(struct ptp_clock_info *ptp, struct timespec64 *ts, + struct ptp_system_timestamp *sts) { struct stmmac_priv *priv = container_of(ptp, struct stmmac_priv, ptp_clock_ops); @@ -130,7 +131,7 @@ static int stmmac_get_time(struct ptp_clock_info *ptp, struct timespec64 *ts) u64 ns = 0; read_lock_irqsave(&priv->ptp_lock, flags); - stmmac_get_systime(priv, priv->ptpaddr, &ns); + stmmac_get_systime(priv, priv->ptpaddr, &ns, sts); read_unlock_irqrestore(&priv->ptp_lock, flags); *ts = ns_to_timespec64(ns); @@ -200,7 +201,7 @@ static int stmmac_enable(struct ptp_clock_info *ptp, target_ns = cfg->start.tv_nsec + ((u64)cfg->start.tv_sec * NSEC_PER_SEC); - stmmac_get_systime(priv, priv->ptpaddr, &ns); + stmmac_get_systime(priv, priv->ptpaddr, &ns, NULL); if (ns > TIME64_MAX - PTP_SAFE_TIME_OFFSET_NS) return -EINVAL; @@ -304,7 +305,7 @@ const struct ptp_clock_info stmmac_ptp_clock_ops = { .pps = 0, .adjfine = stmmac_adjust_freq, .adjtime = stmmac_adjust_time, - .gettime64 = stmmac_get_time, + .gettimex64 = stmmac_get_timex, .settime64 = stmmac_set_time, .enable = stmmac_enable, }; @@ -321,7 +322,7 @@ const struct ptp_clock_info dwmac1000_ptp_clock_ops = { .pps = 0, .adjfine = stmmac_adjust_freq, .adjtime = stmmac_adjust_time, - .gettime64 = stmmac_get_time, + .gettimex64 = stmmac_get_timex, .settime64 = stmmac_set_time, .enable = dwmac1000_ptp_enable, }; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c index 6097f312fce..2ae4f0e760c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c @@ -1778,7 +1778,7 @@ static int stmmac_test_tbs(struct stmmac_priv *priv) return ret; read_lock_irqsave(&priv->ptp_lock, flags); - stmmac_get_systime(priv, priv->ptpaddr, &curr_time); + stmmac_get_systime(priv, priv->ptpaddr, &curr_time, NULL); read_unlock_irqrestore(&priv->ptp_lock, flags); if (!curr_time) { @@ -1800,7 +1800,7 @@ static int stmmac_test_tbs(struct stmmac_priv *priv) /* Check if expected time has elapsed */ read_lock_irqsave(&priv->ptp_lock, flags); - stmmac_get_systime(priv, priv->ptpaddr, &curr_time); + stmmac_get_systime(priv, priv->ptpaddr, &curr_time, NULL); read_unlock_irqrestore(&priv->ptp_lock, flags); if ((curr_time - start_time) < STMMAC_TBS_LT_OFFSET) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c index 42a00446e9b..57ebeb2c19c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c @@ -1070,7 +1070,8 @@ static int tc_taprio_configure(struct stmmac_priv *priv, mutex_lock(&priv->est_lock); /* Adjust for real system time */ - priv->ptp_clock_ops.gettime64(&priv->ptp_clock_ops, ¤t_time); + priv->ptp_clock_ops.gettimex64(&priv->ptp_clock_ops, ¤t_time, + NULL); current_time_ns = timespec64_to_ktime(current_time); time = stmmac_calc_tas_basetime(qopt->base_time, current_time_ns, qopt->cycle_time); -- 2.56.0