summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
diff options
context:
space:
mode:
authorSrirangan <smadhavan@nvidia.com>2018-08-02 04:45:54 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-08-06 20:36:39 -0400
commit17aeea4a2ffa23fc9dbcdc84cda747fe5a025131 (patch)
treed4be52f246724fb9cb99047059073b93aeb089ce /drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
parent6c9daf7626567fffc9d1ccd475865e81ae90a973 (diff)
gpu: nvgpu: gk20a: Fix MISRA 15.6 violations
This fixes errors due to single statement loop bodies without braces, which is part of Rule 15.6 of MISRA. This patch covers in gpu/nvgpu/gk20a/ JIRA NVGPU-989 Change-Id: I2f422e9bc2b03229f4d2c3198613169ce5e7f3ee Signed-off-by: Srirangan <smadhavan@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1791019 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/flcn_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/flcn_gk20a.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
index c55b90b6..98fdb8c2 100644
--- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c
@@ -213,14 +213,16 @@ static int gk20a_flcn_copy_from_dmem(struct nvgpu_falcon *flcn,
213 gk20a_writel(g, base_addr + falcon_falcon_dmemc_r(port), 213 gk20a_writel(g, base_addr + falcon_falcon_dmemc_r(port),
214 src | falcon_falcon_dmemc_aincr_f(1)); 214 src | falcon_falcon_dmemc_aincr_f(1));
215 215
216 for (i = 0; i < words; i++) 216 for (i = 0; i < words; i++) {
217 dst_u32[i] = gk20a_readl(g, 217 dst_u32[i] = gk20a_readl(g,
218 base_addr + falcon_falcon_dmemd_r(port)); 218 base_addr + falcon_falcon_dmemd_r(port));
219 }
219 220
220 if (bytes > 0) { 221 if (bytes > 0) {
221 data = gk20a_readl(g, base_addr + falcon_falcon_dmemd_r(port)); 222 data = gk20a_readl(g, base_addr + falcon_falcon_dmemd_r(port));
222 for (i = 0; i < bytes; i++) 223 for (i = 0; i < bytes; i++) {
223 dst[(words << 2) + i] = ((u8 *)&data)[i]; 224 dst[(words << 2) + i] = ((u8 *)&data)[i];
225 }
224 } 226 }
225 227
226 nvgpu_mutex_release(&flcn->copy_lock); 228 nvgpu_mutex_release(&flcn->copy_lock);
@@ -256,14 +258,16 @@ static int gk20a_flcn_copy_to_dmem(struct nvgpu_falcon *flcn,
256 gk20a_writel(g, base_addr + falcon_falcon_dmemc_r(port), 258 gk20a_writel(g, base_addr + falcon_falcon_dmemc_r(port),
257 dst | falcon_falcon_dmemc_aincw_f(1)); 259 dst | falcon_falcon_dmemc_aincw_f(1));
258 260
259 for (i = 0; i < words; i++) 261 for (i = 0; i < words; i++) {
260 gk20a_writel(g, 262 gk20a_writel(g,
261 base_addr + falcon_falcon_dmemd_r(port), src_u32[i]); 263 base_addr + falcon_falcon_dmemd_r(port), src_u32[i]);
264 }
262 265
263 if (bytes > 0) { 266 if (bytes > 0) {
264 data = 0; 267 data = 0;
265 for (i = 0; i < bytes; i++) 268 for (i = 0; i < bytes; i++) {
266 ((u8 *)&data)[i] = src[(words << 2) + i]; 269 ((u8 *)&data)[i] = src[(words << 2) + i];
270 }
267 gk20a_writel(g, base_addr + falcon_falcon_dmemd_r(port), data); 271 gk20a_writel(g, base_addr + falcon_falcon_dmemd_r(port), data);
268 } 272 }
269 273
@@ -313,14 +317,16 @@ static int gk20a_flcn_copy_from_imem(struct nvgpu_falcon *flcn, u32 src,
313 falcon_falcon_imemc_blk_f(blk) | 317 falcon_falcon_imemc_blk_f(blk) |
314 falcon_falcon_dmemc_aincr_f(1)); 318 falcon_falcon_dmemc_aincr_f(1));
315 319
316 for (i = 0; i < words; i++) 320 for (i = 0; i < words; i++) {
317 dst_u32[i] = gk20a_readl(g, 321 dst_u32[i] = gk20a_readl(g,
318 base_addr + falcon_falcon_imemd_r(port)); 322 base_addr + falcon_falcon_imemd_r(port));
323 }
319 324
320 if (bytes > 0) { 325 if (bytes > 0) {
321 data = gk20a_readl(g, base_addr + falcon_falcon_imemd_r(port)); 326 data = gk20a_readl(g, base_addr + falcon_falcon_imemd_r(port));
322 for (i = 0; i < bytes; i++) 327 for (i = 0; i < bytes; i++) {
323 dst[(words << 2) + i] = ((u8 *)&data)[i]; 328 dst[(words << 2) + i] = ((u8 *)&data)[i];
329 }
324 } 330 }
325 331
326 nvgpu_mutex_release(&flcn->copy_lock); 332 nvgpu_mutex_release(&flcn->copy_lock);