From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 15 May 2014 11:22:27 +0000 (+0200)
Subject: smm: remove code to handle ACPI disable/enable
X-Git-Tag: rel-1.7.5~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4a3f195dff861cc3283c5a5ca35c9a2dad94405d;p=seabios.git

smm: remove code to handle ACPI disable/enable

This is handled already in QEMU, no need to do it in SMM.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/src/fw/smm.c b/src/fw/smm.c
index 1032ffb..5ae6f32 100644
--- a/src/fw/smm.c
+++ b/src/fw/smm.c
@@ -45,34 +45,9 @@ ASM32FLAT(
 
 extern u8 smm_code_start, smm_code_end;
 ASM32FLAT(
-    /* minimal SMM code to enable or disable ACPI */
     ".global smm_code_start, smm_code_end\n"
     "  .code16gcc\n"
     "smm_code_start:\n"
-    "  movw $" __stringify(PORT_SMI_CMD) ", %dx\n"
-    "  inb %dx, %al\n"
-    "  cmpb $0xf0, %al\n"
-    "  jne 1f\n"
-
-    /* ACPI disable */
-    "  movw $" __stringify(PORT_ACPI_PM_BASE) " + 0x04, %dx\n" /* PMCNTRL */
-    "  inw %dx, %ax\n"
-    "  andw $~1, %ax\n"
-    "  outw %ax, %dx\n"
-
-    "  jmp 2f\n"
-
-    "1:\n"
-    "  cmpb $0xf1, %al\n"
-    "  jne 2f\n"
-
-    /* ACPI enable */
-    "  movw $" __stringify(PORT_ACPI_PM_BASE) " + 0x04, %dx\n" /* PMCNTRL */
-    "  inw %dx, %ax\n"
-    "  orw $1, %ax\n"
-    "  outw %ax, %dx\n"
-
-    "2:\n"
     "  rsm\n"
     "smm_code_end:\n"
     "  .code32\n"