diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp106')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/fuse_gp106.c | 37 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/fuse_gp106.h | 32 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 17 |
3 files changed, 15 insertions, 71 deletions
diff --git a/drivers/gpu/nvgpu/gp106/fuse_gp106.c b/drivers/gpu/nvgpu/gp106/fuse_gp106.c deleted file mode 100644 index 82e3217f..00000000 --- a/drivers/gpu/nvgpu/gp106/fuse_gp106.c +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | /* | ||
2 | * GP106 FUSE | ||
3 | * | ||
4 | * Copyright (c) 2017-2018, NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
7 | * copy of this software and associated documentation files (the "Software"), | ||
8 | * to deal in the Software without restriction, including without limitation | ||
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
11 | * Software is furnished to do so, subject to the following conditions: | ||
12 | * | ||
13 | * The above copyright notice and this permission notice shall be included in | ||
14 | * all copies or substantial portions of the Software. | ||
15 | * | ||
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
22 | * DEALINGS IN THE SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include <nvgpu/enabled.h> | ||
26 | #include <nvgpu/io.h> | ||
27 | |||
28 | #include "gk20a/gk20a.h" | ||
29 | #include "gp106/fuse_gp106.h" | ||
30 | |||
31 | int gp106_fuse_check_priv_security(struct gk20a *g) | ||
32 | { | ||
33 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); | ||
34 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); | ||
35 | |||
36 | return 0; | ||
37 | } | ||
diff --git a/drivers/gpu/nvgpu/gp106/fuse_gp106.h b/drivers/gpu/nvgpu/gp106/fuse_gp106.h deleted file mode 100644 index dfb776b8..00000000 --- a/drivers/gpu/nvgpu/gp106/fuse_gp106.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | * GP106 FUSE | ||
3 | * | ||
4 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
7 | * copy of this software and associated documentation files (the "Software"), | ||
8 | * to deal in the Software without restriction, including without limitation | ||
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
11 | * Software is furnished to do so, subject to the following conditions: | ||
12 | * | ||
13 | * The above copyright notice and this permission notice shall be included in | ||
14 | * all copies or substantial portions of the Software. | ||
15 | * | ||
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
22 | * DEALINGS IN THE SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #ifndef _NVGPU_GP106_FUSE | ||
26 | #define _NVGPU_GP106_FUSE | ||
27 | |||
28 | struct gk20a; | ||
29 | |||
30 | int gp106_fuse_check_priv_security(struct gk20a *g); | ||
31 | |||
32 | #endif | ||
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 52fcc9d3..f3b5dd87 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -38,6 +38,9 @@ | |||
38 | #include "common/therm/therm_gp106.h" | 38 | #include "common/therm/therm_gp106.h" |
39 | #include "common/ltc/ltc_gm20b.h" | 39 | #include "common/ltc/ltc_gm20b.h" |
40 | #include "common/ltc/ltc_gp10b.h" | 40 | #include "common/ltc/ltc_gp10b.h" |
41 | #include "common/fuse/fuse_gm20b.h" | ||
42 | #include "common/fuse/fuse_gp10b.h" | ||
43 | #include "common/fuse/fuse_gp106.h" | ||
41 | 44 | ||
42 | #include "gk20a/gk20a.h" | 45 | #include "gk20a/gk20a.h" |
43 | #include "gk20a/fifo_gk20a.h" | 46 | #include "gk20a/fifo_gk20a.h" |
@@ -60,7 +63,6 @@ | |||
60 | #include "gp10b/fifo_gp10b.h" | 63 | #include "gp10b/fifo_gp10b.h" |
61 | #include "gp10b/pmu_gp10b.h" | 64 | #include "gp10b/pmu_gp10b.h" |
62 | #include "gp10b/gr_gp10b.h" | 65 | #include "gp10b/gr_gp10b.h" |
63 | #include "gp10b/fuse_gp10b.h" | ||
64 | 66 | ||
65 | #include "gp106/fifo_gp106.h" | 67 | #include "gp106/fifo_gp106.h" |
66 | #include "gp106/regops_gp106.h" | 68 | #include "gp106/regops_gp106.h" |
@@ -85,7 +87,6 @@ | |||
85 | #include "gp106/gr_ctx_gp106.h" | 87 | #include "gp106/gr_ctx_gp106.h" |
86 | #include "gp106/gr_gp106.h" | 88 | #include "gp106/gr_gp106.h" |
87 | #include "gp106/flcn_gp106.h" | 89 | #include "gp106/flcn_gp106.h" |
88 | #include "gp106/fuse_gp106.h" | ||
89 | 90 | ||
90 | #include "hal_gp106.h" | 91 | #include "hal_gp106.h" |
91 | 92 | ||
@@ -788,6 +789,18 @@ static const struct gpu_ops gp106_ops = { | |||
788 | .is_opt_ecc_enable = gp10b_fuse_is_opt_ecc_enable, | 789 | .is_opt_ecc_enable = gp10b_fuse_is_opt_ecc_enable, |
789 | .is_opt_feature_override_disable = | 790 | .is_opt_feature_override_disable = |
790 | gp10b_fuse_is_opt_feature_override_disable, | 791 | gp10b_fuse_is_opt_feature_override_disable, |
792 | .fuse_status_opt_fbio = gm20b_fuse_status_opt_fbio, | ||
793 | .fuse_status_opt_fbp = gm20b_fuse_status_opt_fbp, | ||
794 | .fuse_status_opt_rop_l2_fbp = gm20b_fuse_status_opt_rop_l2_fbp, | ||
795 | .fuse_status_opt_tpc_gpc = gm20b_fuse_status_opt_tpc_gpc, | ||
796 | .fuse_ctrl_opt_tpc_gpc = gm20b_fuse_ctrl_opt_tpc_gpc, | ||
797 | .fuse_opt_sec_debug_en = gm20b_fuse_opt_sec_debug_en, | ||
798 | .fuse_opt_priv_sec_en = gm20b_fuse_opt_priv_sec_en, | ||
799 | .read_vin_cal_fuse_rev = gp106_fuse_read_vin_cal_fuse_rev, | ||
800 | .read_vin_cal_slope_intercept_fuse = | ||
801 | gp106_fuse_read_vin_cal_slope_intercept_fuse, | ||
802 | .read_vin_cal_gain_offset_fuse = | ||
803 | gp106_fuse_read_vin_cal_gain_offset_fuse, | ||
791 | }, | 804 | }, |
792 | .get_litter_value = gp106_get_litter_value, | 805 | .get_litter_value = gp106_get_litter_value, |
793 | .chip_init_gpu_characteristics = gp106_init_gpu_characteristics, | 806 | .chip_init_gpu_characteristics = gp106_init_gpu_characteristics, |