Message ID | 20210820114000.166527-4-frankja@linux.ibm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | s390x: Cleanup and maintenance | expand |
On Fri, 20 Aug 2021 11:40:00 +0000 Janosch Frank <frankja@linux.ibm.com> wrote: > We had bits and masks defined and don't necessarily need both. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com> > --- > lib/s390x/asm/arch_def.h | 28 ++++++++++++---------------- > lib/s390x/smp.c | 3 ++- > s390x/skrf.c | 3 ++- > 3 files changed, 16 insertions(+), 18 deletions(-) > > diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h > index ab5a9043..aa80d840 100644 > --- a/lib/s390x/asm/arch_def.h > +++ b/lib/s390x/asm/arch_def.h > @@ -55,10 +55,18 @@ struct psw { > #define PSW_MASK_BA 0x0000000080000000UL > #define PSW_MASK_64 PSW_MASK_BA | PSW_MASK_EA; > > -#define CR0_EXTM_SCLP 0x0000000000000200UL > -#define CR0_EXTM_EXTC 0x0000000000002000UL > -#define CR0_EXTM_EMGC 0x0000000000004000UL > -#define CR0_EXTM_MASK 0x0000000000006200UL > +#define CTL0_LOW_ADDR_PROT (63 - 35) > +#define CTL0_EDAT (63 - 40) > +#define CTL0_IEP (63 - 43) > +#define CTL0_AFP (63 - 45) > +#define CTL0_VECTOR (63 - 46) > +#define CTL0_EMERGENCY_SIGNAL (63 - 49) > +#define CTL0_EXTERNAL_CALL (63 - 50) > +#define CTL0_CLOCK_COMPARATOR (63 - 52) > +#define CTL0_SERVICE_SIGNAL (63 - 54) > +#define CR0_EXTM_MASK 0x0000000000006200UL /* Combined external masks */ > + > +#define CTL2_GUARDED_STORAGE (63 - 59) > > struct lowcore { > uint8_t pad_0x0000[0x0080 - 0x0000]; /* 0x0000 */ > @@ -240,18 +248,6 @@ static inline uint64_t stctg(int cr) > return value; > } > > -#define CTL0_LOW_ADDR_PROT (63 - 35) > -#define CTL0_EDAT (63 - 40) > -#define CTL0_IEP (63 - 43) > -#define CTL0_AFP (63 - 45) > -#define CTL0_VECTOR (63 - 46) > -#define CTL0_EMERGENCY_SIGNAL (63 - 49) > -#define CTL0_EXTERNAL_CALL (63 - 50) > -#define CTL0_CLOCK_COMPARATOR (63 - 52) > -#define CTL0_SERVICE_SIGNAL (63 - 54) > - > -#define CTL2_GUARDED_STORAGE (63 - 59) > - > static inline void ctl_set_bit(int cr, unsigned int bit) > { > uint64_t reg; > diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c > index 228fe667..da6d32f3 100644 > --- a/lib/s390x/smp.c > +++ b/lib/s390x/smp.c > @@ -10,6 +10,7 @@ > * Janosch Frank <frankja@linux.ibm.com> > */ > #include <libcflat.h> > +#include <bitops.h> > #include <asm/arch_def.h> > #include <asm/sigp.h> > #include <asm/page.h> > @@ -204,7 +205,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 = PSW_MASK_64; > lc->restart_new_psw.addr = (uint64_t)smp_cpu_setup_state; > - lc->sw_int_crs[0] = 0x0000000000040000UL; > + lc->sw_int_crs[0] = BIT_ULL(CTL0_AFP); > > /* Start processing */ > smp_cpu_restart_nolock(addr, NULL); > diff --git a/s390x/skrf.c b/s390x/skrf.c > index 9488c32b..8ca7588c 100644 > --- a/s390x/skrf.c > +++ b/s390x/skrf.c > @@ -8,6 +8,7 @@ > * Janosch Frank <frankja@linux.ibm.com> > */ > #include <libcflat.h> > +#include <bitops.h> > #include <asm/asm-offsets.h> > #include <asm-generic/barrier.h> > #include <asm/interrupt.h> > @@ -125,8 +126,8 @@ static void ecall_cleanup(void) > { > struct lowcore *lc = (void *)0x0; > > - lc->sw_int_crs[0] = 0x0000000000040000; > lc->ext_new_psw.mask = PSW_MASK_64; > + lc->sw_int_crs[0] = BIT_ULL(CTL0_AFP); > > /* > * PGM old contains the ext new PSW, we need to clean it up,
On 20/08/2021 13.40, Janosch Frank wrote: > We had bits and masks defined and don't necessarily need both. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > --- > lib/s390x/asm/arch_def.h | 28 ++++++++++++---------------- > lib/s390x/smp.c | 3 ++- > s390x/skrf.c | 3 ++- > 3 files changed, 16 insertions(+), 18 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index ab5a9043..aa80d840 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -55,10 +55,18 @@ struct psw { #define PSW_MASK_BA 0x0000000080000000UL #define PSW_MASK_64 PSW_MASK_BA | PSW_MASK_EA; -#define CR0_EXTM_SCLP 0x0000000000000200UL -#define CR0_EXTM_EXTC 0x0000000000002000UL -#define CR0_EXTM_EMGC 0x0000000000004000UL -#define CR0_EXTM_MASK 0x0000000000006200UL +#define CTL0_LOW_ADDR_PROT (63 - 35) +#define CTL0_EDAT (63 - 40) +#define CTL0_IEP (63 - 43) +#define CTL0_AFP (63 - 45) +#define CTL0_VECTOR (63 - 46) +#define CTL0_EMERGENCY_SIGNAL (63 - 49) +#define CTL0_EXTERNAL_CALL (63 - 50) +#define CTL0_CLOCK_COMPARATOR (63 - 52) +#define CTL0_SERVICE_SIGNAL (63 - 54) +#define CR0_EXTM_MASK 0x0000000000006200UL /* Combined external masks */ + +#define CTL2_GUARDED_STORAGE (63 - 59) struct lowcore { uint8_t pad_0x0000[0x0080 - 0x0000]; /* 0x0000 */ @@ -240,18 +248,6 @@ static inline uint64_t stctg(int cr) return value; } -#define CTL0_LOW_ADDR_PROT (63 - 35) -#define CTL0_EDAT (63 - 40) -#define CTL0_IEP (63 - 43) -#define CTL0_AFP (63 - 45) -#define CTL0_VECTOR (63 - 46) -#define CTL0_EMERGENCY_SIGNAL (63 - 49) -#define CTL0_EXTERNAL_CALL (63 - 50) -#define CTL0_CLOCK_COMPARATOR (63 - 52) -#define CTL0_SERVICE_SIGNAL (63 - 54) - -#define CTL2_GUARDED_STORAGE (63 - 59) - static inline void ctl_set_bit(int cr, unsigned int bit) { uint64_t reg; diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c index 228fe667..da6d32f3 100644 --- a/lib/s390x/smp.c +++ b/lib/s390x/smp.c @@ -10,6 +10,7 @@ * Janosch Frank <frankja@linux.ibm.com> */ #include <libcflat.h> +#include <bitops.h> #include <asm/arch_def.h> #include <asm/sigp.h> #include <asm/page.h> @@ -204,7 +205,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 = PSW_MASK_64; lc->restart_new_psw.addr = (uint64_t)smp_cpu_setup_state; - lc->sw_int_crs[0] = 0x0000000000040000UL; + lc->sw_int_crs[0] = BIT_ULL(CTL0_AFP); /* Start processing */ smp_cpu_restart_nolock(addr, NULL); diff --git a/s390x/skrf.c b/s390x/skrf.c index 9488c32b..8ca7588c 100644 --- a/s390x/skrf.c +++ b/s390x/skrf.c @@ -8,6 +8,7 @@ * Janosch Frank <frankja@linux.ibm.com> */ #include <libcflat.h> +#include <bitops.h> #include <asm/asm-offsets.h> #include <asm-generic/barrier.h> #include <asm/interrupt.h> @@ -125,8 +126,8 @@ static void ecall_cleanup(void) { struct lowcore *lc = (void *)0x0; - lc->sw_int_crs[0] = 0x0000000000040000; lc->ext_new_psw.mask = PSW_MASK_64; + lc->sw_int_crs[0] = BIT_ULL(CTL0_AFP); /* * PGM old contains the ext new PSW, we need to clean it up,
We had bits and masks defined and don't necessarily need both. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> --- lib/s390x/asm/arch_def.h | 28 ++++++++++++---------------- lib/s390x/smp.c | 3 ++- s390x/skrf.c | 3 ++- 3 files changed, 16 insertions(+), 18 deletions(-)