Re: [kvm-unit-tests PATCH 7/8] lib: s390x: Control register constant cleanup

Janosch Frank
2021-08-13T09:10:04Z

On 8/13/21 10:49 AM, Claudio Imbrenda wrote:
> On Fri, 13 Aug 2021 07:36:14 +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>
>> ---
>> lib/s390x/asm/arch_def.h | 29 +++++++++++++----------------
>> lib/s390x/smp.c | 2 +-
>> s390x/skrf.c | 2 +-
>> 3 files changed, 15 insertions(+), 18 deletions(-)
>>
>> diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
>> index 245453c3..4574a166 100644
>> --- a/lib/s390x/asm/arch_def.h
>> +++ b/lib/s390x/asm/arch_def.h
>> @@ -54,10 +54,19 @@ 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 BIT_TO_MASK64(x) 1UL << x
>
> don't we already have BIT and BIT_ULL?

Right, I should have looked first...
Will fix!

>
>> +#define CTL2_GUARDED_STORAGE (63 - 59)
>>
>> struct lowcore {
>> uint8_t pad_0x0000[0x0080 - 0x0000];
>> /* 0x0000 */ @@ -239,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..c2c6ffec 100644
>> --- a/lib/s390x/smp.c
>> +++ b/lib/s390x/smp.c
>> @@ -204,7 +204,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_TO_MASK64(CTL0_AFP);
>>
>> /* Start processing */
>> smp_cpu_restart_nolock(addr, NULL);
>> diff --git a/s390x/skrf.c b/s390x/skrf.c
>> index 9488c32b..a350ada6 100644
>> --- a/s390x/skrf.c
>> +++ b/s390x/skrf.c
>> @@ -125,8 +125,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_TO_MASK64(CTL0_AFP);
>>
>> /*
>> * PGM old contains the ext new PSW, we need to clean it up,
>