On 12.02.19 02:16, Collin Walling wrote:
> The extended PTFF features (qsie, qtoue, stoe, stoue) are dependent
> on the multiple-epoch facility (mepoch). Let's print a warning if these
> features are enabled without mepoch.
>
> While we're at it, let's move the FEAT_GROUP_INIT for mepochptff down
> the s390_feature_groups list so it can be properly indexed with its
> generated S390FeatGroup enum.
>
> Signed-off-by: Collin Walling <wall...@linux.ibm.com>
> ---
> target/s390x/cpu_features.c | 2 +-
> target/s390x/cpu_models.c | 4 ++++
> 2 files changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
> index 60cfeba48f..1843c84aaa 100644
> --- a/target/s390x/cpu_features.c
> +++ b/target/s390x/cpu_features.c
> @@ -456,7 +456,6 @@ static 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("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements
> introduced with Multiple-epoch facility"),
> 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"),
> @@ -466,6 +465,7 @@ static S390FeatGroupDef s390_feature_groups[] = {
> FEAT_GROUP_INIT("msa6", MSA_EXT_6, "Message-security-assist-extension 6
> facility"),
> FEAT_GROUP_INIT("msa7", MSA_EXT_7, "Message-security-assist-extension 7
> facility"),
> FEAT_GROUP_INIT("msa8", MSA_EXT_8, "Message-security-assist-extension 8
> facility"),
> + FEAT_GROUP_INIT("mepochptff", MULTIPLE_EPOCH_PTFF, "PTFF enhancements
> introduced with Multiple-epoch facility"),
> };
>
> const S390FeatGroupDef *s390_feat_group_def(S390FeatGroup group)
> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
> index 7c253ff308..b42b5fd327 100644
> --- a/target/s390x/cpu_models.c
> +++ b/target/s390x/cpu_models.c
> @@ -788,6 +788,10 @@ static void check_consistency(const S390CPUModel *model)
> { S390_FEAT_SIE_KSS, S390_FEAT_SIE_F2 },
> { S390_FEAT_AP_QUERY_CONFIG_INFO, S390_FEAT_AP },
> { S390_FEAT_AP_FACILITIES_TEST, S390_FEAT_AP },
> + { S390_FEAT_PTFF_QSIE, S390_FEAT_MULTIPLE_EPOCH },
> + { S390_FEAT_PTFF_QTOUE, S390_FEAT_MULTIPLE_EPOCH },
> + { S390_FEAT_PTFF_STOE, S390_FEAT_MULTIPLE_EPOCH },
> + { S390_FEAT_PTFF_STOUE, S390_FEAT_MULTIPLE_EPOCH },
> };
> int i;
>
>
Reviewed-by: David Hildenbrand <da...@redhat.com>
--
Thanks,
David / dhildenb
