Skip to content

Virtual (GPPT) GICv3 creation #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aarkegz merged 4 commits into from
Jul 14, 2025
Merged

Virtual (GPPT) GICv3 creation #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8c060f
update to newest `axvmconfig`, add vgicv3 creation code.
aarkegz Jul 12, 2025
3f31511
add logs
aarkegz Jul 12, 2025
46f87c9
fix code errors
aarkegz Jul 13, 2025
a590ad6
formatted
aarkegz Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ axdevice_base = { git = "https://github.com/arceos-hypervisor/axdevice_crates.gi
range-alloc = { git = "https://github.com/arceos-hypervisor/range-alloc.git" }

[target.'cfg(target_arch = "aarch64")'.dependencies]
arm_vgic = { git = "https://github.com/arceos-hypervisor/arm_vgic.git" }
arm_vgic = { git = "https://github.com/arceos-hypervisor/arm_vgic.git", features = ["vgicv3"] }
106 changes: 101 additions & 5 deletions src/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use axdevice_base::{
};
use axerrno::{AxResult, ax_err};
use axvmconfig::EmulatedDeviceConfig;
use memory_addr::is_aligned_4k;
use memory_addr::{PhysAddr, is_aligned_4k};

use crate::AxVmDeviceConfig;

Expand All @@ -26,7 +26,7 @@ pub struct AxEmuDevices<R: DeviceAddrRange> {
emu_devices: Vec<Arc<dyn BaseDeviceOps<R>>>,
}

impl<R: DeviceAddrRange> AxEmuDevices<R> {
impl<R: DeviceAddrRange + 'static> AxEmuDevices<R> {
/// Creates a new [`AxEmuDevices`] instance.
pub fn new() -> Self {
Self {
Expand Down Expand Up @@ -126,8 +126,8 @@ impl AxVmDevices {
/// According the emu_configs to init every specific device
fn init(this: &mut Self, emu_configs: &Vec<EmulatedDeviceConfig>) {
for config in emu_configs {
match EmuDeviceType::from_usize(config.emu_type) {
EmuDeviceType::EmuDeviceTInterruptController => {
match config.emu_type {
EmuDeviceType::InterruptController => {
#[cfg(target_arch = "aarch64")]
{
this.add_mmio_dev(Arc::new(Vgic::new()));
Expand All @@ -140,7 +140,103 @@ impl AxVmDevices {
);
}
}
EmuDeviceType::EmuDeviceTIVCChannel => {
EmuDeviceType::GPPTRedistributor => {
#[cfg(target_arch = "aarch64")]
{
const GPPT_GICR_ARG_ERR_MSG: &'static str =
"expect 3 args for gppt redistributor (cpu_num, stride, pcpu_id)";

let cpu_num = config
.cfg_list
.get(0)
.copied()
.expect(GPPT_GICR_ARG_ERR_MSG);
let stride = config
.cfg_list
.get(1)
.copied()
.expect(GPPT_GICR_ARG_ERR_MSG);
let pcpu_id = config
.cfg_list
.get(2)
.copied()
.expect(GPPT_GICR_ARG_ERR_MSG);

for i in 0..cpu_num {
let addr = config.base_gpa + i * stride;
let size = config.length;
this.add_mmio_dev(Arc::new(arm_vgic::v3::vgicr::VGicR::new(
addr.into(),
Some(size),
pcpu_id + i,
)));

info!(
"GPPT Redistributor initialized for vCPU {} with base GPA {:#x} and length {:#x}",
i, addr, size
);
}
}
#[cfg(not(target_arch = "aarch64"))]
{
warn!(
"emu type: {} is not supported on this platform",
config.emu_type
);
}
}
EmuDeviceType::GPPTDistributor => {
#[cfg(target_arch = "aarch64")]
{
this.add_mmio_dev(Arc::new(arm_vgic::v3::vgicd::VGicD::new(
config.base_gpa.into(),
Some(config.length),
)));

info!(
"GPPT Distributor initialized with base GPA {:#x} and length {:#x}",
config.base_gpa, config.length
);
}
#[cfg(not(target_arch = "aarch64"))]
{
warn!(
"emu type: {} is not supported on this platform",
config.emu_type
);
}
}
EmuDeviceType::GPPTITS => {
#[cfg(target_arch = "aarch64")]
{
let host_gits_base = config
.cfg_list
.get(0)
.copied()
.map(PhysAddr::from_usize)
.expect("expect 1 arg for gppt its (host_gits_base)");

this.add_mmio_dev(Arc::new(arm_vgic::v3::gits::Gits::new(
config.base_gpa.into(),
Some(config.length),
host_gits_base,
false,
)));

info!(
"GPPT ITS initialized with base GPA {:#x} and length {:#x}, host GITS base {:#x}",
config.base_gpa, config.length, host_gits_base
);
}
#[cfg(not(target_arch = "aarch64"))]
{
warn!(
"emu type: {} is not supported on this platform",
config.emu_type
);
}
}
EmuDeviceType::IVCChannel => {
if this.ivc_channel.is_none() {
// Initialize the IVC channel range allocator
this.ivc_channel = Some(Mutex::new(RangeAllocator::new(Range {
Expand Down