github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

fpga: altera-cvp: Retry teardown and reset CVP state on failure

Browse Source 
The driver polls CFG_RDY for 0 as notification that the endpoint has
finished teardown and a new session can start safely. After a bad
bitstream that poll can time out: CFG_RDY may stay stuck when
HIP_CLK_SEL=0 if the device has already left usermode before the poll.

Retrying teardown alone is not enough. Exit CvP mode and switch the HIP
clock that feeds CFG_RDY so CVP_STATUS becomes responsive again, then
try the teardown once more.

Introduce altera_cvp_recovery() to wrap this cleanup and single retry.

Signed-off-by: Nazim Amirul <muhammad.nazim.amirul.nazle.asmade@altera.com>
Reviewed-by: Xu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20260923053233.10890-3-muhammad.nazim.amirul.nazle.asmade@altera.com
Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com>
This commit is contained in:
Nazim Amirul 2026-09-22 22:32:33 -07:00 committed by Xu Yilun
parent 0dcfad56e5
commit 093da48782
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/fpga/altera-cvp.c
View File

@ -318,7 +318,29 @@ static int altera_cvp_teardown(struct fpga_manager *mgr,
ret = altera_cvp_wait_status(conf, VSE_CVP_STATUS_CFG_RDY, 0,
conf->priv->poll_time_us);
if (ret)
dev_err(&mgr->dev, "CFG_RDY == 0 timeout\n");
dev_warn(&mgr->dev, "CFG_RDY == 0 timeout\n");
return ret;
}
static int altera_cvp_recovery(struct fpga_manager *mgr,
struct fpga_image_info *info)
{
struct altera_cvp_conf *conf = mgr->priv;
int ret;
ret = altera_cvp_teardown(mgr, info);
if (ret) {
/*
* CVP_STATUS may get stuck if the device left user mode
* before the poll. Exit CvP mode to switch back the clock
* feeding CVP_STATUS, then try the teardown again.
*/
altera_cvp_disable_cvp_mode(conf);
ret = altera_cvp_teardown(mgr, info);
if (ret)
dev_err(&mgr->dev, "Tear-down failed\n");
}
return ret;
}
@ -355,7 +377,7 @@ static int altera_cvp_write_init(struct fpga_manager *mgr,
if (val & VSE_CVP_STATUS_CFG_RDY) {
dev_warn(&mgr->dev, "CvP already started, tear down first\n");
ret = altera_cvp_teardown(mgr, info);
ret = altera_cvp_recovery(mgr, info);
if (ret)
return ret;
}
@ -496,7 +518,7 @@ static int altera_cvp_write_complete(struct fpga_manager *mgr,
u32 mask, val;
int ret;
ret = altera_cvp_teardown(mgr, info);
ret = altera_cvp_recovery(mgr, info);
if (ret)
return ret;