diff options
| -rw-r--r-- | chip/g/dcrypto/dcrypto_runtime.c | 4 | ||||
| -rw-r--r-- | common/tpm_registers.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/chip/g/dcrypto/dcrypto_runtime.c b/chip/g/dcrypto/dcrypto_runtime.c index 3775ffa13a..e182ca5c3c 100644 --- a/chip/g/dcrypto/dcrypto_runtime.c +++ b/chip/g/dcrypto/dcrypto_runtime.c @@ -68,6 +68,10 @@ void dcrypto_unlock(void) } #define DCRYPTO_CALL_TIMEOUT_US (700 * 1000) +/* + * When running on Cr50 this event belongs in the TPM task event space. Make + * sure there is no collision with events defined in ./common/tpm_regsters.c. + */ #define TASK_EVENT_DCRYPTO_DONE TASK_EVENT_CUSTOM(1) uint32_t dcrypto_call(uint32_t adr) diff --git a/common/tpm_registers.c b/common/tpm_registers.c index 06366e3a49..c6813ad633 100644 --- a/common/tpm_registers.c +++ b/common/tpm_registers.c @@ -668,10 +668,13 @@ static void call_extension_command(struct tpm_cmd_header *tpmh, } #endif -/* Event (to TPM task) to request reset, or (from TPM task) on completion. */ -#define TPM_EVENT_RESET TASK_EVENT_CUSTOM(1 << 0) -#define TPM_EVENT_COMMIT TASK_EVENT_CUSTOM(1 << 1) -#define TPM_EVENT_ALT_EXTENSION TASK_EVENT_CUSTOM(1 << 2) +/* + * Events used on the TPM task context. Make sure there is no collision with + * event(s) defined in chip/g/dcrypto/dcrypto_runtime.c + */ +#define TPM_EVENT_RESET TASK_EVENT_CUSTOM(1 << 1) +#define TPM_EVENT_COMMIT TASK_EVENT_CUSTOM(1 << 2) +#define TPM_EVENT_ALT_EXTENSION TASK_EVENT_CUSTOM(1 << 3) /* * Result of executing of the TPM command on the alternative path, could have |