summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-18 13:46:31 +0300
committerPatrick Georgi <pgeorgi@google.com>2020-06-22 11:44:01 +0000
commit3fccec532279664b2c99464161b17a1a1fc42406 (patch)
tree12b912bacc9e14555ec69f6a34e42850e19f1921
parent40b39430939c545b01736d8a3b0581b3e8f88340 (diff)
cpu/x86/smm: Use already defined APM_CNT messages
Change-Id: Ie9635e10dffe2f5fbef7cfbd556c3152dee58ccc Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42616 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--src/mainboard/google/beltino/mainboard.c4
-rw-r--r--src/mainboard/google/jecht/mainboard.c4
-rw-r--r--src/mainboard/google/parrot/mainboard.c4
-rw-r--r--src/mainboard/google/slippy/mainboard.c4
-rw-r--r--src/mainboard/intel/baskingridge/mainboard.c4
-rw-r--r--src/mainboard/intel/wtm2/mainboard.c4
6 files changed, 12 insertions, 12 deletions
diff --git a/src/mainboard/google/beltino/mainboard.c b/src/mainboard/google/beltino/mainboard.c
index e343d6840b..4c2b3061a4 100644
--- a/src/mainboard/google/beltino/mainboard.c
+++ b/src/mainboard/google/beltino/mainboard.c
@@ -2,7 +2,7 @@
#include <types.h>
#include <acpi/acpi.h>
-#include <arch/io.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
@@ -12,7 +12,7 @@
void mainboard_suspend_resume(void)
{
/* Call SMM finalize() handlers before resume */
- outb(0xcb, 0xb2);
+ apm_control(APM_CNT_FINALIZE);
}
diff --git a/src/mainboard/google/jecht/mainboard.c b/src/mainboard/google/jecht/mainboard.c
index 63a9fefd65..786695d21e 100644
--- a/src/mainboard/google/jecht/mainboard.c
+++ b/src/mainboard/google/jecht/mainboard.c
@@ -1,14 +1,14 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
-#include <arch/io.h>
+#include <cpu/x86/smm.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "onboard.h"
void mainboard_suspend_resume(void)
{
/* Call SMM finalize() handlers before resume */
- outb(0xcb, 0xb2);
+ apm_control(APM_CNT_FINALIZE);
}
static void mainboard_init(struct device *dev)
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index e68a13bb2e..4e031d3dfb 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -1,10 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <types.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
#include <acpi/acpi.h>
-#include <arch/io.h>
#include "onboard.h"
#include "ec.h"
#include <southbridge/intel/bd82x6x/pch.h>
@@ -15,7 +15,7 @@
void mainboard_suspend_resume(void)
{
/* Enable ACPI mode before OS resume */
- outb(0xe1, 0xb2);
+ apm_control(APM_CNT_ACPI_ENABLE);
}
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index 9cab3a13ba..c6492ac19d 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -2,10 +2,10 @@
#include <types.h>
#include <smbios.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
#include <acpi/acpi.h>
-#include <arch/io.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "ec.h"
@@ -14,7 +14,7 @@
void mainboard_suspend_resume(void)
{
/* Call SMM finalize() handlers before resume */
- outb(0xcb, 0xb2);
+ apm_control(APM_CNT_FINALIZE);
}
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index 67299fd831..7111e8fbca 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -1,17 +1,17 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <types.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
#include <acpi/acpi.h>
-#include <arch/io.h>
#include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
void mainboard_suspend_resume(void)
{
/* Call SMM finalize() handlers before resume */
- outb(0xcb, 0xb2);
+ apm_control(APM_CNT_FINALIZE);
}
// mainboard_enable is executed as first thing after
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index 180a36228a..c0a5764e58 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -1,16 +1,16 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <types.h>
+#include <cpu/x86/smm.h>
#include <device/device.h>
#include <drivers/intel/gma/int15.h>
#include <acpi/acpi.h>
-#include <arch/io.h>
#include <vendorcode/google/chromeos/chromeos.h>
void mainboard_suspend_resume(void)
{
/* Call SMM finalize() handlers before resume */
- outb(0xcb, 0xb2);
+ apm_control(APM_CNT_FINALIZE);
}
// mainboard_enable is executed as first thing after