lkml.org 
[lkml]   [2017]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v11 06/10] powerpc/powernv: Core IMC events detection
    Date
    From: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>

    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 "type" property in the IMC device tree.

    Signed-off-by: Anju T Sudhakar <anju@linux.vnet.ibm.com>
    Signed-off-by: Hemant Kumar <hemant@linux.vnet.ibm.com>
    Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
    ---
    arch/powerpc/include/asm/imc-pmu.h | 3 +++
    arch/powerpc/perf/imc-pmu.c | 2 ++
    arch/powerpc/platforms/powernv/opal-imc.c | 14 +++++++++++---
    3 files changed, 16 insertions(+), 3 deletions(-)

    diff --git a/arch/powerpc/include/asm/imc-pmu.h b/arch/powerpc/include/asm/imc-pmu.h
    index 650c1e8..e9da151 100644
    --- a/arch/powerpc/include/asm/imc-pmu.h
    +++ b/arch/powerpc/include/asm/imc-pmu.h
    @@ -97,6 +97,7 @@ struct imc_pmu {

    /* In-Memory Collection Counters Type */
    enum {
    + IMC_COUNTER_PER_CORE = 0x4,
    IMC_COUNTER_PER_CHIP = 0x10,
    };

    @@ -104,7 +105,9 @@ enum {
    * Domains for IMC PMUs
    */
    #define IMC_DOMAIN_NEST 1
    +#define IMC_DOMAIN_CORE 2

    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);
    #endif /* PPC_POWERNV_IMC_PMU_DEF_H */
    diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c
    index b0bcb77..f4856eb 100644
    --- a/arch/powerpc/perf/imc-pmu.c
    +++ b/arch/powerpc/perf/imc-pmu.c
    @@ -31,6 +31,8 @@ static DEFINE_MUTEX(imc_nest_inited_reserve);
    static DEFINE_MUTEX(imc_nest_reserve);


    +struct imc_pmu *core_imc_pmu;
    +
    struct imc_pmu *imc_event_to_pmu(struct perf_event *event)
    {
    return container_of(event->pmu, struct imc_pmu, pmu);
    diff --git a/arch/powerpc/platforms/powernv/opal-imc.c b/arch/powerpc/platforms/powernv/opal-imc.c
    index a970ed3..98e7b0f5 100644
    --- a/arch/powerpc/platforms/powernv/opal-imc.c
    +++ b/arch/powerpc/platforms/powernv/opal-imc.c
    @@ -379,7 +379,7 @@ static int imc_get_mem_addr_nest(struct device_node *node,
    /*
    * imc_pmu_create : Takes the parent device which is the pmu unit, pmu_index
    * and domain as the inputs.
    - * Allocates memory for the pmu, sets up its domain (NEST), and
    + * Allocates memory for the pmu, sets up its domain (NEST/CORE), and
    * calls imc_events_setup() to allocate memory for the events supported
    * by this pmu. Assigns a name for the pmu.
    *
    @@ -406,7 +406,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
    pmu_ptr->domain = domain;

    /* 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;

    pp = of_find_property(parent, "name", NULL);
    if (!pp) {
    @@ -427,7 +430,10 @@ static int imc_pmu_create(struct device_node *parent, int pmu_index, int domain)
    goto free_pmu;
    }
    /* 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;

    if (of_property_read_u32(parent, "size", &pmu_ptr->counter_mem_size))
    @@ -504,6 +510,8 @@ static int opal_imc_counters_probe(struct platform_device *pdev)
    continue;
    if (type == IMC_COUNTER_PER_CHIP)
    domain = IMC_DOMAIN_NEST;
    + else if (type == IMC_COUNTER_PER_CORE)
    + domain = IMC_DOMAIN_CORE;
    else
    continue;
    if (!imc_pmu_create(imc_dev, pmu_count, domain))
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-06-28 20:58    [W:4.256 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site