scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-09 17:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cr50: fix event definition collision

Browse Source 
Events used when TPM task is running are defined in two different
places, one of them shared with other boards running on H1.

Let's avoid collision by redefining Cr50 only events to be different
from shared ones used by dcrypto.

BRANCH=cr50
BUG=b:68729265
TEST=verified that there is no more 'tpm_reset_request: already
     scheduled' messages generated when TPM is reset when performing
     long dcrypto operation.

Change-Id: Ic9517fa98be21f3ef5f19b82c593d96b0ddbaf6b
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/756914
Reviewed-by: Nagendra Modadugu <ngm@google.com>
Reviewed-by: Duncan Laurie <dlaurie@google.com>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
This commit is contained in:
Vadim Bendebury
2017-11-07 08:00:21 -08:00
committed by chrome-bot
parent 3919001a39
commit 0e7186422f
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
chip/g/dcrypto/dcrypto_runtime.c
View File

@@ -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)

11
common/tpm_registers.c
View File

@@ -669,10 +669,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