From 74beb5de844e054dc1a08169e6cccaf53e04c5db Mon Sep 17 00:00:00 2001 From: Felix Held Date: Mon, 8 Jan 2024 17:02:23 +0100 Subject: sb/amd/pi/hudson/smhandler: use common APM_CNT_ACPI_* defines The Hudson southbridge code for the AMD binaryPI SoCs had its own ACPI enable and disable APMC command numbers that didn't match the common defines in coreboot, so use the common define here to be consistent with the command numbers in the corresponding FADT fields. Since the only SoC that still would use this code doesn't select HAVE_SMI_HANDLER, this won't fix any observable bug, but better fix this before anyone possibly runs into this. Signed-off-by: Felix Held Change-Id: I5e596071e1b5269b616b7a93151648cb86ae77bc Reviewed-on: https://review.coreboot.org/c/coreboot/+/79848 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- src/southbridge/amd/pi/hudson/hudson.h | 2 -- src/southbridge/amd/pi/hudson/smihandler.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/southbridge/amd/pi/hudson/hudson.h b/src/southbridge/amd/pi/hudson/hudson.h index 510cdd0e32..96a5367a44 100644 --- a/src/southbridge/amd/pi/hudson/hudson.h +++ b/src/southbridge/amd/pi/hudson/hudson.h @@ -45,8 +45,6 @@ #define ACPI_SCI_IRQ 9 #define ACPI_SMI_CTL_PORT 0xb2 -#define ACPI_SMI_CMD_DISABLE 0xbe -#define ACPI_SMI_CMD_ENABLE 0xef #define REV_HUDSON_A11 0x11 #define REV_HUDSON_A12 0x12 diff --git a/src/southbridge/amd/pi/hudson/smihandler.c b/src/southbridge/amd/pi/hudson/smihandler.c index 429d07a4c7..966550fd88 100644 --- a/src/southbridge/amd/pi/hudson/smihandler.c +++ b/src/southbridge/amd/pi/hudson/smihandler.c @@ -28,12 +28,12 @@ static void hudson_apmc_smi_handler(void) const uint8_t cmd = inb(ACPI_SMI_CTL_PORT); switch (cmd) { - case ACPI_SMI_CMD_ENABLE: + case APM_CNT_ACPI_ENABLE: reg32 = inl(ACPI_PM1_CNT_BLK); reg32 |= (1 << 0); /* SCI_EN */ outl(reg32, ACPI_PM1_CNT_BLK); break; - case ACPI_SMI_CMD_DISABLE: + case APM_CNT_ACPI_DISABLE: reg32 = inl(ACPI_PM1_CNT_BLK); reg32 &= ~(1 << 0); /* clear SCI_EN */ outl(ACPI_PM1_CNT_BLK, reg32); -- cgit v1.2.3