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 non-safe code from unit tests

Browse Source 
Remove branch F_CHANNEL_SETUP_BIND_HAS_GPFIFO_MEM from the unit test
for nvgpu_channel_setup_bind as gpfifo_mem belongs to KMD and are not
part of safe builds.

Remove assignment of stub_userd_setup_sw as USERD is compiled out for
safe build.

Jira NVGPU-3172

Change-Id: I4ba72043cb97d8804887c2bed30af9d01dca563e
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2142941
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svc-mobile-misra <svc-mobile-misra@nvidia.com>
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Debarshi Dutta
2019-06-25 15:23:04 +05:30
committed by Alex Waterman
parent b2d8c4774f
commit 92a7ea7b01
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
userspace/units/fifo/channel/nvgpu-channel.c
View File

@@ -552,17 +552,15 @@ done:
}
#define F_CHANNEL_SETUP_BIND_NO_AS BIT(0)
#define F_CHANNEL_SETUP_BIND_HAS_GPFIFO_MEM BIT(1)
#define F_CHANNEL_SETUP_BIND_USERMODE_ENABLED BIT(2)
#define F_CHANNEL_SETUP_BIND_USERMODE_ALLOC_BUF_NULL BIT(3)
#define F_CHANNEL_SETUP_BIND_USERMODE_ALLOC_BUF_FAIL BIT(4)
#define F_CHANNEL_SETUP_BIND_USERMODE_SETUP_RAMFC_FAIL BIT(5)
#define F_CHANNEL_SETUP_BIND_USERMODE_UPDATE_RL_FAIL BIT(6)
#define F_CHANNEL_SETUP_BIND_LAST BIT(7)
#define F_CHANNEL_SETUP_BIND_USERMODE_ENABLED BIT(1)
#define F_CHANNEL_SETUP_BIND_USERMODE_ALLOC_BUF_NULL BIT(2)
#define F_CHANNEL_SETUP_BIND_USERMODE_ALLOC_BUF_FAIL BIT(3)
#define F_CHANNEL_SETUP_BIND_USERMODE_SETUP_RAMFC_FAIL BIT(4)
#define F_CHANNEL_SETUP_BIND_USERMODE_UPDATE_RL_FAIL BIT(5)
#define F_CHANNEL_SETUP_BIND_LAST BIT(6)
static const char *f_channel_setup_bind[] = {
"no_as",
"has_gpfifo_mem",
"usermode_enabled",
"alloc_buf_null",
"alloc_buf_fail",
@@ -631,7 +629,6 @@ int test_channel_setup_bind(struct unit_module *m,
int ret = UNIT_FAIL;
u32 fail =
F_CHANNEL_SETUP_BIND_NO_AS |
F_CHANNEL_SETUP_BIND_HAS_GPFIFO_MEM |
F_CHANNEL_SETUP_BIND_USERMODE_ENABLED |
F_CHANNEL_SETUP_BIND_USERMODE_ALLOC_BUF_NULL |
F_CHANNEL_SETUP_BIND_USERMODE_ALLOC_BUF_FAIL |
@@ -688,11 +685,6 @@ int test_channel_setup_bind(struct unit_module *m,
ch->vm = branches & F_CHANNEL_SETUP_BIND_NO_AS ?
NULL : &vm;
if (branches & F_CHANNEL_SETUP_BIND_HAS_GPFIFO_MEM) {
err = nvgpu_dma_alloc(g, PAGE_SIZE, &ch->gpfifo.mem);
assert(err == 0);
}
if (branches & F_CHANNEL_SETUP_BIND_USERMODE_ENABLED) {
ch->usermode_submit_enabled = true;
}
@@ -721,7 +713,6 @@ int test_channel_setup_bind(struct unit_module *m,
assert(err != 0);
assert(!nvgpu_mem_is_valid(&ch->usermode_userd));
assert(!nvgpu_mem_is_valid(&ch->usermode_gpfifo));
nvgpu_dma_free(g, &ch->gpfifo.mem);
ch->usermode_submit_enabled = false;
assert(nvgpu_atomic_read(&ch->bound) == false);
} else {