diff --git a/drivers/gpu/nvgpu/common/pmu/super_surface/super_surface_priv.h b/drivers/gpu/nvgpu/common/pmu/super_surface/super_surface_priv.h index 2ff363c6c..074d57542 100644 --- a/drivers/gpu/nvgpu/common/pmu/super_surface/super_surface_priv.h +++ b/drivers/gpu/nvgpu/common/pmu/super_surface/super_surface_priv.h @@ -117,8 +117,6 @@ struct nv_pmu_super_surface { struct nv_pmu_volt_volt_rail_boardobj_grp_set volt_rail_grp_set; - struct nv_pmu_volt_volt_policy_boardobj_grp_get_status - volt_policy_grp_get_status; struct nv_pmu_volt_volt_rail_boardobj_grp_get_status volt_rail_grp_get_status; } volt; diff --git a/drivers/gpu/nvgpu/common/pmu/volt/volt_policy.c b/drivers/gpu/nvgpu/common/pmu/volt/volt_policy.c index 3d6c82b62..78aff77a7 100644 --- a/drivers/gpu/nvgpu/common/pmu/volt/volt_policy.c +++ b/drivers/gpu/nvgpu/common/pmu/volt/volt_policy.c @@ -325,25 +325,6 @@ static int _volt_policy_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static int _volt_policy_devgrp_pmustatus_instget(struct gk20a *g, - void *pboardobjgrppmu, - struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) -{ - struct nv_pmu_volt_volt_policy_boardobj_grp_get_status *p_get_status = - (struct nv_pmu_volt_volt_policy_boardobj_grp_get_status *) - pboardobjgrppmu; - - /*check whether pmuboardobjgrp has a valid boardobj in index*/ - if (((u32)BIT(idx) & - p_get_status->hdr.data.super.obj_mask.super.data[0]) == 0U) { - return -EINVAL; - } - - *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) - &p_get_status->objects[idx].data.board_obj; - return 0; -} - static int _volt_policy_grp_pmudatainit_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) @@ -408,7 +389,6 @@ int nvgpu_volt_policy_sw_setup(struct gk20a *g) &g->perf_pmu->volt.volt_policy_metadata.volt_policies.super; pboardobjgrp->pmudatainstget = _volt_policy_devgrp_pmudata_instget; - pboardobjgrp->pmustatusinstget = _volt_policy_devgrp_pmustatus_instget; pboardobjgrp->pmudatainit = _volt_policy_grp_pmudatainit_super; /* Obtain Voltage Rail Table from VBIOS */ @@ -430,16 +410,6 @@ int nvgpu_volt_policy_sw_setup(struct gk20a *g) goto done; } - status = BOARDOBJGRP_PMU_CMD_GRP_GET_STATUS_CONSTRUCT(g, - &g->perf_pmu->volt.volt_policy_metadata.volt_policies.super, - volt, VOLT, volt_policy, VOLT_POLICY); - if (status != 0) { - nvgpu_err(g, - "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", - status); - goto done; - } - done: nvgpu_log_info(g, " done status %x", status); return status; diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/volt.h b/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/volt.h index cfc307d51..b3a8b0658 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/volt.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmu/pmuif/volt.h @@ -177,56 +177,6 @@ union nv_pmu_volt_volt_rail_boardobj_get_status_union { NV_PMU_BOARDOBJ_GRP_GET_STATUS_MAKE_E32(volt, volt_rail); -/* ---------- VOLT_POLICY's GRP_GET_STATUS defines and structures ---------- */ -struct nv_pmu_volt_volt_policy_boardobjgrp_get_status_header { - struct nv_pmu_boardobjgrp_e32 super; -}; - -struct nv_pmu_volt_volt_policy_boardobj_get_status { - struct nv_pmu_boardobj_query super; - u32 offset_volt_requ_v; - u32 offset_volt_curru_v; -}; - -struct nv_pmu_volt_volt_policy_sr_boardobj_get_status { - struct nv_pmu_volt_volt_policy_boardobj_get_status super; - u32 curr_voltu_v; -}; - -struct nv_pmu_volt_volt_policy_splt_r_boardobj_get_status { - struct nv_pmu_volt_volt_policy_boardobj_get_status super; - s32 delta_minu_v; - s32 delta_maxu_v; - s32 orig_delta_minu_v; - s32 orig_delta_maxu_v; - u32 curr_volt_masteru_v; - u32 curr_volt_slaveu_v; - bool b_violation; -}; - -/* srms -> split_rail_multi_step */ -struct nv_pmu_volt_volt_policy_srms_boardobj_get_status { - struct nv_pmu_volt_volt_policy_splt_r_boardobj_get_status super; -}; - -/* srss -> split_rail_single_step */ -struct nv_pmu_volt_volt_policy_srss_boardobj_get_status { - struct nv_pmu_volt_volt_policy_splt_r_boardobj_get_status super; -}; - -union nv_pmu_volt_volt_policy_boardobj_get_status_union { - struct nv_pmu_boardobj_query board_obj; - struct nv_pmu_volt_volt_policy_boardobj_get_status super; - struct nv_pmu_volt_volt_policy_sr_boardobj_get_status single_rail; - struct nv_pmu_volt_volt_policy_splt_r_boardobj_get_status split_rail; - struct nv_pmu_volt_volt_policy_srms_boardobj_get_status - split_rail_m_s; - struct nv_pmu_volt_volt_policy_srss_boardobj_get_status - split_rail_s_s; -}; - -NV_PMU_BOARDOBJ_GRP_GET_STATUS_MAKE_E32(volt, volt_policy); - #define NV_PMU_VOLT_CMD_ID_BOARDOBJ_GRP_SET (0x00000000U) #define NV_PMU_VOLT_CMD_ID_RPC (0x00000001U) #define NV_PMU_VOLT_CMD_ID_BOARDOBJ_GRP_GET_STATUS (0x00000002U)