net: stmmac: fix timestamp snapshots on dwmac1000
Subsystems (4)
v2 cover net: stmmac: fix timestamp snapshots on dwmac1000
Hello,
this is the v2 of a small series containing two small fixes for the timestamp snapshot feature on stmmac, especially on dwmac1000 version. Those issues have been detected on a socfpga (Cyclone V) platform. They kind of follow the big rework sent by Maxime at the end of last year to properly split this feature support between different versions of the DWMAC IP.
---
Changes in v2:
- drop additional parenthesis
- fix wrong hashes in Fixes tags
- add Maxime's RB on first patch
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Alexis Lothore (1):
net: stmmac: fix dwmac1000 ptp timestamp status offset
Alexis Lothoré (1):
net: stmmac: fix multiplication overflow when reading timestamp
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 4 ++-- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
---
base-commit: c03a49f3093a4903c8a93c8b5c9a297b5343b169
change-id: 20250422-stmmac_ts-c226a53099e2
Best regards,
Signature · 3 lines
Alexis Lothoré, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/2 net: stmmac: fix dwmac1000 ptp timestamp status offset
When a PTP interrupt occurs, the driver accesses the wrong offset to learn about the number of available snapshots in the FIFO for dwmac1000:
it should be accessing bits 29..25, while it is currently reading bits 19..16 (those are bits about the auxiliary triggers which have generated the timestamps). As a consequence, it does not compute correctly the number of available snapshots, and so possibly do not generate the corresponding clock events if the bogus value ends up being 0.
Fix clock events generation by reading the correct bits in the timestamp register for dwmac1000.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000.h +2 -2
@@ -320,8 +320,8 @@ enum rtc_control {/* PTP and timestamping registers */ -#define GMAC3_X_ATSNS GENMASK(19, 16) -#define GMAC3_X_ATSNS_SHIFT 16 +#define GMAC3_X_ATSNS GENMASK(29, 25) +#define GMAC3_X_ATSNS_SHIFT 25#define GMAC_PTP_TCR_ATSFC BIT(24)#define GMAC_PTP_TCR_ATSEN0 BIT(25)
Signature · 1 line
2.49.0
PATCH v2 2/2 net: stmmac: fix multiplication overflow when reading timestamp
In reply to Alexis LothoreThe current way of reading a timestamp snapshot in stmmac can lead to integer overflow, as the computation is done on 32 bits. The issue has been observed on a dwmac-socfpga platform returning chaotic timestamp values due to this overflow. The corresponding multiplication is done with a MUL instruction, which returns 32 bit values. Explicitly casting the value to 64 bits replaced the MUL with a UMLAL, which computes and returns the result on 64 bits, and so returns correctly the timestamps.
Prevent this overflow by explicitly casting the intermediate value to u64 to make sure that the whole computation is made on u64. While at it, apply the same cast on the other dwmac variant (GMAC4) method for snapshot retrieval.
--- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +1 -1
@@ -553,7 +553,7 @@ void dwmac1000_get_ptptime(void __iomem *ptpaddr, u64 *ptp_time)u64 ns; ns =readl (ptpaddr +GMAC_PTP_ATNR ); - ns +=readl (ptpaddr +GMAC_PTP_ATSR ) *NSEC_PER_SEC ; + ns += (u64 )readl (ptpaddr +GMAC_PTP_ATSR ) *NSEC_PER_SEC ; *ptp_time = ns; }
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +1 -1
@@ -222,7 +222,7 @@ static void get_ptptime(void __iomem *ptpaddr, u64 *ptp_time)u64 ns; ns =readl (ptpaddr +PTP_ATNR ); - ns +=readl (ptpaddr +PTP_ATSR ) *NSEC_PER_SEC ; + ns += (u64 )readl (ptpaddr +PTP_ATSR ) *NSEC_PER_SEC ; *ptp_time = ns; }
Signature · 1 line
2.49.0
Re: [PATCH net v2 2/2] net: stmmac: fix multiplication overflow when reading timestamp
Quoted 8 lines · On Wed, 23 Apr 2025 09:12:10 +0200 Alexis Lothoré <[email protected]>…
The current way of reading a timestamp snapshot in stmmac can lead to integer overflow, as the computation is done on 32 bits. The issue has been observed on a dwmac-socfpga platform returning chaotic timestamp values due to this overflow. The corresponding multiplication is done with a MUL instruction, which returns 32 bit values. Explicitly casting the value to 64 bits replaced the MUL with a UMLAL, which computes and returns the result on 64 bits, and so returns correctly the timestamps.
Quoted 7 lines
Prevent this overflow by explicitly casting the intermediate value to u64 to make sure that the whole computation is made on u64. While at it, apply the same cast on the other dwmac variant (GMAC4) method for snapshot retrieval.
Fixes 477c3e1f6363 ("net: stmmac: Introduce dwmac1000 timestamping operations")Signed-off-by Alexis Lothoré <[email protected]>
Thanks,
Maxime
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 10 lines · On Wed, 23 Apr 2025 09:12:08 +0200 you wrote:
Hello,
this is the v2 of a small series containing two small fixes for the timestamp snapshot feature on stmmac, especially on dwmac1000 version. Those issues have been detected on a socfpga (Cyclone V) platform. They kind of follow the big rework sent by Maxime at the end of last year to properly split this feature support between different versions of the DWMAC IP.
[...]
Here is the summary with links:
- [net,v2,1/2] net: stmmac: fix dwmac1000 ptp timestamp status offset
https://git.kernel.org/netdev/net/c/73fa4597bdc0 - [net,v2,2/2] net: stmmac: fix multiplication overflow when reading timestamp https://git.kernel.org/netdev/net/c/7b7491372f8e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html