From 67cbfedb334db0df7395cc48ccd6bacb2a86a30d Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 10 Mar 2020 11:22:45 +0100 Subject: timer: add tsctimer_setfreq() Add function to set tsc frequency directly, without calibration. Also tweak timer setup functions a bit: skip setup in case TimerPort has not the default value any more, i.e. another timer has been setup already. Signed-off-by: Gerd Hoffmann Message-id: 20200310102248.28412-1-kraxel@redhat.com --- src/hw/timer.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'src/hw') diff --git a/src/hw/timer.c b/src/hw/timer.c index bdcb3bf..56bb289 100644 --- a/src/hw/timer.c +++ b/src/hw/timer.c @@ -101,8 +101,10 @@ tsctimer_setup(void) void timer_setup(void) { - if (!CONFIG_TSC_TIMER || (CONFIG_PMTIMER && TimerPort != PORT_PIT_COUNTER0)) + if (!CONFIG_TSC_TIMER) return; + if (TimerPort != PORT_PIT_COUNTER0) + return; // have timer already // Check if CPU has a timestamp counter u32 eax, ebx, ecx, edx, cpuid_features = 0; @@ -114,10 +116,32 @@ timer_setup(void) } void +tsctimer_setfreq(u32 khz, const char *src) +{ + if (!CONFIG_TSC_TIMER) + return; + if (TimerPort != PORT_PIT_COUNTER0) + return; // have timer already + + TimerKHz = khz; + ShiftTSC = 0; + while (TimerKHz >= 6000) { + ShiftTSC++; + TimerKHz = (TimerKHz + 1) >> 1; + } + TimerPort = 0; + + dprintf(1, "CPU Mhz=%u (%s)\n", (TimerKHz << ShiftTSC) / 1000, src); +} + +void pmtimer_setup(u16 ioport) { if (!CONFIG_PMTIMER) return; + if (TimerPort != PORT_PIT_COUNTER0) + return; // have timer already + dprintf(1, "Using pmtimer, ioport 0x%x\n", ioport); TimerPort = ioport; TimerKHz = DIV_ROUND_UP(PMTIMER_HZ, 1000); -- cgit v1.1