arm: socfpga: soc64: Check FPGA Config status register before bridge reset
Subsystems (3)
PATCH v2 1/1 arm: socfpga: soc64: Check FPGA Config status register before bridge reset
Instead of querying SDM for FPGA configuration status through mailbox messages, U-Boot now checks System Manager's FPGA Config status register for FPGA configuration status before resetting bridge.
--- arch/arm/mach-socfpga/include/mach/misc.h | 5 +++++ .../mach-socfpga/include/mach/system_manager_soc64.h | 6 +++++- arch/arm/mach-socfpga/misc_s10.c | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 9 deletions(-)
arch/arm/mach-socfpga/include/mach/misc.h +5 -0
@@ -39,6 +39,11 @@ void socfpga_init_security_policies(void);void socfpga_sdram_remap_zero (void );#endif +#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10 ) || \ + defined(CONFIG_TARGET_SOCFPGA_AGILEX ) +int is_fpga_config_ready (void ); +#endif +void do_bridge_reset (int enable,unsigned int mask);void socfpga_pl310_clear (void );void socfpga_get_managers_addr (void );
arch/arm/mach-socfpga/include/mach/system_manager_soc64.h +5 -1
@@ -88,8 +88,12 @@ void sysmgr_pinmux_table_delay(const u32 **table, unsigned int *table_len);#define SYSMGR_ECC_OCRAM_EN BIT(0)#define SYSMGR_ECC_OCRAM_SERR BIT(3)#define SYSMGR_ECC_OCRAM_DERR BIT(4) -#define SYSMGR_FPGAINTF_USEFPGA 0x1 +#define SYSMGR_FPGACONFIG_FPGA_COMPLETE BIT(0) +#define SYSMGR_FPGACONFIG_EARLY_USERMODE BIT(1) +#define SYSMGR_FPGACONFIG_READY_MASK (SYSMGR_FPGACONFIG_FPGA_COMPLETE | \ + SYSMGR_FPGACONFIG_EARLY_USERMODE) +#define SYSMGR_FPGAINTF_USEFPGA 0x1#define SYSMGR_FPGAINTF_NAND BIT(4)#define SYSMGR_FPGAINTF_SDMMC BIT(8)#define SYSMGR_FPGAINTF_SPIM0 BIT(16)
arch/arm/mach-socfpga/misc_s10.c +10 -8
@@ -151,17 +151,19 @@ int arch_early_init_r(void)return 0 ; } +/* Return 1 if FPGA is ready otherwise return 0 */ +int is_fpga_config_ready (void ) +{ +return (readl (socfpga_get_sysmgr_addr () +SYSMGR_SOC64_FPGA_CONFIG ) & +SYSMGR_FPGACONFIG_READY_MASK ) ==SYSMGR_FPGACONFIG_READY_MASK ; +} +void do_bridge_reset (int enable,unsigned int mask) {/* Check FPGA status before bridge enable */ -if (enable) { -int ret =mbox_get_fpga_config_status (MBOX_RECONFIG_STATUS ); - -if (ret && ret !=MBOX_CFGSTAT_STATE_CONFIG ) - ret =mbox_get_fpga_config_status (MBOX_CONFIG_STATUS ); - -if (ret) -return ; +if (!is_fpga_config_ready ()) { +puts ("FPGA not ready. Bridge reset aborted!\n" ); +return ; }socfpga_bridges_reset (enable);
Signature · 1 line
2.2.0
Tan
PATCH v2 1/1 arm: socfpga: soc64: Check FPGA Config status register before bridge reset
Quoted 19 lines
-----Original Message-----
From: Ang, Chee Hong <[email protected]>
Sent: Thursday, August 6, 2020 11:56 AM
To: u-boot at lists.denx.de
Cc: Marek Vasut <[email protected]>; Simon Goldschmidt <[email protected]>; Tom Rini <[email protected]>; See, Chin Liang <[email protected]>; Tan, Ley Foon <[email protected]>; Ang, Chee Hong <[email protected]>; Chee, Tien Fong <[email protected]>; Lim, Elly Siew Chin <[email protected]>
Subject: [PATCH v2] arm: socfpga: soc64: Check FPGA Config status register before bridge resetInstead of querying SDM for FPGA configuration status through mailbox messages, U-Boot now checks System Manager's FPGA Config status register for FPGA configuration status before resetting bridge.
Quoted 7 lines
Signed-off-by Chee Hong Ang <[email protected]>--- arch/arm/mach-socfpga/include/mach/misc.h | 5 +++++ .../mach-socfpga/include/mach/system_manager_soc64.h | 6 +++++- arch/arm/mach-socfpga/misc_s10.c | 18 ++++++++++-------- 3 files changed, 20 insertions(+), 9 deletions(-)
Regards
Ley Foon