diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2022-05-09 14:33:15 +0200 |
|---|---|---|
| committer | Arthur Heymans <arthur@aheymans.xyz> | 2022-05-16 06:53:46 +0000 |
| commit | 08769c6d1404c1be0333273d8b988544750ce87d (patch) | |
| tree | ef37aeb920efea81b84ecf50c2ab990c09541b30 /src/soc/intel/skylake | |
| parent | 159520ed7881d1be2fdd02ee13040e8e21a9833c (diff) | |
soc/intel/*: Use SSDT to pass A4GB and A4GS
GNVS is more fragile as you need to keep struct elements in sync with
ASL code.
Change-Id: I2cd5e6b56e4a0dbbb11f4a0ac97e8f84d53b90ec
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/64216
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Diffstat (limited to 'src/soc/intel/skylake')
| -rw-r--r-- | src/soc/intel/skylake/acpi.c | 3 | ||||
| -rw-r--r-- | src/soc/intel/skylake/acpi/systemagent.asl | 3 | ||||
| -rw-r--r-- | src/soc/intel/skylake/chip.c | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index b7cd5c9cd9..9ae0bb6ea1 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -176,9 +176,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs) /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; - - /* Fill in Above 4GB MMIO resource */ - sa_fill_gnvs(gnvs); } static unsigned long soc_fill_dmar(unsigned long current) diff --git a/src/soc/intel/skylake/acpi/systemagent.asl b/src/soc/intel/skylake/acpi/systemagent.asl index 1ca6232712..f9b8f2d7c3 100644 --- a/src/soc/intel/skylake/acpi/systemagent.asl +++ b/src/soc/intel/skylake/acpi/systemagent.asl @@ -48,6 +48,9 @@ Device (MCHC) } } +External (A4GS, IntObj) +External (A4GB, IntObj) + Method (_CRS, 0, Serialized) { Name (MCRS, ResourceTemplate () diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c index f59b4c3c73..a1a311aa5e 100644 --- a/src/soc/intel/skylake/chip.c +++ b/src/soc/intel/skylake/chip.c @@ -17,6 +17,7 @@ #include <intelblocks/power_limit.h> #include <intelblocks/xdci.h> #include <intelblocks/p2sb.h> +#include <intelblocks/systemagent.h> #include <intelpch/lockdown.h> #include <soc/intel/common/vbt.h> #include <soc/interrupt.h> @@ -190,7 +191,8 @@ static struct device_operations pci_domain_ops = { .set_resources = &pci_domain_set_resources, .scan_bus = &pci_domain_scan_bus, #if CONFIG(HAVE_ACPI_TABLES) - .acpi_name = &soc_acpi_name, + .acpi_name = &soc_acpi_name, + .acpi_fill_ssdt = ssdt_set_above_4g_pci, #endif }; |