Commit a87b0fd4 authored by Thomas Richter's avatar Thomas Richter Committed by Heiko Carstens
Browse files

s390/cpumf: Support for CPU Measurement Facility CSVN 7 



Adds support for the CPU Measurement Counter Facility second version
number 7.

Signed-off-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Acked-by: default avatarSumanth Korikkar <sumanthk@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent f0d43b3a

arch/s390/kernel/perf_cpum_cf_common.c

+2 −2
Original line number Diff line number Diff line
@@ -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:

arch/s390/kernel/perf_cpum_cf_events.c

+3 −3
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static struct attribute *cpumcf_svn_12345_pmu_event_attr[] __initdata = { 
	NULL,

};



static struct attribute *cpumcf_svn_6_pmu_event_attr[] __initdata = {

static struct attribute *cpumcf_svn_67_pmu_event_attr[] __initdata = {

	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_FUNCTIONS),

	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_CYCLES),

	CPUMF_EVENT_PTR(cf_svn_12345, PRNG_BLOCKED_FUNCTIONS),
@@ -715,8 +715,8 @@ __init const struct attribute_group **cpumf_cf_event_group(void) 
	case 1 ... 5:

		csvn = cpumcf_svn_12345_pmu_event_attr;

		break;

	case 6:

		csvn = cpumcf_svn_6_pmu_event_attr;

	case 6 ... 7:

		csvn = cpumcf_svn_67_pmu_event_attr;

		break;

	default:

		csvn = none;