[DO NOT MERGE] [OLD] firmware_uefi: add diagnostics service for uefi logs

flowey/flowey_lib_hvlite/src/_jobs/cfg_versions.rs

@@ -23,7 +23,7 @@ pub const MDBOOK: &str = "0.4.40";
 pub const MDBOOK_ADMONISH: &str = "1.18.0";
 pub const MDBOOK_MERMAID: &str = "0.14.0";
 pub const RUSTUP_TOOLCHAIN: &str = "1.87.0";
-pub const MU_MSVM: &str = "24.0.4";
+pub const MU_MSVM: &str = "25.1.3-alpha";
 pub const NEXTEST: &str = "0.9.74";
 pub const NODEJS: &str = "18.x";
 // N.B. Kernel version numbers for dev and stable branches are not directly

vm/devices/firmware/firmware_uefi/Cargo.toml

@@ -39,7 +39,6 @@ mesh.workspace = true
 open_enum.workspace = true
 pal_async.workspace = true
 ucs2.workspace = true
-
 async-trait.workspace = true
 bitfield-struct.workspace = true
 der = { workspace = true, features = ["derive", "alloc", "oid"], optional = true }

vm/devices/firmware/firmware_uefi/src/lib.rs

@@ -104,6 +104,7 @@ struct UefiDeviceServices {
     generation_id: service::generation_id::GenerationIdServices,
     #[inspect(mut)]
     time: service::time::TimeServices,
+    diagnostics: service::diagnostics::DiagnosticsServices,
 }
 
 // Begin and end range are inclusive.
@@ -199,6 +200,7 @@ impl UefiDevice {
                     generation_id_deps,
                 ),
                 time: service::time::TimeServices::new(time_source),
+                diagnostics: service::diagnostics::DiagnosticsServices::new(),
             },
         };
         Ok(uefi)
@@ -252,6 +254,8 @@ impl UefiDevice {
                     );
                 }
             }
+            UefiCommand::SET_EFI_DIAGNOSTICS_GPA => self.service.diagnostics.set_gpa(data),
+            UefiCommand::PROCESS_EFI_DIAGNOSTICS => self.process_diagnostics(),
             _ => tracelimit::warn_ratelimited!(addr, data, "unknown uefi write"),
         }
     }
@@ -400,6 +404,10 @@ open_enum::open_enum! {
         WATCHDOG_RESOLUTION          = 0x28,
         WATCHDOG_COUNT               = 0x29,
 
+        // EFI Diagnostics
+        SET_EFI_DIAGNOSTICS_GPA      = 0x2B,
+        PROCESS_EFI_DIAGNOSTICS      = 0x2C,
+
         // Event Logging (Windows 8.1 MQ/M0)
         EVENT_LOG_FLUSH              = 0x30,
 
@@ -432,6 +440,7 @@ mod save_restore {
     use vmcore::save_restore::SaveRestore;
 
     mod state {
+        use crate::service::diagnostics::DiagnosticsServices;
         use crate::service::event_log::EventLogServices;
         use crate::service::generation_id::GenerationIdServices;
         use crate::service::nvram::NvramServices;
@@ -457,6 +466,8 @@ mod save_restore {
             pub generation_id: <GenerationIdServices as SaveRestore>::SavedState,
             #[mesh(6)]
             pub time: <TimeServices as SaveRestore>::SavedState,
+            #[mesh(7)]
+            pub diagnostics: <DiagnosticsServices as SaveRestore>::SavedState,
         }
     }
 
@@ -475,6 +486,7 @@ mod save_restore {
                         uefi_watchdog,
                         generation_id,
                         time,
+                        diagnostics,
                     },
                 address,
             } = self;
@@ -487,6 +499,7 @@ mod save_restore {
                 watchdog: uefi_watchdog.save()?,
                 generation_id: generation_id.save()?,
                 time: time.save()?,
+                diagnostics: diagnostics.save()?,
             })
         }
 
@@ -499,6 +512,7 @@ mod save_restore {
                 watchdog,
                 generation_id,
                 time,
+                diagnostics,
             } = state;
 
             self.address = address;
@@ -508,6 +522,7 @@ mod save_restore {
             self.service.uefi_watchdog.restore(watchdog)?;
             self.service.generation_id.restore(generation_id)?;
             self.service.time.restore(time)?;
+            self.service.diagnostics.restore(diagnostics)?;
 
             Ok(())
         }