From b076d8d54c2fd91a35aad6931d0bfa2aa0122036 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 23 Jun 2022 10:49:09 -0700 Subject: [PATCH] mptable_hostb: Use legacy_get_pcibus() to fetch PCI bus number. The mptable_hostb driver is a child of legacy0 and has legacy bus ivars, not PCI or PCI bridge ivars. PR: 264819 Reported by: Dennis Clarke Diagnosed by: avg Reviewed by: avg MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D35548 --- sys/x86/x86/mptable.c | 2 +- sys/x86/x86/mptable_pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c index 5cc42863cf3..c5f113c55a2 100644 --- a/sys/x86/x86/mptable.c +++ b/sys/x86/x86/mptable.c @@ -1250,7 +1250,7 @@ mptable_pci_host_res_init(device_t pcib) struct host_res_args args; KASSERT(pci0 != -1, ("do not know how to map PCI bus IDs")); - args.bus = pci_get_bus(pcib) + pci0; + args.bus = legacy_get_pcibus(pcib) + pci0; args.dev = pcib; args.sc = device_get_softc(pcib); if (pcib_host_res_init(pcib, &args.sc->sc_host_res) != 0) diff --git a/sys/x86/x86/mptable_pci.c b/sys/x86/x86/mptable_pci.c index 1a1d98eafc3..8a1d2abe46f 100644 --- a/sys/x86/x86/mptable_pci.c +++ b/sys/x86/x86/mptable_pci.c @@ -57,7 +57,7 @@ mptable_hostb_probe(device_t dev) if (pci_cfgregopen() == 0) return (ENXIO); - if (mptable_pci_probe_table(pcib_get_bus(dev)) != 0) + if (mptable_pci_probe_table(legacy_get_pcibus(dev)) != 0) return (ENXIO); device_set_desc(dev, "MPTable Host-PCI bridge"); return (0);