arm64: use aarch64-cpu crate

Signed-off-by: Daniel Maslowski <[email protected]>
r9os · Nov 27, 2024 · 09524e8 · 09524e8
1 parent 0cda5c2
commit 09524e8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aarch64/Cargo.toml b/aarch64/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 default-target = "aarch64-unknown-none"
 
 [dependencies]
+aarch64-cpu = "9.4.0"
 bitstruct = "0.1"
 port = { path = "../port" }
 num_enum = { version = "0.7", default-features = false }
diff --git a/aarch64/src/main.rs b/aarch64/src/main.rs
@@ -22,6 +22,7 @@ mod vm;
 
 use crate::kmem::from_virt_to_physaddr;
 use crate::vm::kernel_root;
+
 use core::ffi::c_void;
 use core::ptr;
 use port::fdt::DeviceTree;
@@ -125,6 +126,7 @@ pub extern "C" fn main9(dtb_va: usize) {
     println!("r9 from the Internet");
     println!("DTB found at: {:#x}", dtb_va);
     println!("midr_el1: {:?}", registers::MidrEl1::read());
+    // registers::CNTVOFF_EL2.set(0);
 
     print_binary_sections();
     print_physical_memory_info();

diff --git a/aarch64/src/registers.rs b/aarch64/src/registers.rs
@@ -1,5 +1,7 @@
 #![allow(non_upper_case_globals)]
 
+use aarch64_cpu::registers::{Readable, Writeable};
+use aarch64_cpu::{asm, registers::MIDR_EL1};
 use bitstruct::bitstruct;
 use core::fmt;
 use num_enum::TryFromPrimitive;
@@ -46,16 +48,7 @@ bitstruct! {
 
 impl MidrEl1 {
     pub fn read() -> Self {
-        #[cfg(not(test))]
-        {
-            let mut value: u64;
-            unsafe {
-                core::arch::asm!("mrs {value}, midr_el1", value = out(reg) value);
-            }
-            Self(value)
-        }
-        #[cfg(test)]
-        Self(0)
+        Self(if cfg!(test) { 0 } else { MIDR_EL1.extract().into() })
     }
 
     pub fn partnum_enum(&self) -> Result<PartNum, u16> {