|
 |
26ba25 |
From 91995f02cd4c100d26edd6df3dae0813b8685c02 Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: David Hildenbrand <david@redhat.com>
|
|
|
26ba25 |
Date: Fri, 21 Dec 2018 15:36:08 +0000
|
|
|
26ba25 |
Subject: [PATCH 06/22] s390x/tcg: SET CLOCK COMPARATOR can clear CKC
|
|
|
26ba25 |
interrupts
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: David Hildenbrand <david@redhat.com>
|
|
|
26ba25 |
Message-id: <20181221153614.27961-7-david@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 83750
|
|
|
26ba25 |
O-Subject: [RHEL-8.0 qemu-kvm v2 PATCH 06/12] s390x/tcg: SET CLOCK COMPARATOR can clear CKC interrupts
|
|
|
26ba25 |
Bugzilla: 1653569
|
|
|
26ba25 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
Let's stop the timer and delete any pending CKC IRQ before doing
|
|
|
26ba25 |
anything else.
|
|
|
26ba25 |
|
|
|
26ba25 |
While at it, add a comment why the check for ckc == -1ULL is needed.
|
|
|
26ba25 |
|
|
|
26ba25 |
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
|
26ba25 |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
26ba25 |
Message-Id: <20180627134410.4901-7-david@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit 345f1ab96e8279a537f32ae7447296d23308c7d1)
|
|
|
26ba25 |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
target/s390x/misc_helper.c | 7 +++++++
|
|
|
26ba25 |
1 file changed, 7 insertions(+)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
|
|
|
26ba25 |
index 4f675c7..cada7af 100644
|
|
|
26ba25 |
--- a/target/s390x/misc_helper.c
|
|
|
26ba25 |
+++ b/target/s390x/misc_helper.c
|
|
|
26ba25 |
@@ -155,6 +155,13 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t time)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
S390TODState *td = s390_get_todstate();
|
|
|
26ba25 |
|
|
|
26ba25 |
+ /* stop the timer and remove pending CKC IRQs */
|
|
|
26ba25 |
+ timer_del(env->tod_timer);
|
|
|
26ba25 |
+ qemu_mutex_lock_iothread();
|
|
|
26ba25 |
+ env->pending_int &= ~INTERRUPT_EXT_CLOCK_COMPARATOR;
|
|
|
26ba25 |
+ qemu_mutex_unlock_iothread();
|
|
|
26ba25 |
+
|
|
|
26ba25 |
+ /* the tod has to exceed the ckc, this can never happen if ckc is all 1's */
|
|
|
26ba25 |
if (time == -1ULL) {
|
|
|
26ba25 |
return;
|
|
|
26ba25 |
}
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|