From b96a6506d0095ef7271b9fadaba2e0dc6ca33484 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Mon, 10 Sep 2018 19:48:14 +0530 Subject: gpu: nvgpu: rename PMU perf unit to pmu_perf Move all files under perf/* to pmu_perf/* since pmu_perf is logically appropriate name for PMU's perf unit Rename perf.c to pmu_perf.c Also rename the HAL from gops.perf to gops.pmu_perf Jira NVGPU-1102 Change-Id: I79e73b8b102ddf6b49783c2f38d861cd43b0b4c6 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1819301 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/perf/perf.c | 128 ----- drivers/gpu/nvgpu/perf/perf.h | 85 --- drivers/gpu/nvgpu/perf/vfe_equ.c | 607 --------------------- drivers/gpu/nvgpu/perf/vfe_equ.h | 84 --- drivers/gpu/nvgpu/perf/vfe_var.c | 1091 -------------------------------------- drivers/gpu/nvgpu/perf/vfe_var.h | 109 ---- 6 files changed, 2104 deletions(-) delete mode 100644 drivers/gpu/nvgpu/perf/perf.c delete mode 100644 drivers/gpu/nvgpu/perf/perf.h delete mode 100644 drivers/gpu/nvgpu/perf/vfe_equ.c delete mode 100644 drivers/gpu/nvgpu/perf/vfe_equ.h delete mode 100644 drivers/gpu/nvgpu/perf/vfe_var.c delete mode 100644 drivers/gpu/nvgpu/perf/vfe_var.h (limited to 'drivers/gpu/nvgpu/perf') diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/perf/perf.c deleted file mode 100644 index 582b2577..00000000 --- a/drivers/gpu/nvgpu/perf/perf.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include -#include -#include - -#include "perf.h" - -struct perfrpc_pmucmdhandler_params { - struct nv_pmu_perf_rpc *prpccall; - u32 success; -}; - -static void perfrpc_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg, - void *param, u32 handle, u32 status) -{ - struct perfrpc_pmucmdhandler_params *phandlerparams = - (struct perfrpc_pmucmdhandler_params *)param; - - nvgpu_log_info(g, " "); - - if (msg->msg.perf.msg_type != NV_PMU_PERF_MSG_ID_RPC) { - nvgpu_err(g, "unsupported msg for VFE LOAD RPC %x", - msg->msg.perf.msg_type); - return; - } - - if (phandlerparams->prpccall->b_supported) { - phandlerparams->success = 1; - } -} - -static int pmu_handle_perf_event(struct gk20a *g, void *pmu_msg) -{ - struct nv_pmu_perf_msg *msg = (struct nv_pmu_perf_msg *)pmu_msg; - - nvgpu_log_fn(g, " "); - switch (msg->msg_type) { - case NV_PMU_PERF_MSG_ID_VFE_CALLBACK: - nvgpu_clk_arb_schedule_vf_table_update(g); - break; - default: - WARN_ON(1); - break; - } - return 0; -} - -u32 perf_pmu_vfe_load(struct gk20a *g) -{ - struct pmu_cmd cmd; - struct pmu_payload payload; - u32 status; - u32 seqdesc; - struct nv_pmu_perf_rpc rpccall; - struct perfrpc_pmucmdhandler_params handler; - - memset(&payload, 0, sizeof(struct pmu_payload)); - memset(&rpccall, 0, sizeof(struct nv_pmu_perf_rpc)); - memset(&handler, 0, sizeof(struct perfrpc_pmucmdhandler_params)); - - /*register call back for future VFE updates*/ - g->ops.perf.handle_pmu_perf_event = pmu_handle_perf_event; - - rpccall.function = NV_PMU_PERF_RPC_ID_VFE_LOAD; - rpccall.params.vfe_load.b_load = true; - cmd.hdr.unit_id = PMU_UNIT_PERF; - cmd.hdr.size = (u32)sizeof(struct nv_pmu_perf_cmd) + - (u32)sizeof(struct pmu_hdr); - - cmd.cmd.perf.cmd_type = NV_PMU_PERF_CMD_ID_RPC; - - payload.in.buf = (u8 *)&rpccall; - payload.in.size = (u32)sizeof(struct nv_pmu_perf_rpc); - payload.in.fb_size = PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED; - payload.in.offset = NV_PMU_PERF_CMD_RPC_ALLOC_OFFSET; - - payload.out.buf = (u8 *)&rpccall; - payload.out.size = (u32)sizeof(struct nv_pmu_perf_rpc); - payload.out.fb_size = PMU_CMD_SUBMIT_PAYLOAD_PARAMS_FB_SIZE_UNUSED; - payload.out.offset = NV_PMU_PERF_MSG_RPC_ALLOC_OFFSET; - - handler.prpccall = &rpccall; - handler.success = 0; - - status = nvgpu_pmu_cmd_post(g, &cmd, NULL, &payload, - PMU_COMMAND_QUEUE_LPQ, - perfrpc_pmucmdhandler, (void *)&handler, - &seqdesc, ~0); - - if (status) { - nvgpu_err(g, "unable to post perf RPC cmd %x", - cmd.cmd.perf.cmd_type); - goto done; - } - - pmu_wait_message_cond(&g->pmu, - gk20a_get_gr_idle_timeout(g), - &handler.success, 1); - - if (handler.success == 0) { - status = -EINVAL; - nvgpu_err(g, "rpc call to load VFE failed"); - } -done: - return status; -} diff --git a/drivers/gpu/nvgpu/perf/perf.h b/drivers/gpu/nvgpu/perf/perf.h deleted file mode 100644 index 71c8086b..00000000 --- a/drivers/gpu/nvgpu/perf/perf.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -#ifndef NVGPU_PERF_H -#define NVGPU_PERF_H - -#include -#include "vfe_equ.h" -#include "vfe_var.h" -#include "pstate/pstate.h" -#include "volt/volt.h" -#include "lpwr/lpwr.h" -#include "boardobj/boardobjgrp_e255.h" - -#define CTRL_PERF_VFE_VAR_TYPE_INVALID 0x00 -#define CTRL_PERF_VFE_VAR_TYPE_DERIVED 0x01 -#define CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT 0x02 -#define CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM 0x03 -#define CTRL_PERF_VFE_VAR_TYPE_SINGLE 0x04 -#define CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY 0x05 -#define CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED 0x06 -#define CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE 0x07 -#define CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP 0x08 -#define CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE 0x09 - -#define CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_NONE 0x00 -#define CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_VALUE 0x01 -#define CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_OFFSET 0x02 -#define CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_SCALE 0x03 - -#define CTRL_PERF_VFE_EQU_TYPE_INVALID 0x00 -#define CTRL_PERF_VFE_EQU_TYPE_COMPARE 0x01 -#define CTRL_PERF_VFE_EQU_TYPE_MINMAX 0x02 -#define CTRL_PERF_VFE_EQU_TYPE_QUADRATIC 0x03 - -#define CTRL_PERF_VFE_EQU_OUTPUT_TYPE_UNITLESS 0x00 -#define CTRL_PERF_VFE_EQU_OUTPUT_TYPE_FREQ_MHZ 0x01 -#define CTRL_PERF_VFE_EQU_OUTPUT_TYPE_VOLT_UV 0x02 -#define CTRL_PERF_VFE_EQU_OUTPUT_TYPE_VF_GAIN 0x03 -#define CTRL_PERF_VFE_EQU_OUTPUT_TYPE_VOLT_DELTA_UV 0x04 - -#define CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT 0x03 - -#define CTRL_PERF_VFE_EQU_COMPARE_FUNCTION_EQUAL 0x00 -#define CTRL_PERF_VFE_EQU_COMPARE_FUNCTION_GREATER_EQ 0x01 -#define CTRL_PERF_VFE_EQU_COMPARE_FUNCTION_GREATER 0x02 - -struct gk20a; - -struct nvgpu_vfe_invalidate { - bool state_change; - struct nvgpu_cond wq; - struct nvgpu_thread state_task; -}; - -struct perf_pmupstate { - struct vfe_vars vfe_varobjs; - struct vfe_equs vfe_equobjs; - struct pstates pstatesobjs; - struct obj_volt volt; - struct obj_lwpr lpwr; - struct nvgpu_vfe_invalidate vfe_init; -}; - -u32 perf_pmu_vfe_load(struct gk20a *g); - -#endif /* NVGPU_PERF_H */ diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.c b/drivers/gpu/nvgpu/perf/vfe_equ.c deleted file mode 100644 index 4e93c82e..00000000 --- a/drivers/gpu/nvgpu/perf/vfe_equ.c +++ /dev/null @@ -1,607 +0,0 @@ -/* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include - -#include "perf.h" -#include "vfe_equ.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e255.h" -#include "ctrl/ctrlclk.h" -#include "ctrl/ctrlvolt.h" - -static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs); -static int devinit_get_vfe_equ_table(struct gk20a *g, - struct vfe_equs *pequobjs); - -static int _vfe_equs_pmudatainit(struct gk20a *g, - struct boardobjgrp *pboardobjgrp, - struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) -{ - int status = 0; - - status = boardobjgrp_pmudatainit_e255(g, pboardobjgrp, pboardobjgrppmu); - if (status) { - nvgpu_err(g, "error updating pmu boardobjgrp for vfe equ 0x%x", - status); - goto done; - } - -done: - return status; -} - -static int _vfe_equs_pmudata_instget(struct gk20a *g, - struct nv_pmu_boardobjgrp *pmuboardobjgrp, - struct nv_pmu_boardobj **ppboardobjpmudata, - u8 idx) -{ - struct nv_pmu_perf_vfe_equ_boardobj_grp_set *pgrp_set = - (struct nv_pmu_perf_vfe_equ_boardobj_grp_set *)pmuboardobjgrp; - - nvgpu_log_info(g, " "); - - /* check whether pmuboardobjgrp has a valid boardobj in index */ - if (idx >= CTRL_BOARDOBJGRP_E255_MAX_OBJECTS) { - return -EINVAL; - } - - *ppboardobjpmudata = (struct nv_pmu_boardobj *) - &pgrp_set->objects[idx].data.board_obj; - nvgpu_log_info(g, " Done"); - return 0; -} - -int vfe_equ_sw_setup(struct gk20a *g) -{ - int status; - struct boardobjgrp *pboardobjgrp = NULL; - struct vfe_equs *pvfeequobjs; - - nvgpu_log_info(g, " "); - - status = boardobjgrpconstruct_e255(g, &g->perf_pmu.vfe_equobjs.super); - if (status) { - nvgpu_err(g, - "error creating boardobjgrp for clk domain, status - 0x%x", - status); - goto done; - } - - pboardobjgrp = &g->perf_pmu.vfe_equobjs.super.super; - pvfeequobjs = &(g->perf_pmu.vfe_equobjs); - - BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, PERF, VFE_EQU); - - status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, - perf, PERF, vfe_equ, VFE_EQU); - if (status) { - nvgpu_err(g, - "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", - status); - goto done; - } - - pboardobjgrp->pmudatainit = _vfe_equs_pmudatainit; - pboardobjgrp->pmudatainstget = _vfe_equs_pmudata_instget; - - status = devinit_get_vfe_equ_table(g, pvfeequobjs); - if (status) { - goto done; - } - -done: - nvgpu_log_info(g, " done status %x", status); - return status; -} - -int vfe_equ_pmu_setup(struct gk20a *g) -{ - int status; - struct boardobjgrp *pboardobjgrp = NULL; - - nvgpu_log_info(g, " "); - - pboardobjgrp = &g->perf_pmu.vfe_equobjs.super.super; - - if (!pboardobjgrp->bconstructed) { - return -EINVAL; - } - - status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); - - nvgpu_log_info(g, "Done"); - return status; -} - -static int devinit_get_vfe_equ_table(struct gk20a *g, - struct vfe_equs *pvfeequobjs) -{ - int status = 0; - u8 *vfeequs_tbl_ptr = NULL; - struct vbios_vfe_3x_header_struct vfeequs_tbl_header = { 0 }; - struct vbios_vfe_3x_equ_entry_struct equ = { 0 }; - u8 *vfeequs_tbl_entry_ptr = NULL; - u8 *rd_offset_ptr = NULL; - u32 index = 0; - struct vfe_equ *pequ; - u8 equ_type = 0; - u32 szfmt; - union { - struct boardobj board_obj; - struct vfe_equ super; - struct vfe_equ_compare compare; - struct vfe_equ_minmax minmax; - struct vfe_equ_quadratic quadratic; - } equ_data; - - nvgpu_log_info(g, " "); - - vfeequs_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, - g->bios.perf_token, - CONTINUOUS_VIRTUAL_BINNING_TABLE); - - if (vfeequs_tbl_ptr == NULL) { - status = -EINVAL; - goto done; - } - - memcpy(&vfeequs_tbl_header, vfeequs_tbl_ptr, - VBIOS_CLOCKS_TABLE_1X_HEADER_SIZE_07); - if (vfeequs_tbl_header.header_size != VBIOS_CLOCKS_TABLE_1X_HEADER_SIZE_07) { - status = -EINVAL; - goto done; - } - - if (vfeequs_tbl_header.vfe_equ_entry_size == - VBIOS_VFE_3X_EQU_ENTRY_SIZE_17) { - szfmt = VBIOS_VFE_3X_EQU_ENTRY_SIZE_17; - } else if (vfeequs_tbl_header.vfe_equ_entry_size == - VBIOS_VFE_3X_EQU_ENTRY_SIZE_18) { - szfmt = VBIOS_VFE_3X_EQU_ENTRY_SIZE_18; - } else { - status = -EINVAL; - goto done; - } - - vfeequs_tbl_entry_ptr = vfeequs_tbl_ptr + - vfeequs_tbl_header.header_size + - (vfeequs_tbl_header.vfe_var_entry_count * - vfeequs_tbl_header.vfe_var_entry_size); - - for (index = 0; - index < vfeequs_tbl_header.vfe_equ_entry_count; - index++) { - memset(&equ, 0, sizeof(struct vbios_vfe_3x_equ_entry_struct)); - - rd_offset_ptr = vfeequs_tbl_entry_ptr + - (index * vfeequs_tbl_header.vfe_equ_entry_size); - - memcpy(&equ, rd_offset_ptr, szfmt); - - equ_data.super.var_idx = (u8)equ.var_idx; - equ_data.super.equ_idx_next = - (equ.equ_idx_next == VBIOS_VFE_3X_EQU_ENTRY_IDX_INVALID) ? - CTRL_BOARDOBJ_IDX_INVALID : (u8)equ.equ_idx_next; - equ_data.super.out_range_min = equ.out_range_min; - equ_data.super.out_range_max = equ.out_range_max; - - switch (BIOS_GET_FIELD(equ.param3, VBIOS_VFE_3X_EQU_ENTRY_PAR3_OUTPUT_TYPE)) { - case VBIOS_VFE_3X_EQU_ENTRY_PAR3_OUTPUT_TYPE_UNITLESS: - equ_data.super.output_type = - CTRL_PERF_VFE_EQU_OUTPUT_TYPE_UNITLESS; - break; - - case VBIOS_VFE_3X_EQU_ENTRY_PAR3_OUTPUT_TYPE_FREQ_MHZ: - equ_data.super.output_type = - CTRL_PERF_VFE_EQU_OUTPUT_TYPE_FREQ_MHZ; - break; - - case VBIOS_VFE_3X_EQU_ENTRY_PAR3_OUTPUT_TYPE_VOLT_UV: - equ_data.super.output_type = - CTRL_PERF_VFE_EQU_OUTPUT_TYPE_VOLT_UV; - break; - - case VBIOS_VFE_3X_EQU_ENTRY_PAR3_OUTPUT_TYPE_VF_GAIN: - equ_data.super.output_type = - CTRL_PERF_VFE_EQU_OUTPUT_TYPE_VF_GAIN; - break; - - case VBIOS_VFE_3X_EQU_ENTRY_PAR3_OUTPUT_TYPE_VOLT_DELTA_UV: - equ_data.super.output_type = - CTRL_PERF_VFE_EQU_OUTPUT_TYPE_VOLT_DELTA_UV; - break; - - default: - nvgpu_err(g, "unrecognized output id @vfeequ index %d", - index); - goto done; - } - - switch ((u8)equ.type) { - case VBIOS_VFE_3X_EQU_ENTRY_TYPE_DISABLED: - case VBIOS_VFE_3X_EQU_ENTRY_TYPE_QUADRATIC_FXP: - case VBIOS_VFE_3X_EQU_ENTRY_TYPE_MINMAX_FXP: - continue; - break; - - case VBIOS_VFE_3X_EQU_ENTRY_TYPE_QUADRATIC: - equ_type = CTRL_PERF_VFE_EQU_TYPE_QUADRATIC; - equ_data.quadratic.coeffs[0] = equ.param0; - equ_data.quadratic.coeffs[1] = equ.param1; - equ_data.quadratic.coeffs[2] = equ.param2; - break; - - case VBIOS_VFE_3X_EQU_ENTRY_TYPE_MINMAX: - equ_type = CTRL_PERF_VFE_EQU_TYPE_MINMAX; - equ_data.minmax.b_max = BIOS_GET_FIELD(equ.param0, - VBIOS_VFE_3X_EQU_ENTRY_PAR0_MINMAX_CRIT) && - VBIOS_VFE_3X_EQU_ENTRY_PAR0_MINMAX_CRIT_MAX; - equ_data.minmax.equ_idx0 = (u8)BIOS_GET_FIELD( - equ.param0, - VBIOS_VFE_3X_EQU_ENTRY_PAR0_MINMAX_VFE_EQU_IDX_0); - equ_data.minmax.equ_idx1 = (u8)BIOS_GET_FIELD( - equ.param0, - VBIOS_VFE_3X_EQU_ENTRY_PAR0_MINMAX_VFE_EQU_IDX_1); - break; - - case VBIOS_VFE_3X_EQU_ENTRY_TYPE_COMPARE: - { - u8 cmp_func = (u8)BIOS_GET_FIELD( - equ.param1, - VBIOS_VFE_3X_EQU_ENTRY_PAR1_COMPARE_FUNCTION); - equ_type = CTRL_PERF_VFE_EQU_TYPE_COMPARE; - - switch (cmp_func) { - case VBIOS_VFE_3X_EQU_ENTRY_PAR1_COMPARE_FUNCTION_EQUAL: - equ_data.compare.func_id = - CTRL_PERF_VFE_EQU_COMPARE_FUNCTION_EQUAL; - break; - - case VBIOS_VFE_3X_EQU_ENTRY_PAR1_COMPARE_FUNCTION_GREATER_EQ: - equ_data.compare.func_id = - CTRL_PERF_VFE_EQU_COMPARE_FUNCTION_GREATER_EQ; - break; - case VBIOS_VFE_3X_EQU_ENTRY_PAR1_COMPARE_FUNCTION_GREATER: - equ_data.compare.func_id = - CTRL_PERF_VFE_EQU_COMPARE_FUNCTION_GREATER; - break; - default: - nvgpu_err(g, - "invalid vfe compare index %x type %x ", - index, cmp_func); - status = -EINVAL; - goto done; - } - equ_data.compare.equ_idx_true = (u8)BIOS_GET_FIELD( - equ.param1, - VBIOS_VFE_3X_EQU_ENTRY_PAR1_COMPARE_VFE_EQU_IDX_TRUE); - equ_data.compare.equ_idx_false = (u8)BIOS_GET_FIELD( - equ.param1, - VBIOS_VFE_3X_EQU_ENTRY_PAR1_COMPARE_VFE_EQU_IDX_FALSE); - equ_data.compare.criteria = equ.param0; - break; - } - default: - status = -EINVAL; - nvgpu_err(g, "Invalid equ[%d].type = 0x%x.", - index, (u8)equ.type); - goto done; - } - - equ_data.board_obj.type = equ_type; - pequ = construct_vfe_equ(g, (void *)&equ_data); - - if (pequ == NULL) { - nvgpu_err(g, - "error constructing vfe_equ boardobj %d", index); - status = -EINVAL; - goto done; - } - - status = boardobjgrp_objinsert(&pvfeequobjs->super.super, - (struct boardobj *)pequ, index); - if (status) { - nvgpu_err(g, "error adding vfe_equ boardobj %d", index); - status = -EINVAL; - goto done; - } - } -done: - nvgpu_log_info(g, " done status %x", status); - return status; -} - -static int _vfe_equ_pmudatainit_super(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - u32 status = 0; - struct vfe_equ *pvfe_equ; - struct nv_pmu_vfe_equ *pset; - - nvgpu_log_info(g, " "); - - status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_equ = (struct vfe_equ *)board_obj_ptr; - - pset = (struct nv_pmu_vfe_equ *) - ppmudata; - - pset->var_idx = pvfe_equ->var_idx; - pset->equ_idx_next = pvfe_equ->equ_idx_next; - pset->output_type = pvfe_equ->output_type; - pset->out_range_min = pvfe_equ->out_range_min; - pset->out_range_max = pvfe_equ->out_range_max; - - return status; -} - -static int vfe_equ_construct_super(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct vfe_equ *pvfeequ; - struct vfe_equ *ptmpequ = (struct vfe_equ *)pargs; - int status = 0; - - status = boardobj_construct_super(g, ppboardobj, - size, pargs); - if (status) { - return -EINVAL; - } - - pvfeequ = (struct vfe_equ *)*ppboardobj; - - pvfeequ->super.pmudatainit = - _vfe_equ_pmudatainit_super; - - pvfeequ->var_idx = ptmpequ->var_idx; - pvfeequ->equ_idx_next = ptmpequ->equ_idx_next; - pvfeequ->output_type = ptmpequ->output_type; - pvfeequ->out_range_min = ptmpequ->out_range_min; - pvfeequ->out_range_max = ptmpequ->out_range_max; - - return status; -} - -static int _vfe_equ_pmudatainit_compare(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_equ_compare *pvfe_equ_compare; - struct nv_pmu_vfe_equ_compare *pset; - - nvgpu_log_info(g, " "); - - status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_equ_compare = (struct vfe_equ_compare *)board_obj_ptr; - - pset = (struct nv_pmu_vfe_equ_compare *) ppmudata; - - pset->func_id = pvfe_equ_compare->func_id; - pset->equ_idx_true = pvfe_equ_compare->equ_idx_true; - pset->equ_idx_false = pvfe_equ_compare->equ_idx_false; - pset->criteria = pvfe_equ_compare->criteria; - - return status; -} - - -static int vfe_equ_construct_compare(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_equ_compare *pvfeequ; - struct vfe_equ_compare *ptmpequ = - (struct vfe_equ_compare *)pargs; - int status = 0; - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_COMPARE) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_EQU_TYPE_COMPARE); - status = vfe_equ_construct_super(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfeequ = (struct vfe_equ_compare *)*ppboardobj; - - pvfeequ->super.super.pmudatainit = - _vfe_equ_pmudatainit_compare; - - pvfeequ->func_id = ptmpequ->func_id; - pvfeequ->equ_idx_true = ptmpequ->equ_idx_true; - pvfeequ->equ_idx_false = ptmpequ->equ_idx_false; - pvfeequ->criteria = ptmpequ->criteria; - - - return status; -} - -static int _vfe_equ_pmudatainit_minmax(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_equ_minmax *pvfe_equ_minmax; - struct nv_pmu_vfe_equ_minmax *pset; - - nvgpu_log_info(g, " "); - - status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_equ_minmax = (struct vfe_equ_minmax *)board_obj_ptr; - - pset = (struct nv_pmu_vfe_equ_minmax *) - ppmudata; - - pset->b_max = pvfe_equ_minmax->b_max; - pset->equ_idx0 = pvfe_equ_minmax->equ_idx0; - pset->equ_idx1 = pvfe_equ_minmax->equ_idx1; - - return status; -} - -static int vfe_equ_construct_minmax(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_equ_minmax *pvfeequ; - struct vfe_equ_minmax *ptmpequ = - (struct vfe_equ_minmax *)pargs; - int status = 0; - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_MINMAX) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_EQU_TYPE_MINMAX); - status = vfe_equ_construct_super(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfeequ = (struct vfe_equ_minmax *)*ppboardobj; - - pvfeequ->super.super.pmudatainit = - _vfe_equ_pmudatainit_minmax; - pvfeequ->b_max = ptmpequ->b_max; - pvfeequ->equ_idx0 = ptmpequ->equ_idx0; - pvfeequ->equ_idx1 = ptmpequ->equ_idx1; - - return status; -} - -static int _vfe_equ_pmudatainit_quadratic(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_equ_quadratic *pvfe_equ_quadratic; - struct nv_pmu_vfe_equ_quadratic *pset; - u32 i; - - nvgpu_log_info(g, " "); - - status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_equ_quadratic = (struct vfe_equ_quadratic *)board_obj_ptr; - - pset = (struct nv_pmu_vfe_equ_quadratic *) ppmudata; - - for (i = 0; i < CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT; i++) { - pset->coeffs[i] = pvfe_equ_quadratic->coeffs[i]; - } - - return status; -} - -static int vfe_equ_construct_quadratic(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_equ_quadratic *pvfeequ; - struct vfe_equ_quadratic *ptmpequ = - (struct vfe_equ_quadratic *)pargs; - int status = 0; - u32 i; - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_EQU_TYPE_QUADRATIC) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_EQU_TYPE_QUADRATIC); - status = vfe_equ_construct_super(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfeequ = (struct vfe_equ_quadratic *)*ppboardobj; - - pvfeequ->super.super.pmudatainit = - _vfe_equ_pmudatainit_quadratic; - - for (i = 0; i < CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT; i++) { - pvfeequ->coeffs[i] = ptmpequ->coeffs[i]; - } - - return status; -} - -static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs) -{ - struct boardobj *board_obj_ptr = NULL; - int status; - - nvgpu_log_info(g, " "); - - switch (BOARDOBJ_GET_TYPE(pargs)) { - case CTRL_PERF_VFE_EQU_TYPE_COMPARE: - status = vfe_equ_construct_compare(g, &board_obj_ptr, - sizeof(struct vfe_equ_compare), pargs); - break; - - case CTRL_PERF_VFE_EQU_TYPE_MINMAX: - status = vfe_equ_construct_minmax(g, &board_obj_ptr, - sizeof(struct vfe_equ_minmax), pargs); - break; - - case CTRL_PERF_VFE_EQU_TYPE_QUADRATIC: - status = vfe_equ_construct_quadratic(g, &board_obj_ptr, - sizeof(struct vfe_equ_quadratic), pargs); - break; - - default: - return NULL; - - } - - if (status) { - return NULL; - } - - nvgpu_log_info(g, " Done"); - - return (struct vfe_equ *)board_obj_ptr; -} diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.h b/drivers/gpu/nvgpu/perf/vfe_equ.h deleted file mode 100644 index 98222ee5..00000000 --- a/drivers/gpu/nvgpu/perf/vfe_equ.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * general perf structures & definitions - * - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -#ifndef NVGPU_PERF_VFE_EQU_H -#define NVGPU_PERF_VFE_EQU_H - -#include "boardobj/boardobjgrp.h" -#include "perf/vfe_var.h" -#include - -int vfe_equ_sw_setup(struct gk20a *g); -int vfe_equ_pmu_setup(struct gk20a *g); - -#define VFE_EQU_GET(_pperf, _idx) \ - ((struct vfe_equ *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ - &((_pperf)->vfe.equs.super.super), (_idx))) - -#define VFE_EQU_IDX_IS_VALID(_pperf, _idx) \ - boardobjgrp_idxisvalid(&((_pperf)->vfe.equs.super.super), (_idx)) - -#define VFE_EQU_OUTPUT_TYPE_IS_VALID(_pperf, _idx, _outputtype) \ - (VFE_EQU_IDX_IS_VALID((_pperf), (_idx)) && \ - ((_outputtype) != CTRL_PERF_VFE_EQU_OUTPUT_TYPE_UNITLESS) && \ - ((VFE_EQU_GET((_pperf), (_idx))->outputtype == (_outputtype)) || \ - (VFE_EQU_GET((_pperf), (_idx))->outputtype == \ - CTRL_PERF_VFE_EQU_OUTPUT_TYPE_UNITLESS))) - -struct vfe_equ { - struct boardobj super; - u8 var_idx; - u8 equ_idx_next; - u8 output_type; - u32 out_range_min; - u32 out_range_max; - - bool b_is_dynamic_valid; - bool b_is_dynamic; -}; - -struct vfe_equs { - struct boardobjgrp_e255 super; -}; - -struct vfe_equ_compare { - struct vfe_equ super; - u8 func_id; - u8 equ_idx_true; - u8 equ_idx_false; - u32 criteria; -}; - -struct vfe_equ_minmax { - struct vfe_equ super; - bool b_max; - u8 equ_idx0; - u8 equ_idx1; -}; - -struct vfe_equ_quadratic { - struct vfe_equ super; - u32 coeffs[CTRL_PERF_VFE_EQU_QUADRATIC_COEFF_COUNT]; -}; - -#endif /* NVGPU_PERF_VFE_EQU_H */ diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c deleted file mode 100644 index 8518fc26..00000000 --- a/drivers/gpu/nvgpu/perf/vfe_var.c +++ /dev/null @@ -1,1091 +0,0 @@ -/* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#include -#include - -#include "perf.h" -#include "vfe_var.h" -#include "boardobj/boardobjgrp.h" -#include "boardobj/boardobjgrp_e32.h" -#include "ctrl/ctrlclk.h" -#include "ctrl/ctrlvolt.h" -#include "ctrl/ctrlperf.h" - -static int devinit_get_vfe_var_table(struct gk20a *g, - struct vfe_vars *pvarobjs); -static int vfe_var_construct_single(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs); - -static int _vfe_vars_pmudatainit(struct gk20a *g, - struct boardobjgrp *pboardobjgrp, - struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) -{ - struct nv_pmu_perf_vfe_var_boardobjgrp_set_header *pset = - (struct nv_pmu_perf_vfe_var_boardobjgrp_set_header *) - pboardobjgrppmu; - struct vfe_vars *pvars = (struct vfe_vars *)pboardobjgrp; - int status = 0; - - status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); - if (status) { - nvgpu_err(g, - "error updating pmu boardobjgrp for vfe var 0x%x", - status); - goto done; - } - pset->polling_periodms = pvars->polling_periodms; - -done: - return status; -} - -static int _vfe_vars_pmudata_instget(struct gk20a *g, - struct nv_pmu_boardobjgrp *pmuboardobjgrp, - struct nv_pmu_boardobj **ppboardobjpmudata, - u8 idx) -{ - struct nv_pmu_perf_vfe_var_boardobj_grp_set *pgrp_set = - (struct nv_pmu_perf_vfe_var_boardobj_grp_set *) - pmuboardobjgrp; - - nvgpu_log_info(g, " "); - - /*check whether pmuboardobjgrp has a valid boardobj in index*/ - if (idx >= CTRL_BOARDOBJGRP_E32_MAX_OBJECTS) { - return -EINVAL; - } - - *ppboardobjpmudata = (struct nv_pmu_boardobj *) - &pgrp_set->objects[idx].data.board_obj; - - nvgpu_log_info(g, " Done"); - return 0; -} - -static int _vfe_vars_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, - struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) -{ - struct nv_pmu_perf_vfe_var_boardobj_grp_get_status *pgrp_get_status = - (struct nv_pmu_perf_vfe_var_boardobj_grp_get_status *) - pboardobjgrppmu; - - if (((u32)BIT(idx) & - pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) { - return -EINVAL; - } - - *ppboardobjpmustatus = (struct nv_pmu_boardobj_query *) - &pgrp_get_status->objects[idx].data.board_obj; - return 0; -} - - -int vfe_var_sw_setup(struct gk20a *g) -{ - u32 status; - struct boardobjgrp *pboardobjgrp = NULL; - struct vfe_vars *pvfevarobjs; - - nvgpu_log_info(g, " "); - - status = boardobjgrpconstruct_e32(g, &g->perf_pmu.vfe_varobjs.super); - if (status) { - nvgpu_err(g, - "error creating boardobjgrp for clk domain, status - 0x%x", - status); - goto done; - } - - pboardobjgrp = &g->perf_pmu.vfe_varobjs.super.super; - pvfevarobjs = &g->perf_pmu.vfe_varobjs; - - BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, PERF, VFE_VAR); - - status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, - perf, PERF, vfe_var, VFE_VAR); - if (status) { - nvgpu_err(g, - "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", - status); - goto done; - } - - pboardobjgrp->pmudatainit = _vfe_vars_pmudatainit; - pboardobjgrp->pmudatainstget = _vfe_vars_pmudata_instget; - pboardobjgrp->pmustatusinstget = _vfe_vars_pmustatus_instget; - - status = devinit_get_vfe_var_table(g, pvfevarobjs); - if (status) { - goto done; - } - - status = BOARDOBJGRP_PMU_CMD_GRP_GET_STATUS_CONSTRUCT(g, - &g->perf_pmu.vfe_varobjs.super.super, - perf, PERF, vfe_var, VFE_VAR); - if (status) { - nvgpu_err(g, - "error constructing PMU_BOARDOBJ_CMD_GRP_GET_STATUS interface - 0x%x", - status); - goto done; - } - -done: - nvgpu_log_info(g, " done status %x", status); - return status; -} - -int vfe_var_pmu_setup(struct gk20a *g) -{ - int status; - struct boardobjgrp *pboardobjgrp = NULL; - - nvgpu_log_info(g, " "); - - pboardobjgrp = &g->perf_pmu.vfe_varobjs.super.super; - - if (!pboardobjgrp->bconstructed) { - return -EINVAL; - } - - status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); - - nvgpu_log_info(g, "Done"); - return status; -} - -static u32 dev_init_get_vfield_info(struct gk20a *g, - struct vfe_var_single_sensed_fuse *pvfevar) -{ - u8 *vfieldtableptr = NULL; - u32 vfieldheadersize = VFIELD_HEADER_SIZE; - u8 *vfieldregtableptr = NULL; - u32 vfieldregheadersize = VFIELD_REG_HEADER_SIZE; - u32 i; - u32 oldindex = 0xFFFFFFFF; - u32 currindex; - struct vfield_reg_header vregheader; - struct vfield_reg_entry vregentry; - struct vfield_header vheader; - struct vfield_entry ventry; - struct ctrl_bios_vfield_register_segment *psegment = NULL; - u8 *psegmentcount = NULL; - u32 status = 0; - - vfieldregtableptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, - g->bios.virt_token, VP_FIELD_REGISTER); - if (vfieldregtableptr == NULL) { - status = -EINVAL; - goto done; - } - - vfieldtableptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, - g->bios.virt_token, VP_FIELD_TABLE); - if (vfieldtableptr == NULL) { - status = -EINVAL; - goto done; - } - - memcpy(&vregheader, vfieldregtableptr, VFIELD_REG_HEADER_SIZE); - - if (vregheader.version != VBIOS_VFIELD_REG_TABLE_VERSION_1_0) { - nvgpu_err(g, "invalid vreg header version"); - goto done; - } - - memcpy(&vheader, vfieldtableptr, VFIELD_HEADER_SIZE); - - if (vregheader.version != VBIOS_VFIELD_TABLE_VERSION_1_0) { - nvgpu_err(g, "invalid vfield header version"); - goto done; - } - - pvfevar->vfield_info.fuse.segment_count = 0; - pvfevar->vfield_ver_info.fuse.segment_count = 0; - for (i = 0; i < (u32)vheader.count; i++) { - memcpy(&ventry, vfieldtableptr + vfieldheadersize + - (i * vheader.entry_size), - vheader.entry_size); - - currindex = VFIELD_BIT_REG(ventry); - if (currindex != oldindex) { - - memcpy(&vregentry, vfieldregtableptr + - vfieldregheadersize + - (currindex * vregheader.entry_size), - vregheader.entry_size); - oldindex = currindex; - } - - if (pvfevar->vfield_info.v_field_id == ventry.strap_id) { - psegmentcount = - &(pvfevar->vfield_info.fuse.segment_count); - psegment = - &(pvfevar->vfield_info.fuse.segments[*psegmentcount]); - if (*psegmentcount > NV_PMU_VFE_VAR_SINGLE_SENSED_FUSE_SEGMENTS_MAX) { - status = -EINVAL; - goto done; - } - } else if (pvfevar->vfield_ver_info.v_field_id_ver == ventry.strap_id) { - psegmentcount = - &(pvfevar->vfield_ver_info.fuse.segment_count); - psegment = - &(pvfevar->vfield_ver_info.fuse.segments[*psegmentcount]); - if (*psegmentcount > NV_PMU_VFE_VAR_SINGLE_SENSED_FUSE_SEGMENTS_MAX) { - status = -EINVAL; - goto done; - } - } else { - continue; - } - - switch (VFIELD_CODE((&vregentry))) { - case NV_VFIELD_DESC_CODE_REG: - psegment->type = - NV_PMU_BIOS_VFIELD_DESC_CODE_REG; - psegment->data.reg.addr = vregentry.reg; - psegment->data.reg.super.high_bit = (u8)(VFIELD_BIT_STOP(ventry)); - psegment->data.reg.super.low_bit = (u8)(VFIELD_BIT_START(ventry)); - break; - - case NV_VFIELD_DESC_CODE_INDEX_REG: - psegment->type = - NV_PMU_BIOS_VFIELD_DESC_CODE_INDEX_REG; - psegment->data.index_reg.addr = vregentry.reg; - psegment->data.index_reg.index = vregentry.index; - psegment->data.index_reg.reg_index = vregentry.reg_index; - psegment->data.index_reg.super.high_bit = (u8)(VFIELD_BIT_STOP(ventry)); - psegment->data.index_reg.super.low_bit = (u8)(VFIELD_BIT_START(ventry)); - break; - - default: - psegment->type = - NV_PMU_BIOS_VFIELD_DESC_CODE_INVALID; - status = -EINVAL; - goto done; - } - - if (VFIELD_SIZE((&vregentry)) != NV_VFIELD_DESC_SIZE_DWORD) { - psegment->type = - NV_PMU_BIOS_VFIELD_DESC_CODE_INVALID; - return -EINVAL; - } - (*psegmentcount)++; - } - -done: - return status; -} - -static int _vfe_var_pmudatainit_super(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_var *pvfe_var; - struct nv_pmu_vfe_var *pset; - - nvgpu_log_info(g, " "); - - status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_var = (struct vfe_var *)board_obj_ptr; - pset = (struct nv_pmu_vfe_var *) ppmudata; - - pset->out_range_min = pvfe_var->out_range_min; - pset->out_range_max = pvfe_var->out_range_max; - status = boardobjgrpmask_export(&pvfe_var->mask_dependent_vars.super, - pvfe_var->mask_dependent_vars.super.bitcount, - &pset->mask_dependent_vars.super); - status = boardobjgrpmask_export(&pvfe_var->mask_dependent_equs.super, - pvfe_var->mask_dependent_equs.super.bitcount, - &pset->mask_dependent_equs.super); - return status; -} - -static int vfe_var_construct_super(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct vfe_var *pvfevar; - struct vfe_var *ptmpvar = (struct vfe_var *)pargs; - int status = 0; - - nvgpu_log_info(g, " "); - - status = boardobj_construct_super(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var *)*ppboardobj; - - pvfevar->super.pmudatainit = - _vfe_var_pmudatainit_super; - - pvfevar->out_range_min = ptmpvar->out_range_min; - pvfevar->out_range_max = ptmpvar->out_range_max; - pvfevar->b_is_dynamic_valid = false; - status = boardobjgrpmask_e32_init(&pvfevar->mask_dependent_vars, NULL); - status = boardobjgrpmask_e255_init(&pvfevar->mask_dependent_equs, NULL); - nvgpu_log_info(g, " "); - - return status; -} - -static int _vfe_var_pmudatainit_derived(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); - - return status; -} - -static int vfe_var_construct_derived(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - int status = 0; - struct vfe_var_derived *pvfevar; - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED); - status = vfe_var_construct_super(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_derived *)*ppboardobj; - - pvfevar->super.super.pmudatainit = - _vfe_var_pmudatainit_derived; - - return status; -} - -static int _vfe_var_pmudatainit_derived_product(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_var_derived_product *pvfe_var_derived_product; - struct nv_pmu_vfe_var_derived_product *pset; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_var_derived_product = - (struct vfe_var_derived_product *)board_obj_ptr; - pset = (struct nv_pmu_vfe_var_derived_product *)ppmudata; - - pset->var_idx0 = pvfe_var_derived_product->var_idx0; - pset->var_idx1 = pvfe_var_derived_product->var_idx1; - - return status; -} - -static int vfe_var_construct_derived_product(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_derived_product *pvfevar; - struct vfe_var_derived_product *ptmpvar = - (struct vfe_var_derived_product *)pargs; - int status = 0; - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT); - status = vfe_var_construct_derived(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_derived_product *)*ppboardobj; - - pvfevar->super.super.super.pmudatainit = - _vfe_var_pmudatainit_derived_product; - - pvfevar->var_idx0 = ptmpvar->var_idx0; - pvfevar->var_idx1 = ptmpvar->var_idx1; - - - return status; -} - -static int _vfe_var_pmudatainit_derived_sum(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_var_derived_sum *pvfe_var_derived_sum; - struct nv_pmu_vfe_var_derived_sum *pset; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_var_derived_sum = (struct vfe_var_derived_sum *)board_obj_ptr; - pset = (struct nv_pmu_vfe_var_derived_sum *)ppmudata; - - pset->var_idx0 = pvfe_var_derived_sum->var_idx0; - pset->var_idx1 = pvfe_var_derived_sum->var_idx1; - - return status; -} - -static int vfe_var_construct_derived_sum(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_derived_sum *pvfevar; - struct vfe_var_derived_sum *ptmpvar = - (struct vfe_var_derived_sum *)pargs; - int status = 0; - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM); - status = vfe_var_construct_derived(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_derived_sum *)*ppboardobj; - - pvfevar->super.super.super.pmudatainit = - _vfe_var_pmudatainit_derived_sum; - - pvfevar->var_idx0 = ptmpvar->var_idx0; - pvfevar->var_idx1 = ptmpvar->var_idx1; - - return status; -} - -static int _vfe_var_pmudatainit_single(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_var_single *pvfe_var_single; - struct nv_pmu_vfe_var_single *pset; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_var_single = (struct vfe_var_single *)board_obj_ptr; - pset = (struct nv_pmu_vfe_var_single *) - ppmudata; - - pset->override_type = pvfe_var_single->override_type; - pset->override_value = pvfe_var_single->override_value; - - return status; -} - -static int _vfe_var_pmudatainit_single_frequency(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); - - return status; -} - -static u32 vfe_var_construct_single_frequency(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_single_frequency *pvfevar; - u32 status = 0; - - nvgpu_log_info(g, " "); - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY); - status = vfe_var_construct_single(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_single_frequency *)*ppboardobj; - - pvfevar->super.super.super.pmudatainit = - _vfe_var_pmudatainit_single_frequency; - - pvfevar->super.super.b_is_dynamic = false; - pvfevar->super.super.b_is_dynamic_valid = true; - - nvgpu_log_info(g, "Done"); - return status; -} - -static int _vfe_var_pmudatainit_single_sensed(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); - - return status; -} - -static int _vfe_var_pmudatainit_single_sensed_fuse(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_var_single_sensed_fuse *pvfe_var_single_sensed_fuse; - struct nv_pmu_vfe_var_single_sensed_fuse *pset; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_var_single_sensed_fuse = - (struct vfe_var_single_sensed_fuse *)board_obj_ptr; - - pset = (struct nv_pmu_vfe_var_single_sensed_fuse *) - ppmudata; - - memcpy(&pset->vfield_info, &pvfe_var_single_sensed_fuse->vfield_info, - sizeof(struct ctrl_perf_vfe_var_single_sensed_fuse_vfield_info)); - - memcpy(&pset->vfield_ver_info, - &pvfe_var_single_sensed_fuse->vfield_ver_info, - sizeof(struct ctrl_perf_vfe_var_single_sensed_fuse_ver_vfield_info)); - - memcpy(&pset->override_info, - &pvfe_var_single_sensed_fuse->override_info, - sizeof(struct ctrl_perf_vfe_var_single_sensed_fuse_override_info)); - - pset->b_fuse_value_signed = pvfe_var_single_sensed_fuse->b_fuse_value_signed; - return status; -} - -static u32 vfe_var_construct_single_sensed(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_single_sensed *pvfevar; - - u32 status = 0; - - nvgpu_log_info(g, " "); - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED); - status = vfe_var_construct_single(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_single_sensed *)*ppboardobj; - - pvfevar->super.super.super.pmudatainit = - _vfe_var_pmudatainit_single_sensed; - - nvgpu_log_info(g, "Done"); - - return status; -} - -static u32 vfe_var_construct_single_sensed_fuse(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_single_sensed_fuse *pvfevar; - struct vfe_var_single_sensed_fuse *ptmpvar = - (struct vfe_var_single_sensed_fuse *)pargs; - u32 status = 0; - - nvgpu_log_info(g, " "); - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE); - status = vfe_var_construct_single_sensed(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_single_sensed_fuse *)*ppboardobj; - - pvfevar->super.super.super.super.pmudatainit = - _vfe_var_pmudatainit_single_sensed_fuse; - - pvfevar->vfield_info.v_field_id = ptmpvar->vfield_info.v_field_id; - pvfevar->vfield_info.fuse_val_default = - ptmpvar->vfield_info.fuse_val_default; - pvfevar->vfield_info.hw_correction_scale = - ptmpvar->vfield_info.hw_correction_scale; - pvfevar->vfield_info.hw_correction_offset = - ptmpvar->vfield_info.hw_correction_offset; - pvfevar->vfield_ver_info.v_field_id_ver = - ptmpvar->vfield_ver_info.v_field_id_ver; - pvfevar->vfield_ver_info.ver_expected = - ptmpvar->vfield_ver_info.ver_expected; - pvfevar->vfield_ver_info.b_use_default_on_ver_check_fail = - ptmpvar->vfield_ver_info.b_use_default_on_ver_check_fail; - pvfevar->b_version_check_done = false; - pvfevar->b_fuse_value_signed = - ptmpvar->b_fuse_value_signed; - pvfevar->super.super.super.b_is_dynamic = false; - pvfevar->super.super.super.b_is_dynamic_valid = true; - - dev_init_get_vfield_info(g, pvfevar); - /*check whether fuse segment got initialized*/ - if (pvfevar->vfield_info.fuse.segment_count == 0) { - nvgpu_err(g, "unable to get fuse reg info %x", - pvfevar->vfield_info.v_field_id); - status = -EINVAL; - goto exit; - } - if (pvfevar->vfield_ver_info.fuse.segment_count == 0) { - nvgpu_err(g, "unable to get fuse reg info %x", - pvfevar->vfield_ver_info.v_field_id_ver); - status = -EINVAL; - goto exit; - } -exit: - if (status) { - (*ppboardobj)->destruct(*ppboardobj); - } - - return status; -} - -static int _vfe_var_pmudatainit_single_sensed_temp(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - struct vfe_var_single_sensed_temp *pvfe_var_single_sensed_temp; - struct nv_pmu_vfe_var_single_sensed_temp *pset; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); - if (status != 0) { - return status; - } - - pvfe_var_single_sensed_temp = - (struct vfe_var_single_sensed_temp *)board_obj_ptr; - - pset = (struct nv_pmu_vfe_var_single_sensed_temp *) - ppmudata; - pset->therm_channel_index = - pvfe_var_single_sensed_temp->therm_channel_index; - pset->temp_hysteresis_positive = - pvfe_var_single_sensed_temp->temp_hysteresis_positive; - pset->temp_hysteresis_negative = - pvfe_var_single_sensed_temp->temp_hysteresis_negative; - pset->temp_default = - pvfe_var_single_sensed_temp->temp_default; - return status; -} - -static u32 vfe_var_construct_single_sensed_temp(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_single_sensed_temp *pvfevar; - struct vfe_var_single_sensed_temp *ptmpvar = - (struct vfe_var_single_sensed_temp *)pargs; - u32 status = 0; - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP); - status = vfe_var_construct_single_sensed(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_single_sensed_temp *)*ppboardobj; - - pvfevar->super.super.super.super.pmudatainit = - _vfe_var_pmudatainit_single_sensed_temp; - - pvfevar->therm_channel_index = - ptmpvar->therm_channel_index; - pvfevar->temp_hysteresis_positive = - ptmpvar->temp_hysteresis_positive; - pvfevar->temp_hysteresis_negative = - ptmpvar->temp_hysteresis_negative; - pvfevar->temp_default = - ptmpvar->temp_default; - pvfevar->super.super.super.b_is_dynamic = false; - pvfevar->super.super.super.b_is_dynamic_valid = true; - - return status; -} - -static int _vfe_var_pmudatainit_single_voltage(struct gk20a *g, - struct boardobj *board_obj_ptr, - struct nv_pmu_boardobj *ppmudata) -{ - int status = 0; - - nvgpu_log_info(g, " "); - - status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); - - return status; -} - -static int vfe_var_construct_single_voltage(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_single_voltage *pvfevar; - int status = 0; - - if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE) { - return -EINVAL; - } - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE); - status = vfe_var_construct_super(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_single_voltage *)*ppboardobj; - - pvfevar->super.super.super.pmudatainit = - _vfe_var_pmudatainit_single_voltage; - - pvfevar->super.super.b_is_dynamic = false; - pvfevar->super.super.b_is_dynamic_valid = true; - - return status; -} - -static struct vfe_var *construct_vfe_var(struct gk20a *g, void *pargs) -{ - struct boardobj *board_obj_ptr = NULL; - int status; - - nvgpu_log_info(g, " "); - switch (BOARDOBJ_GET_TYPE(pargs)) { - case CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT: - status = vfe_var_construct_derived_product(g, &board_obj_ptr, - sizeof(struct vfe_var_derived_product), pargs); - break; - - case CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM: - status = vfe_var_construct_derived_sum(g, &board_obj_ptr, - sizeof(struct vfe_var_derived_sum), pargs); - break; - - case CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY: - status = vfe_var_construct_single_frequency(g, &board_obj_ptr, - sizeof(struct vfe_var_single_frequency), pargs); - break; - - case CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE: - status = vfe_var_construct_single_sensed_fuse(g, &board_obj_ptr, - sizeof(struct vfe_var_single_sensed_fuse), pargs); - break; - - case CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP: - status = vfe_var_construct_single_sensed_temp(g, &board_obj_ptr, - sizeof(struct vfe_var_single_sensed_temp), pargs); - break; - - case CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE: - status = vfe_var_construct_single_voltage(g, &board_obj_ptr, - sizeof(struct vfe_var_single_voltage), pargs); - break; - - case CTRL_PERF_VFE_VAR_TYPE_DERIVED: - case CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED: - case CTRL_PERF_VFE_VAR_TYPE_SINGLE: - default: - return NULL; - } - - if (status) { - return NULL; - } - - nvgpu_log_info(g, "done"); - - return (struct vfe_var *)board_obj_ptr; -} - -static int devinit_get_vfe_var_table(struct gk20a *g, - struct vfe_vars *pvfevarobjs) -{ - int status = 0; - u8 *vfevars_tbl_ptr = NULL; - struct vbios_vfe_3x_header_struct vfevars_tbl_header = { 0 }; - struct vbios_vfe_3x_var_entry_struct var = { 0 }; - u8 *vfevars_tbl_entry_ptr = NULL; - u8 *rd_offset_ptr = NULL; - u32 index = 0; - struct vfe_var *pvar; - u8 var_type; - u32 szfmt; - union { - struct boardobj board_obj; - struct vfe_var super; - struct vfe_var_derived_product derived_product; - struct vfe_var_derived_sum derived_sum; - struct vfe_var_single_sensed_fuse single_sensed_fuse; - struct vfe_var_single_sensed_temp single_sensed_temp; - } var_data; - - nvgpu_log_info(g, " "); - - vfevars_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, - g->bios.perf_token, - CONTINUOUS_VIRTUAL_BINNING_TABLE); - if (vfevars_tbl_ptr == NULL) { - status = -EINVAL; - goto done; - } - - memcpy(&vfevars_tbl_header, vfevars_tbl_ptr, - VBIOS_CLOCKS_TABLE_1X_HEADER_SIZE_07); - if (vfevars_tbl_header.header_size != - VBIOS_CLOCKS_TABLE_1X_HEADER_SIZE_07){ - status = -EINVAL; - goto done; - } - - if (vfevars_tbl_header.vfe_var_entry_size == - VBIOS_VFE_3X_VAR_ENTRY_SIZE_19) { - szfmt = VBIOS_VFE_3X_VAR_ENTRY_SIZE_19; - } else if (vfevars_tbl_header.vfe_var_entry_size == - VBIOS_VFE_3X_VAR_ENTRY_SIZE_11) { - szfmt = VBIOS_VFE_3X_VAR_ENTRY_SIZE_11; - } else { - status = -EINVAL; - goto done; - } - - /* Read table entries*/ - vfevars_tbl_entry_ptr = vfevars_tbl_ptr + - vfevars_tbl_header.header_size; - for (index = 0; - index < vfevars_tbl_header.vfe_var_entry_count; - index++) { - rd_offset_ptr = vfevars_tbl_entry_ptr + - (index * vfevars_tbl_header.vfe_var_entry_size); - memcpy(&var, rd_offset_ptr, szfmt); - - var_data.super.out_range_min = var.out_range_min; - var_data.super.out_range_max = var.out_range_max; - - switch ((u8)var.type) { - case VBIOS_VFE_3X_VAR_ENTRY_TYPE_DISABLED: - continue; - break; - - case VBIOS_VFE_3X_VAR_ENTRY_TYPE_SINGLE_FREQUENCY: - var_type = CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY; - break; - - case VBIOS_VFE_3X_VAR_ENTRY_TYPE_SINGLE_VOLTAGE: - var_type = CTRL_PERF_VFE_VAR_TYPE_SINGLE_VOLTAGE; - break; - - case VBIOS_VFE_3X_VAR_ENTRY_TYPE_SINGLE_SENSED_TEMP: - var_type = CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_TEMP; - var_data.single_sensed_temp.temp_default = 0x9600; - var_data.single_sensed_temp.therm_channel_index = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSTEMP_TH_CH_IDX); - var_data.single_sensed_temp.temp_hysteresis_positive = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSTEMP_HYS_POS) << 5; - var_data.single_sensed_temp.temp_hysteresis_negative = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSTEMP_HYS_NEG) << 5; - break; - - case VBIOS_VFE_3X_VAR_ENTRY_TYPE_SINGLE_SENSED_FUSE: - var_type = CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE; - var_data.single_sensed_fuse.vfield_info.v_field_id = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_VFIELD_ID); - var_data.single_sensed_fuse.vfield_ver_info.v_field_id_ver = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_VFIELD_ID_VER); - var_data.single_sensed_fuse.vfield_ver_info.ver_expected = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_EXPECTED_VER); - var_data.single_sensed_fuse.vfield_ver_info.b_use_default_on_ver_check_fail = - (BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL) && - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_USE_DEFAULT_ON_VER_CHECK_FAIL_YES); - var_data.single_sensed_fuse.b_fuse_value_signed = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_SSFUSE_VALUE_SIGNED_INTEGER); - var_data.single_sensed_fuse.vfield_info.fuse_val_default = - var.param1; - if (szfmt >= VBIOS_VFE_3X_VAR_ENTRY_SIZE_19) { - var_data.single_sensed_fuse.vfield_info.hw_correction_scale = - (int)var.param2; - var_data.single_sensed_fuse.vfield_info.hw_correction_offset = - var.param3; - } else { - var_data.single_sensed_fuse.vfield_info.hw_correction_scale = - 1 << 12; - var_data.single_sensed_fuse.vfield_info.hw_correction_offset = - 0; - if ((var_data.single_sensed_fuse.vfield_info.v_field_id == - VFIELD_ID_STRAP_IDDQ) || - (var_data.single_sensed_fuse.vfield_info.v_field_id == - VFIELD_ID_STRAP_IDDQ_1)) { - var_data.single_sensed_fuse.vfield_info.hw_correction_scale = - 50 << 12; - } - } - break; - - case VBIOS_VFE_3X_VAR_ENTRY_TYPE_DERIVED_PRODUCT: - var_type = CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT; - var_data.derived_product.var_idx0 = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_DPROD_VFE_VAR_IDX_0); - var_data.derived_product.var_idx1 = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_DPROD_VFE_VAR_IDX_1); - break; - - case VBIOS_VFE_3X_VAR_ENTRY_TYPE_DERIVED_SUM: - var_type = CTRL_PERF_VFE_VAR_TYPE_DERIVED_SUM; - var_data.derived_sum.var_idx0 = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_DSUM_VFE_VAR_IDX_0); - var_data.derived_sum.var_idx1 = - (u8)BIOS_GET_FIELD(var.param0, - VBIOS_VFE_3X_VAR_ENTRY_PAR0_DSUM_VFE_VAR_IDX_1); - break; - default: - status = -EINVAL; - goto done; - } - var_data.board_obj.type = var_type; - var_data.board_obj.type_mask = 0; - - pvar = construct_vfe_var(g, &var_data); - if (pvar == NULL) { - nvgpu_err(g, - "error constructing vfe_var boardobj %d", - index); - status = -EINVAL; - goto done; - } - - status = boardobjgrp_objinsert(&pvfevarobjs->super.super, - (struct boardobj *)pvar, index); - if (status) { - nvgpu_err(g, "error adding vfe_var boardobj %d", index); - status = -EINVAL; - goto done; - } - } - pvfevarobjs->polling_periodms = vfevars_tbl_header.polling_periodms; -done: - nvgpu_log_info(g, "done status %x", status); - return status; -} - -static int vfe_var_construct_single(struct gk20a *g, - struct boardobj **ppboardobj, - u16 size, void *pargs) -{ - struct boardobj *ptmpobj = (struct boardobj *)pargs; - struct vfe_var_single *pvfevar; - int status = 0; - - nvgpu_log_info(g, " "); - - ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE); - status = vfe_var_construct_super(g, ppboardobj, size, pargs); - if (status) { - return -EINVAL; - } - - pvfevar = (struct vfe_var_single *)*ppboardobj; - - pvfevar->super.super.pmudatainit = - _vfe_var_pmudatainit_single; - - pvfevar->override_type = CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_NONE; - pvfevar->override_value = 0; - - nvgpu_log_info(g, "Done"); - return status; -} diff --git a/drivers/gpu/nvgpu/perf/vfe_var.h b/drivers/gpu/nvgpu/perf/vfe_var.h deleted file mode 100644 index 98b7c40b..00000000 --- a/drivers/gpu/nvgpu/perf/vfe_var.h +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef NVGPU_PERF_VFE_VAR_H -#define NVGPU_PERF_VFE_VAR_H - -#include "boardobj/boardobjgrp.h" -#include - -int vfe_var_sw_setup(struct gk20a *g); -int vfe_var_pmu_setup(struct gk20a *g); - -#define VFE_VAR_GET(_pperf, _idx) \ - ((struct vfe_var)BOARDOBJGRP_OBJ_GET_BY_IDX( \ - &((_pperf)->vfe.vars.super.super), (_idx))) - -#define VFE_VAR_IDX_IS_VALID(_pperf, _idx) \ - boardobjgrp_idxisvalid(&((_pperf)->vfe.vars.super.super), (_idx)) - -struct vfe_var { - struct boardobj super; - u32 out_range_min; - u32 out_range_max; - struct boardobjgrpmask_e32 mask_dependent_vars; - struct boardobjgrpmask_e255 mask_dependent_equs; - bool b_is_dynamic_valid; - bool b_is_dynamic; -}; - -struct vfe_vars { - struct boardobjgrp_e32 super; - u8 polling_periodms; -}; - -struct vfe_var_derived { - struct vfe_var super; -}; - -struct vfe_var_derived_product { - struct vfe_var_derived super; - u8 var_idx0; - u8 var_idx1; -}; - -struct vfe_var_derived_sum { - struct vfe_var_derived super; - u8 var_idx0; - u8 var_idx1; -}; - -struct vfe_var_single { - struct vfe_var super; - u8 override_type; - u32 override_value; -}; - -struct vfe_var_single_frequency { - struct vfe_var_single super; -}; - -struct vfe_var_single_voltage { - struct vfe_var_single super; -}; - -struct vfe_var_single_sensed { - struct vfe_var_single super; -}; - -struct vfe_var_single_sensed_fuse { - struct vfe_var_single_sensed super; - struct ctrl_perf_vfe_var_single_sensed_fuse_override_info override_info; - struct ctrl_perf_vfe_var_single_sensed_fuse_vfield_info vfield_info; - struct ctrl_perf_vfe_var_single_sensed_fuse_ver_vfield_info vfield_ver_info; - struct ctrl_perf_vfe_var_single_sensed_fuse_value fuse_val_default; - bool b_fuse_value_signed; - u32 fuse_value_integer; - u32 fuse_value_hw_integer; - u8 fuse_version; - bool b_version_check_done; -}; - -struct vfe_var_single_sensed_temp { - struct vfe_var_single_sensed super; - u8 therm_channel_index; - int temp_hysteresis_positive; - int temp_hysteresis_negative; - int temp_default; -}; - -#endif /* NVGPU_PERF_VFE_VAR_H */ -- cgit v1.2.2