Skip to content

S
Simple VME FMC Carrier SVEC
Commit 6d8377ab authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

kernel: don't wait for done if already failed 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@vaga.pv.it>
parent e922da65
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
kernel/svec-core.c
View file @ 6d8377ab
...@@ -290,6 +290,11 @@ static int svec_fpga_write_stop(struct svec_dev *svec) ...@@ -290,6 +290,11 @@ static int svec_fpga_write_stop(struct svec_dev *svec)
1); 1);
if(svec->prog_err == -EINVAL) if(svec->prog_err == -EINVAL)
svec->prog_err = 0; svec->prog_err = 0;
} else {
dev_err(&svec->dev,
"Failed to program the application FPGA (%d).\n",
svec->prog_err);
goto out;
} }
/* Reset the bitstream programming words */ /* Reset the bitstream programming words */
...@@ -314,11 +319,9 @@ static int svec_fpga_write_stop(struct svec_dev *svec) ...@@ -314,11 +319,9 @@ static int svec_fpga_write_stop(struct svec_dev *svec)
dev_err(&svec->dev, "Bitstream loaded, status ERROR\n"); dev_err(&svec->dev, "Bitstream loaded, status ERROR\n");
return -EINVAL; return -EINVAL;
} }
out:
/* give the VME bus control to App FPGA */ /* give the VME bus control to App FPGA */
iowrite32be(XLDR_CSR_EXIT, loader_addr + XLDR_REG_CSR); iowrite32be(XLDR_CSR_EXIT, loader_addr + XLDR_REG_CSR);
if (svec->prog_err)
dev_err(&svec->dev, "FPGA programming failed (%d)\n", svec->prog_err);
/* give the VME core a little while to settle up */ /* give the VME core a little while to settle up */
msleep(10); msleep(10);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment