diff --git a/lib/vmd/vmd.c b/lib/vmd/vmd.c
index 4336d4983..aa4d38ff4 100644
--- a/lib/vmd/vmd.c
+++ b/lib/vmd/vmd.c
@@ -82,6 +82,23 @@ vmd_align_base_addrs(struct vmd_adapter *vmd, uint32_t alignment)
 	}
 }
 
+static bool
+vmd_device_is_enumerated(const struct vmd_pci_device *vmd_device)
+{
+	return vmd_device->header->one.prefetch_base_upper == VMD_UPPER_BASE_SIGNATURE &&
+	       vmd_device->header->one.prefetch_limit_upper == VMD_UPPER_LIMIT_SIGNATURE;
+}
+
+static bool
+vmd_device_is_root_port(const struct vmd_pci_device *vmd_device)
+{
+	return vmd_device->header->common.vendor_id == 0x8086 &&
+	       (vmd_device->header->common.device_id == 0x2030 ||
+		vmd_device->header->common.device_id == 0x2031 ||
+		vmd_device->header->common.device_id == 0x2032 ||
+		vmd_device->header->common.device_id == 0x2033);
+}
+
 /*
  *  Allocates an address from vmd membar for the input memory size
  *  vmdAdapter - vmd adapter object
@@ -143,13 +160,27 @@ vmd_is_end_device(struct vmd_pci_device *dev)
 static void
 vmd_update_base_limit_register(struct vmd_pci_device *dev, uint16_t base, uint16_t limit)
 {
-	struct vmd_pci_bus *bus = dev->parent;
+	struct vmd_pci_bus *bus;
 	struct vmd_pci_device *bridge;
 
 	if (base == 0 ||  limit == 0) {
 		return;
 	}
 
+	if (dev->header->common.header_type == PCI_HEADER_TYPE_BRIDGE) {
+		bus = dev->bus_object;
+	} else {
+		bus = dev->parent;
+	}
+
+	bridge = bus->self;
+	SPDK_DEBUGLOG(SPDK_LOG_VMD, "base:limit = %x:%x\n", bridge->header->one.mem_base,
+		      bridge->header->one.mem_limit);
+
+	if (dev->bus->vmd->scan_completed) {
+		return;
+	}
+
 	while (bus && bus->self != NULL) {
 		bridge = bus->self;
 
@@ -168,6 +199,18 @@ vmd_update_base_limit_register(struct vmd_pci_device *dev, uint16_t base, uint16
 	}
 }
 
+static uint64_t
+vmd_get_base_addr(struct vmd_pci_device *dev, uint32_t index)
+{
+	struct vmd_pci_bus *bus = dev->parent;
+
+	if (dev->header_type == PCI_HEADER_TYPE_BRIDGE) {
+		return dev->header->zero.BAR[index] & ~0xf;
+	} else {
+		return (uint64_t)bus->self->header->one.mem_base << 16;
+	}
+}
+
 static bool
 vmd_assign_base_addrs(struct vmd_pci_device *dev)
 {
@@ -203,7 +246,13 @@ vmd_assign_base_addrs(struct vmd_pci_device *dev)
 		}
 		mem_attr = dev->bar[i].size & PCI_BASE_ADDR_MASK;
 		dev->bar[i].size = TWOS_COMPLEMENT(dev->bar[i].size & PCI_BASE_ADDR_MASK);
-		dev->bar[i].start = vmd_allocate_base_addr(vmd, dev, dev->bar[i].size);
+
+		if (vmd->scan_completed) {
+			dev->bar[i].start = vmd_get_base_addr(dev, i);
+		} else {
+			dev->bar[i].start = vmd_allocate_base_addr(vmd, dev, dev->bar[i].size);
+		}
+
 		dev->header->zero.BAR[i] = (uint32_t)dev->bar[i].start;
 
 		if (!dev->bar[i].start) {
@@ -329,6 +378,34 @@ vmd_read_config_space(struct vmd_pci_device *dev)
 			DEVICE_SERIAL_NUMBER_CAP_ID);
 }
 
+static void
+vmd_update_scan_info(struct vmd_pci_device *dev)
+{
+	struct vmd_adapter *vmd_adapter = dev->bus->vmd;
+
+	if (vmd_adapter->root_port_updated) {
+		return;
+	}
+
+	if (dev->header_type == PCI_HEADER_TYPE_NORMAL) {
+		return;
+	}
+
+	if (vmd_device_is_root_port(dev)) {
+		vmd_adapter->root_port_updated = 1;
+		SPDK_DEBUGLOG(SPDK_LOG_VMD, "root_port_updated = %d\n",
+			      vmd_adapter->root_port_updated);
+		SPDK_DEBUGLOG(SPDK_LOG_VMD, "upper:limit = %x : %x\n",
+			      dev->header->one.prefetch_base_upper,
+			      dev->header->one.prefetch_limit_upper);
+		if (vmd_device_is_enumerated(dev)) {
+			vmd_adapter->scan_completed = 1;
+			SPDK_DEBUGLOG(SPDK_LOG_VMD, "scan_completed = %d\n",
+				      vmd_adapter->scan_completed);
+		}
+	}
+}
+
 static void
 vmd_reset_base_limit_registers(struct vmd_pci_device *dev)
 {
@@ -403,7 +480,10 @@ vmd_alloc_dev(struct vmd_pci_bus *bus, uint32_t devfn)
 	dev->header_type = header_type & 0x7;
 
 	if (header_type == PCI_HEADER_TYPE_BRIDGE) {
-		vmd_reset_base_limit_registers(dev);
+		vmd_update_scan_info(dev);
+		if (!dev->bus->vmd->scan_completed) {
+			vmd_reset_base_limit_registers(dev);
+		}
 	}
 
 	vmd_read_config_space(dev);
@@ -859,41 +939,63 @@ vmd_print_pci_info(struct vmd_pci_device *dev)
 }
 
 static void
-vmd_pci_print(struct vmd_pci_bus *bus_list)
+vmd_cache_scan_info(struct vmd_pci_device *dev)
 {
-	struct vmd_pci_bus *bus = bus_list;
-	struct vmd_pci_device *dev;
+	uint32_t reg __attribute__((unused));
 
-	SPDK_INFOLOG(SPDK_LOG_VMD, "\n ...PCIE devices attached to VMD %04x:%02x:%02x:%x...\n",
-		     bus_list->vmd->pci.addr.domain, bus_list->vmd->pci.addr.bus,
-		     bus_list->vmd->pci.addr.dev, bus_list->vmd->pci.addr.func);
-	SPDK_INFOLOG(SPDK_LOG_VMD, "----------------------------------------------\n");
+	if (dev->header_type == PCI_HEADER_TYPE_NORMAL) {
+		return;
+	}
 
-	while (bus != NULL) {
-		vmd_print_pci_info(bus->self);
-		dev = bus->dev_list;
-		while (dev != NULL) {
-			vmd_print_pci_info(dev);
-			dev = dev->next;
-		}
-		bus = bus->next;
+	SPDK_DEBUGLOG(SPDK_LOG_VMD, "vendor/device id:%x:%x\n", dev->header->common.vendor_id,
+		      dev->header->common.device_id);
+
+	if (vmd_device_is_root_port(dev)) {
+		dev->header->one.prefetch_base_upper = VMD_UPPER_BASE_SIGNATURE;
+		reg = dev->header->one.prefetch_base_upper;
+		dev->header->one.prefetch_limit_upper = VMD_UPPER_LIMIT_SIGNATURE;
+		reg = dev->header->one.prefetch_limit_upper;
+
+		SPDK_DEBUGLOG(SPDK_LOG_VMD, "prefetch: %x:%x\n",
+			      dev->header->one.prefetch_base_upper,
+			      dev->header->one.prefetch_limit_upper);
 	}
 }
 
 static uint8_t
 vmd_scan_pcibus(struct vmd_pci_bus *bus)
 {
+	struct vmd_pci_bus *bus_entry;
+	struct vmd_pci_device *dev;
 	uint8_t dev_cnt;
 
 	g_end_device_count = 0;
 	vmd_add_bus_to_list(bus->vmd, bus);
 	bus->vmd->next_bus_number = bus->bus_number + 1;
 	dev_cnt = vmd_scan_single_bus(bus, NULL);
+	bus_entry = bus->vmd->bus_list;
 
-	SPDK_DEBUGLOG(SPDK_LOG_VMD, "\tVMD scan found %u devices\n", dev_cnt);
-	SPDK_DEBUGLOG(SPDK_LOG_VMD, "\tVMD scan found %u END DEVICES\n", g_end_device_count);
+	SPDK_DEBUGLOG(SPDK_LOG_VMD, "VMD scan found %u devices\n", dev_cnt);
+	SPDK_DEBUGLOG(SPDK_LOG_VMD, "VMD scan found %u END DEVICES\n", g_end_device_count);
 
-	vmd_pci_print(bus->vmd->bus_list);
+	SPDK_INFOLOG(SPDK_LOG_VMD, "PCIe devices attached to VMD %04x:%02x:%02x:%x...\n",
+		     bus_entry->vmd->pci.addr.domain, bus_entry->vmd->pci.addr.bus,
+		     bus_entry->vmd->pci.addr.dev, bus_entry->vmd->pci.addr.func);
+
+	while (bus_entry != NULL) {
+		if (bus_entry->self != NULL) {
+			vmd_print_pci_info(bus_entry->self);
+			vmd_cache_scan_info(bus_entry->self);
+		}
+
+		dev = bus_entry->dev_list;
+		while (dev != NULL) {
+			vmd_print_pci_info(dev);
+			dev = dev->next;
+		}
+
+		bus_entry = bus_entry->next;
+	}
 
 	return dev_cnt;
 }
diff --git a/lib/vmd/vmd.h b/lib/vmd/vmd.h
index b0c4e7e46..a88ba7223 100644
--- a/lib/vmd/vmd.h
+++ b/lib/vmd/vmd.h
@@ -154,7 +154,9 @@ struct vmd_adapter {
 	uint32_t is_ready : 1;
 	uint32_t processing_hp : 1;
 	uint32_t max_payload_size: 3;
-	uint32_t rsv : 6;
+	uint32_t root_port_updated : 1;
+	uint32_t scan_completed : 1;
+	uint32_t rsv : 4;
 
 	/* end devices attached to vmd adapters */
 	struct vmd_pci_device *target[MAX_VMD_TARGET];
diff --git a/lib/vmd/vmd_spec.h b/lib/vmd/vmd_spec.h
index c2f864815..c54b0567a 100644
--- a/lib/vmd/vmd_spec.h
+++ b/lib/vmd/vmd_spec.h
@@ -43,6 +43,9 @@
 #define PCI_OFFSET_OF(object, member)  ((uint32_t)&((object*)0)->member)
 #define TWOS_COMPLEMENT(value) (~(value) + 1)
 
+#define VMD_UPPER_BASE_SIGNATURE  0xFFFFFFEF
+#define VMD_UPPER_LIMIT_SIGNATURE 0xFFFFFFED
+
 /*
  *  BAR assignment constants
  */