GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timer: Add functions to initialize absolute timer structures. 

Otherwise there's no good way to create an absolute timer structure without
fiddling with its internal structure or assuming a zero initialized structure
has a value of zero.

Old-Change-Id: Iffe3b6b25ed7963fcfb66f749c531ea445ea4aeb
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65301
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Commit-Queue: Stefan Reinauer <reinauer@google.com>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Stefan Reinauer <reinauer@google.com>
(cherry picked from commit e2e5c1ef3bb2df95fdf0e33cb2d975a990d07a4a)

exynos: Simplify the monotonic timer implementation.

The previous implementation was overly complicated, and when used in the
timestamp implementation produced some weird and broken results.

Old-Change-Id: I3048028ddea0657b01b0c94f312764b38d1397e4
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://gerrit.chromium.org/gerrit/65302
Reviewed-by: Ronald G. Minnich <rminnich@chromium.org>
Commit-Queue: Stefan Reinauer <reinauer@google.com>
Reviewed-by: Stefan Reinauer <reinauer@google.com>
Tested-by: Stefan Reinauer <reinauer@google.com>
(cherry picked from commit 6a3fde9a5b80cdac76d79c65d20d7dd1f1d9e557)

Squashed two closely related commits.

Change-Id: Ifc32d773f4f93d34275a81781001d080357fe8ef
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6406
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Gabe Black 2013-08-09 00:48:06 -07:00 committed by Isaac Christensen
parent 82683ab9d4
commit 6ccc45d7d5
3 changed files with 20 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/cpu/samsung/exynos5250/monotonic_timer.c
View File

@ -18,40 +18,20 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include <delay.h>
#include <timer.h> #include <timer.h>
#include "clk.h" #include "clk.h"
static struct monotonic_counter { static int initialized;
int initialized;
struct mono_time time;
uint64_t last_value;
} mono_counter;
static const uint32_t clocks_per_usec = MCT_HZ/1000000; static const uint32_t clocks_per_usec = MCT_HZ/1000000;
void timer_monotonic_get(struct mono_time *mt) void timer_monotonic_get(struct mono_time *mt)
{ {
uint64_t current_tick; if (!initialized) {
uint64_t usecs_elapsed;
if (!mono_counter.initialized) {
mct_start(); mct_start();
mono_counter.last_value = mct_raw_value(); initialized = 1;
mono_counter.initialized = 1;
} }
current_tick = mct_raw_value(); mono_time_set_usecs(mt, mct_raw_value() / clocks_per_usec);
usecs_elapsed = (current_tick - mono_counter.last_value) /
clocks_per_usec;
/* Update current time and tick values only if a full tick occurred. */
if (usecs_elapsed) {
mono_time_add_usecs(&mono_counter.time, usecs_elapsed);
mono_counter.last_value = current_tick;
}
/* Save result. */
*mt = mono_counter.time;
} }

28
src/cpu/samsung/exynos5420/monotonic_timer.c
View File

@ -18,40 +18,20 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include <delay.h>
#include <timer.h> #include <timer.h>
#include "clk.h" #include "clk.h"
static struct monotonic_counter { static int initialized;
int initialized;
struct mono_time time;
uint64_t last_value;
} mono_counter;
static const uint32_t clocks_per_usec = MCT_HZ/1000000; static const uint32_t clocks_per_usec = MCT_HZ/1000000;
void timer_monotonic_get(struct mono_time *mt) void timer_monotonic_get(struct mono_time *mt)
{ {
uint64_t current_tick; if (!initialized) {
uint64_t usecs_elapsed;
if (!mono_counter.initialized) {
mct_start(); mct_start();
mono_counter.last_value = mct_raw_value(); initialized = 1;
mono_counter.initialized = 1;
} }
current_tick = mct_raw_value(); mono_time_set_usecs(mt, mct_raw_value() / clocks_per_usec);
usecs_elapsed = (current_tick - mono_counter.last_value) /
clocks_per_usec;
/* Update current time and tick values only if a full tick occurred. */
if (usecs_elapsed) {
mono_time_add_usecs(&mono_counter.time, usecs_elapsed);
mono_counter.last_value = current_tick;
}
/* Save result. */
*mt = mono_counter.time;
} }

12
src/include/timer.h
View File

@ -67,6 +67,18 @@ int timers_run(void);
* 0 returned on success, < 0 on error. */ * 0 returned on success, < 0 on error. */
int timer_sched_callback(struct timeout_callback *tocb, unsigned long us); int timer_sched_callback(struct timeout_callback *tocb, unsigned long us);
/* Set an absolute time to a number of microseconds. */
static inline void mono_time_set_usecs(struct mono_time *mt, long us)
{
mt->microseconds = us;
}
/* Set an absolute time to a number of milliseconds. */
static inline void mono_time_set_msecs(struct mono_time *mt, long ms)
{
mt->microseconds = ms * USECS_PER_MSEC;
}
/* Add microseconds to an absolute time. */ /* Add microseconds to an absolute time. */
static inline void mono_time_add_usecs(struct mono_time *mt, long us) static inline void mono_time_add_usecs(struct mono_time *mt, long us)
{ {