diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c
index 88dff3328..61aa2d133 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu.c
@@ -385,7 +385,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu,
 	}
 
 	nvgpu_falcon_copy_from_dmem(pmu->flcn, tail + PMU_MSG_HDR_SIZE,
-		(u8 *)&msg->msg, msg->hdr.size - PMU_MSG_HDR_SIZE, 0);
+		(u8 *)&msg->msg, (u32)msg->hdr.size - PMU_MSG_HDR_SIZE, 0);
 
 	if (msg->msg.init.msg_type != PMU_INIT_MSG_TYPE_PMU_INIT) {
 		nvgpu_err(g, "expecting init msg");
@@ -402,7 +402,7 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu,
 		nvgpu_falcon_copy_from_dmem(pmu->flcn,
 			pv->get_pmu_init_msg_pmu_sw_mg_off(init),
 			(u8 *)&gid_data,
-			sizeof(struct pmu_sha1_gid_data), 0);
+			(u32)sizeof(struct pmu_sha1_gid_data), 0);
 
 		pmu->gid_info.valid =
 			(*gid_hdr_data == PMU_SHA1_GID_SIGNATURE);
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_debug.c b/drivers/gpu/nvgpu/common/pmu/pmu_debug.c
index 256c5e6ec..a8d0aba70 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_debug.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_debug.c
@@ -36,7 +36,7 @@ void nvgpu_pmu_dump_elpg_stats(struct nvgpu_pmu *pmu)
 	nvgpu_err(g, "Print PG stats");
 	nvgpu_falcon_print_dmem(pmu->flcn,
 		pmu->stat_dmem_offset[PMU_PG_ELPG_ENGINE_ID_GRAPHICS],
-		sizeof(struct pmu_pg_stats_v2));
+		(u32)sizeof(struct pmu_pg_stats_v2));
 
 	g->ops.pmu.pmu_dump_elpg_stats(pmu);
 }
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_gk20a.c b/drivers/gpu/nvgpu/common/pmu/pmu_gk20a.c
index 3108a5690..933464383 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_gk20a.c
@@ -821,7 +821,7 @@ void gk20a_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id,
 
 	nvgpu_falcon_copy_from_dmem(pmu->flcn,
 		pmu->stat_dmem_offset[pg_engine_id],
-		(u8 *)&stats, sizeof(struct pmu_pg_stats), 0);
+		(u8 *)&stats, (u32)sizeof(struct pmu_pg_stats), 0);
 
 	pg_stat_data->ingating_time = stats.pg_ingating_time_us;
 	pg_stat_data->ungating_time = stats.pg_ungating_time_us;
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_gp106.c b/drivers/gpu/nvgpu/common/pmu/pmu_gp106.c
index ddb294bf1..18bda5443 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_gp106.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_gp106.c
@@ -171,7 +171,7 @@ void gp106_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id,
 
 	nvgpu_falcon_copy_from_dmem(pmu->flcn,
 		pmu->stat_dmem_offset[pg_engine_id],
-		(u8 *)&stats, sizeof(struct pmu_pg_stats_v2), 0);
+		(u8 *)&stats, (u32)sizeof(struct pmu_pg_stats_v2), 0);
 
 	pg_stat_data->ingating_time = stats.total_sleep_time_us;
 	pg_stat_data->ungating_time = stats.total_non_sleep_time_us;
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_gp10b.c b/drivers/gpu/nvgpu/common/pmu/pmu_gp10b.c
index 55a2eb16f..d41839236 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_gp10b.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_gp10b.c
@@ -265,7 +265,7 @@ void gp10b_pmu_elpg_statistics(struct gk20a *g, u32 pg_engine_id,
 
 	nvgpu_falcon_copy_from_dmem(pmu->flcn,
 		pmu->stat_dmem_offset[pg_engine_id],
-		(u8 *)&stats, sizeof(struct pmu_pg_stats_v1), 0);
+		(u8 *)&stats, (u32)sizeof(struct pmu_pg_stats_v1), 0);
 
 	pg_stat_data->ingating_time = stats.total_sleep_timeus;
 	pg_stat_data->ungating_time = stats.total_nonsleep_timeus;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h b/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h
index 273da1e39..45e8c6ff0 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/flcnif_cmn.h
@@ -98,8 +98,8 @@ struct pmu_hdr {
 
 #define  NV_FLCN_UNIT_ID_REWIND    (0x00U)
 
-#define PMU_MSG_HDR_SIZE	sizeof(struct pmu_hdr)
-#define PMU_CMD_HDR_SIZE	sizeof(struct pmu_hdr)
+#define PMU_MSG_HDR_SIZE	U32(sizeof(struct pmu_hdr))
+#define PMU_CMD_HDR_SIZE	U32(sizeof(struct pmu_hdr))
 
 #define nv_pmu_hdr pmu_hdr
 typedef u8 flcn_status;