Merge remote-tracking branch 'origin/patch-1'

Test pull request to see if this works in my kernel

Author: kennystrawnmusic

Cargo.lock

@@ -9,6 +9,7 @@ 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]
+uefi = "0.24.0"
 
 [dev-dependencies]
 rand = "0.8.4"

api/Cargo.toml

@@ -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,
         }
     }

api/src/info.rs

@@ -172,6 +172,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);

bios/stage-4/src/main.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};
@@ -72,14 +72,18 @@ fn convert_level(level: LevelFilter) -> log::LevelFilter {
 }
 
 /// Required system information that should be queried from the BIOS or UEFI firmware.
-#[derive(Debug, Copy, Clone)]
+#[derive(Debug)]
 pub struct SystemInfo {
     /// Information about the (still unmapped) framebuffer.
     pub framebuffer: Option<RawFrameBufferInfo>,
     /// Address of the _Root System Description Pointer_ structure of the ACPI standard.
     pub rsdp_addr: Option<PhysAddr>,
     pub ramdisk_addr: Option<u64>,
     pub ramdisk_len: u64,
+
+    /// UEFI runtime table address (on a UEFI system)
+    // #[cfg(target_os = "uefi")]
+    pub rt_table_addr: Option<u64>,
 }
 
 /// The physical address of the framebuffer and information about the framebuffer.
@@ -551,6 +555,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
     });
 

common/src/lib.rs

@@ -175,6 +175,7 @@ fn main_inner(image: Handle, mut st: SystemTable<Boot>) -> Status {
         },
         ramdisk_addr,
         ramdisk_len,
+        rt_table_addr: Some(system_table.get_current_system_table_addr()),
     };
 
     bootloader_x86_64_common::load_and_switch_to_kernel(