[kvm-unit-tests PATCH 1/3] s390x: Fix sclp facility bit numbers

Janis Schoetterl-Glausch
2022-05-05T12:47:10Z

sclp_feat_check takes care of adjusting the bit numbering such that they
can be defined as they are in the documentation.

Fixes: 4dd649c8 ("lib: s390x: sclp: Extend feature probing")
Signed-off-by: Janis Schoetterl-Glausch <scgl@linux.ibm.com>
---
lib/s390x/sclp.h | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h
index fead007a..4ce2209f 100644
--- a/lib/s390x/sclp.h
+++ b/lib/s390x/sclp.h
@@ -134,13 +134,15 @@ struct sclp_facilities {
};

/* bit number within a certain byte */
-#define SCLP_FEAT_85_BIT_GSLS 7
-#define SCLP_FEAT_98_BIT_KSS 0
-#define SCLP_FEAT_116_BIT_64BSCAO 7
-#define SCLP_FEAT_116_BIT_CMMA 6
-#define SCLP_FEAT_116_BIT_ESCA 3
-#define SCLP_FEAT_117_BIT_PFMFI 6
-#define SCLP_FEAT_117_BIT_IBS 5
+#define SCLP_FEAT_80_BIT_SOP 2
+#define SCLP_FEAT_85_BIT_GSLS 0
+#define SCLP_FEAT_85_BIT_ESOP 6
+#define SCLP_FEAT_98_BIT_KSS 7
+#define SCLP_FEAT_116_BIT_64BSCAO 0
+#define SCLP_FEAT_116_BIT_CMMA 1
+#define SCLP_FEAT_116_BIT_ESCA 4
+#define SCLP_FEAT_117_BIT_PFMFI 1
+#define SCLP_FEAT_117_BIT_IBS 2

typedef struct ReadInfo {
SCCBHeader h;
--
2.33.1