perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-for-linus
# HEAD: 4d47d6407ac7b4b442a4e717488a3bb137398b6c perf/x86/intel/uncore: Support CoffeeLake 8th CBOX
Fix uncore PMU enumeration for CofeeLake CPUs.
Thanks,
Ingo
------------------>
Kan Liang (2):
perf/x86/intel/uncore: Add more IMC PCI IDs for KabyLake and CoffeeLake CPUs perf/x86/intel/uncore: Support CoffeeLake 8th CBOX
arch/x86/events/intel/uncore.h | 33 +++++++--- arch/x86/events/intel/uncore_snb.c | 121 ++++++++++++++++++++++++++++++++++++- 2 files changed, 144 insertions(+), 10 deletions(-)
arch/x86/events/intel/uncore.h +25 -8
@@ -129,8 +129,15 @@ struct intel_uncore_box {struct intel_uncore_extra_reg shared_regs[0 ]; }; -#define UNCORE_BOX_FLAG_INITIATED 0 -#define UNCORE_BOX_FLAG_CTL_OFFS8 1/* event config registers are 8-byte apart */ +/* CFL uncore 8th cbox MSRs */ +#define CFL_UNC_CBO_7_PERFEVTSEL0 0xf70 +#define CFL_UNC_CBO_7_PER_CTR0 0xf76 + +#define UNCORE_BOX_FLAG_INITIATED 0 +/* event config registers are 8-byte apart */ +#define UNCORE_BOX_FLAG_CTL_OFFS8 1 +/* CFL 8th CBOX has different MSR space */ +#define UNCORE_BOX_FLAG_CFL8_CBOX_MSR_OFFS 2struct uncore_event_desc {struct kobj_attribute attr;
@@ -297,17 +304,27 @@ unsigned int uncore_freerunning_counter(struct intel_uncore_box *box,static inline unsigned uncore_msr_event_ctl (struct intel_uncore_box *box,int idx) { -return box->pmu->type->event_ctl + - (box->pmu->type->pair_ctr_ctl ?2 * idx : idx) + -uncore_msr_box_offset (box); +if (test_bit (UNCORE_BOX_FLAG_CFL8_CBOX_MSR_OFFS , &box->flags)) { +return CFL_UNC_CBO_7_PERFEVTSEL0 + + (box->pmu->type->pair_ctr_ctl ?2 * idx : idx); + }else { +return box->pmu->type->event_ctl + + (box->pmu->type->pair_ctr_ctl ?2 * idx : idx) + +uncore_msr_box_offset (box); + } }static inline unsigned uncore_msr_perf_ctr (struct intel_uncore_box *box,int idx) { -return box->pmu->type->perf_ctr + - (box->pmu->type->pair_ctr_ctl ?2 * idx : idx) + -uncore_msr_box_offset (box); +if (test_bit (UNCORE_BOX_FLAG_CFL8_CBOX_MSR_OFFS , &box->flags)) { +return CFL_UNC_CBO_7_PER_CTR0 + + (box->pmu->type->pair_ctr_ctl ?2 * idx : idx); + }else { +return box->pmu->type->perf_ctr + + (box->pmu->type->pair_ctr_ctl ?2 * idx : idx) + +uncore_msr_box_offset (box); + } } static inline
arch/x86/events/intel/uncore_snb.c +119 -2
151 lines not on this page · raw message
The pull request you sent on Sat, 17 Nov 2018 11:55:18 +0100:
The pull request you sent on Sat, 17 Nov 2018 11:55:18 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitperf-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/b53e27f618b58d50db72375eb8e1b6ddcef7cdb5
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker