linux-kernel - Re: [PATCH] MIPS: ingenic: DTS: Fix watchdog nodes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <09a1d877-aee7-3f2d-8f82-6f7ba00e9cf6@amsat.org>
Date:   Sat, 15 Feb 2020 23:09:39 +0100
From:   Philippe Mathieu-Daudé <f4bug@...at.org>
To:     Paul Cercueil <paul@...pouillou.net>,
        Ralf Baechle <ralf@...ux-mips.org>,
        Paul Burton <paulburton@...nel.org>,
        Rob Herring <robh+dt@...nel.org>,
        Mark Rutland <mark.rutland@....com>
Cc:     Zhou Yanjie <zhouyanjie@...yeetech.com>, od@...c.me,
        linux-mips@...r.kernel.org, devicetree@...r.kernel.org,
        linux-kernel@...r.kernel.org, stable@...r.kernel.org
Subject: Re: [PATCH] MIPS: ingenic: DTS: Fix watchdog nodes

On 2/11/20 3:53 PM, Paul Cercueil wrote:
> The devicetree ABI was broken on purpose by commit 6d532143c915
> ("watchdog: jz4740: Use regmap provided by TCU driver"), and
> commit 1d9c30745455 ("watchdog: jz4740: Use WDT clock provided
> by TCU driver"). The commit message of the latter explains why the ABI
> was broken.
> 
> However, the current devicetree files were not updated to the new ABI
> described in Documentation/devicetree/bindings/timer/ingenic,tcu.txt,
> so the watchdog driver would not probe.
> 
> Fix this problem by updating the watchdog nodes to comply with the new
> ABI.
> 
> Fixes: 6d532143c915 ("watchdog: jz4740: Use regmap provided by TCU
> driver")
> 
> Signed-off-by: Paul Cercueil <paul@...pouillou.net>
> Cc: stable@...r.kernel.org
> ---
>  arch/mips/boot/dts/ingenic/jz4740.dtsi | 17 +++++++++--------
>  arch/mips/boot/dts/ingenic/jz4780.dtsi | 17 +++++++++--------
>  2 files changed, 18 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
> index 5accda2767be..a3301bab9231 100644
> --- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
> +++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
> @@ -1,5 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <dt-bindings/clock/jz4740-cgu.h>
> +#include <dt-bindings/clock/ingenic,tcu.h>
>  
>  / {
>  	#address-cells = <1>;
> @@ -45,14 +46,6 @@ cgu: jz4740-cgu@...00000 {
>  		#clock-cells = <1>;
>  	};
>  
> -	watchdog: watchdog@...02000 {
> -		compatible = "ingenic,jz4740-watchdog";
> -		reg = <0x10002000 0x10>;
> -
> -		clocks = <&cgu JZ4740_CLK_RTC>;
> -		clock-names = "rtc";
> -	};
> -
>  	tcu: timer@...02000 {
>  		compatible = "ingenic,jz4740-tcu", "simple-mfd";
>  		reg = <0x10002000 0x1000>;
> @@ -73,6 +66,14 @@ &cgu JZ4740_CLK_PCLK
>  
>  		interrupt-parent = <&intc>;
>  		interrupts = <23 22 21>;
> +
> +		watchdog: watchdog@0 {
> +			compatible = "ingenic,jz4740-watchdog";
> +			reg = <0x0 0xc>;

Now the WDT_TCSR register is directly managed by the CPU, OK.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@...at.org>

> +
> +			clocks = <&tcu TCU_CLK_WDT>;
> +			clock-names = "wdt";
> +		};
>  	};
>  
>  	rtc_dev: rtc@...03000 {
> diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi b/arch/mips/boot/dts/ingenic/jz4780.dtsi
> index f928329b034b..bb89653d16a3 100644
> --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
> +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
> @@ -1,5 +1,6 @@
>  // SPDX-License-Identifier: GPL-2.0
>  #include <dt-bindings/clock/jz4780-cgu.h>
> +#include <dt-bindings/clock/ingenic,tcu.h>
>  #include <dt-bindings/dma/jz4780-dma.h>
>  
>  / {
> @@ -67,6 +68,14 @@ &cgu JZ4780_CLK_EXCLK
>  
>  		interrupt-parent = <&intc>;
>  		interrupts = <27 26 25>;
> +
> +		watchdog: watchdog@0 {
> +			compatible = "ingenic,jz4780-watchdog";
> +			reg = <0x0 0xc>;
> +
> +			clocks = <&tcu TCU_CLK_WDT>;
> +			clock-names = "wdt";
> +		};
>  	};
>  
>  	rtc_dev: rtc@...03000 {
> @@ -348,14 +357,6 @@ i2c4: i2c@...54000 {
>  		status = "disabled";
>  	};
>  
> -	watchdog: watchdog@...02000 {
> -		compatible = "ingenic,jz4780-watchdog";
> -		reg = <0x10002000 0x10>;
> -
> -		clocks = <&cgu JZ4780_CLK_RTCLK>;
> -		clock-names = "rtc";
> -	};
> -
>  	nemc: nemc@...10000 {
>  		compatible = "ingenic,jz4780-nemc";
>  		reg = <0x13410000 0x10000>;
>