gpu: nvgpu: add missing gops_gr_init hal to target section

Add few missing gr.init hal functions being used from the gr.init unit test to the target section. Jira NVGPU-4888 Change-Id: I5f5604d3530f805cc605c33448371de176f9927a Signed-off-by: vinodg <vinodg@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2279668 Reviewed-by: Deepak Nibade <dnibade@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
2025-12-25 02:52:51 +03:00 · 2020-01-15 17:48:52 -08:00
parent 89f87c12fa
commit 1843a10f39
2 changed files with 75 additions and 37 deletions
--- a/userspace/units/gr/init/nvgpu-gr-init-hal-gv11b.h
+++ b/userspace/units/gr/init/nvgpu-gr-init-hal-gv11b.h
@@ -40,7 +40,7 @@ struct unit_module;
 *
 * Test Type: Feature, Error guessing
 *
- * Targets: g->ops.gr.init.wait_empty.
+ * Targets: gops_gr_init.wait_empty, gp10b_gr_init_wait_empty
 *
 * Input: gr_init_setup, gr_init_prepare, gr_init_support must have
 *        been executed successfully.
@@ -65,7 +65,7 @@ int test_gr_init_hal_wait_empty(struct unit_module *m,
 *
 * Test Type: Feature, Error guessing
 *
- * Targets: g->ops.gr.init.wait_idle.
+ * Targets: gops_gr_init.wait_idle, gm20b_gr_init_wait_idle
 *
 * Input: gr_init_setup, gr_init_prepare, gr_init_support must have
 *        been executed successfully.
@@ -107,7 +107,7 @@ int test_gr_init_hal_wait_idle(struct unit_module *m,
 *
 * Test Type: Feature, Error guessing
 *
- * Targets: g->ops.gr.init.wait_fe_idle.
+ * Targets: gops_gr_init.wait_fe_idle, gm20b_gr_init_wait_fe_idle
 *
 * Input: gr_init_setup, gr_init_prepare, gr_init_support must have
 *        been executed successfully.
@@ -133,7 +133,8 @@ int test_gr_init_hal_wait_fe_idle(struct unit_module *m,
 *
 * Test Type: Feature, Error guessing
 *
- * Targets: g->ops.gr.init.fe_pwr_mode_force_on.
+ * Targets: gops_gr_init.fe_pwr_mode_force_on,
+ *          gm20b_gr_init_fe_pwr_mode_force_on
 *
 * Input: gr_init_setup, gr_init_prepare, gr_init_support must have
 *        been executed successfully.
@@ -163,7 +164,7 @@ int test_gr_init_hal_fe_pwr_mode(struct unit_module *m,
 *
 * Test Type: Feature, Error guessing
 *
- * Targets: g->ops.gr.init.ecc_scrub_reg.
+ * Targets: gops_gr_init.ecc_scrub_reg, gv11b_gr_init_ecc_scrub_reg
 *
 * Input: gr_init_setup, gr_init_prepare, gr_init_support must have
 *        been executed successfully.
@@ -194,15 +195,26 @@ int test_gr_init_hal_ecc_scrub_reg(struct unit_module *m,
 *
 * Test Type: Feature, Error guessing
 *
- * Targets: g->ops.gr.init.get_nonpes_aware_tpc,
- *          g->ops.gr.init.sm_id_config,
- *          g->ops.gr.init.fs_state,
- *          g->ops.gr.init.get_attrib_cb_size,
- *          g->ops.gr.init.get_alpha_cb_size,
- *          g->ops.gr.init.pd_skip_table_gpc,
- *          g->ops.gr.init.load_sw_veid_bundle,
- *          g->ops.gr.init.load_sw_bundle_init,
- *          g->ops.gr.init.load_method_init.
+ * Targets: gops_gr_init.get_nonpes_aware_tpc,
+ *          gv11b_gr_init_get_nonpes_aware_tpc,
+ *          gops_gr_init.sm_id_config,
+ *          gv11b_gr_init_sm_id_config,
+ *          gops_gr_init.get_sm_id_size,
+ *          gp10b_gr_init_get_sm_id_size,
+ *          gops_gr_init.fs_state,
+ *          gv11b_gr_init_fs_state,
+ *          gops_gr_init.get_attrib_cb_size,
+ *          gv11b_gr_init_get_attrib_cb_size,
+ *          gops_gr_init.get_alpha_cb_size,
+ *          gv11b_gr_init_get_alpha_cb_size,
+ *          gops_gr_init.pd_skip_table_gpc,
+ *          gm20b_gr_init_pd_skip_table_gpc,
+ *          gops_gr_init.load_sw_veid_bundle,
+ *          gv11b_gr_init_load_sw_veid_bundle,
+ *          gops_gr_init.load_sw_bundle_init,
+ *          gv11b_gr_init_load_sw_bundle_init,
+ *          gops_gr_init.load_method_init,
+ *          gm20b_gr_init_load_method_init
 *
 * Input: gr_init_setup, gr_init_prepare, gr_init_support must have
 *        been executed successfully.
@@ -244,7 +256,8 @@ int test_gr_init_hal_config_error_injection(struct unit_module *m,
 *
 * Test Type: Feature, Error guessing
 *
- * Targets: g->ops.gr.init.commit_global_pagepool.
+ * Targets: gops_gr_init.commit_global_pagepool,
+ *          gp10b_gr_init_commit_global_pagepool
 *
 * Input: gr_init_setup, gr_init_prepare, gr_init_support must have
 *        been executed successfully.
--- a/userspace/units/gr/nvgpu-gr.h
+++ b/userspace/units/gr/nvgpu-gr.h
@@ -40,9 +40,9 @@ struct unit_module;
 *
 * Test Type: Feature
 *
- * Input: None.
+ * Targets: #nvgpu_gr_alloc
 *
- * Targets: #nvgpu_gr_alloc.
+ * Input: None.
 *
 * Steps:
 * -  Initialize the test environment for common.gr unit testing:
@@ -64,7 +64,7 @@ int test_gr_init_setup(struct unit_module *m, struct gk20a *g, void *args);
 *
 * Test Type: Feature
 *
- * Targets: #nvgpu_gr_free.
+ * Targets: #nvgpu_gr_free
 *
 * Input: test_gr_init_setup must have been executed successfully.
 *
@@ -83,7 +83,16 @@ int test_gr_remove_setup(struct unit_module *m, struct gk20a *g, void *args);
 *
 * Test Type: Feature
 *
- * Targets: #nvgpu_gr_prepare_sw, #nvgpu_gr_prepare_hw.
+ * Targets: gops_gr.gr_prepare_sw, #nvgpu_gr_prepare_sw,
+ *          gops_gr.gr_enable_hw, #nvgpu_gr_enable_hw,
+ *          gops_gr_intr.enable_hww_exceptions,
+ *          gv11b_gr_intr_enable_hww_exceptions,
+ *          gops_gr_intr.enable_interrupts,
+ *          gm20b_gr_intr_enable_interrupts,
+ *          gops_gr_intr.enable_gpc_exceptions,
+ *          gv11b_gr_intr_enable_gpc_exceptions,
+ *          gops_gr_intr.enable_exceptions,
+ *          gv11b_gr_intr_enable_exceptions
 *
 * Input: test_gr_init_setup must have been executed successfully.
 *
@@ -102,7 +111,8 @@ int test_gr_init_prepare(struct unit_module *m, struct gk20a *g, void *args);
 *
 * Test Type: Feature
 *
- * Targets: #nvgpu_gr_init_support.
+ * Targets: gops_gr.gr_init_support, #nvgpu_gr_init_support,
+ *          #nvgpu_gr_init
 *
 * Input: test_gr_init_setup and test_gr_init_prepare
 *        must have been executed successfully.
@@ -128,7 +138,7 @@ int test_gr_init_support(struct unit_module *m, struct gk20a *g, void *args);
 *
 * Test Type: Feature
 *
- * Targets: #nvgpu_gr_suspend.
+ * Targets: gops_gr.gr_suspend, #nvgpu_gr_suspend
 *
 * Input: #test_gr_init_setup, #test_gr_init_prepare and #test_gr_init_support
 *        must have been executed successfully.
@@ -147,7 +157,10 @@ int test_gr_suspend(struct unit_module *m, struct gk20a *g, void *args);
 *
 * Test Type: Feature
 *
- * Targets: #nvgpu_gr_remove_support.
+ * Targets: #nvgpu_gr_remove_support,
+ *          #gops_ecc.ecc_remove_support,
+ *          #nvgpu_ecc_remove_support,
+ *          #nvgpu_gr_ecc_free
 *
 * Input: #test_gr_init_setup, #test_gr_init_prepare and #test_gr_init_support
 *        must have been executed successfully.
@@ -167,12 +180,15 @@ int test_gr_remove_support(struct unit_module *m, struct gk20a *g, void *args);
 *
 * Test Type: Feature, Error Injection
 *
+ * Targets: gops_gr_ecc.gpc_tpc_ecc_init, gv11b_gr_gpc_tpc_ecc_init,
+ *          gops_gr_ecc.fecs_ecc_init, gv11b_gr_fecs_ecc_init,
+ *	    gops_gr_ecc.detect, gv11b_ecc_detect_enabled_units,
+ *          #nvgpu_ecc_counter_init_per_tpc,
+ *          #nvgpu_ecc_counter_init_per_gpc
+ *
 * Input: #test_gr_init_setup, #test_gr_init_prepare and #test_gr_init_support
 *        must have been executed successfully.
 *
- * Targets: gv11b_gr_gpc_tpc_ecc_init, gv11b_gr_fecs_ecc_init and
- *	    gv11b_ecc_detect_enabled_units.
- *
 * Steps:
 * -  Array with various combinations setting register bits for
 *    FUSES_OVERRIDE_DISABLE, OPT_ECC_ENABLE, fecs register for ecc
@@ -193,10 +209,15 @@ int test_gr_init_ecc_features(struct unit_module *m,
 *
 * Test Type: Feature
 *
- * Input: None
+ * Targets: #nvgpu_gr_prepare_sw, #nvgpu_gr_enable_hw,
+ *          #nvgpu_gr_init_support, #nvgpu_gr_sw_ready,
+ *          gops_gr_init.lg_coalesce, gm20b_gr_init_lg_coalesce,
+ *          gops_gr_init.su_coalesce, gm20b_gr_init_su_coalesce,
+ *          gops_gr_init.pes_vsc_stream, gm20b_gr_init_pes_vsc_stream,
+ *          gops_gr_init.fifo_access, gm20b_gr_init_fifo_access,
+ *          gops_gr_init.gpc_mmu, gv11b_gr_init_gpc_mmu,
 *
- * Targets: #nvgpu_gr_prepare_sw, #nvgpu_gr_prepare_hw,
- *          and #nvgpu_gr_init_support.
+ * Input: None
 *
 * Steps:
 * -  Call #test_gr_init_setup.
@@ -208,7 +229,8 @@ int test_gr_init_ecc_features(struct unit_module *m,
 * Output: Returns PASS if the steps above were executed successfully. FAIL
 * otherwise.
 */
-int test_gr_init_setup_ready(struct unit_module *m, struct gk20a *g, void *args);
+int test_gr_init_setup_ready(struct unit_module *m,
+			     struct gk20a *g, void *args);

 /**
 * Test specification for: test_gr_init_error_injections.
@@ -217,16 +239,19 @@ int test_gr_init_setup_ready(struct unit_module *m, struct gk20a *g, void *args)
 *
 * Test Type: Feature, Error Injection
 *
- * Input: #test_gr_setup_ready must have been executed successfully.
+ * Targets: gops_gr.gr_init_support, #nvgpu_gr_init_support,
+ *          gops_gr.gr_prepare_sw, #nvgpu_gr_prepare_sw, gr_remove_support
 *
- * Targets: #nvgpu_gr_init_support, #nvgpu_gr_prepare_sw, gr_remove_support.
+ * Input: #test_gr_setup_ready must have been executed successfully.
 *
 * Steps:
 * -  Add various condition to cause failure in #nvgpu_gr_init_support.
- *    This includes failing of #nvgpu_gr_falcon_init_ctxsw, #nvgpu_gr_init_ctx_state,
+ *    This includes failing of #nvgpu_gr_falcon_init_ctxsw,
+ *    #nvgpu_gr_init_ctx_state,
 *    gr_init_setup_sw and gr_init_setup_hw functions.
 * -  Add various condition to cause failure in #nvgpu_gr_prepare_sw.
- *    This includes failing of #nvgpu_netlist_init_ctx_vars, #nvgpu_gr_falcon_init_support,
+ *    This includes failing of #nvgpu_netlist_init_ctx_vars,
+ *    #nvgpu_gr_falcon_init_support,
 *    #nvgpu_gr_intr_init_support and g->ops.gr.ecc.fecs_ecc_init functions.
 *
 * Output: Returns PASS if the steps above were executed successfully. FAIL
@@ -242,9 +267,9 @@ int test_gr_init_error_injections(struct unit_module *m,
 *
 * Test Type: Feature
 *
- * Input: #test_gr_setup_ready must have been executed successfully.
+ * Targets: #nvgpu_gr_free, #nvgpu_gr_remove_support
 *
- * Targets: #nvgpu_gr_free, #nvgpu_gr_remove_support.
+ * Input: #test_gr_setup_ready must have been executed successfully.
 *
 * Steps:
 * -  Call #test_gr_remove_support.
@@ -253,8 +278,8 @@ int test_gr_init_error_injections(struct unit_module *m,
 * Output: Returns PASS if the steps above were executed successfully. FAIL
 * otherwise.
 */
-int test_gr_init_setup_cleanup(struct unit_module *m, struct gk20a *g, void *args);
-
+int test_gr_init_setup_cleanup(struct unit_module *m,
+			       struct gk20a *g, void *args);
 #endif /* UNIT_NVGPU_GR_H */

 /**