summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/volt
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/volt
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/volt')
-rw-r--r--drivers/gpu/nvgpu/volt/volt_dev.c12
-rw-r--r--drivers/gpu/nvgpu/volt/volt_pmu.c2
-rw-r--r--drivers/gpu/nvgpu/volt/volt_policy.c12
-rw-r--r--drivers/gpu/nvgpu/volt/volt_rail.c20
4 files changed, 23 insertions, 23 deletions
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c
index 38df2105..d900b37b 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.c
+++ b/drivers/gpu/nvgpu/volt/volt_dev.c
@@ -408,7 +408,7 @@ static u32 _volt_device_devgrp_pmudata_instget(struct gk20a *g,
408 (struct nv_pmu_volt_volt_device_boardobj_grp_set *) 408 (struct nv_pmu_volt_volt_device_boardobj_grp_set *)
409 pmuboardobjgrp; 409 pmuboardobjgrp;
410 410
411 gk20a_dbg_info(""); 411 nvgpu_log_info(g, " ");
412 412
413 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 413 /*check whether pmuboardobjgrp has a valid boardobj in index*/
414 if (((u32)BIT(idx) & 414 if (((u32)BIT(idx) &
@@ -417,7 +417,7 @@ static u32 _volt_device_devgrp_pmudata_instget(struct gk20a *g,
417 417
418 *ppboardobjpmudata = (struct nv_pmu_boardobj *) 418 *ppboardobjpmudata = (struct nv_pmu_boardobj *)
419 &pgrp_set->objects[idx].data.board_obj; 419 &pgrp_set->objects[idx].data.board_obj;
420 gk20a_dbg_info("Done"); 420 nvgpu_log_info(g, "Done");
421 return 0; 421 return 0;
422} 422}
423 423
@@ -506,7 +506,7 @@ u32 volt_dev_pmu_setup(struct gk20a *g)
506 u32 status; 506 u32 status;
507 struct boardobjgrp *pboardobjgrp = NULL; 507 struct boardobjgrp *pboardobjgrp = NULL;
508 508
509 gk20a_dbg_info(""); 509 nvgpu_log_info(g, " ");
510 510
511 pboardobjgrp = &g->perf_pmu.volt.volt_dev_metadata.volt_devices.super; 511 pboardobjgrp = &g->perf_pmu.volt.volt_dev_metadata.volt_devices.super;
512 512
@@ -515,7 +515,7 @@ u32 volt_dev_pmu_setup(struct gk20a *g)
515 515
516 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); 516 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
517 517
518 gk20a_dbg_info("Done"); 518 nvgpu_log_info(g, "Done");
519 return status; 519 return status;
520} 520}
521 521
@@ -526,7 +526,7 @@ u32 volt_dev_sw_setup(struct gk20a *g)
526 struct voltage_device *pvolt_device; 526 struct voltage_device *pvolt_device;
527 u8 i; 527 u8 i;
528 528
529 gk20a_dbg_info(""); 529 nvgpu_log_info(g, " ");
530 530
531 status = boardobjgrpconstruct_e32(g, 531 status = boardobjgrpconstruct_e32(g,
532 &g->perf_pmu.volt.volt_dev_metadata.volt_devices); 532 &g->perf_pmu.volt.volt_dev_metadata.volt_devices);
@@ -585,6 +585,6 @@ u32 volt_dev_sw_setup(struct gk20a *g)
585 } 585 }
586 586
587done: 587done:
588 gk20a_dbg_info(" done status %x", status); 588 nvgpu_log_info(g, " done status %x", status);
589 return status; 589 return status;
590} 590}
diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/volt/volt_pmu.c
index 07bff84a..bd9177ff 100644
--- a/drivers/gpu/nvgpu/volt/volt_pmu.c
+++ b/drivers/gpu/nvgpu/volt/volt_pmu.c
@@ -46,7 +46,7 @@ static void volt_rpc_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg,
46 struct volt_rpc_pmucmdhandler_params *phandlerparams = 46 struct volt_rpc_pmucmdhandler_params *phandlerparams =
47 (struct volt_rpc_pmucmdhandler_params *)param; 47 (struct volt_rpc_pmucmdhandler_params *)param;
48 48
49 gk20a_dbg_info(""); 49 nvgpu_log_info(g, " ");
50 50
51 if (msg->msg.volt.msg_type != NV_PMU_VOLT_MSG_ID_RPC) { 51 if (msg->msg.volt.msg_type != NV_PMU_VOLT_MSG_ID_RPC) {
52 nvgpu_err(g, "unsupported msg for VOLT RPC %x", 52 nvgpu_err(g, "unsupported msg for VOLT RPC %x",
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c
index a69c38bb..3783dc32 100644
--- a/drivers/gpu/nvgpu/volt/volt_policy.c
+++ b/drivers/gpu/nvgpu/volt/volt_policy.c
@@ -370,7 +370,7 @@ static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g,
370 (struct nv_pmu_volt_volt_policy_boardobj_grp_set *) 370 (struct nv_pmu_volt_volt_policy_boardobj_grp_set *)
371 pmuboardobjgrp; 371 pmuboardobjgrp;
372 372
373 gk20a_dbg_info(""); 373 nvgpu_log_info(g, " ");
374 374
375 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 375 /*check whether pmuboardobjgrp has a valid boardobj in index*/
376 if (((u32)BIT(idx) & 376 if (((u32)BIT(idx) &
@@ -379,7 +379,7 @@ static u32 _volt_policy_devgrp_pmudata_instget(struct gk20a *g,
379 379
380 *ppboardobjpmudata = (struct nv_pmu_boardobj *) 380 *ppboardobjpmudata = (struct nv_pmu_boardobj *)
381 &pgrp_set->objects[idx].data.board_obj; 381 &pgrp_set->objects[idx].data.board_obj;
382 gk20a_dbg_info(" Done"); 382 nvgpu_log_info(g, " Done");
383 return 0; 383 return 0;
384} 384}
385 385
@@ -430,7 +430,7 @@ u32 volt_policy_pmu_setup(struct gk20a *g)
430 u32 status; 430 u32 status;
431 struct boardobjgrp *pboardobjgrp = NULL; 431 struct boardobjgrp *pboardobjgrp = NULL;
432 432
433 gk20a_dbg_info(""); 433 nvgpu_log_info(g, " ");
434 434
435 pboardobjgrp = 435 pboardobjgrp =
436 &g->perf_pmu.volt.volt_policy_metadata.volt_policies.super; 436 &g->perf_pmu.volt.volt_policy_metadata.volt_policies.super;
@@ -440,7 +440,7 @@ u32 volt_policy_pmu_setup(struct gk20a *g)
440 440
441 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); 441 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
442 442
443 gk20a_dbg_info("Done"); 443 nvgpu_log_info(g, "Done");
444 return status; 444 return status;
445} 445}
446 446
@@ -449,7 +449,7 @@ u32 volt_policy_sw_setup(struct gk20a *g)
449 u32 status = 0; 449 u32 status = 0;
450 struct boardobjgrp *pboardobjgrp = NULL; 450 struct boardobjgrp *pboardobjgrp = NULL;
451 451
452 gk20a_dbg_info(""); 452 nvgpu_log_info(g, " ");
453 453
454 status = boardobjgrpconstruct_e32(g, 454 status = boardobjgrpconstruct_e32(g,
455 &g->perf_pmu.volt.volt_policy_metadata.volt_policies); 455 &g->perf_pmu.volt.volt_policy_metadata.volt_policies);
@@ -496,6 +496,6 @@ u32 volt_policy_sw_setup(struct gk20a *g)
496 } 496 }
497 497
498done: 498done:
499 gk20a_dbg_info(" done status %x", status); 499 nvgpu_log_info(g, " done status %x", status);
500 return status; 500 return status;
501} 501}
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c
index 3461653f..6a7dcdbe 100644
--- a/drivers/gpu/nvgpu/volt/volt_rail.c
+++ b/drivers/gpu/nvgpu/volt/volt_rail.c
@@ -135,7 +135,7 @@ static u32 volt_rail_init_pmudata_super(struct gk20a *g,
135 struct nv_pmu_volt_volt_rail_boardobj_set *rail_pmu_data; 135 struct nv_pmu_volt_volt_rail_boardobj_set *rail_pmu_data;
136 u32 i; 136 u32 i;
137 137
138 gk20a_dbg_info(""); 138 nvgpu_log_info(g, " ");
139 139
140 status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); 140 status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata);
141 if (status) 141 if (status)
@@ -170,7 +170,7 @@ static u32 volt_rail_init_pmudata_super(struct gk20a *g,
170 nvgpu_err(g, 170 nvgpu_err(g,
171 "Failed to export BOARDOBJGRPMASK of VOLTAGE_DEVICEs"); 171 "Failed to export BOARDOBJGRPMASK of VOLTAGE_DEVICEs");
172 172
173 gk20a_dbg_info("Done"); 173 nvgpu_log_info(g, "Done");
174 174
175 return status; 175 return status;
176} 176}
@@ -182,7 +182,7 @@ static struct voltage_rail *construct_volt_rail(struct gk20a *g, void *pargs)
182 struct voltage_rail *board_obj_volt_rail_ptr = NULL; 182 struct voltage_rail *board_obj_volt_rail_ptr = NULL;
183 u32 status; 183 u32 status;
184 184
185 gk20a_dbg_info(""); 185 nvgpu_log_info(g, " ");
186 status = boardobj_construct_super(g, &board_obj_ptr, 186 status = boardobj_construct_super(g, &board_obj_ptr,
187 sizeof(struct voltage_rail), pargs); 187 sizeof(struct voltage_rail), pargs);
188 if (status) 188 if (status)
@@ -211,7 +211,7 @@ static struct voltage_rail *construct_volt_rail(struct gk20a *g, void *pargs)
211 board_obj_volt_rail_ptr->volt_scale_exp_pwr_equ_idx = 211 board_obj_volt_rail_ptr->volt_scale_exp_pwr_equ_idx =
212 ptemp_rail->volt_scale_exp_pwr_equ_idx; 212 ptemp_rail->volt_scale_exp_pwr_equ_idx;
213 213
214 gk20a_dbg_info("Done"); 214 nvgpu_log_info(g, "Done");
215 215
216 return (struct voltage_rail *)board_obj_ptr; 216 return (struct voltage_rail *)board_obj_ptr;
217} 217}
@@ -242,7 +242,7 @@ u32 volt_rail_pmu_setup(struct gk20a *g)
242 u32 status; 242 u32 status;
243 struct boardobjgrp *pboardobjgrp = NULL; 243 struct boardobjgrp *pboardobjgrp = NULL;
244 244
245 gk20a_dbg_info(""); 245 nvgpu_log_info(g, " ");
246 246
247 pboardobjgrp = &g->perf_pmu.volt.volt_rail_metadata.volt_rails.super; 247 pboardobjgrp = &g->perf_pmu.volt.volt_rail_metadata.volt_rails.super;
248 248
@@ -251,7 +251,7 @@ u32 volt_rail_pmu_setup(struct gk20a *g)
251 251
252 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); 252 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
253 253
254 gk20a_dbg_info("Done"); 254 nvgpu_log_info(g, "Done");
255 return status; 255 return status;
256} 256}
257 257
@@ -366,7 +366,7 @@ static u32 _volt_rail_devgrp_pmudata_instget(struct gk20a *g,
366 (struct nv_pmu_volt_volt_rail_boardobj_grp_set *) 366 (struct nv_pmu_volt_volt_rail_boardobj_grp_set *)
367 pmuboardobjgrp; 367 pmuboardobjgrp;
368 368
369 gk20a_dbg_info(""); 369 nvgpu_log_info(g, " ");
370 370
371 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 371 /*check whether pmuboardobjgrp has a valid boardobj in index*/
372 if (((u32)BIT(idx) & 372 if (((u32)BIT(idx) &
@@ -375,7 +375,7 @@ static u32 _volt_rail_devgrp_pmudata_instget(struct gk20a *g,
375 375
376 *ppboardobjpmudata = (struct nv_pmu_boardobj *) 376 *ppboardobjpmudata = (struct nv_pmu_boardobj *)
377 &pgrp_set->objects[idx].data.board_obj; 377 &pgrp_set->objects[idx].data.board_obj;
378 gk20a_dbg_info(" Done"); 378 nvgpu_log_info(g, " Done");
379 return 0; 379 return 0;
380} 380}
381 381
@@ -404,7 +404,7 @@ u32 volt_rail_sw_setup(struct gk20a *g)
404 struct voltage_rail *pvolt_rail; 404 struct voltage_rail *pvolt_rail;
405 u8 i; 405 u8 i;
406 406
407 gk20a_dbg_info(""); 407 nvgpu_log_info(g, " ");
408 408
409 status = boardobjgrpconstruct_e32(g, 409 status = boardobjgrpconstruct_e32(g,
410 &g->perf_pmu.volt.volt_rail_metadata.volt_rails); 410 &g->perf_pmu.volt.volt_rail_metadata.volt_rails);
@@ -465,6 +465,6 @@ u32 volt_rail_sw_setup(struct gk20a *g)
465 } 465 }
466 466
467done: 467done:
468 gk20a_dbg_info(" done status %x", status); 468 nvgpu_log_info(g, " done status %x", status);
469 return status; 469 return status;
470} 470}