Map PCI (BAR) MMIO range too.
Bug: 237249346
Test: Ran pVM firmware manually.
Change-Id: Id1be96e080a3ee90b3cf842fdfed1dc8043aa2df
diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index e6a158d..970a66a 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -32,11 +32,7 @@
mod pci;
mod smccc;
-use crate::{
- entry::RebootReason,
- memory::MemoryTracker,
- pci::{map_cam, pci_node},
-};
+use crate::{entry::RebootReason, memory::MemoryTracker, pci::PciInfo};
use avb::PUBLIC_KEY;
use avb_nostd::verify_image;
use libfdt::Fdt;
@@ -60,8 +56,9 @@
debug!("BCC: {:?} ({:#x} bytes)", bcc.as_ptr(), bcc.len());
// Set up PCI bus for VirtIO devices.
- let pci_node = pci_node(fdt)?;
- map_cam(&pci_node, memory)?;
+ let pci_info = PciInfo::from_fdt(fdt)?;
+ info!("PCI: {:#x?}", pci_info);
+ pci_info.map(memory)?;
verify_image(signed_kernel, PUBLIC_KEY).map_err(|e| {
error!("Failed to verify the payload: {e}");