From 1851b2a06c37b06b22859ef4c7ce1c64d79df72e Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Fri, 18 Dec 2020 17:40:38 +0530 Subject: SBE: Account cancelled timer request [ Upstream commit b44c7594523d20945179e497c45ec9007981ac75 ] Currently we are not accounting cancelled timer request. So in some corner cases we may schedule new timer request with new-timer-value > inflight-timer-value. Lets explicit check new_target value with inflight timer value. Signed-off-by: Vasant Hegde --- hw/sbe-p9.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/sbe-p9.c b/hw/sbe-p9.c index 78c5cc7..ed6761a 100644 --- a/hw/sbe-p9.c +++ b/hw/sbe-p9.c @@ -800,6 +800,9 @@ static void p9_sbe_timer_schedule(void) u64 tb_cnt, now = mftb(); if (sbe_timer_in_progress) { + if (sbe_timer_target >= sbe_last_gen_stamp) + return; + if (now >= sbe_last_gen_stamp) return; -- cgit v1.1