Message ID | 20191105162828.2490-2-frankja@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | s390x: Improve architectural compliance for diag308 | expand |
On 05.11.19 17:28, Janosch Frank wrote: > If we run with DAT enabled and do a reset, we need to save the CRs to > backup our ASCEs on a diag308 for example. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > lib/s390x/asm-offsets.c | 2 +- > lib/s390x/asm/arch_def.h | 4 ++-- > lib/s390x/interrupt.c | 4 ++-- > lib/s390x/smp.c | 2 +- > s390x/cstart64.S | 9 ++++++--- > 5 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c > index 6e2d259..4b213f8 100644 > --- a/lib/s390x/asm-offsets.c > +++ b/lib/s390x/asm-offsets.c > @@ -57,7 +57,7 @@ int main(void) > OFFSET(GEN_LC_SW_INT_GRS, lowcore, sw_int_grs); > OFFSET(GEN_LC_SW_INT_FPRS, lowcore, sw_int_fprs); > OFFSET(GEN_LC_SW_INT_FPC, lowcore, sw_int_fpc); > - OFFSET(GEN_LC_SW_INT_CR0, lowcore, sw_int_cr0); > + OFFSET(GEN_LC_SW_INT_CRS, lowcore, sw_int_crs); > OFFSET(GEN_LC_MCCK_EXT_SA_ADDR, lowcore, mcck_ext_sa_addr); > OFFSET(GEN_LC_FPRS_SA, lowcore, fprs_sa); > OFFSET(GEN_LC_GRS_SA, lowcore, grs_sa); > diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h > index 96cca2e..07d4e5e 100644 > --- a/lib/s390x/asm/arch_def.h > +++ b/lib/s390x/asm/arch_def.h > @@ -78,8 +78,8 @@ struct lowcore { > uint64_t sw_int_fprs[16]; /* 0x0280 */ > uint32_t sw_int_fpc; /* 0x0300 */ > uint8_t pad_0x0304[0x0308 - 0x0304]; /* 0x0304 */ > - uint64_t sw_int_cr0; /* 0x0308 */ > - uint8_t pad_0x0310[0x11b0 - 0x0310]; /* 0x0310 */ > + uint64_t sw_int_crs[16]; /* 0x0308 */ > + uint8_t pad_0x0310[0x11b0 - 0x0388]; /* 0x0388 */ > uint64_t mcck_ext_sa_addr; /* 0x11b0 */ > uint8_t pad_0x11b8[0x1200 - 0x11b8]; /* 0x11b8 */ > uint64_t fprs_sa[16]; /* 0x1200 */ > diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c > index 5cade23..c9e2dc6 100644 > --- a/lib/s390x/interrupt.c > +++ b/lib/s390x/interrupt.c > @@ -124,13 +124,13 @@ void handle_ext_int(void) > } > > if (lc->ext_int_code == EXT_IRQ_SERVICE_SIG) { > - lc->sw_int_cr0 &= ~(1UL << 9); > + lc->sw_int_crs[0] &= ~(1UL << 9); > sclp_handle_ext(); > } else { > ext_int_expected = false; > } > > - if (!(lc->sw_int_cr0 & CR0_EXTM_MASK)) > + if (!(lc->sw_int_crs[0] & CR0_EXTM_MASK)) > lc->ext_old_psw.mask &= ~PSW_MASK_EXT; > } > > diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c > index 7602886..f57f420 100644 > --- a/lib/s390x/smp.c > +++ b/lib/s390x/smp.c > @@ -189,7 +189,7 @@ 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_cr0 = 0x0000000000040000UL; > + lc->sw_int_crs[0] = 0x0000000000040000UL; > > /* Start processing */ > rc = sigp_retry(cpu->addr, SIGP_RESTART, 0, NULL); > diff --git a/s390x/cstart64.S b/s390x/cstart64.S > index 8e2b21e..0455591 100644 > --- a/s390x/cstart64.S > +++ b/s390x/cstart64.S > @@ -93,7 +93,7 @@ memsetxc: > /* save grs 0-15 */ > stmg %r0, %r15, GEN_LC_SW_INT_GRS > /* save cr0 */ Comment needs an update > - stctg %c0, %c0, GEN_LC_SW_INT_CR0 > + stctg %c0, %c15, GEN_LC_SW_INT_CRS > /* load initial cr0 again */ > larl %r1, initial_cr0 > lctlg %c0, %c0, 0(%r1) > @@ -107,13 +107,16 @@ memsetxc: > > .macro RESTORE_REGS > /* restore fprs 0-15 + fpc */ > + /* load initial cr0 again */ Two comments in a wrong look wrong. > + larl %r1, initial_cr0 > + lctlg %c0, %c0, 0(%r1) This hunk does somewhat not fit to this patch description. This needs an explanation or should be moved to a separate patch. > la %r1, GEN_LC_SW_INT_FPRS > .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 > ld \i, \i * 8(%r1) > .endr > lfpc GEN_LC_SW_INT_FPC > /* restore cr0 */ Comments needs an update > - lctlg %c0, %c0, GEN_LC_SW_INT_CR0 > + lctlg %c0, %c15, GEN_LC_SW_INT_CRS > /* restore grs 0-15 */ > lmg %r0, %r15, GEN_LC_SW_INT_GRS > .endm > @@ -150,7 +153,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_CR0 > + lctlg %c0, %c0, GEN_LC_SW_INT_CRS > br %r14 > > pgm_int: > Apart from that looks good.
diff --git a/lib/s390x/asm-offsets.c b/lib/s390x/asm-offsets.c index 6e2d259..4b213f8 100644 --- a/lib/s390x/asm-offsets.c +++ b/lib/s390x/asm-offsets.c @@ -57,7 +57,7 @@ int main(void) OFFSET(GEN_LC_SW_INT_GRS, lowcore, sw_int_grs); OFFSET(GEN_LC_SW_INT_FPRS, lowcore, sw_int_fprs); OFFSET(GEN_LC_SW_INT_FPC, lowcore, sw_int_fpc); - OFFSET(GEN_LC_SW_INT_CR0, lowcore, sw_int_cr0); + OFFSET(GEN_LC_SW_INT_CRS, lowcore, sw_int_crs); OFFSET(GEN_LC_MCCK_EXT_SA_ADDR, lowcore, mcck_ext_sa_addr); OFFSET(GEN_LC_FPRS_SA, lowcore, fprs_sa); OFFSET(GEN_LC_GRS_SA, lowcore, grs_sa); diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index 96cca2e..07d4e5e 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -78,8 +78,8 @@ struct lowcore { uint64_t sw_int_fprs[16]; /* 0x0280 */ uint32_t sw_int_fpc; /* 0x0300 */ uint8_t pad_0x0304[0x0308 - 0x0304]; /* 0x0304 */ - uint64_t sw_int_cr0; /* 0x0308 */ - uint8_t pad_0x0310[0x11b0 - 0x0310]; /* 0x0310 */ + uint64_t sw_int_crs[16]; /* 0x0308 */ + uint8_t pad_0x0310[0x11b0 - 0x0388]; /* 0x0388 */ uint64_t mcck_ext_sa_addr; /* 0x11b0 */ uint8_t pad_0x11b8[0x1200 - 0x11b8]; /* 0x11b8 */ uint64_t fprs_sa[16]; /* 0x1200 */ diff --git a/lib/s390x/interrupt.c b/lib/s390x/interrupt.c index 5cade23..c9e2dc6 100644 --- a/lib/s390x/interrupt.c +++ b/lib/s390x/interrupt.c @@ -124,13 +124,13 @@ void handle_ext_int(void) } if (lc->ext_int_code == EXT_IRQ_SERVICE_SIG) { - lc->sw_int_cr0 &= ~(1UL << 9); + lc->sw_int_crs[0] &= ~(1UL << 9); sclp_handle_ext(); } else { ext_int_expected = false; } - if (!(lc->sw_int_cr0 & CR0_EXTM_MASK)) + if (!(lc->sw_int_crs[0] & CR0_EXTM_MASK)) lc->ext_old_psw.mask &= ~PSW_MASK_EXT; } diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c index 7602886..f57f420 100644 --- a/lib/s390x/smp.c +++ b/lib/s390x/smp.c @@ -189,7 +189,7 @@ 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_cr0 = 0x0000000000040000UL; + lc->sw_int_crs[0] = 0x0000000000040000UL; /* Start processing */ rc = sigp_retry(cpu->addr, SIGP_RESTART, 0, NULL); diff --git a/s390x/cstart64.S b/s390x/cstart64.S index 8e2b21e..0455591 100644 --- a/s390x/cstart64.S +++ b/s390x/cstart64.S @@ -93,7 +93,7 @@ memsetxc: /* save grs 0-15 */ stmg %r0, %r15, GEN_LC_SW_INT_GRS /* save cr0 */ - stctg %c0, %c0, GEN_LC_SW_INT_CR0 + stctg %c0, %c15, GEN_LC_SW_INT_CRS /* load initial cr0 again */ larl %r1, initial_cr0 lctlg %c0, %c0, 0(%r1) @@ -107,13 +107,16 @@ memsetxc: .macro RESTORE_REGS /* restore fprs 0-15 + fpc */ + /* load initial cr0 again */ + larl %r1, initial_cr0 + lctlg %c0, %c0, 0(%r1) la %r1, GEN_LC_SW_INT_FPRS .irp i, 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ld \i, \i * 8(%r1) .endr lfpc GEN_LC_SW_INT_FPC /* restore cr0 */ - lctlg %c0, %c0, GEN_LC_SW_INT_CR0 + lctlg %c0, %c15, GEN_LC_SW_INT_CRS /* restore grs 0-15 */ lmg %r0, %r15, GEN_LC_SW_INT_GRS .endm @@ -150,7 +153,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_CR0 + lctlg %c0, %c0, GEN_LC_SW_INT_CRS br %r14 pgm_int:
If we run with DAT enabled and do a reset, we need to save the CRs to backup our ASCEs on a diag308 for example. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- lib/s390x/asm-offsets.c | 2 +- lib/s390x/asm/arch_def.h | 4 ++-- lib/s390x/interrupt.c | 4 ++-- lib/s390x/smp.c | 2 +- s390x/cstart64.S | 9 ++++++--- 5 files changed, 12 insertions(+), 9 deletions(-)