mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-02 11:35:46 +00:00
vmm: cpu: Don't place CpuManager on MMIO bus when non-dynamic
This is now consistent with not supplying the _CRS for the device when CpuManager is not dynamic. Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
bc90fe4c71
commit
f6dfb42a64
@ -417,7 +417,7 @@ pub struct CpuManager {
|
|||||||
vmmops: Arc<dyn VmmOps>,
|
vmmops: Arc<dyn VmmOps>,
|
||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
#[cfg_attr(target_arch = "aarch64", allow(dead_code))]
|
#[cfg_attr(target_arch = "aarch64", allow(dead_code))]
|
||||||
acpi_address: GuestAddress,
|
acpi_address: Option<GuestAddress>,
|
||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
proximity_domain_per_cpu: BTreeMap<u8, u32>,
|
proximity_domain_per_cpu: BTreeMap<u8, u32>,
|
||||||
affinity: BTreeMap<u8, Vec<u8>>,
|
affinity: BTreeMap<u8, Vec<u8>>,
|
||||||
@ -600,13 +600,6 @@ impl CpuManager {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let device_manager = device_manager.lock().unwrap();
|
let device_manager = device_manager.lock().unwrap();
|
||||||
#[cfg(feature = "acpi")]
|
|
||||||
let acpi_address = device_manager
|
|
||||||
.allocator()
|
|
||||||
.lock()
|
|
||||||
.unwrap()
|
|
||||||
.allocate_platform_mmio_addresses(None, CPU_MANAGER_ACPI_SIZE as u64, None)
|
|
||||||
.ok_or(Error::AllocateMmmioAddress)?;
|
|
||||||
|
|
||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
let proximity_domain_per_cpu: BTreeMap<u8, u32> = {
|
let proximity_domain_per_cpu: BTreeMap<u8, u32> = {
|
||||||
@ -635,6 +628,20 @@ impl CpuManager {
|
|||||||
#[cfg(not(feature = "tdx"))]
|
#[cfg(not(feature = "tdx"))]
|
||||||
let dynamic = true;
|
let dynamic = true;
|
||||||
|
|
||||||
|
#[cfg(feature = "acpi")]
|
||||||
|
let acpi_address = if dynamic {
|
||||||
|
Some(
|
||||||
|
device_manager
|
||||||
|
.allocator()
|
||||||
|
.lock()
|
||||||
|
.unwrap()
|
||||||
|
.allocate_platform_mmio_addresses(None, CPU_MANAGER_ACPI_SIZE as u64, None)
|
||||||
|
.ok_or(Error::AllocateMmmioAddress)?,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let cpu_manager = Arc::new(Mutex::new(CpuManager {
|
let cpu_manager = Arc::new(Mutex::new(CpuManager {
|
||||||
config: config.clone(),
|
config: config.clone(),
|
||||||
interrupt_controller: device_manager.interrupt_controller().clone(),
|
interrupt_controller: device_manager.interrupt_controller().clone(),
|
||||||
@ -662,6 +669,7 @@ impl CpuManager {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
|
if let Some(acpi_address) = acpi_address {
|
||||||
device_manager
|
device_manager
|
||||||
.mmio_bus()
|
.mmio_bus()
|
||||||
.insert(
|
.insert(
|
||||||
@ -670,6 +678,7 @@ impl CpuManager {
|
|||||||
CPU_MANAGER_ACPI_SIZE as u64,
|
CPU_MANAGER_ACPI_SIZE as u64,
|
||||||
)
|
)
|
||||||
.map_err(Error::BusError)?;
|
.map_err(Error::BusError)?;
|
||||||
|
}
|
||||||
|
|
||||||
Ok(cpu_manager)
|
Ok(cpu_manager)
|
||||||
}
|
}
|
||||||
@ -1717,9 +1726,9 @@ impl Aml for CpuMethods {
|
|||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
impl Aml for CpuManager {
|
impl Aml for CpuManager {
|
||||||
fn append_aml_bytes(&self, bytes: &mut Vec<u8>) {
|
fn append_aml_bytes(&self, bytes: &mut Vec<u8>) {
|
||||||
if self.dynamic {
|
|
||||||
// CPU hotplug controller
|
|
||||||
#[cfg(target_arch = "x86_64")]
|
#[cfg(target_arch = "x86_64")]
|
||||||
|
if let Some(acpi_address) = self.acpi_address {
|
||||||
|
// CPU hotplug controller
|
||||||
aml::Device::new(
|
aml::Device::new(
|
||||||
"_SB_.PRES".into(),
|
"_SB_.PRES".into(),
|
||||||
vec![
|
vec![
|
||||||
@ -1732,15 +1741,15 @@ impl Aml for CpuManager {
|
|||||||
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
|
&aml::ResourceTemplate::new(vec![&aml::AddressSpace::new_memory(
|
||||||
aml::AddressSpaceCachable::NotCacheable,
|
aml::AddressSpaceCachable::NotCacheable,
|
||||||
true,
|
true,
|
||||||
self.acpi_address.0 as u64,
|
acpi_address.0 as u64,
|
||||||
self.acpi_address.0 + CPU_MANAGER_ACPI_SIZE as u64 - 1,
|
acpi_address.0 + CPU_MANAGER_ACPI_SIZE as u64 - 1,
|
||||||
)]),
|
)]),
|
||||||
),
|
),
|
||||||
// OpRegion and Fields map MMIO range into individual field values
|
// OpRegion and Fields map MMIO range into individual field values
|
||||||
&aml::OpRegion::new(
|
&aml::OpRegion::new(
|
||||||
"PRST".into(),
|
"PRST".into(),
|
||||||
aml::OpRegionSpace::SystemMemory,
|
aml::OpRegionSpace::SystemMemory,
|
||||||
self.acpi_address.0 as usize,
|
acpi_address.0 as usize,
|
||||||
CPU_MANAGER_ACPI_SIZE,
|
CPU_MANAGER_ACPI_SIZE,
|
||||||
),
|
),
|
||||||
&aml::Field::new(
|
&aml::Field::new(
|
||||||
|
Loading…
Reference in New Issue
Block a user