From 7c3c41bfbd43a444225a8a3a86bfc3e0173f8f05 Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Tue, 22 Jan 2019 14:49:10 +0530 Subject: [PATCH] gpu: nvgpu: remove volt device boardobj get status support Removed unused volt device boardobj get status support & deleted its related code JIRA NVGPU-1874 Change-Id: I27057f74984e977c70ff50b01889eed90a9abd3b Signed-off-by: Mahantesh Kumbar Reviewed-on: https://git-master.nvidia.com/r/2000862 Reviewed-by: svc-mobile-coverity Reviewed-by: svc-mobile-misra GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/pmu/volt/volt_dev.c | 30 ------------------- .../nvgpu/include/nvgpu/pmuif/gpmuifvolt.h | 16 ---------- 2 files changed, 46 deletions(-) diff --git a/drivers/gpu/nvgpu/common/pmu/volt/volt_dev.c b/drivers/gpu/nvgpu/common/pmu/volt/volt_dev.c index a57f3d1ab..17f717c47 100644 --- a/drivers/gpu/nvgpu/common/pmu/volt/volt_dev.c +++ b/drivers/gpu/nvgpu/common/pmu/volt/volt_dev.c @@ -457,25 +457,6 @@ static int _volt_device_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static int _volt_device_devgrp_pmustatus_instget(struct gk20a *g, - void *pboardobjgrppmu, - struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) -{ - struct nv_pmu_volt_volt_device_boardobj_grp_get_status *pgrp_get_status - = (struct nv_pmu_volt_volt_device_boardobj_grp_get_status *) - pboardobjgrppmu; - - /*check whether pmuboardobjgrp has a valid boardobj in index*/ - if (((u32)BIT(idx) & - pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0U) { - return -EINVAL; - } - - *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) - &pgrp_get_status->objects[idx].data.board_obj; - return 0; -} - static int volt_device_volt_cmp(const void *a, const void *b) { const struct voltage_device_entry *a_entry; @@ -583,7 +564,6 @@ int volt_dev_sw_setup(struct gk20a *g) pboardobjgrp = &g->perf_pmu->volt.volt_dev_metadata.volt_devices.super; pboardobjgrp->pmudatainstget = _volt_device_devgrp_pmudata_instget; - pboardobjgrp->pmustatusinstget = _volt_device_devgrp_pmustatus_instget; /* Obtain Voltage Rail Table from VBIOS */ status = volt_get_volt_devices_table(g, &g->perf_pmu->volt. @@ -604,16 +584,6 @@ int volt_dev_sw_setup(struct gk20a *g) goto done; } - status = BOARDOBJGRP_PMU_CMD_GRP_GET_STATUS_CONSTRUCT(g, - &g->perf_pmu->volt.volt_dev_metadata.volt_devices.super, - volt, VOLT, volt_device, VOLT_DEVICE); - if (status != 0) { - nvgpu_err(g, - "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", - status); - goto done; - } - /* update calibration to fuse */ BOARDOBJGRP_FOR_EACH(&(g->perf_pmu->volt.volt_dev_metadata.volt_devices. super), diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h index ba5ca6dbf..0b194a987 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h +++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuifvolt.h @@ -181,22 +181,6 @@ union nv_pmu_volt_volt_rail_boardobj_get_status_union { NV_PMU_BOARDOBJ_GRP_GET_STATUS_MAKE_E32(volt, volt_rail); -/* ---------- VOLT_DEVICE's GRP_GET_STATUS defines and structures ---------- */ -struct nv_pmu_volt_volt_device_boardobjgrp_get_status_header { - struct nv_pmu_boardobjgrp_e32 super; -}; - -struct nv_pmu_volt_volt_device_boardobj_get_status { - struct nv_pmu_boardobj_query super; -}; - -union nv_pmu_volt_volt_device_boardobj_get_status_union { - struct nv_pmu_boardobj_query board_obj; - struct nv_pmu_volt_volt_device_boardobj_get_status super; -}; - -NV_PMU_BOARDOBJ_GRP_GET_STATUS_MAKE_E32(volt, volt_device); - /* ---------- 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;