s390x: smp: Use full PSW to bringup new cpu
Up to now we ignored the psw mask and only used the psw address when
bringing up a new cpu. For DAT we need to also load the mask, so let's
do that.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20200429143518.1360468-8-frankja@linux.ibm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c
index df8dcd9..2860e9c 100644
--- a/lib/s390x/smp.c
+++ b/lib/s390x/smp.c
@@ -202,6 +202,8 @@
cpu->stack = (uint64_t *)alloc_pages(2);
/* Start without DAT and any other mask bits. */
+ cpu->lowcore->sw_int_psw.mask = psw.mask;
+ cpu->lowcore->sw_int_psw.addr = psw.addr;
cpu->lowcore->sw_int_grs[14] = psw.addr;
cpu->lowcore->sw_int_grs[15] = (uint64_t)cpu->stack + (PAGE_SIZE * 4);
lc->restart_new_psw.mask = 0x0000000180000000UL;
diff --git a/s390x/cstart64.S b/s390x/cstart64.S
index ecffbe0..e084f13 100644
--- a/s390x/cstart64.S
+++ b/s390x/cstart64.S
@@ -161,7 +161,8 @@
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
- brasl %r14, %r14
+ larl %r14, 0f
+ lpswe GEN_LC_SW_INT_PSW
/* If the function returns, just loop here */
0: j 0
