diff options
Diffstat (limited to 'drivers/gpu/nvgpu/boardobj')
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobj.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobj.h | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp.c | 78 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp.h | 29 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | 8 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h | 6 |
10 files changed, 81 insertions, 76 deletions
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c index 5f726935..b7892c78 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/boardobj/boardobj.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include "boardobj.h" | 26 | #include "boardobj.h" |
27 | #include "ctrl/ctrlboardobj.h" | 27 | #include "ctrl/ctrlboardobj.h" |
28 | 28 | ||
29 | u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, | 29 | int boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, |
30 | u16 size, void *args) | 30 | u16 size, void *args) |
31 | { | 31 | { |
32 | struct boardobj *pboardobj = NULL; | 32 | struct boardobj *pboardobj = NULL; |
@@ -61,7 +61,7 @@ u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, | |||
61 | return 0; | 61 | return 0; |
62 | } | 62 | } |
63 | 63 | ||
64 | u32 boardobj_destruct_super(struct boardobj *pboardobj) | 64 | int boardobj_destruct_super(struct boardobj *pboardobj) |
65 | { | 65 | { |
66 | struct gk20a *g = pboardobj->g; | 66 | struct gk20a *g = pboardobj->g; |
67 | 67 | ||
@@ -86,7 +86,7 @@ bool boardobj_implements_super(struct gk20a *g, struct boardobj *pboardobj, | |||
86 | return (0 != (pboardobj->type_mask & BIT(type))); | 86 | return (0 != (pboardobj->type_mask & BIT(type))); |
87 | } | 87 | } |
88 | 88 | ||
89 | u32 boardobj_pmudatainit_super(struct gk20a *g, struct boardobj *pboardobj, | 89 | int boardobj_pmudatainit_super(struct gk20a *g, struct boardobj *pboardobj, |
90 | struct nv_pmu_boardobj *pmudata) | 90 | struct nv_pmu_boardobj *pmudata) |
91 | { | 91 | { |
92 | nvgpu_log_info(g, " "); | 92 | nvgpu_log_info(g, " "); |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h index 8fc8d1cc..4df14aaa 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.h +++ b/drivers/gpu/nvgpu/boardobj/boardobj.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -42,14 +42,14 @@ typedef bool boardobj_implements(struct gk20a *g, struct boardobj *pboardobj, | |||
42 | * description structure, describing this BOARDOBJ board device to the PMU. | 42 | * description structure, describing this BOARDOBJ board device to the PMU. |
43 | * | 43 | * |
44 | */ | 44 | */ |
45 | typedef u32 boardobj_pmudatainit(struct gk20a *g, struct boardobj *pboardobj, | 45 | typedef int boardobj_pmudatainit(struct gk20a *g, struct boardobj *pboardobj, |
46 | struct nv_pmu_boardobj *pmudata); | 46 | struct nv_pmu_boardobj *pmudata); |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * Constructor for the base Board Object. Called by each device-specific | 49 | * Constructor for the base Board Object. Called by each device-specific |
50 | * implementation of the BOARDOBJ interface to initialize the board object. | 50 | * implementation of the BOARDOBJ interface to initialize the board object. |
51 | */ | 51 | */ |
52 | typedef u32 boardobj_construct(struct gk20a *g, struct boardobj **pboardobj, | 52 | typedef int boardobj_construct(struct gk20a *g, struct boardobj **pboardobj, |
53 | u16 size, void *args); | 53 | u16 size, void *args); |
54 | 54 | ||
55 | /* | 55 | /* |
@@ -58,7 +58,7 @@ typedef u32 boardobj_construct(struct gk20a *g, struct boardobj **pboardobj, | |||
58 | * This has to be explicitly set by each device that extends from the | 58 | * This has to be explicitly set by each device that extends from the |
59 | * board object. | 59 | * board object. |
60 | */ | 60 | */ |
61 | typedef u32 boardobj_destruct(struct boardobj *pboardobj); | 61 | typedef int boardobj_destruct(struct boardobj *pboardobj); |
62 | 62 | ||
63 | /* | 63 | /* |
64 | * Base Class for all physical or logical device on the PCB. | 64 | * Base Class for all physical or logical device on the PCB. |
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) |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h index 8fc7136f..625e7912 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h | |||
@@ -40,13 +40,13 @@ struct pmu_surface; | |||
40 | * Board Object Group destructor. | 40 | * Board Object Group destructor. |
41 | * | 41 | * |
42 | */ | 42 | */ |
43 | typedef u32 boardobjgrp_destruct(struct boardobjgrp *pboardobjgrp); | 43 | typedef int boardobjgrp_destruct(struct boardobjgrp *pboardobjgrp); |
44 | 44 | ||
45 | /* | 45 | /* |
46 | * Inserts a previously constructed Board Object into a Board Object Group for | 46 | * Inserts a previously constructed Board Object into a Board Object Group for |
47 | * tracking. Objects are inserted in the array based on the given index. | 47 | * tracking. Objects are inserted in the array based on the given index. |
48 | */ | 48 | */ |
49 | typedef u32 boardobjgrp_objinsert(struct boardobjgrp *pboardobjgrp, | 49 | typedef int boardobjgrp_objinsert(struct boardobjgrp *pboardobjgrp, |
50 | struct boardobj *pboardobj, u8 index); | 50 | struct boardobj *pboardobj, u8 index); |
51 | 51 | ||
52 | /* | 52 | /* |
@@ -68,7 +68,7 @@ typedef struct boardobj *boardobjgrp_objgetnext( | |||
68 | * Board Object Group Remover and destructor. This is used to remove and | 68 | * Board Object Group Remover and destructor. This is used to remove and |
69 | * destruct specific entry from the Board Object Group. | 69 | * destruct specific entry from the Board Object Group. |
70 | */ | 70 | */ |
71 | typedef u32 boardobjgrp_objremoveanddestroy(struct boardobjgrp *pboardobjgrp, | 71 | typedef int boardobjgrp_objremoveanddestroy(struct boardobjgrp *pboardobjgrp, |
72 | u8 index); | 72 | u8 index); |
73 | 73 | ||
74 | /* | 74 | /* |
@@ -76,14 +76,14 @@ typedef u32 boardobjgrp_objremoveanddestroy(struct boardobjgrp *pboardobjgrp, | |||
76 | * for the constructed PMU CMDs, and then sets the object via the | 76 | * for the constructed PMU CMDs, and then sets the object via the |
77 | * PMU_BOARDOBJ_CMD_GRP interface (if constructed). | 77 | * PMU_BOARDOBJ_CMD_GRP interface (if constructed). |
78 | */ | 78 | */ |
79 | typedef u32 boardobjgrp_pmuinithandle(struct gk20a *g, | 79 | typedef int boardobjgrp_pmuinithandle(struct gk20a *g, |
80 | struct boardobjgrp *pboardobjGrp); | 80 | struct boardobjgrp *pboardobjGrp); |
81 | 81 | ||
82 | /* | 82 | /* |
83 | * Fills out the appropriate the PMU_BOARDOBJGRP_<xyz> driver<->PMU description | 83 | * Fills out the appropriate the PMU_BOARDOBJGRP_<xyz> driver<->PMU description |
84 | * header structure, more specifically a mask of BOARDOBJs. | 84 | * header structure, more specifically a mask of BOARDOBJs. |
85 | */ | 85 | */ |
86 | typedef u32 boardobjgrp_pmuhdrdatainit(struct gk20a *g, | 86 | typedef int boardobjgrp_pmuhdrdatainit(struct gk20a *g, |
87 | struct boardobjgrp *pboardobjgrp, | 87 | struct boardobjgrp *pboardobjgrp, |
88 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, | 88 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, |
89 | struct boardobjgrpmask *mask); | 89 | struct boardobjgrpmask *mask); |
@@ -92,7 +92,7 @@ typedef u32 boardobjgrp_pmuhdrdatainit(struct gk20a *g, | |||
92 | * Fills out the appropriate the PMU_BOARDOBJGRP_<xyz> driver->PMU description | 92 | * Fills out the appropriate the PMU_BOARDOBJGRP_<xyz> driver->PMU description |
93 | * structure, describing the BOARDOBJGRP and all of its BOARDOBJs to the PMU. | 93 | * structure, describing the BOARDOBJGRP and all of its BOARDOBJs to the PMU. |
94 | */ | 94 | */ |
95 | typedef u32 boardobjgrp_pmudatainit(struct gk20a *g, | 95 | typedef int boardobjgrp_pmudatainit(struct gk20a *g, |
96 | struct boardobjgrp *pboardobjgrp, | 96 | struct boardobjgrp *pboardobjgrp, |
97 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu); | 97 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu); |
98 | 98 | ||
@@ -101,22 +101,22 @@ typedef u32 boardobjgrp_pmudatainit(struct gk20a *g, | |||
101 | * This interface leverages @ref boardobjgrp_pmudatainit to populate the | 101 | * This interface leverages @ref boardobjgrp_pmudatainit to populate the |
102 | * structure. | 102 | * structure. |
103 | */ | 103 | */ |
104 | typedef u32 boardobjgrp_pmuset(struct gk20a *g, | 104 | typedef int boardobjgrp_pmuset(struct gk20a *g, |
105 | struct boardobjgrp *pboardobjgrp); | 105 | struct boardobjgrp *pboardobjgrp); |
106 | 106 | ||
107 | /* | 107 | /* |
108 | * Gets the dynamic status of the PMU BOARDOBJGRP via the | 108 | * Gets the dynamic status of the PMU BOARDOBJGRP via the |
109 | * PMU_BOARDOBJ_CMD_GRP GET_STATUS interface. | 109 | * PMU_BOARDOBJ_CMD_GRP GET_STATUS interface. |
110 | */ | 110 | */ |
111 | typedef u32 boardobjgrp_pmugetstatus(struct gk20a *g, | 111 | typedef int boardobjgrp_pmugetstatus(struct gk20a *g, |
112 | struct boardobjgrp *pboardobjgrp, | 112 | struct boardobjgrp *pboardobjgrp, |
113 | struct boardobjgrpmask *mask); | 113 | struct boardobjgrpmask *mask); |
114 | 114 | ||
115 | typedef u32 boardobjgrp_pmudatainstget(struct gk20a *g, | 115 | typedef int boardobjgrp_pmudatainstget(struct gk20a *g, |
116 | struct nv_pmu_boardobjgrp *boardobjgrppmu, | 116 | struct nv_pmu_boardobjgrp *boardobjgrppmu, |
117 | struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx); | 117 | struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx); |
118 | 118 | ||
119 | typedef u32 boardobjgrp_pmustatusinstget(struct gk20a *g, void *pboardobjgrppmu, | 119 | typedef int boardobjgrp_pmustatusinstget(struct gk20a *g, void *pboardobjgrppmu, |
120 | struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx); | 120 | struct nv_pmu_boardobj_query **ppBoardobjpmustatus, u8 idx); |
121 | 121 | ||
122 | /* | 122 | /* |
@@ -153,7 +153,7 @@ struct boardobjgrp_pmu { | |||
153 | * CMD. This provides the various information describing the PMU CMD including | 153 | * CMD. This provides the various information describing the PMU CMD including |
154 | * the CMD and MSG ID and the size of the various sturctures in the payload. | 154 | * the CMD and MSG ID and the size of the various sturctures in the payload. |
155 | */ | 155 | */ |
156 | typedef u32 boardobjgrp_pmucmd_construct(struct gk20a *g, | 156 | typedef int boardobjgrp_pmucmd_construct(struct gk20a *g, |
157 | struct boardobjgrp *pboardobjgrp, | 157 | struct boardobjgrp *pboardobjgrp, |
158 | struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, | 158 | struct boardobjgrp_pmu_cmd *cmd, u8 id, u8 msgid, |
159 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id); | 159 | u8 hdrsize, u8 entrysize, u16 fbsize, u32 ss_offset, u8 rpc_func_id); |
@@ -161,7 +161,7 @@ typedef u32 boardobjgrp_pmucmd_construct(struct gk20a *g, | |||
161 | /* | 161 | /* |
162 | * Destroys BOARDOBJGRP PMU SW state. CMD. | 162 | * Destroys BOARDOBJGRP PMU SW state. CMD. |
163 | */ | 163 | */ |
164 | typedef u32 boardobjgrp_pmucmd_destroy(struct gk20a *g, | 164 | typedef int boardobjgrp_pmucmd_destroy(struct gk20a *g, |
165 | struct boardobjgrp_pmu_cmd *cmd); | 165 | struct boardobjgrp_pmu_cmd *cmd); |
166 | 166 | ||
167 | /* | 167 | /* |
@@ -169,7 +169,7 @@ typedef u32 boardobjgrp_pmucmd_destroy(struct gk20a *g, | |||
169 | * PMU CMD payload within both the PMU and driver so that it can be referenced | 169 | * PMU CMD payload within both the PMU and driver so that it can be referenced |
170 | * at run-time. | 170 | * at run-time. |
171 | */ | 171 | */ |
172 | typedef u32 boardobjgrp_pmucmd_pmuinithandle(struct gk20a *g, | 172 | typedef int boardobjgrp_pmucmd_pmuinithandle(struct gk20a *g, |
173 | struct boardobjgrp *pboardobjgrp, | 173 | struct boardobjgrp *pboardobjgrp, |
174 | struct boardobjgrp_pmu_cmd *cmd); | 174 | struct boardobjgrp_pmu_cmd *cmd); |
175 | 175 | ||
@@ -352,7 +352,8 @@ do { \ | |||
352 | 352 | ||
353 | /* ------------------------ Function Prototypes ----------------------------- */ | 353 | /* ------------------------ Function Prototypes ----------------------------- */ |
354 | /* Constructor and destructor */ | 354 | /* Constructor and destructor */ |
355 | u32 boardobjgrp_construct_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp); | 355 | int boardobjgrp_construct_super(struct gk20a *g, |
356 | struct boardobjgrp *pboardobjgrp); | ||
356 | boardobjgrp_destruct boardobjgrp_destruct_impl; | 357 | boardobjgrp_destruct boardobjgrp_destruct_impl; |
357 | boardobjgrp_destruct boardobjgrp_destruct_super; | 358 | boardobjgrp_destruct boardobjgrp_destruct_super; |
358 | 359 | ||
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c index a7da8064..b26f8ecb 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | |||
@@ -27,10 +27,10 @@ | |||
27 | #include "boardobjgrp.h" | 27 | #include "boardobjgrp.h" |
28 | #include "boardobjgrpmask.h" | 28 | #include "boardobjgrpmask.h" |
29 | 29 | ||
30 | u32 boardobjgrpconstruct_e255(struct gk20a *g, | 30 | int boardobjgrpconstruct_e255(struct gk20a *g, |
31 | struct boardobjgrp_e255 *pboardobjgrp_e255) | 31 | struct boardobjgrp_e255 *pboardobjgrp_e255) |
32 | { | 32 | { |
33 | u32 status = 0; | 33 | int status = 0; |
34 | u8 objslots; | 34 | u8 objslots; |
35 | 35 | ||
36 | nvgpu_log_info(g, " "); | 36 | nvgpu_log_info(g, " "); |
@@ -58,14 +58,14 @@ boardobjgrpconstruct_e255_exit: | |||
58 | return status; | 58 | return status; |
59 | } | 59 | } |
60 | 60 | ||
61 | u32 boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g, | 61 | int boardobjgrp_pmuhdrdatainit_e255(struct gk20a *g, |
62 | struct boardobjgrp *pboardobjgrp, | 62 | struct boardobjgrp *pboardobjgrp, |
63 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, | 63 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, |
64 | struct boardobjgrpmask *mask) | 64 | struct boardobjgrpmask *mask) |
65 | { | 65 | { |
66 | struct nv_pmu_boardobjgrp_e255 *pgrpe255 = | 66 | struct nv_pmu_boardobjgrp_e255 *pgrpe255 = |
67 | (struct nv_pmu_boardobjgrp_e255 *)pboardobjgrppmu; | 67 | (struct nv_pmu_boardobjgrp_e255 *)pboardobjgrppmu; |
68 | u32 status; | 68 | int status; |
69 | 69 | ||
70 | nvgpu_log_info(g, " "); | 70 | nvgpu_log_info(g, " "); |
71 | 71 | ||
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h index 76aa902a..10cd95c6 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -43,7 +43,8 @@ struct boardobjgrp_e255 { | |||
43 | boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu) | 43 | boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu) |
44 | 44 | ||
45 | /* Constructor and destructor */ | 45 | /* Constructor and destructor */ |
46 | u32 boardobjgrpconstruct_e255(struct gk20a *g, struct boardobjgrp_e255 *pboardobjgrp); | 46 | int boardobjgrpconstruct_e255(struct gk20a *g, |
47 | struct boardobjgrp_e255 *pboardobjgrp); | ||
47 | boardobjgrp_destruct boardobjgrpdestruct_e255; | 48 | boardobjgrp_destruct boardobjgrpdestruct_e255; |
48 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e255; | 49 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e255; |
49 | 50 | ||
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c index 60e5caf6..48322310 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | |||
@@ -28,10 +28,10 @@ | |||
28 | #include "boardobjgrpmask.h" | 28 | #include "boardobjgrpmask.h" |
29 | 29 | ||
30 | 30 | ||
31 | u32 boardobjgrpconstruct_e32(struct gk20a *g, | 31 | int boardobjgrpconstruct_e32(struct gk20a *g, |
32 | struct boardobjgrp_e32 *pboardobjgrp_e32) | 32 | struct boardobjgrp_e32 *pboardobjgrp_e32) |
33 | { | 33 | { |
34 | u32 status; | 34 | int status; |
35 | u8 objslots; | 35 | u8 objslots; |
36 | 36 | ||
37 | nvgpu_log_info(g, " "); | 37 | nvgpu_log_info(g, " "); |
@@ -58,14 +58,14 @@ boardobjgrpconstruct_e32_exit: | |||
58 | return status; | 58 | return status; |
59 | } | 59 | } |
60 | 60 | ||
61 | u32 boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g, | 61 | int boardobjgrp_pmuhdrdatainit_e32(struct gk20a *g, |
62 | struct boardobjgrp *pboardobjgrp, | 62 | struct boardobjgrp *pboardobjgrp, |
63 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, | 63 | struct nv_pmu_boardobjgrp_super *pboardobjgrppmu, |
64 | struct boardobjgrpmask *mask) | 64 | struct boardobjgrpmask *mask) |
65 | { | 65 | { |
66 | struct nv_pmu_boardobjgrp_e32 *pgrpe32 = | 66 | struct nv_pmu_boardobjgrp_e32 *pgrpe32 = |
67 | (struct nv_pmu_boardobjgrp_e32 *)pboardobjgrppmu; | 67 | (struct nv_pmu_boardobjgrp_e32 *)pboardobjgrppmu; |
68 | u32 status; | 68 | int status; |
69 | 69 | ||
70 | nvgpu_log_info(g, " "); | 70 | nvgpu_log_info(g, " "); |
71 | 71 | ||
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h index 97c737a5..900901bb 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -58,7 +58,8 @@ struct boardobjgrp_e32 { | |||
58 | boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu) | 58 | boardobjgrp_pmudatainit_super(g, pboardpbjgrp, pboardobjgrppmu) |
59 | 59 | ||
60 | /* Constructor and destructor */ | 60 | /* Constructor and destructor */ |
61 | u32 boardobjgrpconstruct_e32(struct gk20a *g, struct boardobjgrp_e32 *pboardobjgrp); | 61 | int boardobjgrpconstruct_e32(struct gk20a *g, |
62 | struct boardobjgrp_e32 *pboardobjgrp); | ||
62 | boardobjgrp_destruct boardobjgrpdestruct_e32; | 63 | boardobjgrp_destruct boardobjgrpdestruct_e32; |
63 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e32; | 64 | boardobjgrp_pmuhdrdatainit boardobjgrp_pmuhdrdatainit_e32; |
64 | 65 | ||
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c index c3f4f4a5..d957467b 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.c | |||
@@ -221,7 +221,7 @@ u8 boardobjgrpmask_bitidxhighest(struct boardobjgrpmask *mask) | |||
221 | return result; | 221 | return result; |
222 | } | 222 | } |
223 | 223 | ||
224 | u32 boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx) | 224 | int boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx) |
225 | { | 225 | { |
226 | u8 index; | 226 | u8 index; |
227 | u8 offset; | 227 | u8 offset; |
@@ -241,7 +241,7 @@ u32 boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx) | |||
241 | return 0; | 241 | return 0; |
242 | } | 242 | } |
243 | 243 | ||
244 | u32 boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx) | 244 | int boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx) |
245 | { | 245 | { |
246 | u8 index; | 246 | u8 index; |
247 | u8 offset; | 247 | u8 offset; |
diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h index aacabfe9..c081284a 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrpmask.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -83,8 +83,8 @@ u8 boardobjgrpmask_bitidxlowest(struct boardobjgrpmask *mask); | |||
83 | u8 boardobjgrpmask_bitidxhighest(struct boardobjgrpmask *mask); | 83 | u8 boardobjgrpmask_bitidxhighest(struct boardobjgrpmask *mask); |
84 | 84 | ||
85 | /* Operations on a single bit of a single mask */ | 85 | /* Operations on a single bit of a single mask */ |
86 | u32 boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx); | 86 | int boardobjgrpmask_bitclr(struct boardobjgrpmask *mask, u8 bitidx); |
87 | u32 boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx); | 87 | int boardobjgrpmask_bitset(struct boardobjgrpmask *mask, u8 bitidx); |
88 | u32 boardobjgrpmask_bitinv(struct boardobjgrpmask *mask, u8 bitidx); | 88 | u32 boardobjgrpmask_bitinv(struct boardobjgrpmask *mask, u8 bitidx); |
89 | bool boardobjgrpmask_bitget(struct boardobjgrpmask *mask, u8 bitidx); | 89 | bool boardobjgrpmask_bitget(struct boardobjgrpmask *mask, u8 bitidx); |
90 | 90 | ||