diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-27 14:25:20 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-06-30 05:42:26 +0000 |
| commit | d4174b5f0275ac600eafe6d8965f3bd44c4b15cc (patch) | |
| tree | a13f3410012d8e800c2d8646c1c0f9c5303ba721 | |
| parent | 07a4e56e7568720d561cfd788cc342a3901a6628 (diff) | |
mb/google: Drop aliases for APM_CNT_ACPI_xx
Use defines found in <cpu/x86/smm.h>.
Change-Id: Ib75df13021120fb2c056782c252e97d6b036c7da
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42848
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | src/mainboard/google/butterfly/mainboard_smi.c | 7 | ||||
| -rw-r--r-- | src/mainboard/google/link/mainboard_smi.c | 7 | ||||
| -rw-r--r-- | src/mainboard/google/parrot/smihandler.c | 7 | ||||
| -rw-r--r-- | src/mainboard/google/stout/mainboard_smi.c | 7 |
4 files changed, 8 insertions, 20 deletions
diff --git a/src/mainboard/google/butterfly/mainboard_smi.c b/src/mainboard/google/butterfly/mainboard_smi.c index ab0c5b272a..d4f2b99017 100644 --- a/src/mainboard/google/butterfly/mainboard_smi.c +++ b/src/mainboard/google/butterfly/mainboard_smi.c @@ -33,20 +33,17 @@ void mainboard_smi_sleep(u8 slp_typ) } } -#define APMC_ACPI_EN 0xe1 -#define APMC_ACPI_DIS 0x1e - int mainboard_smi_apmc(u8 apmc) { printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc); switch (apmc) { - case APMC_ACPI_EN: + case APM_CNT_ACPI_ENABLE: printk(BIOS_DEBUG, "APMC: ACPI_EN\n"); /* Clear all pending events and enable SCI */ ec_write_cmd(EC_CMD_ENABLE_ACPI_MODE); break; - case APMC_ACPI_DIS: + case APM_CNT_ACPI_DISABLE: printk(BIOS_DEBUG, "APMC: ACPI_DIS\n"); /* Clear all pending events and tell the EC that ACPI is disabled */ ec_write_cmd(EC_CMD_DISABLE_ACPI_MODE); diff --git a/src/mainboard/google/link/mainboard_smi.c b/src/mainboard/google/link/mainboard_smi.c index 88992713cc..e7ec33289d 100644 --- a/src/mainboard/google/link/mainboard_smi.c +++ b/src/mainboard/google/link/mainboard_smi.c @@ -76,19 +76,16 @@ void mainboard_smi_sleep(u8 slp_typ) google_chromeec_set_wake_mask(LINK_EC_S3_WAKE_EVENTS); } -#define APMC_ACPI_EN 0xe1 -#define APMC_ACPI_DIS 0x1e - int mainboard_smi_apmc(u8 apmc) { switch (apmc) { - case APMC_ACPI_EN: + case APM_CNT_ACPI_ENABLE: google_chromeec_set_smi_mask(0); /* Clear all pending events */ while (google_chromeec_get_event() != 0); google_chromeec_set_sci_mask(LINK_EC_SCI_EVENTS); break; - case APMC_ACPI_DIS: + case APM_CNT_ACPI_DISABLE: google_chromeec_set_sci_mask(0); /* Clear all pending events */ while (google_chromeec_get_event() != 0); diff --git a/src/mainboard/google/parrot/smihandler.c b/src/mainboard/google/parrot/smihandler.c index a71b2a30df..abfe3a3b18 100644 --- a/src/mainboard/google/parrot/smihandler.c +++ b/src/mainboard/google/parrot/smihandler.c @@ -68,14 +68,11 @@ void mainboard_smi_sleep(u8 slp_typ) } } -#define APMC_ACPI_EN 0xe1 -#define APMC_ACPI_DIS 0x1e - int mainboard_smi_apmc(u8 apmc) { printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc); switch (apmc) { - case APMC_ACPI_EN: + case APM_CNT_ACPI_ENABLE: printk(BIOS_DEBUG, "APMC: ACPI_EN\n"); /* Clear all pending events */ /* EC cmd:59 data:E8 */ @@ -85,7 +82,7 @@ int mainboard_smi_apmc(u8 apmc) /* Set LID GPI to generate SCIs */ gpi_route_interrupt(EC_LID_GPI, GPI_IS_SCI); break; - case APMC_ACPI_DIS: + case APM_CNT_ACPI_DISABLE: printk(BIOS_DEBUG, "APMC: ACPI_DIS\n"); /* Clear all pending events */ /* EC cmd:59 data:e9 */ diff --git a/src/mainboard/google/stout/mainboard_smi.c b/src/mainboard/google/stout/mainboard_smi.c index 9c2aff8217..cf7fcaea65 100644 --- a/src/mainboard/google/stout/mainboard_smi.c +++ b/src/mainboard/google/stout/mainboard_smi.c @@ -70,22 +70,19 @@ void mainboard_smi_sleep(u8 slp_typ) ec_it8518_enable_wake_events(); } -#define APMC_ACPI_EN 0xe1 -#define APMC_ACPI_DIS 0x1e - int mainboard_smi_apmc(u8 apmc) { switch (apmc) { case APM_CNT_FINALIZE: stout_ec_finalize_smm(); break; - case APMC_ACPI_EN: + case APM_CNT_ACPI_ENABLE: /* * TODO(kimarie) Clear all pending events and enable SCI. */ ec_write_cmd(EC_CMD_NOTIFY_ACPI_ENTER); break; - case APMC_ACPI_DIS: + case APM_CNT_ACPI_DISABLE: /* * TODO(kimarie) Clear all pending events and enable SMI. */ |