Change in coreboot[master]: soc/intel/apollolake: use P2SB function to generate DMAR HPET

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47532 )

Change subject: soc/intel/apollolake: use P2SB function to generate DMAR HPET
......................................................................

soc/intel/apollolake: use P2SB function to generate DMAR HPET

Change-Id: I68f63c79d04cb2cddb92c9f6385459723f8858bd
Signed-off-by: Arthur Heymans 
---
M src/soc/intel/apollolake/acpi.c
1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/47532/1

diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index ee1a543..8609c7c 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -194,7 +194,7 @@
    	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 @@
    	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);
    }

[Marc Jones (Code Review)]

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47532 )

Change subject: soc/intel/apollolake: use P2SB function to generate DMAR HPET
......................................................................

Patch Set 2: Code-Review+2

[Christian Walter (Code Review)]

Christian Walter has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47532 )

Change subject: soc/intel/apollolake: use P2SB function to generate DMAR HPET
......................................................................

Patch Set 6: Code-Review+2

[Arthur Heymans (Code Review)]

Arthur Heymans has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47532 )

Change subject: soc/intel/apollolake: use P2SB function to generate DMAR HPET
......................................................................

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) 
---
M src/soc/intel/apollolake/acpi.c
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marc Jones: Looks good to me, approved
  Christian Walter: Looks good to me, approved

diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c
index ee1a543..8609c7c 100644
--- a/src/soc/intel/apollolake/acpi.c
+++ b/src/soc/intel/apollolake/acpi.c
@@ -194,7 +194,7 @@
    	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 @@
    	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);
    }