From 281868e55fb45c093a3342d7581f89e4a65548a6 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 12 Nov 2020 21:02:11 +0100 Subject: soc/intel/apollolake: use P2SB function to generate DMAR HPET Change-Id: I68f63c79d04cb2cddb92c9f6385459723f8858bd Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/47532 Reviewed-by: Christian Walter Reviewed-by: Marc Jones Tested-by: build bot (Jenkins) --- src/soc/intel/apollolake/acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c index ee1a543728..8609c7c8e2 100644 --- a/src/soc/intel/apollolake/acpi.c +++ b/src/soc/intel/apollolake/acpi.c @@ -194,7 +194,7 @@ static unsigned long soc_fill_dmar(unsigned long current) p2sb_unhide(); struct device *p2sb_dev = pcidev_path_on_root(PCH_DEVFN_P2SB); uint16_t ibdf = pci_read_config16(p2sb_dev, PCH_P2SB_IBDF); - uint16_t hbdf = pci_read_config16(p2sb_dev, PCH_P2SB_HBDF); + union p2sb_bdf hbdf = p2sb_get_hpet_bdf(); p2sb_hide(); current += acpi_create_dmar_drhd(current, @@ -202,7 +202,7 @@ static unsigned long soc_fill_dmar(unsigned long current) current += acpi_create_dmar_ds_ioapic(current, 2, ibdf >> 8, PCI_SLOT(ibdf), PCI_FUNC(ibdf)); current += acpi_create_dmar_ds_msi_hpet(current, - 0, hbdf >> 8, PCI_SLOT(hbdf), PCI_FUNC(hbdf)); + 0, hbdf.bus, hbdf.dev, hbdf.fn); acpi_dmar_drhd_fixup(tmp, current); } -- cgit v1.2.3