s390/cpum_cf_diag: Add support for CPU-MF SVN 6

Add support for the CPU-Measurement Facility counter
second version number 6. This number is used to detect some
more counters in the crypto counter set and the extended
counter set.

Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/perf_cpum_cf_diag.c b/arch/s390/kernel/perf_cpum_cf_diag.c
index b6854812d2ed56f11cbd03865c16b26290518611..d4e031f7b9c818bb106616ed47736b6dc80e68df 100644 (file)
--- a/arch/s390/kernel/perf_cpum_cf_diag.c
+++ b/arch/s390/kernel/perf_cpum_cf_diag.c
@@ -306,15 +306,20 @@ static size_t cf_diag_ctrset_size(enum cpumf_ctr_set ctrset,
                        ctrset_size = 2;
                break;
        case CPUMF_CTR_SET_CRYPTO:
-               ctrset_size = 16;
+               if (info->csvn >= 1 && info->csvn <= 5)
+                       ctrset_size = 16;
+               else if (info->csvn == 6)
+                       ctrset_size = 20;
                break;
        case CPUMF_CTR_SET_EXT:
                if (info->csvn == 1)
                        ctrset_size = 32;
                else if (info->csvn == 2)
                        ctrset_size = 48;
-               else if (info->csvn >= 3)
+               else if (info->csvn >= 3 && info->csvn <= 5)
                        ctrset_size = 128;
+               else if (info->csvn == 6)
+                       ctrset_size = 160;
                break;
        case CPUMF_CTR_SET_MT_DIAG:
                if (info->csvn > 3)