diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2017-11-07 08:00:21 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-07 17:52:15 -0800 |
| commit | 0e7186422fea5046f11d15fdcf0647887b2aa4f9 (patch) | |
| tree | 3f6684548de86e8e858f54455fce4b1a89511bae /chip | |
| parent | 3919001a390f593ba8e022f223bf1e43b7dbc0a2 (diff) | |
| download | chrome-ec-0e7186422fea5046f11d15fdcf0647887b2aa4f9.tar.gz | |
cr50: fix event definition collision
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>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/g/dcrypto/dcrypto_runtime.c | 4 |
1 files changed, 4 insertions, 0 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) |