1 files changed, 6 insertions, 0 deletions

diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
index 312d43eb686a..8044591dca72 100644
--- a/arch/arm/lib/delay.c
+++ b/arch/arm/lib/delay.c
@@ -83,6 +83,12 @@ void __init register_current_timer_delay(const struct delay_timer *timer)
                                NSEC_PER_SEC, 3600);
         res = cyc_to_ns(1ULL, new_mult, new_shift);
 
+        if (res > 1000) {
+                pr_err("Ignoring delay timer %ps, which has insufficient resolution of %lluns\n",
+                        timer, res);
+                return;
+        }
+
         if (!delay_calibrated && (!delay_res || (res < delay_res))) {
                 pr_info("Switching to timer-based delay loop, resolution %lluns\n", res);
                 delay_timer                     = timer;