From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: frankja@linux.ibm.com, david@redhat.com, cohuck@redhat.com,
linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
thuth@redhat.com
Subject: [kvm-unit-tests PATCH 2/4] lib: s390x: sclp: Extend feature probing
Date: Mon, 10 May 2021 15:00:13 +0000 [thread overview]
Message-ID: <20210510150015.11119-3-frankja@linux.ibm.com> (raw)
In-Reply-To: <20210510150015.11119-1-frankja@linux.ibm.com>
Lets grab more of the feature bits from SCLP read info so we can use
them in the cpumodel tests.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
lib/s390x/sclp.c | 20 ++++++++++++++++++++
lib/s390x/sclp.h | 38 +++++++++++++++++++++++++++++++++++---
2 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c
index f11c2035..f25cfdb2 100644
--- a/lib/s390x/sclp.c
+++ b/lib/s390x/sclp.c
@@ -129,6 +129,13 @@ CPUEntry *sclp_get_cpu_entries(void)
return (CPUEntry *)(_read_info + read_info->offset_cpu);
}
+static bool sclp_feat_check(int byte, int mask)
+{
+ uint8_t *rib = (uint8_t *)read_info;
+
+ return !!(rib[byte] & mask);
+}
+
void sclp_facilities_setup(void)
{
unsigned short cpu0_addr = stap();
@@ -140,6 +147,14 @@ void sclp_facilities_setup(void)
cpu = sclp_get_cpu_entries();
if (read_info->offset_cpu > 134)
sclp_facilities.has_diag318 = read_info->byte_134_diag318;
+ sclp_facilities.has_gsls = sclp_feat_check(85, SCLP_FEAT_85_MASK_GSLS);
+ sclp_facilities.has_kss = sclp_feat_check(98, SCLP_FEAT_98_MASK_KSS);
+ sclp_facilities.has_cmma = sclp_feat_check(116, SCLP_FEAT_116_MASK_CMMA);
+ sclp_facilities.has_64bscao = sclp_feat_check(116, SCLP_FEAT_116_MASK_64BSCAO);
+ sclp_facilities.has_esca = sclp_feat_check(116, SCLP_FEAT_116_MASK_ESCA);
+ sclp_facilities.has_ibs = sclp_feat_check(117, SCLP_FEAT_117_MASK_IBS);
+ sclp_facilities.has_pfmfi = sclp_feat_check(117, SCLP_FEAT_117_MASK_PFMFI);
+
for (i = 0; i < read_info->entries_cpu; i++, cpu++) {
/*
* The logic for only reading the facilities from the
@@ -150,6 +165,11 @@ void sclp_facilities_setup(void)
*/
if (cpu->address == cpu0_addr) {
sclp_facilities.has_sief2 = cpu->feat_sief2;
+ sclp_facilities.has_skeyi = cpu->feat_skeyi;
+ sclp_facilities.has_siif = cpu->feat_siif;
+ sclp_facilities.has_sigpif = cpu->feat_sigpif;
+ sclp_facilities.has_ib = cpu->feat_ib;
+ sclp_facilities.has_cei = cpu->feat_cei;
break;
}
}
diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h
index 85231333..48df1260 100644
--- a/lib/s390x/sclp.h
+++ b/lib/s390x/sclp.h
@@ -94,9 +94,19 @@ typedef struct CPUEntry {
uint8_t reserved0;
uint8_t : 4;
uint8_t feat_sief2 : 1;
+ uint8_t feat_skeyi : 1;
+ uint8_t : 2;
+ uint8_t : 2;
+ uint8_t feat_gpere : 1;
+ uint8_t feat_siif : 1;
+ uint8_t feat_sigpif : 1;
uint8_t : 3;
- uint8_t features_res2 [SCCB_CPU_FEATURE_LEN - 1];
- uint8_t reserved2[6];
+ uint8_t reserved2[3];
+ uint8_t : 2;
+ uint8_t feat_ib : 1;
+ uint8_t feat_cei : 1;
+ uint8_t : 4;
+ uint8_t reserved3[6];
uint8_t type;
uint8_t reserved1;
} __attribute__((packed)) CPUEntry;
@@ -105,10 +115,32 @@ extern struct sclp_facilities sclp_facilities;
struct sclp_facilities {
uint64_t has_sief2 : 1;
+ uint64_t has_skeyi : 1;
+ uint64_t has_gpere : 1;
+ uint64_t has_siif : 1;
+ uint64_t has_sigpif : 1;
+ uint64_t has_ib : 1;
+ uint64_t has_cei : 1;
+
uint64_t has_diag318 : 1;
- uint64_t : 62;
+ uint64_t has_gsls : 1;
+ uint64_t has_cmma : 1;
+ uint64_t has_64bscao : 1;
+ uint64_t has_esca : 1;
+ uint64_t has_kss : 1;
+ uint64_t has_pfmfi : 1;
+ uint64_t has_ibs : 1;
+ uint64_t : 64 - 15;
};
+#define SCLP_FEAT_85_MASK_GSLS (1 << 7)
+#define SCLP_FEAT_98_MASK_KSS (1 << 0)
+#define SCLP_FEAT_116_MASK_64BSCAO (1 << 7)
+#define SCLP_FEAT_116_MASK_CMMA (1 << 6)
+#define SCLP_FEAT_116_MASK_ESCA (1 << 3)
+#define SCLP_FEAT_117_MASK_PFMFI (1 << 6)
+#define SCLP_FEAT_117_MASK_IBS (1 << 5)
+
typedef struct ReadInfo {
SCCBHeader h;
uint16_t rnmax;
--
2.30.2
next prev parent reply other threads:[~2021-05-10 15:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 15:00 [kvm-unit-tests PATCH 0/4] s390x: cpumodel: Add sclp checks Janosch Frank
2021-05-10 15:00 ` [kvm-unit-tests PATCH 1/4] s390x: sclp: Only fetch read info byte 134 if cpu entries are above it Janosch Frank
2021-05-11 11:39 ` David Hildenbrand
2021-05-11 16:32 ` Cornelia Huck
2021-05-10 15:00 ` Janosch Frank [this message]
2021-05-11 11:43 ` [kvm-unit-tests PATCH 2/4] lib: s390x: sclp: Extend feature probing David Hildenbrand
2021-05-11 14:41 ` Claudio Imbrenda
2021-05-11 15:38 ` David Hildenbrand
2021-05-11 15:46 ` Claudio Imbrenda
2021-05-11 16:36 ` Cornelia Huck
2021-05-10 15:00 ` [kvm-unit-tests PATCH 3/4] s390x: cpumodel: FMT4 SCLP test Janosch Frank
2021-05-11 11:45 ` David Hildenbrand
2021-05-11 14:42 ` Claudio Imbrenda
2021-05-10 15:00 ` [kvm-unit-tests PATCH 4/4] s390x: cpumodel: FMT2 SCLP implies test Janosch Frank
2021-05-11 11:46 ` David Hildenbrand
2021-05-11 14:36 ` Claudio Imbrenda
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=20210510150015.11119-3-frankja@linux.ibm.com \
--to=frankja@linux.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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).