diff --git a/drivers/gpu/nvgpu/common/pmu/pmu.c b/drivers/gpu/nvgpu/common/pmu/pmu.c index 96defd156..dc081448d 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu.c @@ -30,6 +30,7 @@ #include #include #include +#include static int nvgpu_pg_init_task(void *arg); @@ -411,7 +412,8 @@ int nvgpu_pmu_process_init_msg(struct nvgpu_pmu *pmu, BUG_ON(sizeof(pmu->gid_info.gid) != sizeof(gid_data.gid)); - (void) memcpy(pmu->gid_info.gid, gid_data.gid, + nvgpu_memcpy((u8 *)pmu->gid_info.gid, + (u8 *)gid_data.gid, sizeof(pmu->gid_info.gid)); } } diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c index c51c4f1ae..53e42a316 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_ipc.c @@ -528,7 +528,8 @@ static int pmu_response_handle(struct nvgpu_pmu *pmu, } else if (seq->state != PMU_SEQ_STATE_CANCELLED) { if (seq->msg != NULL) { if (seq->msg->hdr.size >= msg->hdr.size) { - (void) memcpy(seq->msg, msg, msg->hdr.size); + nvgpu_memcpy((u8 *)seq->msg, (u8 *)msg, + msg->hdr.size); } else { nvgpu_err(g, "sequence %d msg buffer too small", seq->id); diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c index 86a8ec185..b4054dc24 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c @@ -27,6 +27,7 @@ #include #include #include +#include /* state transition : * OFF => [OFF_ON_PENDING optional] => ON_PENDING => ON => OFF @@ -685,9 +686,9 @@ int nvgpu_pmu_ap_send_command(struct gk20a *g, nvgpu_pmu_dbg(g, "cmd post PMU_AP_CMD_ID_INIT_AND_ENABLE_CTRL"); cmd.cmd.pg.ap_cmd.init_and_enable_ctrl.ctrl_id = p_ap_cmd->init_and_enable_ctrl.ctrl_id; - (void) memcpy( - (void *)&(cmd.cmd.pg.ap_cmd.init_and_enable_ctrl.params), - (void *)&(p_ap_cmd->init_and_enable_ctrl.params), + nvgpu_memcpy( + (u8 *)&(cmd.cmd.pg.ap_cmd.init_and_enable_ctrl.params), + (u8 *)&(p_ap_cmd->init_and_enable_ctrl.params), sizeof(struct pmu_ap_ctrl_init_params)); p_callback = ap_callback_init_and_enable_ctrl;