Patch "powerpc/perf: Handle sdar_mode for marked event in power9" has been added to the 4.10-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
powerpc/perf: Handle sdar_mode for marked event in power9
to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
powerpc-perf-handle-sdar_mode-for-marked-event-in-power9.patch
and it can be found in the queue-4.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
78b4416aa249365dd3c1b64da4d3a232014320b0Mon Sep 17 00:00:00 2001
From: Madhavan Srinivasan <[email protected]>
Date: Mon, 20 Feb 2017 19:29:03 +0530
Subject: powerpc/perf: Handle sdar_mode for marked event in power9
From: Madhavan Srinivasan <[email protected]>
commit 78b4416aa249365dd3c1b64da4d3a232014320b0 upstream.
MMCRA[SDAR_MODE] specifices how the SDAR should be updated in continous sampling mode. On P9 it must be set to 0b00 when MMCRA[63] is set.
--- arch/powerpc/perf/isa207-common.c | 43 +++++++++++++++++++++++++++++++------- arch/powerpc/perf/isa207-common.h | 1 2 files changed, 37 insertions(+), 7 deletions(-)
arch/powerpc/perf/isa207-common.c +36 -7
@@ -65,12 +65,41 @@ static bool is_event_valid(u64 event)return !(event & ~valid_mask); } -static u64 mmcra_sdar_mode (u64 event) +static inline bool is_event_marked (u64 event) { -if (cpu_has_feature (CPU_FTR_ARCH_300 ) && !cpu_has_feature (CPU_FTR_POWER9_DD1 )) -return p9_SDAR_MODE (event) <<MMCRA_SDAR_MODE_SHIFT ; +if (event &EVENT_IS_MARKED ) +return true; + +return false; +} -return MMCRA_SDAR_MODE_TLB ; +static void mmcra_sdar_mode (u64 event,unsigned long *mmcra) +{ +/* +* MMCRA[SDAR_MODE] specifices how the SDAR should be updated in +* continous sampling mode. +* +* Incase of Power8: +* MMCRA[SDAR_MODE] will be programmed as "0b01" for continous sampling +* mode and will be un-changed when setting MMCRA[63] (Marked events). +* +* Incase of Power9: +* Marked event: MMCRA[SDAR_MODE] will be set to 0b00 ('No Updates'), +* or if group already have any marked events. +* Non-Marked events (for DD1): +* MMCRA[SDAR_MODE] will be set to 0b01 +* For rest +* MMCRA[SDAR_MODE] will be set from event code. +*/ +if (cpu_has_feature (CPU_FTR_ARCH_300 )) { +if (is_event_marked (event) || (*mmcra &MMCRA_SAMPLE_ENABLE )) + *mmcra &=MMCRA_SDAR_MODE_NO_UPDATES ; +else if (!cpu_has_feature (CPU_FTR_POWER9_DD1 )) + *mmcra |=p9_SDAR_MODE (event) <<MMCRA_SDAR_MODE_SHIFT ; +else if (cpu_has_feature (CPU_FTR_POWER9_DD1 )) + *mmcra |=MMCRA_SDAR_MODE_TLB ; + }else + *mmcra |=MMCRA_SDAR_MODE_TLB ; }static u64 thresh_cmp_val (u64 value)
@@ -158,7 +187,7 @@ int isa207_get_constraint(u64 event, uns value |=CNST_L1_QUAL_VAL (cache); } -if (event &EVENT_IS_MARKED ) { +if (is_event_marked (event)) { mask |=CNST_SAMPLE_MASK ; value |=CNST_SAMPLE_VAL (event >>EVENT_SAMPLE_SHIFT ); }
@@ -256,7 +285,7 @@ int isa207_compute_mmcr(u64 event[], int }/* In continuous sampling mode, update SDAR on TLB miss */ - mmcra |=mmcra_sdar_mode (event[i]); +mmcra_sdar_mode (event[i], &mmcra);if (event[i] &EVENT_IS_L1 ) { cache = event[i] >>EVENT_CACHE_SEL_SHIFT ;
@@ -265,7 +294,7 @@ int isa207_compute_mmcr(u64 event[], int mmcr1 |= (cache &1 ) <<MMCR1_DC_QUAL_SHIFT ; } -if (event[i] &EVENT_IS_MARKED ) { +if (is_event_marked (event[i])) { mmcra |=MMCRA_SAMPLE_ENABLE ; val = (event[i] >>EVENT_SAMPLE_SHIFT ) &EVENT_SAMPLE_MASK ;
arch/powerpc/perf/isa207-common.h +1 -0
@@ -242,6 +242,7 @@#define MMCRA_THR_CMP_SHIFT 32#define MMCRA_SDAR_MODE_SHIFT 42#define MMCRA_SDAR_MODE_TLB (1ull << MMCRA_SDAR_MODE_SHIFT) +#define MMCRA_SDAR_MODE_NO_UPDATES ~(0x3ull << MMCRA_SDAR_MODE_SHIFT)#define MMCRA_IFM_SHIFT 30/* MMCR1 Threshold Compare bit constant for power9 */
Patches currently in stable-queue which might be from [email protected] are
queue-4.10/powerpc-perf-handle-sdar_mode-for-marked-event-in-power9.patch queue-4.10/powerpc-perf-avoid-fab_-_match-checks-for-power9.patch queue-4.10/powerpc-perf-fix-perf_get_data_addr-for-power9-dd1.patch