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>
This commit is contained in:
Kyösti Mälkki 2020-06-27 14:25:20 +03:00 committed by Patrick Georgi
parent 07a4e56e75
commit d4174b5f02
4 changed files with 8 additions and 20 deletions

View file

@ -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) int mainboard_smi_apmc(u8 apmc)
{ {
printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc); printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc);
switch (apmc) { switch (apmc) {
case APMC_ACPI_EN: case APM_CNT_ACPI_ENABLE:
printk(BIOS_DEBUG, "APMC: ACPI_EN\n"); printk(BIOS_DEBUG, "APMC: ACPI_EN\n");
/* Clear all pending events and enable SCI */ /* Clear all pending events and enable SCI */
ec_write_cmd(EC_CMD_ENABLE_ACPI_MODE); ec_write_cmd(EC_CMD_ENABLE_ACPI_MODE);
break; break;
case APMC_ACPI_DIS: case APM_CNT_ACPI_DISABLE:
printk(BIOS_DEBUG, "APMC: ACPI_DIS\n"); printk(BIOS_DEBUG, "APMC: ACPI_DIS\n");
/* Clear all pending events and tell the EC that ACPI is disabled */ /* Clear all pending events and tell the EC that ACPI is disabled */
ec_write_cmd(EC_CMD_DISABLE_ACPI_MODE); ec_write_cmd(EC_CMD_DISABLE_ACPI_MODE);

View file

@ -76,19 +76,16 @@ void mainboard_smi_sleep(u8 slp_typ)
google_chromeec_set_wake_mask(LINK_EC_S3_WAKE_EVENTS); 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) int mainboard_smi_apmc(u8 apmc)
{ {
switch (apmc) { switch (apmc) {
case APMC_ACPI_EN: case APM_CNT_ACPI_ENABLE:
google_chromeec_set_smi_mask(0); google_chromeec_set_smi_mask(0);
/* Clear all pending events */ /* Clear all pending events */
while (google_chromeec_get_event() != 0); while (google_chromeec_get_event() != 0);
google_chromeec_set_sci_mask(LINK_EC_SCI_EVENTS); google_chromeec_set_sci_mask(LINK_EC_SCI_EVENTS);
break; break;
case APMC_ACPI_DIS: case APM_CNT_ACPI_DISABLE:
google_chromeec_set_sci_mask(0); google_chromeec_set_sci_mask(0);
/* Clear all pending events */ /* Clear all pending events */
while (google_chromeec_get_event() != 0); while (google_chromeec_get_event() != 0);

View file

@ -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) int mainboard_smi_apmc(u8 apmc)
{ {
printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc); printk(BIOS_DEBUG, "mainboard_smi_apmc: %x\n", apmc);
switch (apmc) { switch (apmc) {
case APMC_ACPI_EN: case APM_CNT_ACPI_ENABLE:
printk(BIOS_DEBUG, "APMC: ACPI_EN\n"); printk(BIOS_DEBUG, "APMC: ACPI_EN\n");
/* Clear all pending events */ /* Clear all pending events */
/* EC cmd:59 data:E8 */ /* EC cmd:59 data:E8 */
@ -85,7 +82,7 @@ int mainboard_smi_apmc(u8 apmc)
/* Set LID GPI to generate SCIs */ /* Set LID GPI to generate SCIs */
gpi_route_interrupt(EC_LID_GPI, GPI_IS_SCI); gpi_route_interrupt(EC_LID_GPI, GPI_IS_SCI);
break; break;
case APMC_ACPI_DIS: case APM_CNT_ACPI_DISABLE:
printk(BIOS_DEBUG, "APMC: ACPI_DIS\n"); printk(BIOS_DEBUG, "APMC: ACPI_DIS\n");
/* Clear all pending events */ /* Clear all pending events */
/* EC cmd:59 data:e9 */ /* EC cmd:59 data:e9 */

View file

@ -70,22 +70,19 @@ void mainboard_smi_sleep(u8 slp_typ)
ec_it8518_enable_wake_events(); ec_it8518_enable_wake_events();
} }
#define APMC_ACPI_EN 0xe1
#define APMC_ACPI_DIS 0x1e
int mainboard_smi_apmc(u8 apmc) int mainboard_smi_apmc(u8 apmc)
{ {
switch (apmc) { switch (apmc) {
case APM_CNT_FINALIZE: case APM_CNT_FINALIZE:
stout_ec_finalize_smm(); stout_ec_finalize_smm();
break; break;
case APMC_ACPI_EN: case APM_CNT_ACPI_ENABLE:
/* /*
* TODO(kimarie) Clear all pending events and enable SCI. * TODO(kimarie) Clear all pending events and enable SCI.
*/ */
ec_write_cmd(EC_CMD_NOTIFY_ACPI_ENTER); ec_write_cmd(EC_CMD_NOTIFY_ACPI_ENTER);
break; break;
case APMC_ACPI_DIS: case APM_CNT_ACPI_DISABLE:
/* /*
* TODO(kimarie) Clear all pending events and enable SMI. * TODO(kimarie) Clear all pending events and enable SMI.
*/ */