[kvm-unit-tests PATCH 2/2] s390x: smp: Setup CRs from cpu 0

Janosch Frank
2019-12-11T11:59:38Z

Grab the CRs (currently only 0, 1, 7, 13) from cpu 0, so we can
bringup the new cpu in DAT mode or set other control options.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
lib/s390x/smp.c | 5 ++++-
s390x/cstart64.S | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c
index e17751a..4dfe7c6 100644
--- a/lib/s390x/smp.c
+++ b/lib/s390x/smp.c
@@ -191,7 +191,10 @@ int smp_cpu_setup(uint16_t addr, struct psw psw)
cpu->lowcore->sw_int_grs[15] = (uint64_t)cpu->stack + (PAGE_SIZE * 4);
lc->restart_new_psw.mask = 0x0000000180000000UL;
lc->restart_new_psw.addr = (uint64_t)smp_cpu_setup_state;
- lc->sw_int_crs[0] = 0x0000000000040000UL;
+ lc->sw_int_crs[0] = stctg(0);
+ lc->sw_int_crs[1] = stctg(1);
+ lc->sw_int_crs[7] = stctg(7);
+ lc->sw_int_crs[13] = stctg(13);

/* Start processing */
rc = sigp_retry(cpu->addr, SIGP_RESTART, 0, NULL);
diff --git a/s390x/cstart64.S b/s390x/cstart64.S
index e6a6bdb..399ae9b 100644
--- a/s390x/cstart64.S
+++ b/s390x/cstart64.S
@@ -158,7 +158,7 @@ diag308_load_reset:
smp_cpu_setup_state:
xgr %r1, %r1
lmg %r0, %r15, GEN_LC_SW_INT_GRS
- lctlg %c0, %c0, GEN_LC_SW_INT_CRS
+ lctlg %c0, %c15, GEN_LC_SW_INT_CRS
lpswe GEN_LC_SW_INT_PSW

pgm_int:
--
2.20.1