diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-04-18 22:39:46 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-05-09 21:26:04 -0400 |
commit | dd739fcb039d51606e9a5454ec0aab17bcb01965 (patch) | |
tree | 806ba8575d146367ad1be00086ca0cdae35a6b28 /drivers/gpu/nvgpu/boardobj/boardobjgrp.c | |
parent | 7e66f2a63d4855e763fa768047dfc32f6f96b771 (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/boardobj/boardobjgrp.c')
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp.c | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c index 64c02a84..7343f66c 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c | |||
@@ -50,7 +50,7 @@ struct boardobjgrp_pmucmdhandler_params { | |||
50 | 50 | ||
51 | u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp) | 51 | u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp) |
52 | { | 52 | { |
53 | gk20a_dbg_info(""); | 53 | nvgpu_log_info(g, " "); |
54 | 54 | ||
55 | if (pboardobjgrp == NULL) | 55 | if (pboardobjgrp == NULL) |
56 | return -EINVAL; | 56 | return -EINVAL; |
@@ -101,7 +101,9 @@ u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgr | |||
101 | 101 | ||
102 | u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp) | 102 | u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp) |
103 | { | 103 | { |
104 | gk20a_dbg_info(""); | 104 | struct gk20a *g = pboardobjgrp->g; |
105 | |||
106 | nvgpu_log_info(g, " "); | ||
105 | 107 | ||
106 | if (pboardobjgrp == NULL) | 108 | if (pboardobjgrp == NULL) |
107 | return -EINVAL; | 109 | return -EINVAL; |
@@ -120,7 +122,7 @@ u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp) | |||
120 | u32 stat; | 122 | u32 stat; |
121 | u8 index; | 123 | u8 index; |
122 | 124 | ||
123 | gk20a_dbg_info(""); | 125 | nvgpu_log_info(g, " "); |
124 | 126 | ||
125 | if (pboardobjgrp->mask == NULL) | 127 | if (pboardobjgrp->mask == NULL) |
126 | return -EINVAL; | 128 | return -EINVAL; |
@@ -165,7 +167,7 @@ u32 boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp | |||
165 | *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, | 167 | *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, |
166 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id) | 168 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id) |
167 | { | 169 | { |
168 | gk20a_dbg_info(""); | 170 | nvgpu_log_info(g, " "); |
169 | 171 | ||
170 | /* Copy the parameters into the CMD*/ | 172 | /* Copy the parameters into the CMD*/ |
171 | cmd->id = id; | 173 | cmd->id = id; |
@@ -234,7 +236,7 @@ u32 boardobjgrp_pmucmd_pmuinithandle_impl(struct gk20a *g, | |||
234 | u32 status = 0; | 236 | u32 status = 0; |
235 | struct nvgpu_mem *sysmem_desc = &pcmd->surf.sysmem_desc; | 237 | struct nvgpu_mem *sysmem_desc = &pcmd->surf.sysmem_desc; |
236 | 238 | ||
237 | gk20a_dbg_info(""); | 239 | nvgpu_log_info(g, " "); |
238 | 240 | ||
239 | if (g->ops.pmu_ver.boardobj.is_boardobjgrp_pmucmd_id_valid(g, | 241 | if (g->ops.pmu_ver.boardobj.is_boardobjgrp_pmucmd_id_valid(g, |
240 | pboardobjgrp, pcmd)) | 242 | pboardobjgrp, pcmd)) |
@@ -259,7 +261,7 @@ u32 boardobjgrp_pmuinithandle_impl(struct gk20a *g, | |||
259 | { | 261 | { |
260 | u32 status = 0; | 262 | u32 status = 0; |
261 | 263 | ||
262 | gk20a_dbg_info(""); | 264 | nvgpu_log_info(g, " "); |
263 | 265 | ||
264 | status = boardobjgrp_pmucmd_pmuinithandle_impl(g, pboardobjgrp, | 266 | status = boardobjgrp_pmucmd_pmuinithandle_impl(g, pboardobjgrp, |
265 | &pboardobjgrp->pmu.set); | 267 | &pboardobjgrp->pmu.set); |
@@ -295,7 +297,7 @@ u32 boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp | |||
295 | *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, | 297 | *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, |
296 | struct boardobjgrpmask *mask) | 298 | struct boardobjgrpmask *mask) |
297 | { | 299 | { |
298 | gk20a_dbg_info(""); | 300 | nvgpu_log_info(g, " "); |
299 | 301 | ||
300 | if (pboardobjgrp == NULL) | 302 | if (pboardobjgrp == NULL) |
301 | return -EINVAL; | 303 | return -EINVAL; |
@@ -306,7 +308,7 @@ u32 boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp | |||
306 | pboardobjgrppmu->obj_slots = BOARDOBJGRP_PMU_SLOTS_GET(pboardobjgrp); | 308 | pboardobjgrppmu->obj_slots = BOARDOBJGRP_PMU_SLOTS_GET(pboardobjgrp); |
307 | pboardobjgrppmu->flags = 0; | 309 | pboardobjgrppmu->flags = 0; |
308 | 310 | ||
309 | gk20a_dbg_info(" Done"); | 311 | nvgpu_log_info(g, " Done"); |
310 | return 0; | 312 | return 0; |
311 | } | 313 | } |
312 | 314 | ||
@@ -314,7 +316,7 @@ static u32 boardobjgrp_pmudatainstget_stub(struct gk20a *g, | |||
314 | struct nv_pmu_boardobjgrp *boardobjgrppmu, | 316 | struct nv_pmu_boardobjgrp *boardobjgrppmu, |
315 | struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) | 317 | struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) |
316 | { | 318 | { |
317 | gk20a_dbg_info(""); | 319 | nvgpu_log_info(g, " "); |
318 | return -EINVAL; | 320 | return -EINVAL; |
319 | } | 321 | } |
320 | 322 | ||
@@ -323,7 +325,7 @@ static u32 boardobjgrp_pmustatusinstget_stub(struct gk20a *g, | |||
323 | void *pboardobjgrppmu, | 325 | void *pboardobjgrppmu, |
324 | struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx) | 326 | struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx) |
325 | { | 327 | { |
326 | gk20a_dbg_info(""); | 328 | nvgpu_log_info(g, " "); |
327 | return -EINVAL; | 329 | return -EINVAL; |
328 | } | 330 | } |
329 | 331 | ||
@@ -336,7 +338,7 @@ u32 boardobjgrp_pmudatainit_legacy(struct gk20a *g, | |||
336 | struct nv_pmu_boardobj *ppmudata = NULL; | 338 | struct nv_pmu_boardobj *ppmudata = NULL; |
337 | u8 index; | 339 | u8 index; |
338 | 340 | ||
339 | gk20a_dbg_info(""); | 341 | nvgpu_log_info(g, " "); |
340 | 342 | ||
341 | if (pboardobjgrp == NULL) | 343 | if (pboardobjgrp == NULL) |
342 | return -EINVAL; | 344 | return -EINVAL; |
@@ -374,7 +376,7 @@ u32 boardobjgrp_pmudatainit_legacy(struct gk20a *g, | |||
374 | BOARDOBJGRP_FOR_EACH_INDEX_IN_MASK_END | 376 | BOARDOBJGRP_FOR_EACH_INDEX_IN_MASK_END |
375 | 377 | ||
376 | boardobjgrppmudatainit_legacy_done: | 378 | boardobjgrppmudatainit_legacy_done: |
377 | gk20a_dbg_info(" Done"); | 379 | nvgpu_log_info(g, " Done"); |
378 | return status; | 380 | return status; |
379 | } | 381 | } |
380 | 382 | ||
@@ -386,7 +388,7 @@ u32 boardobjgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp | |||
386 | struct nv_pmu_boardobj *ppmudata = NULL; | 388 | struct nv_pmu_boardobj *ppmudata = NULL; |
387 | u8 index; | 389 | u8 index; |
388 | 390 | ||
389 | gk20a_dbg_info(""); | 391 | nvgpu_log_info(g, " "); |
390 | 392 | ||
391 | if (pboardobjgrp == NULL) | 393 | if (pboardobjgrp == NULL) |
392 | return -EINVAL; | 394 | return -EINVAL; |
@@ -420,7 +422,7 @@ u32 boardobjgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp | |||
420 | } | 422 | } |
421 | 423 | ||
422 | boardobjgrppmudatainit_super_done: | 424 | boardobjgrppmudatainit_super_done: |
423 | gk20a_dbg_info(" Done"); | 425 | nvgpu_log_info(g, " Done"); |
424 | return status; | 426 | return status; |
425 | } | 427 | } |
426 | 428 | ||
@@ -452,7 +454,7 @@ u32 boardobjgrp_pmuset_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp) | |||
452 | struct boardobjgrp_pmu_cmd *pcmd = | 454 | struct boardobjgrp_pmu_cmd *pcmd = |
453 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); | 455 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); |
454 | 456 | ||
455 | gk20a_dbg_info(""); | 457 | nvgpu_log_info(g, " "); |
456 | 458 | ||
457 | if (check_boardobjgrp_param(g, pboardobjgrp)) | 459 | if (check_boardobjgrp_param(g, pboardobjgrp)) |
458 | return -EINVAL; | 460 | return -EINVAL; |
@@ -511,7 +513,7 @@ u32 boardobjgrp_pmuset_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjgrp | |||
511 | struct boardobjgrp_pmu_cmd *pcmd = | 513 | struct boardobjgrp_pmu_cmd *pcmd = |
512 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); | 514 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); |
513 | 515 | ||
514 | gk20a_dbg_info(""); | 516 | nvgpu_log_info(g, " "); |
515 | 517 | ||
516 | if (check_boardobjgrp_param(g, pboardobjgrp)) | 518 | if (check_boardobjgrp_param(g, pboardobjgrp)) |
517 | return -EINVAL; | 519 | return -EINVAL; |
@@ -568,7 +570,7 @@ boardobjgrp_pmugetstatus_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp, | |||
568 | struct boardobjgrp_pmu_cmd *pset = | 570 | struct boardobjgrp_pmu_cmd *pset = |
569 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); | 571 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); |
570 | 572 | ||
571 | gk20a_dbg_info(""); | 573 | nvgpu_log_info(g, " "); |
572 | 574 | ||
573 | if (check_boardobjgrp_param(g, pboardobjgrp)) | 575 | if (check_boardobjgrp_param(g, pboardobjgrp)) |
574 | return -EINVAL; | 576 | return -EINVAL; |
@@ -635,7 +637,7 @@ boardobjgrp_pmugetstatus_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjg | |||
635 | struct boardobjgrp_pmu_cmd *pcmd = | 637 | struct boardobjgrp_pmu_cmd *pcmd = |
636 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus); | 638 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus); |
637 | 639 | ||
638 | gk20a_dbg_info(""); | 640 | nvgpu_log_info(g, " "); |
639 | 641 | ||
640 | if (check_boardobjgrp_param(g, pboardobjgrp)) | 642 | if (check_boardobjgrp_param(g, pboardobjgrp)) |
641 | return -EINVAL; | 643 | return -EINVAL; |
@@ -690,8 +692,9 @@ static u32 | |||
690 | boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, | 692 | boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, |
691 | struct boardobj *pboardobj, u8 index) | 693 | struct boardobj *pboardobj, u8 index) |
692 | { | 694 | { |
695 | struct gk20a *g = pboardobjgrp->g; | ||
693 | 696 | ||
694 | gk20a_dbg_info(""); | 697 | nvgpu_log_info(g, " "); |
695 | 698 | ||
696 | if (pboardobjgrp == NULL) | 699 | if (pboardobjgrp == NULL) |
697 | return -EINVAL; | 700 | return -EINVAL; |
@@ -719,7 +722,7 @@ boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, | |||
719 | 722 | ||
720 | pboardobjgrp->objmask |= BIT(index); | 723 | pboardobjgrp->objmask |= BIT(index); |
721 | 724 | ||
722 | gk20a_dbg_info(" Done"); | 725 | nvgpu_log_info(g, " Done"); |
723 | 726 | ||
724 | return boardobjgrpmask_bitset(pboardobjgrp->mask, index); | 727 | return boardobjgrpmask_bitset(pboardobjgrp->mask, index); |
725 | } | 728 | } |
@@ -789,8 +792,9 @@ static u32 boardobjgrp_objremoveanddestroy_final( | |||
789 | { | 792 | { |
790 | u32 status = 0; | 793 | u32 status = 0; |
791 | u32 stat; | 794 | u32 stat; |
795 | struct gk20a *g = pboardobjgrp->g; | ||
792 | 796 | ||
793 | gk20a_dbg_info(""); | 797 | nvgpu_log_info(g, " "); |
794 | 798 | ||
795 | if (!boardobjgrp_idxisvalid(pboardobjgrp, index)) | 799 | if (!boardobjgrp_idxisvalid(pboardobjgrp, index)) |
796 | return -EINVAL; | 800 | return -EINVAL; |
@@ -824,8 +828,6 @@ void boardobjgrpe32hdrset(struct nv_pmu_boardobjgrp *hdr, u32 objmask) | |||
824 | { | 828 | { |
825 | u32 slots = objmask; | 829 | u32 slots = objmask; |
826 | 830 | ||
827 | gk20a_dbg_info(""); | ||
828 | |||
829 | HIGHESTBITIDX_32(slots); | 831 | HIGHESTBITIDX_32(slots); |
830 | slots++; | 832 | slots++; |
831 | 833 | ||
@@ -844,7 +846,7 @@ static void boardobjgrp_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg, | |||
844 | struct boardobjgrp *pboardobjgrp = phandlerparams->pboardobjgrp; | 846 | struct boardobjgrp *pboardobjgrp = phandlerparams->pboardobjgrp; |
845 | struct boardobjgrp_pmu_cmd *pgrpcmd = phandlerparams->pcmd; | 847 | struct boardobjgrp_pmu_cmd *pgrpcmd = phandlerparams->pcmd; |
846 | 848 | ||
847 | gk20a_dbg_info(""); | 849 | nvgpu_log_info(g, " "); |
848 | 850 | ||
849 | pgrpmsg = &msg->msg.boardobj.grp; | 851 | pgrpmsg = &msg->msg.boardobj.grp; |
850 | 852 | ||
@@ -895,7 +897,7 @@ static u32 boardobjgrp_pmucmdsend(struct gk20a *g, | |||
895 | u32 seqdesc; | 897 | u32 seqdesc; |
896 | u32 status = 0; | 898 | u32 status = 0; |
897 | 899 | ||
898 | gk20a_dbg_info(""); | 900 | nvgpu_log_info(g, " "); |
899 | 901 | ||
900 | memset(&payload, 0, sizeof(payload)); | 902 | memset(&payload, 0, sizeof(payload)); |
901 | memset(&handlerparams, 0, sizeof(handlerparams)); | 903 | memset(&handlerparams, 0, sizeof(handlerparams)); |