summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/perf/vfe_var.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-04-18 22:39:46 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-05-09 21:26:04 -0400
commitdd739fcb039d51606e9a5454ec0aab17bcb01965 (patch)
tree806ba8575d146367ad1be00086ca0cdae35a6b28 /drivers/gpu/nvgpu/perf/vfe_var.c
parent7e66f2a63d4855e763fa768047dfc32f6f96b771 (diff)
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 <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1704148 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/perf/vfe_var.c')
-rw-r--r--drivers/gpu/nvgpu/perf/vfe_var.c58
1 files changed, 29 insertions, 29 deletions
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,
69 (struct nv_pmu_perf_vfe_var_boardobj_grp_set *) 69 (struct nv_pmu_perf_vfe_var_boardobj_grp_set *)
70 pmuboardobjgrp; 70 pmuboardobjgrp;
71 71
72 gk20a_dbg_info(""); 72 nvgpu_log_info(g, " ");
73 73
74 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 74 /*check whether pmuboardobjgrp has a valid boardobj in index*/
75 if (idx >= CTRL_BOARDOBJGRP_E32_MAX_OBJECTS) 75 if (idx >= CTRL_BOARDOBJGRP_E32_MAX_OBJECTS)
@@ -78,7 +78,7 @@ static u32 _vfe_vars_pmudata_instget(struct gk20a *g,
78 *ppboardobjpmudata = (struct nv_pmu_boardobj *) 78 *ppboardobjpmudata = (struct nv_pmu_boardobj *)
79 &pgrp_set->objects[idx].data.board_obj; 79 &pgrp_set->objects[idx].data.board_obj;
80 80
81 gk20a_dbg_info(" Done"); 81 nvgpu_log_info(g, " Done");
82 return 0; 82 return 0;
83} 83}
84 84
@@ -105,7 +105,7 @@ u32 vfe_var_sw_setup(struct gk20a *g)
105 struct boardobjgrp *pboardobjgrp = NULL; 105 struct boardobjgrp *pboardobjgrp = NULL;
106 struct vfe_vars *pvfevarobjs; 106 struct vfe_vars *pvfevarobjs;
107 107
108 gk20a_dbg_info(""); 108 nvgpu_log_info(g, " ");
109 109
110 status = boardobjgrpconstruct_e32(g, &g->perf_pmu.vfe_varobjs.super); 110 status = boardobjgrpconstruct_e32(g, &g->perf_pmu.vfe_varobjs.super);
111 if (status) { 111 if (status) {
@@ -148,7 +148,7 @@ u32 vfe_var_sw_setup(struct gk20a *g)
148 } 148 }
149 149
150done: 150done:
151 gk20a_dbg_info(" done status %x", status); 151 nvgpu_log_info(g, " done status %x", status);
152 return status; 152 return status;
153} 153}
154 154
@@ -157,7 +157,7 @@ u32 vfe_var_pmu_setup(struct gk20a *g)
157 u32 status; 157 u32 status;
158 struct boardobjgrp *pboardobjgrp = NULL; 158 struct boardobjgrp *pboardobjgrp = NULL;
159 159
160 gk20a_dbg_info(""); 160 nvgpu_log_info(g, " ");
161 161
162 pboardobjgrp = &g->perf_pmu.vfe_varobjs.super.super; 162 pboardobjgrp = &g->perf_pmu.vfe_varobjs.super.super;
163 163
@@ -166,7 +166,7 @@ u32 vfe_var_pmu_setup(struct gk20a *g)
166 166
167 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); 167 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
168 168
169 gk20a_dbg_info("Done"); 169 nvgpu_log_info(g, "Done");
170 return status; 170 return status;
171} 171}
172 172
@@ -301,7 +301,7 @@ static u32 _vfe_var_pmudatainit_super(struct gk20a *g,
301 struct vfe_var *pvfe_var; 301 struct vfe_var *pvfe_var;
302 struct nv_pmu_vfe_var *pset; 302 struct nv_pmu_vfe_var *pset;
303 303
304 gk20a_dbg_info(""); 304 nvgpu_log_info(g, " ");
305 305
306 status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); 306 status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata);
307 if (status != 0) 307 if (status != 0)
@@ -329,7 +329,7 @@ static u32 vfe_var_construct_super(struct gk20a *g,
329 struct vfe_var *ptmpvar = (struct vfe_var *)pargs; 329 struct vfe_var *ptmpvar = (struct vfe_var *)pargs;
330 u32 status = 0; 330 u32 status = 0;
331 331
332 gk20a_dbg_info(""); 332 nvgpu_log_info(g, " ");
333 333
334 status = boardobj_construct_super(g, ppboardobj, size, pargs); 334 status = boardobj_construct_super(g, ppboardobj, size, pargs);
335 if (status) 335 if (status)
@@ -345,7 +345,7 @@ static u32 vfe_var_construct_super(struct gk20a *g,
345 pvfevar->b_is_dynamic_valid = false; 345 pvfevar->b_is_dynamic_valid = false;
346 status = boardobjgrpmask_e32_init(&pvfevar->mask_dependent_vars, NULL); 346 status = boardobjgrpmask_e32_init(&pvfevar->mask_dependent_vars, NULL);
347 status = boardobjgrpmask_e255_init(&pvfevar->mask_dependent_equs, NULL); 347 status = boardobjgrpmask_e255_init(&pvfevar->mask_dependent_equs, NULL);
348 gk20a_dbg_info(""); 348 nvgpu_log_info(g, " ");
349 349
350 return status; 350 return status;
351} 351}
@@ -356,7 +356,7 @@ static u32 _vfe_var_pmudatainit_derived(struct gk20a *g,
356{ 356{
357 u32 status = 0; 357 u32 status = 0;
358 358
359 gk20a_dbg_info(""); 359 nvgpu_log_info(g, " ");
360 360
361 status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); 361 status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata);
362 362
@@ -392,7 +392,7 @@ static u32 _vfe_var_pmudatainit_derived_product(struct gk20a *g,
392 struct vfe_var_derived_product *pvfe_var_derived_product; 392 struct vfe_var_derived_product *pvfe_var_derived_product;
393 struct nv_pmu_vfe_var_derived_product *pset; 393 struct nv_pmu_vfe_var_derived_product *pset;
394 394
395 gk20a_dbg_info(""); 395 nvgpu_log_info(g, " ");
396 396
397 status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); 397 status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata);
398 if (status != 0) 398 if (status != 0)
@@ -446,7 +446,7 @@ static u32 _vfe_var_pmudatainit_derived_sum(struct gk20a *g,
446 struct vfe_var_derived_sum *pvfe_var_derived_sum; 446 struct vfe_var_derived_sum *pvfe_var_derived_sum;
447 struct nv_pmu_vfe_var_derived_sum *pset; 447 struct nv_pmu_vfe_var_derived_sum *pset;
448 448
449 gk20a_dbg_info(""); 449 nvgpu_log_info(g, " ");
450 450
451 status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata); 451 status = _vfe_var_pmudatainit_derived(g, board_obj_ptr, ppmudata);
452 if (status != 0) 452 if (status != 0)
@@ -498,7 +498,7 @@ static u32 _vfe_var_pmudatainit_single(struct gk20a *g,
498 struct vfe_var_single *pvfe_var_single; 498 struct vfe_var_single *pvfe_var_single;
499 struct nv_pmu_vfe_var_single *pset; 499 struct nv_pmu_vfe_var_single *pset;
500 500
501 gk20a_dbg_info(""); 501 nvgpu_log_info(g, " ");
502 502
503 status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata); 503 status = _vfe_var_pmudatainit_super(g, board_obj_ptr, ppmudata);
504 if (status != 0) 504 if (status != 0)
@@ -520,7 +520,7 @@ static u32 _vfe_var_pmudatainit_single_frequency(struct gk20a *g,
520{ 520{
521 u32 status = 0; 521 u32 status = 0;
522 522
523 gk20a_dbg_info(""); 523 nvgpu_log_info(g, " ");
524 524
525 status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); 525 status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata);
526 526
@@ -535,7 +535,7 @@ static u32 vfe_var_construct_single_frequency(struct gk20a *g,
535 struct vfe_var_single_frequency *pvfevar; 535 struct vfe_var_single_frequency *pvfevar;
536 u32 status = 0; 536 u32 status = 0;
537 537
538 gk20a_dbg_info(""); 538 nvgpu_log_info(g, " ");
539 539
540 if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY) 540 if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_FREQUENCY)
541 return -EINVAL; 541 return -EINVAL;
@@ -553,7 +553,7 @@ static u32 vfe_var_construct_single_frequency(struct gk20a *g,
553 pvfevar->super.super.b_is_dynamic = false; 553 pvfevar->super.super.b_is_dynamic = false;
554 pvfevar->super.super.b_is_dynamic_valid = true; 554 pvfevar->super.super.b_is_dynamic_valid = true;
555 555
556 gk20a_dbg_info("Done"); 556 nvgpu_log_info(g, "Done");
557 return status; 557 return status;
558} 558}
559 559
@@ -563,7 +563,7 @@ static u32 _vfe_var_pmudatainit_single_sensed(struct gk20a *g,
563{ 563{
564 u32 status = 0; 564 u32 status = 0;
565 565
566 gk20a_dbg_info(""); 566 nvgpu_log_info(g, " ");
567 567
568 status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); 568 status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata);
569 569
@@ -578,7 +578,7 @@ static u32 _vfe_var_pmudatainit_single_sensed_fuse(struct gk20a *g,
578 struct vfe_var_single_sensed_fuse *pvfe_var_single_sensed_fuse; 578 struct vfe_var_single_sensed_fuse *pvfe_var_single_sensed_fuse;
579 struct nv_pmu_vfe_var_single_sensed_fuse *pset; 579 struct nv_pmu_vfe_var_single_sensed_fuse *pset;
580 580
581 gk20a_dbg_info(""); 581 nvgpu_log_info(g, " ");
582 582
583 status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); 583 status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata);
584 if (status != 0) 584 if (status != 0)
@@ -614,7 +614,7 @@ static u32 vfe_var_construct_single_sensed(struct gk20a *g,
614 614
615 u32 status = 0; 615 u32 status = 0;
616 616
617 gk20a_dbg_info(" "); 617 nvgpu_log_info(g, " ");
618 618
619 ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED); 619 ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED);
620 status = vfe_var_construct_single(g, ppboardobj, size, pargs); 620 status = vfe_var_construct_single(g, ppboardobj, size, pargs);
@@ -626,7 +626,7 @@ static u32 vfe_var_construct_single_sensed(struct gk20a *g,
626 pvfevar->super.super.super.pmudatainit = 626 pvfevar->super.super.super.pmudatainit =
627 _vfe_var_pmudatainit_single_sensed; 627 _vfe_var_pmudatainit_single_sensed;
628 628
629 gk20a_dbg_info("Done"); 629 nvgpu_log_info(g, "Done");
630 630
631 return status; 631 return status;
632} 632}
@@ -641,7 +641,7 @@ static u32 vfe_var_construct_single_sensed_fuse(struct gk20a *g,
641 (struct vfe_var_single_sensed_fuse *)pargs; 641 (struct vfe_var_single_sensed_fuse *)pargs;
642 u32 status = 0; 642 u32 status = 0;
643 643
644 gk20a_dbg_info(""); 644 nvgpu_log_info(g, " ");
645 645
646 if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE) 646 if (BOARDOBJ_GET_TYPE(pargs) != CTRL_PERF_VFE_VAR_TYPE_SINGLE_SENSED_FUSE)
647 return -EINVAL; 647 return -EINVAL;
@@ -704,7 +704,7 @@ static u32 _vfe_var_pmudatainit_single_sensed_temp(struct gk20a *g,
704 struct vfe_var_single_sensed_temp *pvfe_var_single_sensed_temp; 704 struct vfe_var_single_sensed_temp *pvfe_var_single_sensed_temp;
705 struct nv_pmu_vfe_var_single_sensed_temp *pset; 705 struct nv_pmu_vfe_var_single_sensed_temp *pset;
706 706
707 gk20a_dbg_info(""); 707 nvgpu_log_info(g, " ");
708 708
709 status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata); 709 status = _vfe_var_pmudatainit_single_sensed(g, board_obj_ptr, ppmudata);
710 if (status != 0) 710 if (status != 0)
@@ -769,7 +769,7 @@ static u32 _vfe_var_pmudatainit_single_voltage(struct gk20a *g,
769{ 769{
770 u32 status = 0; 770 u32 status = 0;
771 771
772 gk20a_dbg_info(""); 772 nvgpu_log_info(g, " ");
773 773
774 status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata); 774 status = _vfe_var_pmudatainit_single(g, board_obj_ptr, ppmudata);
775 775
@@ -808,7 +808,7 @@ static struct vfe_var *construct_vfe_var(struct gk20a *g, void *pargs)
808 struct boardobj *board_obj_ptr = NULL; 808 struct boardobj *board_obj_ptr = NULL;
809 u32 status; 809 u32 status;
810 810
811 gk20a_dbg_info(""); 811 nvgpu_log_info(g, " ");
812 switch (BOARDOBJ_GET_TYPE(pargs)) { 812 switch (BOARDOBJ_GET_TYPE(pargs)) {
813 case CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT: 813 case CTRL_PERF_VFE_VAR_TYPE_DERIVED_PRODUCT:
814 status = vfe_var_construct_derived_product(g, &board_obj_ptr, 814 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)
850 if (status) 850 if (status)
851 return NULL; 851 return NULL;
852 852
853 gk20a_dbg_info("done"); 853 nvgpu_log_info(g, "done");
854 854
855 return (struct vfe_var *)board_obj_ptr; 855 return (struct vfe_var *)board_obj_ptr;
856} 856}
@@ -877,7 +877,7 @@ static u32 devinit_get_vfe_var_table(struct gk20a *g,
877 struct vfe_var_single_sensed_temp single_sensed_temp; 877 struct vfe_var_single_sensed_temp single_sensed_temp;
878 } var_data; 878 } var_data;
879 879
880 gk20a_dbg_info(""); 880 nvgpu_log_info(g, " ");
881 881
882 vfevars_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, 882 vfevars_tbl_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g,
883 g->bios.perf_token, 883 g->bios.perf_token,
@@ -1031,7 +1031,7 @@ static u32 devinit_get_vfe_var_table(struct gk20a *g,
1031 } 1031 }
1032 pvfevarobjs->polling_periodms = vfevars_tbl_header.polling_periodms; 1032 pvfevarobjs->polling_periodms = vfevars_tbl_header.polling_periodms;
1033done: 1033done:
1034 gk20a_dbg_info("done status %x", status); 1034 nvgpu_log_info(g, "done status %x", status);
1035 return status; 1035 return status;
1036} 1036}
1037 1037
@@ -1043,7 +1043,7 @@ static u32 vfe_var_construct_single(struct gk20a *g,
1043 struct vfe_var_single *pvfevar; 1043 struct vfe_var_single *pvfevar;
1044 u32 status = 0; 1044 u32 status = 0;
1045 1045
1046 gk20a_dbg_info(""); 1046 nvgpu_log_info(g, " ");
1047 1047
1048 ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE); 1048 ptmpobj->type_mask |= BIT(CTRL_PERF_VFE_VAR_TYPE_SINGLE);
1049 status = vfe_var_construct_super(g, ppboardobj, size, pargs); 1049 status = vfe_var_construct_super(g, ppboardobj, size, pargs);
@@ -1058,6 +1058,6 @@ static u32 vfe_var_construct_single(struct gk20a *g,
1058 pvfevar->override_type = CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_NONE; 1058 pvfevar->override_type = CTRL_PERF_VFE_VAR_SINGLE_OVERRIDE_TYPE_NONE;
1059 pvfevar->override_value = 0; 1059 pvfevar->override_value = 0;
1060 1060
1061 gk20a_dbg_info("Done"); 1061 nvgpu_log_info(g, "Done");
1062 return status; 1062 return status;
1063} 1063}