[kvm-unit-tests,PULL,1/2] kvm-unit-tests: s390: add cpu model checks

Commit Message

Thomas Huth Aug. 2, 2019, 7:23 a.m. UTC

From: Christian Borntraeger <[e-mail]>

This adds a check for documented stfle dependencies.

Signed-off-by: Christian Borntraeger <[e-mail]>
Reviewed-by: Thomas Huth <[e-mail]>
Reviewed-by: Janosch Frank <[e-mail]>
[thuth: Added missing report_prefix_pop() at the end]
Signed-off-by: Thomas Huth <[e-mail]>
---
 s390x/Makefile      |  1 +
 s390x/cpumodel.c    | 60 +++++++++++++++++++++++++++++++++++++++++++++
 s390x/unittests.cfg |  3 +++
 3 files changed, 64 insertions(+)
 create mode 100644 s390x/cpumodel.c

Patch

diff --git a/s390x/Makefile b/s390x/Makefile
index 1f21ddb..574a9a2 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -11,6 +11,7 @@  tests += $(TEST_DIR)/cmm.elf
 tests += $(TEST_DIR)/vector.elf
 tests += $(TEST_DIR)/gs.elf
 tests += $(TEST_DIR)/iep.elf
+tests += $(TEST_DIR)/cpumodel.elf
 tests_binary = $(patsubst %.elf,%.bin,$(tests))
 
 all: directories test_cases test_cases_binary
diff --git a/s390x/cpumodel.c b/s390x/cpumodel.c
new file mode 100644
index 0000000..3811ee1
--- /dev/null
+++ b/s390x/cpumodel.c
@@ -0,0 +1,60 @@ 
+/*
+ * Test the known dependencies for facilities
+ *
+ * Copyright 2019 IBM Corp.
+ *
+ * Authors:
+ *    Christian Borntraeger <[e-mail]>
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Library General Public License version 2.
+ */
+
+#include <asm/facility.h>
+
+static int dep[][2] = {
+	/* from SA22-7832-11 4-98 facility indications */
+	{   4,   3 },
+	{   5,   3 },
+	{   5,   4 },
+	{  19,  18 },
+	{  37,  42 },
+	{  43,  42 },
+	{  73,  49 },
+	{ 134, 129 },
+	{ 135, 129 },
+	{ 139,  25 },
+	{ 139,  28 },
+	{ 146,  76 },
+	/* indirectly documented in description */
+	{  78,   8 },  /* EDAT */
+	/* new dependencies from gen15 */
+	{  61,  45 },
+	{ 148, 129 },
+	{ 148, 135 },
+	{ 152, 129 },
+	{ 152, 134 },
+	{ 155,  76 },
+	{ 155,  77 },
+};
+
+int main(void)
+{
+	int i;
+
+	report_prefix_push("cpumodel");
+
+	report_prefix_push("dependency");
+	for (i = 0; i < ARRAY_SIZE(dep); i++) {
+		if (test_facility(dep[i][0])) {
+			report("%d implies %d", test_facility(dep[i][1]),
+				dep[i][0], dep[i][1]);
+		} else {
+			report_skip("facility %d not present", dep[i][0]);
+		}
+	}
+	report_prefix_pop();
+
+	report_prefix_pop();
+	return report_summary();
+}
diff --git a/s390x/unittests.cfg b/s390x/unittests.cfg
index 546b1f2..db58bad 100644
--- a/s390x/unittests.cfg
+++ b/s390x/unittests.cfg
@@ -61,3 +61,6 @@  file = gs.elf
 
 [iep]
 file = iep.elf
+
+[cpumodel]
+file = cpumodel.elf