Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fpga: zynqmppl: fix fpga loads command for unencrypted use case

Browse source 
When using the fpga loads command, the driver is passing the AES encryption
key address is all cases.  However, for the authenticated, but not encrypted
use case, there is no AES encryption key, and this value is 0.

When AES encryption is not used on the fpga bitstream, the pmufw assumes that
the AES key address is a bitstream size value like what is used by the
unsecure fpga load command.

To fix the problem, this patch checks to see if the AES key address is zero.
If the AES key address is zero, it means that AES is not being used on the
bitstream and the bitstream size should be passed instead.  Thus, matching
the fpga load functionality.

Signed-off-by: Neal Frager <neal.frager@amd.com>
Acked-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
Link: https://lore.kernel.org/r/20230214131959.40298-1-neal.frager@amd.com
Signed-off-by: Michal Simek <michal.simek@amd.com>
This commit is contained in:
Neal Frager 2023-02-14 13:19:59 +00:00 committed by Michal Simek
parent cfa39857de
commit 749cbcfeac
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/fpga/zynqmppl.c
View file

@ -332,10 +332,16 @@ static int zynqmp_loads(xilinx_desc *desc, const void *buf, size_t bsize,
buf_lo = lower_32_bits((ulong)buf); buf_lo = lower_32_bits((ulong)buf);
buf_hi = upper_32_bits((ulong)buf); buf_hi = upper_32_bits((ulong)buf);
ret = xilinx_pm_request(PM_FPGA_LOAD, buf_lo, if ((u32)(uintptr_t)fpga_sec_info->userkey_addr)
ret = xilinx_pm_request(PM_FPGA_LOAD, buf_lo,
buf_hi, buf_hi,
(u32)(uintptr_t)fpga_sec_info->userkey_addr, (u32)(uintptr_t)fpga_sec_info->userkey_addr,
flag, ret_payload); flag, ret_payload);
else
ret = xilinx_pm_request(PM_FPGA_LOAD, buf_lo,
buf_hi, (u32)bsize,
flag, ret_payload);
if (ret) if (ret)
puts("PL FPGA LOAD fail\n"); puts("PL FPGA LOAD fail\n");
else else