diff options
| author |   Thomas-Mich Richter <tmricht@linux.ibm.com> | 2019-04-23 11:36:27 +0200 |
|---|---|---|
| committer |   Martin Schwidefsky <schwidefsky@de.ibm.com> | 2019-04-23 16:30:06 +0200 |
| commit | 1c410fd6a561af452aba282b1cd3cabef2080d72 (patch) | |
| tree | 7595092105b03e9534012645b200a95d00a9bc09 /arch/s390/kernel/perf_cpum_cf_diag.c | |
| parent | s390/mm: convert to the generic get_user_pages_fast code (diff) | |
| download | linux-dev-1c410fd6a561af452aba282b1cd3cabef2080d72.tar.xz linux-dev-1c410fd6a561af452aba282b1cd3cabef2080d72.zip | |
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>
Diffstat (limited to 'arch/s390/kernel/perf_cpum_cf_diag.c')
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf_diag.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/s390/kernel/perf_cpum_cf_diag.c b/arch/s390/kernel/perf_cpum_cf_diag.c index b6854812d2ed..d4e031f7b9c8 100644 --- 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) |