Remove uefi dependency of common crate

Author: phil-opp

Cargo.lock

@@ -147,11 +147,9 @@ pub enum MemoryRegionKind {
     Bootloader,
     /// An unknown memory region reported by the UEFI firmware.
     ///
-    /// This should only be used if the UEFI memory type is known as usable.
+    /// Contains the UEFI memory type tag.
     UnknownUefi(u32),
     /// An unknown memory region reported by the BIOS firmware.
-    ///
-    /// This should only be used if the BIOS memory type is known as usable.
     UnknownBios(u32),
 }
 

api/src/info.rs

@@ -12,7 +12,6 @@ bootloader_api = { version = "0.1.0-alpha.0", path = "../api" }
 conquer-once = { version = "0.3.2", default-features = false }
 log = "0.4.14"
 spinning_top = "0.2.4"
-uefi = "0.13"
 usize_conversions = "0.2.0"
 x86_64 = { version = "0.14.8" }
 xmas-elf = "0.8.0"

common/Cargo.toml

@@ -13,6 +13,9 @@ pub trait LegacyMemoryRegion: Copy + core::fmt::Debug {
     fn len(&self) -> u64;
     /// Returns the type of the region, e.g. whether it is usable or reserved.
     fn kind(&self) -> MemoryRegionKind;
+
+    /// Mark additional regions as usable just before the bootloader jumps to the kernel.
+    fn on_bootloader_exit(&mut self) {}
 }
 
 /// A physical frame allocator based on a BIOS or UEFI provided memory map.
@@ -101,10 +104,11 @@ where
     ) -> &mut [MemoryRegion] {
         let mut next_index = 0;
 
-        for descriptor in self.original {
+        for mut descriptor in self.original {
             let mut start = descriptor.start();
             let end = start + descriptor.len();
             let next_free = self.next_frame.start_address();
+            descriptor.on_bootloader_exit();
             let kind = match descriptor.kind() {
                 MemoryRegionKind::Usable => {
                     if end <= next_free {
@@ -126,19 +130,6 @@ where
                         MemoryRegionKind::Usable
                     }
                 }
-                // some mappings created by the UEFI firmware become usable again at this point
-                MemoryRegionKind::UnknownUefi(other) => {
-                    use uefi::table::boot::MemoryType as M;
-                    match M(other) {
-                        M::LOADER_CODE
-                        | M::LOADER_DATA
-                        | M::BOOT_SERVICES_CODE
-                        | M::BOOT_SERVICES_DATA
-                        | M::RUNTIME_SERVICES_CODE
-                        | M::RUNTIME_SERVICES_DATA => MemoryRegionKind::Usable,
-                        other => MemoryRegionKind::UnknownUefi(other.0),
-                    }
-                }
                 other => other,
             };
 

common/src/legacy_memory_region.rs

@@ -23,4 +23,20 @@ impl<'a> LegacyMemoryRegion for UefiMemoryDescriptor {
             other => MemoryRegionKind::UnknownUefi(other.0),
         }
     }
+
+    fn on_bootloader_exit(&mut self) {
+        match self.0.ty {
+            // the bootloader is about to exit, so we can reallocate its data
+            MemoryType::LOADER_CODE
+            | MemoryType::LOADER_DATA
+            | MemoryType::BOOT_SERVICES_CODE
+            | MemoryType::BOOT_SERVICES_DATA
+            | MemoryType::RUNTIME_SERVICES_CODE
+            | MemoryType::RUNTIME_SERVICES_DATA => {
+                // we don't need this data anymore
+                self.0.ty = MemoryType::CONVENTIONAL;
+            }
+            _ => {}
+        }
+    }
 }