[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <AM3PR04MB131556AF9BDE24E071A51300F51D0@AM3PR04MB1315.eurprd04.prod.outlook.com>
Date: Sat, 6 Jan 2018 03:05:41 +0000
From: Anson Huang <anson.huang@....com>
To: "Rafael J. Wysocki" <rafael@...nel.org>
CC: "linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
Linux PM <linux-pm@...r.kernel.org>,
"Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>,
Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <kernel@...gutronix.de>,
Fabio Estevam <fabio.estevam@....com>,
Rob Herring <robh+dt@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Russell King - ARM Linux <linux@...linux.org.uk>,
"Rafael J. Wysocki" <rjw@...ysocki.net>,
Viresh Kumar <viresh.kumar@...aro.org>,
Jacky Bai <ping.bai@....com>,
"A.s. Dong" <aisheng.dong@....com>
Subject: RE: [PATCH 2/2] cpufreq: imx6q: add 696MHz operating point for
i.mx6ul
Hi, Rafael
Best Regards!
Anson Huang
> -----Original Message-----
> From: rjwysocki@...il.com [mailto:rjwysocki@...il.com] On Behalf Of Rafael
> J. Wysocki
> Sent: 2018-01-05 8:21 PM
> To: Anson Huang <anson.huang@....com>
> Cc: linux-arm-kernel@...ts.infradead.org; devicetree@...r.kernel.org; Linux
> PM <linux-pm@...r.kernel.org>; Linux Kernel Mailing List <linux-
> kernel@...r.kernel.org>; Shawn Guo <shawnguo@...nel.org>; Sascha Hauer
> <kernel@...gutronix.de>; Fabio Estevam <fabio.estevam@....com>; Rob
> Herring <robh+dt@...nel.org>; Mark Rutland <mark.rutland@....com>;
> Russell King - ARM Linux <linux@...linux.org.uk>; Rafael J. Wysocki
> <rjw@...ysocki.net>; Viresh Kumar <viresh.kumar@...aro.org>; Jacky Bai
> <ping.bai@....com>; A.s. Dong <aisheng.dong@....com>
> Subject: Re: [PATCH 2/2] cpufreq: imx6q: add 696MHz operating point for
> i.mx6ul
>
> On Tue, Jan 2, 2018 at 6:07 PM, Anson Huang <Anson.Huang@....com> wrote:
> > Add 696MHz operating point for i.MX6UL, only for those parts with
> > speed grading fuse set to 2b'10 supports 696MHz operating point, so,
> > speed grading check is also added for i.MX6UL in this patch, the clock
> > tree for each operating point are as below:
> >
> > 696MHz:
> > pll1 696000000
> > pll1_bypass 696000000
> > pll1_sys 696000000
> > pll1_sw 696000000
> > arm 696000000
> > 528MHz:
> > pll2 528000000
> > pll2_bypass 528000000
> > pll2_bus 528000000
> > ca7_secondary_sel 528000000
> > step 528000000
> > pll1_sw 528000000
> > arm 528000000
> > 396MHz:
> > pll2_pfd2_396m 396000000
> > ca7_secondary_sel 396000000
> > step 396000000
> > pll1_sw 396000000
> > arm 396000000
> > 198MHz:
> > pll2_pfd2_396m 396000000
> > ca7_secondary_sel 396000000
> > step 396000000
> > pll1_sw 396000000
> > arm 198000000
> >
> > Signed-off-by: Anson Huang <Anson.Huang@....com>
>
> This doesn't apply for me and in a nontrivial way.
>
> What kernel is it against?
I did it based on linux-next, it should be on linux-next-pm branch, I redo
the patch set V2 based on linux-next-pm, also redo the test,
sorry for the inconvenience.
Anson.
>
> > ---
> > drivers/cpufreq/imx6q-cpufreq.c | 46
> > ++++++++++++++++++++++++++++++++++++++++-
> > 1 file changed, 45 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/cpufreq/imx6q-cpufreq.c
> > b/drivers/cpufreq/imx6q-cpufreq.c index d9b2c2d..cbda0cc 100644
> > --- a/drivers/cpufreq/imx6q-cpufreq.c
> > +++ b/drivers/cpufreq/imx6q-cpufreq.c
> > @@ -120,6 +120,10 @@ static int imx6q_set_target(struct cpufreq_policy
> *policy, unsigned int index)
> > clk_set_parent(secondary_sel_clk, pll2_pfd2_396m_clk);
> > clk_set_parent(step_clk, secondary_sel_clk);
> > clk_set_parent(pll1_sw_clk, step_clk);
> > + if (freq_hz > clk_get_rate(pll2_bus_clk)) {
> > + clk_set_rate(pll1_sys_clk, new_freq * 1000);
> > + clk_set_parent(pll1_sw_clk, pll1_sys_clk);
> > + }
> > } else {
> > clk_set_parent(step_clk, pll2_pfd2_396m_clk);
> > clk_set_parent(pll1_sw_clk, step_clk); @@ -244,6
> > +248,43 @@ static void imx6q_opp_check_speed_grading(struct device *dev)
> > of_node_put(np);
> > }
> >
> > +#define OCOTP_CFG3_6UL_SPEED_696MHZ 0x2
> > +
> > +static void imx6ul_opp_check_speed_grading(struct device *dev) {
> > + struct device_node *np;
> > + void __iomem *base;
> > + u32 val;
> > +
> > + np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-ocotp");
> > + if (!np)
> > + return;
> > +
> > + base = of_iomap(np, 0);
> > + if (!base) {
> > + dev_err(dev, "failed to map ocotp\n");
> > + goto put_node;
> > + }
> > +
> > + /*
> > + * Speed GRADING[1:0] defines the max speed of ARM:
> > + * 2b'00: Reserved;
> > + * 2b'01: 528000000Hz;
> > + * 2b'10: 696000000Hz;
> > + * 2b'11: Reserved;
> > + * We need to set the max speed of ARM according to fuse map.
> > + */
> > + val = readl_relaxed(base + OCOTP_CFG3);
> > + val >>= OCOTP_CFG3_SPEED_SHIFT;
> > + val &= 0x3;
> > + if (val != OCOTP_CFG3_6UL_SPEED_696MHZ)
> > + if (dev_pm_opp_disable(dev, 696000000))
> > + dev_warn(dev, "failed to disable 696MHz OPP\n");
> > + iounmap(base);
> > +put_node:
> > + of_node_put(np);
> > +}
> > +
> > static int imx6q_cpufreq_probe(struct platform_device *pdev) {
> > struct device_node *np;
> > @@ -311,7 +352,10 @@ static int imx6q_cpufreq_probe(struct
> platform_device *pdev)
> > goto put_reg;
> > }
> >
> > - imx6q_opp_check_speed_grading(cpu_dev);
> > + if (of_machine_is_compatible("fsl,imx6ul"))
> > + imx6ul_opp_check_speed_grading(cpu_dev);
> > + else
> > + imx6q_opp_check_speed_grading(cpu_dev);
> >
> > /* Because we have added the OPPs here, we must free them */
> > free_opp = true;
> > --
> > 1.9.1
> >
Powered by blists - more mailing lists