Merge pull request #88 from FrameworkComputer/stable

Author: JohnAZoidberg

Cargo.lock

@@ -12,7 +12,7 @@ linux = ["linux_pio", "unix"]
 windows = ["std", "smbios", "dep:windows", "win_driver"]
 smbios = ["dep:smbios-lib"]
 std = ["dep:regex", "dep:clap", "smbios-lib?/std", "dep:hidapi", "dep:rusb"]
-uefi = ["dep:redox_dmi", "dep:plain", "raw_pio", "smbios", "lazy_static/spin_no_std", "dep:uefi", "dep:uefi-services"]
+uefi = ["dep:plain", "raw_pio", "smbios", "lazy_static/spin_no_std", "dep:uefi", "dep:uefi-services"]
 
 # EC communication via Port I/O on Linux
 linux_pio = ["dep:libc"]
@@ -37,7 +37,6 @@ num-traits = { version = "0.2", default-features = false }
 log = "0.4"
 uefi = { version = "0.20", features = ["alloc"], optional = true }
 uefi-services = { version = "0.17", optional = true }
-redox_dmi = { version = "0.1.5", optional = true }
 plain = { version = "0.2.3", optional = true }
 spin = { version = "0.9.4", optional = false }
 hidapi = { version = "2.1.0", optional = true }

framework_lib/Cargo.toml

@@ -1,7 +1,6 @@
 //! A library to interact with [Framework Computer](https://frame.work) hardware and building tools to do so.
 
 #![cfg_attr(feature = "uefi", no_std)]
-#![feature(prelude_import)]
 
 extern crate alloc;
 #[cfg(feature = "uefi")]

framework_lib/src/lib.rs

@@ -99,25 +99,68 @@ pub fn enable_page_break() {
     }
 }
 
+#[repr(packed)]
+pub struct Smbios {
+    pub anchor: [u8; 4],
+    pub checksum: u8,
+    pub length: u8,
+    pub major_version: u8,
+    pub minor_version: u8,
+    pub max_structure_size: u16,
+    pub revision: u8,
+    pub formatted: [u8; 5],
+    pub inter_anchor: [u8; 5],
+    pub inter_checksum: u8,
+    pub table_length: u16,
+    pub table_address: u32,
+    pub structure_count: u16,
+    pub bcd_revision: u8,
+}
+
+impl Smbios {
+    pub fn checksum_valid(&self) -> bool {
+        let mut sum: u8 = self.anchor.iter().sum::<u8>();
+        sum += self.checksum;
+        sum += self.length;
+        sum += self.major_version;
+        sum += self.minor_version;
+        sum += self.max_structure_size as u8;
+        sum += self.revision;
+        sum += self.formatted.iter().sum::<u8>();
+        sum == 0
+    }
+}
+
+pub struct Smbios3 {
+    pub anchor: [u8; 5],
+    pub checksum: u8,
+    pub length: u8,
+    pub major_version: u8,
+    pub minor_version: u8,
+    pub docrev: u8,
+    pub revision: u8,
+    _reserved: u8,
+    pub table_length: u32,
+    pub table_address: u64,
+}
+
 pub fn smbios_data() -> Option<Vec<u8>> {
     let st = unsafe { uefi_services::system_table().as_ref() };
     let config_tables = st.config_table();
 
     for table in config_tables {
         let table_data = match table.guid {
             SMBIOS3_GUID => unsafe {
-                let smbios = &*(table.address as *const dmi::Smbios);
-                // TODO: Seems to be invalid. Is the calculation correct?
-                //smbios.is_valid();
+                let smbios = &*(table.address as *const Smbios3);
+                assert!(smbios.anchor == *b"_SM3_");
                 Some(slice::from_raw_parts(
                     smbios.table_address as *const u8,
                     smbios.table_length as usize,
                 ))
             },
             SMBIOS_GUID => unsafe {
-                let smbios = &*(table.address as *const dmi::Smbios);
-                // TODO: Seems to be invalid. Is the calculation correct?
-                //smbios.is_valid();
+                let smbios = &*(table.address as *const Smbios);
+                assert!(smbios.checksum_valid());
                 Some(slice::from_raw_parts(
                     smbios.table_address as *const u8,
                     smbios.table_length as usize,

framework_lib/src/uefi/mod.rs

@@ -42,8 +42,6 @@ $(BUILD)/efi.img: $(BUILD)/boot.efi
 $(BUILD)/boot.efi: ../Cargo.lock $(SRC_DIR)/Cargo.toml $(SRC_DIR)/src/*
 	  mkdir -p $(BUILD)
 		cargo rustc \
-		-Z build-std=core,alloc \
-		-Z build-std-features=compiler-builtins-mem \
 		--target $(TARGET) \
 		--release \
 		-- \

framework_uefi/Makefile

@@ -1,8 +1,5 @@
-# Can't use stable rust yet, since we need to support the UEFI target
-# UEFI will be supported in stable, soon.
-# Once rust-1.68 is released, we can use stable.
 [toolchain]
-# 2022-12-26
-channel = "nightly-2023-03-18"
+profile = "default"
+channel = "1.68.2"
 components = ["rust-src", "clippy", "rustfmt"]
 targets = ["x86_64-unknown-uefi"]