fix(OVMF): Default non-x86 arch to edk2-stable202508_r1

Author: PelleKrab

uefi-test-runner/src/proto/mod.rs

@@ -30,7 +30,7 @@ pub fn test() {
     usb::test();
     misc::test();
 
-    #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+    #[cfg(target_arch = "x86_64")]
     iommu::test();
 
     // disable the ATA test on aarch64 for now. The aarch64 UEFI Firmware does not yet seem

uefi/src/proto/dma/iommu.rs

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 
-//! EDK2 IOMMU protocol.
+//! EDKII IOMMU protocol.
 
+use crate::data_types::PhysicalAddress;
+use crate::mem::memory_map::MemoryType;
+use crate::proto::unsafe_protocol;
+use crate::{Handle, Result, StatusExt};
 use core::ffi::c_void;
-use uefi::data_types::PhysicalAddress;
-use uefi::mem::memory_map::MemoryType;
-use uefi::proto::unsafe_protocol;
-use uefi::{Handle, Result, StatusExt};
 use uefi_raw::table::boot::AllocateType;
 
 pub use crate::proto::dma::{DmaBuffer, Mapping};
-pub use crate::uefi_raw::protocol::iommu::{
+pub use uefi_raw::protocol::iommu::{
     EdkiiIommuAccess, EdkiiIommuAttribute, EdkiiIommuOperation, EdkiiIommuProtocol,
 };
 
@@ -33,10 +33,10 @@ impl Iommu {
     ///
     /// # Errors
     ///
-    /// * [`Status::INVALID_PARAMETER`]: invalid device handle, mapping, or access flags
-    /// * [`Status::UNSUPPORTED`]: operation not supported by this IOMMU
-    /// * [`Status::OUT_OF_RESOURCES`]: insufficient resources to modify IOMMU access
-    /// * [`Status::DEVICE_ERROR`]: IOMMU device reported an error
+    /// * [`crate::Status::INVALID_PARAMETER`]: invalid device handle, mapping, or access flags
+    /// * [`crate::Status::UNSUPPORTED`]: operation not supported by this IOMMU
+    /// * [`crate::Status::OUT_OF_RESOURCES`]: insufficient resources to modify IOMMU access
+    /// * [`crate::Status::DEVICE_ERROR`]: IOMMU device reported an error
     pub fn set_attribute(
         &self,
         device_handle: Handle,
@@ -58,10 +58,10 @@ impl Iommu {
     ///
     /// # Errors
     ///
-    /// * [`Status::INVALID_PARAMETER`]: invalid operation or buffer
-    /// * [`Status::UNSUPPORTED`]: host address cannot be mapped as a common buffer
-    /// * [`Status::OUT_OF_RESOURCES`]: insufficient resources
-    /// * [`Status::DEVICE_ERROR`]: system hardware could not map the requested address
+    /// * [`crate::Status::INVALID_PARAMETER`]: invalid operation or buffer
+    /// * [`crate::Status::UNSUPPORTED`]: host address cannot be mapped as a common buffer
+    /// * [`crate::Status::OUT_OF_RESOURCES`]: insufficient resources
+    /// * [`crate::Status::DEVICE_ERROR`]: system hardware could not map the requested address
     pub fn map(
         &self,
         operation: EdkiiIommuOperation,
@@ -104,9 +104,9 @@ impl Iommu {
     ///
     /// # Errors
     ///
-    /// * [`Status::INVALID_PARAMETER`]: invalid memory type or attributes
-    /// * [`Status::UNSUPPORTED`]: unsupported attributes
-    /// * [`Status::OUT_OF_RESOURCES`]: memory pages could not be allocated
+    /// * [`crate::Status::INVALID_PARAMETER`]: invalid memory type or attributes
+    /// * [`crate::Status::UNSUPPORTED`]: unsupported attributes
+    /// * [`crate::Status::OUT_OF_RESOURCES`]: memory pages could not be allocated
     pub fn allocate_buffer(
         &self,
         memory_type: MemoryType,

xtask/src/qemu.rs

@@ -20,8 +20,11 @@ use tempfile::TempDir;
 #[cfg(target_os = "linux")]
 use {std::fs::Permissions, std::os::unix::fs::PermissionsExt};
 
-/// Name of the ovmf-prebuilt release to use by default.
-const OVMF_PREBUILT_SOURCE: Source = Source::EDK2_STABLE202511_R2;
+/// OVMF source for x86_64 — includes IOMMU support.
+const OVMF_PREBUILT_SOURCE_X64: Source = Source::EDK2_STABLE202602_R1;
+
+/// OVMF source for all other architectures.
+const OVMF_PREBUILT_SOURCE_DEFAULT: Source = Source::EDK2_STABLE202508_R1;
 
 /// Directory into which the prebuilts will be download (relative to the repo root).
 const OVMF_PREBUILT_DIR: &str = "target/ovmf";
@@ -76,7 +79,11 @@ impl OvmfPaths {
                 );
             }
         } else {
-            let prebuilt = Prebuilt::fetch(OVMF_PREBUILT_SOURCE, OVMF_PREBUILT_DIR)?;
+            let source = match arch {
+                UefiArch::X86_64 => OVMF_PREBUILT_SOURCE_X64,
+                _ => OVMF_PREBUILT_SOURCE_DEFAULT,
+            };
+            let prebuilt = Prebuilt::fetch(source, OVMF_PREBUILT_DIR)?;
 
             Ok(prebuilt.get_file(arch.into(), file_type))
         }
@@ -364,9 +371,12 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
         }
         UefiArch::IA32 | UefiArch::X86_64 => {
             // Use a modern machine. kernel-irqchip=split is required by
-            // intel-iommu with interrupt remapping enabled.
-            cmd.args(["-machine", "q35,kernel-irqchip=split"]);
-            cmd.args(["-device", "intel-iommu,intremap=on,caching-mode=on"]);
+            if arch == UefiArch::X86_64 {
+                cmd.args(["-machine", "q35,kernel-irqchip=split"]);
+                cmd.args(["-device", "intel-iommu,intremap=on,caching-mode=on"]);
+            } else {
+                cmd.args(["-machine", "q35"]);
+            }
 
             // Multi-processor services protocol test needs exactly 4 CPUs.
             cmd.args(["-smp", "4"]);