lkml.org 
[lkml]   [2017]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 07/10] powerpc/powernv: Core IMC events detection
    Date
    This patch adds support for detection of core IMC events along with the
    Nest IMC events. It adds a new domain IMC_DOMAIN_CORE and its determined
    with the help of the compatibility string "ibm,imc-counters-core" based
    on the IMC device tree.

    Cc: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Anton Blanchard <anton@samba.org>
    Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
    Cc: Michael Neuling <mikey@neuling.org>
    Cc: Stewart Smith <stewart@linux.vnet.ibm.com>
    Cc: Daniel Axtens <dja@axtens.net>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Balbir Singh <bsingharora@gmail.com>
    Cc: Anju T Sudhakar <anju@linux.vnet.ibm.com>
    Signed-off-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
    ---
    arch/powerpc/include/asm/imc-pmu.h | 2 ++
    arch/powerpc/perf/imc-pmu.c | 3 +++
    arch/powerpc/platforms/powernv/opal-imc.c | 18 ++++++++++++++++--
    3 files changed, 21 insertions(+), 2 deletions(-)

    diff --git a/arch/powerpc/include/asm/imc-pmu.h b/arch/powerpc/include/asm/imc-pmu.h
    index 7b58721..59de083 100644
    --- a/arch/powerpc/include/asm/imc-pmu.h
    +++ b/arch/powerpc/include/asm/imc-pmu.h
    @@ -30,6 +30,7 @@

    #define IMC_DTB_COMPAT "ibm,opal-in-memory-counters"
    #define IMC_DTB_NEST_COMPAT "ibm,imc-counters-nest"
    +#define IMC_DTB_CORE_COMPAT "ibm,imc-counters-core"

    /*
    * Structure to hold per chip specific memory address
    @@ -67,6 +68,7 @@ struct imc_pmu {
    * Domains for IMC PMUs
    */
    #define IMC_DOMAIN_NEST 1
    +#define IMC_DOMAIN_CORE 2

    #define UNKNOWN_DOMAIN -1

    diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c
    index e46ff6d..9a0e3bc 100644
    --- a/arch/powerpc/perf/imc-pmu.c
    +++ b/arch/powerpc/perf/imc-pmu.c
    @@ -18,8 +18,11 @@ struct perchip_nest_info nest_perchip_info[IMC_MAX_CHIPS];
    struct imc_pmu *per_nest_pmu_arr[IMC_MAX_PMUS];
    static cpumask_t nest_imc_cpumask;

    +struct imc_pmu *core_imc_pmu;
    +
    /* Needed for sanity check */
    extern u64 nest_max_offset;
    +extern u64 core_max_offset;

    PMU_FORMAT_ATTR(event, "config:0-20");
    static struct attribute *imc_format_attrs[] = {
    diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
    index a65aa2d..67ce873 100644
    --- a/arch/powerpc/platforms/powernv/opal-imc.c
    +++ b/arch/powerpc/platforms/powernv/opal-imc.c
    @@ -33,10 +33,12 @@

    extern struct perchip_nest_info nest_perchip_info[IMC_MAX_CHIPS];
    extern struct imc_pmu *per_nest_pmu_arr[IMC_MAX_PMUS];
    +extern struct imc_pmu *core_imc_pmu;

    extern int init_imc_pmu(struct imc_events *events,
    int idx, struct imc_pmu *pmu_ptr);
    u64 nest_max_offset;
    +u64 core_max_offset;

    static int imc_event_info(char *name, struct imc_events *events)
    {
    @@ -80,6 +82,10 @@ static void update_max_value(u32 value, int pmu_domain)
    if (nest_max_offset < value)
    nest_max_offset = value;
    break;
    + case IMC_DOMAIN_CORE:
    + if (core_max_offset < value)
    + core_max_offset = value;
    + break;
    default:
    /* Unknown domain, return */
    return;
    @@ -231,6 +237,8 @@ int imc_get_domain(struct device_node *pmu_dev)
    {
    if (of_device_is_compatible(pmu_dev, IMC_DTB_NEST_COMPAT))
    return IMC_DOMAIN_NEST;
    + if (of_device_is_compatible(pmu_dev, IMC_DTB_CORE_COMPAT))
    + return IMC_DOMAIN_CORE;
    else
    return UNKNOWN_DOMAIN;
    }
    @@ -298,7 +306,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index)
    goto free_pmu;

    /* Needed for hotplug/migration */
    - per_nest_pmu_arr[pmu_index] = pmu_ptr;
    + if (pmu_ptr->domain == IMC_DOMAIN_CORE)
    + core_imc_pmu = pmu_ptr;
    + else if (pmu_ptr->domain == IMC_DOMAIN_NEST)
    + per_nest_pmu_arr[pmu_index] = pmu_ptr;

    /*
    * "events" property inside a PMU node contains the phandle value
    @@ -354,7 +365,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index)
    }

    /* Save the name to register it later */
    - sprintf(buf, "nest_%s", (char *)pp->value);
    + if (pmu_ptr->domain == IMC_DOMAIN_NEST)
    + sprintf(buf, "nest_%s", (char *)pp->value);
    + else
    + sprintf(buf, "%s_imc", (char *)pp->value);
    pmu_ptr->pmu.name = (char *)buf;

    /*
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-02-20 04:13    [W:4.126 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site