| Message ID | 20200429143518.1360468-5-frankja@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: smp: Improve smp code part 2 | expand |
On 29.04.20 16:35, Janosch Frank wrote: > Local interrupts (external and emergency call) should be cleared after > any cpu reset. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: Cornelia Huck <cohuck@redhat.com> > --- > s390x/smp.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/s390x/smp.c b/s390x/smp.c > index 4c50183..5e2e517 100644 > --- a/s390x/smp.c > +++ b/s390x/smp.c > @@ -245,6 +245,19 @@ static void test_reset_initial(void) > report_prefix_pop(); > } > > +static void test_local_ints(void) > +{ > + unsigned long mask; > + > + /* Open masks for ecall and emcall */ > + ctl_set_bit(0, 13); > + ctl_set_bit(0, 14); > + mask = extract_psw_mask(); > + mask |= PSW_MASK_EXT; > + load_psw_mask(mask); > + set_flag(1); > +} > + > static void test_reset(void) > { > struct psw psw; > @@ -253,10 +266,18 @@ static void test_reset(void) > psw.addr = (unsigned long)test_func; > > report_prefix_push("cpu reset"); > + sigp(1, SIGP_EMERGENCY_SIGNAL, 0, NULL); > + sigp(1, SIGP_EXTERNAL_CALL, 0, NULL); > smp_cpu_start(1, psw); > > sigp_retry(1, SIGP_CPU_RESET, 0, NULL); > report(smp_cpu_stopped(1), "cpu stopped"); > + > + set_flag(0); > + psw.addr = (unsigned long)test_local_ints; > + smp_cpu_start(1, psw); > + wait_for_flag(); > + report(true, "local interrupts cleared"); > report_prefix_pop(); > } > > Acked-by: David Hildenbrand <david@redhat.com>
diff --git a/s390x/smp.c b/s390x/smp.c index 4c50183..5e2e517 100644 --- a/s390x/smp.c +++ b/s390x/smp.c @@ -245,6 +245,19 @@ static void test_reset_initial(void) report_prefix_pop(); } +static void test_local_ints(void) +{ + unsigned long mask; + + /* Open masks for ecall and emcall */ + ctl_set_bit(0, 13); + ctl_set_bit(0, 14); + mask = extract_psw_mask(); + mask |= PSW_MASK_EXT; + load_psw_mask(mask); + set_flag(1); +} + static void test_reset(void) { struct psw psw; @@ -253,10 +266,18 @@ static void test_reset(void) psw.addr = (unsigned long)test_func; report_prefix_push("cpu reset"); + sigp(1, SIGP_EMERGENCY_SIGNAL, 0, NULL); + sigp(1, SIGP_EXTERNAL_CALL, 0, NULL); smp_cpu_start(1, psw); sigp_retry(1, SIGP_CPU_RESET, 0, NULL); report(smp_cpu_stopped(1), "cpu stopped"); + + set_flag(0); + psw.addr = (unsigned long)test_local_ints; + smp_cpu_start(1, psw); + wait_for_flag(); + report(true, "local interrupts cleared"); report_prefix_pop(); }