diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-07-12 15:26:29 +0300 |
|---|---|---|
| committer | Philipp Deppenwiese <zaolin.daisuki@gmail.com> | 2019-07-17 14:27:16 +0000 |
| commit | f2ac0137566076262152f74b6b6761c9f6f2def2 (patch) | |
| tree | e082ebf2811068a3ec5c9da99968e8aba39fad25 /src/device | |
| parent | ed52e3dd9c33e5f714bde615e16c1b187cdd269f (diff) | |
soc/intel: Fix regression with hidden PCI devices
Fix regression with commit
903b40a soc/intel: Replace uses of dev_find_slot()
Platforms where FSP hides PCI devices before enumeration
may halt with error message 'PCI: dev is NULL!'.
The workaround here is to print an error message revealing
the faulty source code function and revert to old behaviour
of dev_find_slot().
Change-Id: I5eab3e7f1993b686103eaa257aacda379dc259fa
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34285
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Maxim Polyakov <max.senia.poliak@gmail.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/device_const.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/device/device_const.c b/src/device/device_const.c index c1b0b063ff..f2f0177f57 100644 --- a/src/device/device_const.c +++ b/src/device/device_const.c @@ -234,6 +234,18 @@ DEVTREE_CONST struct device *pcidev_on_root(uint8_t dev, uint8_t fn) return pcidev_path_on_root(PCI_DEVFN(dev, fn)); } +DEVTREE_CONST struct device *pcidev_path_on_root_debug(pci_devfn_t devfn, const char *func) +{ + DEVTREE_CONST struct device *dev = pcidev_path_on_root(devfn); + if (dev) + return dev; + + printk(BIOS_ERR, "BUG: %s requests hidden 00:%02x.%u\n", func, devfn >> 3, devfn & 7); + + /* FIXME: This can return wrong device. */ + return dev_find_slot(0, devfn); +} + /** * Given an SMBus bus and a device number, find the device structure. * |