[U-Boot] [PATCH v3] arm: socfpga: fix SPL booting from fpga OnChip RAM

[U-Boot] [PATCH v3] arm: socfpga: fix SPL booting from fpga OnChip RAM

[Simon Goldschmidt]

This patch prevents disabling the FPGA bridges when
SPL or U-Boot is executed from FPGA onchip RAM.

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
---

Changes in v3:
- use __image_copy_start to check if we are executing from FPGA

Changes in v2:
- use less ifdefs and more C code for address checks
  (but this gives a checkpatch warning because of comparing two
  upper case constants)
- changed comments

 arch/arm/mach-socfpga/include/mach/base_addr_ac5.h |  4 ++++
 arch/arm/mach-socfpga/misc_gen5.c                  | 10 +++++++++-
 arch/arm/mach-socfpga/spl_gen5.c                   | 10 +++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
index bb9e3faa29..dacb258020 100644
--- a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
+++ b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
@@ -6,6 +6,10 @@
 #ifndef _SOCFPGA_BASE_ADDRS_H_
 #define _SOCFPGA_BASE_ADDRS_H_
 
+#define SOCFPGA_FPGA_SLAVES_ADDRESS	0xc0000000
+#define IS_SOCFPGA_FPGA_SLAVES_ADDRESS(addr) \
+	(((addr) >= SOCFPGA_FPGA_SLAVES_ADDRESS) && \
+	 ((addr) < SOCFPGA_STM_ADDRESS))
 #define SOCFPGA_STM_ADDRESS		0xfc000000
 #define SOCFPGA_DAP_ADDRESS		0xff000000
 #define SOCFPGA_EMAC0_ADDRESS		0xff700000
diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c
index 429c3d6cd5..fdac994106 100644
--- a/arch/arm/mach-socfpga/misc_gen5.c
+++ b/arch/arm/mach-socfpga/misc_gen5.c
@@ -20,6 +20,7 @@
 #include <asm/arch/nic301.h>
 #include <asm/arch/scu.h>
 #include <asm/pl310.h>
+#include <asm/sections.h>
 
 #include <dt-bindings/reset/altr,rst-mgr.h>
 
@@ -177,6 +178,8 @@ static void socfpga_nic301_slave_ns(void)
 
 void socfpga_sdram_remap_zero(void)
 {
+	u32 remap;
+
 	socfpga_nic301_slave_ns();
 
 	/*
@@ -187,7 +190,12 @@ void socfpga_sdram_remap_zero(void)
 	setbits_le32(&scu_regs->sacr, 0xfff);
 
 	/* Configure the L2 controller to make SDRAM start at 0 */
-	writel(0x1, &nic301_regs->remap);	/* remap.mpuzero */
+	remap = 0x1; /* remap.mpuzero */
+	/* Keep fpga bridge enabled when running from FPGA onchip RAM */
+	if (IS_SOCFPGA_FPGA_SLAVES_ADDRESS((ulong)__image_copy_start))
+		remap |= 0x8; /* remap.hps2fpga */
+	writel(remap, &nic301_regs->remap);
+
 	writel(0x1, &pl310->pl310_addr_filter_start);
 }
 
diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index be318cc0d9..7c445309f7 100644
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -92,8 +92,11 @@ void board_init_f(ulong dummy)
 
 	/* Put everything into reset but L4WD0. */
 	socfpga_per_reset_all();
-	/* Put FPGA bridges into reset too. */
-	socfpga_bridges_reset(1);
+
+	if (!IS_SOCFPGA_FPGA_SLAVES_ADDRESS((ulong)__image_copy_start)) {
+		/* Put FPGA bridges into reset (unless booting from FPGA). */
+		socfpga_bridges_reset(1);
+	}
 
 	socfpga_per_reset(SOCFPGA_RESET(SDR), 0);
 	socfpga_per_reset(SOCFPGA_RESET(UART0), 0);
@@ -163,5 +166,6 @@ void board_init_f(ulong dummy)
 		hang();
 	}
 
-	socfpga_bridges_reset(1);
+	if (!IS_SOCFPGA_FPGA_SLAVES_ADDRESS((ulong)__image_copy_start))
+		socfpga_bridges_reset(1);
 }
-- 
2.17.1

[U-Boot] [PATCH v3] arm: socfpga: fix SPL booting from fpga OnChip RAM

[Marek Vasut]

On 10/09/2018 10:51 PM, Simon Goldschmidt wrote:
> This patch prevents disabling the FPGA bridges when
> SPL or U-Boot is executed from FPGA onchip RAM.
> 
> Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
> 
> Changes in v3:
> - use __image_copy_start to check if we are executing from FPGA
> 
> Changes in v2:
> - use less ifdefs and more C code for address checks
>   (but this gives a checkpatch warning because of comparing two
>   upper case constants)
> - changed comments
> 
>  arch/arm/mach-socfpga/include/mach/base_addr_ac5.h |  4 ++++
>  arch/arm/mach-socfpga/misc_gen5.c                  | 10 +++++++++-
>  arch/arm/mach-socfpga/spl_gen5.c                   | 10 +++++++---
>  3 files changed, 20 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
> index bb9e3faa29..dacb258020 100644
> --- a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
> +++ b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
> @@ -6,6 +6,10 @@
>  #ifndef _SOCFPGA_BASE_ADDRS_H_
>  #define _SOCFPGA_BASE_ADDRS_H_
>  
> +#define SOCFPGA_FPGA_SLAVES_ADDRESS	0xc0000000
> +#define IS_SOCFPGA_FPGA_SLAVES_ADDRESS(addr) \
> +	(((addr) >= SOCFPGA_FPGA_SLAVES_ADDRESS) && \
> +	 ((addr) < SOCFPGA_STM_ADDRESS))

Can we _please_ stop using macros ? Just turn it into a function with
proper type checking.

[...]

-- 
Best regards,
Marek Vasut