* [PATCH v2 2/3] ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey
2019-05-20 22:00 [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron Matthias Kaehlcke
@ 2019-05-20 22:00 ` Matthias Kaehlcke
2019-05-20 23:26 ` Doug Anderson
2019-05-22 9:14 ` Heiko Stuebner
2019-05-20 22:00 ` [PATCH v2 3/3] ARM: dts: rockchip: Configure the GPU thermal zone for mickey Matthias Kaehlcke
` (2 subsequent siblings)
3 siblings, 2 replies; 9+ messages in thread
From: Matthias Kaehlcke @ 2019-05-20 22:00 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Mark Rutland
Cc: devicetree, Douglas Anderson, linux-kernel, linux-rockchip,
Matthias Kaehlcke, linux-arm-kernel
On rk3288 the CPU and GPU temperatures are correlated. Limit the GPU
frequency on veyron mickey to 400 MHz for CPU temperatures >= 65°C
and to 300 MHz for CPU temperatures >= 85°C.
This matches the configuration of the downstream Chrome OS 3.14 kernel,
the 'official' kernel for mickey.
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
Changes in v2:
- added 'cpu_warm_limit_gpu' to throttle GPU for T.cpu >= 65°C
- removed comment saying that GPU isn't throttled beyond 400 MHz
based on CPU temperature
- updated commit message
Note: this patch depends on "ARM: dts: rockchip: Add #cooling-cells
entry for rk3288 GPU" (https://lore.kernel.org/patchwork/patch/1075005/)
---
arch/arm/boot/dts/rk3288-veyron-mickey.dts | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
index 52f6abc22291..34797abe3403 100644
--- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
@@ -75,9 +75,7 @@
cooling-maps {
/*
* After 1st level, throttle the CPU down to as low as 1.4 GHz
- * and don't let the GPU go faster than 400 MHz. Note that we
- * won't throttle the GPU lower than 400 MHz due to CPU
- * heat--we'll let the GPU do the rest itself.
+ * and don't let the GPU go faster than 400 MHz.
*/
cpu_warm_limit_cpu {
trip = <&cpu_alert_warm>;
@@ -86,6 +84,10 @@
<&cpu2 THERMAL_NO_LIMIT 4>,
<&cpu3 THERMAL_NO_LIMIT 4>;
};
+ cpu_warm_limit_gpu {
+ trip = <&cpu_alert_warm>;
+ cooling-device = <&gpu 1 1>;
+ };
/*
* Add some discrete steps to help throttling system deal
@@ -125,6 +127,12 @@
<&cpu2 8 THERMAL_NO_LIMIT>,
<&cpu3 8 THERMAL_NO_LIMIT>;
};
+
+ /* At very hot, don't let GPU go over 300 MHz */
+ cpu_very_hot_limit_gpu {
+ trip = <&cpu_alert_very_hot>;
+ cooling-device = <&gpu 2 2>;
+ };
};
};
--
2.21.0.1020.gf2820cf01a-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/3] ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey
2019-05-20 22:00 ` [PATCH v2 2/3] ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey Matthias Kaehlcke
@ 2019-05-20 23:26 ` Doug Anderson
2019-05-22 9:14 ` Heiko Stuebner
1 sibling, 0 replies; 9+ messages in thread
From: Doug Anderson @ 2019-05-20 23:26 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Mark Rutland, devicetree, Heiko Stuebner, LKML,
open list:ARM/Rockchip SoC...,
Rob Herring, Linux ARM
Hi,
On Mon, May 20, 2019 at 3:01 PM Matthias Kaehlcke <mka@chromium.org> wrote:
>
> On rk3288 the CPU and GPU temperatures are correlated. Limit the GPU
> frequency on veyron mickey to 400 MHz for CPU temperatures >= 65°C
> and to 300 MHz for CPU temperatures >= 85°C.
>
> This matches the configuration of the downstream Chrome OS 3.14 kernel,
> the 'official' kernel for mickey.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> ---
> Changes in v2:
> - added 'cpu_warm_limit_gpu' to throttle GPU for T.cpu >= 65°C
> - removed comment saying that GPU isn't throttled beyond 400 MHz
> based on CPU temperature
> - updated commit message
>
> Note: this patch depends on "ARM: dts: rockchip: Add #cooling-cells
> entry for rk3288 GPU" (https://lore.kernel.org/patchwork/patch/1075005/)
> ---
> arch/arm/boot/dts/rk3288-veyron-mickey.dts | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
Reviewed-by: Douglas Anderson <dianders@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 2/3] ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey
2019-05-20 22:00 ` [PATCH v2 2/3] ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey Matthias Kaehlcke
2019-05-20 23:26 ` Doug Anderson
@ 2019-05-22 9:14 ` Heiko Stuebner
1 sibling, 0 replies; 9+ messages in thread
From: Heiko Stuebner @ 2019-05-22 9:14 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Mark Rutland, devicetree, linux-kernel, Douglas Anderson,
linux-rockchip, Rob Herring, linux-arm-kernel
Am Dienstag, 21. Mai 2019, 00:00:50 CEST schrieb Matthias Kaehlcke:
> On rk3288 the CPU and GPU temperatures are correlated. Limit the GPU
> frequency on veyron mickey to 400 MHz for CPU temperatures >= 65°C
> and to 300 MHz for CPU temperatures >= 85°C.
>
> This matches the configuration of the downstream Chrome OS 3.14 kernel,
> the 'official' kernel for mickey.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
applied patches 2+3 for 5.3
Thanks
Heiko
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 3/3] ARM: dts: rockchip: Configure the GPU thermal zone for mickey
2019-05-20 22:00 [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron Matthias Kaehlcke
2019-05-20 22:00 ` [PATCH v2 2/3] ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey Matthias Kaehlcke
@ 2019-05-20 22:00 ` Matthias Kaehlcke
2019-05-20 23:29 ` Doug Anderson
2019-05-20 23:24 ` [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron Doug Anderson
2019-05-22 9:14 ` Heiko Stuebner
3 siblings, 1 reply; 9+ messages in thread
From: Matthias Kaehlcke @ 2019-05-20 22:00 UTC (permalink / raw)
To: Heiko Stuebner, Rob Herring, Mark Rutland
Cc: devicetree, Douglas Anderson, linux-kernel, linux-rockchip,
Matthias Kaehlcke, linux-arm-kernel
mickey crams a lot of hardware into a tiny package, which requires
more aggressive thermal throttling than for devices with a larger
footprint. Configure the GPU thermal zone to throttle the GPU
progressively at temperatures >= 60°C. Heat dissipated by the
CPUs also affects the GPU temperature, hence we cap the CPU
frequency to 1.4 GHz for temperatures above 65°C. Further throttling
of the CPUs may be performed by the CPU thermal zone.
The configuration matches that of the downstream Chrome OS 3.14
kernel, the 'official' kernel for mickey.
Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
---
Changes in v2:
- specify all CPUs as cooling devices
- s/downstram/downstream/ in commit message
Note: this patch depends on "ARM: dts: rockchip: Add #cooling-cells
entry for rk3288 GPU" (https://lore.kernel.org/patchwork/patch/1075005/)
---
arch/arm/boot/dts/rk3288-veyron-mickey.dts | 67 ++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
index 34797abe3403..945e80801292 100644
--- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts
+++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts
@@ -136,6 +136,73 @@
};
};
+&gpu_thermal {
+ /delete-node/ trips;
+ /delete-node/ cooling-maps;
+
+ trips {
+ gpu_alert_warmish: gpu_alert_warmish {
+ temperature = <60000>; /* millicelsius */
+ hysteresis = <2000>; /* millicelsius */
+ type = "passive";
+ };
+ gpu_alert_warm: gpu_alert_warm {
+ temperature = <65000>; /* millicelsius */
+ hysteresis = <2000>; /* millicelsius */
+ type = "passive";
+ };
+ gpu_alert_hotter: gpu_alert_hotter {
+ temperature = <84000>; /* millicelsius */
+ hysteresis = <2000>; /* millicelsius */
+ type = "passive";
+ };
+ gpu_alert_very_very_hot: gpu_alert_very_very_hot {
+ temperature = <86000>; /* millicelsius */
+ hysteresis = <2000>; /* millicelsius */
+ type = "passive";
+ };
+ gpu_crit: gpu_crit {
+ temperature = <90000>; /* millicelsius */
+ hysteresis = <2000>; /* millicelsius */
+ type = "critical";
+ };
+ };
+
+ cooling-maps {
+ /* After 1st level throttle the GPU down to as low as 400 MHz */
+ gpu_warmish_limit_gpu {
+ trip = <&gpu_alert_warmish>;
+ cooling-device = <&gpu THERMAL_NO_LIMIT 1>;
+ };
+
+ /*
+ * Slightly after we throttle the GPU, we'll also make sure that
+ * the CPU can't go faster than 1.4 GHz. Note that we won't
+ * throttle the CPU lower than 1.4 GHz due to GPU heat--we'll
+ * let the CPU do the rest itself.
+ */
+ gpu_warm_limit_cpu {
+ trip = <&gpu_alert_warm>;
+ cooling-device = <&cpu0 4 4>,
+ <&cpu1 4 4>,
+ <&cpu2 4 4>,
+ <&cpu3 4 4>;
+ };
+
+ /* When hot, GPU goes down to 300 MHz */
+ gpu_hotter_limit_gpu {
+ trip = <&gpu_alert_hotter>;
+ cooling-device = <&gpu 2 2>;
+ };
+
+ /* When really hot, don't let GPU go _above_ 300 MHz */
+ gpu_very_very_hot_limit_gpu {
+ trip = <&gpu_alert_very_very_hot>;
+ cooling-device = <&gpu 2 THERMAL_NO_LIMIT>;
+ };
+ };
+};
+
&i2c2 {
status = "disabled";
};
--
2.21.0.1020.gf2820cf01a-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 3/3] ARM: dts: rockchip: Configure the GPU thermal zone for mickey
2019-05-20 22:00 ` [PATCH v2 3/3] ARM: dts: rockchip: Configure the GPU thermal zone for mickey Matthias Kaehlcke
@ 2019-05-20 23:29 ` Doug Anderson
0 siblings, 0 replies; 9+ messages in thread
From: Doug Anderson @ 2019-05-20 23:29 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Mark Rutland, devicetree, Heiko Stuebner, LKML,
open list:ARM/Rockchip SoC...,
Rob Herring, Linux ARM
Hi,
On Mon, May 20, 2019 at 3:01 PM Matthias Kaehlcke <mka@chromium.org> wrote:
>
> mickey crams a lot of hardware into a tiny package, which requires
> more aggressive thermal throttling than for devices with a larger
> footprint. Configure the GPU thermal zone to throttle the GPU
> progressively at temperatures >= 60°C. Heat dissipated by the
> CPUs also affects the GPU temperature, hence we cap the CPU
> frequency to 1.4 GHz for temperatures above 65°C. Further throttling
> of the CPUs may be performed by the CPU thermal zone.
>
> The configuration matches that of the downstream Chrome OS 3.14
> kernel, the 'official' kernel for mickey.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> ---
> Changes in v2:
> - specify all CPUs as cooling devices
> - s/downstram/downstream/ in commit message
>
> Note: this patch depends on "ARM: dts: rockchip: Add #cooling-cells
> entry for rk3288 GPU" (https://lore.kernel.org/patchwork/patch/1075005/)
> ---
> arch/arm/boot/dts/rk3288-veyron-mickey.dts | 67 ++++++++++++++++++++++
> 1 file changed, 67 insertions(+)
Reviewed-by: Douglas Anderson <dianders@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron
2019-05-20 22:00 [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron Matthias Kaehlcke
2019-05-20 22:00 ` [PATCH v2 2/3] ARM: dts: rockchip: Use the GPU to cool CPU thermal zone of veyron mickey Matthias Kaehlcke
2019-05-20 22:00 ` [PATCH v2 3/3] ARM: dts: rockchip: Configure the GPU thermal zone for mickey Matthias Kaehlcke
@ 2019-05-20 23:24 ` Doug Anderson
2019-05-22 9:14 ` Heiko Stuebner
3 siblings, 0 replies; 9+ messages in thread
From: Doug Anderson @ 2019-05-20 23:24 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Mark Rutland, devicetree, Heiko Stuebner, LKML,
open list:ARM/Rockchip SoC...,
Rob Herring, Linux ARM
Hi,
On Mon, May 20, 2019 at 3:01 PM Matthias Kaehlcke <mka@chromium.org> wrote:
>
> The NPLL is the only safe way to generate 500 MHz for the GPU. The
> downstream Chrome OS 3.14 kernel ('official' kernel for veyron
> devices) re-purposes NPLL to HDMI and hence disables the OPP for
> the GPU (see https://crrev.com/c/1574579). Disable it here as well
> to keep in sync and avoid problems in case someone decides to
> re-purpose NPLL.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
> ---
> Changes in v2:
> - patch added to the series
> ---
> arch/arm/boot/dts/rk3288-veyron.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
Reviewed-by: Douglas Anderson <dianders@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron
2019-05-20 22:00 [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron Matthias Kaehlcke
` (2 preceding siblings ...)
2019-05-20 23:24 ` [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron Doug Anderson
@ 2019-05-22 9:14 ` Heiko Stuebner
2019-05-22 18:13 ` Doug Anderson
3 siblings, 1 reply; 9+ messages in thread
From: Heiko Stuebner @ 2019-05-22 9:14 UTC (permalink / raw)
To: Matthias Kaehlcke
Cc: Mark Rutland, devicetree, linux-kernel, Douglas Anderson,
linux-rockchip, Rob Herring, linux-arm-kernel
Am Dienstag, 21. Mai 2019, 00:00:49 CEST schrieb Matthias Kaehlcke:
> The NPLL is the only safe way to generate 500 MHz for the GPU. The
> downstream Chrome OS 3.14 kernel ('official' kernel for veyron
> devices) re-purposes NPLL to HDMI and hence disables the OPP for
> the GPU (see https://crrev.com/c/1574579). Disable it here as well
> to keep in sync and avoid problems in case someone decides to
> re-purpose NPLL.
>
> Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
I was actually expecting to just drop the 500MHz opp from all
of rk3288 ;-) .
To not have to respin, I just modified your patch accordingly,
see [0] and please holler if you disagree :-D .
Heiko
[0] https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git/commit/?id=75481833c6dbab4c29d15452f6b4337c16f5407b
> ---
> Changes in v2:
> - patch added to the series
> ---
> arch/arm/boot/dts/rk3288-veyron.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
> index 90c8312d01ff..ec10ce4fcf04 100644
> --- a/arch/arm/boot/dts/rk3288-veyron.dtsi
> +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
> @@ -174,6 +174,14 @@
> temperature = <100000>;
> };
>
> +/*
> + * Remove 500 MHz since the only way to make 500 MHz is via the NPLL
> + * which might be used for HDMI.
> + */
> +&gpu_opp_table {
> + /delete-node/ opp-500000000;
> +};
> +
> &hdmi {
> ddc-i2c-bus = <&i2c5>;
> status = "okay";
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 1/3] ARM: dts: rockchip: disable GPU 500 MHz OPP for veyron
2019-05-22 9:14 ` Heiko Stuebner
@ 2019-05-22 18:13 ` Doug Anderson
0 siblings, 0 replies; 9+ messages in thread
From: Doug Anderson @ 2019-05-22 18:13 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Mark Rutland, devicetree, LKML, Rob Herring,
open list:ARM/Rockchip SoC...,
Matthias Kaehlcke, Linux ARM
Hi,
On Wed, May 22, 2019 at 2:14 AM Heiko Stuebner <heiko@sntech.de> wrote:
>
> Am Dienstag, 21. Mai 2019, 00:00:49 CEST schrieb Matthias Kaehlcke:
> > The NPLL is the only safe way to generate 500 MHz for the GPU. The
> > downstream Chrome OS 3.14 kernel ('official' kernel for veyron
> > devices) re-purposes NPLL to HDMI and hence disables the OPP for
> > the GPU (see https://crrev.com/c/1574579). Disable it here as well
> > to keep in sync and avoid problems in case someone decides to
> > re-purpose NPLL.
> >
> > Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
>
> I was actually expecting to just drop the 500MHz opp from all
> of rk3288 ;-) .
>
> To not have to respin, I just modified your patch accordingly,
> see [0] and please holler if you disagree :-D .
Seems fine to me, thanks!
-Doug
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread