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

timestamps: Fix some lost timestamps for romstage 

Timestamps from cbfs_and_run, TS_START_COPYRAM and TS_END_COPYRAM,
were lost with commit b766b1c7.

Reason is variable ts_table was referencing CAR storage after CAR
is torn doesn. Add use of car_get_var() / car_set_var() so the
references go to migrated storage in CBMEM.

Change-Id: I5a942ad7fd59a04e3a5255f4a3636d37dcfc1591
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/3967
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki 2013-10-13 13:27:56 +03:00
parent 4ca721399c
commit 29e9c22eb7
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/lib/timestamp.c
View File

@ -27,7 +27,7 @@
#define MAX_TIMESTAMPS 30 #define MAX_TIMESTAMPS 30
static struct timestamp_table* ts_table CAR_GLOBAL = NULL; static struct timestamp_table* ts_table_p CAR_GLOBAL = NULL;
static tsc_t ts_basetime CAR_GLOBAL = { .lo = 0, .hi =0 }; static tsc_t ts_basetime CAR_GLOBAL = { .lo = 0, .hi =0 };
static void timestamp_stash(enum timestamp_id id, tsc_t ts_time); static void timestamp_stash(enum timestamp_id id, tsc_t ts_time);
@ -54,16 +54,18 @@ static void timestamp_real_init(tsc_t base)
tst->max_entries = MAX_TIMESTAMPS; tst->max_entries = MAX_TIMESTAMPS;
tst->num_entries = 0; tst->num_entries = 0;
ts_table = tst; car_set_var(ts_table_p, tst);
} }
void timestamp_add(enum timestamp_id id, tsc_t ts_time) void timestamp_add(enum timestamp_id id, tsc_t ts_time)
{ {
struct timestamp_entry *tse; struct timestamp_entry *tse;
struct timestamp_table *ts_table = NULL;
if (!boot_cpu()) if (!boot_cpu())
return; return;
ts_table = car_get_var(ts_table_p);
if (!ts_table) { if (!ts_table) {
timestamp_stash(id, ts_time); timestamp_stash(id, ts_time);
return; return;
@ -92,28 +94,34 @@ static int timestamp_entries CAR_GLOBAL = 0;
/** /**
* timestamp_stash() allows to temporarily cache timestamps. * timestamp_stash() allows to temporarily cache timestamps.
* This is needed when timestamping before the CBMEM area * This is needed when timestamping before the CBMEM area
* is initialized. The function timestamp_sync() is used to * is initialized. The function timestamp_do_sync() is used to
* write the time stamps to the CBMEM area. This is done in * write the timestamps to the CBMEM area and this is done as
* ram stage main() * part of CAR migration for romstage, and in ramstage main().
*/ */
static void timestamp_stash(enum timestamp_id id, tsc_t ts_time) static void timestamp_stash(enum timestamp_id id, tsc_t ts_time)
{ {
if (timestamp_entries >= MAX_TIMESTAMP_CACHE) { struct timestamp_cache *ts_cache = car_get_var(timestamp_cache);
int ts_entries = car_get_var(timestamp_entries);
if (ts_entries >= MAX_TIMESTAMP_CACHE) {
printk(BIOS_ERR, "ERROR: failed to add timestamp to cache\n"); printk(BIOS_ERR, "ERROR: failed to add timestamp to cache\n");
return; return;
} }
timestamp_cache[timestamp_entries].id = id; ts_cache[ts_entries].id = id;
timestamp_cache[timestamp_entries].time = ts_time; ts_cache[ts_entries].time = ts_time;
timestamp_entries++; car_set_var(timestamp_entries, ++ts_entries);
} }
static void timestamp_do_sync(void) static void timestamp_do_sync(void)
{ {
struct timestamp_cache *ts_cache = car_get_var(timestamp_cache);
int ts_entries = car_get_var(timestamp_entries);
int i; int i;
for (i = 0; i < timestamp_entries; i++) for (i = 0; i < ts_entries; i++)
timestamp_add(timestamp_cache[i].id, timestamp_cache[i].time); timestamp_add(ts_cache[i].id, ts_cache[i].time);
timestamp_entries = 0; car_set_var(timestamp_entries, 0);
} }
void timestamp_init(tsc_t base) void timestamp_init(tsc_t base)
@ -123,19 +131,19 @@ void timestamp_init(tsc_t base)
#ifdef __PRE_RAM__ #ifdef __PRE_RAM__
/* Copy of basetime, it is too early for CBMEM. */ /* Copy of basetime, it is too early for CBMEM. */
ts_basetime = base; car_set_var(ts_basetime, base);
#else #else
struct timestamp_table* tst; struct timestamp_table* tst;
/* Locate and use an already existing table. */ /* Locate and use an already existing table. */
tst = cbmem_find(CBMEM_ID_TIMESTAMP); tst = cbmem_find(CBMEM_ID_TIMESTAMP);
if (tst) { if (tst) {
ts_table = tst; car_set_var(ts_table_p, tst);
return; return;
} }
/* Copy of basetime, may be too early for CBMEM. */ /* Copy of basetime, may be too early for CBMEM. */
ts_basetime = base; car_set_var(ts_basetime, base);
timestamp_real_init(base); timestamp_real_init(base);
#endif #endif
} }
@ -146,12 +154,12 @@ void timestamp_reinit(void)
return; return;
#ifdef __PRE_RAM__ #ifdef __PRE_RAM__
timestamp_real_init(ts_basetime); timestamp_real_init(car_get_var(ts_basetime));
#else #else
if (!ts_table) if (!car_get_var(ts_table_p))
timestamp_init(ts_basetime); timestamp_init(car_get_var(ts_basetime));
#endif #endif
if (ts_table) if (car_get_var(ts_table_p))
timestamp_do_sync(); timestamp_do_sync();
} }