FAILED: patch "[PATCH] s390/cpum_cf: rename IBM z13/z14 counter names" failed to apply to 4.14-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
5f3ba878e7a2ffef82fb0882c0dd2c3507d734bcMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Wild?= <[email protected]>
Date: Wed, 18 Apr 2018 17:59:58 +0200
Subject: [PATCH] s390/cpum_cf: rename IBM z13/z14 counter names
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change the IBM z13/z14 counter names to be in sync with all other models.
Cc [email protected] # v4.12+
Fixes 3593eb944c ("s390/cpum_cf: add hardware counter support for IBM z14")
Fixes 3fc7acebae ("s390/cpum_cf: add IBM z13 counter event names")
Signed-off-by André Wild <[email protected]>
Signed-off-by Hendrik Brueckner <[email protected]>
Signed-off-by Martin Schwidefsky <[email protected]>
arch/s390/kernel/perf_cpum_cf_events.c +4 -4
@@ -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 ),