From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4AA42C433ED for ; Mon, 12 Apr 2021 12:39:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 225F361246 for ; Mon, 12 Apr 2021 12:39:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240959AbhDLMjZ (ORCPT ); Mon, 12 Apr 2021 08:39:25 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:44616 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240449AbhDLMjX (ORCPT ); Mon, 12 Apr 2021 08:39:23 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 13CCXMZw103883; Mon, 12 Apr 2021 08:39:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=LKi1j7+jeYBH7KSH5tiy2vbvJYqUa1SWJCvJQgOOPRM=; b=KNN9yQ3ZyzL8tFQoQs7O0quvoLotmDgSk+fztEISYaNthY+7TJmNaQ48Ie3guPa9ZUax 5dLOjmrxu+rjjfMToqk9vaVS7srZAjBJZP06t3SnzL1mHOw27bfzNSKzRx+sidUJMdLr 5ftYyA26X1jyqCUFdJsGCWubsbnUV8mJFXpKac+8YuO8ppakeo4FD2YtIUgX9JUjWJNn g8whNIJvoxRx8FntZqD+ogy5cNgc39RHcXxt5dasHMIzMWufmGsk6ymv6Qk/yPna8jOD BM37sfJPPveqcYG1JMq/vrkm0y3BMyOrQEZz/c0ondn6XIVGnI6HHoVc5ZYuIwIB34A3 bg== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 37vkphedbw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Apr 2021 08:39:05 -0400 Received: from m0098393.ppops.net (m0098393.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 13CCXRfe104508; Mon, 12 Apr 2021 08:39:05 -0400 Received: from ppma03ams.nl.ibm.com (62.31.33a9.ip4.static.sl-reverse.com [169.51.49.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 37vkphedau-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Apr 2021 08:39:05 -0400 Received: from pps.filterd (ppma03ams.nl.ibm.com [127.0.0.1]) by ppma03ams.nl.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 13CCRqZX016614; Mon, 12 Apr 2021 12:39:03 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma03ams.nl.ibm.com with ESMTP id 37u3n89t81-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 12 Apr 2021 12:39:02 +0000 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 13CCd0C939977364 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Apr 2021 12:39:00 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 00309A4055; Mon, 12 Apr 2021 12:38:59 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8A83CA4040; Mon, 12 Apr 2021 12:38:59 +0000 (GMT) Received: from [9.145.90.160] (unknown [9.145.90.160]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 12 Apr 2021 12:38:59 +0000 (GMT) Subject: Re: [kvm-unit-tests PATCH v3 1/7] s390x: lib: add and use macros for control register bits To: Claudio Imbrenda , kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, david@redhat.com, thuth@redhat.com, cohuck@redhat.com, pmorel@linux.ibm.com References: <20210407124209.828540-1-imbrenda@linux.ibm.com> <20210407124209.828540-2-imbrenda@linux.ibm.com> From: Janosch Frank Message-ID: <20ad1009-60c0-c59e-1db1-27670a51418e@linux.ibm.com> Date: Mon, 12 Apr 2021 14:38:59 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210407124209.828540-2-imbrenda@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: pP-cvF0vdsIQRtBXs4Cm7MiY4FTu6DsO X-Proofpoint-ORIG-GUID: TI9M5lmnLr4l4dMxw0M4Kcxwme9sLsMW X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391,18.0.761 definitions=2021-04-12_10:2021-04-12,2021-04-12 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 spamscore=0 impostorscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 phishscore=0 priorityscore=1501 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2104120083 Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org On 4/7/21 2:42 PM, Claudio Imbrenda wrote: > Add CTL0_* and CTL2_* macros for specific control register bits. > > Replace all hardcoded values in the library and in the existing testcases so > that they use the new macros. > > Signed-off-by: Claudio Imbrenda Finally :-) Reviewed-by: Janosch Frank > --- > lib/s390x/asm/arch_def.h | 12 ++++++++++++ > lib/s390x/asm/float.h | 4 ++-- > lib/s390x/asm/interrupt.h | 4 ++-- > lib/s390x/sclp.c | 4 ++-- > s390x/diag288.c | 2 +- > s390x/gs.c | 2 +- > s390x/iep.c | 4 ++-- > s390x/skrf.c | 2 +- > s390x/smp.c | 8 ++++---- > s390x/vector.c | 2 +- > 10 files changed, 28 insertions(+), 16 deletions(-) > > diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h > index 7e2c5e62..c3568ab9 100644 > --- a/lib/s390x/asm/arch_def.h > +++ b/lib/s390x/asm/arch_def.h > @@ -229,6 +229,18 @@ 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/asm/float.h b/lib/s390x/asm/float.h > index 13679447..98829918 100644 > --- a/lib/s390x/asm/float.h > +++ b/lib/s390x/asm/float.h > @@ -38,12 +38,12 @@ static inline void set_fpc_dxc(uint8_t dxc) > > static inline void afp_enable(void) > { > - ctl_set_bit(0, 63 - 45); > + ctl_set_bit(0, CTL0_AFP); > } > > static inline void afp_disable(void) > { > - ctl_clear_bit(0, 63 - 45); > + ctl_clear_bit(0, CTL0_AFP); > } > > #endif > diff --git a/lib/s390x/asm/interrupt.h b/lib/s390x/asm/interrupt.h > index 31e4766d..bf0eb40d 100644 > --- a/lib/s390x/asm/interrupt.h > +++ b/lib/s390x/asm/interrupt.h > @@ -27,13 +27,13 @@ void check_pgm_int_code(uint16_t code); > /* Activate low-address protection */ > static inline void low_prot_enable(void) > { > - ctl_set_bit(0, 63 - 35); > + ctl_set_bit(0, CTL0_LOW_ADDR_PROT); > } > > /* Disable low-address protection */ > static inline void low_prot_disable(void) > { > - ctl_clear_bit(0, 63 - 35); > + ctl_clear_bit(0, CTL0_LOW_ADDR_PROT); > } > > #endif > diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c > index 7a9b2c52..0d0b3d6a 100644 > --- a/lib/s390x/sclp.c > +++ b/lib/s390x/sclp.c > @@ -50,7 +50,7 @@ void sclp_setup_int(void) > { > uint64_t mask; > > - ctl_set_bit(0, 9); > + ctl_set_bit(0, CTL0_SERVICE_SIGNAL); > > mask = extract_psw_mask(); > mask |= PSW_MASK_EXT; > @@ -59,7 +59,7 @@ void sclp_setup_int(void) > > void sclp_handle_ext(void) > { > - ctl_clear_bit(0, 9); > + ctl_clear_bit(0, CTL0_SERVICE_SIGNAL); > spin_lock(&sclp_lock); > sclp_busy = false; > spin_unlock(&sclp_lock); > diff --git a/s390x/diag288.c b/s390x/diag288.c > index e132ff04..82b6ec17 100644 > --- a/s390x/diag288.c > +++ b/s390x/diag288.c > @@ -86,7 +86,7 @@ static void test_bite(void) > asm volatile("stck %0" : "=Q" (time) : : "cc"); > time += (uint64_t)(16000 * 1000) << 12; > asm volatile("sckc %0" : : "Q" (time)); > - ctl_set_bit(0, 11); > + ctl_set_bit(0, CTL0_CLOCK_COMPARATOR); > mask = extract_psw_mask(); > mask |= PSW_MASK_EXT; > load_psw_mask(mask); > diff --git a/s390x/gs.c b/s390x/gs.c > index 1376d0e6..a017a97d 100644 > --- a/s390x/gs.c > +++ b/s390x/gs.c > @@ -145,7 +145,7 @@ static void test_special(void) > static void init(void) > { > /* Enable control bit for gs */ > - ctl_set_bit(2, 4); > + ctl_set_bit(2, CTL2_GUARDED_STORAGE); > > /* Setup gs registers to guard the gs_area */ > gs_cb.gsd = gs_area | 25; > diff --git a/s390x/iep.c b/s390x/iep.c > index fe167ef0..906c77b3 100644 > --- a/s390x/iep.c > +++ b/s390x/iep.c > @@ -22,7 +22,7 @@ static void test_iep(void) > void (*fn)(void); > > /* Enable IEP */ > - ctl_set_bit(0, 20); > + ctl_set_bit(0, CTL0_IEP); > > /* Get and protect a page with the IEP bit */ > iepbuf = alloc_page(); > @@ -40,7 +40,7 @@ static void test_iep(void) > check_pgm_int_code(PGM_INT_CODE_PROTECTION); > report_prefix_pop(); > unprotect_page(iepbuf, PAGE_ENTRY_IEP); > - ctl_clear_bit(0, 20); > + ctl_clear_bit(0, CTL0_IEP); > free_page(iepbuf); > } > > diff --git a/s390x/skrf.c b/s390x/skrf.c > index 57524ba8..94e906a6 100644 > --- a/s390x/skrf.c > +++ b/s390x/skrf.c > @@ -150,7 +150,7 @@ static void ecall_setup(void) > /* Put a skey into the ext new psw */ > lc->ext_new_psw.mask = 0x00F0000180000000UL; > /* Open up ext masks */ > - ctl_set_bit(0, 13); > + ctl_set_bit(0, CTL0_EXTERNAL_CALL); > mask = extract_psw_mask(); > mask |= PSW_MASK_EXT; > load_psw_mask(mask); > diff --git a/s390x/smp.c b/s390x/smp.c > index b0ece491..f25ec769 100644 > --- a/s390x/smp.c > +++ b/s390x/smp.c > @@ -154,7 +154,7 @@ static void ecall(void) > struct lowcore *lc = (void *)0x0; > > expect_ext_int(); > - ctl_set_bit(0, 13); > + ctl_set_bit(0, CTL0_EXTERNAL_CALL); > mask = extract_psw_mask(); > mask |= PSW_MASK_EXT; > load_psw_mask(mask); > @@ -188,7 +188,7 @@ static void emcall(void) > struct lowcore *lc = (void *)0x0; > > expect_ext_int(); > - ctl_set_bit(0, 14); > + ctl_set_bit(0, CTL0_EMERGENCY_SIGNAL); > mask = extract_psw_mask(); > mask |= PSW_MASK_EXT; > load_psw_mask(mask); > @@ -283,8 +283,8 @@ static void test_local_ints(void) > unsigned long mask; > > /* Open masks for ecall and emcall */ > - ctl_set_bit(0, 13); > - ctl_set_bit(0, 14); > + ctl_set_bit(0, CTL0_EXTERNAL_CALL); > + ctl_set_bit(0, CTL0_EMERGENCY_SIGNAL); > mask = extract_psw_mask(); > mask |= PSW_MASK_EXT; > load_psw_mask(mask); > diff --git a/s390x/vector.c b/s390x/vector.c > index d1b6a571..f642ef67 100644 > --- a/s390x/vector.c > +++ b/s390x/vector.c > @@ -106,7 +106,7 @@ static void test_bcd_add(void) > static void init(void) > { > /* Enable vector instructions */ > - ctl_set_bit(0, 17); > + ctl_set_bit(0, CTL0_VECTOR); > > /* Preset vector registers to 0xff */ > memset(pagebuf, 0xff, PAGE_SIZE); >