dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpga: virtex2: Split out image writing from pre/post operations

Browse Source 
This is in preparation for adding slave serial programming support,
which uses the same pre/post operations as slave SelectMAP, to avoid
duplicating code.

Signed-off-by: Robert Hancock <hancock@sedsystems.ca>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Robert Hancock
2019-06-18 09:47:14 -06:00
committed by Michal Simek
parent 25d63a3677
commit 3372081cfd
1 changed files with 183 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
drivers/fpga/virtex2.c
View File

@@ -154,19 +154,18 @@ static int virtex2_info(xilinx_desc *desc)
* INIT_B and DONE lines. If both are high, configuration has * INIT_B and DONE lines. If both are high, configuration has
* succeeded. Congratulations! * succeeded. Congratulations!
*/ */
static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize) static int virtex2_slave_pre(xilinx_virtex2_slave_selectmap_fns *fn, int cookie)
{ {
int ret_val = FPGA_FAIL; unsigned long ts;
xilinx_virtex2_slave_selectmap_fns *fn = desc->iface_fns;
PRINTF("%s:%d: Start with interface functions @ 0x%p\n", PRINTF("%s:%d: Start with interface functions @ 0x%p\n",
__func__, __LINE__, fn); __func__, __LINE__, fn);
if (fn) { if (!fn) {
size_t bytecount = 0; printf("%s:%d: NULL Interface function table!\n",
unsigned char *data = (unsigned char *)buf; __func__, __LINE__);
int cookie = desc->cookie; return FPGA_FAIL;
unsigned long ts; }
/* Gotta split this one up (so the stack won't blow??) */ /* Gotta split this one up (so the stack won't blow??) */
PRINTF("%s:%d: Function Table:\n" PRINTF("%s:%d: Function Table:\n"
@@ -200,10 +199,9 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
/* /*
* Assert the program line. The minimum pulse width for * Assert the program line. The minimum pulse width for
* Virtex II devices is 300 nS (Tprogram parameter in * Virtex II devices is 300 nS (Tprogram parameter in datasheet).
* datasheet). There is no maximum value for the pulse width. * There is no maximum value for the pulse width. Check to make
* Check to make sure that INIT_B goes low after assertion of * sure that INIT_B goes low after assertion of PROG_B
* PROG_B
*/ */
(*fn->pgm)(true, true, cookie); (*fn->pgm)(true, true, cookie);
udelay(10); udelay(10);
@@ -211,8 +209,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
do { do {
if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_INIT) { if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_INIT) {
printf("%s:%d: ** Timeout after %d ticks waiting for INIT to assert.\n", printf("%s:%d: ** Timeout after %d ticks waiting for INIT to assert.\n",
__func__, __LINE__, __func__, __LINE__, CONFIG_SYS_FPGA_WAIT_INIT);
CONFIG_SYS_FPGA_WAIT_INIT);
(*fn->abort)(cookie); (*fn->abort)(cookie);
return FPGA_FAIL; return FPGA_FAIL;
} }
@@ -220,6 +217,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
(*fn->pgm)(false, true, cookie); (*fn->pgm)(false, true, cookie);
CONFIG_FPGA_DELAY(); CONFIG_FPGA_DELAY();
if (fn->clk)
(*fn->clk)(true, true, cookie); (*fn->clk)(true, true, cookie);
/* /*
@@ -230,17 +228,86 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
CONFIG_FPGA_DELAY(); CONFIG_FPGA_DELAY();
if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_INIT) { if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_INIT) {
printf("%s:%d: ** Timeout after %d ticks waiting for INIT to deassert.\n", printf("%s:%d: ** Timeout after %d ticks waiting for INIT to deassert.\n",
__func__, __LINE__, __func__, __LINE__, CONFIG_SYS_FPGA_WAIT_INIT);
CONFIG_SYS_FPGA_WAIT_INIT);
(*fn->abort)(cookie); (*fn->abort)(cookie);
return FPGA_FAIL; return FPGA_FAIL;
} }
} while ((*fn->init)(cookie) && (*fn->busy)(cookie)); } while ((*fn->init)(cookie) && (*fn->busy)(cookie));
if (fn->wr)
(*fn->wr)(true, true, cookie); (*fn->wr)(true, true, cookie);
if (fn->cs)
(*fn->cs)(true, true, cookie); (*fn->cs)(true, true, cookie);
mdelay(10); mdelay(10);
return FPGA_SUCCESS;
}
static int virtex2_slave_post(xilinx_virtex2_slave_selectmap_fns *fn,
int cookie)
{
int ret_val = FPGA_SUCCESS;
unsigned long ts;
/*
* Finished writing the data; deassert FPGA CS_B and WRITE_B signals.
*/
CONFIG_FPGA_DELAY();
if (fn->cs)
(*fn->cs)(false, true, cookie);
if (fn->wr)
(*fn->wr)(false, true, cookie);
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
putc('\n');
#endif
/*
* Check for successful configuration. FPGA INIT_B and DONE
* should both be high upon successful configuration.
*/
ts = get_timer(0);
ret_val = FPGA_SUCCESS;
while (((*fn->done)(cookie) == FPGA_FAIL) ||
(*fn->init)(cookie)) {
if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_CONFIG) {
printf("%s:%d: ** Timeout after %d ticks waiting for DONE to assert and INIT to deassert\n",
__func__, __LINE__, CONFIG_SYS_FPGA_WAIT_CONFIG);
(*fn->abort)(cookie);
ret_val = FPGA_FAIL;
break;
}
}
if (ret_val == FPGA_SUCCESS) {
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
printf("Initialization of FPGA device %d complete\n", cookie);
#endif
/*
* Run the post configuration function if there is one.
*/
if (*fn->post)
(*fn->post)(cookie);
} else {
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
printf("** Initialization of FPGA device %d FAILED\n",
cookie);
#endif
}
return ret_val;
}
static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
{
int ret_val = FPGA_FAIL;
xilinx_virtex2_slave_selectmap_fns *fn = desc->iface_fns;
size_t bytecount = 0;
unsigned char *data = (unsigned char *)buf;
int cookie = desc->cookie;
ret_val = virtex2_slave_pre(fn, cookie);
if (ret_val != FPGA_SUCCESS)
return ret_val;
/* /*
* Load the data byte by byte * Load the data byte by byte
@@ -263,7 +330,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
if ((*fn->init)(cookie)) { if ((*fn->init)(cookie)) {
printf("\n%s:%d: ** Error: INIT asserted during configuration\n", printf("\n%s:%d: ** Error: INIT asserted during configuration\n",
__func__, __LINE__); __func__, __LINE__);
printf("%d = buffer offset, %d = buffer size\n", printf("%zu = buffer offset, %zu = buffer size\n",
bytecount, bsize); bytecount, bsize);
(*fn->abort)(cookie); (*fn->abort)(cookie);
return FPGA_FAIL; return FPGA_FAIL;
@@ -299,57 +366,7 @@ static int virtex2_ssm_load(xilinx_desc *desc, const void *buf, size_t bsize)
#endif #endif
} }
/* return virtex2_slave_post(fn, cookie);
* Finished writing the data; deassert FPGA CS_B and WRITE_B
* signals.
*/
CONFIG_FPGA_DELAY();
(*fn->cs)(false, true, cookie);
(*fn->wr)(false, true, cookie);
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
putc('\n');
#endif
/*
* Check for successful configuration. FPGA INIT_B and DONE
* should both be high upon successful configuration.
*/
ts = get_timer(0);
ret_val = FPGA_SUCCESS;
while (((*fn->done)(cookie) == FPGA_FAIL) ||
(*fn->init)(cookie)) {
if (get_timer(ts) > CONFIG_SYS_FPGA_WAIT_CONFIG) {
printf("%s:%d: ** Timeout after %d ticks waiting for DONE toassert and INIT to deassert\n",
__func__, __LINE__,
CONFIG_SYS_FPGA_WAIT_CONFIG);
(*fn->abort)(cookie);
ret_val = FPGA_FAIL;
break;
}
}
if (ret_val == FPGA_SUCCESS) {
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
printf("Initialization of FPGA device %d complete\n",
cookie);
#endif
/*
* Run the post configuration function if there is one.
*/
if (*fn->post)
(*fn->post)(cookie);
} else {
#ifdef CONFIG_SYS_FPGA_PROG_FEEDBACK
printf("** Initialization of FPGA device %d FAILED\n",
cookie);
#endif
}
} else {
printf("%s:%d: NULL Interface function table!\n",
__func__, __LINE__);
}
return ret_val;
} }
/* /*