diff options
author | Amulya <Amurthyreddy@nvidia.com> | 2018-08-06 01:07:32 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-14 00:51:09 -0400 |
commit | 2328d305b7c9437aa467922086b9fcfc0a4169ba (patch) | |
tree | 6d37f0f7bda427c296cfb06021715a2e01581f0c /drivers/gpu/nvgpu/gv11b | |
parent | e62785190f74cfbf9003a190a768e9077373bf6f (diff) |
gpu: nvgpu: MISRA 10.4 enum fixes
MISRA rule-10.4 only allows arithmetic conversions on operands of the
same essential type category.
Fix violations where an arithmetic conversion is performed on enum and
non-enum types.
JIRA NVGPU-993
Change-Id: I5391bb670d68982e0b5af6600995f70fe0cb2ad3
Signed-off-by: Amulya <Amurthyreddy@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1792852
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 9 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.h | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 4327e087..058a21e5 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -4138,8 +4138,9 @@ void gv11b_gr_get_egpc_etpc_num(struct gk20a *g, u32 addr, | |||
4138 | "egpc_num = %d etpc_num = %d", *egpc_num, *etpc_num); | 4138 | "egpc_num = %d etpc_num = %d", *egpc_num, *etpc_num); |
4139 | } | 4139 | } |
4140 | 4140 | ||
4141 | int gv11b_gr_decode_egpc_addr(struct gk20a *g, u32 addr, int *addr_type, | 4141 | int gv11b_gr_decode_egpc_addr(struct gk20a *g, u32 addr, |
4142 | u32 *gpc_num, u32 *tpc_num, u32 *broadcast_flags) | 4142 | enum ctxsw_addr_type *addr_type, u32 *gpc_num, u32 *tpc_num, |
4143 | u32 *broadcast_flags) | ||
4143 | { | 4144 | { |
4144 | u32 gpc_addr; | 4145 | u32 gpc_addr; |
4145 | u32 tpc_addr; | 4146 | u32 tpc_addr; |
@@ -4702,7 +4703,7 @@ int gr_gv11b_handle_ssync_hww(struct gk20a *g) | |||
4702 | * type and numbers | 4703 | * type and numbers |
4703 | */ | 4704 | */ |
4704 | int gr_gv11b_decode_priv_addr(struct gk20a *g, u32 addr, | 4705 | int gr_gv11b_decode_priv_addr(struct gk20a *g, u32 addr, |
4705 | int *addr_type, /* enum ctxsw_addr_type */ | 4706 | enum ctxsw_addr_type *addr_type, |
4706 | u32 *gpc_num, u32 *tpc_num, u32 *ppc_num, u32 *be_num, | 4707 | u32 *gpc_num, u32 *tpc_num, u32 *ppc_num, u32 *be_num, |
4707 | u32 *broadcast_flags) | 4708 | u32 *broadcast_flags) |
4708 | { | 4709 | { |
@@ -4849,7 +4850,7 @@ int gr_gv11b_create_priv_addr_table(struct gk20a *g, | |||
4849 | u32 *priv_addr_table, | 4850 | u32 *priv_addr_table, |
4850 | u32 *num_registers) | 4851 | u32 *num_registers) |
4851 | { | 4852 | { |
4852 | int addr_type; /*enum ctxsw_addr_type */ | 4853 | enum ctxsw_addr_type addr_type; |
4853 | u32 gpc_num, tpc_num, ppc_num, be_num; | 4854 | u32 gpc_num, tpc_num, ppc_num, be_num; |
4854 | u32 priv_addr, gpc_addr; | 4855 | u32 priv_addr, gpc_addr; |
4855 | u32 broadcast_flags; | 4856 | u32 broadcast_flags; |
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h index 9c680827..0a8a536c 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h | |||
@@ -217,8 +217,9 @@ bool gv11b_gr_pri_is_egpc_addr(struct gk20a *g, u32 addr); | |||
217 | bool gv11b_gr_pri_is_etpc_addr(struct gk20a *g, u32 addr); | 217 | bool gv11b_gr_pri_is_etpc_addr(struct gk20a *g, u32 addr); |
218 | void gv11b_gr_get_egpc_etpc_num(struct gk20a *g, u32 addr, | 218 | void gv11b_gr_get_egpc_etpc_num(struct gk20a *g, u32 addr, |
219 | u32 *egpc_num, u32 *etpc_num); | 219 | u32 *egpc_num, u32 *etpc_num); |
220 | int gv11b_gr_decode_egpc_addr(struct gk20a *g, u32 addr, int *addr_type, | 220 | int gv11b_gr_decode_egpc_addr(struct gk20a *g, u32 addr, |
221 | u32 *gpc_num, u32 *tpc_num, u32 *broadcast_flags); | 221 | enum ctxsw_addr_type *addr_type, u32 *gpc_num, u32 *tpc_num, |
222 | u32 *broadcast_flags); | ||
222 | void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr, | 223 | void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr, |
223 | u32 gpc, u32 tpc, u32 broadcast_flags, u32 *priv_addr_table, u32 *t); | 224 | u32 gpc, u32 tpc, u32 broadcast_flags, u32 *priv_addr_table, u32 *t); |
224 | u32 gv11b_gr_get_egpc_base(struct gk20a *g); | 225 | u32 gv11b_gr_get_egpc_base(struct gk20a *g); |
@@ -242,7 +243,7 @@ u32 gv11b_gr_sm_offset(struct gk20a *g, u32 sm); | |||
242 | 243 | ||
243 | u32 gr_gv11b_get_pmm_per_chiplet_offset(void); | 244 | u32 gr_gv11b_get_pmm_per_chiplet_offset(void); |
244 | int gr_gv11b_decode_priv_addr(struct gk20a *g, u32 addr, | 245 | int gr_gv11b_decode_priv_addr(struct gk20a *g, u32 addr, |
245 | int *addr_type, | 246 | enum ctxsw_addr_type *addr_type, |
246 | u32 *gpc_num, u32 *tpc_num, u32 *ppc_num, u32 *be_num, | 247 | u32 *gpc_num, u32 *tpc_num, u32 *ppc_num, u32 *be_num, |
247 | u32 *broadcast_flags); | 248 | u32 *broadcast_flags); |
248 | int gr_gv11b_create_priv_addr_table(struct gk20a *g, | 249 | int gr_gv11b_create_priv_addr_table(struct gk20a *g, |