Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31051 )
Change subject: mb/{kontron,supermicro}: Use pcidev_on_root() ......................................................................
mb/{kontron,supermicro}: Use pcidev_on_root()
Change-Id: I61b3e5c92830f02d61a108dadde25ff261099e57 Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/31051 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Tristan Corrick tristan@corrick.kiwi --- M src/mainboard/kontron/986lcd-m/mainboard.c M src/mainboard/supermicro/h8scm_fam10/acpi_tables.c M src/mainboard/supermicro/h8scm_fam10/mptable.c M src/mainboard/supermicro/x10slm-f/mainboard.c 4 files changed, 5 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Tristan Corrick: Looks good to me, approved
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index d0d6c6b..73d5997 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -173,7 +173,7 @@ if (!ethernet_disable) continue; printk(BIOS_DEBUG, "Disabling Ethernet NIC #%d\n", i); - dev = dev_find_slot(0, PCI_DEVFN(28, i - 1)); + dev = pcidev_on_root(28, i - 1); if (dev == NULL) { printk(BIOS_ERR, "Disabling Ethernet NIC: Cannot find 00:1c.%d!\n", diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c index 4b2095a..716a77f 100644 --- a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c +++ b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c @@ -34,7 +34,7 @@ IO_APIC_ADDR, gsi_base); /* IOAPIC on rs5690 */ gsi_base += 24; /* SB700 has 24 IOAPIC entries. */ - dev = dev_find_slot(0, PCI_DEVFN(0, 0)); + dev = pcidev_on_root(0, 0); if (dev) { pci_write_config32(dev, 0xF8, 0x1); dword = pci_read_config32(dev, 0xFC) & 0xfffffff0; diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c index ca91368..e28f422 100644 --- a/src/mainboard/supermicro/h8scm_fam10/mptable.c +++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c @@ -45,8 +45,7 @@ u32 *dword; u8 byte;
- dev = dev_find_slot(0, //pirq_router_bus TODO: why bus_sp5100[0] use same value of bus_sr5650[0] assigned by get_pci1234(), instead of 0. - PCI_DEVFN(0x14, 0)); + dev = pcidev_on_root(0x14, 0); if (dev) { dword = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0); smp_write_ioapic(mc, apicid_sp5100, 0x11, dword); @@ -79,7 +78,7 @@ * 00:14.6: INTB MCI */ } - dev = dev_find_slot(0, PCI_DEVFN(0, 0)); + dev = pcidev_on_root(0, 0); if (dev) { pci_write_config32(dev, 0xF8, 0x1); dword = (u32 *)(pci_read_config32(dev, 0xFC) & 0xfffffff0); diff --git a/src/mainboard/supermicro/x10slm-f/mainboard.c b/src/mainboard/supermicro/x10slm-f/mainboard.c index 8d0e3b0..4bd5d15 100644 --- a/src/mainboard/supermicro/x10slm-f/mainboard.c +++ b/src/mainboard/supermicro/x10slm-f/mainboard.c @@ -32,7 +32,7 @@ */ static void hide_ast2400(void) { - struct device *dev = dev_find_slot(0, PCI_DEVFN(0x1c, 0)); + struct device *dev = pcidev_on_root(0x1c, 0); if (!dev) return;