mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-24 10:11:26 +03:00
DCE KMD: Add timeout into synchronous IPC calls
This is for avoiding kernel hang when DCE FW fails to respond. Failures of IPC call will return -ERESTARTSYS or -ETIMEOUT, which will be handled by caller functions: 1. tegra_dce_client_ipc_send_recv (EXPORT_SYMBOL) This is module export symbol and caller have the responsibility of checking return value. 2. DCE FSM event handler Error return will change back to previous state. DCE_IPC_TIMEOUT_MS_MAX is set to 10000[ms] SHA computation time on SC7 entry request can go up 2sec. Host tolerance time must be larger than this. Jira TDS-16567 https://nvbugspro.nvidia.com/bug/5335034 Change-Id: I5d77a9497f14f305d07b98e39a58fbcecafedf92 Signed-off-by: charliej <charliej@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3358620 GVS: buildbot_gerritrpt <buildbot_gerritrpt@nvidia.com> Reviewed-by: Mahesh Kumar <mahkumar@nvidia.com> Reviewed-by: svcacv <svcacv@nvidia.com> Tested-by: Mahesh Kumar <mahkumar@nvidia.com> Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com> (cherry picked from commit 6c2ab3c78ce7cba0e88455b263d51d1a88c03927) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3402917
This commit is contained in:
@@ -124,12 +124,10 @@ int dce_handle_boot_complete_requested_event(struct tegra_dce *d, void *params)
|
||||
|
||||
dce_os_debug(d, "Waiting for dce fw to boot...");
|
||||
|
||||
ret = dce_wait_cond_wait_interruptible(d, &d->ipc_waits[DCE_WAIT_BOOT_COMPLETE], true, 0);
|
||||
ret = dce_wait_cond_wait_interruptible(d, &d->ipc_waits[DCE_WAIT_BOOT_COMPLETE], true,
|
||||
0);
|
||||
if (ret) {
|
||||
/**
|
||||
* TODO: Add error handling for abort and retry
|
||||
*/
|
||||
dce_os_err(d, "dce boot wait was interrupted with err:%d", ret);
|
||||
dce_os_err(d, "dce boot wait, interrupted:%d", ret);
|
||||
}
|
||||
|
||||
boot_done:
|
||||
@@ -388,13 +386,10 @@ static int dce_mailbox_wait_boot_interface(struct tegra_dce *d)
|
||||
u32 status;
|
||||
int ret;
|
||||
|
||||
ret = dce_wait_cond_wait_interruptible(d, &d->ipc_waits[DCE_WAIT_BOOT_CMD], true, 0);
|
||||
if (ret) {
|
||||
/**
|
||||
* TODO: Add error handling for abort and retry
|
||||
*/
|
||||
dce_os_err(d, "dce mbox wait was interrupted with err:%d", ret);
|
||||
}
|
||||
ret = dce_wait_cond_wait_interruptible(d, &d->ipc_waits[DCE_WAIT_BOOT_CMD], true,
|
||||
DCE_IPC_TIMEOUT_MS_MAX);
|
||||
if (ret)
|
||||
dce_os_err(d, "dce mbox wait was interrupted or timedout:%d", ret);
|
||||
|
||||
status = dce_mailbox_get_interface_status(d,
|
||||
DCE_MAILBOX_BOOT_INTERFACE);
|
||||
@@ -405,8 +400,8 @@ static int dce_mailbox_wait_boot_interface(struct tegra_dce *d)
|
||||
status);
|
||||
return -EBADE;
|
||||
}
|
||||
|
||||
return 0;
|
||||
/* if boot failure flag is not available, return ETIMEOUT or ERESTARTSYS */
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user