]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drivers/perf: hisi: Simplify the probe process for each DDRC version
authorJunhao He <hejunhao3@huawei.com>
Thu, 19 Jun 2025 12:55:50 +0000 (20:55 +0800)
committerWill Deacon <will@kernel.org>
Mon, 14 Jul 2025 14:42:16 +0000 (15:42 +0100)
Version 1 and 2 of DDRC PMU also use different HID. Make use of
struct acpi_device_id::driver_data for version specific information
rather than judge the version register. This will help to
simplify the probe process and also a bit easier for extension.

In order to support this extend struct hisi_pmu_dev_info for version
specific counter bits and event range.

Signed-off-by: Junhao He <hejunhao3@huawei.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/20250619125557.57372-2-yangyicong@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c
drivers/perf/hisilicon/hisi_uncore_pmu.h

index 7e490f8868f234e0a66520f6e04a6e7e0a31970b..7e3c2436e96b865e12957126db2cf7b946eb04aa 100644 (file)
 #define DDRC_V1_NR_EVENTS      0x7
 #define DDRC_V2_NR_EVENTS      0x90
 
+#define DDRC_EVENT_CNTn(base, n)       ((base) + (n) * 8)
+#define DDRC_EVENT_TYPEn(base, n)      ((base) + (n) * 4)
+#define DDRC_UNIMPLEMENTED_REG         GENMASK(31, 0)
+
 /*
  * For PMU v1, there are eight-events and every event has been mapped
  * to fixed-purpose counters which register offset is not consistent.
@@ -63,47 +67,37 @@ static const u32 ddrc_reg_off[] = {
        DDRC_PRE_CMD, DDRC_ACT_CMD, DDRC_RNK_CHG, DDRC_RW_CHG
 };
 
-/*
- * Select the counter register offset using the counter index.
- * In PMU v1, there are no programmable counter, the count
- * is read form the statistics counter register itself.
- */
-static u32 hisi_ddrc_pmu_v1_get_counter_offset(int cntr_idx)
-{
-       return ddrc_reg_off[cntr_idx];
-}
-
-static u32 hisi_ddrc_pmu_v2_get_counter_offset(int cntr_idx)
-{
-       return DDRC_V2_EVENT_CNT + cntr_idx * 8;
-}
+struct hisi_ddrc_pmu_regs {
+       u32 event_cnt;
+       u32 event_ctrl;
+       u32 event_type;
+       u32 perf_ctrl;
+       u32 perf_ctrl_en;
+       u32 int_mask;
+       u32 int_clear;
+       u32 int_status;
+};
 
-static u64 hisi_ddrc_pmu_v1_read_counter(struct hisi_pmu *ddrc_pmu,
+static u64 hisi_ddrc_pmu_read_counter(struct hisi_pmu *ddrc_pmu,
                                      struct hw_perf_event *hwc)
 {
-       return readl(ddrc_pmu->base +
-                    hisi_ddrc_pmu_v1_get_counter_offset(hwc->idx));
-}
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
 
-static void hisi_ddrc_pmu_v1_write_counter(struct hisi_pmu *ddrc_pmu,
-                                       struct hw_perf_event *hwc, u64 val)
-{
-       writel((u32)val,
-              ddrc_pmu->base + hisi_ddrc_pmu_v1_get_counter_offset(hwc->idx));
-}
+       if (regs->event_cnt == DDRC_UNIMPLEMENTED_REG)
+               return readl(ddrc_pmu->base + ddrc_reg_off[hwc->idx]);
 
-static u64 hisi_ddrc_pmu_v2_read_counter(struct hisi_pmu *ddrc_pmu,
-                                        struct hw_perf_event *hwc)
-{
-       return readq(ddrc_pmu->base +
-                    hisi_ddrc_pmu_v2_get_counter_offset(hwc->idx));
+       return readq(ddrc_pmu->base + DDRC_EVENT_CNTn(regs->event_cnt, hwc->idx));
 }
 
-static void hisi_ddrc_pmu_v2_write_counter(struct hisi_pmu *ddrc_pmu,
-                                          struct hw_perf_event *hwc, u64 val)
+static void hisi_ddrc_pmu_write_counter(struct hisi_pmu *ddrc_pmu,
+                                       struct hw_perf_event *hwc, u64 val)
 {
-       writeq(val,
-              ddrc_pmu->base + hisi_ddrc_pmu_v2_get_counter_offset(hwc->idx));
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
+
+       if (regs->event_cnt == DDRC_UNIMPLEMENTED_REG)
+               writel((u32)val, ddrc_pmu->base + ddrc_reg_off[hwc->idx]);
+       else
+               writeq(val, ddrc_pmu->base + DDRC_EVENT_CNTn(regs->event_cnt, hwc->idx));
 }
 
 /*
@@ -114,54 +108,12 @@ static void hisi_ddrc_pmu_v2_write_counter(struct hisi_pmu *ddrc_pmu,
 static void hisi_ddrc_pmu_write_evtype(struct hisi_pmu *ddrc_pmu, int idx,
                                       u32 type)
 {
-       u32 offset;
-
-       if (ddrc_pmu->identifier >= HISI_PMU_V2) {
-               offset = DDRC_V2_EVENT_TYPE + 4 * idx;
-               writel(type, ddrc_pmu->base + offset);
-       }
-}
-
-static void hisi_ddrc_pmu_v1_start_counters(struct hisi_pmu *ddrc_pmu)
-{
-       u32 val;
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
 
-       /* Set perf_enable in DDRC_PERF_CTRL to start event counting */
-       val = readl(ddrc_pmu->base + DDRC_PERF_CTRL);
-       val |= DDRC_V1_PERF_CTRL_EN;
-       writel(val, ddrc_pmu->base + DDRC_PERF_CTRL);
-}
+       if (regs->event_type == DDRC_UNIMPLEMENTED_REG)
+               return;
 
-static void hisi_ddrc_pmu_v1_stop_counters(struct hisi_pmu *ddrc_pmu)
-{
-       u32 val;
-
-       /* Clear perf_enable in DDRC_PERF_CTRL to stop event counting */
-       val = readl(ddrc_pmu->base + DDRC_PERF_CTRL);
-       val &= ~DDRC_V1_PERF_CTRL_EN;
-       writel(val, ddrc_pmu->base + DDRC_PERF_CTRL);
-}
-
-static void hisi_ddrc_pmu_v1_enable_counter(struct hisi_pmu *ddrc_pmu,
-                                           struct hw_perf_event *hwc)
-{
-       u32 val;
-
-       /* Set counter index(event code) in DDRC_EVENT_CTRL register */
-       val = readl(ddrc_pmu->base + DDRC_EVENT_CTRL);
-       val |= (1 << GET_DDRC_EVENTID(hwc));
-       writel(val, ddrc_pmu->base + DDRC_EVENT_CTRL);
-}
-
-static void hisi_ddrc_pmu_v1_disable_counter(struct hisi_pmu *ddrc_pmu,
-                                            struct hw_perf_event *hwc)
-{
-       u32 val;
-
-       /* Clear counter index(event code) in DDRC_EVENT_CTRL register */
-       val = readl(ddrc_pmu->base + DDRC_EVENT_CTRL);
-       val &= ~(1 << GET_DDRC_EVENTID(hwc));
-       writel(val, ddrc_pmu->base + DDRC_EVENT_CTRL);
+       writel(type, ddrc_pmu->base + DDRC_EVENT_TYPEn(regs->event_type, idx));
 }
 
 static int hisi_ddrc_pmu_v1_get_event_idx(struct perf_event *event)
@@ -180,120 +132,96 @@ static int hisi_ddrc_pmu_v1_get_event_idx(struct perf_event *event)
        return idx;
 }
 
-static int hisi_ddrc_pmu_v2_get_event_idx(struct perf_event *event)
+static int hisi_ddrc_pmu_get_event_idx(struct perf_event *event)
 {
+       struct hisi_pmu *ddrc_pmu = to_hisi_pmu(event->pmu);
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
+
+       if (regs->event_type == DDRC_UNIMPLEMENTED_REG)
+               return hisi_ddrc_pmu_v1_get_event_idx(event);
+
        return hisi_uncore_pmu_get_event_idx(event);
 }
 
-static void hisi_ddrc_pmu_v2_start_counters(struct hisi_pmu *ddrc_pmu)
+static void hisi_ddrc_pmu_start_counters(struct hisi_pmu *ddrc_pmu)
 {
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
        u32 val;
 
-       val = readl(ddrc_pmu->base + DDRC_V2_PERF_CTRL);
-       val |= DDRC_V2_PERF_CTRL_EN;
-       writel(val, ddrc_pmu->base + DDRC_V2_PERF_CTRL);
+       val = readl(ddrc_pmu->base + regs->perf_ctrl);
+       val |= regs->perf_ctrl_en;
+       writel(val, ddrc_pmu->base + regs->perf_ctrl);
 }
 
-static void hisi_ddrc_pmu_v2_stop_counters(struct hisi_pmu *ddrc_pmu)
+static void hisi_ddrc_pmu_stop_counters(struct hisi_pmu *ddrc_pmu)
 {
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
        u32 val;
 
-       val = readl(ddrc_pmu->base + DDRC_V2_PERF_CTRL);
-       val &= ~DDRC_V2_PERF_CTRL_EN;
-       writel(val, ddrc_pmu->base + DDRC_V2_PERF_CTRL);
+       val = readl(ddrc_pmu->base + regs->perf_ctrl);
+       val &= ~regs->perf_ctrl_en;
+       writel(val, ddrc_pmu->base + regs->perf_ctrl);
 }
 
-static void hisi_ddrc_pmu_v2_enable_counter(struct hisi_pmu *ddrc_pmu,
+static void hisi_ddrc_pmu_enable_counter(struct hisi_pmu *ddrc_pmu,
                                            struct hw_perf_event *hwc)
 {
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
        u32 val;
 
-       val = readl(ddrc_pmu->base + DDRC_V2_EVENT_CTRL);
-       val |= 1 << hwc->idx;
-       writel(val, ddrc_pmu->base + DDRC_V2_EVENT_CTRL);
+       val = readl(ddrc_pmu->base + regs->event_ctrl);
+       val |= BIT_ULL(hwc->idx);
+       writel(val, ddrc_pmu->base + regs->event_ctrl);
 }
 
-static void hisi_ddrc_pmu_v2_disable_counter(struct hisi_pmu *ddrc_pmu,
+static void hisi_ddrc_pmu_disable_counter(struct hisi_pmu *ddrc_pmu,
                                             struct hw_perf_event *hwc)
 {
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
        u32 val;
 
-       val = readl(ddrc_pmu->base + DDRC_V2_EVENT_CTRL);
-       val &= ~(1 << hwc->idx);
-       writel(val, ddrc_pmu->base + DDRC_V2_EVENT_CTRL);
-}
-
-static void hisi_ddrc_pmu_v1_enable_counter_int(struct hisi_pmu *ddrc_pmu,
-                                               struct hw_perf_event *hwc)
-{
-       u32 val;
-
-       /* Write 0 to enable interrupt */
-       val = readl(ddrc_pmu->base + DDRC_INT_MASK);
-       val &= ~(1 << hwc->idx);
-       writel(val, ddrc_pmu->base + DDRC_INT_MASK);
-}
-
-static void hisi_ddrc_pmu_v1_disable_counter_int(struct hisi_pmu *ddrc_pmu,
-                                                struct hw_perf_event *hwc)
-{
-       u32 val;
-
-       /* Write 1 to mask interrupt */
-       val = readl(ddrc_pmu->base + DDRC_INT_MASK);
-       val |= 1 << hwc->idx;
-       writel(val, ddrc_pmu->base + DDRC_INT_MASK);
+       val = readl(ddrc_pmu->base + regs->event_ctrl);
+       val &= ~BIT_ULL(hwc->idx);
+       writel(val, ddrc_pmu->base + regs->event_ctrl);
 }
 
-static void hisi_ddrc_pmu_v2_enable_counter_int(struct hisi_pmu *ddrc_pmu,
-                                               struct hw_perf_event *hwc)
+static void hisi_ddrc_pmu_enable_counter_int(struct hisi_pmu *ddrc_pmu,
+                                            struct hw_perf_event *hwc)
 {
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
        u32 val;
 
-       val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK);
-       val &= ~(1 << hwc->idx);
-       writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK);
+       val = readl(ddrc_pmu->base + regs->int_mask);
+       val &= ~BIT_ULL(hwc->idx);
+       writel(val, ddrc_pmu->base + regs->int_mask);
 }
 
-static void hisi_ddrc_pmu_v2_disable_counter_int(struct hisi_pmu *ddrc_pmu,
-                                               struct hw_perf_event *hwc)
+static void hisi_ddrc_pmu_disable_counter_int(struct hisi_pmu *ddrc_pmu,
+                                             struct hw_perf_event *hwc)
 {
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
        u32 val;
 
-       val = readl(ddrc_pmu->base + DDRC_V2_INT_MASK);
-       val |= 1 << hwc->idx;
-       writel(val, ddrc_pmu->base + DDRC_V2_INT_MASK);
+       val = readl(ddrc_pmu->base + regs->int_mask);
+       val |= BIT_ULL(hwc->idx);
+       writel(val, ddrc_pmu->base + regs->int_mask);
 }
 
-static u32 hisi_ddrc_pmu_v1_get_int_status(struct hisi_pmu *ddrc_pmu)
+static u32 hisi_ddrc_pmu_get_int_status(struct hisi_pmu *ddrc_pmu)
 {
-       return readl(ddrc_pmu->base + DDRC_INT_STATUS);
-}
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
 
-static void hisi_ddrc_pmu_v1_clear_int_status(struct hisi_pmu *ddrc_pmu,
-                                             int idx)
-{
-       writel(1 << idx, ddrc_pmu->base + DDRC_INT_CLEAR);
+       return readl(ddrc_pmu->base + regs->int_status);
 }
 
-static u32 hisi_ddrc_pmu_v2_get_int_status(struct hisi_pmu *ddrc_pmu)
+static void hisi_ddrc_pmu_clear_int_status(struct hisi_pmu *ddrc_pmu,
+                                          int idx)
 {
-       return readl(ddrc_pmu->base + DDRC_V2_INT_STATUS);
-}
+       struct hisi_ddrc_pmu_regs *regs = ddrc_pmu->dev_info->private;
 
-static void hisi_ddrc_pmu_v2_clear_int_status(struct hisi_pmu *ddrc_pmu,
-                                             int idx)
-{
-       writel(1 << idx, ddrc_pmu->base + DDRC_V2_INT_CLEAR);
+       writel(1 << idx, ddrc_pmu->base + regs->int_clear);
 }
 
-static const struct acpi_device_id hisi_ddrc_pmu_acpi_match[] = {
-       { "HISI0233", },
-       { "HISI0234", },
-       {}
-};
-MODULE_DEVICE_TABLE(acpi, hisi_ddrc_pmu_acpi_match);
-
 static int hisi_ddrc_pmu_init_data(struct platform_device *pdev,
                                   struct hisi_pmu *ddrc_pmu)
 {
@@ -314,6 +242,10 @@ static int hisi_ddrc_pmu_init_data(struct platform_device *pdev,
                return -EINVAL;
        }
 
+       ddrc_pmu->dev_info = device_get_match_data(&pdev->dev);
+       if (!ddrc_pmu->dev_info)
+               return -ENODEV;
+
        ddrc_pmu->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(ddrc_pmu->base)) {
                dev_err(&pdev->dev, "ioremap failed for ddrc_pmu resource\n");
@@ -396,34 +328,19 @@ static const struct attribute_group *hisi_ddrc_pmu_v2_attr_groups[] = {
        NULL
 };
 
-static const struct hisi_uncore_ops hisi_uncore_ddrc_v1_ops = {
+static const struct hisi_uncore_ops hisi_uncore_ddrc_ops = {
        .write_evtype           = hisi_ddrc_pmu_write_evtype,
-       .get_event_idx          = hisi_ddrc_pmu_v1_get_event_idx,
-       .start_counters         = hisi_ddrc_pmu_v1_start_counters,
-       .stop_counters          = hisi_ddrc_pmu_v1_stop_counters,
-       .enable_counter         = hisi_ddrc_pmu_v1_enable_counter,
-       .disable_counter        = hisi_ddrc_pmu_v1_disable_counter,
-       .enable_counter_int     = hisi_ddrc_pmu_v1_enable_counter_int,
-       .disable_counter_int    = hisi_ddrc_pmu_v1_disable_counter_int,
-       .write_counter          = hisi_ddrc_pmu_v1_write_counter,
-       .read_counter           = hisi_ddrc_pmu_v1_read_counter,
-       .get_int_status         = hisi_ddrc_pmu_v1_get_int_status,
-       .clear_int_status       = hisi_ddrc_pmu_v1_clear_int_status,
-};
-
-static const struct hisi_uncore_ops hisi_uncore_ddrc_v2_ops = {
-       .write_evtype           = hisi_ddrc_pmu_write_evtype,
-       .get_event_idx          = hisi_ddrc_pmu_v2_get_event_idx,
-       .start_counters         = hisi_ddrc_pmu_v2_start_counters,
-       .stop_counters          = hisi_ddrc_pmu_v2_stop_counters,
-       .enable_counter         = hisi_ddrc_pmu_v2_enable_counter,
-       .disable_counter        = hisi_ddrc_pmu_v2_disable_counter,
-       .enable_counter_int     = hisi_ddrc_pmu_v2_enable_counter_int,
-       .disable_counter_int    = hisi_ddrc_pmu_v2_disable_counter_int,
-       .write_counter          = hisi_ddrc_pmu_v2_write_counter,
-       .read_counter           = hisi_ddrc_pmu_v2_read_counter,
-       .get_int_status         = hisi_ddrc_pmu_v2_get_int_status,
-       .clear_int_status       = hisi_ddrc_pmu_v2_clear_int_status,
+       .get_event_idx          = hisi_ddrc_pmu_get_event_idx,
+       .start_counters         = hisi_ddrc_pmu_start_counters,
+       .stop_counters          = hisi_ddrc_pmu_stop_counters,
+       .enable_counter         = hisi_ddrc_pmu_enable_counter,
+       .disable_counter        = hisi_ddrc_pmu_disable_counter,
+       .enable_counter_int     = hisi_ddrc_pmu_enable_counter_int,
+       .disable_counter_int    = hisi_ddrc_pmu_disable_counter_int,
+       .write_counter          = hisi_ddrc_pmu_write_counter,
+       .read_counter           = hisi_ddrc_pmu_read_counter,
+       .get_int_status         = hisi_ddrc_pmu_get_int_status,
+       .clear_int_status       = hisi_ddrc_pmu_clear_int_status,
 };
 
 static int hisi_ddrc_pmu_dev_probe(struct platform_device *pdev,
@@ -439,18 +356,10 @@ static int hisi_ddrc_pmu_dev_probe(struct platform_device *pdev,
        if (ret)
                return ret;
 
-       if (ddrc_pmu->identifier >= HISI_PMU_V2) {
-               ddrc_pmu->counter_bits = 48;
-               ddrc_pmu->check_event = DDRC_V2_NR_EVENTS;
-               ddrc_pmu->pmu_events.attr_groups = hisi_ddrc_pmu_v2_attr_groups;
-               ddrc_pmu->ops = &hisi_uncore_ddrc_v2_ops;
-       } else {
-               ddrc_pmu->counter_bits = 32;
-               ddrc_pmu->check_event = DDRC_V1_NR_EVENTS;
-               ddrc_pmu->pmu_events.attr_groups = hisi_ddrc_pmu_v1_attr_groups;
-               ddrc_pmu->ops = &hisi_uncore_ddrc_v1_ops;
-       }
-
+       ddrc_pmu->pmu_events.attr_groups = ddrc_pmu->dev_info->attr_groups;
+       ddrc_pmu->counter_bits = ddrc_pmu->dev_info->counter_bits;
+       ddrc_pmu->check_event = ddrc_pmu->dev_info->check_event;
+       ddrc_pmu->ops = &hisi_uncore_ddrc_ops;
        ddrc_pmu->num_counters = DDRC_NR_COUNTERS;
        ddrc_pmu->dev = &pdev->dev;
        ddrc_pmu->on_cpu = -1;
@@ -515,6 +424,49 @@ static void hisi_ddrc_pmu_remove(struct platform_device *pdev)
                                            &ddrc_pmu->node);
 }
 
+static struct hisi_ddrc_pmu_regs hisi_ddrc_v1_pmu_regs = {
+       .event_cnt = DDRC_UNIMPLEMENTED_REG,
+       .event_ctrl = DDRC_EVENT_CTRL,
+       .event_type = DDRC_UNIMPLEMENTED_REG,
+       .perf_ctrl = DDRC_PERF_CTRL,
+       .perf_ctrl_en = DDRC_V1_PERF_CTRL_EN,
+       .int_mask = DDRC_INT_MASK,
+       .int_clear = DDRC_INT_CLEAR,
+       .int_status = DDRC_INT_STATUS,
+};
+
+static const struct hisi_pmu_dev_info hisi_ddrc_v1 = {
+       .counter_bits = 32,
+       .check_event = DDRC_V1_NR_EVENTS,
+       .attr_groups = hisi_ddrc_pmu_v1_attr_groups,
+       .private = &hisi_ddrc_v1_pmu_regs,
+};
+
+static struct hisi_ddrc_pmu_regs hisi_ddrc_v2_pmu_regs = {
+       .event_cnt = DDRC_V2_EVENT_CNT,
+       .event_ctrl = DDRC_V2_EVENT_CTRL,
+       .event_type = DDRC_V2_EVENT_TYPE,
+       .perf_ctrl = DDRC_V2_PERF_CTRL,
+       .perf_ctrl_en = DDRC_V2_PERF_CTRL_EN,
+       .int_mask = DDRC_V2_INT_MASK,
+       .int_clear = DDRC_V2_INT_CLEAR,
+       .int_status = DDRC_V2_INT_STATUS,
+};
+
+static const struct hisi_pmu_dev_info hisi_ddrc_v2 = {
+       .counter_bits = 48,
+       .check_event = DDRC_V2_NR_EVENTS,
+       .attr_groups = hisi_ddrc_pmu_v2_attr_groups,
+       .private = &hisi_ddrc_v2_pmu_regs,
+};
+
+static const struct acpi_device_id hisi_ddrc_pmu_acpi_match[] = {
+       { "HISI0233", (kernel_ulong_t)&hisi_ddrc_v1 },
+       { "HISI0234", (kernel_ulong_t)&hisi_ddrc_v2 },
+       {}
+};
+MODULE_DEVICE_TABLE(acpi, hisi_ddrc_pmu_acpi_match);
+
 static struct platform_driver hisi_ddrc_pmu_driver = {
        .driver = {
                .name = "hisi_ddrc_pmu",
index f4fed25448778d349e1e41db6060dd59ab215986..777675838b80812433aa2324422e84781bb9980f 100644 (file)
@@ -72,6 +72,8 @@ struct hisi_uncore_ops {
 struct hisi_pmu_dev_info {
        const char *name;
        const struct attribute_group **attr_groups;
+       u32 counter_bits;
+       u32 check_event;
        void *private;
 };