nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: remove timeout fault injection tests

Browse Source 
The timeout init API is changing to return void in most cases. Adapt the
unit tests to the reduced branching.

Change-Id: I4d05484529fe4ef46b518f41d10b71a4a9f9c6fb
Signed-off-by: Konsta Hölttä <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2614286
Reviewed-by: svcacv <svcacv@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Konsta Hölttä
2021-10-21 10:40:20 +03:00
committed by mobile promotions
parent 99a664bda0
commit 9b3f3ea4be
17 changed files with 15 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
userspace/units/fifo/preempt/gv11b/nvgpu-preempt-gv11b.c
View File

@@ -366,14 +366,9 @@ int test_gv11b_fifo_is_preempt_pending(struct unit_module *m, struct gk20a *g,
struct nvgpu_tsg *tsg = NULL;
struct gpu_ops gops = g->ops;
unsigned int id_type;
struct nvgpu_posix_fault_inj *timers_fi;
struct nvgpu_os_posix *p = nvgpu_os_posix_from_gk20a(g);
u32 ctx_stat = 0U;
u32 id = 0U, next_id = 0U;
/* Assuming runlist_id is 0 */
u32 runlist_served_pbdmas = g->fifo.runlists[0U]->pbdma_bitmask;
timers_fi = nvgpu_timers_get_fault_injection();
err = nvgpu_runlist_setup_sw(g);
unit_assert(err == 0, goto done);
@@ -407,10 +402,9 @@ int test_gv11b_fifo_is_preempt_pending(struct unit_module *m, struct gk20a *g,
true : false;
if (branches & F_PREEMPT_PENDING_POLL_PBDMA_FAIL) {
nvgpu_posix_enable_fault_injection(timers_fi, true, 0U);
/* TODO: make the poll loop time out */
} else if (branches & F_PREEMPT_PENDING_POLL_ENG_TIMEOUT_FAIL) {
nvgpu_posix_enable_fault_injection(timers_fi, true,
__builtin_popcount(runlist_served_pbdmas));
/* TODO: make the poll loop time out */
}
/*
@@ -420,10 +414,6 @@ int test_gv11b_fifo_is_preempt_pending(struct unit_module *m, struct gk20a *g,
stub.pbdma_st.chsw_status = NVGPU_PBDMA_CHSW_STATUS_INVALID;
if (branches & F_PREEMPT_PENDING_POLL_ENG_PRE_SI_RETRIES) {
/* Timeout should not expire */
nvgpu_posix_enable_fault_injection(timers_fi, true,
PREEMPT_PENDING_POLL_PRE_SI_RETRIES + 4U);
/* Force engine status = ctxsw_switch */
branches |= F_PREEMPT_PENDING_CTX_STAT_SWITCH;
/* Force eng_intr_pending = 0 */
@@ -495,8 +485,6 @@ int test_gv11b_fifo_is_preempt_pending(struct unit_module *m, struct gk20a *g,
} else {
unit_assert(err == 0, goto done);
}
nvgpu_posix_enable_fault_injection(timers_fi, false, 0);
}
ret = UNIT_SUCCESS;