Skip to contentSkip to conversation

arm: socfpga: Add F2SDRAM_MANAGER base address

PATCH New Jit Loon Lim 1 participant 5 messages Nov 13, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 arm: socfpga: Add F2SDRAM_MANAGER base address

From: Ley Foon Tan <[email protected]>

HSD #1508586908-1: Add F2SDRAM Manager base address.

---
 .../include/mach/reset_manager_soc64.h        | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)
arch/arm/mach-socfpga/include/mach/reset_manager_soc64.h +22 -4
index c8bb727aa2..ca5739c30c 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- *  Copyright (C) 2016-2019 Intel Corporation <www.intel.com>
+ *  Copyright (C) 2016-2022 Intel Corporation <www.intel.com>
  */
 
 #ifndef _RESET_MANAGER_SOC64_H_
@@ -12,15 +12,33 @@ void print_reset_info(void);
 void socfpga_bridges_reset(int enable);
 
 #define RSTMGR_SOC64_STATUS	0x00
+#define RSTMGR_SOC64_HDSKEN	0x10
+#define RSTMGR_SOC64_HDSKREQ	0x14
+#define RSTMGR_SOC64_HDSKACK	0x18
 #define RSTMGR_SOC64_MPUMODRST	0x20
 #define RSTMGR_SOC64_PER0MODRST	0x24
 #define RSTMGR_SOC64_PER1MODRST	0x28
 #define RSTMGR_SOC64_BRGMODRST	0x2c
 
-#define RSTMGR_MPUMODRST_CORE0		0
+#define RSTMGR_MPUMODRST_CORE0	0
 #define RSTMGR_PER0MODRST_OCP_MASK	0x0020bf00
-#define RSTMGR_BRGMODRST_DDRSCH_MASK	0X00000040
-#define RSTMGR_BRGMODRST_FPGA2SOC_MASK	0x00000004
+#define RSTMGR_BRGMODRST_SOC2FPGA_MASK	BIT(0)
+#define RSTMGR_BRGMODRST_LWSOC2FPGA_MASK	BIT(1)
+#define RSTMGR_BRGMODRST_FPGA2SOC_MASK	BIT(2)
+#define RSTMGR_BRGMODRST_F2SDRAM0_MASK	BIT(3)
+#define RSTMGR_BRGMODRST_F2SDRAM1_MASK	BIT(4)
+#define RSTMGR_BRGMODRST_F2SDRAM2_MASK	BIT(5)
+#define RSTMGR_BRGMODRST_DDRSCH_MASK	BIT(6)
+
+#define BRGMODRST_SOC2FPGA_BRIDGES	(RSTMGR_BRGMODRST_SOC2FPGA_MASK | \
+					 RSTMGR_BRGMODRST_LWSOC2FPGA_MASK)
+#define BRGMODRST_FPGA2SOC_BRIDGES	(RSTMGR_BRGMODRST_FPGA2SOC_MASK | \
+					 RSTMGR_BRGMODRST_F2SDRAM0_MASK | \
+					 RSTMGR_BRGMODRST_F2SDRAM1_MASK | \
+					 RSTMGR_BRGMODRST_F2SDRAM2_MASK)
+
+#define RSTMGR_HDSKEN_FPGAHSEN		BIT(2)
+#define RSTMGR_HDSKREQ_FPGAHSREQ	BIT(2)
 
 /* SDM, Watchdogs and MPU warm reset mask */
 #define RSTMGR_STAT_SDMWARMRST		BIT(1)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 2/5 arm: socfpga: soc64: Update reset manager registers

From: Ley Foon Tan <[email protected]>

HSD #1508586908-2: Add reset manager registers, preparation for f2s bridge reset support.

---
 arch/arm/mach-socfpga/include/mach/reset_manager_soc64.h | 1 -
 1 file changed, 1 deletion(-)
arch/arm/mach-socfpga/include/mach/reset_manager_soc64.h +0 -1
index ca5739c30c..9589b61749 100644
@@ -29,7 +29,6 @@ void socfpga_bridges_reset(int enable);
 #define RSTMGR_BRGMODRST_F2SDRAM1_MASK	BIT(4)
 #define RSTMGR_BRGMODRST_F2SDRAM2_MASK	BIT(5)
 #define RSTMGR_BRGMODRST_DDRSCH_MASK	BIT(6)
-
 #define BRGMODRST_SOC2FPGA_BRIDGES	(RSTMGR_BRGMODRST_SOC2FPGA_MASK | \
 					 RSTMGR_BRGMODRST_LWSOC2FPGA_MASK)
 #define BRGMODRST_FPGA2SOC_BRIDGES	(RSTMGR_BRGMODRST_FPGA2SOC_MASK | \
Signature · 1 line
2.26.2
#2 lore raw

PATCH 3/5 arm: socfpga: soc64: Move bridges reset to common function

In reply to Jit Loon Lim

From: Ley Foon Tan <[email protected]>

HSD #1508586908-3: Move bridges reset code to common function, socfpga_s2f_bridges_reset(). This function is an inline function and can be included in normal U-boot
and psci secure section.

---
 arch/arm/mach-socfpga/reset_manager_s10.c | 71 +++++++++++------------
 1 file changed, 35 insertions(+), 36 deletions(-)
arch/arm/mach-socfpga/reset_manager_s10.c +35 -36
index f47fec10a0..20ab374881 100644
@@ -57,32 +57,20 @@ void socfpga_per_reset_all(void)
 	writel(0xffffffff, socfpga_get_rstmgr_addr() + RSTMGR_SOC64_PER1MODRST);
 }
 
-void socfpga_bridges_reset(int enable)
+static __always_inline void socfpga_s2f_bridges_reset(int enable)
 {
-#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ATF)
-	u64 arg = enable;
-
-	int ret = invoke_smc(INTEL_SIP_SMC_HPS_SET_BRIDGES, &arg, 1, NULL, 0);
-	if (ret) {
-		printf("SMC call failed with error %d in %s.\n", ret, __func__);
-		return;
-	}
-#else
-	u32 reg;
-
 	if (enable) {
 		/* clear idle request to all bridges */
 		setbits_le32(socfpga_get_sysmgr_addr() +
 			     SYSMGR_SOC64_NOC_IDLEREQ_CLR, ~0);
 
-		/* Release all bridges from reset state */
+		/* Release SOC2FPGA bridges from reset state */
 		clrbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_BRGMODRST,
-			     ~0);
+			     BRGMODRST_SOC2FPGA_BRIDGES);
 
 		/* Poll until all idleack to 0 */
-		read_poll_timeout(readl, reg, !reg, 1000, 300000,
-				  socfpga_get_sysmgr_addr() +
-				  SYSMGR_SOC64_NOC_IDLEACK);
+		POLL_FOR_ZERO(readl(socfpga_get_sysmgr_addr() +
+			      SYSMGR_SOC64_NOC_IDLEACK), 300);
 	} else {
 		/* set idle request to all bridges */
 		writel(~0,
@@ -93,30 +81,41 @@ void socfpga_bridges_reset(int enable)
 		writel(1, socfpga_get_sysmgr_addr() + SYSMGR_SOC64_NOC_TIMEOUT);
 
 		/* Poll until all idleack to 1 */
-		read_poll_timeout(readl, reg,
-				  reg == (SYSMGR_NOC_H2F_MSK |
-					  SYSMGR_NOC_LWH2F_MSK),
-				  1000, 300000,
-				  socfpga_get_sysmgr_addr() +
-				  SYSMGR_SOC64_NOC_IDLEACK);
-
-		/* Poll until all idlestatus to 1 */
-		read_poll_timeout(readl, reg,
-				  reg == (SYSMGR_NOC_H2F_MSK |
-					  SYSMGR_NOC_LWH2F_MSK),
-				  1000, 300000,
-				  socfpga_get_sysmgr_addr() +
-				  SYSMGR_SOC64_NOC_IDLESTATUS);
-
-		/* Reset all bridges (except NOR DDR scheduler & F2S) */
+		POLL_FOR_ZERO(readl(socfpga_get_sysmgr_addr() +
+				    SYSMGR_SOC64_NOC_IDLEACK) ^
+			      (SYSMGR_NOC_H2F_MSK | SYSMGR_NOC_LWH2F_MSK),
+			      300);
+
+		POLL_FOR_ZERO(readl(socfpga_get_sysmgr_addr() +
+				    SYSMGR_SOC64_NOC_IDLESTATUS) ^
+			      (SYSMGR_NOC_H2F_MSK | SYSMGR_NOC_LWH2F_MSK),
+			      300);
+
+		/* Reset all SOC2FPGA bridges (except NOR DDR scheduler & F2S) */
 		setbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_BRGMODRST,
-			     ~(RSTMGR_BRGMODRST_DDRSCH_MASK |
-			       RSTMGR_BRGMODRST_FPGA2SOC_MASK));
+			     BRGMODRST_SOC2FPGA_BRIDGES);
 
 		/* Disable NOC timeout */
 		writel(0, socfpga_get_sysmgr_addr() + SYSMGR_SOC64_NOC_TIMEOUT);
 	}
-#endif
+}
+
+void socfpga_bridges_reset(int enable)
+{
+	if (!IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_SPL_ATF)) {
+		u64 arg = enable;
+
+		if (invoke_smc(INTEL_SIP_SMC_HPS_SET_BRIDGES, &arg, 1, NULL, 0))
+			hang();
+	} else {
+		socfpga_s2f_bridges_reset(enable);
+
+	}
+}
+
+void __secure socfpga_bridges_reset_psci(int enable)
+{
+	socfpga_s2f_bridges_reset(enable);
 }
 
 /*
Signature · 1 line
2.26.2
#3 lore raw

PATCH 4/5 arm: socfpga: soc64: Add f2s bridge support

In reply to Jit Loon Lim

From: Ley Foon Tan <[email protected]>

HSD #1508586908-5: Add F2H and F2SDRAM bridges disable/enable support, based on software programming flow in HW documentation.

---
 arch/arm/mach-socfpga/reset_manager_s10.c | 122 +++++++++++++++++++++-
 1 file changed, 121 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/reset_manager_s10.c +121 -1
index 20ab374881..690cfb2b20 100644
@@ -17,6 +17,57 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/* F2S manager registers */
+#define F2SDRAM_SIDEBAND_FLAGINSTATUS0	0x14
+#define F2SDRAM_SIDEBAND_FLAGOUTSET0	0x50
+#define F2SDRAM_SIDEBAND_FLAGOUTCLR0	0x54
+
+#ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
+#define FLAGINSTATUS0_MPFE_NOC_IDLE	(BIT(0) | BIT(4) | BIT(8))
+#define FLAGINSTATUS0_MPFE_NOC_IDLEACK	(BIT(1) | BIT(5) | BIT(9))
+#define FLAGINSTATUS0_F2S_CMD_EMPTY	(BIT(2) | BIT(6) | BIT(10))
+#define FLAGINSTATUS0_F2S_RESP_EMPTY	(BIT(3) | BIT(7) | BIT(11))
+
+#define FLGAOUTSET0_MPFE_NOC_IDLEREQ	(BIT(0) | BIT(3) | BIT(6))
+#define FLGAOUTSET0_F2S_EN		(BIT(1) | BIT(4) | BIT(7))
+#define FLGAOUTSET0_F2S_FORCE_DRAIN	(BIT(2) | BIT(5) | BIT(8))
+
+#define FLGAOUTCLR0_F2S_IDLEREQ		(BIT(0) | BIT(3) | BIT(6))
+#else
+#define FLAGINSTATUS0_MPFE_NOC_IDLE	BIT(0)
+#define FLAGINSTATUS0_MPFE_NOC_IDLEACK	BIT(1)
+#define FLAGINSTATUS0_F2S_CMD_EMPTY	BIT(2)
+#define FLAGINSTATUS0_F2S_RESP_EMPTY	BIT(3)
+
+#define FLGAOUTSET0_MPFE_NOC_IDLEREQ	BIT(0)
+#define FLGAOUTSET0_F2S_EN		BIT(1)
+#define FLGAOUTSET0_F2S_FORCE_DRAIN	BIT(2)
+
+#define FLGAOUTCLR0_F2S_IDLEREQ		BIT(0)
+#endif
+
+#define POLL_FOR_ZERO(expr, timeout_ms)		\
+	{					\
+		int timeout = (timeout_ms);	\
+		while ((expr)) {		\
+			if (!timeout)		\
+				break;		\
+			timeout--;		\
+			__socfpga_udelay(1000);	\
+		}				\
+	}
+
+#define POLL_FOR_SET(expr, timeout_ms)		\
+	{					\
+		int timeout = (timeout_ms);	\
+		while (!(expr)) {		\
+			if (!timeout)		\
+				break;		\
+			timeout--;		\
+			__socfpga_udelay(1000);	\
+		}				\
+	}
+
 /* Assert or de-assert SoCFPGA reset manager reset. */
 void socfpga_per_reset(u32 reset, int set)
 {
@@ -57,6 +108,74 @@ void socfpga_per_reset_all(void)
 	writel(0xffffffff, socfpga_get_rstmgr_addr() + RSTMGR_SOC64_PER1MODRST);
 }
 
+static __always_inline void socfpga_f2s_bridges_reset(int enable)
+{
+	int timeout_ms = 300;
+	u32 empty;
+
+	if (enable) {
+		clrbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_BRGMODRST,
+			     BRGMODRST_FPGA2SOC_BRIDGES);
+		clrbits_le32(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+			     F2SDRAM_SIDEBAND_FLAGOUTSET0,
+			     FLGAOUTSET0_MPFE_NOC_IDLEREQ);
+
+		POLL_FOR_ZERO((readl(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+			      F2SDRAM_SIDEBAND_FLAGINSTATUS0) &
+			      FLAGINSTATUS0_MPFE_NOC_IDLEACK), timeout_ms);
+		clrbits_le32(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+			     F2SDRAM_SIDEBAND_FLAGOUTSET0,
+			     FLGAOUTSET0_F2S_FORCE_DRAIN);
+		setbits_le32(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+			     F2SDRAM_SIDEBAND_FLAGOUTSET0, FLGAOUTSET0_F2S_EN);
+
+		__socfpga_udelay(1); /* wait 1us */
+	} else {
+		setbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_HDSKEN,
+			     RSTMGR_HDSKEN_FPGAHSEN);
+		setbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_HDSKREQ,
+			     RSTMGR_HDSKREQ_FPGAHSREQ);
+		POLL_FOR_SET(readl(socfpga_get_rstmgr_addr() +
+			     RSTMGR_SOC64_HDSKACK), timeout_ms);
+		clrbits_le32(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+			     F2SDRAM_SIDEBAND_FLAGOUTSET0, FLGAOUTSET0_F2S_EN);
+		__socfpga_udelay(1);
+		setbits_le32(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+			     F2SDRAM_SIDEBAND_FLAGOUTSET0,
+			     FLGAOUTSET0_F2S_FORCE_DRAIN);
+		__socfpga_udelay(1);
+
+		do {
+			/*
+			 * Read response queue status twice to ensure it is
+			 * empty.
+			 */
+			empty = readl(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+				      F2SDRAM_SIDEBAND_FLAGINSTATUS0) &
+				      FLAGINSTATUS0_F2S_RESP_EMPTY;
+			if (empty) {
+				empty = readl(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+					      F2SDRAM_SIDEBAND_FLAGINSTATUS0) &
+					      FLAGINSTATUS0_F2S_RESP_EMPTY;
+				if (empty)
+					break;
+			}
+
+			timeout_ms--;
+			__socfpga_udelay(1000);
+		} while (timeout_ms);
+
+		setbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_BRGMODRST,
+			     BRGMODRST_FPGA2SOC_BRIDGES &
+			     ~RSTMGR_BRGMODRST_FPGA2SOC_MASK);
+		clrbits_le32(socfpga_get_rstmgr_addr() + RSTMGR_SOC64_HDSKREQ,
+			     RSTMGR_HDSKREQ_FPGAHSREQ);
+		setbits_le32(SOCFPGA_F2SDRAM_MGR_ADDRESS +
+			     F2SDRAM_SIDEBAND_FLAGOUTCLR0,
+			     FLGAOUTCLR0_F2S_IDLEREQ);
+	}
+}
+
 static __always_inline void socfpga_s2f_bridges_reset(int enable)
 {
 	if (enable) {
@@ -109,13 +228,14 @@ void socfpga_bridges_reset(int enable)
 			hang();
 	} else {
 		socfpga_s2f_bridges_reset(enable);
-
+		socfpga_f2s_bridges_reset(enable);
 	}
 }
 
 void __secure socfpga_bridges_reset_psci(int enable)
 {
 	socfpga_s2f_bridges_reset(enable);
+	socfpga_f2s_bridges_reset(enable);
 }
 
 /*
Signature · 1 line
2.26.2
#4 lore raw

PATCH 5/5 arm: socfpga: soc64: Avoid hang in bridge reset

In reply to Jit Loon Lim

From: Ley Foon Tan <[email protected]>

HSD #1508586908-6: Software shouldn't hang the system if the HPS bridge reset is failed. Change hang() to error message.

---
 .../include/mach/base_addr_soc64.h            |  1 +
 arch/arm/mach-socfpga/include/mach/timer.h    | 31 +++++++++++++++++++
 arch/arm/mach-socfpga/reset_manager_s10.c     | 12 +++++--
 3 files changed, 41 insertions(+), 3 deletions(-)
arch/arm/mach-socfpga/include/mach/base_addr_soc64.h +1 -0
index 3f899fcfa3..c0de59f279 100644
@@ -16,6 +16,7 @@
 #else
 #define SOCFPGA_FW_MPU_DDR_SCR_ADDRESS		0xf8020100
 #endif
+#define SOCFPGA_F2SDRAM_MGR_ADDRESS		0xf8024000
 #define SOCFPGA_SMMU_ADDRESS			0xfa000000
 #define SOCFPGA_MAILBOX_ADDRESS			0xffa30000
 #define SOCFPGA_UART0_ADDRESS			0xffc02000
arch/arm/mach-socfpga/include/mach/timer.h +31 -0
index 82596e412e..be56b4968f 100644
@@ -6,6 +6,9 @@
 #ifndef _SOCFPGA_TIMER_H_
 #define _SOCFPGA_TIMER_H_
 
+#include <asm/barriers.h>
+#include <div64.h>
+
 struct socfpga_timer {
 	u32	load_val;
 	u32	curr_val;
@@ -14,4 +17,32 @@ struct socfpga_timer {
 	u32	int_stat;
 };
 
+static __always_inline u64 __socfpga_get_time_stamp(void)
+{
+	u64 cntpct;
+
+	isb();
+	asm volatile("mrs %0, cntpct_el0" : "=r" (cntpct));
+	return cntpct;
+}
+
+static __always_inline u64 __socfpga_usec_to_tick(u64 usec)
+{
+	u64 tick = usec;
+	u64 cntfrq;
+
+	asm volatile("mrs %0, cntfrq_el0" : "=r" (cntfrq));
+	tick *= cntfrq;
+	do_div(tick, 1000000);
+	return tick;
+}
+
+static __always_inline void __socfpga_udelay(u64 usec)
+{
+	u64 tmp = __socfpga_get_time_stamp() + __socfpga_usec_to_tick(usec);
+
+	while (__socfpga_get_time_stamp() < tmp + 1)
+		;
+}
+
 #endif
arch/arm/mach-socfpga/reset_manager_s10.c +9 -3
index 690cfb2b20..0274c4dbdb 100644
@@ -8,13 +8,15 @@
 #include <hang.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
+#include <asm/secure.h>
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/smc_api.h>
 #include <asm/arch/system_manager.h>
+#include <asm/arch/timer.h>
 #include <dt-bindings/reset/altr,rst-mgr-s10.h>
+#include <exports.h>
 #include <linux/iopoll.h>
 #include <linux/intel-smc.h>
-
 DECLARE_GLOBAL_DATA_PTR;
 
 /* F2S manager registers */
@@ -223,9 +225,13 @@ void socfpga_bridges_reset(int enable)
 {
 	if (!IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_SPL_ATF)) {
 		u64 arg = enable;
+		int ret;
 
-		if (invoke_smc(INTEL_SIP_SMC_HPS_SET_BRIDGES, &arg, 1, NULL, 0))
-			hang();
+		ret = invoke_smc(INTEL_SIP_SMC_HPS_SET_BRIDGES, &arg, 1, NULL,
+				 0);
+		if (ret)
+			printf("Failed to %s the HPS bridges, error %d\n",
+			       enable ? "enable" : "disable", ret);
 	} else {
 		socfpga_s2f_bridges_reset(enable);
 		socfpga_f2s_bridges_reset(enable);
Signature · 1 line
2.26.2