>From 8799c75ad8f1c4b7573f5117dbf695f4b98a9131 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 10 Aug 2013 11:39:14 -0400 Subject: [PATCH 1/2] Minor cleanups to smm assembler. To: seabios@seabios.org Use size prefixes on assembler instructions. Split the relocation smm handler into a separate section from the main runtime smm handler. Signed-off-by: Kevin O'Connor --- src/smm.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/smm.c b/src/smm.c index a424a29..d8473fd 100644 --- a/src/smm.c +++ b/src/smm.c @@ -16,31 +16,35 @@ ASM32FLAT( ".global smm_relocation_start\n" ".global smm_relocation_end\n" - ".global smm_code_start\n" - ".global smm_code_end\n" - " .code16\n" + " .code16gcc\n" /* code to relocate SMBASE to 0xa0000 */ "smm_relocation_start:\n" - " mov $" __stringify(BUILD_SMM_INIT_ADDR) " + 0x7efc, %ebx\n" - " addr32 mov (%ebx), %al\n" /* revision ID to see if x86_64 or x86 */ - " cmp $0x64, %al\n" + " movl $" __stringify(BUILD_SMM_INIT_ADDR) " + 0x7efc, %ebx\n" + " addr32 movb (%ebx), %al\n" /* revision ID to see if x86_64 or x86 */ + " cmpb $0x64, %al\n" " je 1f\n" - " mov $" __stringify(BUILD_SMM_INIT_ADDR) " + 0x7ef8, %ebx\n" + " movl $" __stringify(BUILD_SMM_INIT_ADDR) " + 0x7ef8, %ebx\n" " jmp 2f\n" "1:\n" - " mov $" __stringify(BUILD_SMM_INIT_ADDR) " + 0x7f00, %ebx\n" + " movl $" __stringify(BUILD_SMM_INIT_ADDR) " + 0x7f00, %ebx\n" "2:\n" " movl $" __stringify(BUILD_SMM_ADDR) " - 0x8000, %eax\n" " addr32 movl %eax, (%ebx)\n" /* indicate to the BIOS that the SMM code was executed */ - " mov $0x00, %al\n" + " movb $0x00, %al\n" " movw $" __stringify(PORT_SMI_STATUS) ", %dx\n" " outb %al, %dx\n" " rsm\n" "smm_relocation_end:\n" + " .code32\n" + ); +ASM32FLAT( /* minimal SMM code to enable or disable ACPI */ + ".global smm_code_start\n" + ".global smm_code_end\n" + " .code16gcc\n" "smm_code_start:\n" " movw $" __stringify(PORT_SMI_CMD) ", %dx\n" " inb %dx, %al\n" @@ -48,7 +52,7 @@ ASM32FLAT( " jne 1f\n" /* ACPI disable */ - " mov $" __stringify(PORT_ACPI_PM_BASE) " + 0x04, %dx\n" /* PMCNTRL */ + " movw $" __stringify(PORT_ACPI_PM_BASE) " + 0x04, %dx\n" /* PMCNTRL */ " inw %dx, %ax\n" " andw $~1, %ax\n" " outw %ax, %dx\n" @@ -56,11 +60,11 @@ ASM32FLAT( " jmp 2f\n" "1:\n" - " cmp $0xf1, %al\n" + " cmpb $0xf1, %al\n" " jne 2f\n" /* ACPI enable */ - " mov $" __stringify(PORT_ACPI_PM_BASE) " + 0x04, %dx\n" /* PMCNTRL */ + " movw $" __stringify(PORT_ACPI_PM_BASE) " + 0x04, %dx\n" /* PMCNTRL */ " inw %dx, %ax\n" " orw $1, %ax\n" " outw %ax, %dx\n" -- 1.7.11.7