From b85c8b2b7c819311bf86e11bc455be3b289e5a8e Mon Sep 17 00:00:00 2001 From: tkudav Date: Thu, 16 Jan 2020 13:16:30 +0530 Subject: [PATCH] gpu: nvgpu: change test names to unique identifier Use a unique identifier to avoid below errors in SWVS: Warning doxygenfunction: Unable to resolve multiple matches for function 'test_xxx' with arguments () in doxygen xml output for project 'nvgpu_doxygen'... JIRA NVGPU-4679 Change-Id: Ifb310381fcc47c6e7ce41bd8789abc173f8380dc Signed-off-by: tkudav Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2279842 Tested-by: mobile promotions Reviewed-by: mobile promotions --- userspace/required_tests.json | 4 ++-- userspace/units/bus/nvgpu-bus.c | 4 ++-- userspace/units/bus/nvgpu-bus.h | 4 ++-- userspace/units/priv_ring/nvgpu-priv_ring.c | 4 ++-- userspace/units/priv_ring/nvgpu-priv_ring.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/userspace/required_tests.json b/userspace/required_tests.json index 59e911cda..c8244eeda 100644 --- a/userspace/required_tests.json +++ b/userspace/required_tests.json @@ -372,7 +372,7 @@ "test_level": 0 }, { - "test": "test_isr", + "test": "test_bus_isr", "case": "bus_isr", "unit": "bus", "test_level": 0 @@ -1974,7 +1974,7 @@ "test_level": 0 }, { - "test": "test_isr", + "test": "test_priv_ring_isr", "case": "priv_ring_isr", "unit": "priv_ring", "test_level": 0 diff --git a/userspace/units/bus/nvgpu-bus.c b/userspace/units/bus/nvgpu-bus.c index 88c2f5b75..d1a335b20 100644 --- a/userspace/units/bus/nvgpu-bus.c +++ b/userspace/units/bus/nvgpu-bus.c @@ -320,7 +320,7 @@ done: return ret; } -int test_isr(struct unit_module *m, struct gk20a *g, void *args) +int test_bus_isr(struct unit_module *m, struct gk20a *g, void *args) { int ret = UNIT_SUCCESS; @@ -343,7 +343,7 @@ struct unit_module_test bus_tests[] = { UNIT_TEST(bus_setup, test_bus_setup, NULL, 0), UNIT_TEST(bus_init_hw, test_init_hw, NULL, 0), UNIT_TEST(bus_bar_bind, test_bar_bind, NULL, 0), - UNIT_TEST(bus_isr, test_isr, NULL, 0), + UNIT_TEST(bus_isr, test_bus_isr, NULL, 0), UNIT_TEST(bus_free_reg_space, test_bus_free_reg_space, NULL, 0), }; diff --git a/userspace/units/bus/nvgpu-bus.h b/userspace/units/bus/nvgpu-bus.h index 7f9a24b4a..aeaae12ac 100644 --- a/userspace/units/bus/nvgpu-bus.h +++ b/userspace/units/bus/nvgpu-bus.h @@ -151,7 +151,7 @@ int test_init_hw(struct unit_module *m, struct gk20a *g, void *args); int test_bar_bind(struct unit_module *m, struct gk20a *g, void *args); /** - * Test specification for: test_isr + * Test specification for: test_bus_isr * * Description: Verify the bus.isr HAL. * @@ -174,5 +174,5 @@ int test_bar_bind(struct unit_module *m, struct gk20a *g, void *args); * Output: * - UNIT_SUCCESS. */ -int test_isr(struct unit_module *m, struct gk20a *g, void *args); +int test_bus_isr(struct unit_module *m, struct gk20a *g, void *args); #endif /* UNIT_NVGPU_BUS_H */ diff --git a/userspace/units/priv_ring/nvgpu-priv_ring.c b/userspace/units/priv_ring/nvgpu-priv_ring.c index eb53d0a52..141b3de3b 100644 --- a/userspace/units/priv_ring/nvgpu-priv_ring.c +++ b/userspace/units/priv_ring/nvgpu-priv_ring.c @@ -273,7 +273,7 @@ int test_get_fbp_count(struct unit_module *m, struct gk20a *g, void *args) return ret; } -int test_isr(struct unit_module *m, struct gk20a *g, void *args) +int test_priv_ring_isr(struct unit_module *m, struct gk20a *g, void *args) { int ret = UNIT_SUCCESS; @@ -358,7 +358,7 @@ struct unit_module_test priv_ring_tests[] = { UNIT_TEST(priv_ring_get_gpc_count, test_get_gpc_count, NULL, 0), UNIT_TEST(priv_ring_get_fbp_count, test_get_fbp_count, NULL, 0), UNIT_TEST(priv_ring_decode_error_code, test_decode_error_code, NULL, 0), - UNIT_TEST(priv_ring_isr, test_isr, NULL, 0), + UNIT_TEST(priv_ring_isr, test_priv_ring_isr, NULL, 0), UNIT_TEST(priv_ring_free_reg_space, test_priv_ring_free_reg_space, NULL, 0), }; diff --git a/userspace/units/priv_ring/nvgpu-priv_ring.h b/userspace/units/priv_ring/nvgpu-priv_ring.h index 36ef0252f..79a18b7a0 100644 --- a/userspace/units/priv_ring/nvgpu-priv_ring.h +++ b/userspace/units/priv_ring/nvgpu-priv_ring.h @@ -186,7 +186,7 @@ int test_get_gpc_count(struct unit_module *m, struct gk20a *g, void *args); int test_get_fbp_count(struct unit_module *m, struct gk20a *g, void *args); /** - * Test specification for: test_isr + * Test specification for: test_priv_ring_isr * * Description: Verify the priv_ring.isr HAL. * @@ -217,7 +217,7 @@ int test_get_fbp_count(struct unit_module *m, struct gk20a *g, void *args); * Output: * - UNIT_SUCCESS */ -int test_isr(struct unit_module *m, struct gk20a *g, void *args); +int test_priv_ring_isr(struct unit_module *m, struct gk20a *g, void *args); /** * Test specification for: test_decode_error_code