Commit-ID: 7a8698058ae493ae53b1a8a2fa23d2e37000d73e Gitweb: http://git.kernel.org/tip/7a8698058ae493ae53b1a8a2fa23d2e37000d73e Author: Borislav Petkov <b...@alien8.de> AuthorDate: Tue, 8 Mar 2016 17:40:41 +0100 Committer: Ingo Molnar <mi...@kernel.org> CommitDate: Tue, 8 Mar 2016 17:49:52 +0100
perf/x86/intel/rapl: Simplify quirk handling even more Drop the quirk() function pointer in favor of a simple boolean which says whether the quirk should be applied or not. Update comment while at it. Signed-off-by: Borislav Petkov <b...@suse.de> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Andi Kleen <andi.kl...@intel.com> Cc: Arnaldo Carvalho de Melo <a...@redhat.com> Cc: Harish Chegondi <harish.chego...@intel.com> Cc: Jacob Pan <jacob.jun....@linux.intel.com> Cc: Jiri Olsa <jo...@redhat.com> Cc: Kan Liang <kan.li...@intel.com> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Stephane Eranian <eran...@google.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Vince Weaver <vincent.wea...@maine.edu> Cc: linux-tip-comm...@vger.kernel.org Link: http://lkml.kernel.org/r/20160308164041.gf16...@pd.tnic Signed-off-by: Ingo Molnar <mi...@kernel.org> --- arch/x86/events/intel/rapl.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 019e541..b834a3f 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -592,18 +592,7 @@ static int rapl_cpu_notifier(struct notifier_block *self, return NOTIFY_OK; } -static __init void rapl_hsw_server_quirk(void) -{ - /* - * DRAM domain on HSW server has fixed energy unit which can be - * different than the unit from power unit MSR. - * "Intel Xeon Processor E5-1600 and E5-2600 v3 Product Families, V2 - * of 2. Datasheet, September 2014, Reference Number: 330784-001 " - */ - rapl_hw_unit[RAPL_IDX_RAM_NRG_STAT] = 16; -} - -static int rapl_check_hw_unit(void (*quirk)(void)) +static int rapl_check_hw_unit(bool apply_quirk) { u64 msr_rapl_power_unit_bits; int i; @@ -614,9 +603,14 @@ static int rapl_check_hw_unit(void (*quirk)(void)) for (i = 0; i < NR_RAPL_DOMAINS; i++) rapl_hw_unit[i] = (msr_rapl_power_unit_bits >> 8) & 0x1FULL; - /* Apply cpu model quirk */ - if (quirk) - quirk(); + /* + * DRAM domain on HSW server and KNL has fixed energy unit which can be + * different than the unit from power unit MSR. See + * "Intel Xeon Processor E5-1600 and E5-2600 v3 Product Families, V2 + * of 2. Datasheet, September 2014, Reference Number: 330784-001 " + */ + if (apply_quirk) + rapl_hw_unit[RAPL_IDX_RAM_NRG_STAT] = 16; /* * Calculate the timer rate: @@ -704,7 +698,7 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { static int __init rapl_pmu_init(void) { - void (*quirk)(void) = NULL; + bool apply_quirk = false; int ret; if (!x86_match_cpu(rapl_cpu_match)) @@ -717,7 +711,7 @@ static int __init rapl_pmu_init(void) rapl_pmu_events_group.attrs = rapl_events_cln_attr; break; case 63: /* Haswell-Server */ - quirk = rapl_hsw_server_quirk; + apply_quirk = true; rapl_cntr_mask = RAPL_IDX_SRV; rapl_pmu_events_group.attrs = rapl_events_srv_attr; break; @@ -733,7 +727,7 @@ static int __init rapl_pmu_init(void) rapl_pmu_events_group.attrs = rapl_events_srv_attr; break; case 87: /* Knights Landing */ - quirk = rapl_hsw_server_quirk; + apply_quirk = true; rapl_cntr_mask = RAPL_IDX_KNL; rapl_pmu_events_group.attrs = rapl_events_knl_attr; break; @@ -741,7 +735,7 @@ static int __init rapl_pmu_init(void) return -ENODEV; } - ret = rapl_check_hw_unit(quirk); + ret = rapl_check_hw_unit(apply_quirk); if (ret) return ret;
