diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 36b7c82..47c0e9f 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -878,6 +878,14 @@
 		case PCI_EXP_TYPE_DOWNSTREAM:
 			printk(BIOS_DEBUG, "%s subordinate bus PCI Express\n",
 			       dev_path(dev));
+#if CONFIG(PCIEXP_HOTPLUG)
+			u16 sltcap;
+			sltcap = pci_read_config16(dev, pciexpos + PCI_EXP_SLTCAP);
+			if (sltcap & PCI_EXP_SLTCAP_HPC) {
+				printk(BIOS_DEBUG, "%s hot-plug capable\n", dev_path(dev));
+				return &default_pciexp_hotplug_ops_bus;
+			}
+#endif /* CONFIG(PCIEXP_HOTPLUG) */
 			return &default_pciexp_ops_bus;
 		case PCI_EXP_TYPE_PCI_BRIDGE:
 			printk(BIOS_DEBUG, "%s subordinate PCI\n",
@@ -1259,7 +1267,7 @@
 
 	if (state == PCI_ROUTE_SCAN) {
 		link->secondary = parent->subordinate + 1;
-		link->subordinate = link->secondary;
+		link->subordinate = link->secondary + dev->hotplug_buses;
 	}
 
 	if (state == PCI_ROUTE_CLOSE) {