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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Thomas-Mich Richter and committed by

Martin Schwidefsky 7 years ago 1c410fd6 1a42010c

+7 -2

1 changed file

expand all

arch

s390

kernel

perf_cpum_cf_diag.c

+7 -2

arch/s390/kernel/perf_cpum_cf_diag.c

··· 306 306 ctrset_size = 2; 307 307 break; 308 308 case CPUMF_CTR_SET_CRYPTO: 309 - ctrset_size = 16; 309 + if (info->csvn >= 1 && info->csvn <= 5) 310 + ctrset_size = 16; 311 + else if (info->csvn == 6) 312 + ctrset_size = 20; 310 313 break; 311 314 case CPUMF_CTR_SET_EXT: 312 315 if (info->csvn == 1) 313 316 ctrset_size = 32; 314 317 else if (info->csvn == 2) 315 318 ctrset_size = 48; 316 - else if (info->csvn >= 3) 319 + else if (info->csvn >= 3 && info->csvn <= 5) 317 320 ctrset_size = 128; 321 + else if (info->csvn == 6) 322 + ctrset_size = 160; 318 323 break; 319 324 case CPUMF_CTR_SET_MT_DIAG: 320 325 if (info->csvn > 3)