From 993d138f6057a679cc1f74e36d30b0d5728e6def Mon Sep 17 00:00:00 2001 From: Philip Elcan Date: Wed, 15 Jan 2020 15:59:03 -0500 Subject: [PATCH] gpu: nvgpu: units: update SWUTS for HALs Update the SWUTS for ptimer, fuse, and ltc tests to include HALs called by appropriate gops for gv11b. JIRA NVGPU-4818 Change-Id: I058d2e75b30373712b21edfd77245b6247812dfa Signed-off-by: Philip Elcan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2279587 GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: mobile promotions Tested-by: mobile promotions --- userspace/units/fuse/nvgpu-fuse-gm20b.h | 13 ++++++++----- userspace/units/fuse/nvgpu-fuse-gp10b.h | 15 +++++++++------ userspace/units/ltc/nvgpu-ltc.h | 22 ++++++++++++---------- userspace/units/ptimer/nvgpu-ptimer.h | 4 ++-- 4 files changed, 31 insertions(+), 23 deletions(-) diff --git a/userspace/units/fuse/nvgpu-fuse-gm20b.h b/userspace/units/fuse/nvgpu-fuse-gm20b.h index d363b29b8..163b0fed9 100644 --- a/userspace/units/fuse/nvgpu-fuse-gm20b.h +++ b/userspace/units/fuse/nvgpu-fuse-gm20b.h @@ -40,7 +40,7 @@ extern struct fuse_test_args gm20b_init_args; * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security + * Targets: gops_fuse.check_priv_security, gm20b_fuse_check_priv_security * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -64,7 +64,7 @@ int test_fuse_gm20b_check_sec(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security + * Targets: gops_fuse.check_priv_security, gm20b_fuse_check_priv_security * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -87,7 +87,7 @@ int test_fuse_gm20b_check_gcplex_fail(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security + * Targets: gops_fuse.check_priv_security, gm20b_fuse_check_priv_security * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -115,7 +115,7 @@ int test_fuse_gm20b_check_sec_invalid_gcplex(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security + * Targets: gops_fuse.check_priv_security, gm20b_fuse_check_priv_security * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -140,7 +140,10 @@ int test_fuse_gm20b_check_non_sec(struct unit_module *m, * Targets: gops_fuse.fuse_status_opt_fbio, gops_fuse.fuse_status_opt_fbp, * gops_fuse.fuse_status_opt_rop_l2_fbp, gops_fuse.fuse_status_opt_tpc_gpc, * gops_fuse.fuse_opt_sec_debug_en, gops_fuse.fuse_opt_priv_sec_en, - * gops_fuse.fuse_ctrl_opt_tpc_gpc + * gops_fuse.fuse_ctrl_opt_tpc_gpc, gm20b_fuse_status_opt_fbio, + * gm20b_fuse_status_opt_fbp, gm20b_fuse_status_opt_rop_l2_fbp, + * gm20b_fuse_status_opt_tpc_gpc, gm20b_fuse_opt_sec_debug_en, + * gm20b_fuse_opt_priv_sec_en, gm20b_fuse_ctrl_opt_tpc_gpc * * Input: test_fuse_device_common_init() must be called for this GPU. * diff --git a/userspace/units/fuse/nvgpu-fuse-gp10b.h b/userspace/units/fuse/nvgpu-fuse-gp10b.h index 9334600be..2ab3f0a77 100644 --- a/userspace/units/fuse/nvgpu-fuse-gp10b.h +++ b/userspace/units/fuse/nvgpu-fuse-gp10b.h @@ -40,7 +40,9 @@ extern struct fuse_test_args gp10b_init_args; * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security, gops_fuse.read_gcplex_config_fuse + * Targets: gops_fuse.check_priv_security, gops_fuse.read_gcplex_config_fuse, + * gp10b_fuse_check_priv_security, + * nvgpu_tegra_fuse_read_gcplex_config_fuse * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -63,7 +65,7 @@ int test_fuse_gp10b_check_sec(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security + * Targets: gops_fuse.check_priv_security, gp10b_fuse_check_priv_security * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -86,7 +88,7 @@ int test_fuse_gp10b_check_gcplex_fail(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security + * Targets: gops_fuse.check_priv_security, gp10b_fuse_check_priv_security * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -114,7 +116,7 @@ int test_fuse_gp10b_check_sec_invalid_gcplex(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.check_priv_security + * Targets: gops_fuse.check_priv_security, gp10b_fuse_check_priv_security * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -136,7 +138,7 @@ int test_fuse_gp10b_check_non_sec(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.is_opt_ecc_enable + * Targets: gops_fuse.is_opt_ecc_enable, gp10b_fuse_is_opt_ecc_enable * * Input: test_fuse_device_common_init() must be called for this GPU. * @@ -159,7 +161,8 @@ int test_fuse_gp10b_ecc(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_fuse.is_opt_feature_override_disable + * Targets: gops_fuse.is_opt_feature_override_disable, + * gp10b_fuse_is_opt_feature_override_disable * * Input: test_fuse_device_common_init() must be called for this GPU. * diff --git a/userspace/units/ltc/nvgpu-ltc.h b/userspace/units/ltc/nvgpu-ltc.h index 88d52931d..3dd21bb60 100644 --- a/userspace/units/ltc/nvgpu-ltc.h +++ b/userspace/units/ltc/nvgpu-ltc.h @@ -37,7 +37,7 @@ * * Test Type: Feature, Error guessing * - * Targets: gops_ltc.init_ltc_support + * Targets: gops_ltc.init_ltc_support, nvgpu_init_ltc_support * * Input: None * @@ -69,7 +69,7 @@ int test_ltc_init_support(struct unit_module *m, * Test Type: Feature, Error guessing * * Targets: nvgpu_ecc_counter_init_per_lts, nvgpu_ltc_ecc_free, - * gops_ltc.ecc_init + * gops_ltc.ecc_init, gv11b_lts_ecc_init * * Input: test_ltc_init_support must have completed successfully. * @@ -134,7 +134,8 @@ int test_ltc_functionality_tests(struct unit_module *m, * Test Type: Feature, Error guessing * * Targets: nvgpu_ltc_sync_enabled, gops_ltc.ltc_remove_support, - * gops_ltc.init_ltc_support + * gops_ltc.init_ltc_support, nvgpu_init_ltc_support, + * nvgpu_ltc_remove_support * * Input: None * @@ -155,7 +156,7 @@ int test_ltc_negative_tests(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_ltc.ltc_remove_support + * Targets: gops_ltc.ltc_remove_support, nvgpu_ltc_remove_support * * Input: None * @@ -175,7 +176,8 @@ int test_ltc_remove_support(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_ltc_intr.isr + * Targets: gops_ltc_intr.isr, gv11b_ltc_intr_isr, + * gp10b_ltc_intr_handle_lts_interrupts * * Input: test_ltc_init_support must have completed successfully. * @@ -253,7 +255,7 @@ int test_ltc_intr(struct unit_module *m, struct gk20a *g, void *args); * * Test Type: Feature * - * Targets: gops_ltc_intr.en_illegal_compstat + * Targets: gops_ltc_intr.en_illegal_compstat, gv11b_ltc_intr_en_illegal_compstat * * Input: None * @@ -276,7 +278,7 @@ int test_ltc_intr_en_illegal_compstat(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_ltc_intr.configure + * Targets: gops_ltc_intr.configure, gv11b_ltc_intr_configure * * Input: None * @@ -300,7 +302,7 @@ int test_ltc_intr_configure(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_ltc.determine_L2_size_bytes + * Targets: gops_ltc.determine_L2_size_bytes, gp10b_determine_L2_size_bytes * * Input: test_ltc_init_support must have completed successfully. * @@ -321,7 +323,7 @@ int test_determine_L2_size_bytes(struct unit_module *m, * * Test Type: Feature * - * Targets: gops_ltc.set_enabled + * Targets: gops_ltc.set_enabled, gp10b_ltc_set_enabled * * Input: None * @@ -344,7 +346,7 @@ int test_ltc_set_enabled(struct unit_module *m, struct gk20a *g, void *args); * * Test Type: Feature, Error guessing * - * Targets: gops_ltc.flush + * Targets: gops_ltc.flush, gm20b_flush_ltc * * Input: None * diff --git a/userspace/units/ptimer/nvgpu-ptimer.h b/userspace/units/ptimer/nvgpu-ptimer.h index 89dfe22f6..a71a6010d 100644 --- a/userspace/units/ptimer/nvgpu-ptimer.h +++ b/userspace/units/ptimer/nvgpu-ptimer.h @@ -78,7 +78,7 @@ int test_free_env(struct unit_module *m, * * Test Type: Feature Based * - * Targets: gops_ptimer.read_ptimer + * Targets: gops_ptimer.read_ptimer, gk20a_read_ptimer * * Input: None * @@ -118,7 +118,7 @@ int test_read_ptimer(struct unit_module *m, * * Test Type: Feature Based * - * Targets: gops_ptimer.isr + * Targets: gops_ptimer.isr, gk20a_ptimer_isr * * Input: None *