device: Allow virtual/generic devices under PCI in devicetree
This change allows a generic device to be described in the devicetree
under a PCI device, such as a root port.
Previously any device under a PCI device was expected to also be a PCI
device and that does not allow for a virtual/generic device to be
present, for example to provide ACPI properties for a root port.
The changes are:
- Ignore non-PCI devices found under a PCI device when scanning and do
not print an error for each devfn scanned.
- Don't treat non-PCI devices as leftover and remove them, instead
enable them as a static device.
- Don't attempt to configure a static device in the tree that is not a
PCIe device type.
With these changes it is now possible to have a generic device under a
PCI device, for example in a USB4/TBT root port (PCIe hotplug device)
this generic device will add ACPI properties for the PCIe tunnel routed
to the external port:
device pci 07.0 on
chip soc/intel/common/block/pcie
device generic 0 on end
end
end
TEST=boot on volteer with the USB4 root port devices in chipset.cb and
ensure they are enabled properly and there are no errors printed in the
coreboot log, and that the device properties are created in the SSDT.
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Change-Id: I56a491808067dc862a7adfd46852f0bd6b41cd95
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46542
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index ce3e509..691ad6b 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -1006,16 +1006,11 @@
prev = &bus->children;
for (dev = bus->children; dev; dev = dev->sibling) {
- if (dev->path.type == DEVICE_PATH_PCI) {
- if (dev->path.pci.devfn == devfn) {
- /* Unlink from the list. */
- *prev = dev->sibling;
- dev->sibling = NULL;
- break;
- }
- } else {
- printk(BIOS_ERR, "child %s not a PCI device\n",
- dev_path(dev));
+ if (dev->path.type == DEVICE_PATH_PCI && dev->path.pci.devfn == devfn) {
+ /* Unlink from the list. */
+ *prev = dev->sibling;
+ dev->sibling = NULL;
+ break;
}
prev = &dev->sibling;
}
@@ -1283,6 +1278,16 @@
prev = &bus->children;
for (dev = bus->children; dev; dev = dev->sibling) {
+
+ /*
+ * If static device is not PCI then enable it here and don't
+ * treat it as a leftover device.
+ */
+ if (dev->path.type != DEVICE_PATH_PCI) {
+ enable_static_device(dev);
+ continue;
+ }
+
/*
* The device is only considered leftover if it is not hidden
* and it has a Vendor ID of 0 (the default for a device that