Add support for loading FPGA bitstream
v9 cover Add support for loading FPGA bitstream
From: Tien Fong Chee <[email protected]>
This version mainly resolved comments from Marek in [v8].
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)
2 a. [U-Boot,v3,1/2] fs: fat: dynamically allocate memory for temporary buffer
b. [U-Boot,v3,2/2] fs: fat: Reduce default max clustersize 64KiB from malloc
pool
https://patchwork.ozlabs.org/project/uboot/list/?series=91135 (under review)
3. [U-Boot] misc: fs_loader: Replace label with DT phandle
https://patchwork.ozlabs.org/project/uboot/list/?series=92167 (under review)
[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 (7):
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: 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 | 533 ++++++++++++++++++++- include/configs/socfpga_common.h | 4 +- include/image.h | 4 + 9 files changed, 682 insertions(+), 32 deletions(-) create mode 100644 board/altera/arria10-socdk/fit_spl_fpga.its
Signature · 1 line
2.2.0
PATCH v9 1/7 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
@@ -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.2.0
PATCH v9 1/7 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10
Quoted 24 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.
Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- Removed explanation about support for altr,bitstream-corechanges 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 +0
-0
doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt Required properties: · line 12
Quoted 6 lines
doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +2
-0@@ -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.
By adding new required property you are automatically saying that you want to break all current users.
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190226/7c3aa658/attachment.sig>
Chee
PATCH v9 1/7 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10
Quoted 33 lines · Michal Simek
Quoted 32 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- Removed explanation about support for altr,bitstream-corechanges 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(-)(quoted diff) +0
-0mgr.txt b/doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga- mgr.txt
index 2fd8e7a..da210bf 100644doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +0
-0@@ -7,8 +7,31 @@ Required properties:- The second index is for writing FPGA configuration data.
Quoted 8 lines
Quoted 6 lines
- 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,doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +1
-0+ FPGA core bitstream and full bitstream.By adding new required property you are automatically saying that you want to break all current users.
This is company's product specific property, that's why with prefix "altr". DT allows that ,right?
Quoted 4 lines
M
PATCH v9 1/7 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10
Quoted 42 lines · Tien Fong
Quoted 33 lines · Michal Simek
Quoted 32 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- Removed explanation about support for altr,bitstream-corechanges 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(-)(quoted diff) +0
-0mgr.txt b/doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga- mgr.txt
index 2fd8e7a..da210bf 100644doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +0
-0@@ -7,8 +7,31 @@ Required properties:- The second index is for writing FPGA configuration data.
Quoted 8 lines
Quoted 6 lines
- 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,doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +1
-0+ FPGA core bitstream and full bitstream.By adding new required property you are automatically saying that you want to break all current users.
Quoted 2 lines
This is company's product specific property, that's why with prefix "altr". DT allows that ,right?
no issue with altr prefix. Issue is that you add a required property and breaking all current users.
It should be optional.
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190226/5580d9c6/attachment.sig>
PATCH v9 1/7 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10
Quoted 42 lines · Michal Simek
Quoted 41 lines · Tien Fong
Quoted 40 lines · Michal Simek
Quoted 36 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- Removed explanation about support for altr,bitstream-corechanges 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(-)(quoted diff) +0
-0mgr.txt b/doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga- mgr.txt
index 2fd8e7a..da210bf 100644doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +0
-0@@ -7,8 +7,31 @@ Required properties: - The second index is for writing FPGAconfiguration 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,doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt Required properties: · line 11
Quoted 1 line
doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +1
-0+ FPGA core bitstream and full bitstream.By adding new required property you are automatically saying that you want to break all current users.
Quoted 6 lines
Quoted 2 lines
This is company's product specific property, that's why with prefix "altr". DT allows that ,right?
no issue with altr prefix. Issue is that you add a required property and breaking all current users.
It should be optional.
This parameter is only for Arria10, which at this point is not fully supported in mainline uboot. So this doesnt affect any existing designs, no?
--dalon
Quoted 5 lines
M
Chee
PATCH v9 1/7 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10
Quoted 59 lines · Dalon L Westergreen
Quoted 58 lines · Michal Simek
Quoted 56 lines · Tien Fong
Quoted 43 lines · Michal Simek
Quoted 41 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- Removed explanation about support for altr,bitstream-corechanges 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(-)(quoted diff) +0
-0a10-fpga-
mgr.txt b/doc/device-tree-bindings/fpga/altera-socfpga-a10- fpga-
mgr.txt
index 2fd8e7a..da210bf 100644
--- a/doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga- mgr.txt
+++ b/doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga- mgr.txt(quoted diff) +0
-0@@ -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.Quoted 8 lines
Quoted 5 lines
+- altr,bitstream : Fit image file name for both FPGA peripheral
bitstream,doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +1
-0+ FPGA core bitstream and full bitstream.By adding new required property you are automatically saying that you
want to break all current users.This is company's product specific property, that's why with prefix
"altr". DT allows that ,right?
Quoted 7 lines
Quoted 4 lines
no issue with altr prefix. Issue is that you add a required property and
breaking all current users.
It should be optional.This parameter is only for Arria10, which at this point is not fully supported
in mainline uboot. So this doesnt affect any existing designs, no?
Yeah, how this breaking all current users? This property in only used for the A10 fpga driver with fit implementation.
Quoted 9 lines
--dalon
Quoted 6 lines
M
PATCH v9 1/7 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10
Quoted 64 lines · Tien Fong
Quoted 63 lines · Dalon L Westergreen
Quoted 62 lines · Michal Simek
Quoted 53 lines · Tien Fong
Quoted 43 lines · Michal Simek
Quoted 41 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- Removed explanation about support for altr,bitstream-corechanges 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(-)(quoted diff) +0
-0a10-fpga-
mgr.txt b/doc/device-tree-bindings/fpga/altera-socfpga-a10- fpga-
mgr.txt
index 2fd8e7a..da210bf 100644
--- a/doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga- mgr.txt
+++ b/doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga- mgr.txt(quoted diff) +0
-0@@ -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.Quoted 8 lines
Quoted 5 lines
+- altr,bitstream : Fit image file name for both FPGA peripheral
bitstream,doc/device-tree-bindings/fpga/altera-socfpga-a10-fpga-mgr.txt +1
-0+ FPGA core bitstream and full bitstream.By adding new required property you are automatically saying that you
want to break all current users.Quoted 3 lines
This is company's product specific property, that's why with prefix
"altr". DT allows that ,right?no issue with altr prefix. Issue is that you add a required property and
breaking all current users.
It should be optional.
Quoted 6 lines
Quoted 3 lines
This parameter is only for Arria10, which at this point is not fully supported
in mainline uboot. So this doesnt affect any existing designs, no?Yeah, how this breaking all current users? This property in only used for the A10 fpga driver with fit implementation.
That you use latest u-boot with previous DT(or our of tree DT which doesn't have this property).
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190227/76a3780a/attachment-0001.sig>
Chee
PATCH v9 1/7 ARM: socfpga: Description on FPGA bitstream type and file name for Arria 10
Quoted 85 lines · Michal Simek
Quoted 84 lines · Tien Fong
Quoted 82 lines · Dalon L Westergreen
Quoted 68 lines · Michal Simek
Quoted 65 lines · Tien Fong
Quoted 62 lines · Michal Simek
Quoted 53 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- Removed explanation about support for altr,bitstream- corechanges 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(-)(quoted diff) +0
-0socfpga-
a10-fpga-
mgr.txt b/doc/device-tree-bindings/fpga/altera-socfpga- a10-
fpga-
mgr.txt
index 2fd8e7a..da210bf 100644
--- a/doc/device-tree-bindings/fpga/altera-socfpga-a10- fpga-
mgr.txt
+++ b/doc/device-tree-bindings/fpga/altera-socfpga-a10- fpga-
mgr.txt(quoted diff) +0
-0@@ -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,(quoted diff) +1
-0+ FPGA core bitstream and fullQuoted 2 lines
bitstream.
By adding new required property you are automatically saying
that you
want to break all current users.Quoted 7 lines
Quoted 3 lines
This is company's product specific property, that's why with prefix
"altr". DT allows that ,right?no issue with altr prefix. Issue is that you add a required property and
breaking all current users.
It should be optional.This parameter is only for Arria10, which at this point is not fully
supported
in mainline uboot. So this doesnt affect any existing designs, no?
Quoted 5 lines
Quoted 3 lines
Yeah, how this breaking all current users? This property in only used
for the A10 fpga driver with fit implementation.That you use latest u-boot with previous DT(or our of tree DT which doesn't have this property).
Sorry, i'm still not getting you. My understanding "breaking" means the existing driver would stop working after A10 DT is applied. May be you can tell us breaking what driver?
What you means with previous DT? Which DT you means? This series of patches are the 1st one fully support A10 SDMMC in mainline.
How this related to your DT?
Thanks,
TF
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
In reply to tien.fong.chee at intel.comFrom: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
---
changes for v8
- 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
@@ -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 at 1 { + description = "FPGA peripheral bitstream"; + data = /incbin/("../../../ghrd_10as066n2.periph.rbf"); + type = "fpga"; + arch = "arm"; + compression = "none"; + }; + + fpga-core at 2 { + 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 at 1", "fpga-core at 2"; + }; + }; +};
Signature · 1 line
2.2.0
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
Quoted 30 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- 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.itsboard/altera/arria10-socdk/fit_spl_fpga.its new file +4
-0@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 + /* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + *
board/altera/arria10-socdk/fit_spl_fpga.its line 14
Quoted 10 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +10
-0+ */ + +/dts-v1/; + +/ { + description = "FIT image with FPGA bistream"; + #address-cells = <1>; + + images { + fpga-periph at 1 {
Still this is DT and using @1 without reg property below is wrong.
board/altera/arria10-socdk/fit_spl_fpga.its line 22
Quoted 8 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +8
-0+ description = "FPGA peripheral bitstream"; + data = /incbin/("../../../ghrd_10as066n2.periph.rbf"); + type = "fpga"; + arch = "arm"; + compression = "none"; + }; + + fpga-core at 2 {
ditto.
Quoted 7 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +6
-0+ description = "FPGA core bitstream"; + data = /incbin/("../../../ghrd_10as066n2.core.rbf"); + type = "fpga"; + arch = "arm"; + compression = "none"; + };
board/altera/arria10-socdk/fit_spl_fpga.its line 38
Quoted 10 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +10
-0+ }; + + configurations { + default = "config-1"; + config-1 { + description = "Boot with FPGA early IO release config"; + fpga = "fpga-periph at 1", "fpga-core at 2"; + }; + }; +};
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190226/aa772703/attachment.sig>
Chee
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
Quoted 38 lines · Michal Simek
Quoted 37 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- 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 +7
-0@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 + /* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + * + */ + +/dts-v1/;
Quoted 8 lines
board/altera/arria10-socdk/fit_spl_fpga.its line 14
Quoted 7 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +7
-0+ +/ { + description = "FIT image with FPGA bistream"; + #address-cells = <1>; + + images { + fpga-periph at 1 {Still this is DT and using @1 without reg property below is wrong.
Sorry, i'm not getting you.
Mind to explain more?
Quoted 35 lines
board/altera/arria10-socdk/fit_spl_fpga.its line 22
Quoted 11 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +2
-0+ description = "FPGA peripheral bitstream"; + data =/incbin/("../../../ghrd_10as066n2.periph.rbf");
board/altera/arria10-socdk/fit_spl_fpga.its new file +6
-0+ type = "fpga"; + arch = "arm"; + compression = "none"; + }; + + fpga-core at 2 {ditto.
Quoted 16 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +2
-0+ description = "FPGA core bitstream"; + data =/incbin/("../../../ghrd_10as066n2.core.rbf");
board/altera/arria10-socdk/fit_spl_fpga.its new file +10
-0+ type = "fpga"; + arch = "arm"; + compression = "none"; + }; + }; + + configurations { + default = "config-1"; + config-1 { + description = "Boot with FPGA early IOrelease config";
board/altera/arria10-socdk/fit_spl_fpga.its line 38
Quoted 4 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +4
-0+ fpga = "fpga-periph at 1", "fpga-core at 2"; + }; + }; +};M
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
Quoted 47 lines · Tien Fong
Quoted 38 lines · Michal Simek
Quoted 37 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- 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 +7
-0@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 + /* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + * + */ + +/dts-v1/;Quoted 8 lines
board/altera/arria10-socdk/fit_spl_fpga.its line 14
Quoted 7 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +7
-0+ +/ { + description = "FIT image with FPGA bistream"; + #address-cells = <1>; + + images { + fpga-periph at 1 {Still this is DT and using @1 without reg property below is wrong.
Quoted 2 lines
Sorry, i'm not getting you.
Mind to explain more?
it should be just fpga-periph {
because you don't have reg properly below.
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190226/f2dc1adb/attachment.sig>
Chee
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
Quoted 53 lines · Michal Simek
Quoted 52 lines · Tien Fong
Quoted 50 lines · Michal Simek
Quoted 36 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- 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 +4
-0@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 + /* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + *board/altera/arria10-socdk/fit_spl_fpga.its line 14
Quoted 10 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +10
-0+ */ + +/dts-v1/; + +/ { + description = "FIT image with FPGA bistream"; + #address-cells = <1>; + + images { + fpga-periph at 1 {Still this is DT and using @1 without reg property below is wrong.
Quoted 4 lines
Quoted 2 lines
Sorry, i'm not getting you.
Mind to explain more?it should be just fpga-periph {
because you don't have reg properly below.
So this rule also apply for ITS image node name?
How about fpga-periph-1?
Quoted 6 lines
M
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
Quoted 54 lines · Tien Fong
Quoted 53 lines · Michal Simek
Quoted 52 lines · Tien Fong
Quoted 50 lines · Michal Simek
Quoted 36 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
Signed-off-by Tien Fong Chee <[email protected]>---
changes for v8
- 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 +4
-0@@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0 + /* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + *board/altera/arria10-socdk/fit_spl_fpga.its line 14
Quoted 10 lines
board/altera/arria10-socdk/fit_spl_fpga.its new file +10
-0+ */ + +/dts-v1/; + +/ { + description = "FIT image with FPGA bistream"; + #address-cells = <1>; + + images { + fpga-periph at 1 {Still this is DT and using @1 without reg property below is wrong.
Quoted 5 lines
Quoted 4 lines
Quoted 2 lines
Sorry, i'm not getting you.
Mind to explain more?it should be just fpga-periph {
because you don't have reg properly below.So this rule also apply for ITS image node name?
yep.
Quoted 1 line
How about fpga-periph-1?
Not a problem with it.
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190227/71cdb050/attachment.sig>
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
In reply to tien.fong.chee at intel.comQuoted 6 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
Signed-off-by Tien Fong Chee <[email protected]>
Quoted 7 lines
---
changes for v8
- Reordered the images and fpga configurations.
- Removed the load property at core image.changes for v8
No reason to have separate v8 changes.
Quoted 2 lines
- Changed the FPGA node name to fpga-core and fpga-periph for both core and periph bitstreams respectively.
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190226/4af03a52/attachment.sig>
Chee
PATCH v9 2/7 ARM: socfpga: Add default FPGA bitstream fitImage for Arria10 SoCDK
Quoted 8 lines · Michal Simek
Quoted 7 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
Add default fitImage file bundling FPGA bitstreams for Arria10.
Signed-off-by Tien Fong Chee <[email protected]>
Quoted 8 lines
Quoted 7 lines
---
changes for v8
- Reordered the images and fpga configurations.
- Removed the load property at core image.changes for v8
No reason to have separate v8 changes.
Sorry for typo, that's v9.
Quoted 7 lines
Quoted 5 lines
- Changed the FPGA node name to fpga-core and fpga-periph for both core and
 periph bitstreams respectively.M
PATCH v9 3/7 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
In reply to tien.fong.chee at intel.comFrom: 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 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 | 40 +- drivers/fpga/socfpga_arria10.c | 533 ++++++++++++++++++++- include/image.h | 4 + 4 files changed, 571 insertions(+), 23 deletions(-)
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +17 -0
@@ -18,6 +18,23 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi" +/ { + chosen { + firmware-loader = <&fs_loader0>; + }; + + fs_loader0: fs-loader at 0 { + 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 +38 -2
@@ -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,40 @@ 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 ); - +int is_fpgamgr_early_user_mode (void ); +const char *get_fpga_filename (const void *fdt,int *len); +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 +512 -21
597 lines not on this page · raw message
include/image.h +4 -0
@@ -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.2.0
PATCH v9 3/7 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
Quoted 39 lines · 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.
Signed-off-by Tien Fong Chee <[email protected]>---
changes for v9
- Support data offset
- Added default DDR load address
- Squashed theimage.h
- Changed to phandle
- Ensure the DDR is fully up running by checking thegd->ramchanges 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 | 40 +- drivers/fpga/socfpga_arria10.c | 533 ++++++++++++++++++++- include/image.h | 4 + 4 files changed, 571 insertions(+), 23 deletions(-)arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +0
-0
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 26
Quoted 9 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +6
-0@@ -18,6 +18,23 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi" +/ { + chosen { + firmware-loader = <&fs_loader0>; + }; + + fs_loader0: fs-loader at 0 {
again @0 without reg properly is wrong.
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 30
Quoted 4 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +4
-0+ u-boot,dm-pre-reloc; + compatible = "u-boot,fs-loader"; + phandlepart = <&mmc 1>; + };
I think that this will be nacked by DT guys.
Quoted 119 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +7
-0+}; + +&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 +38
-2@@ -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,40 @@ 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 ); - +int is_fpgamgr_early_user_mode (void ); +const char *get_fpga_filename (const void *fdt,int *len); +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 +7
-2@@ -1,8 +1,7 @@// SPDX-License-Identifier: GPL-2.0 /* -* Copyright (C) 2017 Intel Corporation <www.intel.com> +* Copyright (C) 2017-2019 Intel Corporation <www.intel.com> */ -#include <asm/io.h> #include <asm/arch/fpga_manager.h> #include <asm/arch/reset_manager.h> @@ -10,8 +9,11 @@#include <asm/arch/sdram.h> #include <asm/arch/misc.h> #include <altera.h> +#include <asm/arch/pinmux.h> #include <common.h> +#include <dm/ofnode.h> #include <errno.h> +#include <fs_loader.h> #include <wait_bit.h> #include <watchdog.h> @@ -21,6 +23,9 @@#define COMPRESSION_OFFSET 229#define FPGA_TIMEOUT_MSEC 1000/* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 +#define DEFAULT_DDR_LOAD_ADDRESS 0x400 + +DECLARE_GLOBAL_DATA_PTR ;static const struct socfpga_fpga_manager *fpga_manager_base = (void *)SOCFPGA_FPGAMGRREGS_ADDRESS ;
drivers/fpga/socfpga_arria10.c static int wait_for_user_mode(void) · line 72
Quoted 5 lines
drivers/fpga/socfpga_arria10.c +1
-1@@ -64,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 )
This is called inside the same file that's why no reason for this change. Maybe you are using that later but it just suggest incorrect split.
drivers/fpga/socfpga_arria10.c int fpgamgr_wait_early_user_mode(void) · line 102
Quoted 9 lines
drivers/fpga/socfpga_arria10.c +1
-1{return (readl (&fpga_manager_base->imgcfg_stat) &ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK ) !=0 ;@@ -94,7 +99,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);
it should be separate patch.
Quoted 4 lines
drivers/fpga/socfpga_arria10.c +0
-0/* restoring original CDRATIO */ fpgamgr_set_cd_ratio (cd_ratio);
drivers/fpga/socfpga_arria10.c static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data, · line 183
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +4
-3@@ -172,9 +177,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);
separate patch - just disturbing reviewers and you are not saying nothing about it in commit message.
Quoted 12 lines
drivers/fpga/socfpga_arria10.c +1
-0/* * from the register map description of cdratio in imgcfg_ctrl_02: @@ -359,6 +365,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 )
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 435
Quoted 4 lines
drivers/fpga/socfpga_arria10.c +0
-1@@ -432,7 +439,6 @@ int fpgamgr_program_finish(void)printf ("FPGA: Poll CD failed with error code %d\n" , status);return -EPERM ; } -WATCHDOG_RESET ();
These two looks like separate patch too.
Quoted 6 lines
drivers/fpga/socfpga_arria10.c +0
-0/* Ensure the FPGA entering user mode */ status =fpgamgr_program_poll_usermode ();@@ -447,27 +453,512 @@ int fpgamgr_program_finish(void)return 0 ; }
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 460
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +5
-4-/* -* FPGA Manager to program the FPGA. This is the interface used by FPGA driver. -* Return 0 for sucess, non-zero for error. -*/ +ofnode get_fpga_mgr_ofnode (void ) +{ +int node_offset; + + fdtdec_find_aliases_for_id(gd->fdt_blob, "fpga_mgr",
nit: using of live functions would be better to get rid of gd->.
Quoted 71 lines
drivers/fpga/socfpga_arria10.c +71
-0+COMPAT_ALTERA_SOCFPGA_FPGA0 , + &node_offset, 1); + +return offset_to_ofnode (node_offset); +} + +const char *get_fpga_filename (const void *fdt,int *len) +{ +const char *fpga_filename =NULL ; + +ofnode fpgamgr_node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (fpgamgr_node)) + fpga_filename =ofnode_read_string (fpgamgr_node, +"altr,bitstream" ); + +return fpga_filename; +} + +static void get_rbf_image_info (struct rbf_info *rbf,u16 *buffer) +{ +/* +* Magic ID starting at: +* -> 1st dword[15:0] in periph.rbf +* -> 2nd dword[15:0] in core.rbf +* Note: dword == 32 bits +*/ +u32 word_reading_max =2 ; +u32 i; + +for (i =0 ; i < word_reading_max; i++) { +if (*(buffer + i) ==FPGA_SOCFPGA_A10_RBF_UNENCRYPTED ) { + rbf->security = unencrypted; + }else if (*(buffer + i) ==FPGA_SOCFPGA_A10_RBF_ENCRYPTED ) { + rbf->security = encrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_UNENCRYPTED ) { + rbf->security = unencrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_ENCRYPTED ) { + rbf->security = encrypted; + }else { + rbf->security = invalid; +continue ; + } + +/* PERIPH RBF(buffer + i + 1), CORE RBF(buffer + i + 2) */ +if (*(buffer + i +1 ) ==FPGA_SOCFPGA_A10_RBF_PERIPH ) { + rbf->section = periph_section; +break ; + }else if (*(buffer + i +1 ) ==FPGA_SOCFPGA_A10_RBF_CORE ) { + rbf->section = core_section; +break ; + }else if (*(buffer + i +2 ) ==FPGA_SOCFPGA_A10_RBF_PERIPH ) { + rbf->section = periph_section; +break ; + }else if (*(buffer + i +2 ) ==FPGA_SOCFPGA_A10_RBF_CORE ) { + rbf->section = core_section; +break ; + } + + rbf->section = unknown; +break ; + +WATCHDOG_RESET (); + } +} + +#ifdef CONFIG_FS_LOADER +static int first_loading_rbf_to_buffer(struct udevice *dev, + struct fpga_loadfs_info *fpga_loadfs,
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 541
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +10
-0+ u32 *buffer, size_t *buffer_bsize) +{ +u32 *buffer_p = (u32 *)*buffer; +u32 *loadable = buffer_p; +size_t buffer_size = *buffer_bsize; +size_t fit_size; +int ret, i, count; +int confs_noffset, images_noffset; +int rbf_offset; +int rbf_size;
put them on the same line.
Quoted 23 lines
drivers/fpga/socfpga_arria10.c +23
-0+const char *fpga_node_name =NULL ; +const char *uname =NULL ; + +/* Load image header into buffer */ + ret =request_firmware_into_buf (dev, + fpga_loadfs->fpga_fsinfo->filename, + buffer_p, +sizeof (struct image_header ), +0 ); +if (ret <0 ) { +debug ("FPGA: Failed to read image header from flash.\n" ); +return -ENOENT ; + } + +if (image_get_magic ((struct image_header *)buffer_p) !=FDT_MAGIC ) { +debug ("FPGA: No FDT magic was found.\n" ); +return -EBADF ; + } + + fit_size =fdt_totalsize (buffer_p); + +if (fit_size > buffer_size) { +debug ("FPGA: FIT image is larger than available buffer.\n" );
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 574
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +10
-0+debug ("Please use FIT external data or increasing buffer.\n" ); +return -ENOMEM ; + } + +/* Load entire FIT into buffer */ + ret =request_firmware_into_buf (dev, + fpga_loadfs->fpga_fsinfo->filename, + buffer_p, + fit_size, +0 );
nit: better buffer_p, fit_size, 0);
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 575
Quoted 1 line
drivers/fpga/socfpga_arria10.c +1
-0+
nit: remove empty line above
Quoted 16 lines
drivers/fpga/socfpga_arria10.c +16
-0+if (ret <0 ) +return ret; + + ret =fit_check_format (buffer_p); +if (!ret) { +debug ("FPGA: No valid FIT image was found.\n" ); +return -EBADF ; + } + + confs_noffset =fdt_path_offset (buffer_p,FIT_CONFS_PATH ); + images_noffset =fdt_path_offset (buffer_p,FIT_IMAGES_PATH ); +if (confs_noffset <0 || images_noffset <0 ) { +debug ("FPGA: No Configurations or images nodes were found.\n" ); +return -ENOENT ; + } +
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 601
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +10
-0+/* Get default configuration unit name from default property */ + confs_noffset =fit_conf_get_node (buffer_p,NULL ); +if (confs_noffset <0 ) { +debug ("FPGA: No default configuration was found in config.\n" ); +return -ENOENT ; + } + + count =fit_conf_get_prop_node_count (buffer_p, confs_noffset, +FIT_FPGA_PROP ); +
nit: remove empty line.
Quoted 159 lines
drivers/fpga/socfpga_arria10.c +159
-0+if (count <0 ) { +debug ("FPGA: Invalid configuration format for FPGA node.\n" ); +return count; + } +debug ("FPGA: FPGA node count: %d\n" , count); + +for (i =0 ; i < count; i++) { + images_noffset =fit_conf_get_prop_node_index (buffer_p, + confs_noffset, +FIT_FPGA_PROP , i); + uname =fit_get_name (buffer_p, images_noffset,NULL ); +if (uname) { +debug ("FPGA: %s\n" , uname); + +if (strstr (uname,"fpga-periph" ) && + (!is_fpgamgr_early_user_mode () || +is_fpgamgr_user_mode ())) { + fpga_node_name = uname; +printf ("FPGA: Start to program " ); +printf ("peripheral/full bitstream ...\n" ); +break ; + }else if (strstr (uname,"fpga-core" ) && + (is_fpgamgr_early_user_mode () && + !is_fpgamgr_user_mode ())) { + fpga_node_name = uname; +printf ("FPGA: Start to program core " ); +printf ("bitstream ...\n" ); +break ; + } + } +WATCHDOG_RESET (); + } + +if (!fpga_node_name) { +debug ("FPGA: No suitable bitstream was found, count: %d.\n" , i); +return 1 ; + } + + images_noffset =fit_image_get_node (buffer_p, fpga_node_name); +if (images_noffset <0 ) { +debug ("FPGA: No node '%s' was found in FIT.\n" , + fpga_node_name); +return -ENOENT ; + } + +if (!fit_image_get_data_position (buffer_p, images_noffset, + &rbf_offset)) { +debug ("FPGA: Data position was found.\n" ); + }else if (!fit_image_get_data_offset (buffer_p, images_noffset, + &rbf_offset)) { +/* +* For FIT with external data, figure out where +* the external images start. This is the base +* for the data-offset properties in each image. +*/ + rbf_offset += ((fdt_totalsize (buffer_p) +3 ) & ~3 ); +debug ("FPGA: Data offset was found.\n" ); + }else { +debug ("FPGA: No data position/offset was found.\n" ); +return -ENOENT ; + } + + ret =fit_image_get_data_size (buffer_p, images_noffset, &rbf_size); +if (ret <0 ) { +debug ("FPGA: No data size was found (err=%d).\n" , ret); +return -ENOENT ; + } + +if (gd->ram_size < rbf_size) { +debug ("FPGA: Using default OCRAM buffer and size.\n" ); + }else { + ret =fit_image_get_load (buffer_p, images_noffset, + (ulong *)loadable); +if (ret <0 ) { + buffer_p = (u32 *)DEFAULT_DDR_LOAD_ADDRESS ; +debug ("FPGA: No loadable was found.\n" ); +debug ("FPGA: Using default DDR load address: 0x%x .\n" , +DEFAULT_DDR_LOAD_ADDRESS ); + }else { + buffer_p = (u32 *)*loadable; +debug ("FPGA: Found loadable address = 0x%x.\n" , + *loadable); + } + + buffer_size = rbf_size; + } + +debug ("FPGA: External data: offset = 0x%x, size = 0x%x.\n" , + rbf_offset, rbf_size); + + fpga_loadfs->remaining = rbf_size; + +/* +* Determine buffer size vs bitstream size, and calculating number of +* chunk by chunk transfer is required due to smaller buffer size +* compare to bitstream +*/ +if (rbf_size <= buffer_size) { +/* Loading whole bitstream into buffer */ + buffer_size = rbf_size; + fpga_loadfs->remaining =0 ; + }else { + fpga_loadfs->remaining -= buffer_size; + } + + fpga_loadfs->offset = rbf_offset; +/* Loading bitstream into buffer */ + ret =request_firmware_into_buf (dev, + fpga_loadfs->fpga_fsinfo->filename, + buffer_p, + buffer_size, + fpga_loadfs->offset); +if (ret <0 ) { +debug ("FPGA: Failed to read bitstream from flash.\n" ); +return -ENOENT ; + } + +/* Getting info about bitstream types */ +get_rbf_image_info (&fpga_loadfs->rbfinfo, (u16 *)buffer_p); + +/* Update next reading bitstream offset */ + fpga_loadfs->offset += buffer_size; + +/* Update the final addr for bitstream */ + *buffer = (u32 )buffer_p; + +/* Update the size of bitstream to be programmed into FPGA */ + *buffer_bsize = buffer_size; + +return 0 ; +} + +static int subsequent_loading_rbf_to_buffer (struct udevice *dev, +struct fpga_loadfs_info *fpga_loadfs, +u32 *buffer,size_t *buffer_bsize) +{ +int ret =0 ; +u32 *buffer_p = (u32 *)*buffer; + +/* Read the bitstream chunk by chunk. */ +if (fpga_loadfs->remaining > *buffer_bsize) { + fpga_loadfs->remaining -= *buffer_bsize; + }else { + *buffer_bsize = fpga_loadfs->remaining; + fpga_loadfs->remaining =0 ; + } + + ret =request_firmware_into_buf (dev, + fpga_loadfs->fpga_fsinfo->filename, + buffer_p, + *buffer_bsize, + fpga_loadfs->offset); +if (ret <0 ) { +debug ("FPGA: Failed to read bitstream from flash.\n" ); +return -ENOENT ; + } + +/* Update next reading bitstream offset */ + fpga_loadfs->offset += *buffer_bsize;
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 770
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +10
-0+ +return 0 ; +} + +int socfpga_loadfs (fpga_fs_info *fpga_fsinfo,const void *buf,size_t bsize, +u32 offset) +{ +struct fpga_loadfs_info fpga_loadfs; +int status =0 ; +int ret =0 ;
no reason to initiate here.
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 777
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 buffer = (uintptr_t )buf; +size_t buffer_sizebytes = bsize; +size_t buffer_sizebytes_ori = bsize; +size_t total_sizeof_image =0 ; +struct udevice *dev; +ofnode node; +int size;
another int - just put them on the same line.
Quoted 48 lines
drivers/fpga/socfpga_arria10.c +48
-0+const fdt32_t *phandle_p; +u32 phandle; + + node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (node)) { + phandle_p =ofnode_get_property (node,"firmware-loader" , &size); +if (phandle_p) { + node =ofnode_path ("/chosen" ); +if (!ofnode_valid (node)) { +debug ("FPGA: /chosen node was not found.\n" ); +return -ENOENT ; + } + + phandle_p =ofnode_get_property (node,"firmware-loader" , + &size); +if (!phandle_p) { +debug ("FPGA: firmware-loader property was not" ); +debug (" found.\n" ); +return -ENOENT ; + } + } + }else { +debug ("FPGA: FPGA manager node was not found.\n" ); +return -ENOENT ; + } + + phandle =fdt32_to_cpu (*phandle_p); + ret =uclass_get_device_by_phandle_id (UCLASS_FS_FIRMWARE_LOADER , + phandle, &dev); +if (ret) +return ret; + +memset (&fpga_loadfs,0 ,sizeof (fpga_loadfs)); + + fpga_loadfs.fpga_fsinfo = fpga_fsinfo; + fpga_loadfs.offset = offset; + +printf ("FPGA: Checking FPGA configuration setting ...\n" ); + +/* +* Note: Both buffer and buffer_sizebytes values can be altered by +* function below. +*/ + ret =first_loading_rbf_to_buffer (dev, &fpga_loadfs, &buffer, + &buffer_sizebytes); +if (ret ==1 ) { +printf ("FPGA: Skipping configuration ...\n" );
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 835
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +10
-0+return 0 ; + }else if (ret) { +return ret; + } + +if (fpga_loadfs.rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode () && !is_fpgamgr_user_mode ())) { +debug ("FPGA : Must be in Early Release mode to program " ); +debug ("core bitstream.\n" ); +return 0 ;
This doesn't look like pass. 0 means pass but it should fail.
Quoted 92 lines
drivers/fpga/socfpga_arria10.c +89
-1+ } + +/* Disable all signals from HPS peripheral controller to FPGA */ +writel (0 , &system_manager_base->fpgaintf_en_global); + +/* Disable all axi bridges (hps2fpga, lwhps2fpga & fpga2hps) */ +socfpga_bridges_reset (); + +if (fpga_loadfs.rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status =fpgamgr_program_init ((u32 *)buffer, buffer_sizebytes); +if (status) { +debug ("FPGA: Init with peripheral bitstream failed.\n" ); +return -EPERM ; + } + } + +/* Transfer bitstream to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, buffer_sizebytes); + + total_sizeof_image += buffer_sizebytes; + +while (fpga_loadfs.remaining) { + ret =subsequent_loading_rbf_to_buffer (dev, + &fpga_loadfs, + &buffer, + &buffer_sizebytes_ori); + +if (ret) +return ret; + +/* Transfer data to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, + buffer_sizebytes_ori); + + total_sizeof_image += buffer_sizebytes_ori; + +WATCHDOG_RESET (); + } + +if (fpga_loadfs.rbfinfo.section == periph_section) { +if (fpgamgr_wait_early_user_mode () != -ETIMEDOUT ) { +config_pins (gd->fdt_blob,"shared" ); +puts ("FPGA: Early Release Succeeded.\n" ); + }else { +debug ("FPGA: Failed to see Early Release.\n" ); +return -EIO ; + } + +/* For monolithic bitstream */ +if (is_fpgamgr_user_mode ()) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + }else if (fpga_loadfs.rbfinfo.section == core_section) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + }else { +debug ("FPGA: Config Error: Unsupported bitstream type.\n" ); +return -ENOEXEC ; + } + +return (int )total_sizeof_image; +} + +void fpgamgr_program (const void *buf,size_t bsize,u32 offset) +{ +fpga_fs_info fpga_fsinfo; +int len; + + fpga_fsinfo.filename =get_fpga_filename (gd->fdt_blob, &len); + +if (fpga_fsinfo.filename) +socfpga_loadfs (&fpga_fsinfo, buf, bsize, offset); +} +#endif + +/* This function is used to load the core bitstream from the OCRAM. */ int socfpga_load (Altera_desc *desc,const void *rbf_data,size_t rbf_size) { -int status; +unsigned long status;
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 934
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +5
-2+struct rbf_info rbfinfo; + +memset (&rbfinfo,0 ,sizeof (rbfinfo)); -/* 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) */
separate changes.
Quoted 12 lines
drivers/fpga/socfpga_arria10.c +4
-5socfpga_bridges_reset (); -/* Initialize the FPGA Manager */ - status =fpgamgr_program_init ((u32 *)rbf_data, rbf_size); -if (status) -return status; +/* Getting info about bitstream types */ +get_rbf_image_info (&rbfinfo, (u16 *)rbf_data); -/* Write the RBF data to FPGA Manager */ +if (rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 951
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +10
-0+ status =fpgamgr_program_init ((u32 *)rbf_data, rbf_size); +if (status) +return status; + } + +if (rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode () && !is_fpgamgr_user_mode ())) { +debug ("FPGA : Must be in early release mode to program " ); +debug ("core bitstream.\n" ); +return 0 ;
0 is supposed to be pass. This looks like a fail.
Quoted 19 lines
drivers/fpga/socfpga_arria10.c +10
-1+ } + +/* Write the bitstream to FPGA Manager */ fpgamgr_program_write (rbf_data, rbf_size); -return fpgamgr_program_finish (); + status =fpgamgr_program_finish (); +if (status) { +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + +return status; }include/image.h +0
-0
include/image.h int fit_check_format(const void *fit); · line 1047
Quoted 7 lines
include/image.h +4
-0@@ -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);
This should be separate patch.
include/image.h int fit_check_format(const void *fit);
Quoted 4 lines
include/image.h +0
-0/** * fit_conf_get_prop_node() - Get node refered to by a configuration
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190226/5d2946e9/attachment.sig>
Chee
PATCH v9 3/7 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
Quoted 61 lines · Michal Simek
Quoted 51 lines · 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v9
- Support data offset
- Added default DDR load address
- Squashed theimage.h
- Changed to phandle
- Ensure the DDR is fully up running by checking thegd->ramchanges 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 | 40 +- drivers/fpga/socfpga_arria10.c | 533
++++++++++++++++++++-
include/image.h | 4 +4 files changed, 571 insertions(+), 23 deletions(-)arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +0
-0@@ -18,6 +18,23 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi"arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 26
Quoted 6 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +6
-0+/ { + chosen { + firmware-loader = <&fs_loader0>; + }; + + fs_loader0: fs-loader at 0 {again @0 without reg properly is wrong.
Quoted 1 line
Quoted 5 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 30
Quoted 4 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +4
-0+ u-boot,dm-pre-reloc; + compatible = "u-boot,fs-loader"; + phandlepart = <&mmc 1>; + };I think that this will be nacked by DT guys.
We have reached common agrement between Simon and Tom that this would be the way to implement the software policy.
Quoted 860 lines
Quoted 130 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +7
-0+}; + +&fpga_mgr { + u-boot,dm-pre-reloc; + altr,bitstream = "fit_spl_fpga.itb"; +}; +&mmc {
u-boot,dm-pre-reloc;
status = "okay";(quoted diff) +0
-0
socfpga/include/mach/fpga_manager_arria10.hb/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 09d13f6..7a4f723 100644arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +1
-1@@ -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. */ arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#include <asm/cache.h> +#include <altera.h> +#include <image.h> +#ifndef _FPGA_MANAGER_ARRIA10_H_
#define _FPGA_MANAGER_ARRIA10_H_arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -51,6 +55,10 @@ #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK BIT(24) #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB16
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#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__
structsocfpga_fpga_manager{arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -88,12 +96,40 @@ struct socfpga_fpga_manager { u32 imgcfg_fifo_status; };arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +24
-0+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 */
intfpgamgr_program_init(u32 * rbf_data, size_t rbf_size); intfpgamgr_program_finish(void);
intis_fpgamgr_user_mode(void);
intfpgamgr_wait_early_user_mode(void);arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +3
-1- +int is_fpgamgr_early_user_mode (void ); +const char *get_fpga_filename (const void *fdt,int *len); +int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf,
size_tbsize,arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +2
-0+ 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 +4
-2@@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2017 Intel Corporation <www.intel.com> + * Copyright (C) 2017-2019 Intel Corporation <www.intel.com> */ - #include <asm/io.h> #include <asm/arch/fpga_manager.h> #include <asm/arch/reset_manager.h>@@ -10,8 +9,11 @@ #include <asm/arch/sdram.h> #include <asm/arch/misc.h> #include <altera.h> +#include <asm/arch/pinmux.h> #include <common.h> +#include <dm/ofnode.h> #include <errno.h> +#include <fs_loader.h> #include <wait_bit.h> #include <watchdog.h>drivers/fpga/socfpga_arria10.c +3
-0@@ -21,6 +23,9 @@ #define COMPRESSION_OFFSET 229 #define FPGA_TIMEOUT_MSEC 1000 /* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 +#define DEFAULT_DDR_LOAD_ADDRESS 0x400 + +DECLARE_GLOBAL_DATA_PTR ;
static const structsocfpga_fpga_manager*fpga_manager_base= (void *)SOCFPGA_FPGAMGRREGS_ADDRESS;drivers/fpga/socfpga_arria10.c +0
-0@@ -64,7 +69,7 @@ static int wait_for_user_mode(void) 1, FPGA_TIMEOUT_MSEC, false); }drivers/fpga/socfpga_arria10.c static int wait_for_user_mode(void) · line 72
Quoted 2 lines
drivers/fpga/socfpga_arria10.c +1
-1-static int is_fpgamgr_early_user_mode (void ) +int is_fpgamgr_early_user_mode (void )This is called inside the same file that's why no reason for this change.
Maybe you are using that later but it just suggest incorrect split.drivers/fpga/socfpga_arria10.c int fpgamgr_wait_early_user_mode(void) · line 102
Quoted 11 lines
{
return (readl(&fpga_manager_base->imgcfg_stat)&ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK) != 0;drivers/fpga/socfpga_arria10.c +0
-0@@ -94,7 +99,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);it should be separate patch.
Quoted 18 lines
/* restoring original CDRATIO */
fpgamgr_set_cd_ratio(cd_ratio);drivers/fpga/socfpga_arria10.c +0
-0@@ -172,9 +177,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=%dcompress=%d.\n", encrypt,
drivers/fpga/socfpga_arria10.c static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data, · line 183
Quoted 1 line
drivers/fpga/socfpga_arria10.c +1
-0+ compress);separate patch - just disturbing reviewers and you are not saying nothing about it in commit message.
Quoted 19 lines
/*
* from the register map description of cdratio inimgcfg_ctrl_02:drivers/fpga/socfpga_arria10.c +0
-0@@ -359,6 +365,7 @@ static int fpgamgr_program_poll_cd(void)
printf("nstatus == 0 while waiting for condone\n");
return-EPERM;
}drivers/fpga/socfpga_arria10.c +1
-0+WATCHDOG_RESET ();}
if (i ==FPGA_TIMEOUT_CNT)drivers/fpga/socfpga_arria10.c +0
-0@@ -432,7 +439,6 @@ int fpgamgr_program_finish(void)
printf("FPGA: Poll CD failed with error code %d\n", status);
return-EPERM;
}drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 435
Quoted 1 line
drivers/fpga/socfpga_arria10.c +0
-1-WATCHDOG_RESET ();These two looks like separate patch too.
Quoted 13 lines
/* Ensure the FPGA entering user mode */
status =fpgamgr_program_poll_usermode();drivers/fpga/socfpga_arria10.c +0
-0@@ -447,27 +453,512 @@ int fpgamgr_program_finish(void) return 0; }
-/*
- * FPGA Manager to program the FPGA. This is the interface used by FPGA driver.
- * Return 0 for sucess, non-zero for error.
- */drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 460
Quoted 5 lines
drivers/fpga/socfpga_arria10.c +5
-0+ofnode get_fpga_mgr_ofnode (void ) +{ +int node_offset; + + fdtdec_find_aliases_for_id(gd->fdt_blob, "fpga_mgr",nit: using of live functions would be better to get rid of gd->.
Quoted 81 lines
drivers/fpga/socfpga_arria10.c +32
-0+COMPAT_ALTERA_SOCFPGA_FPGA0 , + &node_offset, 1); + +return offset_to_ofnode (node_offset); +} + +const char *get_fpga_filename (const void *fdt,int *len) +{ +const char *fpga_filename =NULL ; + +ofnode fpgamgr_node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (fpgamgr_node)) + fpga_filename =ofnode_read_string (fpgamgr_node, +"altr,bitstream" ); + +return fpga_filename; +} + +static void get_rbf_image_info (struct rbf_info *rbf,u16 *buffer) +{ +/* +* Magic ID starting at: +* -> 1st dword[15:0] in periph.rbf +* -> 2nd dword[15:0] in core.rbf +* Note: dword == 32 bits +*/ +u32 word_reading_max =2 ; +u32 i; + +for (i =0 ; i < word_reading_max; i++) { + if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_UNENCRYPTED) {drivers/fpga/socfpga_arria10.c +2
-0+ rbf->security = unencrypted; + } else if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_ENCRYPTED) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->security = encrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_UNENCRYPTED ){
drivers/fpga/socfpga_arria10.c +12
-0+ rbf->security = unencrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_ENCRYPTED ) { + rbf->security = encrypted; + }else { + rbf->security = invalid; +continue ; + } + +/* PERIPH RBF(buffer + i + 1), CORE RBF(buffer + i +2) */ + if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = core_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +14
-0+ rbf->section = core_section; +break ; + } + + rbf->section = unknown; +break ; + +WATCHDOG_RESET (); + } +} + +#ifdef CONFIG_FS_LOADER +static int first_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 541
Quoted 10 lines
drivers/fpga/socfpga_arria10.c +10
-0+ u32 *buffer, size_t *buffer_bsize) +{ +u32 *buffer_p = (u32 *)*buffer; +u32 *loadable = buffer_p; +size_t buffer_size = *buffer_bsize; +size_t fit_size; +int ret, i, count; +int confs_noffset, images_noffset; +int rbf_offset; +int rbf_size;put them on the same line.
Quoted 38 lines
drivers/fpga/socfpga_arria10.c +6
-0+const char *fpga_node_name =NULL ; +const char *uname =NULL ; + +/* Load image header into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +2
-0+ buffer_p, + sizeof(struct
image_header),drivers/fpga/socfpga_arria10.c +3
-0+ 0); +if (ret <0 ) { + debug("FPGA: Failed to read image header fromflash.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + if (image_get_magic((struct image_header *)buffer_p) !=
FDT_MAGIC) {drivers/fpga/socfpga_arria10.c +8
-0+debug ("FPGA: No FDT magic was found.\n" ); +return -EBADF ; + } + + fit_size =fdt_totalsize (buffer_p); + +if (fit_size > buffer_size) { + debug("FPGA: FIT image is larger than availablebuffer.\n");
drivers/fpga/socfpga_arria10.c +1
-0+ debug("Please use FIT external data or increasingbuffer.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return -ENOMEM ; + } + +/* Load entire FIT into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 574
Quoted 3 lines
drivers/fpga/socfpga_arria10.c +3
-0+ buffer_p, + fit_size, + 0);nit: better buffer_p,
fit_size, 0);Quoted 2 lines
+
nit: remove empty line above
Quoted 30 lines
drivers/fpga/socfpga_arria10.c +11
-0+if (ret <0 ) +return ret; + + ret =fit_check_format (buffer_p); +if (!ret) { +debug ("FPGA: No valid FIT image was found.\n" ); +return -EBADF ; + } + + confs_noffset =fdt_path_offset (buffer_p,FIT_CONFS_PATH ); + images_noffset = fdt_path_offset(buffer_p,
FIT_IMAGES_PATH);drivers/fpga/socfpga_arria10.c +2
-0+if (confs_noffset <0 || images_noffset <0 ) { + debug("FPGA: No Configurations or images nodeswere found.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + +/* Get default configuration unit name from default property */
drivers/fpga/socfpga_arria10.c +3
-0+ confs_noffset =fit_conf_get_node (buffer_p,NULL ); +if (confs_noffset <0 ) { + debug("FPGA: No default configuration was found inconfig.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + count = fit_conf_get_prop_node_count(buffer_p,
confs_noffset,drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 601
Quoted 2 lines
drivers/fpga/socfpga_arria10.c +2
-0+ FIT_FPGA_PROP); +nit: remove empty line.
Quoted 197 lines
drivers/fpga/socfpga_arria10.c +2
-0+if (count <0 ) { + debug("FPGA: Invalid configuration format for FPGAnode.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return count; + } +debug ("FPGA: FPGA node count: %d\n" , count); + +for (i =0 ; i < count; i++) { + images_noffset =fit_conf_get_prop_node_index(buffer_p,
drivers/fpga/socfpga_arria10.c +1
-0+ confs
_noffset,drivers/fpga/socfpga_arria10.c +1
-0+ FIT_F
PGA_PROP, i);drivers/fpga/socfpga_arria10.c +1
-0+ uname = fit_get_name(buffer_p, images_noffset,NULL);
drivers/fpga/socfpga_arria10.c +9
-0+if (uname) { +debug ("FPGA: %s\n" , uname); + +if (strstr (uname,"fpga-periph" ) && + (!is_fpgamgr_early_user_mode () || +is_fpgamgr_user_mode ())) { + fpga_node_name = uname; +printf ("FPGA: Start to program " ); + printf("peripheral/full bitstream...\n");
drivers/fpga/socfpga_arria10.c +3
-0+break ; + } else if (strstr(uname, "fpga-core") && + (is_fpgamgr_early_user_mod
e()&&drivers/fpga/socfpga_arria10.c +1
-0+ !is_fpgamgr_user_mode())){
drivers/fpga/socfpga_arria10.c +2
-0+ fpga_node_name = uname; + printf("FPGA: Start to programcore ");
drivers/fpga/socfpga_arria10.c +9
-0+printf ("bitstream ...\n" ); +break ; + } + } +WATCHDOG_RESET (); + } + +if (!fpga_node_name) { + debug("FPGA: No suitable bitstream was found,count: %d.\n", i);
drivers/fpga/socfpga_arria10.c +4
-0+return 1 ; + } + + images_noffset = fit_image_get_node(buffer_p,
fpga_node_name);drivers/fpga/socfpga_arria10.c +10
-0+if (images_noffset <0 ) { +debug ("FPGA: No node '%s' was found in FIT.\n" , + fpga_node_name); +return -ENOENT ; + } + +if (!fit_image_get_data_position (buffer_p, images_noffset, + &rbf_offset)) { +debug ("FPGA: Data position was found.\n" ); + } else if (!fit_image_get_data_offset(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +7
-0+ &rbf_offset)) { +/* +* For FIT with external data, figure out where +* the external images start. This is the base +* for the data-offset properties in each image. +*/ + rbf_offset += ((fdt_totalsize(buffer_p) + 3) &~3);
drivers/fpga/socfpga_arria10.c +3
-0+debug ("FPGA: Data offset was found.\n" ); + }else { + debug("FPGA: No data position/offset wasfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + ret = fit_image_get_data_size(buffer_p, images_noffset,
&rbf_size);drivers/fpga/socfpga_arria10.c +2
-0+if (ret <0 ) { + debug("FPGA: No data size was found (err=%d).\n",ret);
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +if (gd->ram_size < rbf_size) { + debug("FPGA: Using default OCRAM buffer andsize.\n");
drivers/fpga/socfpga_arria10.c +5
-0+ }else { + ret =fit_image_get_load (buffer_p, images_noffset, + (ulong *)loadable); +if (ret <0 ) { + buffer_p = (u32*)DEFAULT_DDR_LOAD_ADDRESS;
drivers/fpga/socfpga_arria10.c +2
-0+debug ("FPGA: No loadable was found.\n" ); + debug("FPGA: Using default DDR loadaddress: 0x%x .\n",
drivers/fpga/socfpga_arria10.c +4
-0+ DEFAULT_DDR_LOAD_ADDRESS); + }else { + buffer_p = (u32 *)*loadable; + debug("FPGA: Found loadable address =0x%x.\n",
drivers/fpga/socfpga_arria10.c +7
-0+ *loadable); + } + + buffer_size = rbf_size; + } + + debug("FPGA: External data: offset = 0x%x, size =0x%x.\n",
drivers/fpga/socfpga_arria10.c +6
-0+ rbf_offset, rbf_size); + + fpga_loadfs->remaining = rbf_size; + +/* +* Determine buffer size vs bitstream size, and calculating number of
drivers/fpga/socfpga_arria10.c +1
-0+ * chunk by chunk transfer is required due to smallerbuffer size
drivers/fpga/socfpga_arria10.c +14
-0+* compare to bitstream +*/ +if (rbf_size <= buffer_size) { +/* Loading whole bitstream into buffer */ + buffer_size = rbf_size; + fpga_loadfs->remaining =0 ; + }else { + fpga_loadfs->remaining -= buffer_size; + } + + fpga_loadfs->offset = rbf_offset; +/* Loading bitstream into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + buffer_size, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +/* Getting info about bitstream types */ + get_rbf_image_info(&fpga_loadfs->rbfinfo, (u16*)buffer_p);
drivers/fpga/socfpga_arria10.c +8
-0+ +/* Update next reading bitstream offset */ + fpga_loadfs->offset += buffer_size; + +/* Update the final addr for bitstream */ + *buffer = (u32 )buffer_p; + +/* Update the size of bitstream to be programmed into FPGA */
drivers/fpga/socfpga_arria10.c +7
-0+ *buffer_bsize = buffer_size; + +return 0 ; +} + +static int subsequent_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c +1
-0+u32 *buffer, size_t
*buffer_bsize)drivers/fpga/socfpga_arria10.c +14
-0+{ +int ret =0 ; +u32 *buffer_p = (u32 *)*buffer; + +/* Read the bitstream chunk by chunk. */ +if (fpga_loadfs->remaining > *buffer_bsize) { + fpga_loadfs->remaining -= *buffer_bsize; + }else { + *buffer_bsize = fpga_loadfs->remaining; + fpga_loadfs->remaining =0 ; + } + + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + *buffer_bsize, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +10
-0+return -ENOENT ; + } + +/* Update next reading bitstream offset */ + fpga_loadfs->offset += *buffer_bsize; + +return 0 ; +} + +int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf,
size_tbsize,drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 770
Quoted 5 lines
drivers/fpga/socfpga_arria10.c +5
-0+ u32 offset) +{ +struct fpga_loadfs_info fpga_loadfs; +int status =0 ; +int ret =0 ;no reason to initiate here.
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 777
Quoted 8 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 buffer = (uintptr_t )buf; +size_t buffer_sizebytes = bsize; +size_t buffer_sizebytes_ori = bsize; +size_t total_sizeof_image =0 ; +struct udevice *dev; +ofnode node; +int size;another int - just put them on the same line.
Quoted 66 lines
drivers/fpga/socfpga_arria10.c +7
-0+const fdt32_t *phandle_p; +u32 phandle; + + node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (node)) { + phandle_p = ofnode_get_property(node, "firmware-loader", &size);
drivers/fpga/socfpga_arria10.c +4
-0+if (phandle_p) { + node =ofnode_path ("/chosen" ); +if (!ofnode_valid (node)) { + debug("FPGA: /chosen node was notfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + phandle_p = ofnode_get_property(node,"firmware-loader",
drivers/fpga/socfpga_arria10.c +3
-0+ &size); +if (!phandle_p) { + debug("FPGA: firmware-loaderproperty was not");
drivers/fpga/socfpga_arria10.c +11
-0+debug (" found.\n" ); +return -ENOENT ; + } + } + }else { +debug ("FPGA: FPGA manager node was not found.\n" ); +return -ENOENT ; + } + + phandle =fdt32_to_cpu (*phandle_p); + ret =uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER,
drivers/fpga/socfpga_arria10.c +13
-0+ phandle, &dev); +if (ret) +return ret; + +memset (&fpga_loadfs,0 ,sizeof (fpga_loadfs)); + + fpga_loadfs.fpga_fsinfo = fpga_fsinfo; + fpga_loadfs.offset = offset; + +printf ("FPGA: Checking FPGA configuration setting ...\n" ); + +/* +* Note: Both buffer and buffer_sizebytes values can be altered by
drivers/fpga/socfpga_arria10.c +3
-0+* function below. +*/ + ret = first_loading_rbf_to_buffer(dev, &fpga_loadfs,&buffer,
drivers/fpga/socfpga_arria10.c +10
-0+ &buffer_sizebytes); +if (ret ==1 ) { +printf ("FPGA: Skipping configuration ...\n" ); +return 0 ; + }else if (ret) { +return ret; + } + + if (fpga_loadfs.rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in Early Release mode toprogram ");
drivers/fpga/socfpga_arria10.c
Quoted 2 lines
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;This doesn't look like pass. 0 means pass but it should fail.
Quoted 118 lines
drivers/fpga/socfpga_arria10.c +3
-0+ } + +/* Disable all signals from HPS peripheral controller to FPGA */
drivers/fpga/socfpga_arria10.c +3
-0+writel (0 , &system_manager_base->fpgaintf_en_global); + +/* Disable all axi bridges (hps2fpga, lwhps2fpga & fpga2hps) */
drivers/fpga/socfpga_arria10.c +5
-0+socfpga_bridges_reset (); + +if (fpga_loadfs.rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)buffer,
buffer_sizebytes);drivers/fpga/socfpga_arria10.c +2
-0+if (status) { + debug("FPGA: Init with peripheralbitstream failed.\n");
drivers/fpga/socfpga_arria10.c +12
-0+return -EPERM ; + } + } + +/* Transfer bitstream to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, buffer_sizebytes); + + total_sizeof_image += buffer_sizebytes; + +while (fpga_loadfs.remaining) { + ret =subsequent_loading_rbf_to_buffer (dev, + &fpga_loadfs,
drivers/fpga/socfpga_arria10.c +2
-0+ &buffer, + &buffer_si
zebytes_ori);drivers/fpga/socfpga_arria10.c +15
-0+ +if (ret) +return ret; + +/* Transfer data to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, + buffer_sizebytes_ori); + + total_sizeof_image += buffer_sizebytes_ori; + +WATCHDOG_RESET (); + } + +if (fpga_loadfs.rbfinfo.section == periph_section) { +if (fpgamgr_wait_early_user_mode () != -ETIMEDOUT ){
drivers/fpga/socfpga_arria10.c +4
-0+config_pins (gd->fdt_blob,"shared" ); +puts ("FPGA: Early Release Succeeded.\n" ); + }else { + debug("FPGA: Failed to see EarlyRelease.\n");
drivers/fpga/socfpga_arria10.c +23
-0+return -EIO ; + } + +/* For monolithic bitstream */ +if (is_fpgamgr_user_mode ()) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + }else if (fpga_loadfs.rbfinfo.section == core_section) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + }else { + debug("FPGA: Config Error: Unsupported bitstreamtype.\n");
drivers/fpga/socfpga_arria10.c +12
-0+return -ENOEXEC ; + } + +return (int )total_sizeof_image; +} + +void fpgamgr_program (const void *buf,size_t bsize,u32 offset) +{ +fpga_fs_info fpga_fsinfo; +int len; + + fpga_fsinfo.filename = get_fpga_filename(gd->fdt_blob,&len);
drivers/fpga/socfpga_arria10.c +7
-0+ +if (fpga_fsinfo.filename) + socfpga_loadfs(&fpga_fsinfo, buf, bsize, offset); +} +#endif + +/* This function is used to load the core bitstream from the OCRAM. */
intsocfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
{drivers/fpga/socfpga_arria10.c +4
-1-int status; +unsigned long status; +struct rbf_info rbfinfo; + +memset (&rbfinfo,0 ,sizeof (rbfinfo));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 & Quoted 1 line
fpga2hps) */
separate changes.
Quoted 24 lines
socfpga_bridges_reset();drivers/fpga/socfpga_arria10.c +2
-4-/* Initialize the FPGA Manager */ - status =fpgamgr_program_init ((u32 *)rbf_data, rbf_size); -if (status) -return status; +/* Getting info about bitstream types */ +get_rbf_image_info (&rbfinfo, (u16 *)rbf_data);drivers/fpga/socfpga_arria10.c +3
-1-/* Write the RBF data to FPGA Manager */ +if (rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)rbf_data,
rbf_size);drivers/fpga/socfpga_arria10.c +6
-0+if (status) +return status; + } + + if (rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in early release mode toprogram ");
drivers/fpga/socfpga_arria10.c
Quoted 2 lines
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;0 is supposed to be pass. This looks like a fail.
Quoted 23 lines
drivers/fpga/socfpga_arria10.c +3
-0+ } + +/* Write the bitstream to FPGA Manager */
fpgamgr_program_write(rbf_data, rbf_size);drivers/fpga/socfpga_arria10.c +7
-1-return fpgamgr_program_finish (); + status =fpgamgr_program_finish (); +if (status) { +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + +return status;}
include/image.h +0
-0@@ -1041,6 +1041,10 @@ int fit_check_format(const void *fit);
intfit_conf_find_compat(const void *fit, const void *fdt); intfit_conf_get_node(const void *fit, const char *conf_uname);include/image.h int fit_check_format(const void *fit); · line 1047
Quoted 4 lines
include/image.h +4
-0+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);This should be separate patch.
Quoted 6 lines
/**
*fit_conf_get_prop_node()- Get node refered to by a configurationM
Chee
PATCH v9 3/7 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
In reply to Michal SimekQuoted 43 lines · Michal Simek
Quoted 42 lines · 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v9
- Support data offset
- Added default DDR load address
- Squashed theimage.h
- Changed to phandle
- Ensure the DDR is fully up running by checking thegd->ramchanges 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 | 40 +- drivers/fpga/socfpga_arria10.c | 533
++++++++++++++++++++-
include/image.h | 4 +4 files changed, 571 insertions(+), 23 deletions(-)
Quoted 16 lines
Quoted 9 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +0
-0@@ -18,6 +18,23 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi"arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 26
Quoted 6 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +6
-0+/ { + chosen { + firmware-loader = <&fs_loader0>; + }; + + fs_loader0: fs-loader at 0 {again @0 without reg properly is wrong.
Mind to explain more?
Quoted 134 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 30
Quoted 6 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +4
-0+ u-boot,dm-pre-reloc; + compatible = "u-boot,fs-loader"; + phandlepart = <&mmc 1>; + };I think that this will be nacked by DT guys.
Quoted 126 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +7
-0+}; + +&fpga_mgr { + u-boot,dm-pre-reloc; + altr,bitstream = "fit_spl_fpga.itb"; +}; +&mmc {
u-boot,dm-pre-reloc;
status = "okay";(quoted diff) +0
-0
socfpga/include/mach/fpga_manager_arria10.hb/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 09d13f6..7a4f723 100644arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +1
-1@@ -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. */ arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#include <asm/cache.h> +#include <altera.h> +#include <image.h> +#ifndef _FPGA_MANAGER_ARRIA10_H_
#define _FPGA_MANAGER_ARRIA10_H_arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -51,6 +55,10 @@ #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK BIT(24) #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB16
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#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__
structsocfpga_fpga_manager{arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -88,12 +96,40 @@ struct socfpga_fpga_manager { u32 imgcfg_fifo_status; };arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +24
-0+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 */
intfpgamgr_program_init(u32 * rbf_data, size_t rbf_size); intfpgamgr_program_finish(void);
intis_fpgamgr_user_mode(void);
intfpgamgr_wait_early_user_mode(void);arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +3
-1- +int is_fpgamgr_early_user_mode (void ); +const char *get_fpga_filename (const void *fdt,int *len); +int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf,
size_tbsize,arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +2
-0+ 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 +4
-2@@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2017 Intel Corporation <www.intel.com> + * Copyright (C) 2017-2019 Intel Corporation <www.intel.com> */ - #include <asm/io.h> #include <asm/arch/fpga_manager.h> #include <asm/arch/reset_manager.h>@@ -10,8 +9,11 @@ #include <asm/arch/sdram.h> #include <asm/arch/misc.h> #include <altera.h> +#include <asm/arch/pinmux.h> #include <common.h> +#include <dm/ofnode.h> #include <errno.h> +#include <fs_loader.h> #include <wait_bit.h> #include <watchdog.h>drivers/fpga/socfpga_arria10.c +3
-0@@ -21,6 +23,9 @@ #define COMPRESSION_OFFSET 229 #define FPGA_TIMEOUT_MSEC 1000 /* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 +#define DEFAULT_DDR_LOAD_ADDRESS 0x400 + +DECLARE_GLOBAL_DATA_PTR ;
static const structsocfpga_fpga_manager*fpga_manager_base= (void *)SOCFPGA_FPGAMGRREGS_ADDRESS;drivers/fpga/socfpga_arria10.c +0
-0@@ -64,7 +69,7 @@ static int wait_for_user_mode(void)
Quoted 8 lines
drivers/fpga/socfpga_arria10.c static int wait_for_user_mode(void) · line 72
Quoted 5 lines
drivers/fpga/socfpga_arria10.c +0
-01, FPGA_TIMEOUT_MSEC, false); }drivers/fpga/socfpga_arria10.c +1
-1-static int is_fpgamgr_early_user_mode (void ) +int is_fpgamgr_early_user_mode (void )This is called inside the same file that's why no reason for this change.
Maybe you are using that later but it just suggest incorrect split.
This is part of complete fpga driver that was accepted long time ago, and now we just submitted the complete fpga driver. I have no strong opinion about this.
Marek, what do you think?
Quoted 70 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_wait_early_user_mode(void) · line 102
Quoted 13 lines
{
return (readl(&fpga_manager_base->imgcfg_stat)&ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK) != 0;drivers/fpga/socfpga_arria10.c +0
-0@@ -94,7 +99,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);it should be separate patch.
Quoted 18 lines
/* restoring original CDRATIO */
fpgamgr_set_cd_ratio(cd_ratio);drivers/fpga/socfpga_arria10.c +0
-0@@ -172,9 +177,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=%dcompress=%d.\n", encrypt,
drivers/fpga/socfpga_arria10.c static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data, · line 183
Quoted 1 line
drivers/fpga/socfpga_arria10.c +1
-0+ compress);separate patch - just disturbing reviewers and you are not saying nothing about it in commit message.
Quoted 19 lines
/*
* from the register map description of cdratio inimgcfg_ctrl_02:drivers/fpga/socfpga_arria10.c +0
-0@@ -359,6 +365,7 @@ static int fpgamgr_program_poll_cd(void)
printf("nstatus == 0 while waiting for condone\n");
return-EPERM;
}drivers/fpga/socfpga_arria10.c +1
-0+WATCHDOG_RESET ();}
if (i ==FPGA_TIMEOUT_CNT)drivers/fpga/socfpga_arria10.c +0
-0@@ -432,7 +439,6 @@ int fpgamgr_program_finish(void)
printf("FPGA: Poll CD failed with error code %d\n", status);
return-EPERM;
}drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 435
Quoted 1 line
drivers/fpga/socfpga_arria10.c +0
-1-WATCHDOG_RESET ();These two looks like separate patch too.
Quoted 11 lines
/* Ensure the FPGA entering user mode */
status =fpgamgr_program_poll_usermode();drivers/fpga/socfpga_arria10.c +0
-0@@ -447,27 +453,512 @@ int fpgamgr_program_finish(void) return 0; }
-/*
- * FPGA Manager to program the FPGA. This is the interface used by FPGA driver.
Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 460
Quoted 7 lines
- * Return 0 for sucess, non-zero for error.
- */drivers/fpga/socfpga_arria10.c +5
-0+ofnode get_fpga_mgr_ofnode (void ) +{ +int node_offset; + + fdtdec_find_aliases_for_id(gd->fdt_blob, "fpga_mgr",nit: using of live functions would be better to get rid of gd->.
Are you means using ofnode?
Quoted 85 lines
Quoted 85 lines
drivers/fpga/socfpga_arria10.c +32
-0+COMPAT_ALTERA_SOCFPGA_FPGA0 , + &node_offset, 1); + +return offset_to_ofnode (node_offset); +} + +const char *get_fpga_filename (const void *fdt,int *len) +{ +const char *fpga_filename =NULL ; + +ofnode fpgamgr_node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (fpgamgr_node)) + fpga_filename =ofnode_read_string (fpgamgr_node, +"altr,bitstream" ); + +return fpga_filename; +} + +static void get_rbf_image_info (struct rbf_info *rbf,u16 *buffer) +{ +/* +* Magic ID starting at: +* -> 1st dword[15:0] in periph.rbf +* -> 2nd dword[15:0] in core.rbf +* Note: dword == 32 bits +*/ +u32 word_reading_max =2 ; +u32 i; + +for (i =0 ; i < word_reading_max; i++) { + if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_UNENCRYPTED) {drivers/fpga/socfpga_arria10.c +2
-0+ rbf->security = unencrypted; + } else if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_ENCRYPTED) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->security = encrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_UNENCRYPTED ){
drivers/fpga/socfpga_arria10.c +12
-0+ rbf->security = unencrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_ENCRYPTED ) { + rbf->security = encrypted; + }else { + rbf->security = invalid; +continue ; + } + +/* PERIPH RBF(buffer + i + 1), CORE RBF(buffer + i +2) */ + if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = core_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +14
-0+ rbf->section = core_section; +break ; + } + + rbf->section = unknown; +break ; + +WATCHDOG_RESET (); + } +} + +#ifdef CONFIG_FS_LOADER +static int first_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c +3
-0+ u32 *buffer, size_t *buffer_bsize) +{ +u32 *buffer_p = (u32 *)*buffer;
Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 541
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 *loadable = buffer_p; +size_t buffer_size = *buffer_bsize; +size_t fit_size; +int ret, i, count; +int confs_noffset, images_noffset; +int rbf_offset; +int rbf_size;put them on the same line.
sure.
Quoted 38 lines
Quoted 38 lines
drivers/fpga/socfpga_arria10.c +6
-0+const char *fpga_node_name =NULL ; +const char *uname =NULL ; + +/* Load image header into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +2
-0+ buffer_p, + sizeof(struct
image_header),drivers/fpga/socfpga_arria10.c +3
-0+ 0); +if (ret <0 ) { + debug("FPGA: Failed to read image header fromflash.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + if (image_get_magic((struct image_header *)buffer_p) !=
FDT_MAGIC) {drivers/fpga/socfpga_arria10.c +8
-0+debug ("FPGA: No FDT magic was found.\n" ); +return -EBADF ; + } + + fit_size =fdt_totalsize (buffer_p); + +if (fit_size > buffer_size) { + debug("FPGA: FIT image is larger than availablebuffer.\n");
drivers/fpga/socfpga_arria10.c +1
-0+ debug("Please use FIT external data or increasingbuffer.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return -ENOMEM ; + } + +/* Load entire FIT into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-
Quoted 5 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 574
Quoted 4 lines
Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +3
-0+ buffer_p, + fit_size, + 0);nit: better buffer_p,
fit_size, 0);
sure.
Quoted 5 lines
Quoted 4 lines
+
nit: remove empty line above
sure.
Quoted 26 lines
Quoted 26 lines
drivers/fpga/socfpga_arria10.c +11
-0+if (ret <0 ) +return ret; + + ret =fit_check_format (buffer_p); +if (!ret) { +debug ("FPGA: No valid FIT image was found.\n" ); +return -EBADF ; + } + + confs_noffset =fdt_path_offset (buffer_p,FIT_CONFS_PATH ); + images_noffset = fdt_path_offset(buffer_p,
FIT_IMAGES_PATH);drivers/fpga/socfpga_arria10.c +2
-0+if (confs_noffset <0 || images_noffset <0 ) { + debug("FPGA: No Configurations or images nodeswere found.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + +/* Get default configuration unit name from default property */
drivers/fpga/socfpga_arria10.c +3
-0+ confs_noffset =fit_conf_get_node (buffer_p,NULL ); +if (confs_noffset <0 ) { + debug("FPGA: No default configuration was found inconfig.\n");
Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 601
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + count = fit_conf_get_prop_node_count(buffer_p,
confs_noffset,drivers/fpga/socfpga_arria10.c +2
-0+ FIT_FPGA_PROP); +nit: remove empty line.
sure.
Quoted 196 lines
Quoted 196 lines
drivers/fpga/socfpga_arria10.c +2
-0+if (count <0 ) { + debug("FPGA: Invalid configuration format for FPGAnode.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return count; + } +debug ("FPGA: FPGA node count: %d\n" , count); + +for (i =0 ; i < count; i++) { + images_noffset =fit_conf_get_prop_node_index(buffer_p,
drivers/fpga/socfpga_arria10.c +1
-0+ confs
_noffset,drivers/fpga/socfpga_arria10.c +1
-0+ FIT_F
PGA_PROP, i);drivers/fpga/socfpga_arria10.c +1
-0+ uname = fit_get_name(buffer_p, images_noffset,NULL);
drivers/fpga/socfpga_arria10.c +9
-0+if (uname) { +debug ("FPGA: %s\n" , uname); + +if (strstr (uname,"fpga-periph" ) && + (!is_fpgamgr_early_user_mode () || +is_fpgamgr_user_mode ())) { + fpga_node_name = uname; +printf ("FPGA: Start to program " ); + printf("peripheral/full bitstream...\n");
drivers/fpga/socfpga_arria10.c +3
-0+break ; + } else if (strstr(uname, "fpga-core") && + (is_fpgamgr_early_user_mod
e()&&drivers/fpga/socfpga_arria10.c +1
-0+ !is_fpgamgr_user_mode())){
drivers/fpga/socfpga_arria10.c +2
-0+ fpga_node_name = uname; + printf("FPGA: Start to programcore ");
drivers/fpga/socfpga_arria10.c +9
-0+printf ("bitstream ...\n" ); +break ; + } + } +WATCHDOG_RESET (); + } + +if (!fpga_node_name) { + debug("FPGA: No suitable bitstream was found,count: %d.\n", i);
drivers/fpga/socfpga_arria10.c +4
-0+return 1 ; + } + + images_noffset = fit_image_get_node(buffer_p,
fpga_node_name);drivers/fpga/socfpga_arria10.c +10
-0+if (images_noffset <0 ) { +debug ("FPGA: No node '%s' was found in FIT.\n" , + fpga_node_name); +return -ENOENT ; + } + +if (!fit_image_get_data_position (buffer_p, images_noffset, + &rbf_offset)) { +debug ("FPGA: Data position was found.\n" ); + } else if (!fit_image_get_data_offset(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +7
-0+ &rbf_offset)) { +/* +* For FIT with external data, figure out where +* the external images start. This is the base +* for the data-offset properties in each image. +*/ + rbf_offset += ((fdt_totalsize(buffer_p) + 3) &~3);
drivers/fpga/socfpga_arria10.c +3
-0+debug ("FPGA: Data offset was found.\n" ); + }else { + debug("FPGA: No data position/offset wasfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + ret = fit_image_get_data_size(buffer_p, images_noffset,
&rbf_size);drivers/fpga/socfpga_arria10.c +2
-0+if (ret <0 ) { + debug("FPGA: No data size was found (err=%d).\n",ret);
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +if (gd->ram_size < rbf_size) { + debug("FPGA: Using default OCRAM buffer andsize.\n");
drivers/fpga/socfpga_arria10.c +5
-0+ }else { + ret =fit_image_get_load (buffer_p, images_noffset, + (ulong *)loadable); +if (ret <0 ) { + buffer_p = (u32*)DEFAULT_DDR_LOAD_ADDRESS;
drivers/fpga/socfpga_arria10.c +2
-0+debug ("FPGA: No loadable was found.\n" ); + debug("FPGA: Using default DDR loadaddress: 0x%x .\n",
drivers/fpga/socfpga_arria10.c +4
-0+ DEFAULT_DDR_LOAD_ADDRESS); + }else { + buffer_p = (u32 *)*loadable; + debug("FPGA: Found loadable address =0x%x.\n",
drivers/fpga/socfpga_arria10.c +7
-0+ *loadable); + } + + buffer_size = rbf_size; + } + + debug("FPGA: External data: offset = 0x%x, size =0x%x.\n",
drivers/fpga/socfpga_arria10.c +6
-0+ rbf_offset, rbf_size); + + fpga_loadfs->remaining = rbf_size; + +/* +* Determine buffer size vs bitstream size, and calculating number of
drivers/fpga/socfpga_arria10.c +1
-0+ * chunk by chunk transfer is required due to smallerbuffer size
drivers/fpga/socfpga_arria10.c +14
-0+* compare to bitstream +*/ +if (rbf_size <= buffer_size) { +/* Loading whole bitstream into buffer */ + buffer_size = rbf_size; + fpga_loadfs->remaining =0 ; + }else { + fpga_loadfs->remaining -= buffer_size; + } + + fpga_loadfs->offset = rbf_offset; +/* Loading bitstream into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + buffer_size, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +/* Getting info about bitstream types */ + get_rbf_image_info(&fpga_loadfs->rbfinfo, (u16*)buffer_p);
drivers/fpga/socfpga_arria10.c +8
-0+ +/* Update next reading bitstream offset */ + fpga_loadfs->offset += buffer_size; + +/* Update the final addr for bitstream */ + *buffer = (u32 )buffer_p; + +/* Update the size of bitstream to be programmed into FPGA */
drivers/fpga/socfpga_arria10.c +7
-0+ *buffer_bsize = buffer_size; + +return 0 ; +} + +static int subsequent_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c +1
-0+u32 *buffer, size_t
*buffer_bsize)drivers/fpga/socfpga_arria10.c +14
-0+{ +int ret =0 ; +u32 *buffer_p = (u32 *)*buffer; + +/* Read the bitstream chunk by chunk. */ +if (fpga_loadfs->remaining > *buffer_bsize) { + fpga_loadfs->remaining -= *buffer_bsize; + }else { + *buffer_bsize = fpga_loadfs->remaining; + fpga_loadfs->remaining =0 ; + } + + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + *buffer_bsize, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +9
-0+return -ENOENT ; + } + +/* Update next reading bitstream offset */ + fpga_loadfs->offset += *buffer_bsize; + +return 0 ; +} +
Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 770
Quoted 7 lines
+int socfpga_loadfs(fpga_fs_info
*fpga_fsinfo, const void *buf,size_tbsize,drivers/fpga/socfpga_arria10.c +5
-0+ u32 offset) +{ +struct fpga_loadfs_info fpga_loadfs; +int status =0 ; +int ret =0 ;no reason to initiate here.
sure.
Quoted 10 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 777
Quoted 9 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 buffer = (uintptr_t )buf; +size_t buffer_sizebytes = bsize; +size_t buffer_sizebytes_ori = bsize; +size_t total_sizeof_image =0 ; +struct udevice *dev; +ofnode node; +int size;another int - just put them on the same line.
sure.
Quoted 62 lines
Quoted 62 lines
drivers/fpga/socfpga_arria10.c +7
-0+const fdt32_t *phandle_p; +u32 phandle; + + node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (node)) { + phandle_p = ofnode_get_property(node, "firmware-loader", &size);
drivers/fpga/socfpga_arria10.c +4
-0+if (phandle_p) { + node =ofnode_path ("/chosen" ); +if (!ofnode_valid (node)) { + debug("FPGA: /chosen node was notfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + phandle_p = ofnode_get_property(node,"firmware-loader",
drivers/fpga/socfpga_arria10.c +3
-0+ &size); +if (!phandle_p) { + debug("FPGA: firmware-loaderproperty was not");
drivers/fpga/socfpga_arria10.c +11
-0+debug (" found.\n" ); +return -ENOENT ; + } + } + }else { +debug ("FPGA: FPGA manager node was not found.\n" ); +return -ENOENT ; + } + + phandle =fdt32_to_cpu (*phandle_p); + ret =uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER,
drivers/fpga/socfpga_arria10.c +13
-0+ phandle, &dev); +if (ret) +return ret; + +memset (&fpga_loadfs,0 ,sizeof (fpga_loadfs)); + + fpga_loadfs.fpga_fsinfo = fpga_fsinfo; + fpga_loadfs.offset = offset; + +printf ("FPGA: Checking FPGA configuration setting ...\n" ); + +/* +* Note: Both buffer and buffer_sizebytes values can be altered by
drivers/fpga/socfpga_arria10.c +3
-0+* function below. +*/ + ret = first_loading_rbf_to_buffer(dev, &fpga_loadfs,&buffer,
drivers/fpga/socfpga_arria10.c +8
-0+ &buffer_sizebytes); +if (ret ==1 ) { +printf ("FPGA: Skipping configuration ...\n" ); +return 0 ; + }else if (ret) { +return ret; + } +
Quoted 8 lines
drivers/fpga/socfpga_arria10.c
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +2
-0+ if (fpga_loadfs.rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in Early Release mode toprogram ");
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;This doesn't look like pass. 0 means pass but it should fail.
This is for supporting our specific use case.
Quoted 141 lines
Quoted 119 lines
drivers/fpga/socfpga_arria10.c +3
-0+ } + +/* Disable all signals from HPS peripheral controller to FPGA */
drivers/fpga/socfpga_arria10.c +3
-0+writel (0 , &system_manager_base->fpgaintf_en_global); + +/* Disable all axi bridges (hps2fpga, lwhps2fpga & fpga2hps) */
drivers/fpga/socfpga_arria10.c +5
-0+socfpga_bridges_reset (); + +if (fpga_loadfs.rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)buffer,
buffer_sizebytes);drivers/fpga/socfpga_arria10.c +2
-0+if (status) { + debug("FPGA: Init with peripheralbitstream failed.\n");
drivers/fpga/socfpga_arria10.c +12
-0+return -EPERM ; + } + } + +/* Transfer bitstream to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, buffer_sizebytes); + + total_sizeof_image += buffer_sizebytes; + +while (fpga_loadfs.remaining) { + ret =subsequent_loading_rbf_to_buffer (dev, + &fpga_loadfs,
drivers/fpga/socfpga_arria10.c +2
-0+ &buffer, + &buffer_si
zebytes_ori);drivers/fpga/socfpga_arria10.c +15
-0+ +if (ret) +return ret; + +/* Transfer data to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, + buffer_sizebytes_ori); + + total_sizeof_image += buffer_sizebytes_ori; + +WATCHDOG_RESET (); + } + +if (fpga_loadfs.rbfinfo.section == periph_section) { +if (fpgamgr_wait_early_user_mode () != -ETIMEDOUT ){
drivers/fpga/socfpga_arria10.c +4
-0+config_pins (gd->fdt_blob,"shared" ); +puts ("FPGA: Early Release Succeeded.\n" ); + }else { + debug("FPGA: Failed to see EarlyRelease.\n");
drivers/fpga/socfpga_arria10.c +23
-0+return -EIO ; + } + +/* For monolithic bitstream */ +if (is_fpgamgr_user_mode ()) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + }else if (fpga_loadfs.rbfinfo.section == core_section) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + }else { + debug("FPGA: Config Error: Unsupported bitstreamtype.\n");
drivers/fpga/socfpga_arria10.c +12
-0+return -ENOEXEC ; + } + +return (int )total_sizeof_image; +} + +void fpgamgr_program (const void *buf,size_t bsize,u32 offset) +{ +fpga_fs_info fpga_fsinfo; +int len; + + fpga_fsinfo.filename = get_fpga_filename(gd->fdt_blob,&len);
drivers/fpga/socfpga_arria10.c +7
-0+ +if (fpga_fsinfo.filename) + socfpga_loadfs(&fpga_fsinfo, buf, bsize, offset); +} +#endif + +/* This function is used to load the core bitstream from the OCRAM. */
intsocfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
{drivers/fpga/socfpga_arria10.c +4
-1-int status; +unsigned long status; +struct rbf_info rbfinfo; + +memset (&rbfinfo,0 ,sizeof (rbfinfo));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 & Quoted 1 line
fpga2hps) */
separate changes.
Quoted 19 lines
socfpga_bridges_reset();drivers/fpga/socfpga_arria10.c +2
-4-/* Initialize the FPGA Manager */ - status =fpgamgr_program_init ((u32 *)rbf_data, rbf_size); -if (status) -return status; +/* Getting info about bitstream types */ +get_rbf_image_info (&rbfinfo, (u16 *)rbf_data);drivers/fpga/socfpga_arria10.c +3
-1-/* Write the RBF data to FPGA Manager */ +if (rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)rbf_data,
rbf_size);drivers/fpga/socfpga_arria10.c +4
-0+if (status) +return status; + } +
Quoted 8 lines
drivers/fpga/socfpga_arria10.c
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +2
-0+ if (rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in early release mode toprogram ");
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;0 is supposed to be pass. This looks like a fail.
This is for supporting our specific use case.
Quoted 39 lines
Quoted 24 lines
drivers/fpga/socfpga_arria10.c +3
-0+ } + +/* Write the bitstream to FPGA Manager */
fpgamgr_program_write(rbf_data, rbf_size);drivers/fpga/socfpga_arria10.c +7
-1-return fpgamgr_program_finish (); + status =fpgamgr_program_finish (); +if (status) { +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + +return status;}
include/image.h +0
-0@@ -1041,6 +1041,10 @@ int fit_check_format(const void *fit);
intfit_conf_find_compat(const void *fit, const void *fdt); intfit_conf_get_node(const void *fit, const char *conf_uname);include/image.h int fit_check_format(const void *fit); · line 1047
Quoted 4 lines
include/image.h +4
-0+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);This should be separate patch.
Quoted 6 lines
/**
*fit_conf_get_prop_node()- Get node refered to by a configurationM
PATCH v9 3/7 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
Quoted 902 lines · Tien Fong
Quoted 43 lines · Michal Simek
Quoted 42 lines · 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v9
- Support data offset
- Added default DDR load address
- Squashed theimage.h
- Changed to phandle
- Ensure the DDR is fully up running by checking thegd->ramchanges 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 | 40 +- drivers/fpga/socfpga_arria10.c | 533
++++++++++++++++++++-
include/image.h | 4 +4 files changed, 571 insertions(+), 23 deletions(-)Quoted 16 lines
Quoted 9 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +0
-0@@ -18,6 +18,23 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi"arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 26
Quoted 6 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +6
-0+/ { + chosen { + firmware-loader = <&fs_loader0>; + }; + + fs_loader0: fs-loader at 0 {again @0 without reg properly is wrong.
Mind to explain more?
Quoted 134 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 30
Quoted 6 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +4
-0+ u-boot,dm-pre-reloc; + compatible = "u-boot,fs-loader"; + phandlepart = <&mmc 1>; + };I think that this will be nacked by DT guys.
Quoted 126 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +7
-0+}; + +&fpga_mgr { + u-boot,dm-pre-reloc; + altr,bitstream = "fit_spl_fpga.itb"; +}; +&mmc {
u-boot,dm-pre-reloc;
status = "okay";(quoted diff) +0
-0
socfpga/include/mach/fpga_manager_arria10.hb/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 09d13f6..7a4f723 100644arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +1
-1@@ -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. */ arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#include <asm/cache.h> +#include <altera.h> +#include <image.h> +#ifndef _FPGA_MANAGER_ARRIA10_H_
#define _FPGA_MANAGER_ARRIA10_H_arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -51,6 +55,10 @@ #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK BIT(24) #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB16
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#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__
structsocfpga_fpga_manager{arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -88,12 +96,40 @@ struct socfpga_fpga_manager { u32 imgcfg_fifo_status; };arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +24
-0+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 */
intfpgamgr_program_init(u32 * rbf_data, size_t rbf_size); intfpgamgr_program_finish(void);
intis_fpgamgr_user_mode(void);
intfpgamgr_wait_early_user_mode(void);arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +3
-1- +int is_fpgamgr_early_user_mode (void ); +const char *get_fpga_filename (const void *fdt,int *len); +int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf,
size_tbsize,arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +2
-0+ 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 +4
-2@@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2017 Intel Corporation <www.intel.com> + * Copyright (C) 2017-2019 Intel Corporation <www.intel.com> */ - #include <asm/io.h> #include <asm/arch/fpga_manager.h> #include <asm/arch/reset_manager.h>@@ -10,8 +9,11 @@ #include <asm/arch/sdram.h> #include <asm/arch/misc.h> #include <altera.h> +#include <asm/arch/pinmux.h> #include <common.h> +#include <dm/ofnode.h> #include <errno.h> +#include <fs_loader.h> #include <wait_bit.h> #include <watchdog.h>drivers/fpga/socfpga_arria10.c +3
-0@@ -21,6 +23,9 @@ #define COMPRESSION_OFFSET 229 #define FPGA_TIMEOUT_MSEC 1000 /* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 +#define DEFAULT_DDR_LOAD_ADDRESS 0x400 + +DECLARE_GLOBAL_DATA_PTR ;
static const structsocfpga_fpga_manager*fpga_manager_base= (void *)SOCFPGA_FPGAMGRREGS_ADDRESS;drivers/fpga/socfpga_arria10.c +0
-0@@ -64,7 +69,7 @@ static int wait_for_user_mode(void)Quoted 8 lines
drivers/fpga/socfpga_arria10.c static int wait_for_user_mode(void) · line 72
Quoted 5 lines
drivers/fpga/socfpga_arria10.c +0
-01, FPGA_TIMEOUT_MSEC, false); }drivers/fpga/socfpga_arria10.c +1
-1-static int is_fpgamgr_early_user_mode (void ) +int is_fpgamgr_early_user_mode (void )This is called inside the same file that's why no reason for this change.
Maybe you are using that later but it just suggest incorrect split.This is part of complete fpga driver that was accepted long time ago, and now we just submitted the complete fpga driver. I have no strong opinion about this.
Marek, what do you think?
Quoted 70 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_wait_early_user_mode(void) · line 102
Quoted 13 lines
{
return (readl(&fpga_manager_base->imgcfg_stat)&ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK) != 0;drivers/fpga/socfpga_arria10.c +0
-0@@ -94,7 +99,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);it should be separate patch.
Quoted 18 lines
/* restoring original CDRATIO */
fpgamgr_set_cd_ratio(cd_ratio);drivers/fpga/socfpga_arria10.c +0
-0@@ -172,9 +177,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=%dcompress=%d.\n", encrypt,
drivers/fpga/socfpga_arria10.c static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data, · line 183
Quoted 1 line
drivers/fpga/socfpga_arria10.c +1
-0+ compress);separate patch - just disturbing reviewers and you are not saying nothing about it in commit message.
Quoted 19 lines
/*
* from the register map description of cdratio inimgcfg_ctrl_02:drivers/fpga/socfpga_arria10.c +0
-0@@ -359,6 +365,7 @@ static int fpgamgr_program_poll_cd(void)
printf("nstatus == 0 while waiting for condone\n");
return-EPERM;
}drivers/fpga/socfpga_arria10.c +1
-0+WATCHDOG_RESET ();}
if (i ==FPGA_TIMEOUT_CNT)drivers/fpga/socfpga_arria10.c +0
-0@@ -432,7 +439,6 @@ int fpgamgr_program_finish(void)
printf("FPGA: Poll CD failed with error code %d\n", status);
return-EPERM;
}drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 435
Quoted 1 line
drivers/fpga/socfpga_arria10.c +0
-1-WATCHDOG_RESET ();These two looks like separate patch too.
Quoted 11 lines
/* Ensure the FPGA entering user mode */
status =fpgamgr_program_poll_usermode();drivers/fpga/socfpga_arria10.c +0
-0@@ -447,27 +453,512 @@ int fpgamgr_program_finish(void) return 0; }
-/*
- * FPGA Manager to program the FPGA. This is the interface used by FPGA driver.Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 460
Quoted 7 lines
- * Return 0 for sucess, non-zero for error.
- */drivers/fpga/socfpga_arria10.c +5
-0+ofnode get_fpga_mgr_ofnode (void ) +{ +int node_offset; + + fdtdec_find_aliases_for_id(gd->fdt_blob, "fpga_mgr",nit: using of live functions would be better to get rid of gd->.
Are you means using ofnode?
Quoted 85 lines
Quoted 85 lines
drivers/fpga/socfpga_arria10.c +32
-0+COMPAT_ALTERA_SOCFPGA_FPGA0 , + &node_offset, 1); + +return offset_to_ofnode (node_offset); +} + +const char *get_fpga_filename (const void *fdt,int *len) +{ +const char *fpga_filename =NULL ; + +ofnode fpgamgr_node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (fpgamgr_node)) + fpga_filename =ofnode_read_string (fpgamgr_node, +"altr,bitstream" ); + +return fpga_filename; +} + +static void get_rbf_image_info (struct rbf_info *rbf,u16 *buffer) +{ +/* +* Magic ID starting at: +* -> 1st dword[15:0] in periph.rbf +* -> 2nd dword[15:0] in core.rbf +* Note: dword == 32 bits +*/ +u32 word_reading_max =2 ; +u32 i; + +for (i =0 ; i < word_reading_max; i++) { + if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_UNENCRYPTED) {drivers/fpga/socfpga_arria10.c +2
-0+ rbf->security = unencrypted; + } else if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_ENCRYPTED) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->security = encrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_UNENCRYPTED ){
drivers/fpga/socfpga_arria10.c +12
-0+ rbf->security = unencrypted; + }else if (*(buffer + i +1 ) == +FPGA_SOCFPGA_A10_RBF_ENCRYPTED ) { + rbf->security = encrypted; + }else { + rbf->security = invalid; +continue ; + } + +/* PERIPH RBF(buffer + i + 1), CORE RBF(buffer + i +2) */ + if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = core_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +14
-0+ rbf->section = core_section; +break ; + } + + rbf->section = unknown; +break ; + +WATCHDOG_RESET (); + } +} + +#ifdef CONFIG_FS_LOADER +static int first_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c +3
-0+ u32 *buffer, size_t *buffer_bsize) +{ +u32 *buffer_p = (u32 *)*buffer;Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 541
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 *loadable = buffer_p; +size_t buffer_size = *buffer_bsize; +size_t fit_size; +int ret, i, count; +int confs_noffset, images_noffset; +int rbf_offset; +int rbf_size;put them on the same line.
sure.
Quoted 38 lines
Quoted 38 lines
drivers/fpga/socfpga_arria10.c +6
-0+const char *fpga_node_name =NULL ; +const char *uname =NULL ; + +/* Load image header into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +2
-0+ buffer_p, + sizeof(struct
image_header),drivers/fpga/socfpga_arria10.c +3
-0+ 0); +if (ret <0 ) { + debug("FPGA: Failed to read image header fromflash.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + if (image_get_magic((struct image_header *)buffer_p) !=
FDT_MAGIC) {drivers/fpga/socfpga_arria10.c +8
-0+debug ("FPGA: No FDT magic was found.\n" ); +return -EBADF ; + } + + fit_size =fdt_totalsize (buffer_p); + +if (fit_size > buffer_size) { + debug("FPGA: FIT image is larger than availablebuffer.\n");
drivers/fpga/socfpga_arria10.c +1
-0+ debug("Please use FIT external data or increasingbuffer.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return -ENOMEM ; + } + +/* Load entire FIT into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 5 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 574
Quoted 4 lines
Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +3
-0+ buffer_p, + fit_size, + 0);nit: better buffer_p,
fit_size, 0);sure.
Quoted 5 lines
Quoted 4 lines
+
nit: remove empty line above
sure.
Quoted 26 lines
Quoted 26 lines
drivers/fpga/socfpga_arria10.c +11
-0+if (ret <0 ) +return ret; + + ret =fit_check_format (buffer_p); +if (!ret) { +debug ("FPGA: No valid FIT image was found.\n" ); +return -EBADF ; + } + + confs_noffset =fdt_path_offset (buffer_p,FIT_CONFS_PATH ); + images_noffset = fdt_path_offset(buffer_p,
FIT_IMAGES_PATH);drivers/fpga/socfpga_arria10.c +2
-0+if (confs_noffset <0 || images_noffset <0 ) { + debug("FPGA: No Configurations or images nodeswere found.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + +/* Get default configuration unit name from default property */
drivers/fpga/socfpga_arria10.c +3
-0+ confs_noffset =fit_conf_get_node (buffer_p,NULL ); +if (confs_noffset <0 ) { + debug("FPGA: No default configuration was found inconfig.\n");
Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 601
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + count = fit_conf_get_prop_node_count(buffer_p,
confs_noffset,drivers/fpga/socfpga_arria10.c +2
-0+ FIT_FPGA_PROP); +nit: remove empty line.
sure.
Quoted 196 lines
Quoted 196 lines
drivers/fpga/socfpga_arria10.c +2
-0+if (count <0 ) { + debug("FPGA: Invalid configuration format for FPGAnode.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return count; + } +debug ("FPGA: FPGA node count: %d\n" , count); + +for (i =0 ; i < count; i++) { + images_noffset =fit_conf_get_prop_node_index(buffer_p,
drivers/fpga/socfpga_arria10.c +1
-0+ confs
_noffset,drivers/fpga/socfpga_arria10.c +1
-0+ FIT_F
PGA_PROP, i);drivers/fpga/socfpga_arria10.c +1
-0+ uname = fit_get_name(buffer_p, images_noffset,NULL);
drivers/fpga/socfpga_arria10.c +9
-0+if (uname) { +debug ("FPGA: %s\n" , uname); + +if (strstr (uname,"fpga-periph" ) && + (!is_fpgamgr_early_user_mode () || +is_fpgamgr_user_mode ())) { + fpga_node_name = uname; +printf ("FPGA: Start to program " ); + printf("peripheral/full bitstream...\n");
drivers/fpga/socfpga_arria10.c +3
-0+break ; + } else if (strstr(uname, "fpga-core") && + (is_fpgamgr_early_user_mod
e()&&drivers/fpga/socfpga_arria10.c +1
-0+ !is_fpgamgr_user_mode())){
drivers/fpga/socfpga_arria10.c +2
-0+ fpga_node_name = uname; + printf("FPGA: Start to programcore ");
drivers/fpga/socfpga_arria10.c +9
-0+printf ("bitstream ...\n" ); +break ; + } + } +WATCHDOG_RESET (); + } + +if (!fpga_node_name) { + debug("FPGA: No suitable bitstream was found,count: %d.\n", i);
drivers/fpga/socfpga_arria10.c +4
-0+return 1 ; + } + + images_noffset = fit_image_get_node(buffer_p,
fpga_node_name);drivers/fpga/socfpga_arria10.c +10
-0+if (images_noffset <0 ) { +debug ("FPGA: No node '%s' was found in FIT.\n" , + fpga_node_name); +return -ENOENT ; + } + +if (!fit_image_get_data_position (buffer_p, images_noffset, + &rbf_offset)) { +debug ("FPGA: Data position was found.\n" ); + } else if (!fit_image_get_data_offset(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +7
-0+ &rbf_offset)) { +/* +* For FIT with external data, figure out where +* the external images start. This is the base +* for the data-offset properties in each image. +*/ + rbf_offset += ((fdt_totalsize(buffer_p) + 3) &~3);
drivers/fpga/socfpga_arria10.c +3
-0+debug ("FPGA: Data offset was found.\n" ); + }else { + debug("FPGA: No data position/offset wasfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + ret = fit_image_get_data_size(buffer_p, images_noffset,
&rbf_size);drivers/fpga/socfpga_arria10.c +2
-0+if (ret <0 ) { + debug("FPGA: No data size was found (err=%d).\n",ret);
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +if (gd->ram_size < rbf_size) { + debug("FPGA: Using default OCRAM buffer andsize.\n");
drivers/fpga/socfpga_arria10.c +5
-0+ }else { + ret =fit_image_get_load (buffer_p, images_noffset, + (ulong *)loadable); +if (ret <0 ) { + buffer_p = (u32*)DEFAULT_DDR_LOAD_ADDRESS;
drivers/fpga/socfpga_arria10.c +2
-0+debug ("FPGA: No loadable was found.\n" ); + debug("FPGA: Using default DDR loadaddress: 0x%x .\n",
drivers/fpga/socfpga_arria10.c +4
-0+ DEFAULT_DDR_LOAD_ADDRESS); + }else { + buffer_p = (u32 *)*loadable; + debug("FPGA: Found loadable address =0x%x.\n",
drivers/fpga/socfpga_arria10.c +7
-0+ *loadable); + } + + buffer_size = rbf_size; + } + + debug("FPGA: External data: offset = 0x%x, size =0x%x.\n",
drivers/fpga/socfpga_arria10.c +6
-0+ rbf_offset, rbf_size); + + fpga_loadfs->remaining = rbf_size; + +/* +* Determine buffer size vs bitstream size, and calculating number of
drivers/fpga/socfpga_arria10.c +1
-0+ * chunk by chunk transfer is required due to smallerbuffer size
drivers/fpga/socfpga_arria10.c +14
-0+* compare to bitstream +*/ +if (rbf_size <= buffer_size) { +/* Loading whole bitstream into buffer */ + buffer_size = rbf_size; + fpga_loadfs->remaining =0 ; + }else { + fpga_loadfs->remaining -= buffer_size; + } + + fpga_loadfs->offset = rbf_offset; +/* Loading bitstream into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + buffer_size, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +/* Getting info about bitstream types */ + get_rbf_image_info(&fpga_loadfs->rbfinfo, (u16*)buffer_p);
drivers/fpga/socfpga_arria10.c +8
-0+ +/* Update next reading bitstream offset */ + fpga_loadfs->offset += buffer_size; + +/* Update the final addr for bitstream */ + *buffer = (u32 )buffer_p; + +/* Update the size of bitstream to be programmed into FPGA */
drivers/fpga/socfpga_arria10.c +7
-0+ *buffer_bsize = buffer_size; + +return 0 ; +} + +static int subsequent_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c +1
-0+u32 *buffer, size_t
*buffer_bsize)drivers/fpga/socfpga_arria10.c +14
-0+{ +int ret =0 ; +u32 *buffer_p = (u32 *)*buffer; + +/* Read the bitstream chunk by chunk. */ +if (fpga_loadfs->remaining > *buffer_bsize) { + fpga_loadfs->remaining -= *buffer_bsize; + }else { + *buffer_bsize = fpga_loadfs->remaining; + fpga_loadfs->remaining =0 ; + } + + ret = request_firmware_into_buf(dev, + fpga_loadfs->fpga_fsinfo-Quoted 1 line
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + *buffer_bsize, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +9
-0+return -ENOENT ; + } + +/* Update next reading bitstream offset */ + fpga_loadfs->offset += *buffer_bsize; + +return 0 ; +} +Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 770
Quoted 7 lines
+int socfpga_loadfs(fpga_fs_info
*fpga_fsinfo, const void *buf,size_tbsize,drivers/fpga/socfpga_arria10.c +5
-0+ u32 offset) +{ +struct fpga_loadfs_info fpga_loadfs; +int status =0 ; +int ret =0 ;no reason to initiate here.
sure.
Quoted 10 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 777
Quoted 9 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 buffer = (uintptr_t )buf; +size_t buffer_sizebytes = bsize; +size_t buffer_sizebytes_ori = bsize; +size_t total_sizeof_image =0 ; +struct udevice *dev; +ofnode node; +int size;another int - just put them on the same line.
sure.
Quoted 62 lines
Quoted 62 lines
drivers/fpga/socfpga_arria10.c +7
-0+const fdt32_t *phandle_p; +u32 phandle; + + node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (node)) { + phandle_p = ofnode_get_property(node, "firmware-loader", &size);
drivers/fpga/socfpga_arria10.c +4
-0+if (phandle_p) { + node =ofnode_path ("/chosen" ); +if (!ofnode_valid (node)) { + debug("FPGA: /chosen node was notfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + phandle_p = ofnode_get_property(node,"firmware-loader",
drivers/fpga/socfpga_arria10.c +3
-0+ &size); +if (!phandle_p) { + debug("FPGA: firmware-loaderproperty was not");
drivers/fpga/socfpga_arria10.c +11
-0+debug (" found.\n" ); +return -ENOENT ; + } + } + }else { +debug ("FPGA: FPGA manager node was not found.\n" ); +return -ENOENT ; + } + + phandle =fdt32_to_cpu (*phandle_p); + ret =uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER,
drivers/fpga/socfpga_arria10.c +13
-0+ phandle, &dev); +if (ret) +return ret; + +memset (&fpga_loadfs,0 ,sizeof (fpga_loadfs)); + + fpga_loadfs.fpga_fsinfo = fpga_fsinfo; + fpga_loadfs.offset = offset; + +printf ("FPGA: Checking FPGA configuration setting ...\n" ); + +/* +* Note: Both buffer and buffer_sizebytes values can be altered by
drivers/fpga/socfpga_arria10.c +3
-0+* function below. +*/ + ret = first_loading_rbf_to_buffer(dev, &fpga_loadfs,&buffer,
drivers/fpga/socfpga_arria10.c +8
-0+ &buffer_sizebytes); +if (ret ==1 ) { +printf ("FPGA: Skipping configuration ...\n" ); +return 0 ; + }else if (ret) { +return ret; + } +Quoted 8 lines
drivers/fpga/socfpga_arria10.c
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +2
-0+ if (fpga_loadfs.rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in Early Release mode toprogram ");
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;This doesn't look like pass. 0 means pass but it should fail.
This is for supporting our specific use case.
Quoted 141 lines
Quoted 119 lines
drivers/fpga/socfpga_arria10.c +3
-0+ } + +/* Disable all signals from HPS peripheral controller to FPGA */
drivers/fpga/socfpga_arria10.c +3
-0+writel (0 , &system_manager_base->fpgaintf_en_global); + +/* Disable all axi bridges (hps2fpga, lwhps2fpga & fpga2hps) */
drivers/fpga/socfpga_arria10.c +5
-0+socfpga_bridges_reset (); + +if (fpga_loadfs.rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)buffer,
buffer_sizebytes);drivers/fpga/socfpga_arria10.c +2
-0+if (status) { + debug("FPGA: Init with peripheralbitstream failed.\n");
drivers/fpga/socfpga_arria10.c +12
-0+return -EPERM ; + } + } + +/* Transfer bitstream to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, buffer_sizebytes); + + total_sizeof_image += buffer_sizebytes; + +while (fpga_loadfs.remaining) { + ret =subsequent_loading_rbf_to_buffer (dev, + &fpga_loadfs,
drivers/fpga/socfpga_arria10.c +2
-0+ &buffer, + &buffer_si
zebytes_ori);drivers/fpga/socfpga_arria10.c +15
-0+ +if (ret) +return ret; + +/* Transfer data to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, + buffer_sizebytes_ori); + + total_sizeof_image += buffer_sizebytes_ori; + +WATCHDOG_RESET (); + } + +if (fpga_loadfs.rbfinfo.section == periph_section) { +if (fpgamgr_wait_early_user_mode () != -ETIMEDOUT ){
drivers/fpga/socfpga_arria10.c +4
-0+config_pins (gd->fdt_blob,"shared" ); +puts ("FPGA: Early Release Succeeded.\n" ); + }else { + debug("FPGA: Failed to see EarlyRelease.\n");
drivers/fpga/socfpga_arria10.c +23
-0+return -EIO ; + } + +/* For monolithic bitstream */ +if (is_fpgamgr_user_mode ()) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + }else if (fpga_loadfs.rbfinfo.section == core_section) { +/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + }else { + debug("FPGA: Config Error: Unsupported bitstreamtype.\n");
drivers/fpga/socfpga_arria10.c +12
-0+return -ENOEXEC ; + } + +return (int )total_sizeof_image; +} + +void fpgamgr_program (const void *buf,size_t bsize,u32 offset) +{ +fpga_fs_info fpga_fsinfo; +int len; + + fpga_fsinfo.filename = get_fpga_filename(gd->fdt_blob,&len);
drivers/fpga/socfpga_arria10.c +7
-0+ +if (fpga_fsinfo.filename) + socfpga_loadfs(&fpga_fsinfo, buf, bsize, offset); +} +#endif + +/* This function is used to load the core bitstream from the OCRAM. */
intsocfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
{drivers/fpga/socfpga_arria10.c +4
-1-int status; +unsigned long status; +struct rbf_info rbfinfo; + +memset (&rbfinfo,0 ,sizeof (rbfinfo));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 & Quoted 1 line
fpga2hps) */
separate changes.
Quoted 19 lines
socfpga_bridges_reset();drivers/fpga/socfpga_arria10.c +2
-4-/* Initialize the FPGA Manager */ - status =fpgamgr_program_init ((u32 *)rbf_data, rbf_size); -if (status) -return status; +/* Getting info about bitstream types */ +get_rbf_image_info (&rbfinfo, (u16 *)rbf_data);drivers/fpga/socfpga_arria10.c +3
-1-/* Write the RBF data to FPGA Manager */ +if (rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)rbf_data,
rbf_size);drivers/fpga/socfpga_arria10.c +4
-0+if (status) +return status; + } +Quoted 8 lines
drivers/fpga/socfpga_arria10.c
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +2
-0+ if (rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in early release mode toprogram ");
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;0 is supposed to be pass. This looks like a fail.
Quoted 1 line
This is for supporting our specific use case.
Still if you call this function what you want to load/program something and you are not able to do it, it should return reasonable return value. I would say error value.
Maybe you just need to improve that debug message to look more sensible.
M
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190226/2dc8f4d1/attachment.sig>
Chee
PATCH v9 3/7 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
Quoted 1,008 lines · Michal Simek
Quoted 1,007 lines · Tien Fong
Quoted 50 lines · Michal Simek
Quoted 48 lines · 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v9
- Support data offset
- Added default DDR load address
- Squashed theimage.h
- Changed to phandle
- Ensure the DDR is fully up running by checking thegd->ramchanges 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 | 40 +- drivers/fpga/socfpga_arria10.c | 533
++++++++++++++++++++-
include/image.h | 4 +4 files changed, 571 insertions(+), 23 deletions(-)Quoted 16 lines
Quoted 9 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +0
-0@@ -18,6 +18,23 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi"arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 26
Quoted 6 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +6
-0+/ { + chosen { + firmware-loader = <&fs_loader0>; + }; + + fs_loader0: fs-loader at 0 {again @0 without reg properly is wrong.
Mind to explain more?
Quoted 139 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 30
Quoted 8 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +4
-0+ u-boot,dm-pre-reloc; + compatible = "u-boot,fs-loader"; + phandlepart = <&mmc 1>; + };I think that this will be nacked by DT guys.
Quoted 129 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +7
-0+}; + +&fpga_mgr { + u-boot,dm-pre-reloc; + altr,bitstream = "fit_spl_fpga.itb"; +}; +&mmc {
u-boot,dm-pre-reloc;
status = "okay";(quoted diff) +0
-0
socfpga/include/mach/fpga_manager_arria10.hb/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 09d13f6..7a4f723 100644arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +1
-1@@ -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. */ arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#include <asm/cache.h> +#include <altera.h> +#include <image.h> +#ifndef _FPGA_MANAGER_ARRIA10_H_
#define _FPGA_MANAGER_ARRIA10_H_arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -51,6 +55,10 @@ #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK BIT(24) #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB16
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#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__
structsocfpga_fpga_manager{arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -88,12 +96,40 @@ struct socfpga_fpga_manager { u32 imgcfg_fifo_status; };arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +24
-0+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 */
intfpgamgr_program_init(u32 * rbf_data, size_t rbf_size); intfpgamgr_program_finish(void);
intis_fpgamgr_user_mode(void);
intfpgamgr_wait_early_user_mode(void);arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +3
-1- +int is_fpgamgr_early_user_mode (void ); +const char *get_fpga_filename (const void *fdt,int *len); +int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf,
size_tbsize,arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +2
-0+ u32 offset); +void fpgamgr_program(const void *buf, size_t bsize, u32offset);
#endif /*__ASSEMBLY__*/
#endif /* _FPGA_MANAGER_ARRIA10_H_ */drivers/fpga/socfpga_arria10.c +4
-2@@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2017 Intel Corporation <www.intel.com> + * Copyright (C) 2017-2019 Intel Corporation <www.intel.com> */ - #include <asm/io.h> #include <asm/arch/fpga_manager.h> #include <asm/arch/reset_manager.h>@@ -10,8 +9,11 @@ #include <asm/arch/sdram.h> #include <asm/arch/misc.h> #include <altera.h> +#include <asm/arch/pinmux.h> #include <common.h> +#include <dm/ofnode.h> #include <errno.h> +#include <fs_loader.h> #include <wait_bit.h> #include <watchdog.h>drivers/fpga/socfpga_arria10.c +3
-0@@ -21,6 +23,9 @@ #define COMPRESSION_OFFSET 229 #define FPGA_TIMEOUT_MSEC 1000 /* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 +#define DEFAULT_DDR_LOAD_ADDRESS 0x400 + +DECLARE_GLOBAL_DATA_PTR ;
static const structsocfpga_fpga_manager*fpga_manager_base= (void *)SOCFPGA_FPGAMGRREGS_ADDRESS;drivers/fpga/socfpga_arria10.c +0
-0@@ -64,7 +69,7 @@ static int wait_for_user_mode(void) 1, FPGA_TIMEOUT_MSEC, false);Quoted 8 lines
drivers/fpga/socfpga_arria10.c static int wait_for_user_mode(void) · line 72
Quoted 4 lines
drivers/fpga/socfpga_arria10.c +0
-0}drivers/fpga/socfpga_arria10.c +1
-1-static int is_fpgamgr_early_user_mode (void ) +int is_fpgamgr_early_user_mode (void )This is called inside the same file that's why no reason for this change.
Maybe you are using that later but it just suggest incorrect split.This is part of complete fpga driver that was accepted long time ago,
and now we just submitted the complete fpga driver. I have no strong
opinion about this.Marek, what do you think?
Quoted 81 lines
Quoted 14 lines
{
return (readl(&fpga_manager_base->imgcfg_stat)&ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK
) != 0;drivers/fpga/socfpga_arria10.c +0
-0@@ -94,7 +99,7 @@ int fpgamgr_wait_early_user_mode(void) i++; }drivers/fpga/socfpga_arria10.c int fpgamgr_wait_early_user_mode(void) · line 102
Quoted 2 lines
drivers/fpga/socfpga_arria10.c +1
-1-debug ("Additional %i sync word needed\n" , i); +debug ("FPGA: Additional %i sync word needed\n" , i);it should be separate patch.
Quoted 22 lines
/* restoring original CDRATIO */
fpgamgr_set_cd_ratio(cd_ratio);drivers/fpga/socfpga_arria10.c +0
-0@@ -172,9 +177,10 @@ static intfpgamgr_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=%dcompress=%d\n",
encrypt, compress);drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA: Header word %d = %08x.\n", 69,rbf_data[69]);
drivers/fpga/socfpga_arria10.c +1
-0+ 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=%dcompress=%d.\n", encrypt,
drivers/fpga/socfpga_arria10.c static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data, · line 183
Quoted 1 line
drivers/fpga/socfpga_arria10.c +1
-0+ compress);separate patch - just disturbing reviewers and you are not saying
nothing about it in commit message.Quoted 20 lines
/*
* from the register map description of cdratio inimgcfg_ctrl_02:drivers/fpga/socfpga_arria10.c +0
-0@@ -359,6 +365,7 @@ static int fpgamgr_program_poll_cd(void)
printf("nstatus == 0 while waiting for condone\n");
return-EPERM;
}drivers/fpga/socfpga_arria10.c +1
-0+WATCHDOG_RESET ();}
if (i ==FPGA_TIMEOUT_CNT)drivers/fpga/socfpga_arria10.c +0
-0@@ -432,7 +439,6 @@ int fpgamgr_program_finish(void)
printf("FPGA: Poll CD failed with error code %d\n", status);
return-EPERM;
}drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 435
Quoted 1 line
drivers/fpga/socfpga_arria10.c +0
-1-WATCHDOG_RESET ();These two looks like separate patch too.
Quoted 13 lines
/* Ensure the FPGA entering user mode */
status =fpgamgr_program_poll_usermode();drivers/fpga/socfpga_arria10.c +0
-0@@ -447,27 +453,512 @@ int fpgamgr_program_finish(void) return 0; }
-/*
- * FPGA Manager to program the FPGA. This is the interface used by
FPGA driver.Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 460
Quoted 7 lines
- * Return 0 for sucess, non-zero for error.
- */drivers/fpga/socfpga_arria10.c +5
-0+ofnode get_fpga_mgr_ofnode (void ) +{ +int node_offset; + + fdtdec_find_aliases_for_id(gd->fdt_blob, "fpga_mgr",nit: using of live functions would be better to get rid of gd->.
Are you means using ofnode?
Quoted 94 lines
Quoted 94 lines
drivers/fpga/socfpga_arria10.c +14
-0+COMPAT_ALTERA_SOCFPGA_FPGA0 , + &node_offset, 1); + +return offset_to_ofnode (node_offset); +} + +const char *get_fpga_filename (const void *fdt,int *len) +{ +const char *fpga_filename =NULL ; + +ofnode fpgamgr_node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (fpgamgr_node)) + fpga_filename =ofnode_read_string(fpgamgr_node,
drivers/fpga/socfpga_arria10.c +1
-0+ "altr,bitstream");
drivers/fpga/socfpga_arria10.c +5
-0+ +return fpga_filename; +} + +static void get_rbf_image_info(struct rbf_info *rbf, u16*buffer)
drivers/fpga/socfpga_arria10.c +12
-0+{ +/* +* Magic ID starting at: +* -> 1st dword[15:0] in periph.rbf +* -> 2nd dword[15:0] in core.rbf +* Note: dword == 32 bits +*/ +u32 word_reading_max =2 ; +u32 i; + +for (i =0 ; i < word_reading_max; i++) { + if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_UNENCRYPTED) {drivers/fpga/socfpga_arria10.c +2
-0+ rbf->security = unencrypted; + } else if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_ENCRYPTED) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->security = encrypted; + }else if (*(buffer + i +1 ) == + FPGA_SOCFPGA_A10_RBF_UNENCRYPTED)
{drivers/fpga/socfpga_arria10.c +3
-0+ rbf->security = unencrypted; + }else if (*(buffer + i +1 ) == + FPGA_SOCFPGA_A10_RBF_ENCRYPTED) {
drivers/fpga/socfpga_arria10.c +10
-0+ rbf->security = encrypted; + }else { + rbf->security = invalid; +continue ; + } + +/* PERIPH RBF(buffer + i + 1), CORE RBF(buffer +i +2) */ + if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = core_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +14
-0+ rbf->section = core_section; +break ; + } + + rbf->section = unknown; +break ; + +WATCHDOG_RESET (); + } +} + +#ifdef CONFIG_FS_LOADER +static int first_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c +1
-0+u32 *buffer, size_t
*buffer_bsize)drivers/fpga/socfpga_arria10.c +2
-0+{ +u32 *buffer_p = (u32 *)*buffer;Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 541
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 *loadable = buffer_p; +size_t buffer_size = *buffer_bsize; +size_t fit_size; +int ret, i, count; +int confs_noffset, images_noffset; +int rbf_offset; +int rbf_size;put them on the same line.
sure.
Quoted 45 lines
Quoted 45 lines
drivers/fpga/socfpga_arria10.c +6
-0+const char *fpga_node_name =NULL ; +const char *uname =NULL ; + +/* Load image header into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +2
-0+ buffer_p, + sizeof(struct
image_header),drivers/fpga/socfpga_arria10.c +3
-0+ 0); +if (ret <0 ) { + debug("FPGA: Failed to read image header fromflash.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + if (image_get_magic((struct image_header *)buffer_p)!=
FDT_MAGIC) {drivers/fpga/socfpga_arria10.c +8
-0+debug ("FPGA: No FDT magic was found.\n" ); +return -EBADF ; + } + + fit_size =fdt_totalsize (buffer_p); + +if (fit_size > buffer_size) { + debug("FPGA: FIT image is larger thanavailable
buffer.\n");drivers/fpga/socfpga_arria10.c +1
-0+ debug("Please use FIT external data orincreasing
buffer.\n");drivers/fpga/socfpga_arria10.c +6
-0+return -ENOMEM ; + } + +/* Load entire FIT into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 7 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 574
Quoted 6 lines
Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +3
-0+ buffer_p, + fit_size, + 0);nit: better buffer_p,
fit_size, 0);sure.
Quoted 7 lines
Quoted 6 lines
+
nit: remove empty line above
sure.
Quoted 31 lines
Quoted 31 lines
drivers/fpga/socfpga_arria10.c +6
-0+if (ret <0 ) +return ret; + + ret =fit_check_format (buffer_p); +if (!ret) { + debug("FPGA: No valid FIT image wasfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -EBADF ; + } + + confs_noffset = fdt_path_offset(buffer_p,
FIT_CONFS_PATH);drivers/fpga/socfpga_arria10.c +1
-0+ images_noffset = fdt_path_offset(buffer_p,
FIT_IMAGES_PATH);drivers/fpga/socfpga_arria10.c +2
-0+if (confs_noffset <0 || images_noffset <0 ) { + debug("FPGA: No Configurations or images nodeswere found.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + +/* Get default configuration unit name from default property */
drivers/fpga/socfpga_arria10.c +3
-0+ confs_noffset =fit_conf_get_node (buffer_p,NULL ); +if (confs_noffset <0 ) { + debug("FPGA: No default configuration wasfound in
config.\n");Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 601
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + count = fit_conf_get_prop_node_count(buffer_p,
confs_noffset,drivers/fpga/socfpga_arria10.c +2
-0+ FIT_FPGA_PROP); +nit: remove empty line.
sure.
Quoted 222 lines
Quoted 222 lines
drivers/fpga/socfpga_arria10.c +2
-0+if (count <0 ) { + debug("FPGA: Invalid configuration format forFPGA
node.\n");drivers/fpga/socfpga_arria10.c +6
-0+return count; + } +debug ("FPGA: FPGA node count: %d\n" , count); + +for (i =0 ; i < count; i++) { + images_noffset =fit_conf_get_prop_node_index(buffer_p,
drivers/fpga/socfpga_arria10.c +1
-0+ confs
_noffset,drivers/fpga/socfpga_arria10.c +1
-0+ F
IT_FPGA_PROP, i);drivers/fpga/socfpga_arria10.c +1
-0+ uname = fit_get_name(buffer_p, images_noffset,NULL);
drivers/fpga/socfpga_arria10.c +5
-0+if (uname) { +debug ("FPGA: %s\n" , uname); + + if (strstr(uname, "fpga-periph") && + (!is_fpgamgr_early_user_mode()||
drivers/fpga/socfpga_arria10.c +3
-0+ is_fpgamgr_user_mode())) { + fpga_node_name = uname; + printf("FPGA: Start to program");
drivers/fpga/socfpga_arria10.c +1
-0+ printf("peripheral/fullbitstream
...\n");drivers/fpga/socfpga_arria10.c +2
-0+break ; + } else if (strstr(uname, "fpga-core")&&
drivers/fpga/socfpga_arria10.c +1
-0+ (is_fpgamgr_early_user
_mode()&&drivers/fpga/socfpga_arria10.c +1
-0+ !is_fpgamgr_user_mode()))
{drivers/fpga/socfpga_arria10.c +2
-0+ fpga_node_name = uname; + printf("FPGA: Start to programcore ");
drivers/fpga/socfpga_arria10.c +9
-0+printf ("bitstream ...\n" ); +break ; + } + } +WATCHDOG_RESET (); + } + +if (!fpga_node_name) { + debug("FPGA: No suitable bitstream was found,count: %d.\n", i);
drivers/fpga/socfpga_arria10.c +4
-0+return 1 ; + } + + images_noffset = fit_image_get_node(buffer_p,
fpga_node_name);drivers/fpga/socfpga_arria10.c +2
-0+if (images_noffset <0 ) { + debug("FPGA: No node '%s' was found inFIT.\n",
drivers/fpga/socfpga_arria10.c +5
-0+ fpga_node_name); +return -ENOENT ; + } + + if (!fit_image_get_data_position(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +3
-0+ &rbf_offset)) { +debug ("FPGA: Data position was found.\n" ); + } else if (!fit_image_get_data_offset(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +3
-0+ &rbf_offset)) { +/* +* For FIT with external data, figure out where
drivers/fpga/socfpga_arria10.c +2
-0+ * the external images start. This is the base + * for the data-offset properties in eachimage.
drivers/fpga/socfpga_arria10.c +2
-0+*/ + rbf_offset += ((fdt_totalsize(buffer_p) + 3) &~3);
drivers/fpga/socfpga_arria10.c +3
-0+debug ("FPGA: Data offset was found.\n" ); + }else { + debug("FPGA: No data position/offset wasfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + ret = fit_image_get_data_size(buffer_p,
images_noffset,&rbf_size);drivers/fpga/socfpga_arria10.c +2
-0+if (ret <0 ) { + debug("FPGA: No data size was found(err=%d).\n",
ret);drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +if (gd->ram_size < rbf_size) { + debug("FPGA: Using default OCRAM buffer andsize.\n");
drivers/fpga/socfpga_arria10.c +2
-0+ }else { + ret = fit_image_get_load(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +3
-0+ (ulong *)loadable); +if (ret <0 ) { + buffer_p = (u32*)DEFAULT_DDR_LOAD_ADDRESS;
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA: No loadable wasfound.\n");
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA: Using default DDR loadaddress: 0x%x .\n",
drivers/fpga/socfpga_arria10.c +4
-0+ DEFAULT_DDR_LOAD_ADDRESS); + }else { + buffer_p = (u32 *)*loadable; + debug("FPGA: Found loadable address =0x%x.\n",
drivers/fpga/socfpga_arria10.c +7
-0+ *loadable); + } + + buffer_size = rbf_size; + } + + debug("FPGA: External data: offset = 0x%x, size =0x%x.\n",
drivers/fpga/socfpga_arria10.c +6
-0+ rbf_offset, rbf_size); + + fpga_loadfs->remaining = rbf_size; + +/* +* Determine buffer size vs bitstream size, and calculating number of
drivers/fpga/socfpga_arria10.c +1
-0+ * chunk by chunk transfer is required due to smallerbuffer size
drivers/fpga/socfpga_arria10.c +14
-0+* compare to bitstream +*/ +if (rbf_size <= buffer_size) { +/* Loading whole bitstream into buffer */ + buffer_size = rbf_size; + fpga_loadfs->remaining =0 ; + }else { + fpga_loadfs->remaining -= buffer_size; + } + + fpga_loadfs->offset = rbf_offset; +/* Loading bitstream into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + buffer_size, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +/* Getting info about bitstream types */ + get_rbf_image_info(&fpga_loadfs->rbfinfo, (u16*)buffer_p);
drivers/fpga/socfpga_arria10.c +8
-0+ +/* Update next reading bitstream offset */ + fpga_loadfs->offset += buffer_size; + +/* Update the final addr for bitstream */ + *buffer = (u32 )buffer_p; + +/* Update the size of bitstream to be programmed into FPGA
*/drivers/fpga/socfpga_arria10.c +6
-0+ *buffer_bsize = buffer_size; + +return 0 ; +} + +static int subsequent_loading_rbf_to_buffer(struct udevice*dev,
drivers/fpga/socfpga_arria10.c +1
-0+ struct
fpga_loadfs_info*fpga_loadfs,drivers/fpga/socfpga_arria10.c +1
-0+u32 *buffer, size_t
*buffer_bsize)drivers/fpga/socfpga_arria10.c +14
-0+{ +int ret =0 ; +u32 *buffer_p = (u32 *)*buffer; + +/* Read the bitstream chunk by chunk. */ +if (fpga_loadfs->remaining > *buffer_bsize) { + fpga_loadfs->remaining -= *buffer_bsize; + }else { + *buffer_bsize = fpga_loadfs->remaining; + fpga_loadfs->remaining =0 ; + } + + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + *buffer_bsize, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +9
-0+return -ENOENT ; + } + +/* Update next reading bitstream offset */ + fpga_loadfs->offset += *buffer_bsize; + +return 0 ; +} +Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 770
Quoted 7 lines
+int socfpga_loadfs(fpga_fs_info
*fpga_fsinfo, const void *buf,size_tbsize,drivers/fpga/socfpga_arria10.c +5
-0+ u32 offset) +{ +struct fpga_loadfs_info fpga_loadfs; +int status =0 ; +int ret =0 ;no reason to initiate here.
sure.
Quoted 4 lines
Quoted 4 lines
Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 777
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 buffer = (uintptr_t )buf; +size_t buffer_sizebytes = bsize; +size_t buffer_sizebytes_ori = bsize; +size_t total_sizeof_image =0 ; +struct udevice *dev; +ofnode node; +int size;another int - just put them on the same line.
sure.
Quoted 69 lines
Quoted 69 lines
drivers/fpga/socfpga_arria10.c +7
-0+const fdt32_t *phandle_p; +u32 phandle; + + node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (node)) { + phandle_p = ofnode_get_property(node,"firmware-
loader", &size);drivers/fpga/socfpga_arria10.c +4
-0+if (phandle_p) { + node =ofnode_path ("/chosen" ); +if (!ofnode_valid (node)) { + debug("FPGA: /chosen node wasnot
found.\n");drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + phandle_p = ofnode_get_property(node,"firmware-loader",
drivers/fpga/socfpga_arria10.c +3
-0+ &size); +if (!phandle_p) { + debug("FPGA: firmware-loaderproperty was not");
drivers/fpga/socfpga_arria10.c +6
-0+debug (" found.\n" ); +return -ENOENT ; + } + } + }else { + debug("FPGA: FPGA manager node was notfound.\n");
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + + phandle =fdt32_to_cpu (*phandle_p); + ret =uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER,
drivers/fpga/socfpga_arria10.c +10
-0+ phandle, &dev); +if (ret) +return ret; + +memset (&fpga_loadfs,0 ,sizeof (fpga_loadfs)); + + fpga_loadfs.fpga_fsinfo = fpga_fsinfo; + fpga_loadfs.offset = offset; + + printf("FPGA: Checking FPGA configuration setting...\n");
drivers/fpga/socfpga_arria10.c +3
-0+ +/* +* Note: Both buffer and buffer_sizebytes values can be
altered bydrivers/fpga/socfpga_arria10.c +3
-0+* function below. +*/ + ret = first_loading_rbf_to_buffer(dev, &fpga_loadfs,&buffer,
drivers/fpga/socfpga_arria10.c +8
-0+ &buffer_sizebytes); +if (ret ==1 ) { +printf ("FPGA: Skipping configuration ...\n" ); +return 0 ; + }else if (ret) { +return ret; + } +Quoted 8 lines
drivers/fpga/socfpga_arria10.c
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +2
-0+ if (fpga_loadfs.rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in Early Release mode toprogram ");
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;This doesn't look like pass. 0 means pass but it should fail.
This is for supporting our specific use case.
Quoted 168 lines
Quoted 136 lines
drivers/fpga/socfpga_arria10.c +3
-0+ } + +/* Disable all signals from HPS peripheral controller to
FPGA */drivers/fpga/socfpga_arria10.c +3
-0+writel (0 , &system_manager_base->fpgaintf_en_global); + +/* Disable all axi bridges (hps2fpga, lwhps2fpga & fpga2hps) */
drivers/fpga/socfpga_arria10.c +5
-0+socfpga_bridges_reset (); + +if (fpga_loadfs.rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)buffer,
buffer_sizebytes);drivers/fpga/socfpga_arria10.c +2
-0+if (status) { + debug("FPGA: Init with peripheralbitstream failed.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return -EPERM ; + } + } + +/* Transfer bitstream to FPGA Manager */ + fpgamgr_program_write((void *)buffer,
buffer_sizebytes);drivers/fpga/socfpga_arria10.c +6
-0+ + total_sizeof_image += buffer_sizebytes; + +while (fpga_loadfs.remaining) { + ret =subsequent_loading_rbf_to_buffer (dev, + &fpga_load
fs,drivers/fpga/socfpga_arria10.c +1
-0+ &buffer,
drivers/fpga/socfpga_arria10.c +1
-0+ &buffe
r_sizebytes_ori);drivers/fpga/socfpga_arria10.c +15
-1+ +if (ret) +return ret; + +/* Transfer data to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, + buffer_sizebytes_ori); + + total_sizeof_image += buffer_sizebytes_ori; + +WATCHDOG_RESET (); + } + +if (fpga_loadfs.rbfinfo.section == periph_section) { + if (fpgamgr_wait_early_user_mode() != -ETIMEDOUT){
drivers/fpga/socfpga_arria10.c +2
-0+config_pins (gd->fdt_blob,"shared" ); + puts("FPGA: Early ReleaseSucceeded.\n");
drivers/fpga/socfpga_arria10.c +2
-0+ }else { + debug("FPGA: Failed to see EarlyRelease.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return -EIO ; + } + +/* For monolithic bitstream */ +if (is_fpgamgr_user_mode ()) { +/* Ensure the FPGA entering config done */
drivers/fpga/socfpga_arria10.c +8
-0+ status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + } else if (fpga_loadfs.rbfinfo.section ==
core_section) {drivers/fpga/socfpga_arria10.c +9
-0+/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + }else { + debug("FPGA: Config Error: Unsupportedbitstream
type.\n");drivers/fpga/socfpga_arria10.c +7
-0+return -ENOEXEC ; + } + +return (int )total_sizeof_image; +} + +void fpgamgr_program(const void *buf, size_t bsize, u32offset)
drivers/fpga/socfpga_arria10.c +5
-0+{ +fpga_fs_info fpga_fsinfo; +int len; + + fpga_fsinfo.filename = get_fpga_filename(gd->fdt_blob,&len);
drivers/fpga/socfpga_arria10.c +3
-0+ +if (fpga_fsinfo.filename) + socfpga_loadfs(&fpga_fsinfo, buf, bsize,offset);
drivers/fpga/socfpga_arria10.c +4
-0+} +#endif + +/* This function is used to load the core bitstream from the OCRAM. */
int socfpga_load(Altera_desc *desc, const void*rbf_data,size_trbf_size)
{drivers/fpga/socfpga_arria10.c +4
-1-int status; +unsigned long status; +struct rbf_info rbfinfo; + +memset (&rbfinfo,0 ,sizeof (rbfinfo));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 & Quoted 1 line
fpga2hps) */
separate changes.
Quoted 26 lines
socfpga_bridges_reset();drivers/fpga/socfpga_arria10.c +0
-2-/* Initialize the FPGA Manager */ - status = fpgamgr_program_init((u32 *)rbf_data,
rbf_size);drivers/fpga/socfpga_arria10.c +2
-2-if (status) -return status; +/* Getting info about bitstream types */ +get_rbf_image_info (&rbfinfo, (u16 *)rbf_data);drivers/fpga/socfpga_arria10.c +3
-1-/* Write the RBF data to FPGA Manager */ +if (rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)rbf_data,
rbf_size);drivers/fpga/socfpga_arria10.c +6
-0+if (status) +return status; + } + + if (rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in early release mode toprogram ");
drivers/fpga/socfpga_arria10.c
Quoted 2 lines
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;0 is supposed to be pass. This looks like a fail.
Quoted 8 lines
Quoted 1 line
This is for supporting our specific use case.
Still if you call this function what you want to load/program something
and you are not able to do it, it should return reasonable return value.
I would say error value.
Maybe you just need to improve that debug message to look more sensible.
OKay, i can change to -ve return value because now the whole fpga driver is fully work with fitImage implementation, that rare use case may no longer required to get supported.
Quoted 4 lines
M
Chee
PATCH v9 3/7 ARM: socfpga: Add FPGA drivers for Arria 10 FPGA bitstream loading
In reply to Michal SimekQuoted 69 lines · Michal Simek
Quoted 68 lines · Tien Fong
Quoted 66 lines · Michal Simek
Quoted 57 lines · 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.Signed-off-by Tien Fong Chee <[email protected]>---
changes for v9
- Support data offset
- Added default DDR load address
- Squashed theimage.h
- Changed to phandle
- Ensure the DDR is fully up running by checking thegd->ramchanges 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 | 40 +- drivers/fpga/socfpga_arria10.c | 533
++++++++++++++++++++-
include/image.h | 4 +4 files changed, 571 insertions(+), 23 deletions(-)arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +0
-0@@ -18,6 +18,23 @@ /dts-v1/; #include "socfpga_arria10_socdk.dtsi"arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 26
Quoted 6 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +6
-0+/ { + chosen { + firmware-loader = <&fs_loader0>; + }; + + fs_loader0: fs-loader at 0 {again @0 without reg properly is wrong.
Quoted 1 line
Quoted 1 line
Mind to explain more?
How about fs-loader-0?
Quoted 950 lines
Quoted 938 lines
Quoted 139 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts line 30
Quoted 8 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +4
-0+ u-boot,dm-pre-reloc; + compatible = "u-boot,fs-loader"; + phandlepart = <&mmc 1>; + };I think that this will be nacked by DT guys.
Quoted 129 lines
arch/arm/dts/socfpga_arria10_socdk_sdmmc.dts +7
-0+}; + +&fpga_mgr { + u-boot,dm-pre-reloc; + altr,bitstream = "fit_spl_fpga.itb"; +}; +&mmc {
u-boot,dm-pre-reloc;
status = "okay";(quoted diff) +0
-0
socfpga/include/mach/fpga_manager_arria10.hb/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 09d13f6..7a4f723 100644arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +1
-1@@ -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. */ arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#include <asm/cache.h> +#include <altera.h> +#include <image.h> +#ifndef _FPGA_MANAGER_ARRIA10_H_
#define _FPGA_MANAGER_ARRIA10_H_arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -51,6 +55,10 @@ #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK BIT(24) #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB16
arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +4
-0+#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__
structsocfpga_fpga_manager{arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +0
-0@@ -88,12 +96,40 @@ struct socfpga_fpga_manager { u32 imgcfg_fifo_status; };arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +24
-0+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 */
intfpgamgr_program_init(u32 * rbf_data, size_t rbf_size); intfpgamgr_program_finish(void);
intis_fpgamgr_user_mode(void);
intfpgamgr_wait_early_user_mode(void);arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +3
-1- +int is_fpgamgr_early_user_mode (void ); +const char *get_fpga_filename (const void *fdt,int *len); +int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf,
size_tbsize,arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h +2
-0+ u32 offset); +void fpgamgr_program(const void *buf, size_t bsize, u32offset);
#endif /*__ASSEMBLY__*/
#endif /* _FPGA_MANAGER_ARRIA10_H_ */drivers/fpga/socfpga_arria10.c +4
-2@@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (C) 2017 Intel Corporation <www.intel.com> + * Copyright (C) 2017-2019 Intel Corporation <www.intel.com> */ - #include <asm/io.h> #include <asm/arch/fpga_manager.h> #include <asm/arch/reset_manager.h>@@ -10,8 +9,11 @@ #include <asm/arch/sdram.h> #include <asm/arch/misc.h> #include <altera.h> +#include <asm/arch/pinmux.h> #include <common.h> +#include <dm/ofnode.h> #include <errno.h> +#include <fs_loader.h> #include <wait_bit.h> #include <watchdog.h>drivers/fpga/socfpga_arria10.c +3
-0@@ -21,6 +23,9 @@ #define COMPRESSION_OFFSET 229 #define FPGA_TIMEOUT_MSEC 1000 /* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 +#define DEFAULT_DDR_LOAD_ADDRESS 0x400 + +DECLARE_GLOBAL_DATA_PTR ;
static const structsocfpga_fpga_manager*fpga_manager_base= (void *)SOCFPGA_FPGAMGRREGS_ADDRESS;drivers/fpga/socfpga_arria10.c +0
-0@@ -64,7 +69,7 @@ static int wait_for_user_mode(void) 1, FPGA_TIMEOUT_MSEC, false);Quoted 8 lines
drivers/fpga/socfpga_arria10.c static int wait_for_user_mode(void) · line 72
Quoted 4 lines
drivers/fpga/socfpga_arria10.c +0
-0}drivers/fpga/socfpga_arria10.c +1
-1-static int is_fpgamgr_early_user_mode (void ) +int is_fpgamgr_early_user_mode (void )This is called inside the same file that's why no reason for this change.
Maybe you are using that later but it just suggest incorrect split.This is part of complete fpga driver that was accepted long time ago,
and now we just submitted the complete fpga driver. I have no strong
opinion about this.Marek, what do you think?
Quoted 81 lines
Quoted 14 lines
{
return (readl(&fpga_manager_base->imgcfg_stat)&ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK
) != 0;drivers/fpga/socfpga_arria10.c +0
-0@@ -94,7 +99,7 @@ int fpgamgr_wait_early_user_mode(void) i++; }drivers/fpga/socfpga_arria10.c int fpgamgr_wait_early_user_mode(void) · line 102
Quoted 2 lines
drivers/fpga/socfpga_arria10.c +1
-1-debug ("Additional %i sync word needed\n" , i); +debug ("FPGA: Additional %i sync word needed\n" , i);it should be separate patch.
Quoted 22 lines
/* restoring original CDRATIO */
fpgamgr_set_cd_ratio(cd_ratio);drivers/fpga/socfpga_arria10.c +0
-0@@ -172,9 +177,10 @@ static intfpgamgr_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=%dcompress=%d\n",
encrypt, compress);drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA: Header word %d = %08x.\n", 69,rbf_data[69]);
drivers/fpga/socfpga_arria10.c +1
-0+ 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=%dcompress=%d.\n", encrypt,
drivers/fpga/socfpga_arria10.c static int fpgamgr_set_cdratio_cdwidth(unsigned int cfg_width, u32 *rbf_data, · line 183
Quoted 1 line
drivers/fpga/socfpga_arria10.c +1
-0+ compress);separate patch - just disturbing reviewers and you are not saying
nothing about it in commit message.Quoted 20 lines
/*
* from the register map description of cdratio inimgcfg_ctrl_02:drivers/fpga/socfpga_arria10.c +0
-0@@ -359,6 +365,7 @@ static int fpgamgr_program_poll_cd(void)
printf("nstatus == 0 while waiting for condone\n");
return-EPERM;
}drivers/fpga/socfpga_arria10.c +1
-0+WATCHDOG_RESET ();}
if (i ==FPGA_TIMEOUT_CNT)drivers/fpga/socfpga_arria10.c +0
-0@@ -432,7 +439,6 @@ int fpgamgr_program_finish(void)
printf("FPGA: Poll CD failed with error code %d\n", status);
return-EPERM;
}drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 435
Quoted 1 line
drivers/fpga/socfpga_arria10.c +0
-1-WATCHDOG_RESET ();These two looks like separate patch too.
Quoted 13 lines
/* Ensure the FPGA entering user mode */
status =fpgamgr_program_poll_usermode();drivers/fpga/socfpga_arria10.c +0
-0@@ -447,27 +453,512 @@ int fpgamgr_program_finish(void) return 0; }
-/*
- * FPGA Manager to program the FPGA. This is the interface used by
FPGA driver.Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 460
Quoted 7 lines
- * Return 0 for sucess, non-zero for error.
- */drivers/fpga/socfpga_arria10.c +5
-0+ofnode get_fpga_mgr_ofnode (void ) +{ +int node_offset; + + fdtdec_find_aliases_for_id(gd->fdt_blob, "fpga_mgr",nit: using of live functions would be better to get rid of gd->.
Are you means using ofnode?
Quoted 94 lines
Quoted 94 lines
drivers/fpga/socfpga_arria10.c +14
-0+COMPAT_ALTERA_SOCFPGA_FPGA0 , + &node_offset, 1); + +return offset_to_ofnode (node_offset); +} + +const char *get_fpga_filename (const void *fdt,int *len) +{ +const char *fpga_filename =NULL ; + +ofnode fpgamgr_node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (fpgamgr_node)) + fpga_filename =ofnode_read_string(fpgamgr_node,
drivers/fpga/socfpga_arria10.c +1
-0+ "altr,bitstream");
drivers/fpga/socfpga_arria10.c +5
-0+ +return fpga_filename; +} + +static void get_rbf_image_info(struct rbf_info *rbf, u16*buffer)
drivers/fpga/socfpga_arria10.c +12
-0+{ +/* +* Magic ID starting at: +* -> 1st dword[15:0] in periph.rbf +* -> 2nd dword[15:0] in core.rbf +* Note: dword == 32 bits +*/ +u32 word_reading_max =2 ; +u32 i; + +for (i =0 ; i < word_reading_max; i++) { + if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_UNENCRYPTED) {drivers/fpga/socfpga_arria10.c +2
-0+ rbf->security = unencrypted; + } else if (*(buffer + i) ==
FPGA_SOCFPGA_A10_RBF_ENCRYPTED) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->security = encrypted; + }else if (*(buffer + i +1 ) == + FPGA_SOCFPGA_A10_RBF_UNENCRYPTED)
{drivers/fpga/socfpga_arria10.c +3
-0+ rbf->security = unencrypted; + }else if (*(buffer + i +1 ) == + FPGA_SOCFPGA_A10_RBF_ENCRYPTED) {
drivers/fpga/socfpga_arria10.c +10
-0+ rbf->security = encrypted; + }else { + rbf->security = invalid; +continue ; + } + +/* PERIPH RBF(buffer + i + 1), CORE RBF(buffer +i +2) */ + if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 1) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = core_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_PERIPH) {drivers/fpga/socfpga_arria10.c +3
-0+ rbf->section = periph_section; +break ; + } else if (*(buffer + i + 2) ==
FPGA_SOCFPGA_A10_RBF_CORE) {drivers/fpga/socfpga_arria10.c +14
-0+ rbf->section = core_section; +break ; + } + + rbf->section = unknown; +break ; + +WATCHDOG_RESET (); + } +} + +#ifdef CONFIG_FS_LOADER +static int first_loading_rbf_to_buffer (struct udevice *dev, + struct fpga_loadfs_info
*fpga_loadfs,drivers/fpga/socfpga_arria10.c +1
-0+u32 *buffer, size_t
*buffer_bsize)drivers/fpga/socfpga_arria10.c +2
-0+{ +u32 *buffer_p = (u32 *)*buffer;Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 541
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 *loadable = buffer_p; +size_t buffer_size = *buffer_bsize; +size_t fit_size; +int ret, i, count; +int confs_noffset, images_noffset; +int rbf_offset; +int rbf_size;put them on the same line.
sure.
Quoted 45 lines
Quoted 45 lines
drivers/fpga/socfpga_arria10.c +6
-0+const char *fpga_node_name =NULL ; +const char *uname =NULL ; + +/* Load image header into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +2
-0+ buffer_p, + sizeof(struct
image_header),drivers/fpga/socfpga_arria10.c +3
-0+ 0); +if (ret <0 ) { + debug("FPGA: Failed to read image header fromflash.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + if (image_get_magic((struct image_header *)buffer_p)!=
FDT_MAGIC) {drivers/fpga/socfpga_arria10.c +8
-0+debug ("FPGA: No FDT magic was found.\n" ); +return -EBADF ; + } + + fit_size =fdt_totalsize (buffer_p); + +if (fit_size > buffer_size) { + debug("FPGA: FIT image is larger thanavailable
buffer.\n");drivers/fpga/socfpga_arria10.c +1
-0+ debug("Please use FIT external data orincreasing
buffer.\n");drivers/fpga/socfpga_arria10.c +6
-0+return -ENOMEM ; + } + +/* Load entire FIT into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 7 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 574
Quoted 6 lines
Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +3
-0+ buffer_p, + fit_size, + 0);nit: better buffer_p,
fit_size, 0);sure.
Quoted 7 lines
Quoted 6 lines
+
nit: remove empty line above
sure.
Quoted 31 lines
Quoted 31 lines
drivers/fpga/socfpga_arria10.c +6
-0+if (ret <0 ) +return ret; + + ret =fit_check_format (buffer_p); +if (!ret) { + debug("FPGA: No valid FIT image wasfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -EBADF ; + } + + confs_noffset = fdt_path_offset(buffer_p,
FIT_CONFS_PATH);drivers/fpga/socfpga_arria10.c +1
-0+ images_noffset = fdt_path_offset(buffer_p,
FIT_IMAGES_PATH);drivers/fpga/socfpga_arria10.c +2
-0+if (confs_noffset <0 || images_noffset <0 ) { + debug("FPGA: No Configurations or images nodeswere found.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + +/* Get default configuration unit name from default property */
drivers/fpga/socfpga_arria10.c +3
-0+ confs_noffset =fit_conf_get_node (buffer_p,NULL ); +if (confs_noffset <0 ) { + debug("FPGA: No default configuration wasfound in
config.\n");Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 601
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + count = fit_conf_get_prop_node_count(buffer_p,
confs_noffset,drivers/fpga/socfpga_arria10.c +2
-0+ FIT_FPGA_PROP); +nit: remove empty line.
sure.
Quoted 222 lines
Quoted 222 lines
drivers/fpga/socfpga_arria10.c +2
-0+if (count <0 ) { + debug("FPGA: Invalid configuration format forFPGA
node.\n");drivers/fpga/socfpga_arria10.c +6
-0+return count; + } +debug ("FPGA: FPGA node count: %d\n" , count); + +for (i =0 ; i < count; i++) { + images_noffset =fit_conf_get_prop_node_index(buffer_p,
drivers/fpga/socfpga_arria10.c +1
-0+ confs
_noffset,drivers/fpga/socfpga_arria10.c +1
-0+ F
IT_FPGA_PROP, i);drivers/fpga/socfpga_arria10.c +1
-0+ uname = fit_get_name(buffer_p, images_noffset,NULL);
drivers/fpga/socfpga_arria10.c +5
-0+if (uname) { +debug ("FPGA: %s\n" , uname); + + if (strstr(uname, "fpga-periph") && + (!is_fpgamgr_early_user_mode()||
drivers/fpga/socfpga_arria10.c +3
-0+ is_fpgamgr_user_mode())) { + fpga_node_name = uname; + printf("FPGA: Start to program");
drivers/fpga/socfpga_arria10.c +1
-0+ printf("peripheral/fullbitstream
...\n");drivers/fpga/socfpga_arria10.c +2
-0+break ; + } else if (strstr(uname, "fpga-core")&&
drivers/fpga/socfpga_arria10.c +1
-0+ (is_fpgamgr_early_user
_mode()&&drivers/fpga/socfpga_arria10.c +1
-0+ !is_fpgamgr_user_mode()))
{drivers/fpga/socfpga_arria10.c +2
-0+ fpga_node_name = uname; + printf("FPGA: Start to programcore ");
drivers/fpga/socfpga_arria10.c +9
-0+printf ("bitstream ...\n" ); +break ; + } + } +WATCHDOG_RESET (); + } + +if (!fpga_node_name) { + debug("FPGA: No suitable bitstream was found,count: %d.\n", i);
drivers/fpga/socfpga_arria10.c +4
-0+return 1 ; + } + + images_noffset = fit_image_get_node(buffer_p,
fpga_node_name);drivers/fpga/socfpga_arria10.c +2
-0+if (images_noffset <0 ) { + debug("FPGA: No node '%s' was found inFIT.\n",
drivers/fpga/socfpga_arria10.c +5
-0+ fpga_node_name); +return -ENOENT ; + } + + if (!fit_image_get_data_position(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +3
-0+ &rbf_offset)) { +debug ("FPGA: Data position was found.\n" ); + } else if (!fit_image_get_data_offset(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +3
-0+ &rbf_offset)) { +/* +* For FIT with external data, figure out where
drivers/fpga/socfpga_arria10.c +2
-0+ * the external images start. This is the base + * for the data-offset properties in eachimage.
drivers/fpga/socfpga_arria10.c +2
-0+*/ + rbf_offset += ((fdt_totalsize(buffer_p) + 3) &~3);
drivers/fpga/socfpga_arria10.c +3
-0+debug ("FPGA: Data offset was found.\n" ); + }else { + debug("FPGA: No data position/offset wasfound.\n");
drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + ret = fit_image_get_data_size(buffer_p,
images_noffset,&rbf_size);drivers/fpga/socfpga_arria10.c +2
-0+if (ret <0 ) { + debug("FPGA: No data size was found(err=%d).\n",
ret);drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +if (gd->ram_size < rbf_size) { + debug("FPGA: Using default OCRAM buffer andsize.\n");
drivers/fpga/socfpga_arria10.c +2
-0+ }else { + ret = fit_image_get_load(buffer_p,
images_noffset,drivers/fpga/socfpga_arria10.c +3
-0+ (ulong *)loadable); +if (ret <0 ) { + buffer_p = (u32*)DEFAULT_DDR_LOAD_ADDRESS;
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA: No loadable wasfound.\n");
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA: Using default DDR loadaddress: 0x%x .\n",
drivers/fpga/socfpga_arria10.c +4
-0+ DEFAULT_DDR_LOAD_ADDRESS); + }else { + buffer_p = (u32 *)*loadable; + debug("FPGA: Found loadable address =0x%x.\n",
drivers/fpga/socfpga_arria10.c +7
-0+ *loadable); + } + + buffer_size = rbf_size; + } + + debug("FPGA: External data: offset = 0x%x, size =0x%x.\n",
drivers/fpga/socfpga_arria10.c +6
-0+ rbf_offset, rbf_size); + + fpga_loadfs->remaining = rbf_size; + +/* +* Determine buffer size vs bitstream size, and calculating number of
drivers/fpga/socfpga_arria10.c +1
-0+ * chunk by chunk transfer is required due to smallerbuffer size
drivers/fpga/socfpga_arria10.c +14
-0+* compare to bitstream +*/ +if (rbf_size <= buffer_size) { +/* Loading whole bitstream into buffer */ + buffer_size = rbf_size; + fpga_loadfs->remaining =0 ; + }else { + fpga_loadfs->remaining -= buffer_size; + } + + fpga_loadfs->offset = rbf_offset; +/* Loading bitstream into buffer */ + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + buffer_size, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + +/* Getting info about bitstream types */ + get_rbf_image_info(&fpga_loadfs->rbfinfo, (u16*)buffer_p);
drivers/fpga/socfpga_arria10.c +8
-0+ +/* Update next reading bitstream offset */ + fpga_loadfs->offset += buffer_size; + +/* Update the final addr for bitstream */ + *buffer = (u32 )buffer_p; + +/* Update the size of bitstream to be programmed into FPGA
*/drivers/fpga/socfpga_arria10.c +6
-0+ *buffer_bsize = buffer_size; + +return 0 ; +} + +static int subsequent_loading_rbf_to_buffer(struct udevice*dev,
drivers/fpga/socfpga_arria10.c +1
-0+ struct
fpga_loadfs_info*fpga_loadfs,drivers/fpga/socfpga_arria10.c +1
-0+u32 *buffer, size_t
*buffer_bsize)drivers/fpga/socfpga_arria10.c +14
-0+{ +int ret =0 ; +u32 *buffer_p = (u32 *)*buffer; + +/* Read the bitstream chunk by chunk. */ +if (fpga_loadfs->remaining > *buffer_bsize) { + fpga_loadfs->remaining -= *buffer_bsize; + }else { + *buffer_bsize = fpga_loadfs->remaining; + fpga_loadfs->remaining =0 ; + } + + ret = request_firmware_into_buf(dev, + fpga_loadfs-Quoted 3 lines
fpga_fsinfo-
filename,
drivers/fpga/socfpga_arria10.c +5
-0+ buffer_p, + *buffer_bsize, + fpga_loadfs->offset); +if (ret <0 ) { + debug("FPGA: Failed to read bitstream fromflash.\n");
drivers/fpga/socfpga_arria10.c +9
-0+return -ENOENT ; + } + +/* Update next reading bitstream offset */ + fpga_loadfs->offset += *buffer_bsize; + +return 0 ; +} +Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 770
Quoted 7 lines
+int socfpga_loadfs(fpga_fs_info
*fpga_fsinfo, const void *buf,size_tbsize,drivers/fpga/socfpga_arria10.c +5
-0+ u32 offset) +{ +struct fpga_loadfs_info fpga_loadfs; +int status =0 ; +int ret =0 ;no reason to initiate here.
sure.
Quoted 4 lines
Quoted 4 lines
Quoted 8 lines
drivers/fpga/socfpga_arria10.c int fpgamgr_program_finish(void) · line 777
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +7
-0+u32 buffer = (uintptr_t )buf; +size_t buffer_sizebytes = bsize; +size_t buffer_sizebytes_ori = bsize; +size_t total_sizeof_image =0 ; +struct udevice *dev; +ofnode node; +int size;another int - just put them on the same line.
sure.
Quoted 69 lines
Quoted 69 lines
drivers/fpga/socfpga_arria10.c +7
-0+const fdt32_t *phandle_p; +u32 phandle; + + node =get_fpga_mgr_ofnode (); + +if (ofnode_valid (node)) { + phandle_p = ofnode_get_property(node,"firmware-
loader", &size);drivers/fpga/socfpga_arria10.c +4
-0+if (phandle_p) { + node =ofnode_path ("/chosen" ); +if (!ofnode_valid (node)) { + debug("FPGA: /chosen node wasnot
found.\n");drivers/fpga/socfpga_arria10.c +4
-0+return -ENOENT ; + } + + phandle_p = ofnode_get_property(node,"firmware-loader",
drivers/fpga/socfpga_arria10.c +3
-0+ &size); +if (!phandle_p) { + debug("FPGA: firmware-loaderproperty was not");
drivers/fpga/socfpga_arria10.c +6
-0+debug (" found.\n" ); +return -ENOENT ; + } + } + }else { + debug("FPGA: FPGA manager node was notfound.\n");
drivers/fpga/socfpga_arria10.c +5
-0+return -ENOENT ; + } + + phandle =fdt32_to_cpu (*phandle_p); + ret =uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER,
drivers/fpga/socfpga_arria10.c +10
-0+ phandle, &dev); +if (ret) +return ret; + +memset (&fpga_loadfs,0 ,sizeof (fpga_loadfs)); + + fpga_loadfs.fpga_fsinfo = fpga_fsinfo; + fpga_loadfs.offset = offset; + + printf("FPGA: Checking FPGA configuration setting...\n");
drivers/fpga/socfpga_arria10.c +3
-0+ +/* +* Note: Both buffer and buffer_sizebytes values can be
altered bydrivers/fpga/socfpga_arria10.c +3
-0+* function below. +*/ + ret = first_loading_rbf_to_buffer(dev, &fpga_loadfs,&buffer,
drivers/fpga/socfpga_arria10.c +8
-0+ &buffer_sizebytes); +if (ret ==1 ) { +printf ("FPGA: Skipping configuration ...\n" ); +return 0 ; + }else if (ret) { +return ret; + } +Quoted 8 lines
drivers/fpga/socfpga_arria10.c
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +2
-0+ if (fpga_loadfs.rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in Early Release mode toprogram ");
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;This doesn't look like pass. 0 means pass but it should fail.
This is for supporting our specific use case.
Quoted 160 lines
Quoted 136 lines
drivers/fpga/socfpga_arria10.c +3
-0+ } + +/* Disable all signals from HPS peripheral controller to
FPGA */drivers/fpga/socfpga_arria10.c +3
-0+writel (0 , &system_manager_base->fpgaintf_en_global); + +/* Disable all axi bridges (hps2fpga, lwhps2fpga & fpga2hps) */
drivers/fpga/socfpga_arria10.c +5
-0+socfpga_bridges_reset (); + +if (fpga_loadfs.rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)buffer,
buffer_sizebytes);drivers/fpga/socfpga_arria10.c +2
-0+if (status) { + debug("FPGA: Init with peripheralbitstream failed.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return -EPERM ; + } + } + +/* Transfer bitstream to FPGA Manager */ + fpgamgr_program_write((void *)buffer,
buffer_sizebytes);drivers/fpga/socfpga_arria10.c +6
-0+ + total_sizeof_image += buffer_sizebytes; + +while (fpga_loadfs.remaining) { + ret =subsequent_loading_rbf_to_buffer (dev, + &fpga_load
fs,drivers/fpga/socfpga_arria10.c +1
-0+ &buffer,
drivers/fpga/socfpga_arria10.c +1
-0+ &buffe
r_sizebytes_ori);drivers/fpga/socfpga_arria10.c +15
-1+ +if (ret) +return ret; + +/* Transfer data to FPGA Manager */ +fpgamgr_program_write ((void *)buffer, + buffer_sizebytes_ori); + + total_sizeof_image += buffer_sizebytes_ori; + +WATCHDOG_RESET (); + } + +if (fpga_loadfs.rbfinfo.section == periph_section) { + if (fpgamgr_wait_early_user_mode() != -ETIMEDOUT){
drivers/fpga/socfpga_arria10.c +2
-0+config_pins (gd->fdt_blob,"shared" ); + puts("FPGA: Early ReleaseSucceeded.\n");
drivers/fpga/socfpga_arria10.c +2
-0+ }else { + debug("FPGA: Failed to see EarlyRelease.\n");
drivers/fpga/socfpga_arria10.c +6
-0+return -EIO ; + } + +/* For monolithic bitstream */ +if (is_fpgamgr_user_mode ()) { +/* Ensure the FPGA entering config done */
drivers/fpga/socfpga_arria10.c +8
-0+ status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + } + } else if (fpga_loadfs.rbfinfo.section ==
core_section) {drivers/fpga/socfpga_arria10.c +9
-0+/* Ensure the FPGA entering config done */ + status =fpgamgr_program_finish (); +if (status) +return status; + +config_pins (gd->fdt_blob,"fpga" ); +puts ("FPGA: Enter user mode.\n" ); + }else { + debug("FPGA: Config Error: Unsupportedbitstream
type.\n");drivers/fpga/socfpga_arria10.c +7
-0+return -ENOEXEC ; + } + +return (int )total_sizeof_image; +} + +void fpgamgr_program(const void *buf, size_t bsize, u32offset)
drivers/fpga/socfpga_arria10.c +5
-0+{ +fpga_fs_info fpga_fsinfo; +int len; + + fpga_fsinfo.filename = get_fpga_filename(gd->fdt_blob,&len);
drivers/fpga/socfpga_arria10.c +3
-0+ +if (fpga_fsinfo.filename) + socfpga_loadfs(&fpga_fsinfo, buf, bsize,offset);
drivers/fpga/socfpga_arria10.c +4
-0+} +#endif + +/* This function is used to load the core bitstream from the OCRAM. */
int socfpga_load(Altera_desc *desc, const void*rbf_data,size_trbf_size)
{drivers/fpga/socfpga_arria10.c +4
-1-int status; +unsigned long status; +struct rbf_info rbfinfo; + +memset (&rbfinfo,0 ,sizeof (rbfinfo));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 & Quoted 1 line
fpga2hps) */
separate changes.
Quoted 21 lines
socfpga_bridges_reset();drivers/fpga/socfpga_arria10.c +0
-2-/* Initialize the FPGA Manager */ - status = fpgamgr_program_init((u32 *)rbf_data,
rbf_size);drivers/fpga/socfpga_arria10.c +2
-2-if (status) -return status; +/* Getting info about bitstream types */ +get_rbf_image_info (&rbfinfo, (u16 *)rbf_data);drivers/fpga/socfpga_arria10.c +3
-1-/* Write the RBF data to FPGA Manager */ +if (rbfinfo.section == periph_section) { +/* Initialize the FPGA Manager */ + status = fpgamgr_program_init((u32 *)rbf_data,
rbf_size);drivers/fpga/socfpga_arria10.c +4
-0+if (status) +return status; + } +Quoted 8 lines
drivers/fpga/socfpga_arria10.c
Quoted 7 lines
drivers/fpga/socfpga_arria10.c +2
-0+ if (rbfinfo.section == core_section && + !(is_fpgamgr_early_user_mode() &&!is_fpgamgr_user_mode())) {
drivers/fpga/socfpga_arria10.c +1
-0+ debug("FPGA : Must be in early release mode toprogram ");
drivers/fpga/socfpga_arria10.c +2
-0+debug ("core bitstream.\n" ); +return 0 ;0 is supposed to be pass. This looks like a fail.
Quoted 1 line
This is for supporting our specific use case.
Still if you call this function what you want to load/program something
and you are not able to do it, it should return reasonable return value.
I would say error value.
Maybe you just need to improve that debug message to look more sensible.M
PATCH v9 4/7 ARM: socfpga: Add the configuration for FPGA SoCFPGA A10 SoCDK
In reply to tien.fong.chee at intel.comFrom: 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
@@ -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.2.0
PATCH v9 5/7 spl : socfpga: Implement fpga bitstream loading with socfpga loadfs
In reply to tien.fong.chee at intel.comFrom: 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 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.
--- arch/arm/mach-socfpga/spl_a10.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/spl_a10.c +30 -1
@@ -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 * 1024DECLARE_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)
Signature · 1 line
2.2.0
PATCH v9 6/7 ARM: socfpga: Synchronize the configuration for A10 SoCDK
In reply to tien.fong.chee at intel.comFrom: 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
@@ -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.2.0
PATCH v9 7/7 ARM: socfpga: Increase Malloc pool size to support FAT filesystem in SPL
In reply to tien.fong.chee at intel.comFrom: 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
@@ -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.2.0
Chee
v9 cover Add support for loading FPGA bitstream
In reply to tien.fong.chee at intel.comQuoted 53 lines · tien.fong.chee at intel.com
From: Tien Fong Chee <[email protected]>
This version mainly resolved comments from Marek in [v8].
This series is working on top of u-boot.git - http://git.denx.de/u-b
oot.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)2 a. [U-Boot,v3,1/2] fs: fat: dynamically allocate memory for temporary buffer
b. [U-Boot,v3,2/2] fs: fat: Reduce default max clustersize 64KiB from malloc
pool
https://patchwork.ozlabs.org/project/uboot/list/?series=91135 (under review)3. [U-Boot] misc:
fs_loader: Replace label with DT phandle
https://patchwork.ozlabs.org/project/uboot/list/?series=92167 (under review)[v8]: https://www.mail-archive.com/u-boot at lists.denx.de/msg316086.htm l
[v7]: https://www.mail-archive.com/u-boot at lists.denx.de/msg314511.htm lTien Fong Chee (7):
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: 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
SPLarch/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 | 533
++++++++++++++++++++-
include/configs/socfpga_common.h | 4 +- include/image.h | 4 +
Quoted 3 lines
9 files changed, 682 insertions(+), 32 deletions(-)create mode 100644 board/altera/arria10-socdk/fit_spl_fpga.its
Any comment?
Thanks,
TF