leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpga: zynq: Add delay after PCFG_PROG_B change

Browse Source 
There is delay needed after PCFG_PROGB change if
AES key source is efuse. This fixes the issue of
encrypted bitstream loading with AES efuse as key
source.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Siva Durga Prasad Paladugu 2018-03-06 17:37:09 +05:30 committed by Michal Simek
parent 31bcb3444c
commit 71723aaec5
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/fpga/zynqpl.c
View File

@ -17,6 +17,7 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#define DEVCFG_CTRL_PCFG_PROG_B 0x40000000 #define DEVCFG_CTRL_PCFG_PROG_B 0x40000000
#define DEVCFG_CTRL_PCFG_AES_EFUSE_MASK 0x00001000
#define DEVCFG_ISR_FATAL_ERROR_MASK 0x00740040 #define DEVCFG_ISR_FATAL_ERROR_MASK 0x00740040
#define DEVCFG_ISR_ERROR_FLAGS_MASK 0x00340840 #define DEVCFG_ISR_ERROR_FLAGS_MASK 0x00340840
#define DEVCFG_ISR_RX_FIFO_OV 0x00040000 #define DEVCFG_ISR_RX_FIFO_OV 0x00040000
@ -205,9 +206,24 @@ static int zynq_dma_xfer_init(bitstream_type bstype)
/* Setting PCFG_PROG_B signal to high */ /* Setting PCFG_PROG_B signal to high */
control = readl(&devcfg_base->ctrl); control = readl(&devcfg_base->ctrl);
writel(control | DEVCFG_CTRL_PCFG_PROG_B, &devcfg_base->ctrl); writel(control | DEVCFG_CTRL_PCFG_PROG_B, &devcfg_base->ctrl);
/*
* Delay is required if AES efuse is selected as
* key source.
*/
if (control & DEVCFG_CTRL_PCFG_AES_EFUSE_MASK)
mdelay(5);
/* Setting PCFG_PROG_B signal to low */ /* Setting PCFG_PROG_B signal to low */
writel(control & ~DEVCFG_CTRL_PCFG_PROG_B, &devcfg_base->ctrl); writel(control & ~DEVCFG_CTRL_PCFG_PROG_B, &devcfg_base->ctrl);
/*
* Delay is required if AES efuse is selected as
* key source.
*/
if (control & DEVCFG_CTRL_PCFG_AES_EFUSE_MASK)
mdelay(5);
/* Polling the PCAP_INIT status for Reset */ /* Polling the PCAP_INIT status for Reset */
ts = get_timer(0); ts = get_timer(0);
while (readl(&devcfg_base->status) & DEVCFG_STATUS_PCFG_INIT) { while (readl(&devcfg_base->status) & DEVCFG_STATUS_PCFG_INIT) {