From: Janosch Frank <frankja@linux.ibm.com> To: kvm@vger.kernel.org Cc: thuth@redhat.com, david@redhat.com, borntraeger@de.ibm.com, imbrenda@linux.ibm.com, cohuck@redhat.com, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v4 1/9] s390x: Add test_bit to library Date: Tue, 12 Jan 2021 08:20:46 -0500 [thread overview] Message-ID: <20210112132054.49756-2-frankja@linux.ibm.com> (raw) In-Reply-To: <20210112132054.49756-1-frankja@linux.ibm.com> Query/feature bits are commonly tested via MSB bit numbers on s390. Let's add test bit functions, so we don't need to copy code to test query bits. The test_bit code has been taken from the kernel since most s390x KVM unit test developers are used to them. Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Reviewed-by: Cornelia Huck <cohuck@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> --- lib/s390x/asm/bitops.h | 26 ++++++++++++++++++++++++++ lib/s390x/asm/facility.h | 3 ++- s390x/uv-guest.c | 6 +++--- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/s390x/asm/bitops.h b/lib/s390x/asm/bitops.h index e7cdda9..792881e 100644 --- a/lib/s390x/asm/bitops.h +++ b/lib/s390x/asm/bitops.h @@ -1,3 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Bitops taken from the kernel as most developers are already used + * to them. + * + * Copyright IBM Corp. 1999,2013 + * + * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>, + * + */ #ifndef _ASMS390X_BITOPS_H_ #define _ASMS390X_BITOPS_H_ @@ -7,4 +17,20 @@ #define BITS_PER_LONG 64 +static inline bool test_bit(unsigned long nr, + const volatile unsigned long *ptr) +{ + const volatile unsigned char *addr; + + addr = ((const volatile unsigned char *)ptr); + addr += (nr ^ (BITS_PER_LONG - 8)) >> 3; + return (*addr >> (nr & 7)) & 1; +} + +static inline bool test_bit_inv(unsigned long nr, + const volatile unsigned long *ptr) +{ + return test_bit(nr ^ (BITS_PER_LONG - 1), ptr); +} + #endif diff --git a/lib/s390x/asm/facility.h b/lib/s390x/asm/facility.h index 7828cf8..95d4a15 100644 --- a/lib/s390x/asm/facility.h +++ b/lib/s390x/asm/facility.h @@ -11,13 +11,14 @@ #include <libcflat.h> #include <asm/facility.h> #include <asm/arch_def.h> +#include <bitops.h> #define NB_STFL_DOUBLEWORDS 32 extern uint64_t stfl_doublewords[]; static inline bool test_facility(int nr) { - return stfl_doublewords[nr / 64] & (0x8000000000000000UL >> (nr % 64)); + return test_bit_inv(nr, stfl_doublewords); } static inline void stfl(void) diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c index bc947ab..e51b85e 100644 --- a/s390x/uv-guest.c +++ b/s390x/uv-guest.c @@ -75,11 +75,11 @@ static void test_query(void) * Ultravisor version and are expected to always be available * because they are basic building blocks. */ - report(uvcb.inst_calls_list[0] & (1UL << (63 - BIT_UVC_CMD_QUI)), + report(test_bit_inv(BIT_UVC_CMD_QUI, &uvcb.inst_calls_list[0]), "query indicated"); - report(uvcb.inst_calls_list[0] & (1UL << (63 - BIT_UVC_CMD_SET_SHARED_ACCESS)), + report(test_bit_inv(BIT_UVC_CMD_SET_SHARED_ACCESS, &uvcb.inst_calls_list[0]), "share indicated"); - report(uvcb.inst_calls_list[0] & (1UL << (63 - BIT_UVC_CMD_REMOVE_SHARED_ACCESS)), + report(test_bit_inv(BIT_UVC_CMD_REMOVE_SHARED_ACCESS, &uvcb.inst_calls_list[0]), "unshare indicated"); report_prefix_pop(); } -- 2.25.1
next prev parent reply other threads:[~2021-01-12 13:22 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-12 13:20 [kvm-unit-tests PATCH v4 0/9] s390x: Add SIE library and simple tests Janosch Frank 2021-01-12 13:20 ` Janosch Frank [this message] 2021-01-14 13:55 ` [kvm-unit-tests PATCH v4 1/9] s390x: Add test_bit to library Claudio Imbrenda 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 2/9] s390x: Consolidate sclp read info Janosch Frank 2021-01-14 13:57 ` Claudio Imbrenda 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 3/9] s390x: SCLP feature checking Janosch Frank 2021-01-13 11:02 ` Cornelia Huck 2021-01-14 13:47 ` Claudio Imbrenda 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 4/9] s390x: Split assembly into multiple files Janosch Frank 2021-01-13 11:04 ` Cornelia Huck 2021-01-13 12:04 ` Thomas Huth 2021-01-13 12:15 ` Janosch Frank 2021-01-14 8:54 ` Thomas Huth 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 5/9] s390x: sie: Add SIE to lib Janosch Frank 2021-01-13 12:44 ` Thomas Huth 2021-01-13 13:34 ` Janosch Frank 2021-01-14 14:43 ` Claudio Imbrenda 2021-01-14 15:03 ` Janosch Frank 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 6/9] s390x: sie: Add first SIE test Janosch Frank 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 7/9] s390x: Add diag318 intercept test Janosch Frank 2021-01-13 11:12 ` Cornelia Huck 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 8/9] s390x: Fix sclp.h style issues Janosch Frank 2021-01-12 13:20 ` [kvm-unit-tests PATCH v4 9/9] s390x: sclp: Add CPU entry offset comment Janosch Frank 2021-01-12 15:51 ` Thomas Huth 2021-01-13 10:25 ` David Hildenbrand 2021-01-13 11:06 ` Janosch Frank 2021-01-13 11:09 ` Cornelia Huck 2021-01-13 13:16 ` Thomas Huth 2021-01-14 14:45 ` Claudio Imbrenda 2021-01-18 9:43 ` [kvm-unit-tests PATCH v4 0/9] s390x: Add SIE library and simple tests Janosch Frank
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210112132054.49756-2-frankja@linux.ibm.com \ --to=frankja@linux.ibm.com \ --cc=borntraeger@de.ibm.com \ --cc=cohuck@redhat.com \ --cc=david@redhat.com \ --cc=imbrenda@linux.ibm.com \ --cc=kvm@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=thuth@redhat.com \ --subject='Re: [kvm-unit-tests PATCH v4 1/9] s390x: Add test_bit to library' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).