Skip to contentSkip to conversation

s390x/tcg: clear local interrupts on reset normal

PATCH Applied Cornelia Huck 3 participants 4 messages Dec 6, 2019 – Dec 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 s390x/tcg: clear local interrupts on reset normal

We neglected to clean up pending interrupts and emergency signals; fix that.

---

v1->v2:
- rebased on top of my s390-next branch; we can now move the fields to be reset instead of clearing them manually

Further cleanup possible in a follow-up patch.

---
 target/s390x/cpu.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
target/s390x/cpu.h +4 -4
index 7f5fa1d35b73..e195e5c7c8bb 100644
@@ -98,10 +98,6 @@ struct CPUS390XState {
 
     uint64_t cregs[16]; /* control registers */
 
-    int pending_int;
-    uint16_t external_call_addr;
-    DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
-
     uint64_t ckc;
     uint64_t cputm;
     uint32_t todpr;
@@ -117,6 +113,10 @@ struct CPUS390XState {
     struct {} start_normal_reset_fields;
     uint8_t riccb[64];     /* runtime instrumentation control */
 
+    int pending_int;
+    uint16_t external_call_addr;
+    DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
+
     /* Fields up to this point are cleared by a CPU reset */
     struct {} end_reset_fields;
 
Signature · 1 line
2.21.0
#1 lore raw
Quoted 9 lines · Cornelia Huck

We neglected to clean up pending interrupts and emergency signals; fix that.

---

v1->v2:
- rebased on top of my s390-next branch; we can now move the fields to be reset instead of clearing them manually

Yep, much cleaner than v1 :)

Quoted 33 lines

Further cleanup possible in a follow-up patch.

---
  target/s390x/cpu.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
target/s390x/cpu.h +4 -4
index 7f5fa1d35b73..e195e5c7c8bb 100644
@@ -98,10 +98,6 @@ struct CPUS390XState {
 
      uint64_t cregs[16]; /* control registers */
 
-    int pending_int;
-    uint16_t external_call_addr;
-    DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
-
      uint64_t ckc;
      uint64_t cputm;
      uint32_t todpr;
@@ -117,6 +113,10 @@ struct CPUS390XState {
      struct {} start_normal_reset_fields;
      uint8_t riccb[64];     /* runtime instrumentation control */
 
+    int pending_int;
+    uint16_t external_call_addr;
+    DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
+
      /* Fields up to this point are cleared by a CPU reset */
      struct {} end_reset_fields;
 
Reviewed-by on v2 1/1
#2 lore raw
In reply to Cornelia Huck
Quoted 33 lines · Cornelia Huck

We neglected to clean up pending interrupts and emergency signals; fix that.

---

v1->v2:
- rebased on top of my s390-next branch; we can now move the fields to be reset instead of clearing them manually

Further cleanup possible in a follow-up patch.

---
 target/s390x/cpu.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
target/s390x/cpu.h +0 -4
index 7f5fa1d35b73..e195e5c7c8bb 100644
@@ -98,10 +98,6 @@ struct CPUS390XState {
 
     uint64_t cregs[16]; /* control registers */
 
-    int pending_int;
-    uint16_t external_call_addr;
-    DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
-
     uint64_t ckc;
     uint64_t cputm;
     uint32_t todpr;

target/s390x/cpu.h struct CPUS390XState { · line 122

Quoted 10 lines
target/s390x/cpu.h +4 -0
@@ -117,6 +113,10 @@ struct CPUS390XState {
     struct {} start_normal_reset_fields;
     uint8_t riccb[64];     /* runtime instrumentation control */
 
+    int pending_int;
+    uint16_t external_call_addr;
+    DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
+
     /* Fields up to this point are cleared by a CPU reset */
     struct {} end_reset_fields;
 
Signature · 3 lines
Thanks,

David / dhildenb
author Applied
#3 lore raw
In reply to Cornelia Huck
Quoted 10 lines · On Fri, 6 Dec 2019 14:54:04 +0100 Cornelia Huck <[email protected]> wrote:

We neglected to clean up pending interrupts and emergency signals; fix that.

---

v1->v2:
- rebased on top of my s390-next branch; we can now move the fields to be reset instead of clearing them manually

Quoted 5 lines

Further cleanup possible in a follow-up patch.

---
 target/s390x/cpu.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Queued to s390-next.