[PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Jon Hunter]

Add the device-tree DFLL clock node and CPU regulator phandle for
tegra124 chromebooks to enable CPUFreq support on these boards.

Signed-off-by: Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

---
This has been tested on a tegra124 nyan-big by using the userspace
CPUFreq governor with a simple CPU benchmark to measure the time taken
for the test to execute.

The tegra124 chromebooks use the same ams,as3722 PMIC as the Jetson TK1
board and hence, this change is based upon that for the Jetson TK1.

 arch/arm/boot/dts/tegra124-nyan.dtsi | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index a9aec23e06f2..40c23a0b7cfc 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -159,7 +159,7 @@
 				vin-ldo9-10-supply = <&vdd_5v0_sys>;
 				vin-ldo11-supply = <&vdd_3v3_run>;
 
-				sd0 {
+				vdd_cpu: sd0 {
 					regulator-name = "+VDD_CPU_AP";
 					regulator-min-microvolt = <700000>;
 					regulator-max-microvolt = <1350000>;
@@ -397,6 +397,13 @@
 		non-removable;
 	};
 
+	/* CPU DFLL clock */
+	clock@0,70110000 {
+		status = "okay";
+		vdd-cpu-supply = <&vdd_cpu>;
+		nvidia,i2c-fs-rate = <400000>;
+	};
+
 	ahub@0,70300000 {
 		i2s@0,70301100 {
 			status = "okay";
@@ -487,6 +494,12 @@
 		};
 	};
 
+	cpus {
+		cpu@0 {
+			vdd-cpu-supply = <&vdd_cpu>;
+		};
+	};
+
 	gpio-keys {
 		compatible = "gpio-keys";
 
-- 
2.1.4

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Jon Hunter]

Adding LAKML. Jon

On 03/06/15 12:43, Jon Hunter wrote:
> Add the device-tree DFLL clock node and CPU regulator phandle for
> tegra124 chromebooks to enable CPUFreq support on these boards.
> 
> Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
> 
> ---
> This has been tested on a tegra124 nyan-big by using the userspace
> CPUFreq governor with a simple CPU benchmark to measure the time taken
> for the test to execute.
> 
> The tegra124 chromebooks use the same ams,as3722 PMIC as the Jetson TK1
> board and hence, this change is based upon that for the Jetson TK1.
> 
>  arch/arm/boot/dts/tegra124-nyan.dtsi | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
> index a9aec23e06f2..40c23a0b7cfc 100644
> --- a/arch/arm/boot/dts/tegra124-nyan.dtsi
> +++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
> @@ -159,7 +159,7 @@
>  				vin-ldo9-10-supply = <&vdd_5v0_sys>;
>  				vin-ldo11-supply = <&vdd_3v3_run>;
>  
> -				sd0 {
> +				vdd_cpu: sd0 {
>  					regulator-name = "+VDD_CPU_AP";
>  					regulator-min-microvolt = <700000>;
>  					regulator-max-microvolt = <1350000>;
> @@ -397,6 +397,13 @@
>  		non-removable;
>  	};
>  
> +	/* CPU DFLL clock */
> +	clock@0,70110000 {
> +		status = "okay";
> +		vdd-cpu-supply = <&vdd_cpu>;
> +		nvidia,i2c-fs-rate = <400000>;
> +	};
> +
>  	ahub@0,70300000 {
>  		i2s@0,70301100 {
>  			status = "okay";
> @@ -487,6 +494,12 @@
>  		};
>  	};
>  
> +	cpus {
> +		cpu@0 {
> +			vdd-cpu-supply = <&vdd_cpu>;
> +		};
> +	};
> +
>  	gpio-keys {
>  		compatible = "gpio-keys";
>  
> 

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Jon Hunter]

On 03/06/15 12:44, Jon Hunter wrote:
> Adding LAKML. Jon
> 
> On 03/06/15 12:43, Jon Hunter wrote:
>> Add the device-tree DFLL clock node and CPU regulator phandle for
>> tegra124 chromebooks to enable CPUFreq support on these boards.
>>
>> Signed-off-by: Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>>
>> ---
>> This has been tested on a tegra124 nyan-big by using the userspace
>> CPUFreq governor with a simple CPU benchmark to measure the time taken
>> for the test to execute.
>>
>> The tegra124 chromebooks use the same ams,as3722 PMIC as the Jetson TK1
>> board and hence, this change is based upon that for the Jetson TK1.
>>
>>  arch/arm/boot/dts/tegra124-nyan.dtsi | 15 ++++++++++++++-
>>  1 file changed, 14 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
>> index a9aec23e06f2..40c23a0b7cfc 100644
>> --- a/arch/arm/boot/dts/tegra124-nyan.dtsi
>> +++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
>> @@ -159,7 +159,7 @@
>>  				vin-ldo9-10-supply = <&vdd_5v0_sys>;
>>  				vin-ldo11-supply = <&vdd_3v3_run>;
>>  
>> -				sd0 {
>> +				vdd_cpu: sd0 {
>>  					regulator-name = "+VDD_CPU_AP";
>>  					regulator-min-microvolt = <700000>;
>>  					regulator-max-microvolt = <1350000>;
>> @@ -397,6 +397,13 @@
>>  		non-removable;
>>  	};
>>  
>> +	/* CPU DFLL clock */
>> +	clock@0,70110000 {
>> +		status = "okay";
>> +		vdd-cpu-supply = <&vdd_cpu>;
>> +		nvidia,i2c-fs-rate = <400000>;
>> +	};
>> +
>>  	ahub@0,70300000 {
>>  		i2s@0,70301100 {
>>  			status = "okay";
>> @@ -487,6 +494,12 @@
>>  		};
>>  	};
>>  
>> +	cpus {
>> +		cpu@0 {
>> +			vdd-cpu-supply = <&vdd_cpu>;
>> +		};
>> +	};
>> +
>>  	gpio-keys {
>>  		compatible = "gpio-keys";

Stephen, Thierry,

Are you ok with this change?

Jon

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Tomeu Vizoso]

On 13 July 2015 at 15:08, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
> On 03/06/15 12:44, Jon Hunter wrote:
>> Adding LAKML. Jon
>>
>> On 03/06/15 12:43, Jon Hunter wrote:
>>> Add the device-tree DFLL clock node and CPU regulator phandle for
>>> tegra124 chromebooks to enable CPUFreq support on these boards.

Ping.

Thanks,

Tomeu

>>> Signed-off-by: Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>>>
>>> ---
>>> This has been tested on a tegra124 nyan-big by using the userspace
>>> CPUFreq governor with a simple CPU benchmark to measure the time taken
>>> for the test to execute.
>>>
>>> The tegra124 chromebooks use the same ams,as3722 PMIC as the Jetson TK1
>>> board and hence, this change is based upon that for the Jetson TK1.
>>>
>>>  arch/arm/boot/dts/tegra124-nyan.dtsi | 15 ++++++++++++++-
>>>  1 file changed, 14 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
>>> index a9aec23e06f2..40c23a0b7cfc 100644
>>> --- a/arch/arm/boot/dts/tegra124-nyan.dtsi
>>> +++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
>>> @@ -159,7 +159,7 @@
>>>                              vin-ldo9-10-supply = <&vdd_5v0_sys>;
>>>                              vin-ldo11-supply = <&vdd_3v3_run>;
>>>
>>> -                            sd0 {
>>> +                            vdd_cpu: sd0 {
>>>                                      regulator-name = "+VDD_CPU_AP";
>>>                                      regulator-min-microvolt = <700000>;
>>>                                      regulator-max-microvolt = <1350000>;
>>> @@ -397,6 +397,13 @@
>>>              non-removable;
>>>      };
>>>
>>> +    /* CPU DFLL clock */
>>> +    clock@0,70110000 {
>>> +            status = "okay";
>>> +            vdd-cpu-supply = <&vdd_cpu>;
>>> +            nvidia,i2c-fs-rate = <400000>;
>>> +    };
>>> +
>>>      ahub@0,70300000 {
>>>              i2s@0,70301100 {
>>>                      status = "okay";
>>> @@ -487,6 +494,12 @@
>>>              };
>>>      };
>>>
>>> +    cpus {
>>> +            cpu@0 {
>>> +                    vdd-cpu-supply = <&vdd_cpu>;
>>> +            };
>>> +    };
>>> +
>>>      gpio-keys {
>>>              compatible = "gpio-keys";
>
> Stephen, Thierry,
>
> Are you ok with this change?
>
> Jon
> --
> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 655 bytes --]

On Thu, Sep 03, 2015 at 03:40:45PM +0200, Tomeu Vizoso wrote:
> On 13 July 2015 at 15:08, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
> > On 03/06/15 12:44, Jon Hunter wrote:
> >> Adding LAKML. Jon
> >>
> >> On 03/06/15 12:43, Jon Hunter wrote:
> >>> Add the device-tree DFLL clock node and CPU regulator phandle for
> >>> tegra124 chromebooks to enable CPUFreq support on these boards.
> 
> Ping.
> 
> Thanks,

Sorry that this has gone unnoticed for so long. I've applied it now to
the for-4.4/dt branch.

Tomeu, do you want me to add your Tested-by, Reviewed-by or Acked-by
before I push this out?

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Tomeu Vizoso]

On 15 September 2015 at 10:12, Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Thu, Sep 03, 2015 at 03:40:45PM +0200, Tomeu Vizoso wrote:
>> On 13 July 2015 at 15:08, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
>> > On 03/06/15 12:44, Jon Hunter wrote:
>> >> Adding LAKML. Jon
>> >>
>> >> On 03/06/15 12:43, Jon Hunter wrote:
>> >>> Add the device-tree DFLL clock node and CPU regulator phandle for
>> >>> tegra124 chromebooks to enable CPUFreq support on these boards.
>>
>> Ping.
>>
>> Thanks,
>
> Sorry that this has gone unnoticed for so long. I've applied it now to
> the for-4.4/dt branch.
>
> Tomeu, do you want me to add your Tested-by, Reviewed-by or Acked-by
> before I push this out?

I haven't done proper tests, but I have tested for several weeks a
branch containing these changes on a nyan-big and have found no
issues.

You can add my Reviewed-by though. Sorry for not having made this clear.

Thanks,

Tomeu

> Thierry

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Jon Hunter]

On 15/09/15 10:00, Tomeu Vizoso wrote:
> On 15 September 2015 at 10:12, Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> On Thu, Sep 03, 2015 at 03:40:45PM +0200, Tomeu Vizoso wrote:
>>> On 13 July 2015 at 15:08, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
>>>> On 03/06/15 12:44, Jon Hunter wrote:
>>>>> Adding LAKML. Jon
>>>>>
>>>>> On 03/06/15 12:43, Jon Hunter wrote:
>>>>>> Add the device-tree DFLL clock node and CPU regulator phandle for
>>>>>> tegra124 chromebooks to enable CPUFreq support on these boards.
>>>
>>> Ping.
>>>
>>> Thanks,
>>
>> Sorry that this has gone unnoticed for so long. I've applied it now to
>> the for-4.4/dt branch.
>>
>> Tomeu, do you want me to add your Tested-by, Reviewed-by or Acked-by
>> before I push this out?
> 
> I haven't done proper tests, but I have tested for several weeks a
> branch containing these changes on a nyan-big and have found no
> issues.
> 
> You can add my Reviewed-by though. Sorry for not having made this clear.

I have noticed that system suspend to LP1 is not working on the nyan-big
with linux-next and never exits suspend. It appears that this patch is
the culprit. I tested cpufreq was changing the frequency as expected but
I did not test suspend.

I have tested suspend on the jetson-tk1 with linux-next that also has
cpufreq enabled and do not see any problems.

Adding Mikko ... Mikko do you know of any reason why cpufreq could cause
problems with suspend? I am guessing it is to do with the different
clock used for the CPUs. Any thoughts?

Tomeu, have you tried suspend on a nyan-big with next?

I am testing with "rtcwake -d rtc1 -m mem -s 5".

Thierry, we may need to comment out these changes for 4.3 or revert this
patch altogether.

Cheers
Jon

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Jon Hunter]

Correcting Mikko's email ...

On 04/11/15 12:16, Jon Hunter wrote:
> 
> On 15/09/15 10:00, Tomeu Vizoso wrote:
>> On 15 September 2015 at 10:12, Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>> On Thu, Sep 03, 2015 at 03:40:45PM +0200, Tomeu Vizoso wrote:
>>>> On 13 July 2015 at 15:08, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
>>>>> On 03/06/15 12:44, Jon Hunter wrote:
>>>>>> Adding LAKML. Jon
>>>>>>
>>>>>> On 03/06/15 12:43, Jon Hunter wrote:
>>>>>>> Add the device-tree DFLL clock node and CPU regulator phandle for
>>>>>>> tegra124 chromebooks to enable CPUFreq support on these boards.
>>>>
>>>> Ping.
>>>>
>>>> Thanks,
>>>
>>> Sorry that this has gone unnoticed for so long. I've applied it now to
>>> the for-4.4/dt branch.
>>>
>>> Tomeu, do you want me to add your Tested-by, Reviewed-by or Acked-by
>>> before I push this out?
>>
>> I haven't done proper tests, but I have tested for several weeks a
>> branch containing these changes on a nyan-big and have found no
>> issues.
>>
>> You can add my Reviewed-by though. Sorry for not having made this clear.
> 
> I have noticed that system suspend to LP1 is not working on the nyan-big
> with linux-next and never exits suspend. It appears that this patch is
> the culprit. I tested cpufreq was changing the frequency as expected but
> I did not test suspend.
> 
> I have tested suspend on the jetson-tk1 with linux-next that also has
> cpufreq enabled and do not see any problems.
> 
> Adding Mikko ... Mikko do you know of any reason why cpufreq could cause
> problems with suspend? I am guessing it is to do with the different
> clock used for the CPUs. Any thoughts?
> 
> Tomeu, have you tried suspend on a nyan-big with next?
> 
> I am testing with "rtcwake -d rtc1 -m mem -s 5".
> 
> Thierry, we may need to comment out these changes for 4.3 or revert this
> patch altogether.
> 
> Cheers
> Jon
> --
> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Jon Hunter]

On 04/11/15 12:19, Jon Hunter wrote:
> Correcting Mikko's email ...
> 
> On 04/11/15 12:16, Jon Hunter wrote:
>>
>> On 15/09/15 10:00, Tomeu Vizoso wrote:
>>> On 15 September 2015 at 10:12, Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>>> On Thu, Sep 03, 2015 at 03:40:45PM +0200, Tomeu Vizoso wrote:
>>>>> On 13 July 2015 at 15:08, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
>>>>>> On 03/06/15 12:44, Jon Hunter wrote:
>>>>>>> Adding LAKML. Jon
>>>>>>>
>>>>>>> On 03/06/15 12:43, Jon Hunter wrote:
>>>>>>>> Add the device-tree DFLL clock node and CPU regulator phandle for
>>>>>>>> tegra124 chromebooks to enable CPUFreq support on these boards.
>>>>>
>>>>> Ping.
>>>>>
>>>>> Thanks,
>>>>
>>>> Sorry that this has gone unnoticed for so long. I've applied it now to
>>>> the for-4.4/dt branch.
>>>>
>>>> Tomeu, do you want me to add your Tested-by, Reviewed-by or Acked-by
>>>> before I push this out?
>>>
>>> I haven't done proper tests, but I have tested for several weeks a
>>> branch containing these changes on a nyan-big and have found no
>>> issues.
>>>
>>> You can add my Reviewed-by though. Sorry for not having made this clear.
>>
>> I have noticed that system suspend to LP1 is not working on the nyan-big
>> with linux-next and never exits suspend. It appears that this patch is
>> the culprit. I tested cpufreq was changing the frequency as expected but
>> I did not test suspend.

By the way, LP2 works fine with this change, it is just when LP1 is
enabled (which is the default).

Jon

Re: [PATCH] ARM: tegra: Enable CPUFreq support for Tegra124 Chromebooks

[Jon Hunter]

On 04/11/15 13:23, Jon Hunter wrote:
> 
> On 04/11/15 12:19, Jon Hunter wrote:
>> Correcting Mikko's email ...
>>
>> On 04/11/15 12:16, Jon Hunter wrote:
>>>
>>> On 15/09/15 10:00, Tomeu Vizoso wrote:
>>>> On 15 September 2015 at 10:12, Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>>>> On Thu, Sep 03, 2015 at 03:40:45PM +0200, Tomeu Vizoso wrote:
>>>>>> On 13 July 2015 at 15:08, Jon Hunter <jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
>>>>>>> On 03/06/15 12:44, Jon Hunter wrote:
>>>>>>>> Adding LAKML. Jon
>>>>>>>>
>>>>>>>> On 03/06/15 12:43, Jon Hunter wrote:
>>>>>>>>> Add the device-tree DFLL clock node and CPU regulator phandle for
>>>>>>>>> tegra124 chromebooks to enable CPUFreq support on these boards.
>>>>>>
>>>>>> Ping.
>>>>>>
>>>>>> Thanks,
>>>>>
>>>>> Sorry that this has gone unnoticed for so long. I've applied it now to
>>>>> the for-4.4/dt branch.
>>>>>
>>>>> Tomeu, do you want me to add your Tested-by, Reviewed-by or Acked-by
>>>>> before I push this out?
>>>>
>>>> I haven't done proper tests, but I have tested for several weeks a
>>>> branch containing these changes on a nyan-big and have found no
>>>> issues.
>>>>
>>>> You can add my Reviewed-by though. Sorry for not having made this clear.
>>>
>>> I have noticed that system suspend to LP1 is not working on the nyan-big
>>> with linux-next and never exits suspend. It appears that this patch is
>>> the culprit. I tested cpufreq was changing the frequency as expected but
>>> I did not test suspend.
> 
> By the way, LP2 works fine with this change, it is just when LP1 is
> enabled (which is the default).

Quick update on this ... it appears that the cause of the lock-up is
related to pll_x (default pll that clocks the cpu cluster before
switching to the dfll). On the jetson-tk1 the pll_x is running at 696MHz
where as on the nyan-big it is running at 2.1GHz. Although the pll is
disabled when switching to dfll, having it configured for 2.1GHz on the
nyan-big is causing a hang during suspend if the dfll is running at much
lower frequencies (>1.5GHz) than the pll_x. So seems like the CPU
voltage is too low for the pll_x, however, it should be disabled?!?

If I hack the cpufreq code to set the pll_x to 696MHz after switching to
the dfll on the nyan-big then the problem goes away ...

diff --git a/drivers/cpufreq/tegra124-cpufreq.c
b/drivers/cpufreq/tegra124-cpufreq.c
index 20bcceb58ccc..a87cef4071e8 100644
--- a/drivers/cpufreq/tegra124-cpufreq.c
+++ b/drivers/cpufreq/tegra124-cpufreq.c
@@ -53,6 +53,10 @@ static int tegra124_cpu_switch_to_dfll(struct
tegra124_cpufreq_priv *priv)

        clk_set_parent(priv->cpu_clk, priv->dfll_clk);

+       ret = clk_set_rate(priv->pllx_clk, 696000000);
+       if (ret)
+               return ret;
+
        return 0;

Need to figure out if the suspend code is touching the pll_x.

Jon