76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
|
From 38ba55dd27a3b8308f0ce2e82a4c3eba3f197d20 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 May 2020 05:53:53 -0400
|
||
|
|
Subject: [PATCH 11/42] pc-bios/s390x: Fix reset psw mask
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20200529055420.16855-12-thuth@redhat.com>
|
||
|
|
Patchwork-id: 97034
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 11/38] pc-bios/s390x: Fix reset psw mask
|
||
|
|
Bugzilla: 1828317
|
||
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
||
|
|
|
||
|
|
From: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
|
||
|
|
We need to set the short psw indication bit in the reset psw, as it is
|
||
|
|
a short psw.
|
||
|
|
|
||
|
|
Exposed by "s390x: Properly fetch and test the short psw on diag308
|
||
|
|
subc 0/1".
|
||
|
|
|
||
|
|
Fixes: 962982329029 ("pc-bios/s390-ccw: do a subsystem reset before running the guest")
|
||
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Message-Id: <20191203132813.2734-5-frankja@linux.ibm.com>
|
||
|
|
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
(cherry picked from commit 5c6f0d5f46a77d77460dfb518cf1e1e4145c276e)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
pc-bios/s390-ccw/jump2ipl.c | 12 +++++++-----
|
||
|
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pc-bios/s390-ccw/jump2ipl.c b/pc-bios/s390-ccw/jump2ipl.c
|
||
|
|
index 266f1502b9..da13c43cc0 100644
|
||
|
|
--- a/pc-bios/s390-ccw/jump2ipl.c
|
||
|
|
+++ b/pc-bios/s390-ccw/jump2ipl.c
|
||
|
|
@@ -12,11 +12,11 @@
|
||
|
|
#define KERN_IMAGE_START 0x010000UL
|
||
|
|
#define PSW_MASK_64 0x0000000100000000ULL
|
||
|
|
#define PSW_MASK_32 0x0000000080000000ULL
|
||
|
|
-#define IPL_PSW_MASK (PSW_MASK_32 | PSW_MASK_64)
|
||
|
|
+#define PSW_MASK_SHORTPSW 0x0008000000000000ULL
|
||
|
|
+#define RESET_PSW_MASK (PSW_MASK_SHORTPSW | PSW_MASK_32 | PSW_MASK_64)
|
||
|
|
|
||
|
|
typedef struct ResetInfo {
|
||
|
|
- uint32_t ipl_mask;
|
||
|
|
- uint32_t ipl_addr;
|
||
|
|
+ uint64_t ipl_psw;
|
||
|
|
uint32_t ipl_continue;
|
||
|
|
} ResetInfo;
|
||
|
|
|
||
|
|
@@ -50,7 +50,9 @@ void jump_to_IPL_code(uint64_t address)
|
||
|
|
ResetInfo *current = 0;
|
||
|
|
|
||
|
|
save = *current;
|
||
|
|
- current->ipl_addr = (uint32_t) (uint64_t) &jump_to_IPL_2;
|
||
|
|
+
|
||
|
|
+ current->ipl_psw = (uint64_t) &jump_to_IPL_2;
|
||
|
|
+ current->ipl_psw |= RESET_PSW_MASK;
|
||
|
|
current->ipl_continue = address & 0x7fffffff;
|
||
|
|
|
||
|
|
debug_print_int("set IPL addr to", current->ipl_continue);
|
||
|
|
@@ -82,7 +84,7 @@ void jump_to_low_kernel(void)
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Trying to get PSW at zero address */
|
||
|
|
- if (*((uint64_t *)0) & IPL_PSW_MASK) {
|
||
|
|
+ if (*((uint64_t *)0) & RESET_PSW_MASK) {
|
||
|
|
jump_to_IPL_code((*((uint64_t *)0)) & 0x7fffffff);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|