arm64: zynqmp: enable the PMUFW watchdog
Subsystems (3)
PATCH 1/1 arm64: zynqmp: enable the PMUFW watchdog
From 528b3117a36b7b4eea1839afbea7191d60638b0c Mon Sep 17 00:00:00 2001
From: Jorge Ramirez-Ortiz <[email protected]>
Date: Wed, 23 Mar 2022 14:41:15 +0100
Subject: [PATCH] arm64: zynqmp: enable the PMUFW watchdog
If the PMUFW was built with support for the CSU watchdog we must let the firmware know that it can be started.
We do this by faking the FSBL done state.
Reference code in PMUFW:
https://github.com/Xilinx/embeddedsw/blob/master/lib/sw_apps/zynqmp_pmufw/src/xpfw_mod_common.c#L36
It needs this fix on the PMUFW
https://github.com/Xilinx/embeddedsw/pull/190
--- arch/arm/mach-zynqmp/include/mach/hardware.h | 5 ++++- board/xilinx/zynqmp/zynqmp.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)
arch/arm/mach-zynqmp/include/mach/hardware.h +4 -1
@@ -174,8 +174,11 @@ struct csu_regs {#define ZYNQMP_PMU_BASEADDR 0xFFD80000 +#define FSBL_COMPLETION 0x1 +struct pmu_regs { -u32 reserved[18 ]; +u32 reserved[17 ]; +u32 gen_storage5;/* 0x44 */ u32 gen_storage6;/* 0x48 */ };
board/xilinx/zynqmp/zynqmp.c +4 -0
@@ -419,6 +419,10 @@ int board_init(void) zynqmp_pm_cfg_obj_size);printf ("Silicon version:\t%d\n" ,zynqmp_get_silicon_version ()); +/* fake FSBL completion to start the PMUFW watchdog when enabled */ +writel (readl (&pmu_base->gen_storage5) |FSBL_COMPLETION , + &pmu_base->gen_storage5); +/* the CSU disables the JTAG interface when secure boot is enabled */ if (CONFIG_IS_ENABLED (ZYNQMP_RESTORE_JTAG ))restore_jtag ();
Signature · 1 line
2.34.1
Quoted 4 lines · Jorge Ramirez-Ortiz
From
528b3117a36b7b4eea1839afbea7191d60638b0cMon Sep 17 00:00:00 2001
From: Jorge Ramirez-Ortiz <[email protected]>
Date: Wed, 23 Mar 2022 14:41:15 +0100
Subject: [PATCH] arm64: zynqmp: enable the PMUFW watchdog
um, seems my sendpatch script is a bit off.
please let me know if I should send a v2.
Quoted 53 lines
If the PMUFW was built with support for the CSU watchdog we must let the firmware know that it can be started.
We do this by faking the FSBL done state.
Reference code in PMUFW:
https://github.com/Xilinx/embeddedsw/blob/master/lib/sw_apps/zynqmp_pmufw/src/xpfw_mod_common.c#L36It needs this fix on the PMUFW
https://github.com/Xilinx/embeddedsw/pull/190Signed-off-by Jorge Ramirez-Ortiz <[email protected]>--- arch/arm/mach-zynqmp/include/mach/hardware.h | 5 ++++- board/xilinx/zynqmp/zynqmp.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)arch/arm/mach-zynqmp/include/mach/hardware.h +4
-1@@ -174,8 +174,11 @@ struct csu_regs {#define ZYNQMP_PMU_BASEADDR 0xFFD80000 +#define FSBL_COMPLETION 0x1 +struct pmu_regs { -u32 reserved[18 ]; +u32 reserved[17 ]; +u32 gen_storage5;/* 0x44 */ u32 gen_storage6;/* 0x48 */ };board/xilinx/zynqmp/zynqmp.c +4
-0@@ -419,6 +419,10 @@ int board_init(void) zynqmp_pm_cfg_obj_size);printf ("Silicon version:\t%d\n" ,zynqmp_get_silicon_version ()); +/* fake FSBL completion to start the PMUFW watchdog when enabled */ +writel (readl (&pmu_base->gen_storage5) |FSBL_COMPLETION , + &pmu_base->gen_storage5); +/* the CSU disables the JTAG interface when secure boot is enabled */ if (CONFIG_IS_ENABLED (ZYNQMP_RESTORE_JTAG ))restore_jtag ();Signature · 1 line
2.34.1
Quoted 8 lines · Jorge Ramirez-Ortiz
From
528b3117a36b7b4eea1839afbea7191d60638b0cMon Sep 17 00:00:00 2001
From: Jorge Ramirez-Ortiz <[email protected]>
Date: Wed, 23 Mar 2022 14:41:15 +0100
Subject: [PATCH] arm64: zynqmp: enable the PMUFW watchdogIf the PMUFW was built with support for the CSU watchdog we must let the firmware know that it can be started.
Quoted 7 lines
We do this by faking the FSBL done state.
Reference code in PMUFW:
https://github.com/Xilinx/embeddedsw/blob/master/lib/sw_apps/zynqmp_pmufw/src/xpfw_mod_common.c#L36It needs this fix on the PMUFW
https://github.com/Xilinx/embeddedsw/pull/190
/* FSBL might not be running anywhere - i.e: SPL boots PMUFW */
SPL doesn't boot PMUFW. It is the first firmware in BOOT.BIN which is loaded by bootrom to PMU. It means comment is not correct. FSBL or SPL just sending PMU configuration object to PMUFW.
Quoted 29 lines
Signed-off-by Jorge Ramirez-Ortiz <[email protected]>--- arch/arm/mach-zynqmp/include/mach/hardware.h | 5 ++++- board/xilinx/zynqmp/zynqmp.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)arch/arm/mach-zynqmp/include/mach/hardware.h +4
-1@@ -174,8 +174,11 @@ struct csu_regs {#define ZYNQMP_PMU_BASEADDR 0xFFD80000 +#define FSBL_COMPLETION 0x1 +struct pmu_regs { -u32 reserved[18 ]; +u32 reserved[17 ]; +u32 gen_storage5;/* 0x44 */ u32 gen_storage6;/* 0x48 */ };board/xilinx/zynqmp/zynqmp.c +0
-0
board/xilinx/zynqmp/zynqmp.c int board_init(void) · line 424
Quoted 6 lines
board/xilinx/zynqmp/zynqmp.c +3
-0@@ -419,6 +419,10 @@ int board_init(void) zynqmp_pm_cfg_obj_size);printf ("Silicon version:\t%d\n" ,zynqmp_get_silicon_version ()); +/* fake FSBL completion to start the PMUFW watchdog when enabled */ +writel (readl (&pmu_base->gen_storage5) |FSBL_COMPLETION , + &pmu_base->gen_storage5);
I look at the code in FSBL and it set it up XFsbl_HandoffExit which is at the end of FSBL. It means this should be setup in SPL not in U-Boot proper.
There is also any XFSBL_FSBL_ENCRYPTED_MASK which maybe you should take a look in connection your other patches.
board/xilinx/zynqmp/zynqmp.c int board_init(void) · line 428
Quoted 4 lines
board/xilinx/zynqmp/zynqmp.c +1
-0+/* the CSU disables the JTAG interface when secure boot is enabled */ if (CONFIG_IS_ENABLED (ZYNQMP_RESTORE_JTAG ))restore_jtag ();
M
Quoted 20 lines · Michal Simek
Quoted 8 lines · Jorge Ramirez-Ortiz
From
528b3117a36b7b4eea1839afbea7191d60638b0cMon Sep 17 00:00:00 2001
From: Jorge Ramirez-Ortiz <[email protected]>
Date: Wed, 23 Mar 2022 14:41:15 +0100
Subject: [PATCH] arm64: zynqmp: enable the PMUFW watchdogIf the PMUFW was built with support for the CSU watchdog we must let the firmware know that it can be started.
Quoted 7 lines
We do this by faking the FSBL done state.
Reference code in PMUFW:
https://github.com/Xilinx/embeddedsw/blob/master/lib/sw_apps/zynqmp_pmufw/src/xpfw_mod_common.c#L36It needs this fix on the PMUFW
https://github.com/Xilinx/embeddedsw/pull/190
Quoted 5 lines
/* FSBL might not be running anywhere - i.e: SPL boots PMUFW */
SPL doesn't boot PMUFW. It is the first firmware in BOOT.BIN which is loaded by bootrom to PMU. It means comment is not correct.
FSBL or SPL just sending PMU configuration object to PMUFW.
yeah I guess it depends what you mean by boot - unless SPL configures it, it wont really boot to a functional state.
but anyway ok, will change.
Quoted 30 lines
Quoted 30 lines
Signed-off-by Jorge Ramirez-Ortiz <[email protected]>--- arch/arm/mach-zynqmp/include/mach/hardware.h | 5 ++++- board/xilinx/zynqmp/zynqmp.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)arch/arm/mach-zynqmp/include/mach/hardware.h +4
-1@@ -174,8 +174,11 @@ struct csu_regs {#define ZYNQMP_PMU_BASEADDR 0xFFD80000 +#define FSBL_COMPLETION 0x1 +struct pmu_regs { -u32 reserved[18 ]; +u32 reserved[17 ]; +u32 gen_storage5;/* 0x44 */ u32 gen_storage6;/* 0x48 */ };board/xilinx/zynqmp/zynqmp.c +0
-0@@ -419,6 +419,10 @@ int board_init(void)
Quoted 8 lines
board/xilinx/zynqmp/zynqmp.c int board_init(void) · line 424
Quoted 5 lines
board/xilinx/zynqmp/zynqmp.c +3
-0zynqmp_pm_cfg_obj_size);printf ("Silicon version:\t%d\n" ,zynqmp_get_silicon_version ()); +/* fake FSBL completion to start the PMUFW watchdog when enabled */ +writel (readl (&pmu_base->gen_storage5) |FSBL_COMPLETION , + &pmu_base->gen_storage5);I look at the code in FSBL and it set it up
XFsbl_HandoffExitwhich is at the end of FSBL. It means this should be setup in SPL not in U-Boot proper.
not sure what you mean. This piece of code I am posting only executes in SPL, doesn it?
Quoted 4 lines
There is also any
XFSBL_FSBL_ENCRYPTED_MASKwhich maybe you should take a look in connection your other patches.
um, ok thanks for the info!
Quoted 7 lines
board/xilinx/zynqmp/zynqmp.c int board_init(void) · line 428
Quoted 5 lines
board/xilinx/zynqmp/zynqmp.c +1
-0+/* the CSU disables the JTAG interface when secure boot is enabled */ if (CONFIG_IS_ENABLED (ZYNQMP_RESTORE_JTAG ))restore_jtag ();M
Quoted 72 lines · Foundries
Quoted 20 lines · Michal Simek
Quoted 8 lines · Jorge Ramirez-Ortiz
From
528b3117a36b7b4eea1839afbea7191d60638b0cMon Sep 17 00:00:00 2001
From: Jorge Ramirez-Ortiz <[email protected]>
Date: Wed, 23 Mar 2022 14:41:15 +0100
Subject: [PATCH] arm64: zynqmp: enable the PMUFW watchdogIf the PMUFW was built with support for the CSU watchdog we must let the firmware know that it can be started.
Quoted 7 lines
We do this by faking the FSBL done state.
Reference code in PMUFW:
https://github.com/Xilinx/embeddedsw/blob/master/lib/sw_apps/zynqmp_pmufw/src/xpfw_mod_common.c#L36It needs this fix on the PMUFW
https://github.com/Xilinx/embeddedsw/pull/190Quoted 5 lines
/* FSBL might not be running anywhere - i.e: SPL boots PMUFW */
SPL doesn't boot PMUFW. It is the first firmware in BOOT.BIN which is loaded by bootrom to PMU. It means comment is not correct.
FSBL or SPL just sending PMU configuration object to PMUFW.yeah I guess it depends what you mean by boot - unless SPL configures it, it wont really boot to a functional state.
but anyway ok, will change.
Quoted 30 lines
Quoted 30 lines
Signed-off-by Jorge Ramirez-Ortiz <[email protected]>--- arch/arm/mach-zynqmp/include/mach/hardware.h | 5 ++++- board/xilinx/zynqmp/zynqmp.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-)arch/arm/mach-zynqmp/include/mach/hardware.h +4
-1@@ -174,8 +174,11 @@ struct csu_regs {#define ZYNQMP_PMU_BASEADDR 0xFFD80000 +#define FSBL_COMPLETION 0x1 +struct pmu_regs { -u32 reserved[18 ]; +u32 reserved[17 ]; +u32 gen_storage5;/* 0x44 */ u32 gen_storage6;/* 0x48 */ };board/xilinx/zynqmp/zynqmp.c +0
-0@@ -419,6 +419,10 @@ int board_init(void)Quoted 8 lines
board/xilinx/zynqmp/zynqmp.c int board_init(void) · line 424
Quoted 5 lines
board/xilinx/zynqmp/zynqmp.c +3
-0zynqmp_pm_cfg_obj_size);printf ("Silicon version:\t%d\n" ,zynqmp_get_silicon_version ()); +/* fake FSBL completion to start the PMUFW watchdog when enabled */ +writel (readl (&pmu_base->gen_storage5) |FSBL_COMPLETION , + &pmu_base->gen_storage5);I look at the code in FSBL and it set it up
XFsbl_HandoffExitwhich is at the end of FSBL. It means this should be setup in SPL not in U-Boot proper.
Quoted 2 lines
not sure what you mean. This piece of code I am posting only executes in SPL, doesn it?
ah. ok. Then fine.
M