multiboot2: Allow setting the RSDP tags

Author: YtvwlD

multiboot2/src/builder/information.rs

@@ -3,7 +3,7 @@ use crate::builder::traits::StructAsBytes;
 use crate::{
     BasicMemoryInfoTag, BootInformationInner, BootLoaderNameTag, CommandLineTag,
     EFISdt32, EFISdt64, ElfSectionsTag, EndTag, FramebufferTag, MemoryMapTag,
-    ModuleTag, SmbiosTag,
+    ModuleTag, RsdpV1Tag, RsdpV2Tag, SmbiosTag,
 };
 
 use alloc::boxed::Box;
@@ -24,6 +24,8 @@ pub struct Multiboot2InformationBuilder {
     module_tags: Vec<Box<ModuleTag>>,
     efisdt32: Option<EFISdt32>,
     efisdt64: Option<EFISdt64>,
+    rsdp_v1_tag: Option<RsdpV1Tag>,
+    rsdp_v2_tag: Option<RsdpV2Tag>,
     smbios_tags: Vec<Box<SmbiosTag>>,
 }
 
@@ -39,6 +41,8 @@ impl Multiboot2InformationBuilder {
             framebuffer_tag: None,
             memory_map_tag: None,
             module_tags: Vec::new(),
+            rsdp_v1_tag: None,
+            rsdp_v2_tag: None,
             smbios_tags: Vec::new(),
         }
     }
@@ -91,6 +95,12 @@ impl Multiboot2InformationBuilder {
         for tag in &self.module_tags {
             len += Self::size_or_up_aligned(tag.byte_size())
         }
+        if let Some(tag) = &self.rsdp_v1_tag {
+            len += Self::size_or_up_aligned(tag.byte_size())
+        }
+        if let Some(tag) = &self.rsdp_v2_tag {
+            len += Self::size_or_up_aligned(tag.byte_size())
+        }
         for tag in &self.smbios_tags {
             len += Self::size_or_up_aligned(tag.byte_size())
         }
@@ -153,6 +163,12 @@ impl Multiboot2InformationBuilder {
         for tag in self.module_tags {
             Self::build_add_bytes(&mut data, &tag.struct_as_bytes(), false)
         }
+        if let Some(tag) = self.rsdp_v1_tag.as_ref() {
+            Self::build_add_bytes(&mut data, &tag.struct_as_bytes(), false)
+        }
+        if let Some(tag) = self.rsdp_v2_tag.as_ref() {
+            Self::build_add_bytes(&mut data, &tag.struct_as_bytes(), false)
+        }
         for tag in self.smbios_tags {
             Self::build_add_bytes(&mut data, &tag.struct_as_bytes(), false)
         }
@@ -198,6 +214,14 @@ impl Multiboot2InformationBuilder {
         self.module_tags.push(module_tag);
     }
 
+    pub fn rsdp_v1_tag(&mut self, rsdp_v1_tag: RsdpV1Tag) {
+        self.rsdp_v1_tag = Some(rsdp_v1_tag);
+    }
+
+    pub fn rsdp_v2_tag(&mut self, rsdp_v2_tag: RsdpV2Tag) {
+        self.rsdp_v2_tag = Some(rsdp_v2_tag);
+    }
+
     pub fn add_smbios_tag(&mut self, smbios_tag: Box<SmbiosTag>) {
         self.smbios_tags.push(smbios_tag);
     }

multiboot2/src/rsdp.rs

@@ -9,6 +9,10 @@
 //! Even though the bootloader should give the address of the real RSDP/XSDT, the checksum and
 //! signature should be manually verified.
 use crate::TagType;
+#[cfg(feature = "builder")]
+use crate::builder::traits::StructAsBytes;
+use core::convert::TryInto;
+use core::mem::size_of;
 use core::slice;
 use core::str;
 use core::str::Utf8Error;
@@ -29,6 +33,17 @@ pub struct RsdpV1Tag {
 }
 
 impl RsdpV1Tag {
+    #[cfg(feature = "builder")]
+    pub fn new(
+        signature: [u8; 8], checksum: u8, oem_id: [u8; 6], revision: u8,
+        rsdt_address: u32,
+    ) -> Self {
+        Self {
+            typ: TagType::AcpiV1, size: size_of::<Self>().try_into().unwrap(),
+            signature, checksum, oem_id, revision, rsdt_address,
+        }
+    }
+
     /// The "RSD PTR " marker singature.
     ///
     /// This is originally a 8-byte C string (not null terminated!) that must contain "RSD PTR "
@@ -62,6 +77,13 @@ impl RsdpV1Tag {
     }
 }
 
+#[cfg(feature = "builder")]
+impl StructAsBytes for RsdpV1Tag {
+    fn byte_size(&self) -> usize {
+        size_of::<Self>()
+    }
+}
+
 /// This tag contains a copy of RSDP as defined per ACPI 2.0 or later specification.
 #[derive(Clone, Copy, Debug)]
 #[repr(C, packed)]
@@ -72,14 +94,26 @@ pub struct RsdpV2Tag {
     checksum: u8,
     oem_id: [u8; 6],
     revision: u8,
-    _rsdt_address: u32,
+    rsdt_address: u32,
     length: u32,
     xsdt_address: u64, // This is the PHYSICAL address of the XSDT
     ext_checksum: u8,
     _reserved: [u8; 3],
 }
 
 impl RsdpV2Tag {
+    #[cfg(feature = "builder")]
+    pub fn new(
+        signature: [u8; 8], checksum: u8, oem_id: [u8; 6], revision: u8,
+        rsdt_address: u32, length: u32, xsdt_address: u64, ext_checksum: u8,
+    ) -> Self {
+        Self {
+            typ: TagType::AcpiV2, size: size_of::<Self>().try_into().unwrap(),
+            signature, checksum, oem_id, revision, rsdt_address, length,
+            xsdt_address, ext_checksum, _reserved: [0; 3],
+        }
+    }
+
     /// The "RSD PTR " marker signature.
     ///
     /// This is originally a 8-byte C string (not null terminated!) that must contain "RSD PTR ".
@@ -120,3 +154,10 @@ impl RsdpV2Tag {
         self.ext_checksum
     }
 }
+
+#[cfg(feature = "builder")]
+impl StructAsBytes for RsdpV2Tag {
+    fn byte_size(&self) -> usize {
+        size_of::<Self>()
+    }
+}