The MSA 12 facility depends on MSA 6 for which only its
subfunctions are defined as features.  Hence, require all
MSA 6 subfunctions as pre-requisite for MSA 12.

Signed-off-by: Hendrik Brueckner <brueckner@linux.ibm.com>
---
 target/s390x/cpu_models.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index beb50b5300..a95e54fa8c 100644
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -553,6 +553,18 @@ static void check_consistency(const S390CPUModel *model)
         { S390_FEAT_PLO_QSTG, S390_FEAT_PLO_EXT },
         { S390_FEAT_PLO_QSTX, S390_FEAT_PLO_EXT },
         { S390_FEAT_PLO_QSTO, S390_FEAT_PLO_EXT },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KIMD_SHA3_224 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KIMD_SHA3_256 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KIMD_SHA3_384 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KIMD_SHA3_512 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KIMD_SHAKE_128 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KIMD_SHAKE_256 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KLMD_SHA3_224 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KLMD_SHA3_256 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KLMD_SHA3_384 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KLMD_SHA3_512 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KLMD_SHAKE_128 },
+        { S390_FEAT_MSA_EXT_12, S390_FEAT_KLMD_SHAKE_256 },
     };
     int i;
 
-- 
2.43.5