From eaf2088217575a211fbdb4bd21aa76dba7677af4 Mon Sep 17 00:00:00 2001 From: tkudav Date: Thu, 26 Dec 2019 16:14:29 +0530 Subject: [PATCH] gpu: nvgpu: Update test types in priv_ring 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: I66cda323387163a41808be09a69f625d53b744ed Signed-off-by: tkudav Reviewed-on: https://git-master.nvidia.com/r/2269041 Reviewed-by: mobile promotions Tested-by: mobile promotions --- userspace/required_tests.json | 4 +- userspace/units/priv_ring/nvgpu-priv_ring.c | 10 +++-- userspace/units/priv_ring/nvgpu-priv_ring.h | 42 ++++++++++----------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/userspace/required_tests.json b/userspace/required_tests.json index 23e3addad..4a38477f3 100644 --- a/userspace/required_tests.json +++ b/userspace/required_tests.json @@ -1920,7 +1920,7 @@ "test_level": 0 }, { - "test": "test_setup", + "test": "test_priv_ring_setup", "case": "priv_ring_setup", "unit": "priv_ring", "test_level": 0 @@ -1968,7 +1968,7 @@ "test_level": 0 }, { - "test": "test_free_reg_space", + "test": "test_priv_ring_free_reg_space", "case": "priv_ring_free_reg_space", "unit": "priv_ring", "test_level": 0 diff --git a/userspace/units/priv_ring/nvgpu-priv_ring.c b/userspace/units/priv_ring/nvgpu-priv_ring.c index 3fb239b3f..eb53d0a52 100644 --- a/userspace/units/priv_ring/nvgpu-priv_ring.c +++ b/userspace/units/priv_ring/nvgpu-priv_ring.c @@ -107,7 +107,7 @@ static struct nvgpu_posix_io_callbacks test_reg_callbacks = { #define NV_PMC_START 0x00000000U #define NV_PMC_SIZE 0x00000FFFU -int test_setup(struct unit_module *m, struct gk20a *g, void *args) +int test_priv_ring_setup(struct unit_module *m, struct gk20a *g, void *args) { /* Init HAL */ g->ops.priv_ring.enable_priv_ring = gm20b_priv_ring_enable; @@ -161,7 +161,8 @@ 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_priv_ring_free_reg_space(struct unit_module *m, struct gk20a *g, + void *args) { /* Free register space */ nvgpu_posix_io_delete_reg_space(g, NV_PRIV_MASTER_START); @@ -349,7 +350,7 @@ int test_decode_error_code(struct unit_module *m, struct gk20a *g, void *args) } struct unit_module_test priv_ring_tests[] = { - UNIT_TEST(priv_ring_setup, test_setup, NULL, 0), + UNIT_TEST(priv_ring_setup, test_priv_ring_setup, NULL, 0), UNIT_TEST(priv_ring_enable_priv_ring, test_enable_priv_ring, NULL, 0), UNIT_TEST(priv_ring_set_ppriv_timeout_settings, test_set_ppriv_timeout_settings, NULL, 0), @@ -358,7 +359,8 @@ struct unit_module_test priv_ring_tests[] = { 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_free_reg_space, test_free_reg_space, NULL, 0), + UNIT_TEST(priv_ring_free_reg_space, + test_priv_ring_free_reg_space, NULL, 0), }; UNIT_MODULE(priv_ring, priv_ring_tests, UNIT_PRIO_NVGPU_TEST); diff --git a/userspace/units/priv_ring/nvgpu-priv_ring.h b/userspace/units/priv_ring/nvgpu-priv_ring.h index b059294d4..9195a79a7 100644 --- a/userspace/units/priv_ring/nvgpu-priv_ring.h +++ b/userspace/units/priv_ring/nvgpu-priv_ring.h @@ -33,7 +33,7 @@ struct unit_module; */ /** - * Test specification for: test_setup + * Test specification for: test_priv_ring_setup * * Description: Setup prerequisites for tests. * @@ -51,16 +51,16 @@ struct unit_module; * - UNIT_FAIL if encounters an error creating reg space * - UNIT_SUCCESS otherwise */ -int test_setup(struct unit_module *m, struct gk20a *g, void *args); +int test_priv_ring_setup(struct unit_module *m, struct gk20a *g, void *args); /** - * Test specification for: test_free_reg_space + * Test specification for: test_priv_ring_free_reg_space * - * Description: Free resources from test_setup() + * Description: Free resources from test_priv_ring_setup() * - * Test Type: Other (setup) + * Test Type: Other (cleanup) * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Free up NV_PRIV_MASTER, NV_PRIV_SYS, NV_PRIV_GPC and NV_PMC register space. @@ -68,18 +68,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_priv_ring_free_reg_space(struct unit_module *m, struct gk20a *g, void *args); /** * Test specification for: test_enable_priv_ring * * Description: Verify the priv_ring.enable_priv_ring HAL. * - * Test Type: Feature Based + * Test Type: Feature * * Targets: gm20b_enable_priv_ring * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Call enable_priv_ring() HAL. @@ -98,11 +98,11 @@ int test_enable_priv_ring(struct unit_module *m, struct gk20a *g, void *args); * * Description: Verify the priv_ring.set_ppriv_timeout_settings HAL. * - * Test Type: Feature Based + * Test Type: Feature * * Targets: gm20b_priv_set_timeout_settings * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Call set_ppriv_timeout_settings HAL to set the timeout values to 0x800. @@ -120,11 +120,11 @@ int test_set_ppriv_timeout_settings(struct unit_module *m, struct gk20a *g, * * Description: Verify the priv_ring.enum_ltc HAL. * - * Test Type: Feature Based + * Test Type: Feature * * Targets: gm20b_priv_ring_enum_ltc. * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Initialize bits corresponding to count (Bits 4:0) in @@ -143,11 +143,11 @@ int test_enum_ltc(struct unit_module *m, struct gk20a *g, void *args); * * Description: Verify the priv_ring.get_gpc_count HAL. * - * Test Type: Feature Based + * Test Type: Feature * * Targets: gm20b_priv_ring_get_gpc_count * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Initialize bits corresponding to count (Bits 4:0) in @@ -166,11 +166,11 @@ int test_get_gpc_count(struct unit_module *m, struct gk20a *g, void *args); * * Description: Verify the priv_ring.get_fbp_count HAL. * - * Test Type: Feature Based + * Test Type: Feature * * Targets: gm20b_priv_ring_get_fbp_count * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Initialize bits corresponding to count (Bits 4:0) in @@ -189,11 +189,11 @@ int test_get_fbp_count(struct unit_module *m, struct gk20a *g, void *args); * * Description: Verify the priv_ring.isr HAL. * - * Test Type: Feature Based + * Test Type: Feature, Error injection * * Targets: gp10b_priv_ring_isr * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Set status0 such that: @@ -223,11 +223,11 @@ int test_isr(struct unit_module *m, struct gk20a *g, void *args); * * Description: Verify the priv_ring.decode_error_code HAL. * - * Test Type: Feature Based + * Test Type: Feature, Error injection * * Targets: gp10b_decode_error_code * - * Input: test_setup() has been executed. + * Input: test_priv_ring_setup() has been executed. * * Steps: * - Call decode_error_code HAL with different error_codes covering all the