diff options
Diffstat (limited to 'arch/x86/kernel/cpu/perf_event_intel.c')
-rw-r--r-- | arch/x86/kernel/cpu/perf_event_intel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c index 960e85de13fb..3998131d1a68 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/kernel/cpu/perf_event_intel.c | |||
@@ -1134,7 +1134,7 @@ static __initconst const u64 slm_hw_cache_extra_regs | |||
1134 | [ C(LL ) ] = { | 1134 | [ C(LL ) ] = { |
1135 | [ C(OP_READ) ] = { | 1135 | [ C(OP_READ) ] = { |
1136 | [ C(RESULT_ACCESS) ] = SLM_DMND_READ|SLM_LLC_ACCESS, | 1136 | [ C(RESULT_ACCESS) ] = SLM_DMND_READ|SLM_LLC_ACCESS, |
1137 | [ C(RESULT_MISS) ] = SLM_DMND_READ|SLM_LLC_MISS, | 1137 | [ C(RESULT_MISS) ] = 0, |
1138 | }, | 1138 | }, |
1139 | [ C(OP_WRITE) ] = { | 1139 | [ C(OP_WRITE) ] = { |
1140 | [ C(RESULT_ACCESS) ] = SLM_DMND_WRITE|SLM_LLC_ACCESS, | 1140 | [ C(RESULT_ACCESS) ] = SLM_DMND_WRITE|SLM_LLC_ACCESS, |
@@ -1184,8 +1184,7 @@ static __initconst const u64 slm_hw_cache_event_ids | |||
1184 | [ C(OP_READ) ] = { | 1184 | [ C(OP_READ) ] = { |
1185 | /* OFFCORE_RESPONSE.ANY_DATA.LOCAL_CACHE */ | 1185 | /* OFFCORE_RESPONSE.ANY_DATA.LOCAL_CACHE */ |
1186 | [ C(RESULT_ACCESS) ] = 0x01b7, | 1186 | [ C(RESULT_ACCESS) ] = 0x01b7, |
1187 | /* OFFCORE_RESPONSE.ANY_DATA.ANY_LLC_MISS */ | 1187 | [ C(RESULT_MISS) ] = 0, |
1188 | [ C(RESULT_MISS) ] = 0x01b7, | ||
1189 | }, | 1188 | }, |
1190 | [ C(OP_WRITE) ] = { | 1189 | [ C(OP_WRITE) ] = { |
1191 | /* OFFCORE_RESPONSE.ANY_RFO.LOCAL_CACHE */ | 1190 | /* OFFCORE_RESPONSE.ANY_RFO.LOCAL_CACHE */ |
@@ -1217,7 +1216,7 @@ static __initconst const u64 slm_hw_cache_event_ids | |||
1217 | [ C(ITLB) ] = { | 1216 | [ C(ITLB) ] = { |
1218 | [ C(OP_READ) ] = { | 1217 | [ C(OP_READ) ] = { |
1219 | [ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P */ | 1218 | [ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P */ |
1220 | [ C(RESULT_MISS) ] = 0x0282, /* ITLB.MISSES */ | 1219 | [ C(RESULT_MISS) ] = 0x40205, /* PAGE_WALKS.I_SIDE_WALKS */ |
1221 | }, | 1220 | }, |
1222 | [ C(OP_WRITE) ] = { | 1221 | [ C(OP_WRITE) ] = { |
1223 | [ C(RESULT_ACCESS) ] = -1, | 1222 | [ C(RESULT_ACCESS) ] = -1, |