summaryrefslogtreecommitdiff
path: root/common/timer.c
diff options
context:
space:
mode:
authornagendra modadugu <ngm@google.com>2016-07-17 20:50:45 -0700
committerchrome-bot <chrome-bot@chromium.org>2016-07-21 17:32:28 -0700
commitf623eaf077a4050cd7ae6dd3c96525325060d647 (patch)
treeafc692c9a24d7e4659ee97fdb15ba4e4356e65b7 /common/timer.c
parent64397fdd5b734b0ec6346e325893291a1f446291 (diff)
downloadchrome-ec-f623eaf077a4050cd7ae6dd3c96525325060d647.tar.gz
timer: fix clock() implementation to match TPM2 library expectations
The clock() function was introduced to provide free running clock for the TPM2 library, which expects this clock to run with a millisecond resolution. This patch fixes the bug where the function in fact was returning the clock running at a microsecond resolution. BRANCH=none BUG=chrome-os-partner:43025,chrome-os-partner:47524 BUG=chrome-os-partner:50115 TEST=with the appropriate modification of the user of this function all lockout related TCG tests pass. Signed-off-by: nagendra modadugu <ngm@google.com> Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/361180 (cherry picked from commit b4e78b309900402499b8742199fb4536570d3000) (cherry picked from commit fefaa02a4f2c807a3ad50137bd7dba7f5f081c31) Change-Id: Ic02fffca610426d22e58609eb8c3693aec96ad5c Reviewed-on: https://chromium-review.googlesource.com/362118
Diffstat (limited to 'common/timer.c')
-rw-r--r--common/timer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/timer.c b/common/timer.c
index 289314e74a..b1f452f611 100644
--- a/common/timer.c
+++ b/common/timer.c
@@ -185,7 +185,8 @@ timestamp_t get_time(void)
clock_t clock(void)
{
- return (clock_t) __hw_clock_source_read();
+ /* __hw_clock_source_read() returns a microsecond resolution timer.*/
+ return (clock_t) __hw_clock_source_read() / 1000;
}
void force_time(timestamp_t ts)