* [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support
@ 2019-02-08 18:32 Frank Li
2019-02-08 18:32 ` [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes Frank Li
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Frank Li @ 2019-02-08 18:32 UTC (permalink / raw)
To: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com,
dl-linux-imx, robh+dt@kernel.org, Aisheng Dong,
devicetree@vger.kernel.org, lznuaa@gmail.com
Cc: Frank Li
Add ddr performance monitor support for iMX8QXP.
Support below events.
ddr0/activate/ [Kernel PMU event]
ddr0/axid-read/ [Kernel PMU event]
ddr0/axid-write/ [Kernel PMU event]
ddr0/cycles/ [Kernel PMU event]
ddr0/hp-read-credit-cnt/ [Kernel PMU event]
ddr0/hp-read/ [Kernel PMU event]
ddr0/hp-req-nodcredit/ [Kernel PMU event]
ddr0/hp-xact-credit/ [Kernel PMU event]
ddr0/load-mode/ [Kernel PMU event]
ddr0/lp-read-credit-cnt/ [Kernel PMU event]
ddr0/lp-req-nocredit/ [Kernel PMU event]
ddr0/lp-xact-credit/ [Kernel PMU event]
ddr0/mwr/ [Kernel PMU event]
ddr0/precharge/ [Kernel PMU event]
ddr0/raw-hazard/ [Kernel PMU event]
ddr0/read-access/ [Kernel PMU event]
ddr0/read-activate/ [Kernel PMU event]
ddr0/read-command/ [Kernel PMU event]
ddr0/read-cycles/ [Kernel PMU event]
ddr0/read-modify-write-command/ [Kernel PMU event]
ddr0/read-queue-depth/ [Kernel PMU event]
ddr0/read-write-transition/ [Kernel PMU event]
ddr0/read/ [Kernel PMU event]
ddr0/refresh/ [Kernel PMU event]
ddr0/selfresh/ [Kernel PMU event]
ddr0/wr-xact-credit/ [Kernel PMU event]
ddr0/write-access/ [Kernel PMU event]
ddr0/write-command/ [Kernel PMU event]
ddr0/write-credit-cnt/ [Kernel PMU event]
ddr0/write-cycles/ [Kernel PMU event]
ddr0/write-queue-depth/ [Kernel PMU event]
ddr0/write/
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
drivers/perf/Kconfig | 7 +
drivers/perf/Makefile | 1 +
drivers/perf/fsl_imx8_ddr_perf.c | 532 +++++++++++++++++++++++++++++++++++++++
3 files changed, 540 insertions(+)
create mode 100644 drivers/perf/fsl_imx8_ddr_perf.c
diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
index af9bc17..1e6664a 100644
--- a/drivers/perf/Kconfig
+++ b/drivers/perf/Kconfig
@@ -61,6 +61,13 @@ config ARM_DSU_PMU
system, control logic. The PMU allows counting various events related
to DSU.
+config FSL_IMX8_DDR_PERF
+ tristate "Freescale i.MX8 DDR perf monitor"
+ depends on ARCH_MXC
+ help
+ Provides support for ddr perfomance monitor in i.MX8QX. Provide memory
+ througput information.
+
config HISI_PMU
bool "HiSilicon SoC PMU"
depends on ARM64 && ACPI
diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile
index 909f27f..f832de7 100644
--- a/drivers/perf/Makefile
+++ b/drivers/perf/Makefile
@@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_CCN) += arm-ccn.o
obj-$(CONFIG_ARM_DSU_PMU) += arm_dsu_pmu.o
obj-$(CONFIG_ARM_PMU) += arm_pmu.o arm_pmu_platform.o
obj-$(CONFIG_ARM_PMU_ACPI) += arm_pmu_acpi.o
+obj-$(CONFIG_FSL_IMX8_DDR_PERF) += fsl_imx8_ddr_perf.o
obj-$(CONFIG_HISI_PMU) += hisilicon/
obj-$(CONFIG_QCOM_L2_PMU) += qcom_l2_pmu.o
obj-$(CONFIG_QCOM_L3_PMU) += qcom_l3_pmu.o
diff --git a/drivers/perf/fsl_imx8_ddr_perf.c b/drivers/perf/fsl_imx8_ddr_perf.c
new file mode 100644
index 0000000..63c068c
--- /dev/null
+++ b/drivers/perf/fsl_imx8_ddr_perf.c
@@ -0,0 +1,532 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright 2017 NXP
+ * Copyright 2016 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_device.h>
+#include <linux/of_irq.h>
+#include <linux/perf_event.h>
+#include <linux/slab.h>
+
+
+#define COUNTER_CNTL 0x0
+#define COUNTER_READ 0x20
+
+#define COUNTER_DPCR1 0x30
+
+#define CNTL_OVER 0x1
+#define CNTL_CLEAR 0x2
+#define CNTL_EN 0x4
+#define CNTL_EN_MASK 0xFFFFFFFB
+#define CNTL_CLEAR_MASK 0xFFFFFFFD
+#define CNTL_OVER_MASK 0xFFFFFFFE
+
+#define CNTL_CSV_SHIFT 24
+#define CNTL_CSV_MASK (0xFF << CNTL_CSV_SHIFT)
+
+#define EVENT_CYCLES_ID 0
+#define EVENT_CYCLES_COUNTER 0
+#define NUM_COUNTER 4
+#define MAX_EVENT 3
+
+#define to_ddr_pmu(p) container_of(p, struct ddr_pmu, pmu)
+
+#define DDR_PERF_DEV_NAME "ddr_perf"
+
+static DEFINE_IDA(ddr_ida);
+
+PMU_EVENT_ATTR_STRING(cycles, ddr_perf_cycles, "event=0x00");
+PMU_EVENT_ATTR_STRING(selfresh, ddr_perf_selfresh, "event=0x01");
+PMU_EVENT_ATTR_STRING(read-access, ddr_perf_read_accesses, "event=0x04");
+PMU_EVENT_ATTR_STRING(write-access, ddr_perf_write_accesses, "event=0x05");
+PMU_EVENT_ATTR_STRING(read-queue-depth, ddr_perf_read_queue_depth,
+ "event=0x08");
+PMU_EVENT_ATTR_STRING(write-queue-depth, ddr_perf_write_queue_depth,
+ "event=0x09");
+PMU_EVENT_ATTR_STRING(lp-read-credit-cnt, ddr_perf_lp_read_credit_cnt,
+ "event=0x10");
+PMU_EVENT_ATTR_STRING(hp-read-credit-cnt, ddr_perf_hp_read_credit_cnt,
+ "event=0x11");
+PMU_EVENT_ATTR_STRING(write-credit-cnt, ddr_perf_write_credit_cnt,
+ "event=0x12");
+PMU_EVENT_ATTR_STRING(read-command, ddr_perf_read_command, "event=0x20");
+PMU_EVENT_ATTR_STRING(write-command, ddr_perf_write_command, "event=0x21");
+PMU_EVENT_ATTR_STRING(read-modify-write-command,
+ ddr_perf_read_modify_write_command, "event=0x22");
+PMU_EVENT_ATTR_STRING(hp-read, ddr_perf_hp_read, "event=0x23");
+PMU_EVENT_ATTR_STRING(hp-req-nodcredit, ddr_perf_hp_req_nocredit, "event=0x24");
+PMU_EVENT_ATTR_STRING(hp-xact-credit, ddr_perf_hp_xact_credit, "event=0x25");
+PMU_EVENT_ATTR_STRING(lp-req-nocredit, ddr_perf_lp_req_nocredit, "event=0x26");
+PMU_EVENT_ATTR_STRING(lp-xact-credit, ddr_perf_lp_xact_credit, "event=0x27");
+PMU_EVENT_ATTR_STRING(wr-xact-credit, ddr_perf_wr_xact_credit, "event=0x29");
+PMU_EVENT_ATTR_STRING(read-cycles, ddr_perf_read_cycles, "event=0x2a");
+PMU_EVENT_ATTR_STRING(write-cycles, ddr_perf_write_cycles, "event=0x2b");
+PMU_EVENT_ATTR_STRING(read-write-transition, ddr_perf_read_write_transition,
+ "event=0x30");
+PMU_EVENT_ATTR_STRING(precharge, ddr_perf_precharge, "event=0x31");
+PMU_EVENT_ATTR_STRING(activate, ddr_perf_activate, "event=0x32");
+PMU_EVENT_ATTR_STRING(load-mode, ddr_perf_load_mode, "event=0x33");
+PMU_EVENT_ATTR_STRING(mwr, ddr_perf_mwr, "event=0x34");
+PMU_EVENT_ATTR_STRING(read, ddr_perf_read, "event=0x35");
+PMU_EVENT_ATTR_STRING(read-activate, ddr_perf_read_activate, "event=0x36");
+PMU_EVENT_ATTR_STRING(refresh, ddr_perf_refresh, "event=0x37");
+PMU_EVENT_ATTR_STRING(write, ddr_perf_write, "event=0x38");
+PMU_EVENT_ATTR_STRING(raw-hazard, ddr_perf_raw_hazard, "event=0x39");
+
+PMU_EVENT_ATTR_STRING(axid-read, ddr_perf_axid_read, "event=0x41");
+PMU_EVENT_ATTR_STRING(axid-write, ddr_perf_axid_write, "event=0x42");
+
+#define DDR_CAP_AXI_ID 0x1
+
+struct fsl_ddr_devtype_data {
+ unsigned int flags;
+};
+
+static const struct fsl_ddr_devtype_data imx8_data;
+static const struct fsl_ddr_devtype_data imx8m_data = {
+ .flags = DDR_CAP_AXI_ID,
+};
+
+static const struct of_device_id imx_ddr_pmu_dt_ids[] = {
+ { .compatible = "fsl,imx8-ddr-pmu", .data = (void *)&imx8_data},
+ { .compatible = "fsl,imx8m-ddr-pmu", .data = (void *)&imx8m_data},
+ { /* sentinel */ }
+};
+
+struct ddr_pmu {
+ struct pmu pmu;
+ void __iomem *base;
+ cpumask_t cpu;
+ struct hlist_node node;
+ struct device *dev;
+ struct perf_event *active_events[NUM_COUNTER];
+ int total_events;
+ bool cycles_active;
+ struct fsl_ddr_devtype_data *devtype;
+};
+
+static ssize_t ddr_perf_cpumask_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct ddr_pmu *pmu = dev_get_drvdata(dev);
+
+ return cpumap_print_to_pagebuf(true, buf, &pmu->cpu);
+}
+
+static struct device_attribute ddr_perf_cpumask_attr =
+ __ATTR(cpumask, 0444, ddr_perf_cpumask_show, NULL);
+
+static struct attribute *ddr_perf_cpumask_attrs[] = {
+ &ddr_perf_cpumask_attr.attr,
+ NULL,
+};
+
+static struct attribute_group ddr_perf_cpumask_attr_group = {
+ .attrs = ddr_perf_cpumask_attrs,
+};
+
+static struct attribute *ddr_perf_events_attrs[] = {
+ &ddr_perf_cycles.attr.attr,
+ &ddr_perf_selfresh.attr.attr,
+ &ddr_perf_read_accesses.attr.attr,
+ &ddr_perf_write_accesses.attr.attr,
+ &ddr_perf_read_queue_depth.attr.attr,
+ &ddr_perf_write_queue_depth.attr.attr,
+ &ddr_perf_lp_read_credit_cnt.attr.attr,
+ &ddr_perf_hp_read_credit_cnt.attr.attr,
+ &ddr_perf_write_credit_cnt.attr.attr,
+ &ddr_perf_read_command.attr.attr,
+ &ddr_perf_write_command.attr.attr,
+ &ddr_perf_read_modify_write_command.attr.attr,
+ &ddr_perf_hp_read.attr.attr,
+ &ddr_perf_hp_req_nocredit.attr.attr,
+ &ddr_perf_hp_xact_credit.attr.attr,
+ &ddr_perf_lp_req_nocredit.attr.attr,
+ &ddr_perf_lp_xact_credit.attr.attr,
+ &ddr_perf_wr_xact_credit.attr.attr,
+ &ddr_perf_read_cycles.attr.attr,
+ &ddr_perf_write_cycles.attr.attr,
+ &ddr_perf_read_write_transition.attr.attr,
+ &ddr_perf_precharge.attr.attr,
+ &ddr_perf_activate.attr.attr,
+ &ddr_perf_load_mode.attr.attr,
+ &ddr_perf_mwr.attr.attr,
+ &ddr_perf_read.attr.attr,
+ &ddr_perf_read_activate.attr.attr,
+ &ddr_perf_refresh.attr.attr,
+ &ddr_perf_write.attr.attr,
+ &ddr_perf_raw_hazard.attr.attr,
+ &ddr_perf_axid_read.attr.attr,
+ &ddr_perf_axid_write.attr.attr,
+ NULL,
+};
+
+static struct attribute_group ddr_perf_events_attr_group = {
+ .name = "events",
+ .attrs = ddr_perf_events_attrs,
+};
+
+PMU_FORMAT_ATTR(event, "config:0-63");
+PMU_FORMAT_ATTR(axi_id, "config1:0-63");
+
+static struct attribute *ddr_perf_format_attrs[] = {
+ &format_attr_event.attr,
+ &format_attr_axi_id.attr,
+ NULL,
+};
+
+static struct attribute_group ddr_perf_format_attr_group = {
+ .name = "format",
+ .attrs = ddr_perf_format_attrs,
+};
+
+static const struct attribute_group *attr_groups[] = {
+ &ddr_perf_events_attr_group,
+ &ddr_perf_format_attr_group,
+ &ddr_perf_cpumask_attr_group,
+ NULL,
+};
+
+static u32 ddr_perf_alloc_counter(struct ddr_pmu *pmu, int event)
+{
+ int i;
+
+ /* Always map cycle event to counter 0 */
+ if (event == EVENT_CYCLES_ID)
+ return EVENT_CYCLES_COUNTER;
+
+ for (i = 1; i < NUM_COUNTER; i++)
+ if (pmu->active_events[i] == NULL)
+ return i;
+
+ return -ENOENT;
+}
+
+static u32 ddr_perf_free_counter(struct ddr_pmu *pmu, int counter)
+{
+ if (counter < 0 || counter >= NUM_COUNTER)
+ return -ENOENT;
+
+ pmu->active_events[counter] = NULL;
+
+ return 0;
+}
+
+static u32 ddr_perf_read_counter(struct ddr_pmu *pmu, int counter)
+{
+ return readl(pmu->base + COUNTER_READ + counter * 4);
+}
+
+static int ddr_perf_event_init(struct perf_event *event)
+{
+ struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
+ struct hw_perf_event *hwc = &event->hw;
+
+ if (event->attr.type != event->pmu->type)
+ return -ENOENT;
+
+ if (is_sampling_event(event) || event->attach_state & PERF_ATTACH_TASK)
+ return -EOPNOTSUPP;
+
+ if (event->cpu < 0) {
+ dev_warn(pmu->dev, "Can't provide per-task data!\n");
+ return -EOPNOTSUPP;
+ }
+
+ if (event->attr.exclude_user ||
+ event->attr.exclude_kernel ||
+ event->attr.exclude_hv ||
+ event->attr.exclude_idle ||
+ event->attr.exclude_host ||
+ event->attr.exclude_guest ||
+ event->attr.sample_period)
+ return -EINVAL;
+
+ event->cpu = cpumask_first(&pmu->cpu);
+ hwc->idx = -1;
+
+ return 0;
+}
+
+
+static void ddr_perf_event_update(struct perf_event *event)
+{
+ struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
+ struct hw_perf_event *hwc = &event->hw;
+ u64 delta, prev_raw_count, new_raw_count;
+ int counter = hwc->idx;
+
+ do {
+ prev_raw_count = local64_read(&hwc->prev_count);
+ new_raw_count = ddr_perf_read_counter(pmu, counter);
+ } while (local64_cmpxchg(&hwc->prev_count, prev_raw_count,
+ new_raw_count) != prev_raw_count);
+
+ delta = (new_raw_count - prev_raw_count) & 0xFFFFFFFF;
+
+ local64_add(delta, &event->count);
+}
+
+static void ddr_perf_event_enable(struct ddr_pmu *pmu, int config,
+ int counter, bool enable)
+{
+ u8 reg = counter * 4 + COUNTER_CNTL;
+ int val;
+
+ if (enable) {
+ /* Clear counter, then enable it. */
+ writel(0, pmu->base + reg);
+ val = CNTL_EN | CNTL_CLEAR;
+ val |= (config << CNTL_CSV_SHIFT) & CNTL_CSV_MASK;
+ } else {
+ /* Disable counter */
+ val = readl(pmu->base + reg) & CNTL_EN_MASK;
+ }
+
+ writel(val, pmu->base + reg);
+
+ if (config == EVENT_CYCLES_ID)
+ pmu->cycles_active = enable;
+}
+
+static void ddr_perf_event_start(struct perf_event *event, int flags)
+{
+ struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
+ struct hw_perf_event *hwc = &event->hw;
+ int counter = hwc->idx;
+
+ if (pmu->devtype->flags & DDR_CAP_AXI_ID) {
+ if (event->attr.config == 0x41 ||
+ event->attr.config == 0x42) {
+ int val = event->attr.config1;
+ writel(val, pmu->base + COUNTER_DPCR1);
+ }
+ }
+
+ local64_set(&hwc->prev_count, 0);
+
+ ddr_perf_event_enable(pmu, event->attr.config, counter, true);
+ /*
+ * If the cycles counter wasn't explicitly selected,
+ * we will enable it now.
+ */
+ if (counter > 0 && !pmu->cycles_active)
+ ddr_perf_event_enable(pmu, EVENT_CYCLES_ID,
+ EVENT_CYCLES_COUNTER, true);
+}
+
+static int ddr_perf_event_add(struct perf_event *event, int flags)
+{
+ struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
+ struct hw_perf_event *hwc = &event->hw;
+ int counter;
+ int cfg = event->attr.config;
+
+ counter = ddr_perf_alloc_counter(pmu, cfg);
+ if (counter < 0) {
+ dev_warn(pmu->dev, "There are not enough counters\n");
+ return -EOPNOTSUPP;
+ }
+
+ pmu->active_events[counter] = event;
+ pmu->total_events++;
+ hwc->idx = counter;
+
+ if (flags & PERF_EF_START)
+ ddr_perf_event_start(event, flags);
+
+ local64_set(&hwc->prev_count, ddr_perf_read_counter(pmu, counter));
+
+ return 0;
+}
+
+static void ddr_perf_event_stop(struct perf_event *event, int flags)
+{
+ struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
+ struct hw_perf_event *hwc = &event->hw;
+ int counter = hwc->idx;
+
+ ddr_perf_event_enable(pmu, event->attr.config, counter, false);
+ ddr_perf_event_update(event);
+}
+
+static void ddr_perf_event_del(struct perf_event *event, int flags)
+{
+ struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
+ struct hw_perf_event *hwc = &event->hw;
+ int counter = hwc->idx;
+
+ ddr_perf_event_stop(event, PERF_EF_UPDATE);
+
+ ddr_perf_free_counter(pmu, counter);
+ pmu->total_events--;
+ hwc->idx = -1;
+
+ /* If all events have stopped, stop the cycles counter as well */
+ if ((pmu->total_events == 0) && pmu->cycles_active)
+ ddr_perf_event_enable(pmu, EVENT_CYCLES_ID,
+ EVENT_CYCLES_COUNTER, false);
+}
+
+static int ddr_perf_init(struct ddr_pmu *pmu, void __iomem *base,
+ struct device *dev)
+{
+ *pmu = (struct ddr_pmu) {
+ .pmu = (struct pmu) {
+ .task_ctx_nr = perf_invalid_context,
+ .attr_groups = attr_groups,
+ .event_init = ddr_perf_event_init,
+ .add = ddr_perf_event_add,
+ .del = ddr_perf_event_del,
+ .start = ddr_perf_event_start,
+ .stop = ddr_perf_event_stop,
+ .read = ddr_perf_event_update,
+ },
+ .base = base,
+ .dev = dev,
+ };
+
+ return ida_simple_get(&ddr_ida, 0, 0, GFP_KERNEL);
+}
+
+static irqreturn_t ddr_perf_irq_handler(int irq, void *p)
+{
+ int i;
+ u8 reg;
+ int val;
+ int counter;
+ struct ddr_pmu *pmu = (struct ddr_pmu *) p;
+ struct perf_event *event;
+
+ /*
+ * The cycles counter has overflowed. Update all of the local counter
+ * values, then reset the cycles counter, so the others can continue
+ * counting.
+ */
+ for (i = 0; i <= pmu->total_events; i++) {
+ if (pmu->active_events[i] != NULL) {
+ event = pmu->active_events[i];
+ counter = event->hw.idx;
+ reg = counter * 4 + COUNTER_CNTL;
+ val = readl(pmu->base + reg);
+ ddr_perf_event_update(event);
+ if (val & CNTL_OVER) {
+ /* Clear counter, then re-enable it. */
+ ddr_perf_event_enable(pmu, event->attr.config,
+ counter, true);
+ /* Update event again to reset prev_count */
+ ddr_perf_event_update(event);
+ }
+ }
+ }
+
+ /*
+ * Reset the cycles counter regardless if it was explicitly
+ * enabled or not.
+ */
+ ddr_perf_event_enable(pmu, EVENT_CYCLES_ID,
+ EVENT_CYCLES_COUNTER, true);
+
+ return IRQ_HANDLED;
+}
+
+static int ddr_perf_probe(struct platform_device *pdev)
+{
+ struct ddr_pmu *pmu;
+ struct device_node *np;
+ void __iomem *base;
+ struct resource *iomem;
+ char *name;
+ int num;
+ int ret;
+ u32 irq;
+ const struct of_device_id *of_id =
+ of_match_device(imx_ddr_pmu_dt_ids, &pdev->dev);
+
+ iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ base = devm_ioremap_resource(&pdev->dev, iomem);
+ if (IS_ERR(base)) {
+ ret = PTR_ERR(base);
+ return ret;
+ }
+
+ np = pdev->dev.of_node;
+
+ pmu = kzalloc(sizeof(*pmu), GFP_KERNEL);
+ if (!pmu)
+ return -ENOMEM;
+
+ num = ddr_perf_init(pmu, base, &pdev->dev);
+ name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "ddr%d", num);
+
+ pmu->devtype = (struct fsl_ddr_devtype_data *)of_id->data;
+
+ cpumask_set_cpu(smp_processor_id(), &pmu->cpu);
+ ret = perf_pmu_register(&(pmu->pmu), name, -1);
+ if (ret)
+ goto ddr_perf_err;
+
+ /* Request irq */
+ irq = of_irq_get(np, 0);
+ if (irq < 0) {
+ pr_err("Failed to get irq: %d", irq);
+ goto ddr_perf_err;
+ }
+
+ ret = devm_request_threaded_irq(&pdev->dev, irq,
+ ddr_perf_irq_handler, NULL,
+ IRQF_TRIGGER_RISING | IRQF_ONESHOT,
+ DDR_PERF_DEV_NAME,
+ pmu);
+ if (ret < 0) {
+ pr_err("Request irq failed: %d", ret);
+ goto ddr_perf_irq_err;
+ }
+
+ return 0;
+
+ddr_perf_irq_err:
+ perf_pmu_unregister(&(pmu->pmu));
+ddr_perf_err:
+ pr_warn("i.MX8 DDR Perf PMU failed (%d), disabled\n", ret);
+ kfree(pmu);
+ return ret;
+}
+
+
+static int ddr_perf_remove(struct platform_device *pdev)
+{
+ struct ddr_pmu *pmu = platform_get_drvdata(pdev);
+
+ perf_pmu_unregister(&pmu->pmu);
+ kfree(pmu);
+
+ return 0;
+}
+
+static struct platform_driver imx_ddr_pmu_driver = {
+ .driver = {
+ .name = "imx-ddr-pmu",
+ .of_match_table = imx_ddr_pmu_dt_ids,
+ },
+ .probe = ddr_perf_probe,
+ .remove = ddr_perf_remove,
+};
+
+static int __init imx_ddr_pmu_init(void)
+{
+ return platform_driver_register(&imx_ddr_pmu_driver);
+}
+
+module_init(imx_ddr_pmu_init);
+
--
2.5.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes
2019-02-08 18:32 [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Frank Li
@ 2019-02-08 18:32 ` Frank Li
2019-02-08 18:44 ` Fabio Estevam
2019-02-09 12:21 ` Fabio Estevam
2019-02-08 18:32 ` [PATCH 3/4] dt-bindings: perf: imx8-ddr: add imx8qxp ddr performance monitor Frank Li
` (3 subsequent siblings)
4 siblings, 2 replies; 12+ messages in thread
From: Frank Li @ 2019-02-08 18:32 UTC (permalink / raw)
To: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com,
dl-linux-imx, robh+dt@kernel.org, Aisheng Dong,
devicetree@vger.kernel.org, lznuaa@gmail.com
Cc: Frank Li
Add ddr performance monitor
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
index 4c3dd95..243d7b3 100644
--- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
@@ -79,6 +79,13 @@
interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
};
+ ddr_pmu0: ddr_pmu@5c020000 {
+ compatible = "fsl,imx8-ddr-pmu";
+ reg = <0x0 0x5c020000 0x0 0x10000>;
+ interrupt-parent = <&gic>;
+ interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
psci {
compatible = "arm,psci-1.0";
method = "smc";
--
2.5.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] dt-bindings: perf: imx8-ddr: add imx8qxp ddr performance monitor
2019-02-08 18:32 [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Frank Li
2019-02-08 18:32 ` [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes Frank Li
@ 2019-02-08 18:32 ` Frank Li
2019-02-09 12:15 ` Fabio Estevam
2019-02-08 18:32 ` [PATCH 4/4] MAINTAINERS: Added imx DDR performonitor driver maintainer information Frank Li
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Frank Li @ 2019-02-08 18:32 UTC (permalink / raw)
To: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com,
dl-linux-imx, robh+dt@kernel.org, Aisheng Dong,
devicetree@vger.kernel.org, lznuaa@gmail.com
Cc: Frank Li
Added binding doc for imx8qxp ddr performance monitor
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
.../devicetree/bindings/perf/fsl-imx-ddr.txt | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
diff --git a/Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt b/Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
new file mode 100644
index 0000000..375a67c
--- /dev/null
+++ b/Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
@@ -0,0 +1,22 @@
+* Freescale(NXP) IMX8 DDR performance monitor
+
+Required properties:
+
+- compatible: (standard compatible string) should be one of:
+ "fsl,imx8-ddr-pmu"
+ "fsl,imx8m-ddr-pmu"
+
+- reg: (standard registers property) physical address and size
+
+- interrupts: (standard interrupt property) single interrupt
+ generated by the control block
+
+Example:
+
+ ddr_pmu0: ddr_pmu@5c020000 {
+ compatible = "fsl,imx8-ddr-pmu";
+ reg = <0x0 0x5c020000 0x0 0x10000>;
+ interrupt-parent = <&gic>;
+ interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
--
2.5.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4] MAINTAINERS: Added imx DDR performonitor driver maintainer information
2019-02-08 18:32 [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Frank Li
2019-02-08 18:32 ` [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes Frank Li
2019-02-08 18:32 ` [PATCH 3/4] dt-bindings: perf: imx8-ddr: add imx8qxp ddr performance monitor Frank Li
@ 2019-02-08 18:32 ` Frank Li
2019-02-09 12:11 ` [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Fabio Estevam
2019-02-11 11:19 ` Mark Rutland
4 siblings, 0 replies; 12+ messages in thread
From: Frank Li @ 2019-02-08 18:32 UTC (permalink / raw)
To: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com,
dl-linux-imx, robh+dt@kernel.org, Aisheng Dong,
devicetree@vger.kernel.org, lznuaa@gmail.com
Cc: Frank Li
Add DDR perf counter driver maintainer information
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
MAINTAINERS | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 6ba068e..687be0f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6163,6 +6163,13 @@ L: linux-i2c@vger.kernel.org
S: Maintained
F: drivers/i2c/busses/i2c-cpm.c
+FREESCALE IMX DDR Performance Monitor DRIVER
+M: Frank Li <Frank.li@nxp.com>
+L: linux-arm-kernel@lists.infradead.org
+S: Maintained
+F: drivers/perf/fsl_imx8_ddr_perf.c
+F: Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt
+
FREESCALE IMX LPI2C DRIVER
M: Dong Aisheng <aisheng.dong@nxp.com>
L: linux-i2c@vger.kernel.org
--
2.5.2
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes
2019-02-08 18:32 ` [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes Frank Li
@ 2019-02-08 18:44 ` Fabio Estevam
2019-02-08 18:59 ` Zhi Li
2019-02-09 12:21 ` Fabio Estevam
1 sibling, 1 reply; 12+ messages in thread
From: Fabio Estevam @ 2019-02-08 18:44 UTC (permalink / raw)
To: Frank Li
Cc: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, dl-linux-imx,
robh+dt@kernel.org, Aisheng Dong, devicetree@vger.kernel.org,
lznuaa@gmail.com
Hi Frank,
On Fri, Feb 8, 2019 at 4:32 PM Frank Li <frank.li@nxp.com> wrote:
>
> Add ddr performance monitor
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
> arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> index 4c3dd95..243d7b3 100644
> --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> @@ -79,6 +79,13 @@
> interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
> };
>
> + ddr_pmu0: ddr_pmu@5c020000 {
> + compatible = "fsl,imx8-ddr-pmu";
> + reg = <0x0 0x5c020000 0x0 0x10000>;
In mainline tree this should be:
reg = <0x5c020000 0x10000>;
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes
2019-02-08 18:44 ` Fabio Estevam
@ 2019-02-08 18:59 ` Zhi Li
2019-02-09 12:28 ` Fabio Estevam
0 siblings, 1 reply; 12+ messages in thread
From: Zhi Li @ 2019-02-08 18:59 UTC (permalink / raw)
To: Fabio Estevam
Cc: Frank Li, mark.rutland@arm.com, will.deacon@arm.com,
shawnguo@kernel.org, s.hauer@pengutronix.de,
kernel@pengutronix.de, dl-linux-imx, robh+dt@kernel.org,
Aisheng Dong, devicetree@vger.kernel.org
On Fri, Feb 8, 2019 at 12:44 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Hi Frank,
>
> On Fri, Feb 8, 2019 at 4:32 PM Frank Li <frank.li@nxp.com> wrote:
> >
> > Add ddr performance monitor
> >
> > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> > ---
> > arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > index 4c3dd95..243d7b3 100644
> > --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> > @@ -79,6 +79,13 @@
> > interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
> > };
> >
> > + ddr_pmu0: ddr_pmu@5c020000 {
> > + compatible = "fsl,imx8-ddr-pmu";
> > + reg = <0x0 0x5c020000 0x0 0x10000>;
>
> In mainline tree this should be:
>
> reg = <0x5c020000 0x10000>;
If it is true if under subsystem node. ddr pmu is the same level as
GIC. So address should be 64bit
gic: interrupt-controller@51a00000 {
compatible = "arm,gic-v3";
reg = <0x0 0x51a00000 0 0x10000>, /* GIC Dist */
<0x0 0x51b00000 0 0xc0000>; /* GICR (RD_base +
SGI_base) */
#interrupt-cells = <3>;
interrupt-controller;
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
};
best regards
Frank Li
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support
2019-02-08 18:32 [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Frank Li
` (2 preceding siblings ...)
2019-02-08 18:32 ` [PATCH 4/4] MAINTAINERS: Added imx DDR performonitor driver maintainer information Frank Li
@ 2019-02-09 12:11 ` Fabio Estevam
2019-02-11 11:19 ` Mark Rutland
4 siblings, 0 replies; 12+ messages in thread
From: Fabio Estevam @ 2019-02-09 12:11 UTC (permalink / raw)
To: Frank Li
Cc: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, dl-linux-imx,
robh+dt@kernel.org, Aisheng Dong, devicetree@vger.kernel.org,
lznuaa@gmail.com
Hi Frank,
On Fri, Feb 8, 2019 at 4:32 PM Frank Li <frank.li@nxp.com> wrote:
> +config FSL_IMX8_DDR_PERF
> + tristate "Freescale i.MX8 DDR perf monitor"
> + depends on ARCH_MXC
> + help
> + Provides support for ddr perfomance monitor in i.MX8QX. Provide memory
Since it supports i.MX8/i.MX8M, maybe you can put "in i.MX8" instead.
> --- /dev/null
> +++ b/drivers/perf/fsl_imx8_ddr_perf.c
> @@ -0,0 +1,532 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright 2017 NXP
> + * Copyright 2016 Freescale Semiconductor, Inc.
> + *
> + * The code contained herein is licensed under the GNU General Public
> + * http://www.gnu.org/copyleft/gpl.html
Since you use the SPDX tag you can simply remove this paragraph.
> +static int ddr_perf_probe(struct platform_device *pdev)
> +{
> + struct ddr_pmu *pmu;
> + struct device_node *np;
> + void __iomem *base;
> + struct resource *iomem;
> + char *name;
> + int num;
> + int ret;
> + u32 irq;
> + const struct of_device_id *of_id =
> + of_match_device(imx_ddr_pmu_dt_ids, &pdev->dev);
> +
> + iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + base = devm_ioremap_resource(&pdev->dev, iomem);
> + if (IS_ERR(base)) {
> + ret = PTR_ERR(base);
You could simply return directly here: return PTR_ERR(base);
> + return ret;
> + }
> +
> + np = pdev->dev.of_node;
> +
> + pmu = kzalloc(sizeof(*pmu), GFP_KERNEL);
Using devm_kzalloc() here would make the error handling simpler.
> + if (!pmu)
> + return -ENOMEM;
> +
> + num = ddr_perf_init(pmu, base, &pdev->dev);
> + name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "ddr%d", num);
> +
> + pmu->devtype = (struct fsl_ddr_devtype_data *)of_id->data;
> +
> + cpumask_set_cpu(smp_processor_id(), &pmu->cpu);
> + ret = perf_pmu_register(&(pmu->pmu), name, -1);
> + if (ret)
> + goto ddr_perf_err;
> +
> + /* Request irq */
> + irq = of_irq_get(np, 0);
> + if (irq < 0) {
> + pr_err("Failed to get irq: %d", irq);
Please use dev_err() instead.
Also, there is a bug here. You need to make:
ret = irq;
Otherwise you will return success on failure.
> + goto ddr_perf_err;
> + }
> +
> + ret = devm_request_threaded_irq(&pdev->dev, irq,
> + ddr_perf_irq_handler, NULL,
> + IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> + DDR_PERF_DEV_NAME,
> + pmu);
> + if (ret < 0) {
> + pr_err("Request irq failed: %d", ret);
dev_err()
> + goto ddr_perf_irq_err;
> + }
> +
> + return 0;
> +
> +ddr_perf_irq_err:
> + perf_pmu_unregister(&(pmu->pmu));
> +ddr_perf_err:
> + pr_warn("i.MX8 DDR Perf PMU failed (%d), disabled\n", ret);
dev_err()
> + kfree(pmu);
> + return ret;
> +}
> +
> +
No need for two empty lines.
> +static int ddr_perf_remove(struct platform_device *pdev)
> +{
> + struct ddr_pmu *pmu = platform_get_drvdata(pdev);
> +
> + perf_pmu_unregister(&pmu->pmu);
> + kfree(pmu);
If you use devm_kzalloc() then you don't need to call kfree().
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/4] dt-bindings: perf: imx8-ddr: add imx8qxp ddr performance monitor
2019-02-08 18:32 ` [PATCH 3/4] dt-bindings: perf: imx8-ddr: add imx8qxp ddr performance monitor Frank Li
@ 2019-02-09 12:15 ` Fabio Estevam
0 siblings, 0 replies; 12+ messages in thread
From: Fabio Estevam @ 2019-02-09 12:15 UTC (permalink / raw)
To: Frank Li
Cc: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, dl-linux-imx,
robh+dt@kernel.org, Aisheng Dong, devicetree@vger.kernel.org,
lznuaa@gmail.com
On Fri, Feb 8, 2019 at 4:32 PM Frank Li <frank.li@nxp.com> wrote:
> +Example:
> +
> + ddr_pmu0: ddr_pmu@5c020000 {
Underscores should not be used in node names. You could use
pmu@5c020000 instead.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes
2019-02-08 18:32 ` [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes Frank Li
2019-02-08 18:44 ` Fabio Estevam
@ 2019-02-09 12:21 ` Fabio Estevam
1 sibling, 0 replies; 12+ messages in thread
From: Fabio Estevam @ 2019-02-09 12:21 UTC (permalink / raw)
To: Frank Li
Cc: mark.rutland@arm.com, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, dl-linux-imx,
robh+dt@kernel.org, Aisheng Dong, devicetree@vger.kernel.org,
lznuaa@gmail.com
On Fri, Feb 8, 2019 at 4:32 PM Frank Li <frank.li@nxp.com> wrote:
> diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> index 4c3dd95..243d7b3 100644
> --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi
> @@ -79,6 +79,13 @@
> interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
> };
>
> + ddr_pmu0: ddr_pmu@5c020000 {
Underscores should not be used in node names. You could use
pmu@5c020000 instead.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes
2019-02-08 18:59 ` Zhi Li
@ 2019-02-09 12:28 ` Fabio Estevam
0 siblings, 0 replies; 12+ messages in thread
From: Fabio Estevam @ 2019-02-09 12:28 UTC (permalink / raw)
To: Zhi Li
Cc: Frank Li, mark.rutland@arm.com, will.deacon@arm.com,
shawnguo@kernel.org, s.hauer@pengutronix.de,
kernel@pengutronix.de, dl-linux-imx, robh+dt@kernel.org,
Aisheng Dong, devicetree@vger.kernel.org
On Fri, Feb 8, 2019 at 4:59 PM Zhi Li <lznuaa@gmail.com> wrote:
> If it is true if under subsystem node. ddr pmu is the same level as
> GIC. So address should be 64bit
Understood.
When I searched for the PMU region at 0x5c020000 I saw a "Reserved"
box in the Refence Manual, so it seems the manual needs to be updated.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support
2019-02-08 18:32 [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Frank Li
` (3 preceding siblings ...)
2019-02-09 12:11 ` [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Fabio Estevam
@ 2019-02-11 11:19 ` Mark Rutland
2019-02-11 16:33 ` Zhi Li
4 siblings, 1 reply; 12+ messages in thread
From: Mark Rutland @ 2019-02-11 11:19 UTC (permalink / raw)
To: Frank Li
Cc: will.deacon@arm.com, shawnguo@kernel.org, s.hauer@pengutronix.de,
kernel@pengutronix.de, festevam@gmail.com, dl-linux-imx,
robh+dt@kernel.org, Aisheng Dong, devicetree@vger.kernel.org,
lznuaa@gmail.com
On Fri, Feb 08, 2019 at 06:32:39PM +0000, Frank Li wrote:
> Add ddr performance monitor support for iMX8QXP.
> Support below events.
>
> ddr0/activate/ [Kernel PMU event]
> ddr0/axid-read/ [Kernel PMU event]
> ddr0/axid-write/ [Kernel PMU event]
> ddr0/cycles/ [Kernel PMU event]
> ddr0/hp-read-credit-cnt/ [Kernel PMU event]
> ddr0/hp-read/ [Kernel PMU event]
> ddr0/hp-req-nodcredit/ [Kernel PMU event]
> ddr0/hp-xact-credit/ [Kernel PMU event]
> ddr0/load-mode/ [Kernel PMU event]
> ddr0/lp-read-credit-cnt/ [Kernel PMU event]
> ddr0/lp-req-nocredit/ [Kernel PMU event]
> ddr0/lp-xact-credit/ [Kernel PMU event]
> ddr0/mwr/ [Kernel PMU event]
> ddr0/precharge/ [Kernel PMU event]
> ddr0/raw-hazard/ [Kernel PMU event]
> ddr0/read-access/ [Kernel PMU event]
> ddr0/read-activate/ [Kernel PMU event]
> ddr0/read-command/ [Kernel PMU event]
> ddr0/read-cycles/ [Kernel PMU event]
> ddr0/read-modify-write-command/ [Kernel PMU event]
> ddr0/read-queue-depth/ [Kernel PMU event]
> ddr0/read-write-transition/ [Kernel PMU event]
> ddr0/read/ [Kernel PMU event]
> ddr0/refresh/ [Kernel PMU event]
> ddr0/selfresh/ [Kernel PMU event]
> ddr0/wr-xact-credit/ [Kernel PMU event]
> ddr0/write-access/ [Kernel PMU event]
> ddr0/write-command/ [Kernel PMU event]
> ddr0/write-credit-cnt/ [Kernel PMU event]
> ddr0/write-cycles/ [Kernel PMU event]
> ddr0/write-queue-depth/ [Kernel PMU event]
> ddr0/write/
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
> ---
> drivers/perf/Kconfig | 7 +
> drivers/perf/Makefile | 1 +
> drivers/perf/fsl_imx8_ddr_perf.c | 532 +++++++++++++++++++++++++++++++++++++++
> 3 files changed, 540 insertions(+)
> create mode 100644 drivers/perf/fsl_imx8_ddr_perf.c
[...]
> +static void ddr_perf_event_start(struct perf_event *event, int flags)
> +{
> + struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
> + struct hw_perf_event *hwc = &event->hw;
> + int counter = hwc->idx;
> +
> + if (pmu->devtype->flags & DDR_CAP_AXI_ID) {
> + if (event->attr.config == 0x41 ||
> + event->attr.config == 0x42) {
> + int val = event->attr.config1;
> + writel(val, pmu->base + COUNTER_DPCR1);
> + }
> + }
What exactly is this, and why are 0x41 and 0x42 special?
This should be described in the commit message, and probably in
Documentation/perf/, given this is unusual.
> +
> + local64_set(&hwc->prev_count, 0);
> +
> + ddr_perf_event_enable(pmu, event->attr.config, counter, true);
> + /*
> + * If the cycles counter wasn't explicitly selected,
> + * we will enable it now.
> + */
> + if (counter > 0 && !pmu->cycles_active)
> + ddr_perf_event_enable(pmu, EVENT_CYCLES_ID,
> + EVENT_CYCLES_COUNTER, true);
> +}
Why do we need to enable the cycle counter?
If this is a requirement, it should be described in the commit message.
> +static int ddr_perf_event_add(struct perf_event *event, int flags)
> +{
> + struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
> + struct hw_perf_event *hwc = &event->hw;
> + int counter;
> + int cfg = event->attr.config;
> +
> + counter = ddr_perf_alloc_counter(pmu, cfg);
> + if (counter < 0) {
> + dev_warn(pmu->dev, "There are not enough counters\n");
> + return -EOPNOTSUPP;
> + }
This should be dev_dbg(), not dev_warn().
> +static irqreturn_t ddr_perf_irq_handler(int irq, void *p)
> +{
> + int i;
> + u8 reg;
> + int val;
> + int counter;
> + struct ddr_pmu *pmu = (struct ddr_pmu *) p;
> + struct perf_event *event;
> +
> + /*
> + * The cycles counter has overflowed. Update all of the local counter
> + * values, then reset the cycles counter, so the others can continue
> + * counting.
> + */
Does the interrupt only fire when the cycle counter overflows?
i.e. there is no way to detect when other counters overflow?
> + for (i = 0; i <= pmu->total_events; i++) {
> + if (pmu->active_events[i] != NULL) {
> + event = pmu->active_events[i];
> + counter = event->hw.idx;
> + reg = counter * 4 + COUNTER_CNTL;
> + val = readl(pmu->base + reg);
> + ddr_perf_event_update(event);
> + if (val & CNTL_OVER) {
> + /* Clear counter, then re-enable it. */
> + ddr_perf_event_enable(pmu, event->attr.config,
> + counter, true);
> + /* Update event again to reset prev_count */
> + ddr_perf_event_update(event);
> + }
> + }
> + }
Depending on how events are added/removed, they may not be contiguous,
so it isn't correct to use total_events here. You need to check all
NUM_COUNTER slots.
Please also avoid nesting by using an early continue, e.g.
for (i = 0; i < NUM_COUNTER; i++) {
if (!pmu->active_events[i])
continue;
event = pmu->active_events[i];
counter = event->hw.idx;
...
}
> +
> + /*
> + * Reset the cycles counter regardless if it was explicitly
> + * enabled or not.
> + */
> + ddr_perf_event_enable(pmu, EVENT_CYCLES_ID,
> + EVENT_CYCLES_COUNTER, true);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int ddr_perf_probe(struct platform_device *pdev)
> +{
> + struct ddr_pmu *pmu;
> + struct device_node *np;
> + void __iomem *base;
> + struct resource *iomem;
> + char *name;
> + int num;
> + int ret;
> + u32 irq;
> + const struct of_device_id *of_id =
> + of_match_device(imx_ddr_pmu_dt_ids, &pdev->dev);
> +
> + iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + base = devm_ioremap_resource(&pdev->dev, iomem);
> + if (IS_ERR(base)) {
> + ret = PTR_ERR(base);
> + return ret;
> + }
> +
> + np = pdev->dev.of_node;
> +
> + pmu = kzalloc(sizeof(*pmu), GFP_KERNEL);
> + if (!pmu)
> + return -ENOMEM;
> +
> + num = ddr_perf_init(pmu, base, &pdev->dev);
> + name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "ddr%d", num);
> +
> + pmu->devtype = (struct fsl_ddr_devtype_data *)of_id->data;
> +
> + cpumask_set_cpu(smp_processor_id(), &pmu->cpu);
This will need a hotplug callback to handle context migration.
> + ret = perf_pmu_register(&(pmu->pmu), name, -1);
> + if (ret)
> + goto ddr_perf_err;
> +
> + /* Request irq */
> + irq = of_irq_get(np, 0);
> + if (irq < 0) {
> + pr_err("Failed to get irq: %d", irq);
> + goto ddr_perf_err;
> + }
> +
> + ret = devm_request_threaded_irq(&pdev->dev, irq,
> + ddr_perf_irq_handler, NULL,
> + IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> + DDR_PERF_DEV_NAME,
This should not be a threaded IRQ. Your code implicitly relies on mutual
exclusion between the IRQ handler and other code (e.g. when the perf
core code disables interrupts).
Thanks,
Mark.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support
2019-02-11 11:19 ` Mark Rutland
@ 2019-02-11 16:33 ` Zhi Li
0 siblings, 0 replies; 12+ messages in thread
From: Zhi Li @ 2019-02-11 16:33 UTC (permalink / raw)
To: Mark Rutland
Cc: Frank Li, will.deacon@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com,
dl-linux-imx, robh+dt@kernel.org, Aisheng Dong,
devicetree@vger.kernel.org
On Mon, Feb 11, 2019 at 5:19 AM Mark Rutland <mark.rutland@arm.com> wrote:
>
> On Fri, Feb 08, 2019 at 06:32:39PM +0000, Frank Li wrote:
> > Add ddr performance monitor support for iMX8QXP.
> > Support below events.
> >
> > ddr0/activate/ [Kernel PMU event]
> > ddr0/axid-read/ [Kernel PMU event]
> > ddr0/axid-write/ [Kernel PMU event]
> > ddr0/cycles/ [Kernel PMU event]
> > ddr0/hp-read-credit-cnt/ [Kernel PMU event]
> > ddr0/hp-read/ [Kernel PMU event]
> > ddr0/hp-req-nodcredit/ [Kernel PMU event]
> > ddr0/hp-xact-credit/ [Kernel PMU event]
> > ddr0/load-mode/ [Kernel PMU event]
> > ddr0/lp-read-credit-cnt/ [Kernel PMU event]
> > ddr0/lp-req-nocredit/ [Kernel PMU event]
> > ddr0/lp-xact-credit/ [Kernel PMU event]
> > ddr0/mwr/ [Kernel PMU event]
> > ddr0/precharge/ [Kernel PMU event]
> > ddr0/raw-hazard/ [Kernel PMU event]
> > ddr0/read-access/ [Kernel PMU event]
> > ddr0/read-activate/ [Kernel PMU event]
> > ddr0/read-command/ [Kernel PMU event]
> > ddr0/read-cycles/ [Kernel PMU event]
> > ddr0/read-modify-write-command/ [Kernel PMU event]
> > ddr0/read-queue-depth/ [Kernel PMU event]
> > ddr0/read-write-transition/ [Kernel PMU event]
> > ddr0/read/ [Kernel PMU event]
> > ddr0/refresh/ [Kernel PMU event]
> > ddr0/selfresh/ [Kernel PMU event]
> > ddr0/wr-xact-credit/ [Kernel PMU event]
> > ddr0/write-access/ [Kernel PMU event]
> > ddr0/write-command/ [Kernel PMU event]
> > ddr0/write-credit-cnt/ [Kernel PMU event]
> > ddr0/write-cycles/ [Kernel PMU event]
> > ddr0/write-queue-depth/ [Kernel PMU event]
> > ddr0/write/
> >
> > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> > ---
> > drivers/perf/Kconfig | 7 +
> > drivers/perf/Makefile | 1 +
> > drivers/perf/fsl_imx8_ddr_perf.c | 532 +++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 540 insertions(+)
> > create mode 100644 drivers/perf/fsl_imx8_ddr_perf.c
>
> [...]
>
> > +static void ddr_perf_event_start(struct perf_event *event, int flags)
> > +{
> > + struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
> > + struct hw_perf_event *hwc = &event->hw;
> > + int counter = hwc->idx;
> > +
> > + if (pmu->devtype->flags & DDR_CAP_AXI_ID) {
> > + if (event->attr.config == 0x41 ||
> > + event->attr.config == 0x42) {
> > + int val = event->attr.config1;
> > + writel(val, pmu->base + COUNTER_DPCR1);
> > + }
> > + }
>
> What exactly is this, and why are 0x41 and 0x42 special?
>
> This should be described in the commit message, and probably in
> Documentation/perf/, given this is unusual.
>
> > +
> > + local64_set(&hwc->prev_count, 0);
> > +
> > + ddr_perf_event_enable(pmu, event->attr.config, counter, true);
> > + /*
> > + * If the cycles counter wasn't explicitly selected,
> > + * we will enable it now.
> > + */
> > + if (counter > 0 && !pmu->cycles_active)
> > + ddr_perf_event_enable(pmu, EVENT_CYCLES_ID,
> > + EVENT_CYCLES_COUNTER, true);
> > +}
>
> Why do we need to enable the cycle counter?
>
> If this is a requirement, it should be described in the commit message.
>
> > +static int ddr_perf_event_add(struct perf_event *event, int flags)
> > +{
> > + struct ddr_pmu *pmu = to_ddr_pmu(event->pmu);
> > + struct hw_perf_event *hwc = &event->hw;
> > + int counter;
> > + int cfg = event->attr.config;
> > +
> > + counter = ddr_perf_alloc_counter(pmu, cfg);
> > + if (counter < 0) {
> > + dev_warn(pmu->dev, "There are not enough counters\n");
> > + return -EOPNOTSUPP;
> > + }
>
> This should be dev_dbg(), not dev_warn().
>
> > +static irqreturn_t ddr_perf_irq_handler(int irq, void *p)
> > +{
> > + int i;
> > + u8 reg;
> > + int val;
> > + int counter;
> > + struct ddr_pmu *pmu = (struct ddr_pmu *) p;
> > + struct perf_event *event;
> > +
> > + /*
> > + * The cycles counter has overflowed. Update all of the local counter
> > + * values, then reset the cycles counter, so the others can continue
> > + * counting.
> > + */
>
> Does the interrupt only fire when the cycle counter overflows?
>
> i.e. there is no way to detect when other counters overflow?
>
> > + for (i = 0; i <= pmu->total_events; i++) {
> > + if (pmu->active_events[i] != NULL) {
> > + event = pmu->active_events[i];
> > + counter = event->hw.idx;
> > + reg = counter * 4 + COUNTER_CNTL;
> > + val = readl(pmu->base + reg);
> > + ddr_perf_event_update(event);
> > + if (val & CNTL_OVER) {
> > + /* Clear counter, then re-enable it. */
> > + ddr_perf_event_enable(pmu, event->attr.config,
> > + counter, true);
> > + /* Update event again to reset prev_count */
> > + ddr_perf_event_update(event);
> > + }
> > + }
> > + }
>
> Depending on how events are added/removed, they may not be contiguous,
> so it isn't correct to use total_events here. You need to check all
> NUM_COUNTER slots.
>
> Please also avoid nesting by using an early continue, e.g.
>
> for (i = 0; i < NUM_COUNTER; i++) {
> if (!pmu->active_events[i])
> continue;
>
> event = pmu->active_events[i];
> counter = event->hw.idx;
>
> ...
> }
>
> > +
> > + /*
> > + * Reset the cycles counter regardless if it was explicitly
> > + * enabled or not.
> > + */
> > + ddr_perf_event_enable(pmu, EVENT_CYCLES_ID,
> > + EVENT_CYCLES_COUNTER, true);
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static int ddr_perf_probe(struct platform_device *pdev)
> > +{
> > + struct ddr_pmu *pmu;
> > + struct device_node *np;
> > + void __iomem *base;
> > + struct resource *iomem;
> > + char *name;
> > + int num;
> > + int ret;
> > + u32 irq;
> > + const struct of_device_id *of_id =
> > + of_match_device(imx_ddr_pmu_dt_ids, &pdev->dev);
> > +
> > + iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> > + base = devm_ioremap_resource(&pdev->dev, iomem);
> > + if (IS_ERR(base)) {
> > + ret = PTR_ERR(base);
> > + return ret;
> > + }
> > +
> > + np = pdev->dev.of_node;
> > +
> > + pmu = kzalloc(sizeof(*pmu), GFP_KERNEL);
> > + if (!pmu)
> > + return -ENOMEM;
> > +
> > + num = ddr_perf_init(pmu, base, &pdev->dev);
> > + name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "ddr%d", num);
> > +
> > + pmu->devtype = (struct fsl_ddr_devtype_data *)of_id->data;
> > +
> > + cpumask_set_cpu(smp_processor_id(), &pmu->cpu);
>
> This will need a hotplug callback to handle context migration.
Thanks, Other comments I known how to change.
this is global event, why need take care cpu hotplugs.
Do you have sample code how to handle hotplug callback?
best regards
Frank Li
>
> > + ret = perf_pmu_register(&(pmu->pmu), name, -1);
> > + if (ret)
> > + goto ddr_perf_err;
> > +
> > + /* Request irq */
> > + irq = of_irq_get(np, 0);
> > + if (irq < 0) {
> > + pr_err("Failed to get irq: %d", irq);
> > + goto ddr_perf_err;
> > + }
> > +
> > + ret = devm_request_threaded_irq(&pdev->dev, irq,
> > + ddr_perf_irq_handler, NULL,
> > + IRQF_TRIGGER_RISING | IRQF_ONESHOT,
> > + DDR_PERF_DEV_NAME,
>
> This should not be a threaded IRQ. Your code implicitly relies on mutual
> exclusion between the IRQ handler and other code (e.g. when the perf
> core code disables interrupts).
>
> Thanks,
> Mark.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2019-02-11 16:33 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-08 18:32 [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Frank Li
2019-02-08 18:32 ` [PATCH 2/4] arm64: dts: imx8qxp: added ddr performance monitor nodes Frank Li
2019-02-08 18:44 ` Fabio Estevam
2019-02-08 18:59 ` Zhi Li
2019-02-09 12:28 ` Fabio Estevam
2019-02-09 12:21 ` Fabio Estevam
2019-02-08 18:32 ` [PATCH 3/4] dt-bindings: perf: imx8-ddr: add imx8qxp ddr performance monitor Frank Li
2019-02-09 12:15 ` Fabio Estevam
2019-02-08 18:32 ` [PATCH 4/4] MAINTAINERS: Added imx DDR performonitor driver maintainer information Frank Li
2019-02-09 12:11 ` [PATCH 1/4] drivers/perf: imx_ddr: Add ddr performance counter support Fabio Estevam
2019-02-11 11:19 ` Mark Rutland
2019-02-11 16:33 ` Zhi Li
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).