* [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog
@ 2021-03-10 17:32 Eddie James
2021-03-10 17:32 ` [PATCH linux dev-5.10 2/3] ARM: dts: aspeed: everest: " Eddie James
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Eddie James @ 2021-03-10 17:32 UTC (permalink / raw)
To: openbmc
Set watchdog 1 to pulse the fan watchdog circuit that drives the FAULT
pin of the MAX31785, resulting in fans running at full speed, if at
any point the BMC stops pulsing it, such as a BMC reboot at runtime.
Enable watchdog 2 for BMC reboots.
Signed-off-by: Matthew Barth <msbarth@linux.ibm.com>
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 85fb60d16fdf..9f34136ec40f 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -3193,6 +3193,20 @@ flash@0 {
};
};
+&wdt1 {
+ aspeed,reset-type = "none";
+ aspeed,external-signal;
+ aspeed,ext-push-pull;
+ aspeed,ext-active-high;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_wdtrst1_default>;
+};
+
+&wdt2 {
+ status = "okay";
+};
+
&xdma {
status = "okay";
memory-region = <&vga_memory>;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH linux dev-5.10 2/3] ARM: dts: aspeed: everest: Enable fan watchdog
2021-03-10 17:32 [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog Eddie James
@ 2021-03-10 17:32 ` Eddie James
2021-04-08 1:13 ` Andrew Jeffery
2021-03-10 17:32 ` [PATCH linux dev-5.10 3/3] ARM: dts: aspeed: Add Rainier 1S4U machine Eddie James
2021-03-11 23:52 ` [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog Joel Stanley
2 siblings, 1 reply; 6+ messages in thread
From: Eddie James @ 2021-03-10 17:32 UTC (permalink / raw)
To: openbmc
Set watchdog 1 to pulse the fan watchdog circuit that drives the FAULT
pin of the MAX31785, resulting in fans running at full speed, if at
any point the BMC stops pulsing it, such as a BMC reboot at runtime.
Enable watchdog 2 for BMC reboots.
Signed-off-by: Matthew Barth <msbarth@linux.ibm.com>
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index f33c22f824cd..4836750776d0 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -2335,6 +2335,20 @@ &mac3 {
use-ncsi;
};
+&wdt1 {
+ aspeed,reset-type = "none";
+ aspeed,external-signal;
+ aspeed,ext-push-pull;
+ aspeed,ext-active-high;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_wdtrst1_default>;
+};
+
+&wdt2 {
+ status = "okay";
+};
+
&xdma {
status = "okay";
memory-region = <&vga_memory>;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH linux dev-5.10 2/3] ARM: dts: aspeed: everest: Enable fan watchdog
2021-03-10 17:32 ` [PATCH linux dev-5.10 2/3] ARM: dts: aspeed: everest: " Eddie James
@ 2021-04-08 1:13 ` Andrew Jeffery
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Jeffery @ 2021-04-08 1:13 UTC (permalink / raw)
To: openbmc
On Thu, 11 Mar 2021, at 04:02, Eddie James wrote:
> Set watchdog 1 to pulse the fan watchdog circuit that drives the FAULT
> pin of the MAX31785, resulting in fans running at full speed, if at
> any point the BMC stops pulsing it, such as a BMC reboot at runtime.
> Enable watchdog 2 for BMC reboots.
>
> Signed-off-by: Matthew Barth <msbarth@linux.ibm.com>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
Acked-by: Andrew Jeffery <andrew@aj.id.au>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH linux dev-5.10 3/3] ARM: dts: aspeed: Add Rainier 1S4U machine
2021-03-10 17:32 [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog Eddie James
2021-03-10 17:32 ` [PATCH linux dev-5.10 2/3] ARM: dts: aspeed: everest: " Eddie James
@ 2021-03-10 17:32 ` Eddie James
2021-04-12 19:42 ` Andrew Geissler
2021-03-11 23:52 ` [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog Joel Stanley
2 siblings, 1 reply; 6+ messages in thread
From: Eddie James @ 2021-03-10 17:32 UTC (permalink / raw)
To: openbmc
The 1S4U version of the Rainier system has only 4 fans. Create a new
tree, include the 4U version, and delete the 2 extra fans.
Signed-off-by: Eddie James <eajames@linux.ibm.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts | 14 ++++++++++++++
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +-
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7b24be9cf961..535a467822f9 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1398,6 +1398,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-ibm-everest.dtb \
aspeed-bmc-ibm-rainier.dtb \
aspeed-bmc-ibm-rainier-v2.dtb \
+ aspeed-bmc-ibm-rainier-1s4u.dtb \
aspeed-bmc-ibm-rainier-4u.dtb \
aspeed-bmc-ibm-rainier-4u-v2.dtb \
aspeed-bmc-intel-s2600wf.dtb \
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
new file mode 100644
index 000000000000..78b2dab63624
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2021 IBM Corp.
+/dts-v1/;
+
+#include "aspeed-bmc-ibm-rainier-4u-v2.dts"
+
+/ {
+ model = "Rainier 1S4U";
+};
+
+&max {
+ /delete-node/ fan4;
+ /delete-node/ fan5;
+};
diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 9f34136ec40f..dad90a152174 100644
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1978,7 +1978,7 @@ tmp275@48 {
reg = <0x48>;
};
- max31785@52 {
+ max: max31785@52 {
compatible = "maxim,max31785a";
reg = <0x52>;
#address-cells = <1>;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH linux dev-5.10 3/3] ARM: dts: aspeed: Add Rainier 1S4U machine
2021-03-10 17:32 ` [PATCH linux dev-5.10 3/3] ARM: dts: aspeed: Add Rainier 1S4U machine Eddie James
@ 2021-04-12 19:42 ` Andrew Geissler
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Geissler @ 2021-04-12 19:42 UTC (permalink / raw)
To: Eddie James; +Cc: openbmc Maillist
> On Mar 10, 2021, at 11:32 AM, Eddie James <eajames@linux.ibm.com> wrote:
>
> The 1S4U version of the Rainier system has only 4 fans. Create a new
> tree, include the 4U version, and delete the 2 extra fans.
>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts | 14 ++++++++++++++
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +-
> 3 files changed, 16 insertions(+), 1 deletion(-)
> create mode 100644 arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 7b24be9cf961..535a467822f9 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -1398,6 +1398,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
> aspeed-bmc-ibm-everest.dtb \
> aspeed-bmc-ibm-rainier.dtb \
> aspeed-bmc-ibm-rainier-v2.dtb \
> + aspeed-bmc-ibm-rainier-1s4u.dtb \
> aspeed-bmc-ibm-rainier-4u.dtb \
> aspeed-bmc-ibm-rainier-4u-v2.dtb \
> aspeed-bmc-intel-s2600wf.dtb \
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
> new file mode 100644
> index 000000000000..78b2dab63624
> --- /dev/null
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts
> @@ -0,0 +1,14 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +// Copyright 2021 IBM Corp.
> +/dts-v1/;
> +
> +#include "aspeed-bmc-ibm-rainier-4u-v2.dts"
> +
> +/ {
> + model = "Rainier 1S4U";
> +};
> +
> +&max {
> + /delete-node/ fan4;
Testing brought to light that the hardware actually uses slots 0, 1, 2, and 4
for the 4 fans. So need to replace the delete of fan4 here with fan3.
Otherwise, looks good, thanks.
> + /delete-node/ fan5;
> +};
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index 9f34136ec40f..dad90a152174 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -1978,7 +1978,7 @@ tmp275@48 {
> reg = <0x48>;
> };
>
> - max31785@52 {
> + max: max31785@52 {
> compatible = "maxim,max31785a";
> reg = <0x52>;
> #address-cells = <1>;
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog
2021-03-10 17:32 [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog Eddie James
2021-03-10 17:32 ` [PATCH linux dev-5.10 2/3] ARM: dts: aspeed: everest: " Eddie James
2021-03-10 17:32 ` [PATCH linux dev-5.10 3/3] ARM: dts: aspeed: Add Rainier 1S4U machine Eddie James
@ 2021-03-11 23:52 ` Joel Stanley
2 siblings, 0 replies; 6+ messages in thread
From: Joel Stanley @ 2021-03-11 23:52 UTC (permalink / raw)
To: Eddie James; +Cc: OpenBMC Maillist
On Wed, 10 Mar 2021 at 17:32, Eddie James <eajames@linux.ibm.com> wrote:
>
> Set watchdog 1 to pulse the fan watchdog circuit that drives the FAULT
> pin of the MAX31785, resulting in fans running at full speed, if at
> any point the BMC stops pulsing it, such as a BMC reboot at runtime.
> Enable watchdog 2 for BMC reboots.
This patch looks okay, assuming you have tested rebooting still works.
Have we tested that u-boot reboots still work, and do not trigger the reset?
Have you considered making a common ibm-p10 device tree, and
including/removing nodes as appropriate for the various rainier and
everest systems? I think this will reduce the work required to
maintain the trees, particularly as it avoids adding changes like this
twice.
Cheers,
Joel
>
> Signed-off-by: Matthew Barth <msbarth@linux.ibm.com>
> Signed-off-by: Eddie James <eajames@linux.ibm.com>
> ---
> arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index 85fb60d16fdf..9f34136ec40f 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -3193,6 +3193,20 @@ flash@0 {
> };
> };
>
> +&wdt1 {
> + aspeed,reset-type = "none";
> + aspeed,external-signal;
> + aspeed,ext-push-pull;
> + aspeed,ext-active-high;
> +
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_wdtrst1_default>;
> +};
> +
> +&wdt2 {
> + status = "okay";
> +};
> +
> &xdma {
> status = "okay";
> memory-region = <&vga_memory>;
> --
> 2.27.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-04-12 19:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-10 17:32 [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog Eddie James
2021-03-10 17:32 ` [PATCH linux dev-5.10 2/3] ARM: dts: aspeed: everest: " Eddie James
2021-04-08 1:13 ` Andrew Jeffery
2021-03-10 17:32 ` [PATCH linux dev-5.10 3/3] ARM: dts: aspeed: Add Rainier 1S4U machine Eddie James
2021-04-12 19:42 ` Andrew Geissler
2021-03-11 23:52 ` [PATCH linux dev-5.10 1/3] ARM: dts: aspeed: rainier: Enable fan watchdog Joel Stanley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.