From 92a7ea7b01488128b7ab50217767a7036e1c5dfb Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Tue, 25 Jun 2019 15:23:04 +0530 Subject: [PATCH] gpu: nvgpu: remove non-safe code from unit tests 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 Reviewed-on: https://git-master.nvidia.com/r/2142941 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra Reviewed-by: Alex Waterman GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/hal/fifo/pbdma_gv11b_fusa.c | 2 +- userspace/units/fifo/channel/nvgpu-channel.c | 21 ++++++------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/nvgpu/hal/fifo/pbdma_gv11b_fusa.c b/drivers/gpu/nvgpu/hal/fifo/pbdma_gv11b_fusa.c index 33b7935b7..018ff0212 100644 --- a/drivers/gpu/nvgpu/hal/fifo/pbdma_gv11b_fusa.c +++ b/drivers/gpu/nvgpu/hal/fifo/pbdma_gv11b_fusa.c @@ -244,7 +244,7 @@ void gv11b_pbdma_setup_hw(struct gk20a *g) timeout = nvgpu_readl(g, pbdma_timeout_r(i)); nvgpu_log_info(g, "pbdma_timeout reg val = 0x%08x", timeout); - if (!nvgpu_platform_is_silicon(g)) { + if (nvgpu_platform_is_silicon(g)) { timeout = set_field(timeout, pbdma_timeout_period_m(), pbdma_timeout_period_max_f()); nvgpu_log_info(g, "new pbdma_timeout reg val = 0x%08x", diff --git a/userspace/units/fifo/channel/nvgpu-channel.c b/userspace/units/fifo/channel/nvgpu-channel.c index c37490f10..344db5fa8 100644 --- a/userspace/units/fifo/channel/nvgpu-channel.c +++ b/userspace/units/fifo/channel/nvgpu-channel.c @@ -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 {