From 49fc4e3e434afdcdc543b34cc60c9462ec08facf Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 17 Aug 2022 21:57:46 +0200 Subject: [PATCH] pciexp: Move PCI path check one level up to pciexp_enable_ltr() If we have a PCIe root port without `ops_pci` or without `get_ltr_max_latencies`, the parent device wouldn't be PCI. Hence, check for a PCI path early. Change-Id: I358cb6756750bb10d0a23ab7133b917bfa25988b Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/coreboot/+/66845 Tested-by: build bot (Jenkins) Reviewed-by: Jonathan Zhang Reviewed-by: Arthur Heymans --- src/device/pciexp_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/device/pciexp_device.c b/src/device/pciexp_device.c index 449315bb29..c8ac391c06 100644 --- a/src/device/pciexp_device.c +++ b/src/device/pciexp_device.c @@ -211,8 +211,7 @@ static bool _pciexp_enable_ltr(struct device *parent, unsigned int parent_cap, return true; if (parent && - (parent->path.type != DEVICE_PATH_PCI || - !_pciexp_ltr_supported(parent, parent_cap) || + (!_pciexp_ltr_supported(parent, parent_cap) || !_pciexp_ltr_enabled(parent, parent_cap))) return false; @@ -235,6 +234,8 @@ static void pciexp_enable_ltr(struct device *dev) unsigned int parent_cap = 0; if (!dev->ops->ops_pci || !dev->ops->ops_pci->get_ltr_max_latencies) { parent = dev->bus->dev; + if (parent->path.type != DEVICE_PATH_PCI) + return; parent_cap = pci_find_capability(parent, PCI_CAP_ID_PCIE); if (!parent_cap) return;