sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

firmware: socfpga: Fix a bug in fpgamgr_program_write_buf() 

Fix a bug in fpgamgr_program_write_buf() where .rbf file whose length
is not a multiple of 4 would cause an integer overflow which would
result in infinite loop.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Andrey Smirnov 2015-04-21 16:25:02 -07:00 committed by Sascha Hauer
parent ffbb818808
commit 143eb1d3b4
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/firmware/socfpga.c
View File

@ -324,13 +324,27 @@ static int fpgamgr_program_write_buf(struct firmware_handler *fh, const void *bu
const uint32_t *buf32 = buf;
/* write to FPGA Manager AXI data */
while (size) {
while (size >= sizeof(uint32_t)) {
writel(*buf32, mgr->regs_data);
readl(mgr->regs + FPGAMGRREGS_MON_GPIO_EXT_PORTA_ADDRESS);
buf32++;
size -= sizeof(uint32_t);
}
if (size) {
const uint8_t *buf8 = (const uint8_t *)buf32;
uint32_t word = 0;
while (size--) {
word |= *buf8;
word <<= 8;
buf8++;
}
writel(word, mgr->regs_data);
readl(mgr->regs + FPGAMGRREGS_MON_GPIO_EXT_PORTA_ADDRESS);
}
return 0;
}