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

aarch64: Refactor AArch64 GIC space definitions

Browse Source 
Move the definition of MSI space to layout.rs, so other crates can
reference it. Now it is needed by virtio-iommu.

Signed-off-by: Michael Zhao <michael.zhao@arm.com>
This commit is contained in:
Michael Zhao 2021-09-06 21:11:41 +08:00 committed by Sebastien Boeuf
parent 253c06d3ba
commit b30ddc0837
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/src/aarch64/gic/gicv3.rs
View File

@ -78,23 +78,17 @@ pub mod kvm {
impl VersionMapped for Gicv3State {} impl VersionMapped for Gicv3State {}
impl KvmGicV3 { impl KvmGicV3 {
// Unfortunately bindgen omits defines that are based on other defines.
// See arch/arm64/include/uapi/asm/kvm.h file from the linux kernel.
pub const SZ_64K: u64 = 0x0001_0000;
const KVM_VGIC_V3_DIST_SIZE: u64 = KvmGicV3::SZ_64K;
const KVM_VGIC_V3_REDIST_SIZE: u64 = (2 * KvmGicV3::SZ_64K);
// Device trees specific constants // Device trees specific constants
pub const ARCH_GIC_V3_MAINT_IRQ: u32 = 9; pub const ARCH_GIC_V3_MAINT_IRQ: u32 = 9;
/// Get the address of the GIC distributor. /// Get the address of the GIC distributor.
pub fn get_dist_addr() -> u64 { pub fn get_dist_addr() -> u64 {
layout::MAPPED_IO_START - KvmGicV3::KVM_VGIC_V3_DIST_SIZE layout::GIC_V3_DIST_START
} }
/// Get the size of the GIC distributor. /// Get the size of the GIC distributor.
pub fn get_dist_size() -> u64 { pub fn get_dist_size() -> u64 {
KvmGicV3::KVM_VGIC_V3_DIST_SIZE layout::GIC_V3_DIST_SIZE
} }
/// Get the address of the GIC redistributors. /// Get the address of the GIC redistributors.
@ -104,7 +98,7 @@ pub mod kvm {
/// Get the size of the GIC redistributors. /// Get the size of the GIC redistributors.
pub fn get_redists_size(vcpu_count: u64) -> u64 { pub fn get_redists_size(vcpu_count: u64) -> u64 {
vcpu_count * KvmGicV3::KVM_VGIC_V3_REDIST_SIZE vcpu_count * layout::GIC_V3_REDIST_SIZE
} }
/// Save the state of GIC. /// Save the state of GIC.

5
arch/src/aarch64/gic/gicv3_its.rs
View File

@ -13,6 +13,7 @@ pub mod kvm {
use crate::aarch64::gic::gicv3::kvm::KvmGicV3; use crate::aarch64::gic::gicv3::kvm::KvmGicV3;
use crate::aarch64::gic::kvm::{save_pending_tables, KvmGicDevice}; use crate::aarch64::gic::kvm::{save_pending_tables, KvmGicDevice};
use crate::aarch64::gic::GicDevice; use crate::aarch64::gic::GicDevice;
use crate::layout;
use anyhow::anyhow; use anyhow::anyhow;
use hypervisor::kvm::kvm_bindings; use hypervisor::kvm::kvm_bindings;
use hypervisor::CpuState; use hypervisor::CpuState;
@ -179,10 +180,8 @@ pub mod kvm {
impl VersionMapped for Gicv3ItsState {} impl VersionMapped for Gicv3ItsState {}
impl KvmGicV3Its { impl KvmGicV3Its {
const KVM_VGIC_V3_ITS_SIZE: u64 = (2 * KvmGicV3::SZ_64K);
fn get_msi_size() -> u64 { fn get_msi_size() -> u64 {
KvmGicV3Its::KVM_VGIC_V3_ITS_SIZE layout::GIC_V3_ITS_SIZE
} }
fn get_msi_addr(vcpu_count: u64) -> u64 { fn get_msi_addr(vcpu_count: u64) -> u64 {

11
arch/src/aarch64/layout.rs
View File

@ -55,6 +55,17 @@ pub const UEFI_SIZE: u64 = 0x040_0000;
/// Below this address will reside the GIC, above this address will reside the MMIO devices. /// Below this address will reside the GIC, above this address will reside the MMIO devices.
pub const MAPPED_IO_START: u64 = 0x0900_0000; pub const MAPPED_IO_START: u64 = 0x0900_0000;
/// See kernel file arch/arm64/include/uapi/asm/kvm.h for the GIC related definitions.
/// 0x08ff_0000 ~ 0x0900_0000 is reserved for GICv3 Distributor
pub const GIC_V3_DIST_SIZE: u64 = 0x01_0000;
pub const GIC_V3_DIST_START: u64 = MAPPED_IO_START - GIC_V3_DIST_SIZE;
/// Below 0x08ff_0000 is reserved for GICv3 Redistributor.
/// The size defined here is for each vcpu.
/// The total size is 'number_of_vcpu * GIC_V3_REDIST_SIZE'
pub const GIC_V3_REDIST_SIZE: u64 = 0x02_0000;
/// Below Redistributor area is GICv3 ITS
pub const GIC_V3_ITS_SIZE: u64 = 0x02_0000;
/// Space 0x0900_0000 ~ 0x0905_0000 is reserved for legacy devices. /// Space 0x0900_0000 ~ 0x0905_0000 is reserved for legacy devices.
pub const LEGACY_SERIAL_MAPPED_IO_START: u64 = 0x0900_0000; pub const LEGACY_SERIAL_MAPPED_IO_START: u64 = 0x0900_0000;
pub const LEGACY_RTC_MAPPED_IO_START: u64 = 0x0901_0000; pub const LEGACY_RTC_MAPPED_IO_START: u64 = 0x0901_0000;