Bump rust version to newer nightly and use acpi crate to print acpi info

Jiajie Chen · Jiajie Chen · commit 96357e63df10 · 2019-06-30T03:41:50.000+08:00
diff --git a/crate/memory/src/cow.rs b/crate/memory/src/cow.rs
@@ -110,7 +110,7 @@ impl<T: PageTable> CowExt<T> {
             return true;
         }
         use core::mem::MaybeUninit;
-        let mut temp_data: [u8; PAGE_SIZE] = unsafe { MaybeUninit::uninitialized().into_initialized() };
+        let mut temp_data: [u8; PAGE_SIZE] = unsafe { MaybeUninit::zeroed().assume_init() };
         temp_data[..].copy_from_slice(self.get_page_slice_mut(addr));
 
         self.unmap_shared(addr);
diff --git a/crate/memory/src/paging/mock_page_table.rs b/crate/memory/src/paging/mock_page_table.rs
@@ -147,7 +147,7 @@ impl MockPageTable {
         use core::mem::MaybeUninit;
         MockPageTable {
             entries: [MockEntry::default(); PAGE_COUNT],
-            data: unsafe { MaybeUninit::uninitialized().into_initialized() },
+            data: unsafe { MaybeUninit::zeroed().assume_init() },
             page_fault_handler: None,
         }
     }
diff --git a/crate/memory/src/swap/mock_swapper.rs b/crate/memory/src/swap/mock_swapper.rs
@@ -17,7 +17,7 @@ pub struct MockSwapper {
 impl Swapper for MockSwapper {
     fn swap_out(&mut self, data: &[u8]) -> Result<usize, ()> {
         let id = self.alloc_id();
-        let mut slice: [u8; PAGE_SIZE] = unsafe { MaybeUninit::uninitialized().into_initialized() };
+        let mut slice: [u8; PAGE_SIZE] = unsafe { MaybeUninit::zeroed().assume_init() };
         slice.copy_from_slice(data);
         self.map.insert(id, slice);
         Ok(id)
@@ -27,7 +27,7 @@ impl Swapper for MockSwapper {
         if !self.map.contains_key(&token) {
             return Err(());
         }
-        let mut slice: [u8; PAGE_SIZE] = unsafe { MaybeUninit::uninitialized().into_initialized() };
+        let mut slice: [u8; PAGE_SIZE] = unsafe { MaybeUninit::zeroed().assume_init() };
         slice.copy_from_slice(data);
         self.map.insert(token, slice);
         Ok(())
@@ -64,8 +64,8 @@ mod test {
     #[test]
     fn swap_out_in() {
         let mut swapper = MockSwapper::default();
-        let mut data: [u8; 4096] = unsafe { MaybeUninit::uninitialized().into_initialized() };
-        let data1: [u8; 4096] = unsafe { MaybeUninit::uninitialized().into_initialized() };
+        let mut data: [u8; 4096] = unsafe { MaybeUninit::zeroed().assume_init() };
+        let data1: [u8; 4096] = unsafe { MaybeUninit::zeroed().assume_init() };
         let token = swapper.swap_out(&data1).unwrap();
         swapper.swap_in(token, &mut data).unwrap();
         assert_data_eq(&data, &data1);
@@ -74,9 +74,9 @@ mod test {
     #[test]
     fn swap_update() {
         let mut swapper = MockSwapper::default();
-        let mut data: [u8; 4096] = unsafe { MaybeUninit::uninitialized().into_initialized() };
-        let data1: [u8; 4096] = unsafe { MaybeUninit::uninitialized().into_initialized() };
-        let data2: [u8; 4096] = unsafe { MaybeUninit::uninitialized().into_initialized() };
+        let mut data: [u8; 4096] = unsafe { MaybeUninit::zeroed().assume_init() };
+        let data1: [u8; 4096] = unsafe { MaybeUninit::zeroed().assume_init() };
+        let data2: [u8; 4096] = unsafe { MaybeUninit::zeroed().assume_init() };
         let token = swapper.swap_out(&data1).unwrap();
         swapper.swap_update(token, &data2).unwrap();
         swapper.swap_in(token, &mut data).unwrap();
@@ -86,7 +86,7 @@ mod test {
     #[test]
     fn invalid_token() {
         let mut swapper = MockSwapper::default();
-        let mut data: [u8; 4096] = unsafe { MaybeUninit::uninitialized().into_initialized() };
+        let mut data: [u8; 4096] = unsafe { MaybeUninit::zeroed().assume_init() };
         assert_eq!(swapper.swap_in(0, &mut data), Err(()));
     }
 }
diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -77,6 +77,7 @@ x86_64 = "0.6"
 raw-cpuid = "6.0"
 uart_16550 = "0.2"
 pc-keyboard = "0.5"
+acpi = "0.2"
 
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
 riscv = { git = "https://github.com/rcore-os/riscv", features = ["inline-asm"] }
diff --git a/kernel/src/arch/aarch64/paging.rs b/kernel/src/arch/aarch64/paging.rs
@@ -213,7 +213,7 @@ impl PageTableImpl {
         ManuallyDrop::new(PageTableImpl {
             page_table: MappedPageTable::new(table, frame_to_page_table),
             root_frame: frame,
-            entry: core::mem::MaybeUninit::uninitialized().into_initialized(),
+            entry: core::mem::MaybeUninit::zeroed().assume_init(),
         })
     }
     /// The method for getting the kernel page table.
@@ -224,7 +224,7 @@ impl PageTableImpl {
         ManuallyDrop::new(PageTableImpl {
             page_table: MappedPageTable::new(table, frame_to_page_table),
             root_frame: frame,
-            entry: core::mem::MaybeUninit::uninitialized().into_initialized(),
+            entry: core::mem::MaybeUninit::zeroed().assume_init(),
         })
     }
 }
@@ -239,7 +239,7 @@ impl PageTableExt for PageTableImpl {
             PageTableImpl {
                 page_table: MappedPageTable::new(table, frame_to_page_table),
                 root_frame: frame,
-                entry: core::mem::MaybeUninit::uninitialized().into_initialized(),
+                entry: core::mem::MaybeUninit::zeroed().assume_init(),
             }
         }
     }
diff --git a/kernel/src/arch/mipsel/paging.rs b/kernel/src/arch/mipsel/paging.rs
@@ -156,7 +156,7 @@ impl PageTableImpl {
         ManuallyDrop::new(PageTableImpl {
             page_table: TwoLevelPageTable::new(table),
             root_frame: frame,
-            entry: unsafe { core::mem::MaybeUninit::uninitialized().into_initialized() },
+            entry: unsafe { core::mem::MaybeUninit::zeroed().assume_init() },
         })
     }
 
@@ -178,7 +178,7 @@ impl PageTableExt for PageTableImpl {
         PageTableImpl {
             page_table: TwoLevelPageTable::new(table),
             root_frame: frame,
-            entry: unsafe { core::mem::MaybeUninit::uninitialized().into_initialized() },
+            entry: unsafe { core::mem::MaybeUninit::zeroed().assume_init() },
         }
     }
 
diff --git a/kernel/src/arch/riscv32/paging.rs b/kernel/src/arch/riscv32/paging.rs
@@ -158,7 +158,7 @@ impl PageTableImpl {
         ManuallyDrop::new(PageTableImpl {
             page_table: TopLevelPageTable::new(table, PHYSICAL_MEMORY_OFFSET),
             root_frame: frame,
-            entry: unsafe { core::mem::MaybeUninit::uninitialized().into_initialized() },
+            entry: unsafe { core::mem::MaybeUninit::zeroed().assume_init() },
         })
     }
     /// The method for getting the kernel page table.
@@ -180,7 +180,7 @@ impl PageTableExt for PageTableImpl {
         PageTableImpl {
             page_table: TopLevelPageTable::new(table, PHYSICAL_MEMORY_OFFSET),
             root_frame: frame,
-            entry: unsafe { core::mem::uninitialized() },
+            entry: unsafe { core::mem::zeroed() },
         }
     }
 
diff --git a/kernel/src/arch/x86_64/acpi.rs b/kernel/src/arch/x86_64/acpi.rs
@@ -0,0 +1,31 @@
+use crate::arch::consts::PHYSICAL_MEMORY_OFFSET;
+use acpi::{search_for_rsdp_bios, AcpiHandler, PhysicalMapping};
+use core::ptr::NonNull;
+
+struct Handler;
+
+impl AcpiHandler for Handler {
+    fn map_physical_region<T>(
+        &mut self,
+        physical_address: usize,
+        size: usize,
+    ) -> PhysicalMapping<T> {
+        PhysicalMapping {
+            physical_start: physical_address,
+            virtual_start: NonNull::new((physical_address + PHYSICAL_MEMORY_OFFSET) as *mut T)
+                .unwrap(),
+            region_length: size,
+            mapped_length: size,
+        }
+    }
+
+    fn unmap_physical_region<T>(&mut self, region: PhysicalMapping<T>) {
+        // do nothing
+    }
+}
+
+pub fn init() {
+    let mut handler = Handler {};
+    let res = unsafe { search_for_rsdp_bios(&mut handler) };
+    debug!("ACPI {:#x?}", res);
+}
diff --git a/kernel/src/arch/x86_64/mod.rs b/kernel/src/arch/x86_64/mod.rs
@@ -2,6 +2,7 @@ use bootloader::bootinfo::{BootInfo, MemoryRegionType};
 use core::sync::atomic::*;
 use log::*;
 
+pub mod acpi;
 pub mod board;
 pub mod consts;
 pub mod cpu;
@@ -64,6 +65,8 @@ pub extern "C" fn _start(boot_info: &'static BootInfo) -> ! {
     crate::drivers::init();
     // init cpu scheduler and process manager, and add user shell app in process manager
     crate::process::init();
+    // load acpi
+    acpi::init();
 
     // wake up other CPUs
     AP_CAN_INIT.store(true, Ordering::Relaxed);
diff --git a/kernel/src/arch/x86_64/paging.rs b/kernel/src/arch/x86_64/paging.rs
@@ -203,7 +203,7 @@ impl PageTableImpl {
         let table = &mut *frame_to_page_table(frame);
         ManuallyDrop::new(PageTableImpl(
             MappedPageTable::new(table, frame_to_page_table),
-            core::mem::MaybeUninit::uninitialized().into_initialized(),
+            core::mem::MaybeUninit::zeroed().assume_init(),
             frame,
         ))
     }
@@ -223,7 +223,7 @@ impl PageTableExt for PageTableImpl {
         unsafe {
             PageTableImpl(
                 MappedPageTable::new(table, frame_to_page_table),
-                core::mem::MaybeUninit::uninitialized().into_initialized(),
+                core::mem::MaybeUninit::zeroed().assume_init(),
                 frame,
             )
         }
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
@@ -8,6 +8,7 @@
 #![feature(global_asm)]
 #![feature(fnbox)]
 #![feature(maybe_uninit)]
+#![feature(alloc_prelude)]
 #![deny(unused_must_use)]
 #![no_std]
 
diff --git a/kernel/src/memory.rs b/kernel/src/memory.rs
@@ -191,7 +191,7 @@ pub fn copy_from_user<T>(addr: *const T) -> Option<T> {
     if !access_ok(addr as usize, size_of::<T>()) {
         return None;
     }
-    let mut dst: T = unsafe { core::mem::uninitialized() };
+    let mut dst: T = unsafe { core::mem::zeroed() };
     match unsafe { read_user(&mut dst, addr) } {
         0 => Some(dst),
         _ => None,
diff --git a/kernel/src/process/structs.rs b/kernel/src/process/structs.rs
@@ -103,7 +103,7 @@ impl Thread {
         Box::new(Thread {
             context: Context::null(),
             // safety: other fields will never be used
-            ..core::mem::MaybeUninit::uninitialized().into_initialized()
+            ..core::mem::MaybeUninit::zeroed().assume_init()
         })
     }
 
@@ -146,7 +146,7 @@ impl Thread {
     ) -> Result<(MemorySet, usize, usize), &'static str> {
         // Read ELF header
         // 0x3c0: magic number from ld-musl.so
-        let mut data: [u8; 0x3c0] = unsafe { MaybeUninit::uninitialized().into_initialized() };
+        let mut data: [u8; 0x3c0] = unsafe { MaybeUninit::zeroed().assume_init() };
         inode
             .read_at(0, &mut data)
             .map_err(|_| "failed to read from INode")?;
@@ -197,8 +197,7 @@ impl Thread {
                 .lookup_follow(loader_path, FOLLOW_MAX_DEPTH)
                 .map_err(|_| "interpreter not found")?;
             // load loader by bias and set aux vector.
-            let mut interp_data: [u8; 0x3c0] =
-                unsafe { MaybeUninit::uninitialized().into_initialized() };
+            let mut interp_data: [u8; 0x3c0] = unsafe { MaybeUninit::zeroed().assume_init() };
             interp_inode
                 .read_at(0, &mut interp_data)
                 .map_err(|_| "failed to read from INode")?;
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-03-05
+nightly-2019-06-15

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ impl<T: PageTable> CowExt<T> {`
`110`	`110`	`return true;`
`111`	`111`	`}`
`112`	`112`	`use core::mem::MaybeUninit;`
`113`		`- let mut temp_data: [u8; PAGE_SIZE] = unsafe { MaybeUninit::uninitialized().into_initialized() };`
	`113`	`+ let mut temp_data: [u8; PAGE_SIZE] = unsafe { MaybeUninit::zeroed().assume_init() };`
`114`	`114`	`temp_data[..].copy_from_slice(self.get_page_slice_mut(addr));`
`115`	`115`
`116`	`116`	`self.unmap_shared(addr);`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ impl MockPageTable {`
`147`	`147`	`use core::mem::MaybeUninit;`
`148`	`148`	`MockPageTable {`
`149`	`149`	`entries: [MockEntry::default(); PAGE_COUNT],`
`150`		`- data: unsafe { MaybeUninit::uninitialized().into_initialized() },`
	`150`	`+ data: unsafe { MaybeUninit::zeroed().assume_init() },`
`151`	`151`	`page_fault_handler: None,`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ impl PageTableImpl {`
`213`	`213`	`ManuallyDrop::new(PageTableImpl {`
`214`	`214`	`page_table: MappedPageTable::new(table, frame_to_page_table),`
`215`	`215`	`root_frame: frame,`
`216`		`- entry: core::mem::MaybeUninit::uninitialized().into_initialized(),`
	`216`	`+ entry: core::mem::MaybeUninit::zeroed().assume_init(),`
`217`	`217`	`})`
`218`	`218`	`}`
`219`	`219`	`/// The method for getting the kernel page table.`
`@@ -224,7 +224,7 @@ impl PageTableImpl {`
`224`	`224`	`ManuallyDrop::new(PageTableImpl {`
`225`	`225`	`page_table: MappedPageTable::new(table, frame_to_page_table),`
`226`	`226`	`root_frame: frame,`
`227`		`- entry: core::mem::MaybeUninit::uninitialized().into_initialized(),`
	`227`	`+ entry: core::mem::MaybeUninit::zeroed().assume_init(),`
`228`	`228`	`})`
`229`	`229`	`}`
`230`	`230`	`}`
`@@ -239,7 +239,7 @@ impl PageTableExt for PageTableImpl {`
`239`	`239`	`PageTableImpl {`
`240`	`240`	`page_table: MappedPageTable::new(table, frame_to_page_table),`
`241`	`241`	`root_frame: frame,`
`242`		`- entry: core::mem::MaybeUninit::uninitialized().into_initialized(),`
	`242`	`+ entry: core::mem::MaybeUninit::zeroed().assume_init(),`
`243`	`243`	`}`
`244`	`244`	`}`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ impl PageTableImpl {`
`156`	`156`	`ManuallyDrop::new(PageTableImpl {`
`157`	`157`	`page_table: TwoLevelPageTable::new(table),`
`158`	`158`	`root_frame: frame,`
`159`		`- entry: unsafe { core::mem::MaybeUninit::uninitialized().into_initialized() },`
	`159`	`+ entry: unsafe { core::mem::MaybeUninit::zeroed().assume_init() },`
`160`	`160`	`})`
`161`	`161`	`}`
`162`	`162`
`@@ -178,7 +178,7 @@ impl PageTableExt for PageTableImpl {`
`178`	`178`	`PageTableImpl {`
`179`	`179`	`page_table: TwoLevelPageTable::new(table),`
`180`	`180`	`root_frame: frame,`
`181`		`- entry: unsafe { core::mem::MaybeUninit::uninitialized().into_initialized() },`
	`181`	`+ entry: unsafe { core::mem::MaybeUninit::zeroed().assume_init() },`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ impl PageTableImpl {`
`158`	`158`	`ManuallyDrop::new(PageTableImpl {`
`159`	`159`	`page_table: TopLevelPageTable::new(table, PHYSICAL_MEMORY_OFFSET),`
`160`	`160`	`root_frame: frame,`
`161`		`- entry: unsafe { core::mem::MaybeUninit::uninitialized().into_initialized() },`
	`161`	`+ entry: unsafe { core::mem::MaybeUninit::zeroed().assume_init() },`
`162`	`162`	`})`
`163`	`163`	`}`
`164`	`164`	`/// The method for getting the kernel page table.`
`@@ -180,7 +180,7 @@ impl PageTableExt for PageTableImpl {`
`180`	`180`	`PageTableImpl {`
`181`	`181`	`page_table: TopLevelPageTable::new(table, PHYSICAL_MEMORY_OFFSET),`
`182`	`182`	`root_frame: frame,`
`183`		`- entry: unsafe { core::mem::uninitialized() },`
	`183`	`+ entry: unsafe { core::mem::zeroed() },`
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`