Add support for the UEFI runtime table address

api/Cargo.toml

@@ -6,9 +6,5 @@ repository.workspace = true
 edition = "2021"
 description = "Makes a kernel compatible with the bootloader crate"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-
 [dev-dependencies]
 rand = "0.8.4"

api/src/info.rs

@@ -63,6 +63,9 @@ pub struct BootInfo {
     /// Virtual address of the loaded kernel image.
     pub kernel_image_offset: u64,
 
+    /// UEFI runtime table address (if running on UEFI)
+    pub rt_table_addr: Optional<u64>,
+
     #[doc(hidden)]
     pub _test_sentinel: u64,
 }
@@ -85,6 +88,7 @@ impl BootInfo {
             kernel_addr: 0,
             kernel_len: 0,
             kernel_image_offset: 0,
+            rt_table_addr: Optional::None,
             _test_sentinel: 0,
         }
     }

bios/stage-4/src/main.rs

@@ -164,6 +164,7 @@ pub extern "C" fn _start(info: &mut BiosInfo) -> ! {
             _ => Some(info.ramdisk.start),
         },
         ramdisk_len: info.ramdisk.len,
+        rt_table_addr: None,
     };
 
     load_and_switch_to_kernel(kernel, config, frame_allocator, page_tables, system_info);

common/src/lib.rs

@@ -5,7 +5,7 @@
 use crate::legacy_memory_region::{LegacyFrameAllocator, LegacyMemoryRegion};
 use bootloader_api::{
     config::Mapping,
-    info::{FrameBuffer, FrameBufferInfo, MemoryRegion, TlsTemplate},
+    info::{FrameBuffer, FrameBufferInfo, MemoryRegion, Optional, TlsTemplate},
     BootInfo, BootloaderConfig,
 };
 use bootloader_boot_config::{BootConfig, LevelFilter};
@@ -80,6 +80,11 @@ pub struct SystemInfo {
     pub rsdp_addr: Option<PhysAddr>,
     pub ramdisk_addr: Option<u64>,
     pub ramdisk_len: u64,
+
+    /// UEFI runtime table address (if running on UEFI).
+    ///
+    /// Use a raw pointer from your kernel to this address to access UEFI Runtime Services.
+    pub rt_table_addr: Option<u64>,
 }
 
 /// The physical address of the framebuffer and information about the framebuffer.
@@ -551,6 +556,11 @@ where
         info.kernel_len = mappings.kernel_slice_len as _;
         info.kernel_image_offset = mappings.kernel_image_offset.as_u64();
         info._test_sentinel = boot_config._test_sentinel;
+        info.rt_table_addr = if let Some(addr) = system_info.rt_table_addr {
+            Optional::Some(addr)
+        } else {
+            Optional::None
+        };
         info
     });
 

uefi/src/main.rs

@@ -166,6 +166,7 @@
         },
         ramdisk_addr,
         ramdisk_len,
+        rt_table_addr: Some(system_table.get_current_system_table_addr()),
     };
 
     bootloader_x86_64_common::load_and_switch_to_kernel(
@@ -210,7 +211,7 @@
 
 fn load_file_from_boot_method(
     image: Handle,
     st: &mut SystemTable<Boot>,
     filename: &str,
     boot_mode: BootMode,
 ) -> Option<&'static mut [u8]> {