|
 |
902636 |
From 511638161566d4944a572a31d787eb27bbc0bc8e Mon Sep 17 00:00:00 2001
|
|
|
902636 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
902636 |
Date: Fri, 29 May 2020 05:53:45 -0400
|
|
|
902636 |
Subject: [PATCH 03/42] s390x: Don't do a normal reset on the initial cpu
|
|
|
902636 |
MIME-Version: 1.0
|
|
|
902636 |
Content-Type: text/plain; charset=UTF-8
|
|
|
902636 |
Content-Transfer-Encoding: 8bit
|
|
|
902636 |
|
|
|
902636 |
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
|
902636 |
Message-id: <20200529055420.16855-4-thuth@redhat.com>
|
|
|
902636 |
Patchwork-id: 97017
|
|
|
902636 |
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 03/38] s390x: Don't do a normal reset on the initial cpu
|
|
|
902636 |
Bugzilla: 1828317
|
|
|
902636 |
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
|
|
902636 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
902636 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
902636 |
|
|
|
902636 |
From: Janosch Frank <frankja@linux.ibm.com>
|
|
|
902636 |
|
|
|
902636 |
The initiating cpu needs to be reset with an initial reset. While
|
|
|
902636 |
doing a normal reset followed by a initial reset is not wrong per se,
|
|
|
902636 |
the Ultravisor will only allow the correct reset to be performed.
|
|
|
902636 |
|
|
|
902636 |
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
|
|
902636 |
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
|
902636 |
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
Message-Id: <20191127175046.4911-2-frankja@linux.ibm.com>
|
|
|
902636 |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
902636 |
(cherry picked from commit ec9227339fce99412830d44a37eb0bd2fadd5f75)
|
|
|
902636 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
902636 |
---
|
|
|
902636 |
hw/s390x/s390-virtio-ccw.c | 3 +++
|
|
|
902636 |
1 file changed, 3 insertions(+)
|
|
|
902636 |
|
|
|
902636 |
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
|
902636 |
index c2c83d2fce..4ea01c53c0 100644
|
|
|
902636 |
--- a/hw/s390x/s390-virtio-ccw.c
|
|
|
902636 |
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
|
902636 |
@@ -348,6 +348,9 @@ static void s390_machine_reset(MachineState *machine)
|
|
|
902636 |
break;
|
|
|
902636 |
case S390_RESET_LOAD_NORMAL:
|
|
|
902636 |
CPU_FOREACH(t) {
|
|
|
902636 |
+ if (t == cs) {
|
|
|
902636 |
+ continue;
|
|
|
902636 |
+ }
|
|
|
902636 |
run_on_cpu(t, s390_do_cpu_reset, RUN_ON_CPU_NULL);
|
|
|
902636 |
}
|
|
|
902636 |
subsystem_reset();
|
|
|
902636 |
--
|
|
|
902636 |
2.27.0
|
|
|
902636 |
|