diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-09-16 12:25:59 +0300 |
|---|---|---|
| committer |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-16 16:00:50 -0300 |
| commit | 56a3d1c79c0a4c8f7c7c668a32fe367b24e238b6 (patch) | |
| tree | a2331ca6920977ddd3d95079519964c8674506ae /kvm | |
| parent | test: Move apic functions to libcflat (diff) | |
| download | qemu-kvm-56a3d1c79c0a4c8f7c7c668a32fe367b24e238b6.tar.gz qemu-kvm-56a3d1c79c0a4c8f7c7c668a32fe367b24e238b6.tar.bz2 qemu-kvm-56a3d1c79c0a4c8f7c7c668a32fe367b24e238b6.zip | |
test: switch 64-bit smp startup to real APIC
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'kvm')
| -rw-r--r-- | kvm/user/test/x86/cstart64.S | 74 |
1 files changed, 43 insertions, 31 deletions
diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index 14bb98c97..278465b8f 100644 --- a/kvm/user/test/x86/cstart64.S +++ b/kvm/user/test/x86/cstart64.S @@ -107,10 +107,42 @@ efer = 0xc0000080 mov %eax, %cr0 ret +smp_stacktop: .long 0xa0000 -smp_init_ipi: +.align 16 + +gdt32: + .quad 0 + .quad 0x00cf9b000000ffff // flat 32-bit code segment + .quad 0x00cf93000000ffff // flat 32-bit data segment +gdt32_end: + +.code16 +sipi_entry: + mov %cr0, %eax + or $1, %eax + mov %eax, %cr0 + lgdtl gdt32_descr - sipi_entry + ljmpl $8, $ap_start32 + +gdt32_descr: + .word gdt32_end - gdt32 - 1 + .long gdt32 + +sipi_end: + +.code32 +ap_start32: + mov $0x10, %ax + mov %ax, %ds + mov %ax, %es + mov %ax, %fs + mov %ax, %gs + mov %ax, %ss + mov $-4096, %esp + lock/xaddl %esp, smp_stacktop call prepare_64 - jmpl $8, $ap_start64 + ljmpl $8, $ap_start64 .code64 ap_start64: @@ -151,34 +183,14 @@ load_tss: ret smp_init: -#if 0 - lea boot_idt + ipi_vector * 8, %rdi - mov $smp_init_ipi, %eax - mov %ax, (%rdi) - mov %cs, %ax - mov %ax, 2(%rdi) - movw $0x8e00, 4(%rdi) - shr $16, %eax - mov %ax, 6(%rdi) - - mov $(APIC_BASE + APIC_REG_IPI_VECTOR), %dx - mov $ipi_vector, %eax - out %eax, %dx - - mov $(APIC_BASE + APIC_REG_NCPU), %dx - in %dx, %eax - mov %eax, %ecx - mov $1, %esi -smp_loop: - cmp %esi, %ecx - je smp_init_done - - mov $(APIC_BASE + APIC_REG_SEND_IPI), %dx - mov %esi, %eax - out %eax, %dx - - inc %esi - jmp smp_loop + cld + lea sipi_entry, %rsi + xor %rdi, %rdi + mov $(sipi_end - sipi_entry), %rcx + rep/movsb + mov $APIC_DEFAULT_PHYS_BASE, %eax + movl $(APIC_DEST_ALLBUT | APIC_DEST_PHYSICAL | APIC_DM_INIT | APIC_INT_ASSERT), APIC_ICR(%rax) + movl $(APIC_DEST_ALLBUT | APIC_DEST_PHYSICAL | APIC_DM_INIT), APIC_ICR(%rax) + movl $(APIC_DEST_ALLBUT | APIC_DEST_PHYSICAL | APIC_DM_STARTUP), APIC_ICR(%rax) smp_init_done: -#endif ret |