Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-27 07:15:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(intel): add mailbox error return status for FCS_DECRYPTION" into integration

Browse source
This commit is contained in:
Sandrine Bailleux 2022-12-19 08:37:23 +01:00 • committed by TrustedFirmware Code Review
commit ff4a2c17eb
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plat/intel/soc/common/include/socfpga_mailbox.h
View file

@ -129,6 +129,10 @@
#define MBOX_BUSY -5 #define MBOX_BUSY -5
#define MBOX_TIMEOUT -2047 #define MBOX_TIMEOUT -2047
/* Key Status */
#define MBOX_RET_SDOS_DECRYPTION_ERROR_102 -258
#define MBOX_RET_SDOS_DECRYPTION_ERROR_103 -259
/* Reconfig Status Response */ /* Reconfig Status Response */
#define RECONFIG_STATUS_STATE 0 #define RECONFIG_STATUS_STATE 0
#define RECONFIG_STATUS_PIN_STATUS 2 #define RECONFIG_STATUS_PIN_STATUS 2

5
plat/intel/soc/common/sip/socfpga_sip_fcs.c
View file

@ -411,7 +411,10 @@ int intel_fcs_decryption_ext(uint32_t session_id, uint32_t context_id,
(uint32_t *) &payload, payload_size, (uint32_t *) &payload, payload_size,
CMD_CASUAL, resp_data, &resp_len); CMD_CASUAL, resp_data, &resp_len);
if (status < 0) { if (status == MBOX_RET_SDOS_DECRYPTION_ERROR_102 ||
status == MBOX_RET_SDOS_DECRYPTION_ERROR_103) {
*mbox_error = -status;
} else if (status < 0) {
*mbox_error = -status; *mbox_error = -status;
return INTEL_SIP_SMC_STATUS_ERROR; return INTEL_SIP_SMC_STATUS_ERROR;
} }

5
plat/intel/soc/common/socfpga_sip_svc.c
View file

@ -611,7 +611,10 @@ uint32_t intel_smc_service_completed(uint64_t addr, uint32_t size,
*ret_size = resp_len * MBOX_WORD_BYTE; *ret_size = resp_len * MBOX_WORD_BYTE;
flush_dcache_range(addr, *ret_size); flush_dcache_range(addr, *ret_size);
if (status != MBOX_RET_OK) { if (status == MBOX_RET_SDOS_DECRYPTION_ERROR_102 ||
status == MBOX_RET_SDOS_DECRYPTION_ERROR_103) {
*mbox_error = -status;
} else if (status != MBOX_RET_OK) {
*mbox_error = -status; *mbox_error = -status;
return INTEL_SIP_SMC_STATUS_ERROR; return INTEL_SIP_SMC_STATUS_ERROR;
} }