[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [Patch v2 07/29] s390x/cpumodel: introduce CPU feature grou
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [Patch v2 07/29] s390x/cpumodel: introduce CPU feature group definitions |
Date: |
Mon, 8 Aug 2016 17:32:36 +0200 |
Let's use the generated groups to create feature group representations for
the user. These groups can later be used to enable/disable multiple
features in one shot and will be used to reduce the amount of reported
features to the user if all subfeatures are in place.
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
target-s390x/cpu_features.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
target-s390x/cpu_features.h | 23 +++++++++++++++++++++++
2 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/target-s390x/cpu_features.c b/target-s390x/cpu_features.c
index 65e2b64..1f51143 100644
--- a/target-s390x/cpu_features.c
+++ b/target-s390x/cpu_features.c
@@ -12,6 +12,7 @@
#include "qemu/osdep.h"
#include "cpu_features.h"
+#include "gen-features.h"
#define FEAT_INIT(_name, _type, _bit, _desc) \
{ \
@@ -320,14 +321,55 @@ void s390_add_from_feat_block(S390FeatBitmap features,
S390FeatType type,
}
}
-void s390_feat_bitmap_to_ascii(const S390FeatBitmap bitmap, void *opaque,
+void s390_feat_bitmap_to_ascii(const S390FeatBitmap features, void *opaque,
void (*fn)(const char *name, void *opaque))
{
+ S390FeatBitmap bitmap, tmp;
+ S390FeatGroup group;
S390Feat feat;
+ bitmap_copy(bitmap, features, S390_FEAT_MAX);
+
+ /* process whole groups first */
+ for (group = 0; group < S390_FEAT_GROUP_MAX; group++) {
+ const S390FeatGroupDef *def = s390_feat_group_def(group);
+
+ bitmap_and(tmp, bitmap, def->feat, S390_FEAT_MAX);
+ if (bitmap_equal(tmp, def->feat, S390_FEAT_MAX)) {
+ bitmap_andnot(bitmap, bitmap, def->feat, S390_FEAT_MAX);
+ fn(def->name, opaque);
+ }
+ }
+
+ /* report leftovers as separate features */
feat = find_first_bit(bitmap, S390_FEAT_MAX);
while (feat < S390_FEAT_MAX) {
fn(s390_feat_def(feat)->name, opaque);
feat = find_next_bit(bitmap, S390_FEAT_MAX, feat + 1);
};
}
+
+#define FEAT_GROUP_INIT(_name, _group, _desc) \
+ { \
+ .name = _name, \
+ .desc = _desc, \
+ .feat = { S390_FEAT_GROUP_LIST_ ## _group }, \
+ }
+
+/* indexed by feature group number for easy lookup */
+static const S390FeatGroupDef s390_feature_groups[] = {
+ FEAT_GROUP_INIT("plo", PLO, "Perform-locked-operation facility"),
+ FEAT_GROUP_INIT("tods", TOD_CLOCK_STEERING, "Tod-clock-steering facility"),
+ FEAT_GROUP_INIT("gen13ptff", GEN13_PTFF, "PTFF enhancements introduced
with z13"),
+ FEAT_GROUP_INIT("msa", MSA, "Message-security-assist facility"),
+ FEAT_GROUP_INIT("msa1", MSA_EXT_1, "Message-security-assist-extension 1
facility"),
+ FEAT_GROUP_INIT("msa2", MSA_EXT_2, "Message-security-assist-extension 2
facility"),
+ FEAT_GROUP_INIT("msa3", MSA_EXT_3, "Message-security-assist-extension 3
facility"),
+ FEAT_GROUP_INIT("msa4", MSA_EXT_4, "Message-security-assist-extension 4
facility"),
+ FEAT_GROUP_INIT("msa5", MSA_EXT_5, "Message-security-assist-extension 5
facility"),
+};
+
+const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
+{
+ return &s390_feature_groups[group];
+}
diff --git a/target-s390x/cpu_features.h b/target-s390x/cpu_features.h
index 69dc60d..6128903 100644
--- a/target-s390x/cpu_features.h
+++ b/target-s390x/cpu_features.h
@@ -272,6 +272,29 @@ void s390_add_from_feat_block(S390FeatBitmap features,
S390FeatType type,
void s390_feat_bitmap_to_ascii(const S390FeatBitmap features, void *opaque,
void (*fn)(const char *name, void *opaque));
+/* static groups that will never change */
+typedef enum {
+ S390_FEAT_GROUP_PLO,
+ S390_FEAT_GROUP_TOD_CLOCK_STEERING,
+ S390_FEAT_GROUP_GEN13_PTFF_ENH,
+ S390_FEAT_GROUP_MSA,
+ S390_FEAT_GROUP_MSA_EXT_1,
+ S390_FEAT_GROUP_MSA_EXT_2,
+ S390_FEAT_GROUP_MSA_EXT_3,
+ S390_FEAT_GROUP_MSA_EXT_4,
+ S390_FEAT_GROUP_MSA_EXT_5,
+ S390_FEAT_GROUP_MAX,
+} S390FeatGroup;
+
+/* Definition of a CPU feature group */
+typedef struct {
+ const char *name; /* name exposed to the user */
+ const char *desc; /* description exposed to the user */
+ S390FeatBitmap feat; /* features contained in the group */
+} S390FeatGroupDef;
+
+const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group);
+
#define BE_BIT_NR(BIT) (BIT ^ (BITS_PER_LONG - 1))
#define BE_BIT(BIT) (1ULL < BE_BIT_NR(BIT))
--
2.6.6
- [Qemu-devel] [Patch v2 00/29] s390x CPU models: exposing features, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 03/29] s390x/cpumodel: expose CPU class properties, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 11/29] s390x/cpumodel: let the CPU model handle feature checks, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 01/29] qmp: details about CPU definitions in query-cpu-definitions, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 06/29] s390x/cpumodel: generate CPU feature group lists, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 10/29] s390x/cpumodel: expose features and feature groups as properties, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 17/29] s390x/sclp: propagate the mha via sclp, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 15/29] s390x/sclp: indicate sclp features, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 07/29] s390x/cpumodel: introduce CPU feature group definitions,
David Hildenbrand <=
- [Qemu-devel] [Patch v2 12/29] s390x/cpumodel: check and apply the CPU model, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 05/29] s390x/cpumodel: generate CPU feature lists for CPU models, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 18/29] s390x/sclp: propagate hmfai, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 02/29] s390x/cpumodel: "host" and "qemu" as CPU subclasses, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 04/29] s390x/cpumodel: introduce CPU features, David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 26/29] qmp: add QMP interface "query-cpu-model-baseline", David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 24/29] qmp: add QMP interface "query-cpu-model-expansion", David Hildenbrand, 2016/08/08
- [Qemu-devel] [Patch v2 29/29] s390x/cpumodel: implement QMP interface "query-cpu-model-baseline", David Hildenbrand, 2016/08/08