openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fpga: region: Add fpga-region property 'encrypted-fpga-config' 

Add fpga-region property to allow passing the fact that the bitstream is
encrypted to the fpga-region and ultimately to the low-level driver.

Signed-off-by: Moritz Fischer <mdf@kernel.org>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Moritz Fischer 2017-02-27 09:19:02 -06:00 committed by Greg Kroah-Hartman
parent 7f33bbca14
commit 161db575ef
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/fpga/fpga-region.txt
View File

@ -186,6 +186,7 @@ Optional properties:
otherwise full reconfiguration is done. otherwise full reconfiguration is done.
- external-fpga-config : boolean, set if the FPGA has already been configured - external-fpga-config : boolean, set if the FPGA has already been configured
prior to OS boot up. prior to OS boot up.
- encrypted-fpga-config : boolean, set if the bitstream is encrypted
- region-unfreeze-timeout-us : The maximum time in microseconds to wait for - region-unfreeze-timeout-us : The maximum time in microseconds to wait for
bridges to successfully become enabled after the region has been bridges to successfully become enabled after the region has been
programmed. programmed.

4
drivers/fpga/fpga-region.c
View File

@ -339,6 +339,7 @@ static int child_regions_with_firmware(struct device_node *overlay)
* *
* firmware-name : program the FPGA * firmware-name : program the FPGA
* external-fpga-config : FPGA is already programmed * external-fpga-config : FPGA is already programmed
* encrypted-fpga-config : FPGA bitstream is encrypted
* *
* The overlay can add other FPGA regions, but child FPGA regions cannot have a * The overlay can add other FPGA regions, but child FPGA regions cannot have a
* firmware-name property since those regions don't exist yet. * firmware-name property since those regions don't exist yet.
@ -373,6 +374,9 @@ static int fpga_region_notify_pre_apply(struct fpga_region *region,
if (of_property_read_bool(nd->overlay, "external-fpga-config")) if (of_property_read_bool(nd->overlay, "external-fpga-config"))
info->flags |= FPGA_MGR_EXTERNAL_CONFIG; info->flags |= FPGA_MGR_EXTERNAL_CONFIG;
if (of_property_read_bool(nd->overlay, "encrypted-fpga-config"))
info->flags |= FPGA_MGR_ENCRYPTED_BITSTREAM;
of_property_read_string(nd->overlay, "firmware-name", &firmware_name); of_property_read_string(nd->overlay, "firmware-name", &firmware_name);
of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us", of_property_read_u32(nd->overlay, "region-unfreeze-timeout-us",