diff options
Diffstat (limited to 'drivers/gpu/nvgpu/include')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/bios.h | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h | 45 |
2 files changed, 14 insertions, 34 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/bios.h b/drivers/gpu/nvgpu/include/nvgpu/bios.h index 191f0dbd..eec057f2 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/bios.h +++ b/drivers/gpu/nvgpu/include/nvgpu/bios.h | |||
@@ -321,6 +321,9 @@ struct vbios_vfe_3x_var_entry_struct { | |||
321 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_MASK 0x1000000 | 321 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_MASK 0x1000000 |
322 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_SHIFT 24 | 322 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_SHIFT 24 |
323 | 323 | ||
324 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_VALUE_SIGNED_INTEGER_MASK 0x2000000 | ||
325 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_VALUE_SIGNED_INTEGER_SHIFT 25 | ||
326 | |||
324 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_YES 0x00000001 | 327 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_YES 0x00000001 |
325 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_NO 0x00000000 | 328 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_NO 0x00000000 |
326 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_DPROD_VFE_VAR_IDX_0_MASK 0xFF | 329 | #define VBIOS_VFE_3X_VAR_ENTRY_PAR0_DPROD_VFE_VAR_IDX_0_MASK 0xFF |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h index 18568a4d..7764c72a 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifperfvfe.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -24,11 +24,11 @@ | |||
24 | 24 | ||
25 | #include "gpmuifbios.h" | 25 | #include "gpmuifbios.h" |
26 | #include "gpmuifboardobj.h" | 26 | #include "gpmuifboardobj.h" |
27 | #include "ctrl/ctrlperf.h" | ||
27 | 28 | ||
28 | #define CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT 0x03 | 29 | #define CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT 0x03 |
29 | #define NV_PMU_PERF_RPC_VFE_EQU_EVAL_VAR_COUNT_MAX 2 | 30 | #define NV_PMU_PERF_RPC_VFE_EQU_EVAL_VAR_COUNT_MAX 2 |
30 | #define NV_PMU_PERF_RPC_VFE_EQU_MONITOR_COUNT_MAX 16 | 31 | #define NV_PMU_PERF_RPC_VFE_EQU_MONITOR_COUNT_MAX 16 |
31 | #define NV_PMU_VFE_VAR_SINGLE_SENSED_FUSE_SEGMENTS_MAX 1 | ||
32 | 32 | ||
33 | struct nv_pmu_perf_vfe_var_value { | 33 | struct nv_pmu_perf_vfe_var_value { |
34 | u8 var_type; | 34 | u8 var_type; |
@@ -66,8 +66,8 @@ struct nv_pmu_perf_vfe_var_get_status_super { | |||
66 | 66 | ||
67 | struct nv_pmu_perf_vfe_var_single_sensed_fuse_get_status { | 67 | struct nv_pmu_perf_vfe_var_single_sensed_fuse_get_status { |
68 | struct nv_pmu_perf_vfe_var_get_status_super super; | 68 | struct nv_pmu_perf_vfe_var_get_status_super super; |
69 | u32 fuse_value_integer; | 69 | struct ctrl_perf_vfe_var_single_sensed_fuse_value fuse_value_integer; |
70 | u32 fuse_value_hw_integer; | 70 | struct ctrl_perf_vfe_var_single_sensed_fuse_value fuse_value_hw_integer; |
71 | u8 fuse_version; | 71 | u8 fuse_version; |
72 | bool b_version_check_failed; | 72 | bool b_version_check_failed; |
73 | }; | 73 | }; |
@@ -84,6 +84,8 @@ struct nv_pmu_vfe_var { | |||
84 | struct nv_pmu_boardobj super; | 84 | struct nv_pmu_boardobj super; |
85 | u32 out_range_min; | 85 | u32 out_range_min; |
86 | u32 out_range_max; | 86 | u32 out_range_max; |
87 | struct ctrl_boardobjgrp_mask_e32 mask_dependent_vars; | ||
88 | struct ctrl_boardobjgrp_mask_e255 mask_dependent_equs; | ||
87 | }; | 89 | }; |
88 | 90 | ||
89 | struct nv_pmu_vfe_var_derived { | 91 | struct nv_pmu_vfe_var_derived { |
@@ -116,38 +118,13 @@ struct nv_pmu_vfe_var_single_sensed { | |||
116 | struct nv_pmu_vfe_var_single super; | 118 | struct nv_pmu_vfe_var_single super; |
117 | }; | 119 | }; |
118 | 120 | ||
119 | struct nv_pmu_vfe_var_single_sensed_fuse_info { | ||
120 | u8 segment_count; | ||
121 | union nv_pmu_bios_vfield_register_segment segments[ | ||
122 | NV_PMU_VFE_VAR_SINGLE_SENSED_FUSE_SEGMENTS_MAX]; | ||
123 | }; | ||
124 | |||
125 | struct nv_pmu_vfe_var_single_sensed_fuse_vfield_info { | ||
126 | struct nv_pmu_vfe_var_single_sensed_fuse_info fuse; | ||
127 | u32 fuse_val_default; | ||
128 | int hw_correction_scale; | ||
129 | int hw_correction_offset; | ||
130 | u8 v_field_id; | ||
131 | }; | ||
132 | |||
133 | struct nv_pmu_vfe_var_single_sensed_fuse_ver_vfield_info { | ||
134 | struct nv_pmu_vfe_var_single_sensed_fuse_info fuse; | ||
135 | u8 ver_expected; | ||
136 | bool b_ver_check; | ||
137 | bool b_use_default_on_ver_check_fail; | ||
138 | u8 v_field_id_ver; | ||
139 | }; | ||
140 | |||
141 | struct nv_pmu_vfe_var_single_sensed_fuse_override_info { | ||
142 | u32 fuse_val_override; | ||
143 | bool b_fuse_regkey_override; | ||
144 | }; | ||
145 | |||
146 | struct nv_pmu_vfe_var_single_sensed_fuse { | 121 | struct nv_pmu_vfe_var_single_sensed_fuse { |
147 | struct nv_pmu_vfe_var_single_sensed super; | 122 | struct nv_pmu_vfe_var_single_sensed super; |
148 | struct nv_pmu_vfe_var_single_sensed_fuse_override_info override_info; | 123 | struct ctrl_perf_vfe_var_single_sensed_fuse_override_info override_info; |
149 | struct nv_pmu_vfe_var_single_sensed_fuse_vfield_info vfield_info; | 124 | struct ctrl_perf_vfe_var_single_sensed_fuse_vfield_info vfield_info; |
150 | struct nv_pmu_vfe_var_single_sensed_fuse_ver_vfield_info vfield_ver_info; | 125 | struct ctrl_perf_vfe_var_single_sensed_fuse_ver_vfield_info vfield_ver_info; |
126 | struct ctrl_perf_vfe_var_single_sensed_fuse_value fuse_val_default; | ||
127 | bool b_fuse_value_signed; | ||
151 | }; | 128 | }; |
152 | 129 | ||
153 | struct nv_pmu_vfe_var_single_sensed_temp { | 130 | struct nv_pmu_vfe_var_single_sensed_temp { |