hulk inclusion category: bugfix bugzilla: https://atomgit.com/openeuler/kernel/issues/9430 -------------------------------- This reverts commit 14e583ccc8af52f03a29ea704970e8e4b28966c2, reversing changes made to adbe47b6cb32f8ea1644528dc0efce88d043f126. It introduces a x86_64 check_build error: In file included from drivers/char/tpm/tpm_hygon.c:18: ./include/linux/psp-hygon.h:51:9: error: redeclaration of enumerator ‘CSV3_CMD_LAUNCH_FINISH_EX’ 51 | CSV3_CMD_LAUNCH_FINISH_EX = 0x204, | ^~~~~~~~~~~~~~~~~~~~~~~~~ ./include/linux/psp-hygon.h:48:9: note: previous definition of ‘CSV3_CMD_LAUNCH_FINISH_EX’ with type ‘int’ 48 | CSV3_CMD_LAUNCH_FINISH_EX = 0x204, | ^~~~~~~~~~~~~~~~~~~~~~~~~ Revert it to avoid compilation issues. Fixes: 78d3389e7d6b ("crypto: ccp: Define CSV3 LAUNCH_FINISH_EX command id") Signed-off-by: Tengda Wu <wutengda2@huawei.com> --- drivers/crypto/ccp/hygon/csv-dev.c | 1 - include/linux/psp-hygon.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/crypto/ccp/hygon/csv-dev.c b/drivers/crypto/ccp/hygon/csv-dev.c index 03f7e6db0e39..adf6bd89304f 100644 --- a/drivers/crypto/ccp/hygon/csv-dev.c +++ b/drivers/crypto/ccp/hygon/csv-dev.c @@ -65,7 +65,6 @@ int csv_cmd_buffer_len(int cmd) case CSV3_CMD_RECEIVE_ENCRYPT_DATA: return sizeof(struct csv3_data_receive_encrypt_data); case CSV3_CMD_RECEIVE_ENCRYPT_CONTEXT: - case CSV3_CMD_LAUNCH_FINISH_EX: return sizeof(struct csv3_data_launch_finish_ex); return sizeof(struct csv3_data_receive_encrypt_context); case CSV3_CMD_LAUNCH_FINISH_EX: return sizeof(struct csv3_data_launch_finish_ex); default: return 0; diff --git a/include/linux/psp-hygon.h b/include/linux/psp-hygon.h index 29f63bbfa1e1..0b81edaf2d56 100644 --- a/include/linux/psp-hygon.h +++ b/include/linux/psp-hygon.h @@ -45,7 +45,6 @@ enum csv3_cmd { CSV3_CMD_SET_GUEST_PRIVATE_MEMORY = 0x200, CSV3_CMD_LAUNCH_ENCRYPT_DATA = 0x201, CSV3_CMD_LAUNCH_ENCRYPT_VMCB = 0x202, - CSV3_CMD_LAUNCH_FINISH_EX = 0x204, /* Guest NPT(Nested Page Table) management commands */ CSV3_CMD_UPDATE_NPT = 0x203, CSV3_CMD_LAUNCH_FINISH_EX = 0x204, -- 2.34.1