Sandybridge: Fix integer overrun in romstage udelay()

This was broken, fixing according to related patch for i945

Change-Id: I925cd205ee5beb918181740a7b981a4209688ac6
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1412
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer 2012-07-25 16:15:25 -07:00 committed by Ronald G. Minnich
parent 0db6820b10
commit 7874e9dcfc
1 changed files with 16 additions and 6 deletions

View File

@ -23,9 +23,22 @@
#include <cpu/x86/msr.h>
/**
* Intel Core(tm) cpus always run the TSC at the maximum possible CPU clock
* Intel SandyBridge/IvyBridge CPUs always run the TSC at BCLK=100MHz
*/
/* Simple 32- to 64-bit multiplication. Uses 16-bit words to avoid overflow.
* This code is used to prevent use of libgcc's umoddi3.
*/
static inline void multiply_to_tsc(tsc_t *const tsc, const u32 a, const u32 b)
{
tsc->lo = (a & 0xffff) * (b & 0xffff);
tsc->hi = ((tsc->lo >> 16)
+ ((a & 0xffff) * (b >> 16))
+ ((b & 0xffff) * (a >> 16)));
tsc->lo = ((tsc->hi & 0xffff) << 16) | (tsc->lo & 0xffff);
tsc->hi = ((a >> 16) * (b >> 16)) + (tsc->hi >> 16);
}
void udelay(u32 us)
{
u32 dword;
@ -33,15 +46,12 @@ void udelay(u32 us)
msr_t msr;
u32 fsb = 100, divisor;
u32 d; /* ticks per us */
u32 dn = 0x1000000 / 2; /* how many us before we need to use hi */
msr = rdmsr(0xce);
divisor = (msr.lo >> 8) & 0xff;
d = fsb * divisor;
tscd.hi = us / dn;
tscd.lo = (us - tscd.hi * dn) * d;
d = fsb * divisor; /* On Core/Core2 this is divided by 4 */
multiply_to_tsc(&tscd, us, d);
tsc1 = rdtsc();
dword = tsc1.lo + tscd.lo;