Ingest Patina version 23.0.0 (#207)

Update to Patina major version 23. To do this, the following changes are
needed:

1. Update serial port creation for new mutable access and construction
2. Update patina_performance configuration to PlatformInfo
3. Update various SDK paths/names from SDK refactor

Author: cfernald

Cargo.lock

@@ -26,18 +26,18 @@ path = "src/lib.rs"
 [dependencies]
 
 # Patina dependencies
-patina = { version = "22" }
-patina_acpi = { version = "22" }
-patina_adv_logger = { version = "22" }
-patina_debugger = { version = "22" }
-patina_dxe_core = { version = "22" }
-patina_ffs_extractors = { version = "22" }
-patina_mm = { version = "22" }
-patina_performance = { version = "22" }
-patina_samples = { version = "22" }
-patina_smbios = { version = "22" }
-patina_stacktrace = { version = "22" }
-patina_test = { version = "22", features = ["test-runner"] }
+patina = { version = "23" }
+patina_acpi = { version = "23" }
+patina_adv_logger = { version = "23" }
+patina_debugger = { version = "23" }
+patina_dxe_core = { version = "23" }
+patina_ffs_extractors = { version = "23" }
+patina_mm = { version = "23" }
+patina_performance = { version = "23" }
+patina_samples = { version = "23" }
+patina_smbios = { version = "23" }
+patina_stacktrace = { version = "23" }
+patina_test = { version = "23", features = ["test-runner"] }
 
 # Other dependencies
 log = { version = "^0.4", default-features = false, features = [

Cargo.toml

@@ -12,8 +12,8 @@
 
 use core::{ffi::c_void, panic::PanicInfo};
 #[cfg(feature = "build_debugger")]
-use patina::serial::virtio::VirtioSerial;
-use patina::{log::Format, serial::uart::UartPl011};
+use patina::peripheral::serial::virtio::VirtioSerial;
+use patina::{debug::log::Format, performance::config::PerformanceConfig, peripheral::serial::uart::UartPl011};
 use patina_adv_logger::{
     component::AdvancedLoggerComponent,
     logger::{AdvancedLogger, TargetFilter},
@@ -47,7 +47,8 @@ static LOGGER: AdvancedLogger<UartPl011> = AdvancedLogger::new(
         TargetFilter { target: "efi_memory_map", log_level: log::LevelFilter::Off, hw_filter_override: None },
     ],
     log::LevelFilter::Info,
-    UartPl011::new(PL011_UART_BASE),
+    // SAFETY: PL011_UART_BASE is the valid PL011 UART MMIO base owned by this logger.
+    unsafe { UartPl011::new(PL011_UART_BASE) },
 );
 
 #[cfg(feature = "enable_debugger")]
@@ -99,12 +100,7 @@ impl ComponentInfo for ArmVirt {
             #[cfg(feature = "exit_on_patina_test_failure")]
             qemu_fail();
         }));
-        add.component(patina_performance::component::Performance::new().with_measurements(
-            patina::performance::Measurement::DriverBindingStart     // Adds driver binding start measurements.
-               | patina::performance::Measurement::DriverBindingStop // Adds driver binding stop measurements.
-               | patina::performance::Measurement::LoadImage         // Adds load image measurements.
-               | patina::performance::Measurement::StartImage, // Adds start image measurements.
-        ));
+        add.component(patina_performance::component::Performance::new());
         add.component(patina_acpi::component::AcpiComponent::default());
     }
 
@@ -116,6 +112,12 @@ impl PlatformInfo for ArmVirt {
     type MemoryInfo = Self;
     type ComponentInfo = Self;
     type Extractor = CompositeSectionExtractor;
+
+    const DEFAULT_PERFORMANCE_CONFIG: PerformanceConfig = PerformanceConfig::new()
+        .with_measurement(patina::performance::Measurement::DriverBindingStart)
+        .with_measurement(patina::performance::Measurement::DriverBindingStop)
+        .with_measurement(patina::performance::Measurement::LoadImage)
+        .with_measurement(patina::performance::Measurement::StartImage);
 }
 
 static CORE: Core<ArmVirt> = Core::new(CompositeSectionExtractor::new());

bin/arm_virt_dxe_core.rs

@@ -12,8 +12,8 @@
 
 use core::{ffi::c_void, panic::PanicInfo};
 use patina::{
-    log::{Format, SerialLogger},
-    serial::uart::Uart16550,
+    debug::log::{Format, SerialLogger},
+    peripheral::serial::uart::Uart16550,
 };
 use patina_dxe_core::*;
 use patina_ffs_extractors::CompositeSectionExtractor;
@@ -44,17 +44,19 @@ static LOGGER: SerialLogger<Uart16550> = SerialLogger::new(
         ("goblin", log::LevelFilter::Off),
     ],
     log::LevelFilter::Info,
-    Uart16550::Io { base: 0x402 },
+    // SAFETY: 0x402 is the QEMU OVMF debug-console I/O port owned by this logger.
+    unsafe { Uart16550::new_io(0x402) },
 );
 
 const PM_TIMER_PORT: u16 = 0x608;
 const _ENABLE_DEBUGGER: bool = cfg!(feature = "enable_debugger");
 
 #[cfg(feature = "build_debugger")]
 static DEBUGGER: patina_debugger::PatinaDebugger<Uart16550> =
-    patina_debugger::PatinaDebugger::new(Uart16550::Io { base: 0x3F8 })
-        .with_force_enable(_ENABLE_DEBUGGER)
-        .with_log_policy(patina_debugger::DebuggerLoggingPolicy::FullLogging);
+    // SAFETY: 0x3F8 is the standard COM1 I/O port owned by the debugger.
+    patina_debugger::PatinaDebugger::new(unsafe { Uart16550::new_io(0x3F8) })
+            .with_force_enable(_ENABLE_DEBUGGER)
+            .with_log_policy(patina_debugger::DebuggerLoggingPolicy::FullLogging);
 
 struct Ovmf;