From c4fbc9146dae55763ac0089644138c0ccb370897 Mon Sep 17 00:00:00 2001 From: Felix Held Date: Thu, 14 Dec 2023 20:59:54 +0100 Subject: [PATCH] cpu/x86/smi_trigger: call pm_acpi_smi_cmd_port to get APMC SMI IO port Instead of hard-coding the APMC SMI command IO port in the FADT, call pm_acpi_smi_cmd_port() to get the APMC SMI command IO port. Also update the comment in apm_get_apmc to match what it's doing. Signed-off-by: Felix Held Change-Id: I0f36b8a0e93a82b8c6d23c5c5d8fbebb1bc6b0bc Reviewed-on: https://review.coreboot.org/c/coreboot/+/79567 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/cpu/x86/smi_trigger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/x86/smi_trigger.c b/src/cpu/x86/smi_trigger.c index 470ecde8b0..9781642c74 100644 --- a/src/cpu/x86/smi_trigger.c +++ b/src/cpu/x86/smi_trigger.c @@ -38,7 +38,7 @@ int apm_control(u8 cmd) apmc_log(__func__, cmd); /* Now raise the SMI. */ - outb(cmd, APM_CNT); + outb(cmd, pm_acpi_smi_cmd_port()); printk(BIOS_DEBUG, "APMC done.\n"); return 0; @@ -46,8 +46,8 @@ int apm_control(u8 cmd) u8 apm_get_apmc(void) { - /* Emulate B2 register as the FADT / Linux expects it */ - u8 cmd = inb(APM_CNT); + /* Read command byte from APMC SMI IO port */ + u8 cmd = inb(pm_acpi_smi_cmd_port()); apmc_log("SMI#", cmd); return cmd;