Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/71614 )
Change subject: [WIP] soc/amd: Change CPU ASL for p-states ......................................................................
[WIP] soc/amd: Change CPU ASL for p-states
CB:20910 and CB:19723 identify these as copy-pasted work.
I tracked this back to CB:53 and CB:54 where a literal constant 0x810 matched with a block of 6 bytes at offset 0x10 from (SB900_)ACPI_IO_BASE named ACPI_CPU_CONTROL.
Change-Id: I886a40ea9d58da102fe21f5f0018ac22b562e1f5 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/amd/cezanne/acpi.c M src/soc/amd/common/block/include/amdblocks/acpi.h M src/soc/amd/glinda/acpi.c M src/soc/amd/glinda/include/soc/iomap.h M src/soc/amd/mendocino/acpi.c M src/soc/amd/morgana/acpi.c M src/soc/amd/picasso/acpi.c M src/soc/amd/stoneyridge/acpi.c 8 files changed, 24 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/71614/1
diff --git a/src/soc/amd/cezanne/acpi.c b/src/soc/amd/cezanne/acpi.c index 802476e..aeed8ca 100644 --- a/src/soc/amd/cezanne/acpi.c +++ b/src/soc/amd/cezanne/acpi.c @@ -297,7 +297,7 @@ if (cpu == 0) { /* BSP values for _SB.Pxxx */ proc_blk_len = 6; - proc_blk_addr = ACPI_GPE0_BLK; + proc_blk_addr = ACPI_CPU_CONTROL; } else { /* AP values for _SB.Pxxx */ proc_blk_addr = 0; diff --git a/src/soc/amd/common/block/include/amdblocks/acpi.h b/src/soc/amd/common/block/include/amdblocks/acpi.h index 3dd8418..2d2d806 100644 --- a/src/soc/amd/common/block/include/amdblocks/acpi.h +++ b/src/soc/amd/common/block/include/amdblocks/acpi.h @@ -14,6 +14,7 @@ #define MMIO_ACPI_PM1_CNT_BLK 0x04 /* sleep types defined in include/acpi/acpi.h */ #define ACPI_PM1_CNT_SCIEN BIT(0) + #define MMIO_ACPI_PM_TMR_BLK 0x08 #define MMIO_ACPI_CPU_CONTROL 0x0c #define MMIO_ACPI_GPE0_BLK 0x14 diff --git a/src/soc/amd/glinda/acpi.c b/src/soc/amd/glinda/acpi.c index 0c95494..3eb4cde 100644 --- a/src/soc/amd/glinda/acpi.c +++ b/src/soc/amd/glinda/acpi.c @@ -300,7 +300,7 @@ if (cpu == 0) { /* BSP values for _SB.Pxxx */ proc_blk_len = 6; - proc_blk_addr = ACPI_GPE0_BLK; + proc_blk_addr = ACPI_CPU_CONTROL; } else { /* AP values for _SB.Pxxx */ proc_blk_addr = 0; diff --git a/src/soc/amd/glinda/include/soc/iomap.h b/src/soc/amd/glinda/include/soc/iomap.h index bb8588c..b4a3d05 100644 --- a/src/soc/amd/glinda/include/soc/iomap.h +++ b/src/soc/amd/glinda/include/soc/iomap.h @@ -49,6 +49,7 @@ #define ACPI_PM1_STS (ACPI_PM_EVT_BLK + 0x00) #define ACPI_PM1_EN (ACPI_PM_EVT_BLK + 0x02) #define ACPI_PM1_CNT_BLK (ACPI_IO_BASE + 0x04) + #define ACPI_PM_TMR_BLK (ACPI_IO_BASE + 0x08) #define ACPI_CPU_CONTROL (ACPI_IO_BASE + 0x10) #define ACPI_GPE0_BLK (ACPI_IO_BASE + 0x20) diff --git a/src/soc/amd/mendocino/acpi.c b/src/soc/amd/mendocino/acpi.c index d30fb85..7863641 100644 --- a/src/soc/amd/mendocino/acpi.c +++ b/src/soc/amd/mendocino/acpi.c @@ -299,7 +299,7 @@ if (cpu == 0) { /* BSP values for _SB.Pxxx */ proc_blk_len = 6; - proc_blk_addr = ACPI_GPE0_BLK; + proc_blk_addr = ACPI_CPU_CONTROL; } else { /* AP values for _SB.Pxxx */ proc_blk_addr = 0; diff --git a/src/soc/amd/morgana/acpi.c b/src/soc/amd/morgana/acpi.c index 15b64c5..ab37cbb 100644 --- a/src/soc/amd/morgana/acpi.c +++ b/src/soc/amd/morgana/acpi.c @@ -300,7 +300,7 @@ if (cpu == 0) { /* BSP values for _SB.Pxxx */ proc_blk_len = 6; - proc_blk_addr = ACPI_GPE0_BLK; + proc_blk_addr = ACPI_CPU_CONTROL; } else { /* AP values for _SB.Pxxx */ proc_blk_addr = 0; diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 6d46698..db359cb 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -292,7 +292,7 @@ if (cpu == 0) { /* BSP values for _SB.Pxxx */ proc_blk_len = 6; - proc_blk_addr = ACPI_GPE0_BLK; + proc_blk_addr = ACPI_CPU_CONTROL; } else { /* AP values for _SB.Pxxx */ proc_blk_addr = 0; diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c index cc0194b..0586950 100644 --- a/src/soc/amd/stoneyridge/acpi.c +++ b/src/soc/amd/stoneyridge/acpi.c @@ -108,7 +108,7 @@ printk(BIOS_DEBUG, "ACPI \_SB report %d core(s)\n", cores);
/* Generate BSP _SB.P000 */ - acpigen_write_processor(0, ACPI_GPE0_BLK, 6); + acpigen_write_processor(0, ACPI_CPU_CONTROL, 6); acpigen_pop_len();
/* Generate AP _SB.Pxxx */