kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

hypervisor: arch: Move PMU IRQ definition from arch to hypervisor crate

Browse Source 
Since this would be used in other places inside the hypervisor and
hypervisor crate cannot take a dependency on arch crate, as that creates
cyclic dependency.

Signed-off-by: Jinank Jain <jinankjain@microsoft.com>
This commit is contained in:
Jinank Jain
2025-05-07 10:50:04 +00:00
parent aaa3a114dd
commit 691fe0ca68
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/src/aarch64/fdt.rs
View File

@@ -17,7 +17,7 @@ use byteorder::{BigEndian, ByteOrder};
use hypervisor::arch::aarch64::gic::Vgic; use hypervisor::arch::aarch64::gic::Vgic;
use hypervisor::arch::aarch64::regs::{ use hypervisor::arch::aarch64::regs::{
AARCH64_ARCH_TIMER_HYP_IRQ, AARCH64_ARCH_TIMER_PHYS_NONSECURE_IRQ, AARCH64_ARCH_TIMER_HYP_IRQ, AARCH64_ARCH_TIMER_PHYS_NONSECURE_IRQ,
AARCH64_ARCH_TIMER_PHYS_SECURE_IRQ, AARCH64_ARCH_TIMER_VIRT_IRQ, AARCH64_ARCH_TIMER_PHYS_SECURE_IRQ, AARCH64_ARCH_TIMER_VIRT_IRQ, AARCH64_PMU_IRQ,
}; };
use thiserror::Error; use thiserror::Error;
use vm_fdt::{FdtWriter, FdtWriterResult}; use vm_fdt::{FdtWriter, FdtWriterResult};
@@ -63,9 +63,6 @@ const GIC_FDT_IRQ_TYPE_PPI: u32 = 1;
const IRQ_TYPE_EDGE_RISING: u32 = 1; const IRQ_TYPE_EDGE_RISING: u32 = 1;
const IRQ_TYPE_LEVEL_HI: u32 = 4; const IRQ_TYPE_LEVEL_HI: u32 = 4;
// PMU PPI interrupt number
pub const AARCH64_PMU_IRQ: u32 = 7;
// Keys and Buttons // Keys and Buttons
// System Power Down // System Power Down
const KEY_POWER: u32 = 116; const KEY_POWER: u32 = 116;

3
hypervisor/src/arch/aarch64/regs.rs
View File

@@ -221,3 +221,6 @@ pub const AARCH64_ARCH_TIMER_PHYS_SECURE_IRQ: u32 = 13;
pub const AARCH64_ARCH_TIMER_PHYS_NONSECURE_IRQ: u32 = 14; pub const AARCH64_ARCH_TIMER_PHYS_NONSECURE_IRQ: u32 = 14;
pub const AARCH64_ARCH_TIMER_VIRT_IRQ: u32 = 11; pub const AARCH64_ARCH_TIMER_VIRT_IRQ: u32 = 11;
pub const AARCH64_ARCH_TIMER_HYP_IRQ: u32 = 10; pub const AARCH64_ARCH_TIMER_HYP_IRQ: u32 = 10;
// PMU PPI interrupt number
pub const AARCH64_PMU_IRQ: u32 = 7;

4
vmm/src/device_manager.rs
View File

@@ -60,6 +60,8 @@ use devices::legacy::Serial;
#[cfg(feature = "pvmemcontrol")] #[cfg(feature = "pvmemcontrol")]
use devices::pvmemcontrol::{PvmemcontrolBusDevice, PvmemcontrolPciDevice}; use devices::pvmemcontrol::{PvmemcontrolBusDevice, PvmemcontrolPciDevice};
use devices::{interrupt_controller, AcpiNotificationFlags}; use devices::{interrupt_controller, AcpiNotificationFlags};
#[cfg(target_arch = "aarch64")]
use hypervisor::arch::aarch64::regs::AARCH64_PMU_IRQ;
use hypervisor::IoEventAddress; use hypervisor::IoEventAddress;
use libc::{ use libc::{
tcsetattr, termios, MAP_NORESERVE, MAP_PRIVATE, MAP_SHARED, O_TMPFILE, PROT_READ, PROT_WRITE, tcsetattr, termios, MAP_NORESERVE, MAP_PRIVATE, MAP_SHARED, O_TMPFILE, PROT_READ, PROT_WRITE,
@@ -1488,7 +1490,7 @@ impl DeviceManager {
.cpu_manager .cpu_manager
.lock() .lock()
.unwrap() .unwrap()
.init_pmu(arch::aarch64::fdt::AARCH64_PMU_IRQ + 16) .init_pmu(AARCH64_PMU_IRQ + 16)
.is_err() .is_err()
{ {
info!("Failed to initialize PMU"); info!("Failed to initialize PMU");

4
vmm/src/vm.rs
View File

@@ -39,6 +39,8 @@ use devices::AcpiNotificationFlags;
use gdbstub_arch::aarch64::reg::AArch64CoreRegs as CoreRegs; use gdbstub_arch::aarch64::reg::AArch64CoreRegs as CoreRegs;
#[cfg(all(target_arch = "x86_64", feature = "guest_debug"))] #[cfg(all(target_arch = "x86_64", feature = "guest_debug"))]
use gdbstub_arch::x86::reg::X86_64CoreRegs as CoreRegs; use gdbstub_arch::x86::reg::X86_64CoreRegs as CoreRegs;
#[cfg(target_arch = "aarch64")]
use hypervisor::arch::aarch64::regs::AARCH64_PMU_IRQ;
use hypervisor::{HypervisorVmError, VmOps}; use hypervisor::{HypervisorVmError, VmOps};
use libc::{termios, SIGWINCH}; use libc::{termios, SIGWINCH};
use linux_loader::cmdline::Cmdline; use linux_loader::cmdline::Cmdline;
@@ -1382,7 +1384,7 @@ impl Vm {
.cpu_manager .cpu_manager
.lock() .lock()
.unwrap() .unwrap()
.init_pmu(arch::aarch64::fdt::AARCH64_PMU_IRQ + 16) .init_pmu(AARCH64_PMU_IRQ + 16)
.map_err(|_| { .map_err(|_| {
Error::ConfigureSystem(arch::Error::PlatformSpecific( Error::ConfigureSystem(arch::Error::PlatformSpecific(
arch::aarch64::Error::VcpuInitPmu, arch::aarch64::Error::VcpuInitPmu,