lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] 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 <bp@suse.de>
    Cc: Andi Kleen <andi.kleen@intel.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Harish Chegondi <harish.chegondi@intel.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Kan Liang <kan.liang@intel.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Vince Weaver <vincent.weaver@maine.edu>
    ---
    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 019e541fa988..b834a3f55a01 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;

    --
    2.3.5
    --
    Regards/Gruss,
    Boris.

    ECO tip #101: Trim your mails when you reply.

    \
     
     \ /
      Last update: 2016-03-08 18:21    [W:3.475 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site