External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 11:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: device_manager: Update structure holding PCI IRQs

Browse Source 
Make the code a bit clearer by changing the naming of the structure
holding the list of IRQs reserved for PCI devices. It is also modified
into an array of 32 entries since we know this is the amount of PCI
slots that is supported.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2021-03-17 18:45:57 +01:00
parent e311fd66cd
commit c8c3cad8cb
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vmm/src/device_manager.rs
View File

@ -903,8 +903,8 @@ pub struct DeviceManager {
// BTreeMap of PCI b/d/f to their corresponding MetaPciDevice. // BTreeMap of PCI b/d/f to their corresponding MetaPciDevice.
pci_devices: BTreeMap<u32, (String, PciDeviceHandle)>, pci_devices: BTreeMap<u32, (String, PciDeviceHandle)>,
// BTreeMap of PCI b/d/f to their allocated IRQ. // List of allocated IRQs for each PCI slot.
pci_device_irqs: BTreeMap<u32, u32>, pci_irq_slots: [u8; 32],
// Tree of devices, representing the dependencies between devices. // Tree of devices, representing the dependencies between devices.
// Useful for introspection, snapshot and restore. // Useful for introspection, snapshot and restore.
@ -1008,7 +1008,7 @@ impl DeviceManager {
pci_devices_up: 0, pci_devices_up: 0,
pci_devices_down: 0, pci_devices_down: 0,
pci_devices: BTreeMap::new(), pci_devices: BTreeMap::new(),
pci_device_irqs: BTreeMap::new(), pci_irq_slots: [0; 32],
device_tree, device_tree,
#[cfg(feature = "acpi")] #[cfg(feature = "acpi")]
exit_evt: _exit_evt.try_clone().map_err(DeviceManagerError::EventFd)?, exit_evt: _exit_evt.try_clone().map_err(DeviceManagerError::EventFd)?,
@ -1135,7 +1135,7 @@ impl DeviceManager {
fn reserve_legacy_interrupts_for_pci_devices(&mut self) -> DeviceManagerResult<()> { fn reserve_legacy_interrupts_for_pci_devices(&mut self) -> DeviceManagerResult<()> {
// Reserve 8 IRQs which will be shared across all PCI devices. // Reserve 8 IRQs which will be shared across all PCI devices.
let num_irqs = 8; let num_irqs = 8;
let mut irqs: Vec<u32> = Vec::new(); let mut irqs: Vec<u8> = Vec::new();
for _ in 0..num_irqs { for _ in 0..num_irqs {
irqs.push( irqs.push(
self.address_manager self.address_manager
@ -1143,14 +1143,13 @@ impl DeviceManager {
.lock() .lock()
.unwrap() .unwrap()
.allocate_irq() .allocate_irq()
.ok_or(DeviceManagerError::AllocateIrq)?, .ok_or(DeviceManagerError::AllocateIrq)? as u8,
); );
} }
// There are 32 devices on the PCI bus, let's assign them an IRQ. // There are 32 devices on the PCI bus, let's assign them an IRQ.
for i in 0..32 { for i in 0..32 {
self.pci_device_irqs self.pci_irq_slots[i] = irqs[(i % num_irqs) as usize];
.insert(i << 3, irqs[(i % num_irqs) as usize]);
} }
Ok(()) Ok(())
@ -2840,14 +2839,13 @@ impl DeviceManager {
} }
} }
let legacy_interrupt_group = if let (Some(irq), Some(legacy_interrupt_manager)) = ( let legacy_interrupt_group = if let Some(legacy_interrupt_manager) =
self.pci_device_irqs.get(&pci_device_bdf), &self.legacy_interrupt_manager
&self.legacy_interrupt_manager, {
) {
Some( Some(
legacy_interrupt_manager legacy_interrupt_manager
.create_group(LegacyIrqGroupConfig { .create_group(LegacyIrqGroupConfig {
irq: *irq as InterruptIndex, irq: self.pci_irq_slots[(pci_device_bdf >> 3) as usize] as InterruptIndex,
}) })
.map_err(DeviceManagerError::CreateInterruptGroup)?, .map_err(DeviceManagerError::CreateInterruptGroup)?,
) )
@ -3758,9 +3756,10 @@ impl Aml for DeviceManager {
// Build PCI routing table, listing IRQs assigned to PCI devices. // Build PCI routing table, listing IRQs assigned to PCI devices.
let prt_package_list: Vec<(u32, u32)> = self let prt_package_list: Vec<(u32, u32)> = self
.pci_device_irqs .pci_irq_slots
.iter() .iter()
.map(|(bdf, irq)| (((((*bdf >> 3) & 0x1fu32) << 16) | 0xffffu32), *irq)) .enumerate()
.map(|(i, irq)| (((((i as u32) & 0x1fu32) << 16) | 0xffffu32), *irq as u32))
.collect(); .collect();
let prt_package_list: Vec<aml::Package> = prt_package_list let prt_package_list: Vec<aml::Package> = prt_package_list
.iter() .iter()