* [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP
@ 2016-11-07 17:30 Frank Li
2016-11-07 17:30 ` [PATCH V3 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc Frank Li
2016-11-14 5:36 ` [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP Shawn Guo
0 siblings, 2 replies; 4+ messages in thread
From: Frank Li @ 2016-11-07 17:30 UTC (permalink / raw)
To: shawnguo, frank.li
Cc: linux-arm-kernel, linux-kernel, peterz, mingo, acme,
alexander.shishkin, lznuaa, mark.rutland, Frank Li
i.MX6QP added new register bit PROFILE_SEL in MADPCR0.
need set it at perf start.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Change from V2 - V3
- Use MMDC_FLAG_PROFILE_SEL
- Use flags instead of driver_data
- fix commit message typo
- add const
- use u32 val.
Change from V1 - V2
- remove fsl_mmdc_devtype
arch/arm/mach-imx/mmdc.c | 38 ++++++++++++++++++++++++++++++++------
1 file changed, 32 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c
index d82d14c..ba96bf9 100644
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -44,6 +44,7 @@
#define DBG_RST 0x2
#define PRF_FRZ 0x4
#define CYC_OVF 0x8
+#define PROFILE_SEL 0x10
#define MMDC_MADPCR0 0x410
#define MMDC_MADPSR0 0x418
@@ -55,10 +56,29 @@
#define MMDC_NUM_COUNTERS 6
+#define MMDC_FLAG_PROFILE_SEL 0x1
+
#define to_mmdc_pmu(p) container_of(p, struct mmdc_pmu, pmu)
static int ddr_type;
+struct fsl_mmdc_devtype_data {
+ unsigned int flags;
+};
+
+static const struct fsl_mmdc_devtype_data imx6q_data = {
+};
+
+static const struct fsl_mmdc_devtype_data imx6qp_data = {
+ .flags = MMDC_FLAG_PROFILE_SEL,
+};
+
+static const struct of_device_id imx_mmdc_dt_ids[] = {
+ { .compatible = "fsl,imx6q-mmdc", .data = (void *)&imx6q_data},
+ { .compatible = "fsl,imx6qp-mmdc", .data = (void *)&imx6qp_data},
+ { /* sentinel */ }
+};
+
#ifdef CONFIG_PERF_EVENTS
static DEFINE_IDA(mmdc_ida);
@@ -83,6 +103,7 @@ struct mmdc_pmu {
struct device *dev;
struct perf_event *mmdc_events[MMDC_NUM_COUNTERS];
struct hlist_node node;
+ struct fsl_mmdc_devtype_data *devtype_data;
};
/*
@@ -307,6 +328,7 @@ static void mmdc_pmu_event_start(struct perf_event *event, int flags)
struct mmdc_pmu *pmu_mmdc = to_mmdc_pmu(event->pmu);
struct hw_perf_event *hwc = &event->hw;
void __iomem *mmdc_base, *reg;
+ u32 val;
mmdc_base = pmu_mmdc->mmdc_base;
reg = mmdc_base + MMDC_MADPCR0;
@@ -321,7 +343,12 @@ static void mmdc_pmu_event_start(struct perf_event *event, int flags)
local64_set(&hwc->prev_count, 0);
writel(DBG_RST, reg);
- writel(DBG_EN, reg);
+
+ val = DBG_EN;
+ if (pmu_mmdc->devtype_data->flags & MMDC_FLAG_PROFILE_SEL)
+ val |= PROFILE_SEL;
+
+ writel(val, reg);
}
static int mmdc_pmu_event_add(struct perf_event *event, int flags)
@@ -436,6 +463,8 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
char *name;
int mmdc_num;
int ret;
+ const struct of_device_id *of_id =
+ of_match_device(imx_mmdc_dt_ids, &pdev->dev);
pmu_mmdc = kzalloc(sizeof(*pmu_mmdc), GFP_KERNEL);
if (!pmu_mmdc) {
@@ -450,6 +479,8 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
name = devm_kasprintf(&pdev->dev,
GFP_KERNEL, "mmdc%d", mmdc_num);
+ pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
+
hrtimer_init(&pmu_mmdc->hrtimer, CLOCK_MONOTONIC,
HRTIMER_MODE_REL);
pmu_mmdc->hrtimer.function = mmdc_pmu_timer_handler;
@@ -524,11 +555,6 @@ int imx_mmdc_get_ddr_type(void)
return ddr_type;
}
-static const struct of_device_id imx_mmdc_dt_ids[] = {
- { .compatible = "fsl,imx6q-mmdc", },
- { /* sentinel */ }
-};
-
static struct platform_driver imx_mmdc_driver = {
.driver = {
.name = "imx-mmdc",
--
2.5.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH V3 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc
2016-11-07 17:30 [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP Frank Li
@ 2016-11-07 17:30 ` Frank Li
2016-11-14 5:37 ` Shawn Guo
2016-11-14 5:36 ` [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP Shawn Guo
1 sibling, 1 reply; 4+ messages in thread
From: Frank Li @ 2016-11-07 17:30 UTC (permalink / raw)
To: shawnguo, frank.li
Cc: linux-arm-kernel, linux-kernel, peterz, mingo, acme,
alexander.shishkin, lznuaa, mark.rutland, Frank Li
MMDC has a slightly different programming model between imx6q and imx6qp
in terms of perf support, it's exactly same for suspend support, so we
have fsl,imx6q-mmdc here to save patching suspend driver with the new
compatible.
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Change from V3 to V2
- change commit message to show suspend need fsl,imx6q-mmdc
arch/arm/boot/dts/imx6qp.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/imx6qp.dtsi b/arch/arm/boot/dts/imx6qp.dtsi
index 886dbf2..e0fdd0f 100644
--- a/arch/arm/boot/dts/imx6qp.dtsi
+++ b/arch/arm/boot/dts/imx6qp.dtsi
@@ -85,5 +85,12 @@
pcie: pcie@0x01000000 {
compatible = "fsl,imx6qp-pcie", "snps,dw-pcie";
};
+
+ aips-bus@02100000 {
+ mmdc0: mmdc@021b0000 { /* MMDC0 */
+ compatible = "fsl,imx6qp-mmdc", "fsl,imx6q-mmdc";
+ reg = <0x021b0000 0x4000>;
+ };
+ };
};
};
--
2.5.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP
2016-11-07 17:30 [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP Frank Li
2016-11-07 17:30 ` [PATCH V3 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc Frank Li
@ 2016-11-14 5:36 ` Shawn Guo
1 sibling, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2016-11-14 5:36 UTC (permalink / raw)
To: Frank Li
Cc: linux-arm-kernel, linux-kernel, peterz, mingo, acme,
alexander.shishkin, lznuaa, mark.rutland
On Mon, Nov 07, 2016 at 11:30:48AM -0600, Frank Li wrote:
> i.MX6QP added new register bit PROFILE_SEL in MADPCR0.
> need set it at perf start.
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH V3 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc
2016-11-07 17:30 ` [PATCH V3 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc Frank Li
@ 2016-11-14 5:37 ` Shawn Guo
0 siblings, 0 replies; 4+ messages in thread
From: Shawn Guo @ 2016-11-14 5:37 UTC (permalink / raw)
To: Frank Li
Cc: mark.rutland, peterz, linux-kernel, acme, alexander.shishkin,
mingo, lznuaa, linux-arm-kernel
On Mon, Nov 07, 2016 at 11:30:49AM -0600, Frank Li wrote:
> MMDC has a slightly different programming model between imx6q and imx6qp
> in terms of perf support, it's exactly same for suspend support, so we
> have fsl,imx6q-mmdc here to save patching suspend driver with the new
> compatible.
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
s/stream/string in subject.
I fixed it up and applied the patch.
Shawn
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-14 5:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-07 17:30 [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP Frank Li
2016-11-07 17:30 ` [PATCH V3 2/2] ARM: dts: add new compatible stream for i.MX6QP mmdc Frank Li
2016-11-14 5:37 ` Shawn Guo
2016-11-14 5:36 ` [PATCH V3 1/2] ARM: imx: mmdc perf function support i.MX6QP Shawn Guo
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).