summaryrefslogtreecommitdiffstats
path: root/arch/x86/cpu/interrupts.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-02-28 19:26:12 +0000
committerSimon Glass <sjg@chromium.org>2013-03-04 15:57:36 -0800
commitbc2df1afb92435da6fb16310dac6b722bfaade9f (patch)
treecd10c393aba37399a0e80a3045a0543e44176003 /arch/x86/cpu/interrupts.c
parent8937140957eb91060b766781bb3a9e2b191529a5 (diff)
downloadtalos-obmc-uboot-bc2df1afb92435da6fb16310dac6b722bfaade9f.tar.gz
talos-obmc-uboot-bc2df1afb92435da6fb16310dac6b722bfaade9f.zip
x86: Permit bootstage and timer data to be used prior to relocation
It is useful to be able to access the timer before U-Boot has relocated so that we can fully support bootstage. Add new global_data members to support this. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/cpu/interrupts.c')
-rw-r--r--arch/x86/cpu/interrupts.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/cpu/interrupts.c b/arch/x86/cpu/interrupts.c
index dd30a05a9d..6dc74e34c6 100644
--- a/arch/x86/cpu/interrupts.c
+++ b/arch/x86/cpu/interrupts.c
@@ -626,13 +626,12 @@ asm(".globl irq_common_entry\n" \
*/
u64 get_ticks(void)
{
- static u64 tick_base;
u64 now_tick = rdtsc();
- if (!tick_base)
- tick_base = now_tick;
+ if (!gd->arch.tsc_base)
+ gd->arch.tsc_base = now_tick;
- return now_tick - tick_base;
+ return now_tick - gd->arch.tsc_base;
}
#define PLATFORM_INFO_MSR 0xce
OpenPOWER on IntegriCloud