From 3fccec532279664b2c99464161b17a1a1fc42406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 18 Jun 2020 13:46:31 +0300 Subject: cpu/x86/smm: Use already defined APM_CNT messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ie9635e10dffe2f5fbef7cfbd556c3152dee58ccc Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/42616 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/google/beltino/mainboard.c | 4 ++-- src/mainboard/google/jecht/mainboard.c | 4 ++-- src/mainboard/google/parrot/mainboard.c | 4 ++-- src/mainboard/google/slippy/mainboard.c | 4 ++-- src/mainboard/intel/baskingridge/mainboard.c | 4 ++-- src/mainboard/intel/wtm2/mainboard.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/mainboard') 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 #include -#include +#include #include #include #include @@ -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 -#include +#include #include #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 +#include #include #include #include -#include #include "onboard.h" #include "ec.h" #include @@ -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 #include +#include #include #include #include -#include #include #include #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 +#include #include #include #include -#include #include #include 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 +#include #include #include #include -#include #include 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 -- cgit v1.2.3