Use psci crate for PSCI calls.
Bug: 223166344
Test: Ran as unprotected VM bootloader under crosvm.
Change-Id: I8619f1b12fa63bcff581eeeb3ce3223b21cd793d
diff --git a/pvmfw/src/exceptions.rs b/pvmfw/src/exceptions.rs
index 2bdcf9c..f67a524 100644
--- a/pvmfw/src/exceptions.rs
+++ b/pvmfw/src/exceptions.rs
@@ -16,59 +16,59 @@
use crate::console::emergency_write_str;
use crate::eprintln;
-use crate::psci::system_reset;
use core::arch::asm;
+use psci::system_reset;
#[no_mangle]
extern "C" fn sync_exception_current() {
emergency_write_str("sync_exception_current\n");
print_esr();
- system_reset();
+ system_reset().unwrap();
}
#[no_mangle]
extern "C" fn irq_current() {
emergency_write_str("irq_current\n");
- system_reset();
+ system_reset().unwrap();
}
#[no_mangle]
extern "C" fn fiq_current() {
emergency_write_str("fiq_current\n");
- system_reset();
+ system_reset().unwrap();
}
#[no_mangle]
extern "C" fn serr_current() {
emergency_write_str("serr_current\n");
print_esr();
- system_reset();
+ system_reset().unwrap();
}
#[no_mangle]
extern "C" fn sync_lower() {
emergency_write_str("sync_lower\n");
print_esr();
- system_reset();
+ system_reset().unwrap();
}
#[no_mangle]
extern "C" fn irq_lower() {
emergency_write_str("irq_lower\n");
- system_reset();
+ system_reset().unwrap();
}
#[no_mangle]
extern "C" fn fiq_lower() {
emergency_write_str("fiq_lower\n");
- system_reset();
+ system_reset().unwrap();
}
#[no_mangle]
extern "C" fn serr_lower() {
emergency_write_str("serr_lower\n");
print_esr();
- system_reset();
+ system_reset().unwrap();
}
#[inline]