summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
diff options
context:
space:
mode:
authorSrirangan <smadhavan@nvidia.com>2018-08-23 02:37:41 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-08-28 09:47:28 -0400
commit4032e8915a65aa94f8b556676c5606683ec28f52 (patch)
treedc16ddcc61f9fed52c1c687bb02e6ec13edd28c6 /drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
parent8676b2e65b786497c4a0609f06143e7d1bb1a3c0 (diff)
gpu: nvgpu: gm20b: Fix MISRA 15.6 violations
MISRA Rule-15.6 requires that all if-else blocks be enclosed in braces, including single statement blocks. Fix errors due to single statement if blocks without braces, introducing the braces. JIRA NVGPU-671 Change-Id: I1651ae8ee680bdeb48606569c4e8c2fc7cb87f20 Signed-off-by: Srirangan <smadhavan@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1805077 Reviewed-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/fifo_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/fifo_gm20b.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
index f0635b83..dd11d2c7 100644
--- a/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/fifo_gm20b.c
@@ -99,9 +99,10 @@ void gm20b_fifo_trigger_mmu_fault(struct gk20a *g,
99 } else { 99 } else {
100 u32 mmu_id = gm20b_engine_id_to_mmu_id(g, 100 u32 mmu_id = gm20b_engine_id_to_mmu_id(g,
101 engine_id); 101 engine_id);
102 if (mmu_id != (u32)~0) 102 if (mmu_id != (u32)~0) {
103 gk20a_writel(g, fifo_trigger_mmu_fault_r(mmu_id), 103 gk20a_writel(g, fifo_trigger_mmu_fault_r(mmu_id),
104 fifo_trigger_mmu_fault_enable_f(1)); 104 fifo_trigger_mmu_fault_enable_f(1));
105 }
105 } 106 }
106 } 107 }
107 108
@@ -120,8 +121,9 @@ void gm20b_fifo_trigger_mmu_fault(struct gk20a *g,
120 delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX); 121 delay = min_t(u32, delay << 1, GR_IDLE_CHECK_MAX);
121 } while (!nvgpu_timeout_expired(&timeout)); 122 } while (!nvgpu_timeout_expired(&timeout));
122 123
123 if (ret) 124 if (ret) {
124 nvgpu_err(g, "mmu fault timeout"); 125 nvgpu_err(g, "mmu fault timeout");
126 }
125 127
126 /* release mmu fault trigger */ 128 /* release mmu fault trigger */
127 for_each_set_bit(engine_id, &engine_ids, 32) { 129 for_each_set_bit(engine_id, &engine_ids, 32) {
@@ -150,9 +152,10 @@ void gm20b_device_info_data_parse(struct gk20a *g,
150 *fault_id = 152 *fault_id =
151 top_device_info_data_fault_id_enum_v(table_entry); 153 top_device_info_data_fault_id_enum_v(table_entry);
152 } 154 }
153 } else 155 } else {
154 nvgpu_err(g, "unknown device_info_data %d", 156 nvgpu_err(g, "unknown device_info_data %d",
155 top_device_info_data_type_v(table_entry)); 157 top_device_info_data_type_v(table_entry));
158 }
156} 159}
157 160
158void gm20b_fifo_init_pbdma_intr_descs(struct fifo_gk20a *f) 161void gm20b_fifo_init_pbdma_intr_descs(struct fifo_gk20a *f)
@@ -250,10 +253,11 @@ static const char * const gm20b_gpc_client_descs[] = {
250 253
251void gm20b_fifo_get_mmu_fault_gpc_desc(struct mmu_fault_info *mmfault) 254void gm20b_fifo_get_mmu_fault_gpc_desc(struct mmu_fault_info *mmfault)
252{ 255{
253 if (mmfault->client_id >= ARRAY_SIZE(gm20b_gpc_client_descs)) 256 if (mmfault->client_id >= ARRAY_SIZE(gm20b_gpc_client_descs)) {
254 WARN_ON(mmfault->client_id >= 257 WARN_ON(mmfault->client_id >=
255 ARRAY_SIZE(gm20b_gpc_client_descs)); 258 ARRAY_SIZE(gm20b_gpc_client_descs));
256 else 259 } else {
257 mmfault->client_id_desc = 260 mmfault->client_id_desc =
258 gm20b_gpc_client_descs[mmfault->client_id]; 261 gm20b_gpc_client_descs[mmfault->client_id];
262 }
259} 263}