From 79a11950acfc55e6f7a2e9c673991c1dafc59f91 Mon Sep 17 00:00:00 2001 From: Bill XIE Date: Sun, 29 Jan 2023 09:55:19 +0800 Subject: nb/intel/{sandybridge,haswell}: Generate IOAPIC DMAR entries from hw MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use acpi_create_dmar_ds_ioapic_from_hw() to generate DMAR entries. This can restore s3 resume capability for Sandy Bridge platforms lost after commit d165357ec37c ("sb,soc/intel: Use register_new_ioapic_gsi0()"). Cherry-picked from commit b184e6e0a1cc ("nb/intel/{sandybridge,haswell}: Generate IOAPIC DMAR entries from hw"). Original-signed-off-by: Bill XIE Change-Id: I83e735707cd9ff30aa339443593239cd7e3e4656 Original-reviewed-on: https://review.coreboot.org/c/coreboot/+/72513 Original-reviewed-by: Nico Huber Original-reviewed-by: Arthur Heymans Signed-off-by: Bill XIE Reviewed-on: https://review.coreboot.org/c/coreboot/+/72763 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Kyösti Mälkki --- src/northbridge/intel/haswell/acpi.c | 6 ++++-- src/northbridge/intel/sandybridge/acpi.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/northbridge/intel/haswell/acpi.c b/src/northbridge/intel/haswell/acpi.c index 290dc1e92873..8d179aaa623f 100644 --- a/src/northbridge/intel/haswell/acpi.c +++ b/src/northbridge/intel/haswell/acpi.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include "haswell.h" @@ -38,8 +39,9 @@ static unsigned long acpi_fill_dmar(unsigned long current) const unsigned long tmp = current; current += acpi_create_dmar_drhd(current, DRHD_INCLUDE_PCI_ALL, 0, vtvc0bar); - current += acpi_create_dmar_ds_ioapic(current, 2, PCH_IOAPIC_PCI_BUS, - PCH_IOAPIC_PCI_SLOT, 0); + current += acpi_create_dmar_ds_ioapic_from_hw(current, IO_APIC_ADDR, + PCH_IOAPIC_PCI_BUS, + PCH_IOAPIC_PCI_SLOT, 0); size_t i; for (i = 0; i < 8; ++i) diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c index c2f6eae0e7da..8be161ec05d1 100644 --- a/src/northbridge/intel/sandybridge/acpi.c +++ b/src/northbridge/intel/sandybridge/acpi.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include "sandybridge.h" @@ -42,8 +43,9 @@ static unsigned long acpi_fill_dmar(unsigned long current) const unsigned long tmp = current; current += acpi_create_dmar_drhd(current, DRHD_INCLUDE_PCI_ALL, 0, VTVC0_BASE); - current += acpi_create_dmar_ds_ioapic(current, 2, PCH_IOAPIC_PCI_BUS, - PCH_IOAPIC_PCI_SLOT, 0); + current += acpi_create_dmar_ds_ioapic_from_hw(current, IO_APIC_ADDR, + PCH_IOAPIC_PCI_BUS, + PCH_IOAPIC_PCI_SLOT, 0); size_t i; for (i = 0; i < 8; ++i) -- cgit v1.2.3