Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
Message-ID: <trinity-2eb7c0ac-d9dc-446c-8907-69b5f4df6838-1624618996538@3c-app-gmx-bs66>
From:   Frank Wunderlich <frank-w@public-files.de>
To:     Daniel Lezcano <daniel.lezcano@linaro.org>
Cc:     Eric Woudstra <ericwouds@gmail.com>,
        Rob Herring <robh+dt@kernel.org>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
        Sean Wang <sean.wang@mediatek.com>,
        Ryder Lee <ryder.lee@mediatek.com>,
        Daniel Golle <daniel@makrotopia.org>
Subject: Aw: Re:  Re: [PATCH] Fix mt7622.dtsi thermal cpu
Content-Type: text/plain; charset=UTF-8
Date:   Fri, 25 Jun 2021 13:03:16 +0200
Importance: normal
Sensitivity: Normal
In-Reply-To: <8b27246b-721e-fa0e-5c2b-b1b4b4d6fdd3@linaro.org>
References: <20210619121927.32699-1-ericwouds@gmail.com>
 <e30a2d01-a200-80cb-88d9-6aea62dd49f1@linaro.org>
 <56fb5540-fb86-4e6a-a596-1276026b37e5@gmail.com>
 <a4e41929-6ab4-fabb-741e-f25a5fd14e3b@linaro.org>
 <47261865-00e3-41eb-bb36-2b939f81f1e8@gmail.com>
 <fb633034-96e5-6165-b43f-290ae1a65cfd@linaro.org>
 <189b52d5-b103-43e1-a64f-1e627fbc75af@gmail.com>
 <173e6bab-9d21-eb28-9b91-a5f80c01fd03@linaro.org>
 <3dd22cf2-1186-4870-aa49-e5cddc18c6e9@gmail.com>
 <trinity-7580d955-3187-41e5-9297-1ac8f628a9d5-1624609003739@3c-app-gmx-bs66>
 <8b27246b-721e-fa0e-5c2b-b1b4b4d6fdd3@linaro.org>
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi

> Gesendet: Freitag, 25. Juni 2021 um 11:57 Uhr
> Von: "Daniel Lezcano" <daniel.lezcano@linaro.org>

> You should not add the fan in the mt7622.dtsi itself but in the board
> specific file where there is a fan output on it. mt7622.dtsi is supposed
> to be the SoC itself AFAICT.
>
> For instance:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git/tree/a=
rch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi#n39
>
> https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git/tree/a=
rch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi#n164

> > @@ -170,14 +177,12 @@
> >  			cooling-maps {
> >  				map0 {
> >  					trip =3D <&cpu_passive>;
> > -					cooling-device =3D <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
> > -							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> > +					cooling-device =3D <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> >  				};
>
> fan =3D=3D active trip point
>
> This is referring to the passive trip point. So it should point to the
> CPU as it is now. Note the order of mitigation is inverted regarding the
> proposal description.

but we need to disable the passive trip as cpu-trotteling starts there...t=
he higher temperature trips are currently not reached

summary

moving fan and cpu_thermal-override to bananapi-r64.dts

passive-trip: cooling-device =3D <&cpu0/1 0 0> as in erics Patch
active trip: cooling-device =3D <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
the other 2 unchanged

but i suggest changing the temperature points in mt7622 dtsi as this is So=
C specific

so basicly:

=2D-- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -143,13 +143,13 @@ cpu_thermal: cpu-thermal {

                        trips {
                                cpu_passive: cpu-passive {
-                                       temperature =3D <47000>;
+                                       temperature =3D <70000>;
                                        hysteresis =3D <2000>;
                                        type =3D "passive";
                                };

                                cpu_active: cpu-active {
-                                       temperature =3D <67000>;
+                                       temperature =3D <80000>;
                                        hysteresis =3D <2000>;
                                        type =3D "active";
                                };
@@ -170,8 +170,8 @@ cpu-crit {
                        cooling-maps {
                                map0 {
                                        trip =3D <&cpu_passive>;
-                                       cooling-device =3D <&cpu0 THERMAL_=
NO_LIMIT THERMAL_NO_LIMIT>,
-                                                        <&cpu1 THERMAL_NO=
_LIMIT THERMAL_NO_LIMIT>;
+                                       cooling-device =3D <&cpu0 0 0>,
+                                                        <&cpu1 0 0>;
                                };

                                map1 {
@@ -428,6 +428,7 @@ uart3: serial@11005000 {
        pwm: pwm@11006000 {
                compatible =3D "mediatek,mt7622-pwm";
                reg =3D <0 0x11006000 0 0x1000>;
+               #pwm-cells =3D <3>;
                interrupts =3D <GIC_SPI 77 IRQ_TYPE_LEVEL_LOW>;
                clocks =3D <&topckgen CLK_TOP_PWM_SEL>,
                         <&pericfg CLK_PERI_PWM_PD>,

=2D-- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
@@ -37,6 +37,13 @@ cpu@1 {
                };
        };

+       fan0: pwm-fan {
+               compatible =3D "pwm-fan";
+               #cooling-cells =3D <2>;
+               pwms =3D <&pwm 2 10000 0>;
+               cooling-levels =3D <0 102 170 230>;
+       };
+
        gpio-keys {
                compatible =3D "gpio-keys";

@@ -582,6 +589,29 @@ &u3phy {
        status =3D "okay";
 };

+&cpu_thermal {
+       cooling-maps {
+               map1 {
+                       trip =3D <&cpu_active>;
+                       cooling-device =3D <&fan0 THERMAL_NO_LIMIT THERMAL=
_NO_LIMIT>;
+               };
+       };
+};
+
 &uart0 {
        pinctrl-names =3D "default";
        pinctrl-0 =3D <&uart0_pins>;