diff options
author | Philip Elcan <pelcan@nvidia.com> | 2018-08-29 15:46:12 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-07 00:33:50 -0400 |
commit | 7f8226887c28267d3c2351692d4429ead1e17695 (patch) | |
tree | aa09c45e496b058044c9d9a94c94d9922c572285 /drivers/gpu/nvgpu/boardobj/boardobjgrp.c | |
parent | 0e58ebaae13dd59b6aba5297f898e7c89fcd2742 (diff) |
gpu: nvgpu: cleanup return types for MISRA 10.3
This is a big cleanup of return types across a number of modules in the
nvgpu driver. Many functions were returning u32 but using negative
return codes. This is a MISRA 10.3 violation by assigning signed values
to a u32.
JIRA NVGPU-647
Change-Id: I59ee66706321f5b5b1a07ed8c24b81583e9ba28c
Signed-off-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1810743
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 | 78 |
1 files changed, 40 insertions, 38 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c index e0ab67be..e3b69d4b 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.c | |||
@@ -32,10 +32,10 @@ static boardobjgrp_objgetnext boardobjgrp_objgetnext_final; | |||
32 | static boardobjgrp_objremoveanddestroy boardobjgrp_objremoveanddestroy_final; | 32 | static boardobjgrp_objremoveanddestroy boardobjgrp_objremoveanddestroy_final; |
33 | static boardobjgrp_pmudatainstget boardobjgrp_pmudatainstget_stub; | 33 | static boardobjgrp_pmudatainstget boardobjgrp_pmudatainstget_stub; |
34 | static boardobjgrp_pmustatusinstget boardobjgrp_pmustatusinstget_stub; | 34 | static boardobjgrp_pmustatusinstget boardobjgrp_pmustatusinstget_stub; |
35 | static u32 boardobjgrp_pmucmdsend(struct gk20a *g, | 35 | static int boardobjgrp_pmucmdsend(struct gk20a *g, |
36 | struct boardobjgrp *pboardobjgrp, | 36 | struct boardobjgrp *pboardobjgrp, |
37 | struct boardobjgrp_pmu_cmd *pcmd); | 37 | struct boardobjgrp_pmu_cmd *pcmd); |
38 | static u32 boardobjgrp_pmucmdsend_rpc(struct gk20a *g, | 38 | static int boardobjgrp_pmucmdsend_rpc(struct gk20a *g, |
39 | struct boardobjgrp *pboardobjgrp, | 39 | struct boardobjgrp *pboardobjgrp, |
40 | struct boardobjgrp_pmu_cmd *pcmd, | 40 | struct boardobjgrp_pmu_cmd *pcmd, |
41 | bool copy_out); | 41 | bool copy_out); |
@@ -48,7 +48,8 @@ struct boardobjgrp_pmucmdhandler_params { | |||
48 | u32 success; | 48 | u32 success; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp) | 51 | int boardobjgrp_construct_super(struct gk20a *g, |
52 | struct boardobjgrp *pboardobjgrp) | ||
52 | { | 53 | { |
53 | nvgpu_log_info(g, " "); | 54 | nvgpu_log_info(g, " "); |
54 | 55 | ||
@@ -102,7 +103,7 @@ u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgr | |||
102 | return 0; | 103 | return 0; |
103 | } | 104 | } |
104 | 105 | ||
105 | u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp) | 106 | int boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp) |
106 | { | 107 | { |
107 | struct gk20a *g = pboardobjgrp->g; | 108 | struct gk20a *g = pboardobjgrp->g; |
108 | 109 | ||
@@ -119,12 +120,12 @@ u32 boardobjgrp_destruct_impl(struct boardobjgrp *pboardobjgrp) | |||
119 | return pboardobjgrp->destruct(pboardobjgrp); | 120 | return pboardobjgrp->destruct(pboardobjgrp); |
120 | } | 121 | } |
121 | 122 | ||
122 | u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp) | 123 | int boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp) |
123 | { | 124 | { |
124 | struct boardobj *pboardobj; | 125 | struct boardobj *pboardobj; |
125 | struct gk20a *g = pboardobjgrp->g; | 126 | struct gk20a *g = pboardobjgrp->g; |
126 | u32 status = 0; | 127 | int status = 0; |
127 | u32 stat; | 128 | int stat; |
128 | u8 index; | 129 | u8 index; |
129 | 130 | ||
130 | nvgpu_log_info(g, " "); | 131 | nvgpu_log_info(g, " "); |
@@ -174,7 +175,7 @@ u32 boardobjgrp_destruct_super(struct boardobjgrp *pboardobjgrp) | |||
174 | return status; | 175 | return status; |
175 | } | 176 | } |
176 | 177 | ||
177 | u32 boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp | 178 | int boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp |
178 | *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, | 179 | *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, |
179 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id) | 180 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id) |
180 | { | 181 | { |
@@ -190,7 +191,7 @@ u32 boardobjgrp_pmucmd_construct_impl(struct gk20a *g, struct boardobjgrp | |||
190 | return 0; | 191 | return 0; |
191 | } | 192 | } |
192 | 193 | ||
193 | u32 boardobjgrp_pmucmd_construct_impl_v1(struct gk20a *g, struct boardobjgrp | 194 | int boardobjgrp_pmucmd_construct_impl_v1(struct gk20a *g, struct boardobjgrp |
194 | *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, | 195 | *pboardobjgrp, struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, |
195 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id) | 196 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id) |
196 | { | 197 | { |
@@ -206,7 +207,7 @@ u32 boardobjgrp_pmucmd_construct_impl_v1(struct gk20a *g, struct boardobjgrp | |||
206 | return 0; | 207 | return 0; |
207 | } | 208 | } |
208 | 209 | ||
209 | u32 boardobjgrp_pmucmd_destroy_impl(struct gk20a *g, | 210 | int boardobjgrp_pmucmd_destroy_impl(struct gk20a *g, |
210 | struct boardobjgrp_pmu_cmd *cmd) | 211 | struct boardobjgrp_pmu_cmd *cmd) |
211 | { | 212 | { |
212 | struct nvgpu_mem *mem = &cmd->surf.sysmem_desc; | 213 | struct nvgpu_mem *mem = &cmd->surf.sysmem_desc; |
@@ -242,11 +243,11 @@ int is_boardobjgrp_pmucmd_id_valid_v1(struct gk20a *g, | |||
242 | return err; | 243 | return err; |
243 | } | 244 | } |
244 | 245 | ||
245 | u32 boardobjgrp_pmucmd_pmuinithandle_impl(struct gk20a *g, | 246 | int boardobjgrp_pmucmd_pmuinithandle_impl(struct gk20a *g, |
246 | struct boardobjgrp *pboardobjgrp, | 247 | struct boardobjgrp *pboardobjgrp, |
247 | struct boardobjgrp_pmu_cmd *pcmd) | 248 | struct boardobjgrp_pmu_cmd *pcmd) |
248 | { | 249 | { |
249 | u32 status = 0; | 250 | int status = 0; |
250 | struct nvgpu_mem *sysmem_desc = &pcmd->surf.sysmem_desc; | 251 | struct nvgpu_mem *sysmem_desc = &pcmd->surf.sysmem_desc; |
251 | 252 | ||
252 | nvgpu_log_info(g, " "); | 253 | nvgpu_log_info(g, " "); |
@@ -271,10 +272,10 @@ boardobjgrp_pmucmd_pmuinithandle_exit: | |||
271 | return status; | 272 | return status; |
272 | } | 273 | } |
273 | 274 | ||
274 | u32 boardobjgrp_pmuinithandle_impl(struct gk20a *g, | 275 | int boardobjgrp_pmuinithandle_impl(struct gk20a *g, |
275 | struct boardobjgrp *pboardobjgrp) | 276 | struct boardobjgrp *pboardobjgrp) |
276 | { | 277 | { |
277 | u32 status = 0; | 278 | int status = 0; |
278 | 279 | ||
279 | nvgpu_log_info(g, " "); | 280 | nvgpu_log_info(g, " "); |
280 | 281 | ||
@@ -310,7 +311,7 @@ boardobjgrp_pmuinithandle_exit: | |||
310 | } | 311 | } |
311 | 312 | ||
312 | 313 | ||
313 | u32 boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp | 314 | int boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp |
314 | *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, | 315 | *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, |
315 | struct boardobjgrpmask *mask) | 316 | struct boardobjgrpmask *mask) |
316 | { | 317 | { |
@@ -331,7 +332,7 @@ u32 boardobjgrp_pmuhdrdatainit_super(struct gk20a *g, struct boardobjgrp | |||
331 | return 0; | 332 | return 0; |
332 | } | 333 | } |
333 | 334 | ||
334 | static u32 boardobjgrp_pmudatainstget_stub(struct gk20a *g, | 335 | static int boardobjgrp_pmudatainstget_stub(struct gk20a *g, |
335 | struct nv_pmu_boardobjgrp *boardobjgrppmu, | 336 | struct nv_pmu_boardobjgrp *boardobjgrppmu, |
336 | struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) | 337 | struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) |
337 | { | 338 | { |
@@ -340,7 +341,7 @@ static u32 boardobjgrp_pmudatainstget_stub(struct gk20a *g, | |||
340 | } | 341 | } |
341 | 342 | ||
342 | 343 | ||
343 | static u32 boardobjgrp_pmustatusinstget_stub(struct gk20a *g, | 344 | static int boardobjgrp_pmustatusinstget_stub(struct gk20a *g, |
344 | void *pboardobjgrppmu, | 345 | void *pboardobjgrppmu, |
345 | struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx) | 346 | struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx) |
346 | { | 347 | { |
@@ -348,11 +349,11 @@ static u32 boardobjgrp_pmustatusinstget_stub(struct gk20a *g, | |||
348 | return -EINVAL; | 349 | return -EINVAL; |
349 | } | 350 | } |
350 | 351 | ||
351 | u32 boardobjgrp_pmudatainit_legacy(struct gk20a *g, | 352 | int boardobjgrp_pmudatainit_legacy(struct gk20a *g, |
352 | struct boardobjgrp *pboardobjgrp, | 353 | struct boardobjgrp *pboardobjgrp, |
353 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) | 354 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) |
354 | { | 355 | { |
355 | u32 status = 0; | 356 | int status = 0; |
356 | struct boardobj *pboardobj = NULL; | 357 | struct boardobj *pboardobj = NULL; |
357 | struct nv_pmu_boardobj *ppmudata = NULL; | 358 | struct nv_pmu_boardobj *ppmudata = NULL; |
358 | u8 index; | 359 | u8 index; |
@@ -401,10 +402,10 @@ boardobjgrppmudatainit_legacy_done: | |||
401 | return status; | 402 | return status; |
402 | } | 403 | } |
403 | 404 | ||
404 | u32 boardobjgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp | 405 | int boardobjgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp |
405 | *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) | 406 | *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) |
406 | { | 407 | { |
407 | u32 status = 0; | 408 | int status = 0; |
408 | struct boardobj *pboardobj = NULL; | 409 | struct boardobj *pboardobj = NULL; |
409 | struct nv_pmu_boardobj *ppmudata = NULL; | 410 | struct nv_pmu_boardobj *ppmudata = NULL; |
410 | u8 index; | 411 | u8 index; |
@@ -476,9 +477,9 @@ static int check_boardobjgrp_param(struct gk20a *g, | |||
476 | return 0; | 477 | return 0; |
477 | } | 478 | } |
478 | 479 | ||
479 | u32 boardobjgrp_pmuset_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp) | 480 | int boardobjgrp_pmuset_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp) |
480 | { | 481 | { |
481 | u32 status = 0; | 482 | int status = 0; |
482 | struct boardobjgrp_pmu_cmd *pcmd = | 483 | struct boardobjgrp_pmu_cmd *pcmd = |
483 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); | 484 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); |
484 | 485 | ||
@@ -537,10 +538,11 @@ boardobjgrp_pmuset_exit: | |||
537 | return status; | 538 | return status; |
538 | } | 539 | } |
539 | 540 | ||
540 | u32 boardobjgrp_pmuset_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjgrp) | 541 | int boardobjgrp_pmuset_impl_v1(struct gk20a *g, |
542 | struct boardobjgrp *pboardobjgrp) | ||
541 | { | 543 | { |
542 | struct nvgpu_pmu *pmu = &g->pmu; | 544 | struct nvgpu_pmu *pmu = &g->pmu; |
543 | u32 status = 0; | 545 | int status = 0; |
544 | struct boardobjgrp_pmu_cmd *pcmd = | 546 | struct boardobjgrp_pmu_cmd *pcmd = |
545 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); | 547 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.set); |
546 | 548 | ||
@@ -593,11 +595,11 @@ boardobjgrp_pmuset_exit: | |||
593 | return status; | 595 | return status; |
594 | } | 596 | } |
595 | 597 | ||
596 | u32 | 598 | int |
597 | boardobjgrp_pmugetstatus_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp, | 599 | boardobjgrp_pmugetstatus_impl(struct gk20a *g, struct boardobjgrp *pboardobjgrp, |
598 | struct boardobjgrpmask *mask) | 600 | struct boardobjgrpmask *mask) |
599 | { | 601 | { |
600 | u32 status = 0; | 602 | int status = 0; |
601 | struct boardobjgrp_pmu_cmd *pcmd = | 603 | struct boardobjgrp_pmu_cmd *pcmd = |
602 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus); | 604 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus); |
603 | struct boardobjgrp_pmu_cmd *pset = | 605 | struct boardobjgrp_pmu_cmd *pset = |
@@ -665,12 +667,12 @@ boardobjgrp_pmugetstatus_exit: | |||
665 | return status; | 667 | return status; |
666 | } | 668 | } |
667 | 669 | ||
668 | u32 | 670 | int |
669 | boardobjgrp_pmugetstatus_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjgrp, | 671 | boardobjgrp_pmugetstatus_impl_v1(struct gk20a *g, struct boardobjgrp *pboardobjgrp, |
670 | struct boardobjgrpmask *mask) | 672 | struct boardobjgrpmask *mask) |
671 | { | 673 | { |
672 | struct nvgpu_pmu *pmu = &g->pmu; | 674 | struct nvgpu_pmu *pmu = &g->pmu; |
673 | u32 status = 0; | 675 | int status = 0; |
674 | struct boardobjgrp_pmu_cmd *pcmd = | 676 | struct boardobjgrp_pmu_cmd *pcmd = |
675 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus); | 677 | (struct boardobjgrp_pmu_cmd *)(&pboardobjgrp->pmu.getstatus); |
676 | 678 | ||
@@ -728,7 +730,7 @@ boardobjgrp_pmugetstatus_exit: | |||
728 | return status; | 730 | return status; |
729 | } | 731 | } |
730 | 732 | ||
731 | static u32 | 733 | static int |
732 | boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, | 734 | boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, |
733 | struct boardobj *pboardobj, u8 index) | 735 | struct boardobj *pboardobj, u8 index) |
734 | { | 736 | { |
@@ -761,8 +763,8 @@ boardobjgrp_objinsert_final(struct boardobjgrp *pboardobjgrp, | |||
761 | } | 763 | } |
762 | 764 | ||
763 | pboardobjgrp->ppobjects[index] = pboardobj; | 765 | pboardobjgrp->ppobjects[index] = pboardobj; |
764 | pboardobjgrp->objmaxidx = BOARDOBJGRP_IS_EMPTY(pboardobjgrp) ? | 766 | pboardobjgrp->objmaxidx = (u8)(BOARDOBJGRP_IS_EMPTY(pboardobjgrp) ? |
765 | index : max(pboardobjgrp->objmaxidx, index); | 767 | index : max(pboardobjgrp->objmaxidx, index)); |
766 | pboardobj->idx = index; | 768 | pboardobj->idx = index; |
767 | 769 | ||
768 | pboardobjgrp->objmask |= BIT(index); | 770 | pboardobjgrp->objmask |= BIT(index); |
@@ -835,12 +837,12 @@ static struct boardobj *boardobjgrp_objgetnext_final( | |||
835 | return pboardobjnext; | 837 | return pboardobjnext; |
836 | } | 838 | } |
837 | 839 | ||
838 | static u32 boardobjgrp_objremoveanddestroy_final( | 840 | static int boardobjgrp_objremoveanddestroy_final( |
839 | struct boardobjgrp *pboardobjgrp, | 841 | struct boardobjgrp *pboardobjgrp, |
840 | u8 index) | 842 | u8 index) |
841 | { | 843 | { |
842 | u32 status = 0; | 844 | int status = 0; |
843 | u32 stat; | 845 | int stat; |
844 | struct gk20a *g = pboardobjgrp->g; | 846 | struct gk20a *g = pboardobjgrp->g; |
845 | 847 | ||
846 | nvgpu_log_info(g, " "); | 848 | nvgpu_log_info(g, " "); |
@@ -938,7 +940,7 @@ static void boardobjgrp_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg, | |||
938 | } | 940 | } |
939 | } | 941 | } |
940 | 942 | ||
941 | static u32 boardobjgrp_pmucmdsend(struct gk20a *g, | 943 | static int boardobjgrp_pmucmdsend(struct gk20a *g, |
942 | struct boardobjgrp *pboardobjgrp, | 944 | struct boardobjgrp *pboardobjgrp, |
943 | struct boardobjgrp_pmu_cmd *pcmd) | 945 | struct boardobjgrp_pmu_cmd *pcmd) |
944 | { | 946 | { |
@@ -947,7 +949,7 @@ static u32 boardobjgrp_pmucmdsend(struct gk20a *g, | |||
947 | struct nv_pmu_boardobj_cmd_grp *pgrpcmd; | 949 | struct nv_pmu_boardobj_cmd_grp *pgrpcmd; |
948 | struct pmu_cmd cmd; | 950 | struct pmu_cmd cmd; |
949 | u32 seqdesc; | 951 | u32 seqdesc; |
950 | u32 status = 0; | 952 | int status = 0; |
951 | 953 | ||
952 | nvgpu_log_info(g, " "); | 954 | nvgpu_log_info(g, " "); |
953 | 955 | ||
@@ -1009,7 +1011,7 @@ boardobjgrp_pmucmdsend_exit: | |||
1009 | return status; | 1011 | return status; |
1010 | } | 1012 | } |
1011 | 1013 | ||
1012 | static u32 boardobjgrp_pmucmdsend_rpc(struct gk20a *g, | 1014 | static int boardobjgrp_pmucmdsend_rpc(struct gk20a *g, |
1013 | struct boardobjgrp *pboardobjgrp, | 1015 | struct boardobjgrp *pboardobjgrp, |
1014 | struct boardobjgrp_pmu_cmd *pcmd, | 1016 | struct boardobjgrp_pmu_cmd *pcmd, |
1015 | bool copy_out) | 1017 | bool copy_out) |