From ae3f524a1f7dfe52331ef4cbaf8fc317f260fe7a Mon Sep 17 00:00:00 2001 From: John Zhao Date: Fri, 23 Apr 2021 10:51:18 -0700 Subject: [PATCH] soc/intel/tigerlake: Use device ID from pci_devs header file This change applies device ID from the SoC pci_devs.h directly. BUG=None TEST=Built image successfully. Signed-off-by: John Zhao Change-Id: I0c3bd60c62664337429e6817d2cf54cf2e8d500b Reviewed-on: https://review.coreboot.org/c/coreboot/+/52641 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak Reviewed-by: Angel Pons --- src/soc/intel/tigerlake/acpi.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c index c1f55f934e..f245457376 100644 --- a/src/soc/intel/tigerlake/acpi.c +++ b/src/soc/intel/tigerlake/acpi.c @@ -180,7 +180,7 @@ static unsigned long soc_fill_dmar(unsigned long current) unsigned long tmp = current; current += acpi_create_dmar_drhd(current, 0, 0, gfxvtbar); - current += acpi_create_dmar_ds_pci(current, 0, 2, 0); + current += acpi_create_dmar_ds_pci(current, 0, SA_DEV_SLOT_IGD, 0); acpi_dmar_drhd_fixup(tmp, current); } @@ -193,7 +193,7 @@ static unsigned long soc_fill_dmar(unsigned long current) unsigned long tmp = current; current += acpi_create_dmar_drhd(current, 0, 0, ipuvtbar); - current += acpi_create_dmar_ds_pci(current, 0, 5, 0); + current += acpi_create_dmar_ds_pci(current, 0, SA_DEV_SLOT_IPU, 0); acpi_dmar_drhd_fixup(tmp, current); } @@ -206,7 +206,8 @@ static unsigned long soc_fill_dmar(unsigned long current) unsigned long tmp = current; current += acpi_create_dmar_drhd(current, 0, 0, tbtbar); - current += acpi_create_dmar_ds_pci_br(current, 0, 7, i); + current += acpi_create_dmar_ds_pci_br(current, 0, + SA_DEV_SLOT_TBT, i); acpi_dmar_drhd_fixup(tmp, current); } @@ -234,7 +235,7 @@ static unsigned long soc_fill_dmar(unsigned long current) const unsigned long tmp = current; current += acpi_create_dmar_rmrr(current, 0, sa_get_gsm_base(), sa_get_tolud_base() - 1); - current += acpi_create_dmar_ds_pci(current, 0, 2, 0); + current += acpi_create_dmar_ds_pci(current, 0, SA_DEV_SLOT_IGD, 0); acpi_dmar_rmrr_fixup(tmp, current); return current;