102 lines
3.9 KiB
Diff
102 lines
3.9 KiB
Diff
|
From bdad28b11e36f657cb8909e7223a7d8fc0948c2e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thomas Huth <thuth@redhat.com>
|
||
|
|
Date: Fri, 29 May 2020 05:53:51 -0400
|
||
|
|
Subject: [PATCH 09/42] s390x: Fix cpu normal reset ri clearing
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
Message-id: <20200529055420.16855-10-thuth@redhat.com>
|
||
|
|
Patchwork-id: 97029
|
||
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 09/38] s390x: Fix cpu normal reset ri clearing
|
||
|
|
Bugzilla: 1828317
|
||
|
|
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
|
||
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@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>
|
||
|
|
|
||
|
|
As it turns out we need to clear the ri controls and PSW enablement
|
||
|
|
bit to be architecture compliant.
|
||
|
|
|
||
|
|
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
|
||
|
|
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
|
||
|
|
Message-Id: <20191203132813.2734-4-frankja@linux.ibm.com>
|
||
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
(cherry picked from commit e893baee70149896d1e43e341da4d6c614037d5d)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
target/s390x/cpu.c | 7 ++++++-
|
||
|
|
target/s390x/cpu.h | 7 ++++++-
|
||
|
|
2 files changed, 12 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
|
||
|
|
index bd39cb54b7..99ea09085a 100644
|
||
|
|
--- a/target/s390x/cpu.c
|
||
|
|
+++ b/target/s390x/cpu.c
|
||
|
|
@@ -100,7 +100,7 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
|
||
|
|
case S390_CPU_RESET_INITIAL:
|
||
|
|
/* initial reset does not clear everything! */
|
||
|
|
memset(&env->start_initial_reset_fields, 0,
|
||
|
|
- offsetof(CPUS390XState, end_reset_fields) -
|
||
|
|
+ offsetof(CPUS390XState, start_normal_reset_fields) -
|
||
|
|
offsetof(CPUS390XState, start_initial_reset_fields));
|
||
|
|
|
||
|
|
/* architectured initial value for Breaking-Event-Address register */
|
||
|
|
@@ -123,6 +123,11 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
|
||
|
|
&env->fpu_status);
|
||
|
|
/* fall through */
|
||
|
|
case S390_CPU_RESET_NORMAL:
|
||
|
|
+ env->psw.mask &= ~PSW_MASK_RI;
|
||
|
|
+ memset(&env->start_normal_reset_fields, 0,
|
||
|
|
+ offsetof(CPUS390XState, end_reset_fields) -
|
||
|
|
+ offsetof(CPUS390XState, start_normal_reset_fields));
|
||
|
|
+
|
||
|
|
env->pfault_token = -1UL;
|
||
|
|
env->bpbc = false;
|
||
|
|
break;
|
||
|
|
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
|
||
|
|
index d2af13b345..7e1c18d596 100644
|
||
|
|
--- a/target/s390x/cpu.h
|
||
|
|
+++ b/target/s390x/cpu.h
|
||
|
|
@@ -58,7 +58,6 @@ struct CPUS390XState {
|
||
|
|
*/
|
||
|
|
uint64_t vregs[32][2] QEMU_ALIGNED(16); /* vector registers */
|
||
|
|
uint32_t aregs[16]; /* access registers */
|
||
|
|
- uint8_t riccb[64]; /* runtime instrumentation control */
|
||
|
|
uint64_t gscb[4]; /* guarded storage control */
|
||
|
|
uint64_t etoken; /* etoken */
|
||
|
|
uint64_t etoken_extension; /* etoken extension */
|
||
|
|
@@ -114,6 +113,10 @@ struct CPUS390XState {
|
||
|
|
uint64_t gbea;
|
||
|
|
uint64_t pp;
|
||
|
|
|
||
|
|
+ /* Fields up to this point are not cleared by normal CPU reset */
|
||
|
|
+ struct {} start_normal_reset_fields;
|
||
|
|
+ uint8_t riccb[64]; /* runtime instrumentation control */
|
||
|
|
+
|
||
|
|
/* Fields up to this point are cleared by a CPU reset */
|
||
|
|
struct {} end_reset_fields;
|
||
|
|
|
||
|
|
@@ -252,6 +255,7 @@ extern const VMStateDescription vmstate_s390_cpu;
|
||
|
|
#undef PSW_SHIFT_ASC
|
||
|
|
#undef PSW_MASK_CC
|
||
|
|
#undef PSW_MASK_PM
|
||
|
|
+#undef PSW_MASK_RI
|
||
|
|
#undef PSW_SHIFT_MASK_PM
|
||
|
|
#undef PSW_MASK_64
|
||
|
|
#undef PSW_MASK_32
|
||
|
|
@@ -273,6 +277,7 @@ extern const VMStateDescription vmstate_s390_cpu;
|
||
|
|
#define PSW_MASK_CC 0x0000300000000000ULL
|
||
|
|
#define PSW_MASK_PM 0x00000F0000000000ULL
|
||
|
|
#define PSW_SHIFT_MASK_PM 40
|
||
|
|
+#define PSW_MASK_RI 0x0000008000000000ULL
|
||
|
|
#define PSW_MASK_64 0x0000000100000000ULL
|
||
|
|
#define PSW_MASK_32 0x0000000080000000ULL
|
||
|
|
#define PSW_MASK_ESA_ADDR 0x000000007fffffffULL
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|