The Meson AXG leverages the SCPI ARM protocol for the management of CPU
power, thermal, and frequency. This series addresses several issues that
have impacted the functionality of the power_allocator thermal governor
and cpufreq cooling devices.
Dmitry Rokosov (2):
arm64: dts: amlogic: axg: move cpu cooling-cells to common dtsi
arm64: dts: amlogic: axg: initialize default SoC capacitance
.../amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 16 ----------------
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 8 ++++++++
2 files changed, 8 insertions(+), 16 deletions(-)
--
2.43.0
The CPU cooling-cells property should be located in the meson-axg common
dtsi, as it is required for all AXG-based boards with DVFS.
Signed-off-by: Dmitry Rokosov <[email protected]>
---
.../amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 16 ----------------
arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++++
2 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
index db605f3a22b4..55802fb03a46 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
@@ -332,19 +332,3 @@ &gpio {
"", "", "", "", "", // 80 - 84
"", ""; // 85-86
};
-
-&cpu0 {
- #cooling-cells = <2>;
-};
-
-&cpu1 {
- #cooling-cells = <2>;
-};
-
-&cpu2 {
- #cooling-cells = <2>;
-};
-
-&cpu3 {
- #cooling-cells = <2>;
-};
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index 7e5ac9db93f8..ea96fef328e8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -74,6 +74,7 @@ cpu0: cpu@0 {
enable-method = "psci";
next-level-cache = <&l2>;
clocks = <&scpi_dvfs 0>;
+ #cooling-cells = <2>;
};
cpu1: cpu@1 {
@@ -83,6 +84,7 @@ cpu1: cpu@1 {
enable-method = "psci";
next-level-cache = <&l2>;
clocks = <&scpi_dvfs 0>;
+ #cooling-cells = <2>;
};
cpu2: cpu@2 {
@@ -92,6 +94,7 @@ cpu2: cpu@2 {
enable-method = "psci";
next-level-cache = <&l2>;
clocks = <&scpi_dvfs 0>;
+ #cooling-cells = <2>;
};
cpu3: cpu@3 {
@@ -101,6 +104,7 @@ cpu3: cpu@3 {
enable-method = "psci";
next-level-cache = <&l2>;
clocks = <&scpi_dvfs 0>;
+ #cooling-cells = <2>;
};
l2: l2-cache0 {
--
2.43.0
On 09/02/2024 22:28, Dmitry Rokosov wrote:
> The CPU cooling-cells property should be located in the meson-axg common
> dtsi, as it is required for all AXG-based boards with DVFS.
>
> Signed-off-by: Dmitry Rokosov <[email protected]>
> ---
> .../amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 16 ----------------
> arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++++
> 2 files changed, 4 insertions(+), 16 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
> index db605f3a22b4..55802fb03a46 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
> @@ -332,19 +332,3 @@ &gpio {
> "", "", "", "", "", // 80 - 84
> "", ""; // 85-86
> };
> -
> -&cpu0 {
> - #cooling-cells = <2>;
> -};
> -
> -&cpu1 {
> - #cooling-cells = <2>;
> -};
> -
> -&cpu2 {
> - #cooling-cells = <2>;
> -};
> -
> -&cpu3 {
> - #cooling-cells = <2>;
> -};
> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> index 7e5ac9db93f8..ea96fef328e8 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
> @@ -74,6 +74,7 @@ cpu0: cpu@0 {
> enable-method = "psci";
> next-level-cache = <&l2>;
> clocks = <&scpi_dvfs 0>;
> + #cooling-cells = <2>;
> };
>
> cpu1: cpu@1 {
> @@ -83,6 +84,7 @@ cpu1: cpu@1 {
> enable-method = "psci";
> next-level-cache = <&l2>;
> clocks = <&scpi_dvfs 0>;
> + #cooling-cells = <2>;
> };
>
> cpu2: cpu@2 {
> @@ -92,6 +94,7 @@ cpu2: cpu@2 {
> enable-method = "psci";
> next-level-cache = <&l2>;
> clocks = <&scpi_dvfs 0>;
> + #cooling-cells = <2>;
> };
>
> cpu3: cpu@3 {
> @@ -101,6 +104,7 @@ cpu3: cpu@3 {
> enable-method = "psci";
> next-level-cache = <&l2>;
> clocks = <&scpi_dvfs 0>;
> + #cooling-cells = <2>;
> };
>
> l2: l2-cache0 {
Reviewed-by: Neil Armstrong <[email protected]>
Hi,
On Sat, 10 Feb 2024 00:28:04 +0300, Dmitry Rokosov wrote:
> The Meson AXG leverages the SCPI ARM protocol for the management of CPU
> power, thermal, and frequency. This series addresses several issues that
> have impacted the functionality of the power_allocator thermal governor
> and cpufreq cooling devices.
>
> Dmitry Rokosov (2):
> arm64: dts: amlogic: axg: move cpu cooling-cells to common dtsi
> arm64: dts: amlogic: axg: initialize default SoC capacitance
>
> [...]
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.9/arm64-dt)
[1/2] arm64: dts: amlogic: axg: move cpu cooling-cells to common dtsi
https://git.kernel.org/amlogic/c/7c3215fe05fe3b8faacc03245cc922c4b98075d7
[2/2] arm64: dts: amlogic: axg: initialize default SoC capacitance
https://git.kernel.org/amlogic/c/a06d4fdec1ce800188bec15c0219d6774dd145f8
These changes has been applied on the intermediate git tree [1].
The v6.9/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.
In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].
The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.
If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
--
Neil