| Message ID | 20200104063505.219030-4-anarsoul@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: allwinner: a64: Enable DVFS on A64 | expand |
Hi! On Fri, Jan 03, 2020 at 10:35:05PM -0800, Vasily Khoruzhick wrote: > Add CPU regulator, CPU clock, operation points and thermal trip points > to enable DVFS on A64 > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > --- > .../allwinner/sun50i-a64-amarula-relic.dts | 4 + > .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 + > .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 + > .../dts/allwinner/sun50i-a64-olinuxino.dts | 4 + > .../dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + > .../boot/dts/allwinner/sun50i-a64-pine64.dts | 4 + > .../dts/allwinner/sun50i-a64-pinebook.dts | 4 + > .../allwinner/sun50i-a64-sopine-baseboard.dts | 4 + > .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 4 + > .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 4 + > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 102 ++++++++++++++++++ > 11 files changed, 142 insertions(+) > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts > index 5634245d11db..43f6ac0beed6 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts > @@ -65,6 +65,10 @@ wifi_pwrseq: wifi-pwrseq { > }; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &csi { > status = "okay"; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > index 208373efee49..cbcab80de8c5 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > @@ -108,6 +108,10 @@ &codec_analog { > status = "okay"; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &dai { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts > index 9b9d9157128c..6708acf94d01 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts > @@ -87,6 +87,10 @@ wifi_pwrseq: wifi_pwrseq { > }; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &de { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts > index 01a9a52edae4..f94e60eb4ec2 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts > @@ -87,6 +87,10 @@ wifi_pwrseq: wifi_pwrseq { > }; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &de { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > index f54a415f2e3b..2793afba4884 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > @@ -123,6 +123,10 @@ &codec_analog { > status = "okay"; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &dai { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts > index 409523cb0950..04aa452d4400 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts > @@ -84,6 +84,10 @@ &codec_analog { > status = "okay"; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &dai { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts > index 78c82a665c84..365d85c16deb 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts > @@ -98,6 +98,10 @@ &codec_analog { > status = "okay"; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &dai { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts > index 920103ec0046..e760e8efdf3e 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts > @@ -100,6 +100,10 @@ &codec_analog { > status = "okay"; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &dai { > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi > index 9d20e13f0c02..3d8e2d452ce1 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi > @@ -51,6 +51,10 @@ &codec_analog { > cpvdd-supply = <®_eldo1>; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &mmc0 { > pinctrl-names = "default"; > pinctrl-0 = <&mmc0_pins>; > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > index 970415106dcf..28edcef8bed1 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > @@ -104,6 +104,10 @@ &de { > status = "okay"; > }; > > +&cpu0 { > + cpu-supply = <®_dcdc2>; > +}; > + > &ehci1 { > status = "okay"; > }; Did you test it on all those boards (and if so, how were the OPP tested), or was it done simply by looking at the schematics? > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > index 5e3f16c3b706..7f37c8cd1b6e 100644 > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > @@ -80,6 +80,52 @@ simplefb_hdmi: framebuffer-hdmi { > }; > }; > > + cpu0_opp_table: opp_table0 { > + compatible = "operating-points-v2"; > + opp-shared; > + > + opp-648000000 { > + opp-hz = /bits/ 64 <648000000>; > + opp-microvolt = <1040000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; > + opp-816000000 { > + opp-hz = /bits/ 64 <816000000>; > + opp-microvolt = <1100000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; Nit: having new lines between the nodes would be great > + opp-912000000 { > + opp-hz = /bits/ 64 <912000000>; > + opp-microvolt = <1120000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; > + opp-960000000 { > + opp-hz = /bits/ 64 <960000000>; > + opp-microvolt = <1160000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; > + opp-1008000000 { > + opp-hz = /bits/ 64 <1008000000>; > + opp-microvolt = <1200000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; > + opp-1056000000 { > + opp-hz = /bits/ 64 <1056000000>; > + opp-microvolt = <1240000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; > + opp-1104000000 { > + opp-hz = /bits/ 64 <1104000000>; > + opp-microvolt = <1260000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; > + opp-1152000000 { > + opp-hz = /bits/ 64 <1152000000>; > + opp-microvolt = <1300000>; > + clock-latency-ns = <244144>; /* 8 32k periods */ > + }; > + }; > + What frequency is setup by U-Boot? If it's 1008 MHz as usual, then having the OPP above that frequency by default means that a board that doesn't set cpu-supply (or doesn't set it up properly) will be unstable, since it will increase the frequency, but not the voltage, and the voltage isn't enough for that new frequency. The way we've done it so far on the SoCs in a similar situation (A33, A83t) is only to list the OPP below the frequency set up by U-Boot in the DTSI, and list the frequencies above that in the boards that add cpu-supply. Given that it seems that we need to have them listed on number of boards, I guess we could add a separate DTSI that would be included only by the boards setting cpu-supply? > cpus { > #address-cells = <1>; > #size-cells = <0>; > @@ -90,6 +136,10 @@ cpu0: cpu@0 { > reg = <0>; > enable-method = "psci"; > next-level-cache = <&L2>; > + clocks = <&ccu CLK_CPUX>; > + clock-names = "cpu"; > + operating-points-v2 = <&cpu0_opp_table>; > + #cooling-cells = <2>; > }; > > cpu1: cpu@1 { > @@ -98,6 +148,10 @@ cpu1: cpu@1 { > reg = <1>; > enable-method = "psci"; > next-level-cache = <&L2>; > + clocks = <&ccu CLK_CPUX>; > + clock-names = "cpu"; > + operating-points-v2 = <&cpu0_opp_table>; > + #cooling-cells = <2>; > }; > > cpu2: cpu@2 { > @@ -106,6 +160,10 @@ cpu2: cpu@2 { > reg = <2>; > enable-method = "psci"; > next-level-cache = <&L2>; > + clocks = <&ccu CLK_CPUX>; > + clock-names = "cpu"; > + operating-points-v2 = <&cpu0_opp_table>; > + #cooling-cells = <2>; > }; > > cpu3: cpu@3 { > @@ -114,6 +172,10 @@ cpu3: cpu@3 { > reg = <3>; > enable-method = "psci"; > next-level-cache = <&L2>; > + clocks = <&ccu CLK_CPUX>; > + clock-names = "cpu"; > + operating-points-v2 = <&cpu0_opp_table>; > + #cooling-cells = <2>; > }; > > L2: l2-cache { > @@ -218,6 +280,46 @@ cpu_thermal: cpu0-thermal { > polling-delay-passive = <0>; > polling-delay = <0>; > thermal-sensors = <&ths 0>; > + > + cooling-maps { > + map0 { > + trip = <&cpu_alert0>; > + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > + }; > + map1 { > + trip = <&cpu_alert1>; > + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > + }; > + }; > + > + trips { > + cpu_alert0: cpu_alert0 { > + /* milliCelsius */ > + temperature = <75000>; > + hysteresis = <2000>; > + type = "passive"; > + }; > + > + cpu_alert1: cpu_alert1 { > + /* milliCelsius */ > + temperature = <90000>; > + hysteresis = <2000>; > + type = "hot"; > + }; > + > + cpu_crit: cpu_crit { > + /* milliCelsius */ > + temperature = <110000>; > + hysteresis = <2000>; > + type = "critical"; > + }; > + }; > }; Where are those tripping points coming from? Thanks! Maxime
On Sat, Jan 4, 2020 at 12:37 AM Maxime Ripard <mripard@kernel.org> wrote: > > Hi! > > On Fri, Jan 03, 2020 at 10:35:05PM -0800, Vasily Khoruzhick wrote: > > Add CPU regulator, CPU clock, operation points and thermal trip points > > to enable DVFS on A64 > > > > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> > > --- > > .../allwinner/sun50i-a64-amarula-relic.dts | 4 + > > .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 + > > .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 + > > .../dts/allwinner/sun50i-a64-olinuxino.dts | 4 + > > .../dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + > > .../boot/dts/allwinner/sun50i-a64-pine64.dts | 4 + > > .../dts/allwinner/sun50i-a64-pinebook.dts | 4 + > > .../allwinner/sun50i-a64-sopine-baseboard.dts | 4 + > > .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 4 + > > .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 4 + > > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 102 ++++++++++++++++++ > > 11 files changed, 142 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts > > index 5634245d11db..43f6ac0beed6 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts > > @@ -65,6 +65,10 @@ wifi_pwrseq: wifi-pwrseq { > > }; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &csi { > > status = "okay"; > > > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > > index 208373efee49..cbcab80de8c5 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts > > @@ -108,6 +108,10 @@ &codec_analog { > > status = "okay"; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &dai { > > status = "okay"; > > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts > > index 9b9d9157128c..6708acf94d01 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts > > @@ -87,6 +87,10 @@ wifi_pwrseq: wifi_pwrseq { > > }; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &de { > > status = "okay"; > > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts > > index 01a9a52edae4..f94e60eb4ec2 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts > > @@ -87,6 +87,10 @@ wifi_pwrseq: wifi_pwrseq { > > }; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &de { > > status = "okay"; > > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > > index f54a415f2e3b..2793afba4884 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts > > @@ -123,6 +123,10 @@ &codec_analog { > > status = "okay"; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &dai { > > status = "okay"; > > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts > > index 409523cb0950..04aa452d4400 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts > > @@ -84,6 +84,10 @@ &codec_analog { > > status = "okay"; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &dai { > > status = "okay"; > > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts > > index 78c82a665c84..365d85c16deb 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts > > @@ -98,6 +98,10 @@ &codec_analog { > > status = "okay"; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &dai { > > status = "okay"; > > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts > > index 920103ec0046..e760e8efdf3e 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts > > @@ -100,6 +100,10 @@ &codec_analog { > > status = "okay"; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &dai { > > status = "okay"; > > }; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi > > index 9d20e13f0c02..3d8e2d452ce1 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi > > @@ -51,6 +51,10 @@ &codec_analog { > > cpvdd-supply = <®_eldo1>; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &mmc0 { > > pinctrl-names = "default"; > > pinctrl-0 = <&mmc0_pins>; > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > > index 970415106dcf..28edcef8bed1 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > > @@ -104,6 +104,10 @@ &de { > > status = "okay"; > > }; > > > > +&cpu0 { > > + cpu-supply = <®_dcdc2>; > > +}; > > + > > &ehci1 { > > status = "okay"; > > }; > > Did you test it on all those boards (and if so, how were the OPP > tested), or was it done simply by looking at the schematics? I tested it only on Pine64-LTS and Pinebook. But all these boards use AXP803 which always uses DCDC2 as CPU regulator. > > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > > index 5e3f16c3b706..7f37c8cd1b6e 100644 > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi > > @@ -80,6 +80,52 @@ simplefb_hdmi: framebuffer-hdmi { > > }; > > }; > > > > + cpu0_opp_table: opp_table0 { > > + compatible = "operating-points-v2"; > > + opp-shared; > > + > > + opp-648000000 { > > + opp-hz = /bits/ 64 <648000000>; > > + opp-microvolt = <1040000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > + opp-816000000 { > > + opp-hz = /bits/ 64 <816000000>; > > + opp-microvolt = <1100000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > Nit: having new lines between the nodes would be great Will do. > > + opp-912000000 { > > + opp-hz = /bits/ 64 <912000000>; > > + opp-microvolt = <1120000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > + opp-960000000 { > > + opp-hz = /bits/ 64 <960000000>; > > + opp-microvolt = <1160000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > + opp-1008000000 { > > + opp-hz = /bits/ 64 <1008000000>; > > + opp-microvolt = <1200000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > + opp-1056000000 { > > + opp-hz = /bits/ 64 <1056000000>; > > + opp-microvolt = <1240000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > + opp-1104000000 { > > + opp-hz = /bits/ 64 <1104000000>; > > + opp-microvolt = <1260000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > + opp-1152000000 { > > + opp-hz = /bits/ 64 <1152000000>; > > + opp-microvolt = <1300000>; > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > + }; > > + }; > > + > > What frequency is setup by U-Boot? It's 816 MHz > If it's 1008 MHz as usual, then having the OPP above that frequency by > default means that a board that doesn't set cpu-supply (or doesn't set > it up properly) will be unstable, since it will increase the > frequency, but not the voltage, and the voltage isn't enough for that > new frequency. > > The way we've done it so far on the SoCs in a similar situation (A33, > A83t) is only to list the OPP below the frequency set up by U-Boot in > the DTSI, and list the frequencies above that in the boards that add > cpu-supply. > > Given that it seems that we need to have them listed on number of > boards, I guess we could add a separate DTSI that would be included > only by the boards setting cpu-supply? Currently all the A64 boards that we support use AXP803, so I'm not sure whether we actually need that. We can just define CPU regulator for them and use default OPP and that's exactly what I did. > > cpus { > > #address-cells = <1>; > > #size-cells = <0>; > > @@ -90,6 +136,10 @@ cpu0: cpu@0 { > > reg = <0>; > > enable-method = "psci"; > > next-level-cache = <&L2>; > > + clocks = <&ccu CLK_CPUX>; > > + clock-names = "cpu"; > > + operating-points-v2 = <&cpu0_opp_table>; > > + #cooling-cells = <2>; > > }; > > > > cpu1: cpu@1 { > > @@ -98,6 +148,10 @@ cpu1: cpu@1 { > > reg = <1>; > > enable-method = "psci"; > > next-level-cache = <&L2>; > > + clocks = <&ccu CLK_CPUX>; > > + clock-names = "cpu"; > > + operating-points-v2 = <&cpu0_opp_table>; > > + #cooling-cells = <2>; > > }; > > > > cpu2: cpu@2 { > > @@ -106,6 +160,10 @@ cpu2: cpu@2 { > > reg = <2>; > > enable-method = "psci"; > > next-level-cache = <&L2>; > > + clocks = <&ccu CLK_CPUX>; > > + clock-names = "cpu"; > > + operating-points-v2 = <&cpu0_opp_table>; > > + #cooling-cells = <2>; > > }; > > > > cpu3: cpu@3 { > > @@ -114,6 +172,10 @@ cpu3: cpu@3 { > > reg = <3>; > > enable-method = "psci"; > > next-level-cache = <&L2>; > > + clocks = <&ccu CLK_CPUX>; > > + clock-names = "cpu"; > > + operating-points-v2 = <&cpu0_opp_table>; > > + #cooling-cells = <2>; > > }; > > > > L2: l2-cache { > > @@ -218,6 +280,46 @@ cpu_thermal: cpu0-thermal { > > polling-delay-passive = <0>; > > polling-delay = <0>; > > thermal-sensors = <&ths 0>; > > + > > + cooling-maps { > > + map0 { > > + trip = <&cpu_alert0>; > > + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > > + }; > > + map1 { > > + trip = <&cpu_alert1>; > > + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > > + }; > > + }; > > + > > + trips { > > + cpu_alert0: cpu_alert0 { > > + /* milliCelsius */ > > + temperature = <75000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > + > > + cpu_alert1: cpu_alert1 { > > + /* milliCelsius */ > > + temperature = <90000>; > > + hysteresis = <2000>; > > + type = "hot"; > > + }; > > + > > + cpu_crit: cpu_crit { > > + /* milliCelsius */ > > + temperature = <110000>; > > + hysteresis = <2000>; > > + type = "critical"; > > + }; > > + }; > > }; > > Where are those tripping points coming from? These are taken from A33 dtsi. I couldn't find any recommended throttling and critical temp in A64 user manual [1]. [1] http://linux-sunxi.org/images/b/b4/Allwinner_A64_User_Manual_V1.1.pdf > Thanks! > Maxime
Hi, On Sat, Jan 04, 2020 at 08:24:01AM -0800, Vasily Khoruzhick wrote: > > > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > > > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts > > > @@ -104,6 +104,10 @@ &de { > > > status = "okay"; > > > }; > > > > > > +&cpu0 { > > > + cpu-supply = <®_dcdc2>; > > > +}; > > > + > > > &ehci1 { > > > status = "okay"; > > > }; > > > > Did you test it on all those boards (and if so, how were the OPP > > tested), or was it done simply by looking at the schematics? > > I tested it only on Pine64-LTS and Pinebook. But all these boards use > AXP803 which always uses DCDC2 as CPU regulator. Ok. How were those OPPs picked and tested? > > > + opp-912000000 { > > > + opp-hz = /bits/ 64 <912000000>; > > > + opp-microvolt = <1120000>; > > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > > + }; > > > + opp-960000000 { > > > + opp-hz = /bits/ 64 <960000000>; > > > + opp-microvolt = <1160000>; > > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > > + }; > > > + opp-1008000000 { > > > + opp-hz = /bits/ 64 <1008000000>; > > > + opp-microvolt = <1200000>; > > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > > + }; > > > + opp-1056000000 { > > > + opp-hz = /bits/ 64 <1056000000>; > > > + opp-microvolt = <1240000>; > > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > > + }; > > > + opp-1104000000 { > > > + opp-hz = /bits/ 64 <1104000000>; > > > + opp-microvolt = <1260000>; > > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > > + }; > > > + opp-1152000000 { > > > + opp-hz = /bits/ 64 <1152000000>; > > > + opp-microvolt = <1300000>; > > > + clock-latency-ns = <244144>; /* 8 32k periods */ > > > + }; > > > + }; > > > + > > > > What frequency is setup by U-Boot? > > It's 816 MHz > > > If it's 1008 MHz as usual, then having the OPP above that frequency by > > default means that a board that doesn't set cpu-supply (or doesn't set > > it up properly) will be unstable, since it will increase the > > frequency, but not the voltage, and the voltage isn't enough for that > > new frequency. > > > > The way we've done it so far on the SoCs in a similar situation (A33, > > A83t) is only to list the OPP below the frequency set up by U-Boot in > > the DTSI, and list the frequencies above that in the boards that add > > cpu-supply. > > > > Given that it seems that we need to have them listed on number of > > boards, I guess we could add a separate DTSI that would be included > > only by the boards setting cpu-supply? > > Currently all the A64 boards that we support use AXP803, so I'm not > sure whether we actually need that. We can just define CPU regulator > for them and use default OPP and that's exactly what I did. Yeah, but none of them have been supporting it since day one. Having these OPPs now mean that the very first thing you'll need to do is to bringup the PMIC as well, otherwise the system will crash. And to the person doing the bringup, this will be far from obvious that a) we have that requirement b) the crash that they are seeing is due to cpufreq. > > > cpus { > > > #address-cells = <1>; > > > #size-cells = <0>; > > > @@ -90,6 +136,10 @@ cpu0: cpu@0 { > > > reg = <0>; > > > enable-method = "psci"; > > > next-level-cache = <&L2>; > > > + clocks = <&ccu CLK_CPUX>; > > > + clock-names = "cpu"; > > > + operating-points-v2 = <&cpu0_opp_table>; > > > + #cooling-cells = <2>; > > > }; > > > > > > cpu1: cpu@1 { > > > @@ -98,6 +148,10 @@ cpu1: cpu@1 { > > > reg = <1>; > > > enable-method = "psci"; > > > next-level-cache = <&L2>; > > > + clocks = <&ccu CLK_CPUX>; > > > + clock-names = "cpu"; > > > + operating-points-v2 = <&cpu0_opp_table>; > > > + #cooling-cells = <2>; > > > }; > > > > > > cpu2: cpu@2 { > > > @@ -106,6 +160,10 @@ cpu2: cpu@2 { > > > reg = <2>; > > > enable-method = "psci"; > > > next-level-cache = <&L2>; > > > + clocks = <&ccu CLK_CPUX>; > > > + clock-names = "cpu"; > > > + operating-points-v2 = <&cpu0_opp_table>; > > > + #cooling-cells = <2>; > > > }; > > > > > > cpu3: cpu@3 { > > > @@ -114,6 +172,10 @@ cpu3: cpu@3 { > > > reg = <3>; > > > enable-method = "psci"; > > > next-level-cache = <&L2>; > > > + clocks = <&ccu CLK_CPUX>; > > > + clock-names = "cpu"; > > > + operating-points-v2 = <&cpu0_opp_table>; > > > + #cooling-cells = <2>; > > > }; > > > > > > L2: l2-cache { > > > @@ -218,6 +280,46 @@ cpu_thermal: cpu0-thermal { > > > polling-delay-passive = <0>; > > > polling-delay = <0>; > > > thermal-sensors = <&ths 0>; > > > + > > > + cooling-maps { > > > + map0 { > > > + trip = <&cpu_alert0>; > > > + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > > + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > > + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > > + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > > > + }; > > > + map1 { > > > + trip = <&cpu_alert1>; > > > + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > > + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > > + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, > > > + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; > > > + }; > > > + }; > > > + > > > + trips { > > > + cpu_alert0: cpu_alert0 { > > > + /* milliCelsius */ > > > + temperature = <75000>; > > > + hysteresis = <2000>; > > > + type = "passive"; > > > + }; > > > + > > > + cpu_alert1: cpu_alert1 { > > > + /* milliCelsius */ > > > + temperature = <90000>; > > > + hysteresis = <2000>; > > > + type = "hot"; > > > + }; > > > + > > > + cpu_crit: cpu_crit { > > > + /* milliCelsius */ > > > + temperature = <110000>; > > > + hysteresis = <2000>; > > > + type = "critical"; > > > + }; > > > + }; > > > }; > > > > Where are those tripping points coming from? > > These are taken from A33 dtsi. I couldn't find any recommended > throttling and critical temp in A64 user manual [1]. > > [1] http://linux-sunxi.org/images/b/b4/Allwinner_A64_User_Manual_V1.1.pdf Ok. Can you mention that in the commit log? Thanks! Maxime
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts index 5634245d11db..43f6ac0beed6 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts @@ -65,6 +65,10 @@ wifi_pwrseq: wifi-pwrseq { }; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &csi { status = "okay"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts index 208373efee49..cbcab80de8c5 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts @@ -108,6 +108,10 @@ &codec_analog { status = "okay"; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &dai { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts index 9b9d9157128c..6708acf94d01 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts @@ -87,6 +87,10 @@ wifi_pwrseq: wifi_pwrseq { }; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &de { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts index 01a9a52edae4..f94e60eb4ec2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts @@ -87,6 +87,10 @@ wifi_pwrseq: wifi_pwrseq { }; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &de { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index f54a415f2e3b..2793afba4884 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -123,6 +123,10 @@ &codec_analog { status = "okay"; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &dai { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 409523cb0950..04aa452d4400 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -84,6 +84,10 @@ &codec_analog { status = "okay"; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &dai { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts index 78c82a665c84..365d85c16deb 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts @@ -98,6 +98,10 @@ &codec_analog { status = "okay"; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &dai { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index 920103ec0046..e760e8efdf3e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -100,6 +100,10 @@ &codec_analog { status = "okay"; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &dai { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi index 9d20e13f0c02..3d8e2d452ce1 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi @@ -51,6 +51,10 @@ &codec_analog { cpvdd-supply = <®_eldo1>; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts index 970415106dcf..28edcef8bed1 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts @@ -104,6 +104,10 @@ &de { status = "okay"; }; +&cpu0 { + cpu-supply = <®_dcdc2>; +}; + &ehci1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index 5e3f16c3b706..7f37c8cd1b6e 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -80,6 +80,52 @@ simplefb_hdmi: framebuffer-hdmi { }; }; + cpu0_opp_table: opp_table0 { + compatible = "operating-points-v2"; + opp-shared; + + opp-648000000 { + opp-hz = /bits/ 64 <648000000>; + opp-microvolt = <1040000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + opp-816000000 { + opp-hz = /bits/ 64 <816000000>; + opp-microvolt = <1100000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + opp-912000000 { + opp-hz = /bits/ 64 <912000000>; + opp-microvolt = <1120000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + opp-960000000 { + opp-hz = /bits/ 64 <960000000>; + opp-microvolt = <1160000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + opp-1008000000 { + opp-hz = /bits/ 64 <1008000000>; + opp-microvolt = <1200000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + opp-1056000000 { + opp-hz = /bits/ 64 <1056000000>; + opp-microvolt = <1240000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + opp-1104000000 { + opp-hz = /bits/ 64 <1104000000>; + opp-microvolt = <1260000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + opp-1152000000 { + opp-hz = /bits/ 64 <1152000000>; + opp-microvolt = <1300000>; + clock-latency-ns = <244144>; /* 8 32k periods */ + }; + }; + cpus { #address-cells = <1>; #size-cells = <0>; @@ -90,6 +136,10 @@ cpu0: cpu@0 { reg = <0>; enable-method = "psci"; next-level-cache = <&L2>; + clocks = <&ccu CLK_CPUX>; + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; cpu1: cpu@1 { @@ -98,6 +148,10 @@ cpu1: cpu@1 { reg = <1>; enable-method = "psci"; next-level-cache = <&L2>; + clocks = <&ccu CLK_CPUX>; + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; cpu2: cpu@2 { @@ -106,6 +160,10 @@ cpu2: cpu@2 { reg = <2>; enable-method = "psci"; next-level-cache = <&L2>; + clocks = <&ccu CLK_CPUX>; + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; cpu3: cpu@3 { @@ -114,6 +172,10 @@ cpu3: cpu@3 { reg = <3>; enable-method = "psci"; next-level-cache = <&L2>; + clocks = <&ccu CLK_CPUX>; + clock-names = "cpu"; + operating-points-v2 = <&cpu0_opp_table>; + #cooling-cells = <2>; }; L2: l2-cache { @@ -218,6 +280,46 @@ cpu_thermal: cpu0-thermal { polling-delay-passive = <0>; polling-delay = <0>; thermal-sensors = <&ths 0>; + + cooling-maps { + map0 { + trip = <&cpu_alert0>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + map1 { + trip = <&cpu_alert1>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + + trips { + cpu_alert0: cpu_alert0 { + /* milliCelsius */ + temperature = <75000>; + hysteresis = <2000>; + type = "passive"; + }; + + cpu_alert1: cpu_alert1 { + /* milliCelsius */ + temperature = <90000>; + hysteresis = <2000>; + type = "hot"; + }; + + cpu_crit: cpu_crit { + /* milliCelsius */ + temperature = <110000>; + hysteresis = <2000>; + type = "critical"; + }; + }; }; gpu0_thermal: gpu0-thermal {
Add CPU regulator, CPU clock, operation points and thermal trip points to enable DVFS on A64 Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> --- .../allwinner/sun50i-a64-amarula-relic.dts | 4 + .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 4 + .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 4 + .../dts/allwinner/sun50i-a64-olinuxino.dts | 4 + .../dts/allwinner/sun50i-a64-orangepi-win.dts | 4 + .../boot/dts/allwinner/sun50i-a64-pine64.dts | 4 + .../dts/allwinner/sun50i-a64-pinebook.dts | 4 + .../allwinner/sun50i-a64-sopine-baseboard.dts | 4 + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 4 + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 4 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 102 ++++++++++++++++++ 11 files changed, 142 insertions(+)