Skip to contentSkip to conversation

arm: socfpga: soc64: Check FPGA Config status register before bridge reset

PATCH Superseded Chee Hong Ang 2 participants 2 messages Aug 5, 2020 – Aug 6, 2020

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 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
index a85c5ae..43cc3d4 100644
@@ -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 socfpga_get_fpga_config(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
index c90f63a..5e3f54a 100644
@@ -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
index 670bfa1..c8751db 100644
@@ -151,17 +151,19 @@ int arch_early_init_r(void)
 	return 0;
 }
 
+/* Return 0 if FPGA is ready otherwise return non-zero */
+int socfpga_get_fpga_config(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 (socfpga_get_fpga_config()) {
+		puts("FPGA not ready. Bridge reset aborted!\n");
+		return;
 	}
 
 	socfpga_bridges_reset(enable);
Signature · 1 line
2.2.0
#1 lore raw

PATCH 1/1 arm: socfpga: soc64: Check FPGA Config status register before bridge reset

Quoted 78 lines

-----Original Message-----
From: Ang, Chee Hong <[email protected]>
Sent: Wednesday, August 5, 2020 8:55 PM
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 v1] 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- renamed from arch/arm/mach-socfpga/include/mach/misc.h +0 -0

socfpga/include/mach/misc.h
index a85c5ae..43cc3d4 100644

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 socfpga_get_fpga_config(void);
+#endif
+
 void do_bridge_reset(int enable, unsigned int mask);  void

socfpga_pl310_clear(void); void socfpga_get_managers_addr(void); diff -- git a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h index c90f63a..5e3f54a 100644

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- renamed from arch/arm/mach-socfpga/misc_s10.c +0 -0

socfpga/misc_s10.c
index 670bfa1..c8751db 100644

arch/arm/mach-socfpga/misc_s10.c +3 -0
@@ -151,17 +151,19 @@ int arch_early_init_r(void)
 	return 0;
 }
 
+/* Return 0 if FPGA is ready otherwise return non-zero */ int
+socfpga_get_fpga_config(void) {
+	return (readl(socfpga_get_sysmgr_addr() +

SYSMGR_SOC64_FPGA_CONFIG) &

arch/arm/mach-socfpga/misc_s10.c +1 -0
+		SYSMGR_FPGACONFIG_READY_MASK) !=
Quoted 1 line

SYSMGR_FPGACONFIG_READY_MASK; }

This returns FPGA config ready status, suggest this function can rename to something _ready() and return true if it is ready. Easier for reading and understanding.

Quoted 10 lines
arch/arm/mach-socfpga/misc_s10.c +1 -2
+
 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);

arch/arm/mach-socfpga/misc_s10.c +0 -3
-
-		if (ret && ret != MBOX_CFGSTAT_STATE_CONFIG)
-			ret =

mbox_get_fpga_config_status(MBOX_CONFIG_STATUS);

arch/arm/mach-socfpga/misc_s10.c int arch_early_init_r(void) · line 169

Quoted 9 lines
arch/arm/mach-socfpga/misc_s10.c +3 -3
-
-		if (ret)
-			return;
+	if (socfpga_get_fpga_config()) {
+		puts("FPGA not ready. Bridge reset aborted!\n");
+		return;
 	}
 
 	socfpga_bridges_reset(enable);

Regards
Ley Foon