Skip to contentSkip to conversation

Add support for loading FPGA bitstream

PATCH Superseded tien.fong.chee at intel.com 5 participants 33 messages Mar 5, 2019 – Mar 8, 2019

Subsystems (4)

v11 of 13 Superseded Latest is v13 →

lore
Share & tools
lore
#0 lore raw

v11 cover Add support for loading FPGA bitstream

From: Tien Fong Chee <[email protected]>

This version mainly assign "-1" to both periph and core images in patch[2/9] because the numeric associates the core and periph images in cases where there are multiple.

This series is working on top of u-boot.git http://git.denx.de/u-boot.git

These patches are required before applying this series of patches
1. [U-Boot,v4] misc: fs_loader: Add support for initializing block device
https://patchwork.ozlabs.org/project/uboot/list/?series=89282(done review)

3. [U-Boot] misc: fs_loader: Replace label with DT phandle
https://patchwork.ozlabs.org/project/uboot/list/?series=92167(under review)

[v9]: https://www.mail-archive.com/u-boot at lists.denx.de/msg316086.html [v8]: https://www.mail-archive.com/u-boot at lists.denx.de/msg316086.html [v7]: https://www.mail-archive.com/u-boot at lists.denx.de/msg314511.html

Tien Fong Chee (9):
ARM: socfpga: Description on FPGA bitstream type and file name for
Arria 10
ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
ARM: socfpga: Cleaning up the messages
ARM: socfpga: Move the watchdog reset to the looping location
ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK spl : socfpga: Implement fpga bitstream loading with socfpga loadfs
ARM: socfpga: Synchronize the configuration for A10 SoCDK
ARM: socfpga: Increase Malloc pool size to support FAT filesystem in
SPL

 arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts       |  17 +
 .../include/mach/fpga_manager_arria10.h            |  40 +-
 arch/arm/mach-socfpga/spl_a10.c                    |  31 +-
 board/altera/arria10-socdk/fit_spl_fpga.its        |  38 ++
 configs/socfpga_arria10_defconfig                  |  21 +-
 .../fpga/altera-socfpga-a10-fpga-mgr.txt           |  26 +-
 drivers/fpga/socfpga_arria10.c                     | 514 ++++++++++++++++++++-
 include/configs/socfpga_common.h                   |   4 +-
 include/image.h                                    |   4 +
 9 files changed, 663 insertions(+), 32 deletions(-)
 create mode 100644 board/altera/arria10-socdk/fit_spl_fpga.its
Signature · 1 line
2.13.0
#1 lore raw

PATCH v11 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

From: Tien Fong Chee <[email protected]>

This patch adds description on properties about file name used for both peripheral bitstream and core bitstream.

---

changes for v8
- Removed explanation about support for altr,bitstream-core

changes for v7
- Provided example of setting FPGA FIT image for both early IO release and full release FPGA configuration.

---
 .../fpga/altera-socfpga-a10-fpga-mgr.txt           | 26 +++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)
doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +25 -1
index 2fd8e7a847..da210bfc86 100644
@@ -7,8 +7,31 @@ Required properties:
                - The second index is for writing FPGA configuration data.
 - resets     : Phandle and reset specifier for the device's reset.
 - clocks     : Clocks used by the device.
+- altr,bitstream : Fit image file name for both FPGA peripheral bitstream,
+		   FPGA core bitstream and full bitstream.
 
-Example:
+		   Full bitstream, consist of peripheral bitstream and core
+		   bitstream.
+
+		   FPGA peripheral bitstream is used to initialize FPGA IOs,
+		   PLL, IO48 and DDR. This bitstream is required to get DDR up
+		   running.
+
+		   FPGA core bitstream contains FPGA design which is used to
+		   program FPGA CRAM and ERAM.
+
+Example: Bundles both peripheral bitstream and core bitstream into FIT image
+	 called fit_spl_fpga.itb. This FIT image can be created through running
+	 this command: tools/mkimage
+		       -E -p 400
+		       -f board/altera/arria10-socdk/fit_spl_fpga.its
+		       fit_spl_fpga.itb
+
+	 For details of describing structure and contents of the FIT image,
+	 please refer board/altera/arria10-socdk/fit_spl_fpga.its
+
+- Examples for booting with full release or booting with early IO release, then
+  follow by entering early user mode:
 
 	fpga_mgr: fpga-mgr at ffd03000 {
 		compatible = "altr,socfpga-a10-fpga-mgr";
@@ -16,4 +39,5 @@ Example:
 		       0xffcfe400 0x20>;
 		clocks = <&l4_mp_clk>;
 		resets = <&rst FPGAMGR_RESET>;
+		altr,bitstream = "fit_spl_fpga.itb";
 	};
Signature · 1 line
2.13.0
maintainer
#2 lore raw

PATCH v11 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

Curious, you sent out 3 versions(2x v10, and v11) within ~2 hours. What versions should we be reviewing?

Quoted 7 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

This patch adds description on properties about file name used for both peripheral bitstream and core bitstream.

#3 lore raw

PATCH v11 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

Quoted 3 lines · Dinh Nguyen

Curious, you sent out 3 versions(2x v10, and v11) within ~2 hours. What
versions should we be reviewing?

2nd version of v10 was resent quickly after request from Dalon to change the node names. I have comment on the 1st version v10 cover letter to void the whole series since no review starting yet.

After that, Marek told me to resend in v11.

Sorry for any confusion, please help to review v11, this series of patches mainly resolved some comments from Simek on [v9]: https://www.m
ail-archive.com/u-boot at lists.denx.de/msg316086.html and node names changed on patch [2/9]

Quoted 11 lines · tien.fong.chee at intel.com
Quoted 9 lines

From: Tien Fong Chee <[email protected]>

This patch adds description on properties about file name used for both
peripheral bitstream and core bitstream.

#4 lore raw

PATCH v11 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

Quoted 9 lines · Tien Fong
Quoted 3 lines · Dinh Nguyen

Curious, you sent out 3 versions(2x v10, and v11) within ~2 hours. What
versions should we be reviewing?

2nd version of v10 was resent quickly after request from Dalon to change the node names. I have comment on the 1st version v10 cover letter to void the whole series since no review starting yet.

After that, Marek told me to resend in v11.

That is not true, I merely asked whether the v10 that was reposted is actually v11 .

Quoted 14 lines

Sorry for any confusion, please help to review v11, this series of patches mainly resolved some comments from Simek on [v9]: https://www.m
ail-archive.com/u-boot at lists.denx.de/msg316086.html and node names changed on patch [2/9]

Quoted 10 lines · tien.fong.chee at intel.com
Quoted 8 lines

From: Tien Fong Chee <[email protected]>

This patch adds description on properties about file name used for both
peripheral bitstream and core bitstream.

Signature · 2 lines
Best regards,
Marek Vasut
#5 lore raw

PATCH v11 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

Quoted 8 lines · Marek Vasut
Quoted 7 lines · Tien Fong
Quoted 5 lines · Dinh Nguyen

Curious, you sent out 3 versions(2x v10, and v11) within ~2 hours.
What
versions should we be reviewing?

Quoted 7 lines
Quoted 5 lines

2nd version of v10 was resent quickly after request from Dalon to change the node names. I have comment on the 1st version v10 cover letter to void the whole series since no review starting yet.

After that, Marek told me to resend in v11.

That is not true, I merely asked whether the v10 that was reposted is actually v11 .

Ohh...sorry for misunderstanding, i thought you was asking me to resend v11 if there are any changes on v10.

Quoted 21 lines
Quoted 20 lines

Sorry for any confusion, please help to review v11, this series of patches mainly resolved some comments from Simek on [v9]: https://w
ww.m
ail-archive.com/u-boot at lists.denx.de/msg316086.html and node names changed on patch [2/9]

Quoted 13 lines · tien.fong.chee at intel.com
Quoted 10 lines

From: Tien Fong Chee <[email protected]>

This patch adds description on properties about file name used for
both
peripheral bitstream and core bitstream.

#6 lore raw

PATCH v11 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

Quoted 13 lines · Tien Fong
Quoted 12 lines · Marek Vasut
Quoted 11 lines · Tien Fong
Quoted 5 lines · Dinh Nguyen

Curious, you sent out 3 versions(2x v10, and v11) within ~2 hours.
What
versions should we be reviewing?

2nd version of v10 was resent quickly after request from Dalon to change the node names. I have comment on the 1st version v10 cover letter to void the whole series since no review starting yet.

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

After that, Marek told me to resend in v11.

That is not true, I merely asked whether the v10 that was reposted is actually v11 .

Ohh...sorry for misunderstanding, i thought you was asking me to resend v11 if there are any changes on v10.

If you refer to "Is this actually V11 ?" , then no, I was asking whether this V10 repost was actually a V11 , whether there were changes between those two versions of V10. Based on the discussion, I think there were some.

Signature · 2 lines
Best regards,
Marek Vasut
#7 lore raw

PATCH v11 1/9 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10

Quoted 27 lines · Marek Vasut
Quoted 19 lines · Tien Fong
Quoted 17 lines · Marek Vasut
Quoted 15 lines · Tien Fong
Quoted 6 lines · Dinh Nguyen

Curious, you sent out 3 versions(2x v10, and v11) within ~2 hours.
What
versions should we be reviewing?

2nd version of v10 was resent quickly after request from Dalon to
change the node names. I have comment on the 1st version v10 cover
letter to void the whole series since no review starting yet.

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

After that, Marek told me to resend in v11.

That is not true, I merely asked whether the v10 that was reposted is
actually v11 .

Ohh...sorry for misunderstanding, i thought you was asking me to resend
v11 if there are any changes on v10.

Quoted 6 lines

If you refer to "Is this actually V11 ?" , then no, I was asking whether
this V10 repost was actually a V11 , whether there were changes between
those two versions of V10. Based on the discussion, I think there were some.

Yeah, the repost was actually 2nd verison of V10, with minor changed on node names for patch [2/9].

Quoted 1 line
#8 lore raw

PATCH v11 2/9 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Add default fitImage file bundling FPGA bitstreams for Arria10.

---

changes for v11
- Replaced core image node "-2" with "-1",
the numeric associates the core and periph images in case where there are multiple.

changes for v10
- Replaced both image nodes "@1" and "@2" with "-1" and "-2" respectively.

changes for v9
- Reordered the images and fpga configurations.
- Removed the load property at core image.

changes for v8
- Changed the FPGA node name to fpga-core and fpga-periph for both core and periph bitstreams respectively.

---
 board/altera/arria10-socdk/fit_spl_fpga.its | 38 +++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 board/altera/arria10-socdk/fit_spl_fpga.its
board/altera/arria10-socdk/fit_spl_fpga.its new file +38 -0
new file mode 100644
index 0000000000..adae997213
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0
+ /*
+ * Copyright (C) 2019 Intel Corporation <www.intel.com>
+ *
+ */
+
+/dts-v1/;
+
+/ {
+	description = "FIT image with FPGA bistream";
+	#address-cells = <1>;
+
+	images {
+		fpga-periph-1 {
+			description = "FPGA peripheral bitstream";
+			data = /incbin/("../../../ghrd_10as066n2.periph.rbf");
+			type = "fpga";
+			arch = "arm";
+			compression = "none";
+		};
+
+		fpga-core-1 {
+			description = "FPGA core bitstream";
+			data = /incbin/("../../../ghrd_10as066n2.core.rbf");
+			type = "fpga";
+			arch = "arm";
+			compression = "none";
+		};
+	};
+
+	configurations {
+		default = "config-1";
+		config-1 {
+			description = "Boot with FPGA early IO release config";
+			fpga = "fpga-periph-1", "fpga-core-1";
+		};
+	};
+};
Signature · 1 line
2.13.0
#9 lore raw

PATCH v11 3/9 ARM: socfpga: Cleaning up the messages

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Ensure the comment and debug messages are always consistent with the rest.

---
 drivers/fpga/socfpga_arria10.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/fpga/socfpga_arria10.c +7 -6
index 114dd910ab..b0abe1955c 100644
@@ -94,7 +94,7 @@ int fpgamgr_wait_early_user_mode(void)
 		i++;
 	}
 
-	debug("Additional %i sync word needed\n", i);
+	debug("FPGA: Additional %i sync word needed\n", i);
 
 	/* restoring original CDRATIO */
 	fpgamgr_set_cd_ratio(cd_ratio);
@@ -172,9 +172,10 @@ static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data,
 	compress = (rbf_data[COMPRESSION_OFFSET] >> 1) & 1;
 	compress = !compress;
 
-	debug("header word %d = %08x\n", 69, rbf_data[69]);
-	debug("header word %d = %08x\n", 229, rbf_data[229]);
-	debug("read from rbf header: encrypt=%d compress=%d\n", encrypt, compress);
+	debug("FPGA: Header word %d = %08x.\n", 69, rbf_data[69]);
+	debug("FPGA: Header word %d = %08x.\n", 229, rbf_data[229]);
+	debug("FPGA: Read from rbf header: encrypt=%d compress=%d.\n", encrypt,
+	     compress);
 
 	/*
 	 * from the register map description of cdratio in imgcfg_ctrl_02:
@@ -455,10 +456,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
 {
 	int status;
 
-	/* disable all signals from hps peripheral controller to fpga */
+	/* Disable all signals from hps peripheral controller to fpga */
 	writel(0, &system_manager_base->fpgaintf_en_global);
 
-	/* disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */
+	/* Disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */
 	socfpga_bridges_reset();
 
 	/* Initialize the FPGA Manager */
Signature · 1 line
2.13.0
maintainer
#10 lore raw

PATCH v11 3/9 ARM: socfpga: Cleaning up the messages

Quoted 3 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Ensure the comment and debug messages are always consistent with the rest.

The rest of what? This patch seems unnecessary to me.

Dinh

Quoted 47 lines
---
 drivers/fpga/socfpga_arria10.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/fpga/socfpga_arria10.c +7 -6
index 114dd910ab..b0abe1955c 100644
@@ -94,7 +94,7 @@ int fpgamgr_wait_early_user_mode(void)
 		i++;
 	}
 
-	debug("Additional %i sync word needed\n", i);
+	debug("FPGA: Additional %i sync word needed\n", i);
 
 	/* restoring original CDRATIO */
 	fpgamgr_set_cd_ratio(cd_ratio);
@@ -172,9 +172,10 @@ static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data,
 	compress = (rbf_data[COMPRESSION_OFFSET] >> 1) & 1;
 	compress = !compress;
 
-	debug("header word %d = %08x\n", 69, rbf_data[69]);
-	debug("header word %d = %08x\n", 229, rbf_data[229]);
-	debug("read from rbf header: encrypt=%d compress=%d\n", encrypt, compress);
+	debug("FPGA: Header word %d = %08x.\n", 69, rbf_data[69]);
+	debug("FPGA: Header word %d = %08x.\n", 229, rbf_data[229]);
+	debug("FPGA: Read from rbf header: encrypt=%d compress=%d.\n", encrypt,
+	     compress);
 
 	/*
 	 * from the register map description of cdratio in imgcfg_ctrl_02:
@@ -455,10 +456,10 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
 {
 	int status;
 
-	/* disable all signals from hps peripheral controller to fpga */
+	/* Disable all signals from hps peripheral controller to fpga */
 	writel(0, &system_manager_base->fpgaintf_en_global);
 
-	/* disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */
+	/* Disable all axi bridge (hps2fpga, lwhps2fpga & fpga2hps) */
 	socfpga_bridges_reset();
 
 	/* Initialize the FPGA Manager */
#11 lore raw

PATCH v11 3/9 ARM: socfpga: Cleaning up the messages

Quoted 8 lines · Dinh Nguyen
Quoted 5 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Ensure the comment and debug messages are always consistent with the rest.

The rest of what? This patch seems unnecessary to me.

This patch is mainly to change all existing debug messages with prefix "FPGA:" and ensure uppercase for 1st character in all messages inside FPGA driver.

Thanks,
TF.

Quoted 60 lines
Quoted 60 lines

---
 drivers/fpga/socfpga_arria10.c | 13 +++++++------

 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/fpga/socfpga_arria10.c +0 -0
index 114dd910ab..b0abe1955c 100644
@@ -94,7 +94,7 @@ int fpgamgr_wait_early_user_mode(void)
  		i++;
  	}

drivers/fpga/socfpga_arria10.c +1 -1
-	debug("Additional %i sync word needed\n", i);
+	debug("FPGA: Additional %i sync word needed\n", i);


  /* restoring original CDRATIO */
  fpgamgr_set_cd_ratio(cd_ratio);

drivers/fpga/socfpga_arria10.c +0 -0
@@ -172,9 +172,10 @@ static int
 fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data,
  	compress = (rbf_data[COMPRESSION_OFFSET] >> 1) & 1;
  	compress = !compress;

drivers/fpga/socfpga_arria10.c +0 -3
-	debug("header word %d = %08x\n", 69, rbf_data[69]);
-	debug("header word %d = %08x\n", 229, rbf_data[229]);
-	debug("read from rbf header: encrypt=%d compress=%d\n",

encrypt, compress);

drivers/fpga/socfpga_arria10.c +2 -0
+	debug("FPGA: Header word %d = %08x.\n", 69, rbf_data[69]);
+	debug("FPGA: Header word %d = %08x.\n", 229,

rbf_data[229]);

drivers/fpga/socfpga_arria10.c +1 -0
+	debug("FPGA: Read from rbf header: encrypt=%d

compress=%d.\n", encrypt,

drivers/fpga/socfpga_arria10.c +1 -0
+	     compress);


  /*
   * from the register map description of cdratio in imgcfg_ctrl_02:

drivers/fpga/socfpga_arria10.c +0 -0
@@ -455,10 +456,10 @@ int socfpga_load(Altera_desc *desc, const
 void *rbf_data, size_t rbf_size)
  {
  	int status;

drivers/fpga/socfpga_arria10.c +0 -1
-	/* disable all signals from hps peripheral controller to

fpga */

drivers/fpga/socfpga_arria10.c +1 -0
+	/* Disable all signals from hps peripheral controller to

fpga */
  writel(0, &system_manager_base->fpgaintf_en_global);

drivers/fpga/socfpga_arria10.c +0 -1
-	/* disable all axi bridge (hps2fpga, lwhps2fpga &

fpga2hps) */

drivers/fpga/socfpga_arria10.c +1 -0
+	/* Disable all axi bridge (hps2fpga, lwhps2fpga &

fpga2hps) */
  socfpga_bridges_reset();

  /* Initialize the FPGA Manager */

#12 lore raw

PATCH v11 4/9 ARM: socfpga: Move the watchdog reset to the looping location

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Ensure the watchdog is reset timely if the looping is long.

---
 drivers/fpga/socfpga_arria10.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/socfpga_arria10.c +1 -1
index b0abe1955c..9499d1a014 100644
@@ -360,6 +360,7 @@ static int fpgamgr_program_poll_cd(void)
 			printf("nstatus == 0 while waiting for condone\n");
 			return -EPERM;
 		}
+		WATCHDOG_RESET();
 	}
 
 	if (i == FPGA_TIMEOUT_CNT)
@@ -433,7 +434,6 @@ int fpgamgr_program_finish(void)
 		printf("FPGA: Poll CD failed with error code %d\n", status);
 		return -EPERM;
 	}
-	WATCHDOG_RESET();
 
 	/* Ensure the FPGA entering user mode */
 	status = fpgamgr_program_poll_usermode();
Signature · 1 line
2.13.0
maintainer
#13 lore raw

PATCH v11 4/9 ARM: socfpga: Move the watchdog reset to the looping location

It looks like this patch was not in the previous 9 versions of this series? Please try to not add new functionality to a series that is already gone through so many reviews. It make reviewing the series really confusing!

Quoted 3 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Ensure the watchdog is reset timely if the looping is long.

How are you ensuring this?

Dinh

#14 lore raw

PATCH v11 4/9 ARM: socfpga: Move the watchdog reset to the looping location

Quoted 4 lines · Dinh Nguyen

It looks like this patch was not in the previous 9 versions of this series? Please try to not add new functionality to a series that is already gone through so many reviews. It make reviewing the series really confusing!

This is split out from [v9] patch [3/7] https://patchwork.ozlabs.org/pa
tch/1044415/ as suggested by Simek.

Quoted 7 lines · tien.fong.chee at intel.com
Quoted 4 lines

From: Tien Fong Chee <[email protected]>

Ensure the watchdog is reset timely if the looping is long.

How are you ensuring this?

watchdog reset would be triggered for each polling.

TF

#15 lore raw

PATCH v11 5/9 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Add FPGA driver to support program FPGA with FPGA bitstream loading from filesystem. The driver are designed based on generic firmware loader framework. The driver can handle FPGA program operation from loading FPGA bitstream in flash to memory and then to program FPGA.

---

changes for v10
-Cleaned up the codes.
-Return -EPERM when programing core on non early IO release mode. -Using live function to get rid of gd->
-Removed @0 for fs-loader node

changes for v9
- Support data offset
- Added default DDR load address
- Squashed the image.h
- Changed to phandle
- Ensure the DDR is fully up running by checking the gd->ram

changes for v8
- Added codes to discern bitstream type based on fpga node name.

changes for v7
- Restructure the FPGA driver to support both peripheral bitstream and core bitstream bundled into FIT image.
- Support loadable property for core bitstream. User can set loadable in DDR for better performance. This loading would be done in one large chunk instead of chunk by chunk loading with small memory buffer.

---
 arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts       |  17 +
 .../include/mach/fpga_manager_arria10.h            |  39 +-
 drivers/fpga/socfpga_arria10.c                     | 497 ++++++++++++++++++++-
 include/image.h                                    |   4 +
 4 files changed, 542 insertions(+), 15 deletions(-)
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +17 -0
index 998d811210..cc761967c7 100644
@@ -18,6 +18,23 @@
 /dts-v1/;
 #include "socfpga_arria10_socdk.dtsi"
 
+/ {
+	chosen {
+		firmware-loader = <&fs_loader0>;
+	};
+
+	fs_loader0: fs-loader {
+		u-boot,dm-pre-reloc;
+		compatible = "u-boot,fs-loader";
+		phandlepart = <&mmc 1>;
+	};
+};
+
+&fpga_mgr {
+	u-boot,dm-pre-reloc;
+	altr,bitstream = "fit_spl_fpga.itb";
+};
+
 &mmc {
 	u-boot,dm-pre-reloc;
 	status = "okay";
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +37 -2
index 09d13f6fd3..c5f67714aa 100644
@@ -1,9 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * Copyright (C) 2017 Intel Corporation <www.intel.com>
+ * Copyright (C) 2017-2019 Intel Corporation <www.intel.com>
  * All rights reserved.
  */
 
+#include <asm/cache.h>
+#include <altera.h>
+#include <image.h>
+
 #ifndef _FPGA_MANAGER_ARRIA10_H_
 #define _FPGA_MANAGER_ARRIA10_H_
 
@@ -51,6 +55,10 @@
 #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK		BIT(24)
 #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB			16
 
+#define FPGA_SOCFPGA_A10_RBF_UNENCRYPTED	0xa65c
+#define FPGA_SOCFPGA_A10_RBF_ENCRYPTED		0xa65d
+#define FPGA_SOCFPGA_A10_RBF_PERIPH		0x0001
+#define FPGA_SOCFPGA_A10_RBF_CORE		0x8001
 #ifndef __ASSEMBLY__
 
 struct socfpga_fpga_manager {
@@ -88,12 +96,39 @@ struct socfpga_fpga_manager {
 	u32  imgcfg_fifo_status;
 };
 
+enum rbf_type {
+	unknown,
+	periph_section,
+	core_section
+};
+
+enum rbf_security {
+	invalid,
+	unencrypted,
+	encrypted
+};
+
+struct rbf_info {
+	enum rbf_type section;
+	enum rbf_security security;
+};
+
+struct fpga_loadfs_info {
+	fpga_fs_info *fpga_fsinfo;
+	u32 remaining;
+	u32 offset;
+	struct rbf_info rbfinfo;
+};
+
 /* Functions */
 int fpgamgr_program_init(u32 * rbf_data, size_t rbf_size);
 int fpgamgr_program_finish(void);
 int is_fpgamgr_user_mode(void);
 int fpgamgr_wait_early_user_mode(void);
-
+const char *get_fpga_filename(void);
+int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf, size_t bsize,
+		  u32 offset);
+void fpgamgr_program(const void *buf, size_t bsize, u32 offset);
 #endif /* __ASSEMBLY__ */
 
 #endif /* _FPGA_MANAGER_ARRIA10_H_ */
drivers/fpga/socfpga_arria10.c +484 -13

532 lines not on this page · raw message

include/image.h +4 -0
index 83a2d412c9..f839443c3f 100644
@@ -1041,6 +1041,10 @@ int fit_check_format(const void *fit);
 
 int fit_conf_find_compat(const void *fit, const void *fdt);
 int fit_conf_get_node(const void *fit, const char *conf_uname);
+int fit_conf_get_prop_node_count(const void *fit, int noffset,
+		const char *prop_name);
+int fit_conf_get_prop_node_index(const void *fit, int noffset,
+		const char *prop_name, int index);
 
 /**
  * fit_conf_get_prop_node() - Get node refered to by a configuration
Signature · 1 line
2.13.0
#16 lore raw

PATCH v11 6/9 ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality to get the SoCFPGA loadfs driver support. This would enable the implementation of programming bitstream into FPGA from MMC.

---

changes for v8
- Added FIT related configs

changes for v7
- Removed limit set for CONFIG_FS_FAT_MAX_CLUSTSIZE

---
 configs/socfpga_arria10_defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
configs/socfpga_arria10_defconfig +8 -0
index 0554f1b6ec..c870543346 100644
@@ -27,10 +27,18 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 # CONFIG_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_SPL_DM_MMC=y
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_FS_FAT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_FS_LOADER=y
 CONFIG_FPGA_SOCFPGA=y
+CONFIG_SPL_FIT=y
+CONFIG_FIT=y
 CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_MMC=y
Signature · 1 line
2.13.0
maintainer
#17 lore raw

PATCH v11 6/9 ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK

Quoted 10 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality to get the SoCFPGA loadfs driver support. This would enable the implementation of programming bitstream into FPGA from MMC.

---

Quoted 8 lines

changes for v8
- Added FIT related configs

changes for v7
- Removed limit set for CONFIG_FS_FAT_MAX_CLUSTSIZE

---
 configs/socfpga_arria10_defconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

What changed in v9 - v11?

Also this patch doesn't apply to v2019.04-rc4 at all:

error: patch failed: configs/socfpga_arria10_defconfig:27
error: configs/socfpga_arria10_defconfig: patch does not apply dinguyen at b13cycling:~/linux_dev/u-boot$ git apply --reject patch1.patch Checking patch configs/socfpga_arria10_defconfig...
error: while searching for:
# CONFIG_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc" CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SPL_FS_FAT=y
CONFIG_FPGA_SOCFPGA=y
CONFIG_DM_GPIO=y
CONFIG_DWAPB_GPIO=y
CONFIG_DM_MMC=y

error: patch failed: configs/socfpga_arria10_defconfig:27 Applying patch configs/socfpga_arria10_defconfig with 1 reject... Rejected hunk #1.

Dinh

#18 lore raw

PATCH v11 6/9 ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK

Quoted 17 lines · Dinh Nguyen
Quoted 15 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality
to get the SoCFPGA loadfs driver support. This would enable the implementation of programming bitstream into FPGA from MMC.

---

changes for v8
- Added FIT related configs

Quoted 6 lines
Quoted 5 lines

changes for v7
- Removed limit set for CONFIG_FS_FAT_MAX_CLUSTSIZE
---
 configs/socfpga_arria10_defconfig | 8 ++++++++

 1 file changed, 8 insertions(+)

What changed in v9 - v11?

Means no change if no changes are defined here.

Quoted 20 lines

Also this patch doesn't apply to v2019.04-rc4 at all:

error: patch failed: configs/socfpga_arria10_defconfig:27
error: configs/socfpga_arria10_defconfig: patch does not apply dinguyen at b13cycling:~/linux_dev/u-boot$ git apply --reject patch1.patch
Checking patch configs/socfpga_arria10_defconfig...
error: while searching for:
# CONFIG_EFI_PARTITION is not set CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc" CONFIG_ENV_IS_IN_MMC=y
CONFIG_SPL_DM=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SPL_FS_FAT=y
CONFIG_FPGA_SOCFPGA=y
CONFIG_DM_GPIO=y
CONFIG_DWAPB_GPIO=y
CONFIG_DM_MMC=y

Quoted 3 lines

error: patch failed: configs/socfpga_arria10_defconfig:27 Applying patch configs/socfpga_arria10_defconfig with 1 reject... Rejected hunk #1.

Thanks for catching it. I would rebase to latest mainbranch.

TF.

#19 lore raw

PATCH v11 7/9 spl : socfpga: Implement fpga bitstream loading with socfpga loadfs

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Add support for loading FPGA bitstream to get DDR up running before U-Boot is loaded into DDR. Boot device initialization, generic firmware loader and SPL FAT support are required for this whole mechanism to work.

---

changes for v10
- Removed the static so the function can be referred by other c file.

changes for v9
- Used ALLOC_CACHE_ALIGN_BUFFER
- De-duplicated the same chunks of codes

changes for v7
- Removed casting for get_fpga_filename
- Removed hard coding DDR address for loading core bistream, using loadable property from FIT.
- Added checking for config_pins, return if error.

# Conflicts:
# arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h

---
 .../include/mach/fpga_manager_arria10.h            |  1 +
 arch/arm/mach-socfpga/spl_a10.c                    | 31 +++++++++++++++++++++-
 drivers/fpga/socfpga_arria10.c                     |  2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +1 -0
index c5f67714aa..62249b3695 100644
@@ -126,6 +126,7 @@ int fpgamgr_program_finish(void);
 int is_fpgamgr_user_mode(void);
 int fpgamgr_wait_early_user_mode(void);
 const char *get_fpga_filename(void);
+int is_fpgamgr_early_user_mode(void);
 int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf, size_t bsize,
 		  u32 offset);
 void fpgamgr_program(const void *buf, size_t bsize, u32 offset);
arch/arm/mach-socfpga/spl_a10.c +30 -1
index c97eacb424..4b658c87a3 100644
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
- *  Copyright (C) 2012 Altera Corporation <www.altera.com>
+ *  Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
  */
 
 #include <common.h>
@@ -23,6 +23,11 @@
 #include <fdtdec.h>
 #include <watchdog.h>
 #include <asm/arch/pinmux.h>
+#include <asm/arch/fpga_manager.h>
+#include <mmc.h>
+#include <memalign.h>
+
+#define FPGA_BUFSIZ	16 * 1024
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -68,11 +73,35 @@ u32 spl_boot_mode(const u32 boot_device)
 
 void spl_board_init(void)
 {
+	ALLOC_CACHE_ALIGN_BUFFER(char, buf, FPGA_BUFSIZ);
+
 	/* enable console uart printing */
 	preloader_console_init();
 	WATCHDOG_RESET();
 
 	arch_early_init_r();
+
+	/* If the full FPGA is already loaded, ie.from EPCQ, config fpga pins */
+	if (is_fpgamgr_user_mode()) {
+		int ret = config_pins(gd->fdt_blob, "shared");
+
+		if (ret)
+			return;
+
+		ret = config_pins(gd->fdt_blob, "fpga");
+		if (ret)
+			return;
+	} else if (!is_fpgamgr_early_user_mode()) {
+		/* Program IOSSM(early IO release) or full FPGA */
+		fpgamgr_program(buf, FPGA_BUFSIZ, 0);
+	}
+
+	/* If the IOSSM/full FPGA is already loaded, start DDR */
+	if (is_fpgamgr_early_user_mode() || is_fpgamgr_user_mode())
+		ddr_calibration_sequence();
+
+	if (!is_fpgamgr_user_mode())
+		fpgamgr_program(buf, FPGA_BUFSIZ, 0);
 }
 
 void board_init_f(ulong dummy)
drivers/fpga/socfpga_arria10.c +1 -1
index 9df2c430d7..285280e507 100644
@@ -69,7 +69,7 @@ static int wait_for_user_mode(void)
 		1, FPGA_TIMEOUT_MSEC, false);
 }
 
-static int is_fpgamgr_early_user_mode(void)
+int is_fpgamgr_early_user_mode(void)
 {
 	return (readl(&fpga_manager_base->imgcfg_stat) &
 		ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK) != 0;
Signature · 1 line
2.13.0
#20 lore raw

PATCH v11 8/9 ARM: socfpga: Synchronize the configuration for A10 SoCDK

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality the get the kit working.

---

changes for v8
- Moved the FIT related configs to the patch of configuration for FPGA SoCFPGA A10 SoCDK.

changes for v7
- Keep minimal configs.

---
 configs/socfpga_arria10_defconfig | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
configs/socfpga_arria10_defconfig +9 -6
index c870543346..bdbf90ed44 100644
@@ -10,10 +10,13 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS0,115200"
 # CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
 CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_sdmmc.dtb"
+CONFIG_VERSION_VARIABLE=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_SPL_FPGA_SUPPORT=y
-CONFIG_SPL_SPI_LOAD=y
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_GREPENV=y
 # CONFIG_CMD_FLASH is not set
@@ -22,9 +25,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
-# CONFIG_SPL_DOS_PARTITION is not set
-# CONFIG_ISO_PARTITION is not set
-# CONFIG_EFI_PARTITION is not set
+CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SPL_ENV_SUPPORT=y
@@ -32,7 +33,6 @@ CONFIG_SPL_DM=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_DM_MMC=y
 CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_EXT_SUPPORT=y
 CONFIG_SPL_FS_FAT=y
 CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 CONFIG_FS_LOADER=y
@@ -43,11 +43,14 @@ CONFIG_DM_GPIO=y
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_MTD_DEVICE=y
+CONFIG_MMC_DW=y
+CONFIG_PHY_MICREL=y
+CONFIG_PHY_MICREL_KSZ90X1=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_MII=y
+CONFIG_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y
 CONFIG_DESIGNWARE_APB_TIMER=y
-CONFIG_USE_TINY_PRINTF=y
Signature · 1 line
2.13.0
maintainer
#21 lore raw

PATCH v11 8/9 ARM: socfpga: Synchronize the configuration for A10 SoCDK

Quoted 13 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality the get the kit working.

---

changes for v8
- Moved the FIT related configs to the patch of configuration for FPGA SoCFPGA A10 SoCDK.

Quoted 5 lines

changes for v7
- Keep minimal configs.

---
 configs/socfpga_arria10_defconfig | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

Why are there 2 patches touching socfpga_arria10_defconfig in this series? Can you squash them into 1?

Dinh

#22 lore raw

PATCH v11 8/9 ARM: socfpga: Synchronize the configuration for A10 SoCDK

Quoted 18 lines · Dinh Nguyen
Quoted 16 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Update the default configuration file to enable the necessary functionality
the get the kit working.

---

changes for v8
- Moved the FIT related configs to the patch of configuration for FPGA
  SoCFPGA A10 SoCDK.

Quoted 7 lines
Quoted 5 lines

changes for v7
- Keep minimal configs.
---
 configs/socfpga_arria10_defconfig | 15 +++++++++------

 1 file changed, 9 insertions(+), 6 deletions(-)

Why are there 2 patches touching socfpga_arria10_defconfig in this series? Can you squash them into 1?

Marek want clear description for each CONFIG added into the defconfig. So, 1st defconfig is about enabling fpga driver, and 2nd for enabling complete boot.

#23 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

In reply to tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool, here come to result of reasonable size required for whole SDMMC boot working on A10 SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

---

changes for v7
- Added 0x3000 for memory headroom.

---
 include/configs/socfpga_common.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_common.h +2 -2
index 4551cb29bc..548b458e78 100644
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2012 Altera Corporation <www.altera.com>
+ * Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
  */
 #ifndef __CONFIG_SOCFPGA_COMMON_H__
 #define __CONFIG_SOCFPGA_COMMON_H__
@@ -258,7 +258,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
 /* SPL memory allocation configuration, this is for FAT implementation */
 #ifndef CONFIG_SYS_SPL_MALLOC_START
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00010000
+#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00015000
 #define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SYS_INIT_RAM_SIZE - \
 					 CONFIG_SYS_SPL_MALLOC_SIZE + \
 					 CONFIG_SYS_INIT_RAM_ADDR)
Signature · 1 line
2.13.0
#24 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

Am 05.03.2019 um 17:23 schrieb tien.fong.chee at intel.com:

Quoted 30 lines

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool, here come to result of reasonable size required for whole SDMMC boot working on A10 SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

---

changes for v7
- Added 0x3000 for memory headroom.

---
  include/configs/socfpga_common.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_common.h +1 -1
index 4551cb29bc..548b458e78 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2012 Altera Corporation <www.altera.com>
+ * Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
   */
  #ifndef __CONFIG_SOCFPGA_COMMON_H__
  #define __CONFIG_SOCFPGA_COMMON_H__

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 261

Quoted 5 lines
include/configs/socfpga_common.h +1 -1
@@ -258,7 +258,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
  #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
  /* SPL memory allocation configuration, this is for FAT implementation */
  #ifndef CONFIG_SYS_SPL_MALLOC_START
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00010000
+#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00015000

This will clash with my series here:
https://patchwork.ozlabs.org/patch/1051451/

Any chance you could test that on A10? I only have a cyclone 5.

Regards,
Simon

Quoted 4 lines
include/configs/socfpga_common.h +0 -0
  #define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SYS_INIT_RAM_SIZE - \
  					 CONFIG_SYS_SPL_MALLOC_SIZE + \
  					 CONFIG_SYS_INIT_RAM_ADDR)
#25 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

Quoted 45 lines · Simon Goldschmidt

Am 05.03.2019 um 17:23 schrieb tien.fong.chee at intel.com:

Quoted 39 lines

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool, here come
to result of reasonable size required for whole SDMMC boot working on A10
SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

---

changes for v7
- Added 0x3000 for memory headroom.
---
  include/configs/socfpga_common.h | 4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_common.h +1 -1
index 4551cb29bc..548b458e78 100644
@@ -1,6 +1,6 @@
   /* SPDX-License-Identifier: GPL-2.0+ */
   /*
- * Copyright (C) 2012 Altera Corporation <www.altera.com>
+ * Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
    */
   #ifndef __CONFIG_SOCFPGA_COMMON_H__
   #define __CONFIG_SOCFPGA_COMMON_H__
@@ -258,7 +258,7 @@ unsigned int
 cm_get_qspi_controller_clk_hz(void);
   #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
   /* SPL memory allocation configuration, this is for FAT

implementation */
  #ifndef CONFIG_SYS_SPL_MALLOC_START

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 261

Quoted 2 lines
include/configs/socfpga_common.h +1 -1
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00010000
+#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00015000

This will clash with my series here:
https://patchwork.ozlabs.org/patch/1051451/

Quoted 1 line

Any chance you could test that on A10? I only have a cyclone 5.

Okay, let me trying to test your series.

Quoted 1 line

Thanks,
TF

Quoted 10 lines
Quoted 10 lines

  #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_INIT_RAM_S
IZE - \
    CONFIG_SYS_SPL_MALLOC_SI ZE + \
    CONFIG_SYS_INIT_RAM_ADDR )

#26 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

In reply to Simon Goldschmidt
Quoted 45 lines · Simon Goldschmidt

Am 05.03.2019 um 17:23 schrieb tien.fong.chee at intel.com:

Quoted 39 lines

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool, here come
to result of reasonable size required for whole SDMMC boot working on A10
SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

---

changes for v7
- Added 0x3000 for memory headroom.
---
  include/configs/socfpga_common.h | 4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_common.h +1 -1
index 4551cb29bc..548b458e78 100644
@@ -1,6 +1,6 @@
   /* SPDX-License-Identifier: GPL-2.0+ */
   /*
- * Copyright (C) 2012 Altera Corporation <www.altera.com>
+ * Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
    */
   #ifndef __CONFIG_SOCFPGA_COMMON_H__
   #define __CONFIG_SOCFPGA_COMMON_H__
@@ -258,7 +258,7 @@ unsigned int
 cm_get_qspi_controller_clk_hz(void);
   #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
   /* SPL memory allocation configuration, this is for FAT

implementation */
  #ifndef CONFIG_SYS_SPL_MALLOC_START

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 261

Quoted 2 lines
include/configs/socfpga_common.h +1 -1
-#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00010000
+#define CONFIG_SYS_SPL_MALLOC_SIZE	0x00015000

This will clash with my series here:
https://patchwork.ozlabs.org/patch/1051451/

Quoted 2 lines

Any chance you could test that on A10? I only have a cyclone 5.

I have tested the series, and checking the failure from the codes, SPL_SYS_MALLOC_SIMPLE and SPL_SYS_MALLOC_F_LEN are not working in A10, because FPGA loading and distro boot from FAT FS require full malloc mechanism.

Thanks,
TF.

Quoted 10 lines
Quoted 10 lines

  #define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_INIT_RAM_S
IZE - \
    CONFIG_SYS_SPL_MALLOC_SI ZE + \
    CONFIG_SYS_INIT_RAM_ADDR )

#27 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

Quoted 47 lines · Tien Fong
Quoted 45 lines · Simon Goldschmidt

Am 05.03.2019 um 17:23 schrieb tien.fong.chee at intel.com:

Quoted 39 lines

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool, here come
to result of reasonable size required for whole SDMMC boot working on A10
SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

---

changes for v7
- Added 0x3000 for memory headroom.

---
  include/configs/socfpga_common.h | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_common.h +1 -1
index 4551cb29bc..548b458e78 100644
@@ -1,6 +1,6 @@
  /* SPDX-License-Identifier: GPL-2.0+ */
  /*
- * Copyright (C) 2012 Altera Corporation <www.altera.com>
+ * Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
   */
  #ifndef __CONFIG_SOCFPGA_COMMON_H__
  #define __CONFIG_SOCFPGA_COMMON_H__
@@ -258,7 +258,7 @@ unsigned int
 cm_get_qspi_controller_clk_hz(void);
  #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
  /* SPL memory allocation configuration, this is for FAT

implementation */
#ifndef CONFIG_SYS_SPL_MALLOC_START

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 261

Quoted 2 lines
include/configs/socfpga_common.h +1 -1
-#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000
+#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00015000

This will clash with my series here:
https://patchwork.ozlabs.org/patch/1051451/

Quoted 6 lines
Quoted 2 lines

Any chance you could test that on A10? I only have a cyclone 5.

I have tested the series, and checking the failure from the codes, SPL_SYS_MALLOC_SIMPLE and SPL_SYS_MALLOC_F_LEN are not working in A10, because FPGA loading and distro boot from FAT FS require full malloc mechanism.

OK, thanks for testing. Seems like I was missing that the difference between CONFIG_SYS_SPL_MALLOC_START/_SIZE and SYS_MALLOC_F_LEN is
full malloc vs. simple malloc.

I'll work on that.

Regards,
Simon

Quoted 13 lines

Thanks,
TF.

Quoted 10 lines
Quoted 10 lines

#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SYS_INIT_RAM_S
IZE - \
CONFIG_SYS_SPL_MALLOC_SI
ZE + \
CONFIG_SYS_INIT_RAM_ADDR
)

#28 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

Quoted 62 lines · Simon Goldschmidt
Quoted 52 lines · Tien Fong
Quoted 49 lines · Simon Goldschmidt

Am 05.03.2019 um 17:23 schrieb tien.fong.chee at intel.com:

Quoted 42 lines

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool,
here come
to result of reasonable size required for whole SDMMC boot working
on A10
SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

---

changes for v7
- Added 0x3000 for memory headroom.
---
  include/configs/socfpga_common.h | 4 ++--

  1 file changed, 2 insertions(+), 2 deletions(-)
include/configs/socfpga_common.h +1 -1
index 4551cb29bc..548b458e78 100644
@@ -1,6 +1,6 @@
   /* SPDX-License-Identifier: GPL-2.0+ */
   /*
- * Copyright (C) 2012 Altera Corporation <www.altera.com>
+ * Copyright (C) 2012-2019 Altera Corporation <www.altera.com>
    */
   #ifndef __CONFIG_SOCFPGA_COMMON_H__
   #define __CONFIG_SOCFPGA_COMMON_H__
@@ -258,7 +258,7 @@ unsigned int
 cm_get_qspi_controller_clk_hz(void);
   #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
   /* SPL memory allocation configuration, this is for FAT

implementation */
  #ifndef CONFIG_SYS_SPL_MALLOC_START

include/configs/socfpga_common.h unsigned int cm_get_qspi_controller_clk_hz(void); · line 261

Quoted 2 lines
include/configs/socfpga_common.h +1 -1
-#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00010000
+#define CONFIG_SYS_SPL_MALLOC_SIZE 0x00015000

This will clash with my series here:
https://patchwork.ozlabs.org/patch/1051451/

Quoted 8 lines
Quoted 2 lines

Any chance you could test that on A10? I only have a cyclone 5.

I have tested the series, and checking the failure from the codes, SPL_SYS_MALLOC_SIMPLE and SPL_SYS_MALLOC_F_LEN are not working in A10,
because FPGA loading and distro boot from FAT FS require full malloc
mechanism.

Quoted 6 lines

OK, thanks for testing. Seems like I was missing that the difference between
CONFIG_SYS_SPL_MALLOC_START/_SIZE and SYS_MALLOC_F_LEN is full malloc vs. simple malloc.

I'll work on that.

Great!!

Thanks a lot.

TF.

Quoted 18 lines
Quoted 18 lines

Thanks,
TF.

Quoted 13 lines
Quoted 13 lines

  #define
CONFIG_SYS_SPL_MALLOC_START       (CONFIG_SYS_INIT_RAM_S IZE - \
                                     CONFIG_SYS_SPL_MALLOC_SI ZE + \
                                     CONFIG_SYS_INIT_RAM_ADDR )

maintainer
#29 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

In reply to tien.fong.chee at intel.com
Quoted 6 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool, here come to result of reasonable size required for whole SDMMC boot working on A10 SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

This commit log is really confusing. What "series of patches"? I think you're just needing a bigger malloc pool. Can you just say that and explain why you need it?

Thanks,
Dinh

#30 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

Quoted 5 lines · Dinh Nguyen
Quoted 3 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

Quoted 7 lines
Quoted 6 lines

After some series of patches to maximise reusable of memory pool, here come
to result of reasonable size required for whole SDMMC boot working on A10
SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

This commit log is really confusing. What "series of patches"?

There are few patches for optimization the vfat needed to result this calculation. For previous records, you can check from here [v7]: https:
//www.mail-archive.com/u-boot at lists.denx.de/msg314511.html.

Quoted 3 lines

I think
you're just needing a bigger malloc pool. Can you just say that and explain why you need it?

I put this details because Marek asked this before, so i think others also intrested to know.

TF.

maintainer
#31 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

Quoted 12 lines · Tien Fong
Quoted 11 lines · Dinh Nguyen
Quoted 9 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool, here come
to result of reasonable size required for whole SDMMC boot working on A10
SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

Quoted 4 lines
Quoted 1 line

This commit log is really confusing. What "series of patches"?

There are few patches for optimization the vfat needed to result this calculation. For previous records, you can check from here [v7]: https:
//www.mail-archive.com/u-boot at lists.denx.de/msg314511.html.

Ok. Please state these facts in the commit log. I have no idea what "series of patches" you were referring to.

Quoted 7 lines
Quoted 4 lines

I think
you're just needing a bigger malloc pool. Can you just say that and explain why you need it?

I put this details because Marek asked this before, so i think others also intrested to know.

That's fine! Just that the details wasn't very clear.

Dinh

#32 lore raw

PATCH v11 9/9 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL

Quoted 19 lines · Dinh Nguyen
Quoted 17 lines · Tien Fong
Quoted 15 lines · Dinh Nguyen
Quoted 12 lines · tien.fong.chee at intel.com

From: Tien Fong Chee <[email protected]>

After some series of patches to maximise reusable of memory pool,
here come
to result of reasonable size required for whole SDMMC boot working
on A10
SoCDK. Size required come from default max cluster(0x10000) + others(0x2000) + additional memory for headroom(0x3000).

Quoted 8 lines
Quoted 6 lines
Quoted 1 line

This commit log is really confusing. What "series of patches"?

There are few patches for optimization the vfat needed to result this
calculation. For previous records, you can check from here [v7]:
https:
//www.mail-archive.com/u-boot at lists.denx.de/msg314511.html.

Ok. Please state these facts in the commit log. I have no idea what "series of patches" you were referring to.

Sure.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

 I think
you're just needing a bigger malloc pool. Can you just say that and
explain why you need it?

Quoted 5 lines
Quoted 4 lines

I put this details because Marek asked this before, so i think others
also intrested to know.

That's fine! Just that the details wasn't very clear.

Okay, i will improve it.

Quoted 2 lines

Dinh