diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2021-01-27 20:22:33 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-02-01 08:54:23 +0000 |
| commit | da321d883468f1306dc6105d3d924b12cb43fa06 (patch) | |
| tree | f5ab0c84bd3dcb89cba36eb765fc3192b85454dc /src/soc/amd/picasso | |
| parent | 460b4f8dfd37cb06fe2a60c57abcc2b2564f8100 (diff) | |
soc/amd: Drop PCNT from GNVS
It's a static value that is neither referenced from SMI handler
nor needs to be updated on S3 resume path.
Change-Id: Iab2741242b0e2df8a0429ffaad270ce21882588c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50119
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/soc/amd/picasso')
| -rw-r--r-- | src/soc/amd/picasso/acpi.c | 7 | ||||
| -rw-r--r-- | src/soc/amd/picasso/acpi/cpu.asl | 1 | ||||
| -rw-r--r-- | src/soc/amd/picasso/acpi/globalnvs.asl | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/nvs.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index ed2be4845c..ebb2bcd195 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -384,6 +384,10 @@ void generate_cpu_entries(const struct device *device) acpigen_pop_len(); } + + acpigen_write_scope("\\"); + acpigen_write_name_integer("PCNT", logical_cores); + acpigen_pop_len(); } unsigned long southbridge_write_acpi_tables(const struct device *device, @@ -398,9 +402,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Set unknown wake source */ gnvs->pm1i = ~0ULL; gnvs->gpei = ~0ULL; - - /* CPU core count */ - gnvs->pcnt = dev_count_cpu(); } static int acpigen_soc_gpio_op(const char *op, unsigned int gpio_num) diff --git a/src/soc/amd/picasso/acpi/cpu.asl b/src/soc/amd/picasso/acpi/cpu.asl index e1b7498f09..294d89f481 100644 --- a/src/soc/amd/picasso/acpi/cpu.asl +++ b/src/soc/amd/picasso/acpi/cpu.asl @@ -36,6 +36,7 @@ Method (PNOT) * Processor Object */ /* These devices are created at runtime */ +External (\PCNT, IntObj) External (\_SB.C000, DeviceObj) External (\_SB.C001, DeviceObj) External (\_SB.C002, DeviceObj) diff --git a/src/soc/amd/picasso/acpi/globalnvs.asl b/src/soc/amd/picasso/acpi/globalnvs.asl index 9d3f381f97..31d375c5e4 100644 --- a/src/soc/amd/picasso/acpi/globalnvs.asl +++ b/src/soc/amd/picasso/acpi/globalnvs.asl @@ -12,7 +12,7 @@ Name (PICM, Zero) /* Interrupt Mode used by OS. Assume PIC. */ Field (GNVS, ByteAcc, NoLock, Preserve) { /* Miscellaneous */ - PCNT, 8, // 0x00 - Processor Count + , 8, // 0x00 - Processor Count LIDS, 8, // 0x01 - LID State PWRS, 8, // 0x02 - AC Power State CBMC, 32, // 0x03 - 0x06 - coreboot Memory Console diff --git a/src/soc/amd/picasso/include/soc/nvs.h b/src/soc/amd/picasso/include/soc/nvs.h index f10fbdde58..b8945ffe3a 100644 --- a/src/soc/amd/picasso/include/soc/nvs.h +++ b/src/soc/amd/picasso/include/soc/nvs.h @@ -14,7 +14,7 @@ struct __packed global_nvs { /* Miscellaneous */ - uint8_t pcnt; /* 0x00 - Processor Count */ + uint8_t unused_was_pcnt; /* 0x00 - Processor Count */ uint8_t lids; /* 0x01 - LID State */ uint8_t pwrs; /* 0x02 - AC Power State */ uint32_t cbmc; /* 0x03 - 0x06 - coreboot Memory Console */ |