[PATCH v3 0/3] support watchdog for exynosautov920

[PATCH v3 0/3] support watchdog for exynosautov920

[Taewan Kim]

Add support for the ExynosAutoV920 SoC. Basically this is almost
similar to ExynosAuto V9 or Exynos850 such as two watchdog instance for
each cluster but some CPU configuration are quite different.
Therefore device tree, compatibles and drvdata should be added.

---
Changes in v2:
- Add a space before }
- Fix worng variant condition (cl1 -> cl0)
- Move the location declaring watchdog node
  to the correct location that fits the DTS coding rules
---
Changes in v3:
- Add Acked-by/Reviewed-by tags 
---

Byoungtae Cho (3):
  dt-bindings: watchdog: Document ExynosAutoV920 watchdog bindings
  watchdog: s3c2410_wdt: add support for exynosautov920 SoC
  arm64: dts: exynosautov920: add watchdog DT node

 .../bindings/watchdog/samsung-wdt.yaml        |  3 ++
 .../arm64/boot/dts/exynos/exynosautov920.dtsi | 20 ++++++++++
 drivers/watchdog/s3c2410_wdt.c                | 37 ++++++++++++++++++-
 3 files changed, 59 insertions(+), 1 deletion(-)

-- 
2.47.0

[PATCH v3 1/3] dt-bindings: watchdog: Document ExynosAutoV920 watchdog bindings

[Taewan Kim]

From: Byoungtae Cho <bt.cho@samsung.com>

Add "samsung-exynosautov920-wdt" compatible to the dt-schema
document. ExynosAutoV920 is new SoC for automotive, similar to
exynosautov9 but some CPU configurations are quite different.

Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
Acked-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
index 77a5ddd0426e..d175ae968336 100644
--- a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
@@ -26,6 +26,7 @@ properties:
           - samsung,exynos7-wdt                   # for Exynos7
           - samsung,exynos850-wdt                 # for Exynos850
           - samsung,exynosautov9-wdt              # for Exynosautov9
+          - samsung,exynosautov920-wdt            # for Exynosautov920
       - items:
           - enum:
               - tesla,fsd-wdt
@@ -77,6 +78,7 @@ allOf:
               - samsung,exynos7-wdt
               - samsung,exynos850-wdt
               - samsung,exynosautov9-wdt
+              - samsung,exynosautov920-wdt
     then:
       required:
         - samsung,syscon-phandle
@@ -88,6 +90,7 @@ allOf:
               - google,gs101-wdt
               - samsung,exynos850-wdt
               - samsung,exynosautov9-wdt
+              - samsung,exynosautov920-wdt
     then:
       properties:
         clocks:
-- 
2.47.0

[PATCH v3 2/3] watchdog: s3c2410_wdt: add support for exynosautov920 SoC

[Taewan Kim]

From: Byoungtae Cho <bt.cho@samsung.com>

Adds the compatibles and drvdata for the ExynosAuto V920 SoC. This SoC
is almost similar to ExynosAutoV9, but some CPU configurations are quite
different, so it should be added. Plus it also support DBGACK like as
GS101 SoC.

Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/watchdog/s3c2410_wdt.c | 37 +++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 686cf544d0ae..aa128099c47d 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -63,6 +63,10 @@
 #define EXYNOS850_CLUSTER1_NONCPU_INT_EN	0x1644
 #define EXYNOSAUTOV9_CLUSTER1_NONCPU_OUT	0x1520
 #define EXYNOSAUTOV9_CLUSTER1_NONCPU_INT_EN	0x1544
+#define EXYNOSAUTOV920_CLUSTER0_NONCPU_OUT	0x1420
+#define EXYNOSAUTOV920_CLUSTER0_NONCPU_INT_EN	0x1444
+#define EXYNOSAUTOV920_CLUSTER1_NONCPU_OUT	0x1720
+#define EXYNOSAUTOV920_CLUSTER1_NONCPU_INT_EN	0x1744
 
 #define EXYNOS850_CLUSTER0_WDTRESET_BIT		24
 #define EXYNOS850_CLUSTER1_WDTRESET_BIT		23
@@ -303,6 +307,32 @@ static const struct s3c2410_wdt_variant drv_data_gs101_cl1 = {
 		  QUIRK_HAS_DBGACK_BIT,
 };
 
+static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl0 = {
+	.mask_reset_reg = EXYNOSAUTOV920_CLUSTER0_NONCPU_INT_EN,
+	.mask_bit = 2,
+	.mask_reset_inv = true,
+	.rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET,
+	.rst_stat_bit = EXYNOSAUTOV9_CLUSTER0_WDTRESET_BIT,
+	.cnt_en_reg = EXYNOSAUTOV920_CLUSTER0_NONCPU_OUT,
+	.cnt_en_bit = 7,
+	.quirks = QUIRK_HAS_WTCLRINT_REG | QUIRK_HAS_PMU_MASK_RESET |
+		  QUIRK_HAS_PMU_RST_STAT | QUIRK_HAS_PMU_CNT_EN |
+		  QUIRK_HAS_DBGACK_BIT,
+};
+
+static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl1 = {
+	.mask_reset_reg = EXYNOSAUTOV920_CLUSTER1_NONCPU_INT_EN,
+	.mask_bit = 2,
+	.mask_reset_inv = true,
+	.rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET,
+	.rst_stat_bit = EXYNOSAUTOV9_CLUSTER1_WDTRESET_BIT,
+	.cnt_en_reg = EXYNOSAUTOV920_CLUSTER1_NONCPU_OUT,
+	.cnt_en_bit = 7,
+	.quirks = QUIRK_HAS_WTCLRINT_REG | QUIRK_HAS_PMU_MASK_RESET |
+		  QUIRK_HAS_PMU_RST_STAT | QUIRK_HAS_PMU_CNT_EN |
+		  QUIRK_HAS_DBGACK_BIT,
+};
+
 static const struct of_device_id s3c2410_wdt_match[] = {
 	{ .compatible = "google,gs101-wdt",
 	  .data = &drv_data_gs101_cl0 },
@@ -320,6 +350,8 @@ static const struct of_device_id s3c2410_wdt_match[] = {
 	  .data = &drv_data_exynos850_cl0 },
 	{ .compatible = "samsung,exynosautov9-wdt",
 	  .data = &drv_data_exynosautov9_cl0 },
+	{ .compatible = "samsung,exynosautov920-wdt",
+	  .data = &drv_data_exynosautov920_cl0 },
 	{},
 };
 MODULE_DEVICE_TABLE(of, s3c2410_wdt_match);
@@ -643,7 +675,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
 	/* Choose Exynos850/ExynosAutov9 driver data w.r.t. cluster index */
 	if (variant == &drv_data_exynos850_cl0 ||
 	    variant == &drv_data_exynosautov9_cl0 ||
-	    variant == &drv_data_gs101_cl0) {
+	    variant == &drv_data_gs101_cl0 ||
+	    variant == &drv_data_exynosautov920_cl0) {
 		u32 index;
 		int err;
 
@@ -662,6 +695,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt)
 				variant = &drv_data_exynosautov9_cl1;
 			else if (variant == &drv_data_gs101_cl0)
 				variant = &drv_data_gs101_cl1;
+			else if (variant == &drv_data_exynosautov920_cl0)
+				variant = &drv_data_exynosautov920_cl1;
 			break;
 		default:
 			return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index);
-- 
2.47.0

[PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Taewan Kim]

From: Byoungtae Cho <bt.cho@samsung.com>

Adds two watchdog devices for ExynosAutoV920 SoC.

Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
---
 .../arm64/boot/dts/exynos/exynosautov920.dtsi | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm64/boot/dts/exynos/exynosautov920.dtsi b/arch/arm64/boot/dts/exynos/exynosautov920.dtsi
index 91882b37fdb3..2b3e8debda3d 100644
--- a/arch/arm64/boot/dts/exynos/exynosautov920.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynosautov920.dtsi
@@ -172,6 +172,26 @@ chipid@10000000 {
 			reg = <0x10000000 0x24>;
 		};
 
+		watchdog_cl0: watchdog@10060000 {
+			compatible = "samsung,exynosautov920-wdt";
+			reg = <0x10060000 0x100>;
+			interrupts = <GIC_SPI 953 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&xtcxo>, <&xtcxo>;
+			clock-names = "watchdog", "watchdog_src";
+			samsung,syscon-phandle = <&pmu_system_controller>;
+			samsung,cluster-index = <0>;
+		};
+
+		watchdog_cl1: watchdog@10070000 {
+			compatible = "samsung,exynosautov920-wdt";
+			reg = <0x10070000 0x100>;
+			interrupts = <GIC_SPI 952 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&xtcxo>, <&xtcxo>;
+			clock-names = "watchdog", "watchdog_src";
+			samsung,syscon-phandle = <&pmu_system_controller>;
+			samsung,cluster-index = <1>;
+		};
+
 		gic: interrupt-controller@10400000 {
 			compatible = "arm,gic-v3";
 			#interrupt-cells = <3>;
-- 
2.47.0

Re: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Krzysztof Kozlowski]

On 21/10/2024 08:39, Taewan Kim wrote:
> From: Byoungtae Cho <bt.cho@samsung.com>
> 
> Adds two watchdog devices for ExynosAutoV920 SoC.
> 
> Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
> Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
> ---
>  .../arm64/boot/dts/exynos/exynosautov920.dtsi | 20 +++++++++++++++++++
>  1 file changed, 20 insertions(+)

How did this happen that this patch was taken to watchdog? There is no
Ack here from me.

Drop this patch from watchdog, I do no agree to take it via that tree.

Best regards,
Krzysztof

Re: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Wim Van Sebroeck]

Hi Krzystof,

> On 21/10/2024 08:39, Taewan Kim wrote:
> > From: Byoungtae Cho <bt.cho@samsung.com>
> > 
> > Adds two watchdog devices for ExynosAutoV920 SoC.
> > 
> > Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
> > Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
> > ---
> >  .../arm64/boot/dts/exynos/exynosautov920.dtsi | 20 +++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> 
> How did this happen that this patch was taken to watchdog? There is no
> Ack here from me.
> 
> Drop this patch from watchdog, I do no agree to take it via that tree.
> 
> Best regards,
> Krzysztof
> 

Seems like you are having a hard day. 
The 3 patches are dropped. I presume that you will take them all through your tree then?

Kind regards,
Wim.

PS: the patches are:
[PATCH v3 1/3] dt-bindings: watchdog: Document ExynosAutoV920 watchdog bindings
[PATCH v3 2/3] watchdog: s3c2410_wdt: add support for exynosautov920 SoC
[PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

Re: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Wim Van Sebroeck]

Hi Krzystof,

> On 07/11/2024 11:33, Wim Van Sebroeck wrote:
> > Hi Krzystof,
> > 
> >> On 21/10/2024 08:39, Taewan Kim wrote:
> >>> From: Byoungtae Cho <bt.cho@samsung.com>
> >>>
> >>> Adds two watchdog devices for ExynosAutoV920 SoC.
> >>>
> >>> Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
> >>> Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
> >>> ---
> >>>  .../arm64/boot/dts/exynos/exynosautov920.dtsi | 20 +++++++++++++++++++
> >>>  1 file changed, 20 insertions(+)
> >>
> >> How did this happen that this patch was taken to watchdog? There is no
> >> Ack here from me.
> >>
> >> Drop this patch from watchdog, I do no agree to take it via that tree.
> >>
> >> Best regards,
> >> Krzysztof
> >>
> > 
> > Seems like you are having a hard day. 
> > The 3 patches are dropped. I presume that you will take them all through your tree then?
> 
> I meant only this one patch, not entire patchset. The bindings and
> watchdog driver are for you. I commented only about this patch here - DTS.
> 
> 
> Best regards,
> Krzysztof
> 

I added the first two patches again. Even when it sounds more logical to me to keep the 3 together. But that's a never ending discussion, so we won't go into that :-).

Kind regards,
Wim.

Re: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Krzysztof Kozlowski]

On 07/11/2024 11:33, Wim Van Sebroeck wrote:
> Hi Krzystof,
> 
>> On 21/10/2024 08:39, Taewan Kim wrote:
>>> From: Byoungtae Cho <bt.cho@samsung.com>
>>>
>>> Adds two watchdog devices for ExynosAutoV920 SoC.
>>>
>>> Signed-off-by: Byoungtae Cho <bt.cho@samsung.com>
>>> Signed-off-by: Taewan Kim <trunixs.kim@samsung.com>
>>> ---
>>>  .../arm64/boot/dts/exynos/exynosautov920.dtsi | 20 +++++++++++++++++++
>>>  1 file changed, 20 insertions(+)
>>
>> How did this happen that this patch was taken to watchdog? There is no
>> Ack here from me.
>>
>> Drop this patch from watchdog, I do no agree to take it via that tree.
>>
>> Best regards,
>> Krzysztof
>>
> 
> Seems like you are having a hard day. 
> The 3 patches are dropped. I presume that you will take them all through your tree then?

I meant only this one patch, not entire patchset. The bindings and
watchdog driver are for you. I commented only about this patch here - DTS.


Best regards,
Krzysztof

Re: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Krzysztof Kozlowski]

On 07/11/2024 12:33, Wim Van Sebroeck wrote:
>>> Seems like you are having a hard day. 
>>> The 3 patches are dropped. I presume that you will take them all through your tree then?
>>
>> I meant only this one patch, not entire patchset. The bindings and
>> watchdog driver are for you. I commented only about this patch here - DTS.
>>
>>
>> Best regards,
>> Krzysztof
>>
> 
> I added the first two patches again. Even when it sounds more logical to me to keep the 3 together.

Thank you.

> But that's a never ending discussion, so we won't go into that :-).

DTS is hardware description independent from Linux, therefore always
goes separate way than Linux drivers.

Best regards,
Krzysztof

RE: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[김태완]

Hi Krzysztof,

> On 07/11/2024 12:33, Wim Van Sebroeck wrote:
> >>> Seems like you are having a hard day.
> >>> The 3 patches are dropped. I presume that you will take them all
> through your tree then?
> >>
> >> I meant only this one patch, not entire patchset. The bindings and
> >> watchdog driver are for you. I commented only about this patch here -
> DTS.
> >>
> >>
> >> Best regards,
> >> Krzysztof
> >>
> >
> > I added the first two patches again. Even when it sounds more logical to
> me to keep the 3 together.
> 
> Thank you.
> 
> > But that's a never ending discussion, so we won't go into that :-).
> 
> DTS is hardware description independent from Linux, therefore always goes
> separate way than Linux drivers.
> 
> Best regards,
> Krzysztof

I found that the first two patches have been added to the linux-next git, 
but the last patch has not yet been reviewed.

I would appreciate it if you could take a look at this patch.

Best regards,
Taewan Kim.

Re: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Krzysztof Kozlowski]

On 05/12/2024 01:28, 김태완 wrote:
> Hi Krzysztof,
> 
>> On 07/11/2024 12:33, Wim Van Sebroeck wrote:
>>>>> Seems like you are having a hard day.
>>>>> The 3 patches are dropped. I presume that you will take them all
>> through your tree then?
>>>>
>>>> I meant only this one patch, not entire patchset. The bindings and
>>>> watchdog driver are for you. I commented only about this patch here -
>> DTS.
>>>>
>>>>
>>>> Best regards,
>>>> Krzysztof
>>>>
>>>
>>> I added the first two patches again. Even when it sounds more logical to
>> me to keep the 3 together.
>>
>> Thank you.
>>
>>> But that's a never ending discussion, so we won't go into that :-).
>>
>> DTS is hardware description independent from Linux, therefore always goes
>> separate way than Linux drivers.
>>
>> Best regards,
>> Krzysztof
> 
> I found that the first two patches have been added to the linux-next git, 
> but the last patch has not yet been reviewed.
> 
> I would appreciate it if you could take a look at this patch.

Since this patch was applied, I dropped from my queue. I don't have it
in my inbox anymore. Please rebase, resolve any comments and resend.
Best regards,
Krzysztof

Re: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[Krzysztof Kozlowski]

On 05/12/2024 08:19, Krzysztof Kozlowski wrote:
>>>> But that's a never ending discussion, so we won't go into that :-).
>>>
>>> DTS is hardware description independent from Linux, therefore always goes
>>> separate way than Linux drivers.
>>>
>>> Best regards,
>>> Krzysztof
>>
>> I found that the first two patches have been added to the linux-next git, 
>> but the last patch has not yet been reviewed.
>>
>> I would appreciate it if you could take a look at this patch.
> 
> Since this patch was applied, I dropped from my queue. I don't have it
> in my inbox anymore. Please rebase, resolve any comments and resend.

I found it in my inbox and tried to apply but it fails:
error: patch failed: arch/arm64/boot/dts/exynos/exynosautov920.dtsi:172


please rebase and resend.

Best regards,
Krzysztof

RE: [PATCH v3 3/3] arm64: dts: exynosautov920: add watchdog DT node

[김태완]

on 05/12/2024 12:25 UTC+09:00, Taewan Kim wrote:
>>>>> But that's a never ending discussion, so we won't go into that :-).
>>>>
>>>> DTS is hardware description independent from Linux, therefore always
>>>> goes separate way than Linux drivers.
>>>>
>>>> Best regards,
>>>> Krzysztof
>>>
>>> I found that the first two patches have been added to the linux-next
>>> git, but the last patch has not yet been reviewed.
>>>
>>> I would appreciate it if you could take a look at this patch.
>>
>> Since this patch was applied, I dropped from my queue. I don't have it
>> in my inbox anymore. Please rebase, resolve any comments and resend.
>
>I found it in my inbox and tried to apply but it fails:
>error: patch failed: arch/arm64/boot/dts/exynos/exynosautov920.dtsi:172
>
>
>please rebase and resend.

Thanks to your hard work, I will resend it after rebase.

Best regards,
Taewan Kim