aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasant Hegde <hegdevasant@linux.vnet.ibm.com>2020-12-18 17:40:38 +0530
committerVasant Hegde <hegdevasant@linux.vnet.ibm.com>2021-09-28 14:26:33 +0530
commit1851b2a06c37b06b22859ef4c7ce1c64d79df72e (patch)
treefbb986d89c9c0734cecf0c8e338edfa1549fbc36
parent314f1b2fb343be9320eda815eda13ffef3688531 (diff)
downloadskiboot-skiboot-op940.x.zip
skiboot-skiboot-op940.x.tar.gz
skiboot-skiboot-op940.x.tar.bz2
SBE: Account cancelled timer requestskiboot-op940.x
[ 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 <hegdevasant@linux.vnet.ibm.com>
-rw-r--r--hw/sbe-p9.c3
1 files changed, 3 insertions, 0 deletions
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;