| Message ID | 20200117104640.1983-6-frankja@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: smp: Improve smp code and reset checks | expand |
On Fri, 17 Jan 2020 05:46:36 -0500 Janosch Frank <frankja@linux.ibm.com> wrote: > We store the user provided psw address into restart new, so a psw > restart does not lead us through setup again. > > Also we wait on smp_cpu_setup() until the cpu has finished setup > before returning. This is necessary for z/VM and LPAR where sigp is > asynchronous. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > --- > lib/s390x/smp.c | 2 ++ > s390x/cstart64.S | 2 ++ > 2 files changed, 4 insertions(+) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
On 17.01.20 11:46, Janosch Frank wrote: > We store the user provided psw address into restart new, so a psw > restart does not lead us through setup again. > > Also we wait on smp_cpu_setup() until the cpu has finished setup > before returning. This is necessary for z/VM and LPAR where sigp is > asynchronous. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > Reviewed-by: David Hildenbrand <david@redhat.com> > --- > lib/s390x/smp.c | 2 ++ > s390x/cstart64.S | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c > index 84e681d..9dad146 100644 > --- a/lib/s390x/smp.c > +++ b/lib/s390x/smp.c > @@ -204,6 +204,8 @@ int smp_cpu_setup(uint16_t addr, struct psw psw) > > /* Start processing */ > smp_cpu_restart_nolock(addr, NULL); > + /* Wait until the cpu has finished setup and started the provided psw */ > + while (lc->restart_new_psw.addr != psw.addr) { mb(); } while (lc->restart_new_psw.addr != psw.addr) mb();
diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c index 84e681d..9dad146 100644 --- a/lib/s390x/smp.c +++ b/lib/s390x/smp.c @@ -204,6 +204,8 @@ int smp_cpu_setup(uint16_t addr, struct psw psw) /* Start processing */ smp_cpu_restart_nolock(addr, NULL); + /* Wait until the cpu has finished setup and started the provided psw */ + while (lc->restart_new_psw.addr != psw.addr) { mb(); } out: spin_unlock(&lock); return rc; diff --git a/s390x/cstart64.S b/s390x/cstart64.S index 86dd4c4..9af6bb3 100644 --- a/s390x/cstart64.S +++ b/s390x/cstart64.S @@ -159,6 +159,8 @@ smp_cpu_setup_state: xgr %r1, %r1 lmg %r0, %r15, GEN_LC_SW_INT_GRS lctlg %c0, %c0, GEN_LC_SW_INT_CRS + /* We should only go once through cpu setup and not for every restart */ + stg %r14, GEN_LC_RESTART_NEW_PSW + 8 br %r14 pgm_int: