Skip to content

Commit 70ba6da

Browse files
committed
[optimization][tdm]: optimize TDM driver code logic to avoid warning
Signed-off-by: chench <chench@hygon.cn> Change-Id: I6ec9c9f0978aedea308ed8d733b2dc6c5d9aa65e
1 parent b4575e7 commit 70ba6da

1 file changed

Lines changed: 11 additions & 9 deletions

File tree

drivers/crypto/ccp/hygon/tdm-dev.c

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -676,17 +676,15 @@ int psp_create_measure_task(struct addr_range_info *range, struct measure_data *
676676
}
677677

678678
paddr_range_info->count = info_index;
679-
addr_range_info_len = paddr_range_info->count * sizeof(struct addr_info) +
680-
sizeof(struct addr_range_info);
679+
addr_range_info_len = paddr_range_info->count * sizeof(struct addr_info);
681680
} else {
682681
/*check if physics address valid*/
683682
ret = tdm_verify_phy_addr_valid(range);
684683
if (ret) {
685684
pr_err("range address is abnormal!\n");
686685
goto end;
687686
}
688-
addr_range_info_len = range->count * sizeof(struct addr_info) +
689-
sizeof(struct addr_range_info);
687+
addr_range_info_len = range->count * sizeof(struct addr_info);
690688
}
691689

692690
tdm_cmdresp_data = kzalloc(TDM_C2P_CMD_SIZE, GFP_KERNEL);
@@ -709,10 +707,14 @@ int psp_create_measure_task(struct addr_range_info *range, struct measure_data *
709707
goto free_cmdresp;
710708
}
711709

712-
if (flag & TASK_CREATE_VADDR)
713-
memcpy(&create_cmd->range_info, paddr_range_info, addr_range_info_len);
714-
else
715-
memcpy(&create_cmd->range_info, range, addr_range_info_len);
710+
if (flag & TASK_CREATE_VADDR) {
711+
create_cmd->range_info.count = paddr_range_info->count;
712+
memcpy(&create_cmd->range_info.addr[0], &paddr_range_info->addr[0],
713+
addr_range_info_len);
714+
} else {
715+
create_cmd->range_info.count = range->count;
716+
memcpy(&create_cmd->range_info.addr[0], &range->addr[0], addr_range_info_len);
717+
}
716718

717719
ret = tdm_do_cmd(0, (void *)create_cmd, &error);
718720
if (ret && ret != -EIO) {
@@ -1311,7 +1313,7 @@ int tdm_get_report(uint32_t task_id, struct task_selection_2b *selection,
13111313
*length = needed_length;
13121314
ret = -DYN_ERR_SIZE_SMALL;
13131315
} else {
1314-
memcpy(report_buffer, report_resp, needed_length);
1316+
memcpy(report_buffer, (uint8_t *)report_resp, needed_length);
13151317
}
13161318

13171319
free_cmdresp:

0 commit comments

Comments
 (0)