[PATCH v17 03/16] arm64/delay: define arm64_wfet_deadline()

From: Ankur Arora

Date: Mon Nov 16 2026 - 03:25:37 EST


Make the WFET deadline available via arm64_wfet_deadline().

Also update xloops_to_cycles() (used to compute nsecs_to_cycles()) to
use mul_u64_u64_shr() instead of 32-bit fixed point arithmetic to avoid
truncation for delay values larger than ~10s. This adds an extra mul
operation but is only used from delay loops so shouldn't matter too
much.

While at it, define some related constants and convert relevant macros
to static inlines.

Cc: Catalin Marinas <catalin.marinas@xxxxxxx>
Cc: Will Deacon <will@xxxxxxxxxx>
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
Reviewed-by: Christoph Lameter <cl@xxxxxxxxx>
Acked-by: Catalin Marinas <catalin.marinas@xxxxxxx>
Tested-by: Haris Okanovic <harisokn@xxxxxxxxxx>
Tested-by: Sahil Chandna <sahilchandna@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ankur Arora <ankur.a.arora@xxxxxxxxxx>
---
Notes:
- keep nsecs_to_cycles(), usecs_to_cycles() local to lib/delay.c
- note that the eventual intent is to use smp_cond_load_relaxed_timeout()
and thus arm64_wfet_deadline() from poll_idle() (which is noinstr).
Will do handling for noinstr in arm64_wfet_deadline() (and
__delay_cycles() etc) as part of that series.

arch/arm64/include/asm/arch_timer.h | 2 ++
arch/arm64/lib/delay.c | 38 +++++++++++++++++++++++------
2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index 6717209df05b..3012fc0d521d 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -86,6 +86,8 @@ static inline notrace u64 arch_timer_read_cntvct_el0(void)
return cnt;
}

+u64 arm64_wfet_deadline(u64 timeout_ns);
+
#define arch_timer_reg_read_stable(reg) \
({ \
erratum_handler(read_ ## reg)(); \
diff --git a/arch/arm64/lib/delay.c b/arch/arm64/lib/delay.c
index e278e060e78a..dab36c7a913c 100644
--- a/arch/arm64/lib/delay.c
+++ b/arch/arm64/lib/delay.c
@@ -12,15 +12,33 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/timex.h>
+#include <linux/math64.h>
+#include <linux/types.h>
+#include <asm/param.h>

#include <clocksource/arm_arch_timer.h>

-#define USECS_TO_CYCLES(time_usecs) \
- xloops_to_cycles((time_usecs) * 0x10C7UL)
+/* 2**32 / 1000000 (rounded up) */
+#define __usecs_to_xloops_mult 0x10C7UL

-static inline unsigned long xloops_to_cycles(unsigned long xloops)
+/* 2**32 / 1000000000 (rounded up) */
+#define __nsecs_to_xloops_mult 0x5UL
+
+static inline u64 xloops_to_cycles(u64 xloops)
+{
+ u64 loops_per_sec = (u64)loops_per_jiffy * HZ;
+
+ return mul_u64_u64_shr(xloops, loops_per_sec, 32);
+}
+
+static inline u64 usecs_to_cycles(u64 time_usecs)
+{
+ return xloops_to_cycles(time_usecs * __usecs_to_xloops_mult);
+}
+
+static inline u64 nsecs_to_cycles(u64 time_nsecs)
{
- return (xloops * loops_per_jiffy * HZ) >> 32;
+ return xloops_to_cycles(time_nsecs * __nsecs_to_xloops_mult);
}

/*
@@ -54,7 +72,7 @@ void __delay(unsigned long cycles)
wfet(end);
} else if (arch_timer_evtstrm_available()) {
const cycles_t timer_evt_period =
- USECS_TO_CYCLES(ARCH_TIMER_EVT_STREAM_PERIOD_US);
+ usecs_to_cycles(ARCH_TIMER_EVT_STREAM_PERIOD_US);

while ((__delay_cycles() - start + timer_evt_period) < cycles)
wfe();
@@ -65,6 +83,12 @@ void __delay(unsigned long cycles)
}
EXPORT_SYMBOL(__delay);

+u64 arm64_wfet_deadline(u64 timeout_ns)
+{
+ return __delay_cycles() + nsecs_to_cycles(timeout_ns);
+}
+EXPORT_SYMBOL_GPL(arm64_wfet_deadline);
+
inline void __const_udelay(unsigned long xloops)
{
__delay(xloops_to_cycles(xloops));
@@ -73,12 +97,12 @@ EXPORT_SYMBOL(__const_udelay);

void __udelay(unsigned long usecs)
{
- __const_udelay(usecs * 0x10C7UL); /* 2**32 / 1000000 (rounded up) */
+ __const_udelay(usecs * __usecs_to_xloops_mult);
}
EXPORT_SYMBOL(__udelay);

void __ndelay(unsigned long nsecs)
{
- __const_udelay(nsecs * 0x5UL); /* 2**32 / 1000000000 (rounded up) */
+ __const_udelay(nsecs * __nsecs_to_xloops_mult);
}
EXPORT_SYMBOL(__ndelay);
--
2.43.7