From dd739fcb039d51606e9a5454ec0aab17bcb01965 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 18 Apr 2018 19:39:46 -0700 Subject: gpu: nvgpu: Remove gk20a_dbg* functions Switch all logging to nvgpu_log*(). gk20a_dbg* macros are intentionally left there because of use from other repositories. Because the new functions do not work without a pointer to struct gk20a, and piping it just for logging is excessive, some log messages are deleted. Change-Id: I00e22e75fe4596a330bb0282ab4774b3639ee31e Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1704148 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/perf/perf.c | 6 ++--- drivers/gpu/nvgpu/perf/vfe_equ.c | 30 ++++++++++----------- drivers/gpu/nvgpu/perf/vfe_var.c | 58 ++++++++++++++++++++-------------------- 3 files changed, 47 insertions(+), 47 deletions(-) (limited to 'drivers/gpu/nvgpu/perf') diff --git a/drivers/gpu/nvgpu/perf/perf.c b/drivers/gpu/nvgpu/perf/perf.c index 55e67b15..bf63e1ea 100644 --- a/drivers/gpu/nvgpu/perf/perf.c +++ b/drivers/gpu/nvgpu/perf/perf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + * 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"), @@ -37,7 +37,7 @@ static void perfrpc_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg, struct perfrpc_pmucmdhandler_params *phandlerparams = (struct perfrpc_pmucmdhandler_params *)param; - gk20a_dbg_info(""); + 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", @@ -53,7 +53,7 @@ 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; - gk20a_dbg_fn(""); + nvgpu_log_fn(g, " "); switch (msg->msg_type) { case NV_PMU_PERF_MSG_ID_VFE_CALLBACK: nvgpu_clk_arb_schedule_vf_table_update(g); diff --git a/drivers/gpu/nvgpu/perf/vfe_equ.c b/drivers/gpu/nvgpu/perf/vfe_equ.c index 2493061e..8321d98d 100644 --- a/drivers/gpu/nvgpu/perf/vfe_equ.c +++ b/drivers/gpu/nvgpu/perf/vfe_equ.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. + * 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"), @@ -59,7 +59,7 @@ static u32 _vfe_equs_pmudata_instget(struct gk20a *g, struct nv_pmu_perf_vfe_equ_boardobj_grp_set *pgrp_set = (struct nv_pmu_perf_vfe_equ_boardobj_grp_set *)pmuboardobjgrp; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); /* check whether pmuboardobjgrp has a valid boardobj in index */ if (idx >= CTRL_BOARDOBJGRP_E255_MAX_OBJECTS) @@ -67,7 +67,7 @@ static u32 _vfe_equs_pmudata_instget(struct gk20a *g, *ppboardobjpmudata = (struct nv_pmu_boardobj *) &pgrp_set->objects[idx].data.board_obj; - gk20a_dbg_info(" Done"); + nvgpu_log_info(g, " Done"); return 0; } @@ -77,7 +77,7 @@ u32 vfe_equ_sw_setup(struct gk20a *g) struct boardobjgrp *pboardobjgrp = NULL; struct vfe_equs *pvfeequobjs; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = boardobjgrpconstruct_e255(g, &g->perf_pmu.vfe_equobjs.super); if (status) { @@ -109,7 +109,7 @@ u32 vfe_equ_sw_setup(struct gk20a *g) goto done; done: - gk20a_dbg_info(" done status %x", status); + nvgpu_log_info(g, " done status %x", status); return status; } @@ -118,7 +118,7 @@ u32 vfe_equ_pmu_setup(struct gk20a *g) u32 status; struct boardobjgrp *pboardobjgrp = NULL; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); pboardobjgrp = &g->perf_pmu.vfe_equobjs.super.super; @@ -127,7 +127,7 @@ u32 vfe_equ_pmu_setup(struct gk20a *g) status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); - gk20a_dbg_info("Done"); + nvgpu_log_info(g, "Done"); return status; } @@ -152,7 +152,7 @@ static u32 devinit_get_vfe_equ_table(struct gk20a *g, struct vfe_equ_quadratic quadratic; } equ_data; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); vfeequs_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, g->bios.perf_token, @@ -325,7 +325,7 @@ static u32 devinit_get_vfe_equ_table(struct gk20a *g, } } done: - gk20a_dbg_info(" done status %x", status); + nvgpu_log_info(g, " done status %x", status); return status; } @@ -337,7 +337,7 @@ static u32 _vfe_equ_pmudatainit_super(struct gk20a *g, struct vfe_equ *pvfe_equ; struct nv_pmu_vfe_equ *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status != 0) @@ -392,7 +392,7 @@ static u32 _vfe_equ_pmudatainit_compare(struct gk20a *g, struct vfe_equ_compare *pvfe_equ_compare; struct nv_pmu_vfe_equ_compare *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status != 0) @@ -451,7 +451,7 @@ static u32 _vfe_equ_pmudatainit_minmax(struct gk20a *g, struct vfe_equ_minmax *pvfe_equ_minmax; struct nv_pmu_vfe_equ_minmax *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status != 0) @@ -507,7 +507,7 @@ static u32 _vfe_equ_pmudatainit_quadratic(struct gk20a *g, struct nv_pmu_vfe_equ_quadratic *pset; u32 i; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_equ_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status != 0) @@ -558,7 +558,7 @@ static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs) struct boardobj *board_obj_ptr = NULL; u32 status; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); switch (BOARDOBJ_GET_TYPE(pargs)) { case CTRL_PERF_VFE_EQU_TYPE_COMPARE: @@ -584,7 +584,7 @@ static struct vfe_equ *construct_vfe_equ(struct gk20a *g, void *pargs) if (status) return NULL; - gk20a_dbg_info(" Done"); + nvgpu_log_info(g, " Done"); return (struct vfe_equ *)board_obj_ptr; } diff --git a/drivers/gpu/nvgpu/perf/vfe_var.c b/drivers/gpu/nvgpu/perf/vfe_var.c index a44c39ad..8b95230e 100644 --- a/drivers/gpu/nvgpu/perf/vfe_var.c +++ b/drivers/gpu/nvgpu/perf/vfe_var.c @@ -69,7 +69,7 @@ static u32 _vfe_vars_pmudata_instget(struct gk20a *g, (struct nv_pmu_perf_vfe_var_boardobj_grp_set *) pmuboardobjgrp; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); /*check whether pmuboardobjgrp has a valid boardobj in index*/ if (idx >= CTRL_BOARDOBJGRP_E32_MAX_OBJECTS) @@ -78,7 +78,7 @@ static u32 _vfe_vars_pmudata_instget(struct gk20a *g, *ppboardobjpmudata = (struct nv_pmu_boardobj *) &pgrp_set->objects[idx].data.board_obj; - gk20a_dbg_info(" Done"); + nvgpu_log_info(g, " Done"); return 0; } @@ -105,7 +105,7 @@ u32 vfe_var_sw_setup(struct gk20a *g) struct boardobjgrp *pboardobjgrp = NULL; struct vfe_vars *pvfevarobjs; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = boardobjgrpconstruct_e32(g, &g->perf_pmu.vfe_varobjs.super); if (status) { @@ -148,7 +148,7 @@ u32 vfe_var_sw_setup(struct gk20a *g) } done: - gk20a_dbg_info(" done status %x", status); + nvgpu_log_info(g, " done status %x", status); return status; } @@ -157,7 +157,7 @@ u32 vfe_var_pmu_setup(struct gk20a *g) u32 status; struct boardobjgrp *pboardobjgrp = NULL; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); pboardobjgrp = &g->perf_pmu.vfe_varobjs.super.super; @@ -166,7 +166,7 @@ u32 vfe_var_pmu_setup(struct gk20a *g) status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); - gk20a_dbg_info("Done"); + nvgpu_log_info(g, "Done"); return status; } @@ -301,7 +301,7 @@ static u32 _vfe_var_pmudatainit_super(struct gk20a *g, struct vfe_var *pvfe_var; struct nv_pmu_vfe_var *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status != 0) @@ -329,7 +329,7 @@ static u32 vfe_var_construct_super(struct gk20a *g, struct vfe_var *ptmpvar = (struct vfe_var *)pargs; u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = boardobj_construct_super(g, ppboardobj, size, pargs); if (status) @@ -345,7 +345,7 @@ static u32 vfe_var_construct_super(struct gk20a *g, pvfevar->b_is_dynamic_valid = false; status = boardobjgrpmask_e32_init(&pvfevar->mask_dependent_vars, NULL); status = boardobjgrpmask_e255_init(&pvfevar->mask_dependent_equs, NULL); - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); return status; } @@ -356,7 +356,7 @@ static u32 _vfe_var_pmudatainit_derived(struct gk20a *g, { u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); @@ -392,7 +392,7 @@ static u32 _vfe_var_pmudatainit_derived_product(struct gk20a *g, struct vfe_var_derived_product *pvfe_var_derived_product; struct nv_pmu_vfe_var_derived_product *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); if (status != 0) @@ -446,7 +446,7 @@ static u32 _vfe_var_pmudatainit_derived_sum(struct gk20a *g, struct vfe_var_derived_sum *pvfe_var_derived_sum; struct nv_pmu_vfe_var_derived_sum *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); if (status != 0) @@ -498,7 +498,7 @@ static u32 _vfe_var_pmudatainit_single(struct gk20a *g, struct vfe_var_single *pvfe_var_single; struct nv_pmu_vfe_var_single *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status != 0) @@ -520,7 +520,7 @@ static u32 _vfe_var_pmudatainit_single_frequency(struct gk20a *g, { u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); @@ -535,7 +535,7 @@ static u32 vfe_var_construct_single_frequency(struct gk20a *g, struct vfe_var_single_frequency *pvfevar; u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY) return -EINVAL; @@ -553,7 +553,7 @@ static u32 vfe_var_construct_single_frequency(struct gk20a *g, pvfevar->super.super.b_is_dynamic = false; pvfevar->super.super.b_is_dynamic_valid = true; - gk20a_dbg_info("Done"); + nvgpu_log_info(g, "Done"); return status; } @@ -563,7 +563,7 @@ static u32 _vfe_var_pmudatainit_single_sensed(struct gk20a *g, { u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); @@ -578,7 +578,7 @@ static u32 _vfe_var_pmudatainit_single_sensed_fuse(struct gk20a *g, struct vfe_var_single_sensed_fuse *pvfe_var_single_sensed_fuse; struct nv_pmu_vfe_var_single_sensed_fuse *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); if (status != 0) @@ -614,7 +614,7 @@ static u32 vfe_var_construct_single_sensed(struct gk20a *g, u32 status = 0; - gk20a_dbg_info(" "); + nvgpu_log_info(g, " "); ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED); status = vfe_var_construct_single(g, ppboardobj, size, pargs); @@ -626,7 +626,7 @@ static u32 vfe_var_construct_single_sensed(struct gk20a *g, pvfevar->super.super.super.pmudatainit = _vfe_var_pmudatainit_single_sensed; - gk20a_dbg_info("Done"); + nvgpu_log_info(g, "Done"); return status; } @@ -641,7 +641,7 @@ static u32 vfe_var_construct_single_sensed_fuse(struct gk20a *g, (struct vfe_var_single_sensed_fuse *)pargs; u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE) return -EINVAL; @@ -704,7 +704,7 @@ static u32 _vfe_var_pmudatainit_single_sensed_temp(struct gk20a *g, struct vfe_var_single_sensed_temp *pvfe_var_single_sensed_temp; struct nv_pmu_vfe_var_single_sensed_temp *pset; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); if (status != 0) @@ -769,7 +769,7 @@ static u32 _vfe_var_pmudatainit_single_voltage(struct gk20a *g, { u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); @@ -808,7 +808,7 @@ static struct vfe_var *construct_vfe_var(struct gk20a *g, void *pargs) struct boardobj *board_obj_ptr = NULL; u32 status; - gk20a_dbg_info(""); + 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, @@ -850,7 +850,7 @@ static struct vfe_var *construct_vfe_var(struct gk20a *g, void *pargs) if (status) return NULL; - gk20a_dbg_info("done"); + nvgpu_log_info(g, "done"); return (struct vfe_var *)board_obj_ptr; } @@ -877,7 +877,7 @@ static u32 devinit_get_vfe_var_table(struct gk20a *g, struct vfe_var_single_sensed_temp single_sensed_temp; } var_data; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); vfevars_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, g->bios.perf_token, @@ -1031,7 +1031,7 @@ static u32 devinit_get_vfe_var_table(struct gk20a *g, } pvfevarobjs->polling_periodms = vfevars_tbl_header.polling_periodms; done: - gk20a_dbg_info("done status %x", status); + nvgpu_log_info(g, "done status %x", status); return status; } @@ -1043,7 +1043,7 @@ static u32 vfe_var_construct_single(struct gk20a *g, struct vfe_var_single *pvfevar; u32 status = 0; - gk20a_dbg_info(""); + nvgpu_log_info(g, " "); ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE); status = vfe_var_construct_super(g, ppboardobj, size, pargs); @@ -1058,6 +1058,6 @@ static u32 vfe_var_construct_single(struct gk20a *g, pvfevar->override_type = CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_NONE; pvfevar->override_value = 0; - gk20a_dbg_info("Done"); + nvgpu_log_info(g, "Done"); return status; } -- cgit v1.2.2