diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2015-03-11 17:45:47 -0400 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-03-13 10:02:17 +0100 |
| commit | 4adadbde6904807de2e990c0af839ad0cc977806 (patch) | |
| tree | a81de956cd7fd8960e4b7523f41c93444717f0e9 | |
| parent | f16479727d131feff2d023bf005cf656c32dce2e (diff) | |
| download | seabios-4adadbde6904807de2e990c0af839ad0cc977806.zip seabios-4adadbde6904807de2e990c0af839ad0cc977806.tar.gz seabios-4adadbde6904807de2e990c0af839ad0cc977806.tar.bz2 | |
smp: Fix smp race introduced in 0673b787rel-1.8.1
In 0673b787 the QEMU SMP init code was changed to run in 32bit mode.
Unfortunately, the transition32 assembler function is not
multi-processor safe, because it modifies the global RTC index
register. This race condition led to sporadic failures when emulating
machines with a large number of processors.
This patch changes the entry_smp code to use a variant of transition32
that does not touch the RTC registers.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
(cherry picked from commit 5ae3dd6f74e17a7cd06165a75214798b0c606115)
| -rw-r--r-- | src/romlayout.S | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/romlayout.S b/src/romlayout.S index 6b3aabd..93b6874 100644 --- a/src/romlayout.S +++ b/src/romlayout.S @@ -22,7 +22,8 @@ // %edx = return location (in 32bit mode) // Clobbers: ecx, flags, segment registers, cr0, idt/gdt DECLFUNC transition32 -transition32_for_smi: +transition32_nmi_off: + // transition32 when NMI and A20 are already initialized movl %eax, %ecx jmp 1f transition32: @@ -205,7 +206,7 @@ __farcall16: entry_smi: // Transition to 32bit mode. movl $1f + BUILD_BIOS_ADDR, %edx - jmp transition32_for_smi + jmp transition32_nmi_off .code32 1: movl $BUILD_SMM_ADDR + 0x8000, %esp calll _cfunc32flat_handle_smi - BUILD_BIOS_ADDR @@ -216,8 +217,10 @@ entry_smi: DECLFUNC entry_smp entry_smp: // Transition to 32bit mode. + cli + cld movl $2f + BUILD_BIOS_ADDR, %edx - jmp transition32 + jmp transition32_nmi_off .code32 // Acquire lock and take ownership of shared stack 1: rep ; nop |