Skip to content

fix(board): add CMOS and fw_dbg only for firmware boot #428

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
Lencerf merged 1 commit into from
Mar 10, 2026
Merged

fix(board): add CMOS and fw_dbg only for firmware boot #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions alioth-cli/src/boot/boot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,12 @@ fn create<H: Hypervisor>(hypervisor: &H, config: Config) -> Result<Machine<H>, a
vm.add_pvpanic()?;
}

#[cfg(target_arch = "x86_64")]
if config.payload.firmware.is_some() {
vm.add_cmos()?;
vm.add_fw_dbg()?;
}

#[cfg(target_arch = "x86_64")]
if config.payload.firmware.is_some() || !config.fw_cfg.is_empty() {
vm.add_fw_cfg(config.fw_cfg.into_iter())?;
Expand Down
8 changes: 1 addition & 7 deletions alioth/src/board/board_x86_64/board_x86_64.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,10 @@ use zerocopy::{FromZeros, IntoBytes};
use crate::arch::cpuid::{Cpuid1Ecx, CpuidIn};
use crate::arch::layout::{
BIOS_DATA_END, EBDA_END, EBDA_START, IOAPIC_START, MEM_64_START, PORT_ACPI_RESET,
PORT_ACPI_SLEEP_CONTROL, PORT_ACPI_TIMER, PORT_CMOS_REG, PORT_FWDBG, RAM_32_SIZE,
PORT_ACPI_SLEEP_CONTROL, PORT_ACPI_TIMER, RAM_32_SIZE,
};
use crate::arch::msr::{IA32_MISC_ENABLE, MiscEnable};
use crate::board::{Board, BoardConfig, CpuTopology, PCIE_MMIO_64_SIZE, Result, VcpuGuard, error};
use crate::device::clock::SystemClock;
use crate::device::cmos::Cmos;
use crate::device::fw_dbg::FwDbg;
use crate::device::ioapic::IoApic;
use crate::firmware::acpi::bindings::{
AcpiTableFadt, AcpiTableHeader, AcpiTableRsdp, AcpiTableXsdt3,
Expand Down Expand Up @@ -446,9 +443,6 @@ where
pub fn arch_init(&self) -> Result<()> {
let io_apic = self.arch.io_apic.clone();
self.mmio_devs.write().push((IOAPIC_START, io_apic));
let mut io_devs = self.io_devs.write();
io_devs.push((PORT_CMOS_REG, Arc::new(Cmos::new(SystemClock))));
io_devs.push((PORT_FWDBG, Arc::new(FwDbg::new())));
Ok(())
}
}
Expand Down
21 changes: 19 additions & 2 deletions alioth/src/vm/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@ use snafu::{ResultExt, Snafu};
#[cfg(target_arch = "aarch64")]
use crate::arch::layout::{PL011_START, PL031_START};
#[cfg(target_arch = "x86_64")]
use crate::arch::layout::{PORT_COM1, PORT_FW_CFG_SELECTOR};
use crate::arch::layout::{PORT_CMOS_REG, PORT_COM1, PORT_FW_CFG_SELECTOR, PORT_FWDBG};
use crate::board::{Board, BoardConfig};
#[cfg(target_arch = "aarch64")]
use crate::device::clock::SystemClock;
#[cfg(target_arch = "x86_64")]
use crate::device::cmos::Cmos;
#[cfg(target_arch = "x86_64")]
use crate::device::fw_cfg::{FwCfg, FwCfgItemParam};
#[cfg(target_arch = "x86_64")]
use crate::device::fw_dbg::FwDbg;
#[cfg(target_arch = "aarch64")]
use crate::device::pl011::Pl011;
#[cfg(target_arch = "aarch64")]
Expand Down Expand Up @@ -160,6 +163,20 @@ where
Ok(())
}

#[cfg(target_arch = "x86_64")]
pub fn add_cmos(&self) -> Result<(), Error> {
let mut io_devs = self.board.io_devs.write();
io_devs.push((PORT_CMOS_REG, Arc::new(Cmos::new(SystemClock))));
Ok(())
}

#[cfg(target_arch = "x86_64")]
pub fn add_fw_dbg(&self) -> Result<(), Error> {
let mut io_devs = self.board.io_devs.write();
io_devs.push((PORT_FWDBG, Arc::new(FwDbg::new())));
Ok(())
}

#[cfg(target_arch = "aarch64")]
pub fn add_pl011(&self) -> Result<(), Error> {
let irq_line = self.board.vm.create_irq_sender(1)?;
Expand Down