gpu: nvgpu: add HAL for reading gcplex fuse

This adds a HAL interface for reading the gcplex fuse and sets up the
HAL for the appropriate devices.

JIRA NVGPU-938

Change-Id: I83ed8b78b70f5b24ac3921d174c299abc91e286d
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1945141
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Philip Elcan
2018-11-07 13:04:30 -05:00
committed by mobile promotions
parent e156066256
commit 328fcb4c76
7 changed files with 15 additions and 4 deletions

View File

@@ -45,7 +45,7 @@ int gm20b_fuse_check_priv_security(struct gk20a *g)
return 0; return 0;
} }
if (nvgpu_tegra_fuse_read_gcplex_config_fuse(g, &gcplex_config) != 0) { if (g->ops.fuse.read_gcplex_config_fuse(g, &gcplex_config) != 0) {
nvgpu_err(g, "err reading gcplex config fuse, check fuse clk"); nvgpu_err(g, "err reading gcplex config fuse, check fuse clk");
return -EINVAL; return -EINVAL;
} }

View File

@@ -46,7 +46,7 @@ int gp10b_fuse_check_priv_security(struct gk20a *g)
return 0; return 0;
} }
if (nvgpu_tegra_fuse_read_gcplex_config_fuse(g, &gcplex_config) != 0) { if (g->ops.fuse.read_gcplex_config_fuse(g, &gcplex_config) != 0) {
nvgpu_err(g, "err reading gcplex config fuse, check fuse clk"); nvgpu_err(g, "err reading gcplex config fuse, check fuse clk");
return -EINVAL; return -EINVAL;
} }

View File

@@ -267,9 +267,10 @@ void pmu_dump_security_fuses_gm20b(struct gk20a *g)
g->ops.fuse.fuse_opt_sec_debug_en(g)); g->ops.fuse.fuse_opt_sec_debug_en(g));
nvgpu_err(g, "FUSE_OPT_PRIV_SEC_EN_0: 0x%x", nvgpu_err(g, "FUSE_OPT_PRIV_SEC_EN_0: 0x%x",
g->ops.fuse.fuse_opt_priv_sec_en(g)); g->ops.fuse.fuse_opt_priv_sec_en(g));
nvgpu_tegra_fuse_read_gcplex_config_fuse(g, &val); if (g->ops.fuse.read_gcplex_config_fuse(g, &val) != 0) {
nvgpu_err(g, "FUSE_GCPLEX_CONFIG_FUSE_0: 0x%x", val); nvgpu_err(g, "FUSE_GCPLEX_CONFIG_FUSE_0: 0x%x", val);
} }
}
bool gm20b_pmu_is_debug_mode_en(struct gk20a *g) bool gm20b_pmu_is_debug_mode_en(struct gk20a *g)
{ {

View File

@@ -32,6 +32,7 @@
#include <nvgpu/tsg.h> #include <nvgpu/tsg.h>
#include <nvgpu/perfbuf.h> #include <nvgpu/perfbuf.h>
#include <nvgpu/cyclestats_snapshot.h> #include <nvgpu/cyclestats_snapshot.h>
#include <nvgpu/fuse.h>
#include "common/clock_gating/gm20b_gating_reglist.h" #include "common/clock_gating/gm20b_gating_reglist.h"
#include "common/bus/bus_gm20b.h" #include "common/bus/bus_gm20b.h"
@@ -674,6 +675,8 @@ static const struct gpu_ops gm20b_ops = {
.read_vin_cal_fuse_rev = NULL, .read_vin_cal_fuse_rev = NULL,
.read_vin_cal_slope_intercept_fuse = NULL, .read_vin_cal_slope_intercept_fuse = NULL,
.read_vin_cal_gain_offset_fuse = NULL, .read_vin_cal_gain_offset_fuse = NULL,
.read_gcplex_config_fuse =
nvgpu_tegra_fuse_read_gcplex_config_fuse,
}, },
.acr = { .acr = {
.acr_sw_init = nvgpu_gm20b_acr_sw_init, .acr_sw_init = nvgpu_gm20b_acr_sw_init,

View File

@@ -33,6 +33,7 @@
#include <nvgpu/tsg.h> #include <nvgpu/tsg.h>
#include <nvgpu/perfbuf.h> #include <nvgpu/perfbuf.h>
#include <nvgpu/cyclestats_snapshot.h> #include <nvgpu/cyclestats_snapshot.h>
#include <nvgpu/fuse.h>
#include "common/bus/bus_gk20a.h" #include "common/bus/bus_gk20a.h"
#include "common/clock_gating/gp10b_gating_reglist.h" #include "common/clock_gating/gp10b_gating_reglist.h"
@@ -742,6 +743,8 @@ static const struct gpu_ops gp10b_ops = {
.read_vin_cal_fuse_rev = NULL, .read_vin_cal_fuse_rev = NULL,
.read_vin_cal_slope_intercept_fuse = NULL, .read_vin_cal_slope_intercept_fuse = NULL,
.read_vin_cal_gain_offset_fuse = NULL, .read_vin_cal_gain_offset_fuse = NULL,
.read_gcplex_config_fuse =
nvgpu_tegra_fuse_read_gcplex_config_fuse,
}, },
.acr = { .acr = {
.acr_sw_init = nvgpu_gm20b_acr_sw_init, .acr_sw_init = nvgpu_gm20b_acr_sw_init,

View File

@@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#include <nvgpu/gk20a.h> #include <nvgpu/gk20a.h>
#include <nvgpu/fuse.h>
#include "common/bus/bus_gk20a.h" #include "common/bus/bus_gk20a.h"
#include "common/bus/bus_gp10b.h" #include "common/bus/bus_gp10b.h"
@@ -868,6 +869,8 @@ static const struct gpu_ops gv11b_ops = {
.read_vin_cal_fuse_rev = NULL, .read_vin_cal_fuse_rev = NULL,
.read_vin_cal_slope_intercept_fuse = NULL, .read_vin_cal_slope_intercept_fuse = NULL,
.read_vin_cal_gain_offset_fuse = NULL, .read_vin_cal_gain_offset_fuse = NULL,
.read_gcplex_config_fuse =
nvgpu_tegra_fuse_read_gcplex_config_fuse,
}, },
.acr = { .acr = {
.acr_sw_init = nvgpu_gv11b_acr_sw_init, .acr_sw_init = nvgpu_gv11b_acr_sw_init,

View File

@@ -1325,6 +1325,7 @@ struct gpu_ops {
int (*read_vin_cal_gain_offset_fuse)(struct gk20a *g, int (*read_vin_cal_gain_offset_fuse)(struct gk20a *g,
u32 vin_id, s8 *gain, u32 vin_id, s8 *gain,
s8 *offset); s8 *offset);
int (*read_gcplex_config_fuse)(struct gk20a *g, u32 *val);
} fuse; } fuse;
struct { struct {
int (*init)(struct gk20a *g); int (*init)(struct gk20a *g);