diff --git a/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
index 3c7012e85..5bc8be27e 100644
--- a/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
+++ b/drivers/gpu/nvgpu/common/pmu/pg/pmu_pg.c
@@ -598,7 +598,8 @@ int nvgpu_pmu_init_bind_fecs(struct gk20a *g)
 
 	(void) memset(&cmd, 0, sizeof(struct pmu_cmd));
 	cmd.hdr.unit_id = PMU_UNIT_PG;
-	cmd.hdr.size = PMU_CMD_HDR_SIZE +
+	nvgpu_assert(PMU_CMD_HDR_SIZE < U32(U8_MAX));
+	cmd.hdr.size = U8(PMU_CMD_HDR_SIZE) +
 			g->ops.pmu_ver.pg_cmd_eng_buf_load_size(&cmd.cmd.pg);
 	g->ops.pmu_ver.pg_cmd_eng_buf_load_set_cmd_type(&cmd.cmd.pg,
 			PMU_PG_CMD_ID_ENG_BUF_LOAD);
@@ -639,7 +640,8 @@ void nvgpu_pmu_setup_hw_load_zbc(struct gk20a *g)
 
 	(void) memset(&cmd, 0, sizeof(struct pmu_cmd));
 	cmd.hdr.unit_id = PMU_UNIT_PG;
-	cmd.hdr.size = PMU_CMD_HDR_SIZE +
+	nvgpu_assert(PMU_CMD_HDR_SIZE < U32(U8_MAX));
+	cmd.hdr.size = U8(PMU_CMD_HDR_SIZE) +
 			g->ops.pmu_ver.pg_cmd_eng_buf_load_size(&cmd.cmd.pg);
 	g->ops.pmu_ver.pg_cmd_eng_buf_load_set_cmd_type(&cmd.cmd.pg,
 			PMU_PG_CMD_ID_ENG_BUF_LOAD);
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
index c954ae909..28ab05747 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_fw.c
@@ -993,17 +993,26 @@ static void *get_pmu_sequence_out_alloc_ptr_v1(struct pmu_sequence *seq)
 
 static u8 pg_cmd_eng_buf_load_size_v0(struct pmu_pg_cmd *pg)
 {
-	return (u32)sizeof(pg->eng_buf_load_v0);
+	size_t tmp_size = sizeof(pg->eng_buf_load_v0);
+
+	nvgpu_assert(tmp_size <= (size_t)U8_MAX);
+	return U8(tmp_size);
 }
 
 static u8 pg_cmd_eng_buf_load_size_v1(struct pmu_pg_cmd *pg)
 {
-	return (u32)sizeof(pg->eng_buf_load_v1);
+	size_t tmp_size = sizeof(pg->eng_buf_load_v1);
+
+	nvgpu_assert(tmp_size <= (size_t)U8_MAX);
+	return U8(tmp_size);
 }
 
 static u8 pg_cmd_eng_buf_load_size_v2(struct pmu_pg_cmd *pg)
 {
-	return (u32)sizeof(pg->eng_buf_load_v2);
+	size_t tmp_size = sizeof(pg->eng_buf_load_v2);
+
+	nvgpu_assert(tmp_size <= (size_t)U8_MAX);
+	return U8(tmp_size);
 }
 
 static void pg_cmd_eng_buf_load_set_cmd_type_v0(struct pmu_pg_cmd *pg,