Revert "devices: pci: support hotplugged pci bus to be removed from tree"

This reverts commit 4d854e80b4.

Change-Id: Ic245238be013a0b00630a16d65747e0b6e2c7ed5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3727473
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Maciek Swiech <drmasquatch@google.com>
Tested-by: Dennis Kempin <denniskempin@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>

arch/src/lib.rs

@@ -640,7 +640,7 @@ pub fn generate_pci_root(
 
     let mut device_ranges = BTreeMap::new();
     let mut io_ranges = BTreeMap::new();
-    let root_bus = Arc::new(Mutex::new(PciBus::new(0, 0, false)));
+    let root_bus = Arc::new(Mutex::new(PciBus::new(0, 0)));
 
     generate_pci_topology(
         root_bus.clone(),

devices/src/pci/pci_device.rs

@@ -31,8 +31,8 @@ use super::PciId;
 #[sorted]
 #[derive(Error, Debug)]
 pub enum Error {
-    /// Added pci device's parent bus does not belong to this bus
-    #[error("pci device {0}'s parent bus does not belong to bus {1}")]
+    /// Device does not located on this bus
+    #[error("pci device {0} does not located on bus {1}")]
     AddedDeviceBusNotExist(PciAddress, u8),
     /// Invalid alignment encountered.
     #[error("Alignment must be a power of 2")]
@@ -40,9 +40,6 @@ pub enum Error {
     /// The new bus has already been added to this bus
     #[error("Added bus {0} already existed on bus {1}")]
     BusAlreadyExist(u8, u8),
-    /// Target bus not exists on this bus
-    #[error("pci bus {0} does not exist on bus {1}")]
-    BusNotExist(u8, u8),
     /// Setup of the device capabilities failed.
     #[error("failed to add capability {0}")]
     CapabilitiesSetup(pci_configuration::Error),
@@ -57,9 +54,7 @@ pub enum Error {
     /// Device is already on this bus
     #[error("pci device {0} has already been added to bus {1}")]
     DeviceAlreadyExist(PciAddress, u8),
-    /// Device not exist on this bus
-    #[error("pci device {0} does not located on bus {1}")]
-    DeviceNotExist(PciAddress, u8),
+
     /// Allocating space for an IO BAR failed.
     #[error("failed to allocate space for an IO BAR, size={0}: {1}")]
     IoAllocationFailed(u64, SystemAllocatorFaliure),
@@ -117,27 +112,20 @@ pub struct PciBus {
     // Hash map that stores all direct child buses of this bus.
     // It maps from child bus number to its pci bus structure.
     child_buses: HashMap<u8, Arc<Mutex<PciBus>>>,
-    // Is hotplug bus
-    hotplug_bus: bool,
 }
 
 impl PciBus {
     // Creates a new pci bus
-    pub fn new(bus_num: u8, parent_bus_num: u8, hotplug_bus: bool) -> Self {
+    pub fn new(bus_num: u8, parent_bus_num: u8) -> Self {
         PciBus {
             bus_num,
             parent_bus_num,
             child_devices: HashSet::new(),
             child_buses: HashMap::new(),
-            hotplug_bus,
         }
     }
 
-    pub fn get_bus_num(&self) -> u8 {
-        self.bus_num
-    }
-
-    // Add a new child device to this pci bus tree.
+    // Add a new child device to this pci bus tree recursively.
     pub fn add_child_device(&mut self, add_device: PciAddress) -> Result<()> {
         if self.bus_num == add_device.bus {
             if !self.child_devices.insert(add_device) {
@@ -159,20 +147,7 @@ impl PciBus {
         Err(Error::AddedDeviceBusNotExist(add_device, self.bus_num))
     }
 
-    // Remove one child device from this pci bus tree
-    pub fn remove_child_device(&mut self, device: PciAddress) -> Result<()> {
-        if self.child_devices.remove(&device) {
-            return Ok(());
-        }
-        for child_bus in self.child_buses.values() {
-            if child_bus.lock().remove_child_device(device).is_ok() {
-                return Ok(());
-            }
-        }
-        Err(Error::DeviceNotExist(device, self.bus_num))
-    }
-
-    // Add a new child bus to this pci bus tree.
+    // Add a new child bus to this pci bus tree recursively.
     pub fn add_child_bus(&mut self, add_bus: Arc<Mutex<PciBus>>) -> Result<()> {
         let add_bus_num = add_bus.lock().bus_num;
         let add_bus_parent = add_bus.lock().parent_bus_num;
@@ -197,34 +172,6 @@ impl PciBus {
         Err(Error::ParentBusNotExist(add_bus_num, self.bus_num))
     }
 
-    // Remove one child bus from this pci bus tree.
-    pub fn remove_child_bus(&mut self, bus_no: u8) -> Result<()> {
-        if self.child_buses.remove(&bus_no).is_some() {
-            return Ok(());
-        }
-        for (_, child_bus) in self.child_buses.iter() {
-            if child_bus.lock().remove_child_bus(bus_no).is_ok() {
-                return Ok(());
-            }
-        }
-        Err(Error::BusNotExist(bus_no, self.bus_num))
-    }
-
-    // Find all downstream devices under the given bus
-    pub fn find_downstream_devices(&self, bus_no: u8) -> Vec<PciAddress> {
-        if self.bus_num == bus_no {
-            return self.get_downstream_devices();
-        }
-        for (_, child_bus) in self.child_buses.iter() {
-            let res = child_bus.lock().find_downstream_devices(bus_no);
-            if !res.is_empty() {
-                return res;
-            }
-        }
-
-        Vec::new()
-    }
-
     // Get all devices in this pci bus tree
     pub fn get_downstream_devices(&self) -> Vec<PciAddress> {
         let mut devices = Vec::new();
@@ -235,33 +182,8 @@ impl PciBus {
         devices
     }
 
-    // Check if given device is located in the device tree
-    pub fn contains(&self, device: PciAddress) -> bool {
-        if self.child_devices.contains(&device) {
-            return true;
-        }
-
-        for (_, child_bus) in self.child_buses.iter() {
-            if child_bus.lock().contains(device) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    // Returns the hotplug bus that this device is on.
-    pub fn get_hotplug_bus(&self, device: PciAddress) -> Option<u8> {
-        if self.hotplug_bus && self.contains(device) {
-            return Some(self.bus_num);
-        }
-        for (_, child_bus) in self.child_buses.iter() {
-            let hotplug_bus = child_bus.lock().get_hotplug_bus(device);
-            if hotplug_bus.is_some() {
-                return hotplug_bus;
-            }
-        }
-        return None;
+    pub fn get_bus_num(&self) -> u8 {
+        self.bus_num
     }
 }
 

devices/src/pci/pcie/pci_bridge.rs

@@ -92,7 +92,6 @@ impl PciBridge {
             .lock()
             .get_bus_range()
             .expect("PciBridge's backend device must implement get_bus_range()");
-
         let data = [
             bus_range.primary,
             bus_range.secondary,
@@ -100,17 +99,15 @@ impl PciBridge {
             0,
         ];
         config.write_reg(BR_BUS_NUMBER_REG, 0, &data[..]);
-        let pci_bus = Arc::new(Mutex::new(PciBus::new(
-            bus_range.secondary,
-            bus_range.primary,
-            device.lock().hotplug_implemented(),
-        )));
 
         PciBridge {
             device,
             config,
             pci_address: None,
-            pci_bus,
+            pci_bus: Arc::new(Mutex::new(PciBus::new(
+                bus_range.secondary,
+                bus_range.primary,
+            ))),
             bus_range,
             msi_config,
             msi_cap_offset,