Merge changes Ie725df5a,I18786a33
* changes:
pvmfw: Add top-level Error reporting
vmbase: Make BASE_ADDRESS public
diff --git a/pvmfw/src/main.rs b/pvmfw/src/main.rs
index 8526a92..5f918fb 100644
--- a/pvmfw/src/main.rs
+++ b/pvmfw/src/main.rs
@@ -19,12 +19,24 @@
mod exceptions;
-use vmbase::{main, println};
+use core::fmt;
-main!(main);
+use vmbase::{main, power::reboot, println};
-/// Entry point for pVM firmware.
-pub fn main(fdt_address: u64, payload_start: u64, payload_size: u64, arg3: u64) {
+#[derive(Debug, Clone)]
+enum Error {}
+
+impl fmt::Display for Error {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ #[allow(clippy::match_single_binding)]
+ let msg = match self {
+ _ => "",
+ };
+ write!(f, "{}", msg)
+ }
+}
+
+fn main(fdt_address: u64, payload_start: u64, payload_size: u64, arg3: u64) -> Result<(), Error> {
println!("pVM firmware");
println!(
"fdt_address={:#018x}, payload_start={:#018x}, payload_size={:#018x}, x3={:#018x}",
@@ -32,6 +44,24 @@
);
println!("Starting payload...");
+
+ Ok(())
+}
+
+main!(main_wrapper);
+
+/// Entry point for pVM firmware.
+pub fn main_wrapper(fdt_address: u64, payload_start: u64, payload_size: u64, arg3: u64) {
+ match main(fdt_address, payload_start, payload_size, arg3) {
+ Ok(()) => jump_to_payload(fdt_address, payload_start),
+ Err(e) => {
+ println!("Boot rejected: {}", e);
+ }
+ }
+ reboot()
+}
+
+fn jump_to_payload(fdt_address: u64, payload_start: u64) {
// Safe because this is a function we have implemented in assembly that matches its signature
// here.
unsafe {
diff --git a/vmbase/src/console.rs b/vmbase/src/console.rs
index b52d924..fabea91 100644
--- a/vmbase/src/console.rs
+++ b/vmbase/src/console.rs
@@ -18,7 +18,8 @@
use core::fmt::{write, Arguments, Write};
use spin::mutex::SpinMutex;
-const BASE_ADDRESS: usize = 0x3f8;
+/// Base memory-mapped address of the primary UART device.
+pub const BASE_ADDRESS: usize = 0x3f8;
static CONSOLE: SpinMutex<Option<Uart>> = SpinMutex::new(None);