diff --git a/drivers/gpu/nvgpu/common/fifo/engines.c b/drivers/gpu/nvgpu/common/fifo/engines.c
index 895001499..4499a04c4 100644
--- a/drivers/gpu/nvgpu/common/fifo/engines.c
+++ b/drivers/gpu/nvgpu/common/fifo/engines.c
@@ -726,7 +726,7 @@ u32 nvgpu_engine_get_mask_on_id(struct gk20a *g, u32 id, bool is_tsg)
 					ENGINE_STATUS_CTX_ID_TYPE_TSGID) ||
 					(!is_tsg && type ==
 					ENGINE_STATUS_CTX_ID_TYPE_CHID)) {
-				engines |= BIT(active_engine_id);
+				engines |= BIT32(active_engine_id);
 			}
 		}
 	}
diff --git a/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b.c b/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b.c
index b81e8c07f..05bb250c8 100644
--- a/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b.c
+++ b/drivers/gpu/nvgpu/hal/fifo/ramfc_gv11b.c
@@ -59,7 +59,7 @@ int gv11b_ramfc_setup(struct channel_gk20a *ch, u64 gpfifo_base,
 
 	nvgpu_mem_wr32(g, mem, ram_fc_gp_base_hi_w(),
 		pbdma_gp_base_hi_offset_f(u64_hi32(gpfifo_base)) |
-		pbdma_gp_base_hi_limit2_f(ilog2(gpfifo_entries)));
+		pbdma_gp_base_hi_limit2_f(U32(ilog2(gpfifo_entries))));
 
 	nvgpu_mem_wr32(g, mem, ram_fc_signature_w(),
 		ch->g->ops.pbdma.get_signature(ch->g));