From a1259a6795eedc78adb1528eee0444ca867859a7 Mon Sep 17 00:00:00 2001 From: tkudav Date: Mon, 23 Dec 2019 16:15:33 +0530 Subject: [PATCH] gpu: nvgpu: Update test types in common.fbp SWUTS Use the updated test types. Other (setup) --> Other (cleanup) Feature based --> Feature Also, change test names to 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: I2bddf608f22d8c9f9dd5fbde9ca39f4417839077 Signed-off-by: tkudav Reviewed-on: https://git-master.nvidia.com/r/2267587 Reviewed-by: mobile promotions Tested-by: mobile promotions --- userspace/required_tests.json | 4 ++-- userspace/units/fbp/nvgpu-fbp.c | 8 ++++---- userspace/units/fbp/nvgpu-fbp.h | 18 +++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/userspace/required_tests.json b/userspace/required_tests.json index 4da09c870..fc4eb5a7d 100644 --- a/userspace/required_tests.json +++ b/userspace/required_tests.json @@ -726,7 +726,7 @@ "test_level": 0 }, { - "test": "test_free_reg_space", + "test": "test_fbp_free_reg_space", "case": "fbp_free_reg_space", "unit": "fbp", "test_level": 0 @@ -744,7 +744,7 @@ "test_level": 0 }, { - "test": "test_setup", + "test": "test_fbp_setup", "case": "fbp_setup", "unit": "fbp", "test_level": 0 diff --git a/userspace/units/fbp/nvgpu-fbp.c b/userspace/units/fbp/nvgpu-fbp.c index 7dc1a6c80..99501e1ad 100644 --- a/userspace/units/fbp/nvgpu-fbp.c +++ b/userspace/units/fbp/nvgpu-fbp.c @@ -66,7 +66,7 @@ static struct nvgpu_posix_io_callbacks test_reg_callbacks = { .bar1_readl = readl_access_reg_fn, }; -int test_setup(struct unit_module *m, struct gk20a *g, void *args) +int test_fbp_setup(struct unit_module *m, struct gk20a *g, void *args) { /* Init HAL */ g->ops.top.get_max_fbps_count = gm20b_top_get_max_fbps_count; @@ -93,7 +93,7 @@ int test_setup(struct unit_module *m, struct gk20a *g, void *args) return UNIT_SUCCESS; } -int test_free_reg_space(struct unit_module *m, struct gk20a *g, void *args) +int test_fbp_free_reg_space(struct unit_module *m, struct gk20a *g, void *args) { /* Free register space */ nvgpu_posix_io_delete_reg_space(g, fuse_status_opt_fbp_r()); @@ -209,10 +209,10 @@ int test_fbp_remove_support(struct unit_module *m, struct gk20a *g, void *args) return ret; } struct unit_module_test fbp_tests[] = { - UNIT_TEST(fbp_setup, test_setup, NULL, 0), + UNIT_TEST(fbp_setup, test_fbp_setup, NULL, 0), UNIT_TEST(fbp_init_and_query, test_fbp_init_and_query, NULL, 0), UNIT_TEST(fbp_remove_support, test_fbp_remove_support, NULL, 0), - UNIT_TEST(fbp_free_reg_space, test_free_reg_space, NULL, 0), + UNIT_TEST(fbp_free_reg_space, test_fbp_free_reg_space, NULL, 0), }; UNIT_MODULE(fbp, fbp_tests, UNIT_PRIO_NVGPU_TEST); diff --git a/userspace/units/fbp/nvgpu-fbp.h b/userspace/units/fbp/nvgpu-fbp.h index 3fcc1a7cc..d8fc9dcb1 100644 --- a/userspace/units/fbp/nvgpu-fbp.h +++ b/userspace/units/fbp/nvgpu-fbp.h @@ -33,7 +33,7 @@ struct unit_module; */ /** - * Test specification for: test_setup + * Test specification for: test_fbp_setup * * Description: Setup prerequisites for tests. * @@ -50,16 +50,16 @@ struct unit_module; * - UNIT_FAIL if encounters an error creating register space; * - UNIT_SUCCESS otherwise */ -int test_setup(struct unit_module *m, struct gk20a *g, void *args); +int test_fbp_setup(struct unit_module *m, struct gk20a *g, void *args); /** - * Test specification for: test_free_reg_space + * Test specification for: test_fbp_free_reg_space * * Description: Free resources from test_setup() * - * Test Type: Other (setup) + * Test Type: Other (cleanup) * - * Input: test_setup() has been executed. + * Input: test_fbp_setup() has been executed. * * Steps: * - Free up NV_TOP and NV_FUSE register space. @@ -67,18 +67,18 @@ int test_setup(struct unit_module *m, struct gk20a *g, void *args); * Output: * - UNIT_SUCCESS */ -int test_free_reg_space(struct unit_module *m, struct gk20a *g, void *args); +int test_fbp_free_reg_space(struct unit_module *m, struct gk20a *g, void *args); /** * Test specification for: test_fbp_init_and_query * * Description: Verify the FBP init and config query APIs exposed by common.fbp. * - * Test Type: Feature Based + * Test Type: Feature * * Targets: nvgpu_fbp_init_support, nvgpu_fbp_get_max_fbps_count, nvgpu_fbp_get_fbp_en_mask * - * Input: test_setup() has been executed. + * Input: test_fbp_setup() has been executed. * * Steps: * - Initialize the FBP floorsweeping status in fuse to 0xE1 by writing to fuse @@ -107,7 +107,7 @@ int test_fbp_init_and_query(struct unit_module *m, struct gk20a *g, void *args); * * Description: Verify the nvgpu_fbp_remove_support exposed by common.fbp. * - * Test Type: Feature Based + * Test Type: Feature * * Targets: nvgpu_fbp_remove_support *