nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: fifo MISRA fix for Rule 10.3

Browse Source 
JIRA NVGPU-3383

Change-Id: Ic1b30cd4b8c5dba0ea75ff0de316d0d5dcc99ae4
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2116730
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Seema Khowala
2019-05-09 12:45:15 -07:00
committed by mobile promotions
parent 7054643749
commit 50d4421dc2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/nvgpu/hal/fifo/mmu_fault_gm20b.c
View File

@@ -83,7 +83,7 @@ static inline u32 gm20b_engine_id_to_fault_id(struct gk20a *g,
void gm20b_fifo_trigger_mmu_fault(struct gk20a *g, void gm20b_fifo_trigger_mmu_fault(struct gk20a *g,
unsigned long engine_ids_bitmask) unsigned long engine_ids_bitmask)
{ {
unsigned long poll_delay = POLL_DELAY_MIN_US; unsigned int poll_delay = POLL_DELAY_MIN_US;
unsigned long engine_id; unsigned long engine_id;
int ret; int ret;
struct nvgpu_timeout timeout; struct nvgpu_timeout timeout;
@@ -119,8 +119,8 @@ void gm20b_fifo_trigger_mmu_fault(struct gk20a *g,
break; break;
} }
nvgpu_usleep_range(poll_delay, poll_delay * 2UL); nvgpu_usleep_range(poll_delay, poll_delay * 2U);
poll_delay = min_t(u32, poll_delay << 1, POLL_DELAY_MAX_US); poll_delay = min_t(u32, poll_delay << 1U, POLL_DELAY_MAX_US);
} while (nvgpu_timeout_expired(&timeout) == 0); } while (nvgpu_timeout_expired(&timeout) == 0);
if (ret != 0) { if (ret != 0) {
@@ -129,6 +129,6 @@ void gm20b_fifo_trigger_mmu_fault(struct gk20a *g,
/* release trigger mmu fault */ /* release trigger mmu fault */
for_each_set_bit(engine_id, &engine_ids_bitmask, 32UL) { for_each_set_bit(engine_id, &engine_ids_bitmask, 32UL) {
nvgpu_writel(g, fifo_trigger_mmu_fault_r(engine_id), 0); nvgpu_writel(g, fifo_trigger_mmu_fault_r((u32)engine_id), 0U);
} }
} }