diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-10 17:09:36 -0400 |
---|---|---|
committer | Bo Yan <byan@nvidia.com> | 2018-08-20 14:00:59 -0400 |
commit | 227c6f7b7a499dd58e0db6859736cfe586ef0897 (patch) | |
tree | d354f8422647021693aefefa5124d865c29ecd32 /drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |
parent | 9e69e0cf978b53706f55ffb873e3966b4bb3a7a8 (diff) |
gpu: nvgpu: Move fuse HAL to common
Move implementation of fuse HAL to common/fuse. Also implements new
fuse query functions for FBIO, FBP, TPC floorsweeping and security
fuses.
JIRA NVGPU-957
Change-Id: I55e256a4f1b59d50a721d4942907f70dc57467c4
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1797177
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/hal_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 7df17ed7..efd66b5d 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -36,6 +36,8 @@ | |||
36 | #include "common/therm/therm_gp10b.h" | 36 | #include "common/therm/therm_gp10b.h" |
37 | #include "common/ltc/ltc_gm20b.h" | 37 | #include "common/ltc/ltc_gm20b.h" |
38 | #include "common/ltc/ltc_gp10b.h" | 38 | #include "common/ltc/ltc_gp10b.h" |
39 | #include "common/fuse/fuse_gm20b.h" | ||
40 | #include "common/fuse/fuse_gp10b.h" | ||
39 | 41 | ||
40 | #include "gk20a/gk20a.h" | 42 | #include "gk20a/gk20a.h" |
41 | #include "gk20a/fifo_gk20a.h" | 43 | #include "gk20a/fifo_gk20a.h" |
@@ -70,7 +72,6 @@ | |||
70 | 72 | ||
71 | #include "gp10b.h" | 73 | #include "gp10b.h" |
72 | #include "hal_gp10b.h" | 74 | #include "hal_gp10b.h" |
73 | #include "fuse_gp10b.h" | ||
74 | 75 | ||
75 | #include <nvgpu/debug.h> | 76 | #include <nvgpu/debug.h> |
76 | #include <nvgpu/bug.h> | 77 | #include <nvgpu/bug.h> |
@@ -80,7 +81,6 @@ | |||
80 | #include <nvgpu/error_notifier.h> | 81 | #include <nvgpu/error_notifier.h> |
81 | 82 | ||
82 | #include <nvgpu/hw/gp10b/hw_proj_gp10b.h> | 83 | #include <nvgpu/hw/gp10b/hw_proj_gp10b.h> |
83 | #include <nvgpu/hw/gp10b/hw_fuse_gp10b.h> | ||
84 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> | 84 | #include <nvgpu/hw/gp10b/hw_fifo_gp10b.h> |
85 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> | 85 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> |
86 | #include <nvgpu/hw/gp10b/hw_top_gp10b.h> | 86 | #include <nvgpu/hw/gp10b/hw_top_gp10b.h> |
@@ -597,7 +597,7 @@ static const struct gpu_ops gp10b_ops = { | |||
597 | .pmu_pg_init_param = gp10b_pg_gr_init, | 597 | .pmu_pg_init_param = gp10b_pg_gr_init, |
598 | .pmu_pg_supported_engines_list = gk20a_pmu_pg_engines_list, | 598 | .pmu_pg_supported_engines_list = gk20a_pmu_pg_engines_list, |
599 | .pmu_pg_engines_feature_list = gk20a_pmu_pg_feature_list, | 599 | .pmu_pg_engines_feature_list = gk20a_pmu_pg_feature_list, |
600 | .dump_secure_fuses = pmu_dump_security_fuses_gp10b, | 600 | .dump_secure_fuses = pmu_dump_security_fuses_gm20b, |
601 | .reset_engine = gk20a_pmu_engine_reset, | 601 | .reset_engine = gk20a_pmu_engine_reset, |
602 | .is_engine_in_reset = gk20a_pmu_is_engine_in_reset, | 602 | .is_engine_in_reset = gk20a_pmu_is_engine_in_reset, |
603 | .get_irqdest = gk20a_pmu_get_irqdest, | 603 | .get_irqdest = gk20a_pmu_get_irqdest, |
@@ -702,6 +702,16 @@ static const struct gpu_ops gp10b_ops = { | |||
702 | .is_opt_ecc_enable = gp10b_fuse_is_opt_ecc_enable, | 702 | .is_opt_ecc_enable = gp10b_fuse_is_opt_ecc_enable, |
703 | .is_opt_feature_override_disable = | 703 | .is_opt_feature_override_disable = |
704 | gp10b_fuse_is_opt_feature_override_disable, | 704 | gp10b_fuse_is_opt_feature_override_disable, |
705 | .fuse_status_opt_fbio = gm20b_fuse_status_opt_fbio, | ||
706 | .fuse_status_opt_fbp = gm20b_fuse_status_opt_fbp, | ||
707 | .fuse_status_opt_rop_l2_fbp = gm20b_fuse_status_opt_rop_l2_fbp, | ||
708 | .fuse_status_opt_tpc_gpc = gm20b_fuse_status_opt_tpc_gpc, | ||
709 | .fuse_ctrl_opt_tpc_gpc = gm20b_fuse_ctrl_opt_tpc_gpc, | ||
710 | .fuse_opt_sec_debug_en = gm20b_fuse_opt_sec_debug_en, | ||
711 | .fuse_opt_priv_sec_en = gm20b_fuse_opt_priv_sec_en, | ||
712 | .read_vin_cal_fuse_rev = NULL, | ||
713 | .read_vin_cal_slope_intercept_fuse = NULL, | ||
714 | .read_vin_cal_gain_offset_fuse = NULL, | ||
705 | }, | 715 | }, |
706 | .chip_init_gpu_characteristics = gp10b_init_gpu_characteristics, | 716 | .chip_init_gpu_characteristics = gp10b_init_gpu_characteristics, |
707 | .get_litter_value = gp10b_get_litter_value, | 717 | .get_litter_value = gp10b_get_litter_value, |