Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f3ba878 authored by André Wild's avatar André Wild Committed by Martin Schwidefsky
Browse files

s390/cpum_cf: rename IBM z13/z14 counter names 



Change the IBM z13/z14 counter names to be in sync with all other models.

Cc: stable@vger.kernel.org # v4.12+
Fixes: 3593eb94 ("s390/cpum_cf: add hardware counter support for IBM z14")
Fixes: 3fc7aceb ("s390/cpum_cf: add IBM z13 counter event names")
Signed-off-by: default avatarAndré Wild <wild@linux.ibm.com>
Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 5d27a2bf

arch/s390/kernel/perf_cpum_cf_events.c

+4 −4
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ CPUMF_EVENT_ATTR(cf_zec12, L1I_OFFBOOK_L3_SOURCED_WRITES_IV, 0x00a1); 
CPUMF_EVENT_ATTR(cf_zec12, TX_NC_TABORT, 0x00b1);

CPUMF_EVENT_ATTR(cf_zec12, TX_C_TABORT_NO_SPECIAL, 0x00b2);

CPUMF_EVENT_ATTR(cf_zec12, TX_C_TABORT_SPECIAL, 0x00b3);

CPUMF_EVENT_ATTR(cf_z13, L1D_WRITES_RO_EXCL, 0x0080);

CPUMF_EVENT_ATTR(cf_z13, L1D_RO_EXCL_WRITES, 0x0080);

CPUMF_EVENT_ATTR(cf_z13, DTLB1_WRITES, 0x0081);

CPUMF_EVENT_ATTR(cf_z13, DTLB1_MISSES, 0x0082);

CPUMF_EVENT_ATTR(cf_z13, DTLB1_HPAGE_WRITES, 0x0083);
@@ -179,7 +179,7 @@ CPUMF_EVENT_ATTR(cf_z13, TX_C_TABORT_NO_SPECIAL, 0x00db); 
CPUMF_EVENT_ATTR(cf_z13, TX_C_TABORT_SPECIAL, 0x00dc);

CPUMF_EVENT_ATTR(cf_z13, MT_DIAG_CYCLES_ONE_THR_ACTIVE, 0x01c0);

CPUMF_EVENT_ATTR(cf_z13, MT_DIAG_CYCLES_TWO_THR_ACTIVE, 0x01c1);

CPUMF_EVENT_ATTR(cf_z14, L1D_WRITES_RO_EXCL, 0x0080);

CPUMF_EVENT_ATTR(cf_z14, L1D_RO_EXCL_WRITES, 0x0080);

CPUMF_EVENT_ATTR(cf_z14, DTLB2_WRITES, 0x0081);

CPUMF_EVENT_ATTR(cf_z14, DTLB2_MISSES, 0x0082);

CPUMF_EVENT_ATTR(cf_z14, DTLB2_HPAGE_WRITES, 0x0083);
@@ -371,7 +371,7 @@ static struct attribute *cpumcf_zec12_pmu_event_attr[] __initdata = { 
};



static struct attribute *cpumcf_z13_pmu_event_attr[] __initdata = {

	CPUMF_EVENT_PTR(cf_z13, L1D_WRITES_RO_EXCL),

	CPUMF_EVENT_PTR(cf_z13, L1D_RO_EXCL_WRITES),

	CPUMF_EVENT_PTR(cf_z13, DTLB1_WRITES),

	CPUMF_EVENT_PTR(cf_z13, DTLB1_MISSES),

	CPUMF_EVENT_PTR(cf_z13, DTLB1_HPAGE_WRITES),
@@ -431,7 +431,7 @@ static struct attribute *cpumcf_z13_pmu_event_attr[] __initdata = { 
};



static struct attribute *cpumcf_z14_pmu_event_attr[] __initdata = {

	CPUMF_EVENT_PTR(cf_z14, L1D_WRITES_RO_EXCL),

	CPUMF_EVENT_PTR(cf_z14, L1D_RO_EXCL_WRITES),

	CPUMF_EVENT_PTR(cf_z14, DTLB2_WRITES),

	CPUMF_EVENT_PTR(cf_z14, DTLB2_MISSES),

	CPUMF_EVENT_PTR(cf_z14, DTLB2_HPAGE_WRITES),