diff options
| author | Linus Torvalds <[email protected]> | 2022-01-21 08:57:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-01-21 08:57:15 +0200 |
| commit | 85e67d56ebdecd8601d62e3aadcd2927845c97b9 (patch) | |
| tree | ceecadd340a992edff5450fecb32ec0666ce538c /arch/s390/kernel/perf_cpum_cf_common.c | |
| parent | 31d949782e1daf4b329337dd36b2d6d60764fe29 (diff) | |
| parent | 5754f9084f261f6fbfdcc6e57dae97c86a6ff688 (diff) | |
Merge tag 's390-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Heiko Carstens:
- add Sven Schnelle as reviewer for s390 code
- make uaccess code more readable
- change cpu measurement facility code to also support counter second
version number 7, and add discard support for limited samples
* tag 's390-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: add Sven Schnelle as reviewer
s390/uaccess: introduce bit field for OAC specifier
s390/cpumf: Support for CPU Measurement Sampling Facility LS bit
s390/cpumf: Support for CPU Measurement Facility CSVN 7
Diffstat (limited to 'arch/s390/kernel/perf_cpum_cf_common.c')
| -rw-r--r-- | arch/s390/kernel/perf_cpum_cf_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/perf_cpum_cf_common.c b/arch/s390/kernel/perf_cpum_cf_common.c index 30f0242de4a5..8ee48672233f 100644 --- a/arch/s390/kernel/perf_cpum_cf_common.c +++ b/arch/s390/kernel/perf_cpum_cf_common.c @@ -178,7 +178,7 @@ size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset, case CPUMF_CTR_SET_CRYPTO: if (info->csvn >= 1 && info->csvn <= 5) ctrset_size = 16; - else if (info->csvn == 6) + else if (info->csvn == 6 || info->csvn == 7) ctrset_size = 20; break; case CPUMF_CTR_SET_EXT: @@ -188,7 +188,7 @@ size_t cpum_cf_ctrset_size(enum cpumf_ctr_set ctrset, ctrset_size = 48; else if (info->csvn >= 3 && info->csvn <= 5) ctrset_size = 128; - else if (info->csvn == 6) + else if (info->csvn == 6 || info->csvn == 7) ctrset_size = 160; break; case CPUMF_CTR_SET_MT_DIAG: |