Support dumping Turin data structures and Milan data structures at the same time.

Fixes <#191>.

Author: daym

Cargo.lock

@@ -7,7 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", tag = "v0.3.3", features = ["std", "serde", "schemars"] }
+amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", branch = "issue-135", features = ["std", "serde", "schemars"] }
 amd-efs = { git = "ssh://git@github.com/oxidecomputer/amd-efs.git", tag = "v0.4.0", features = ["std", "serde", "schemars"] }
 goblin = { version = "0.4", features = ["elf64", "endian_fd"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", tag = "v0.3.3", features = ["std", "serde", "schemars"] }
+amd-apcb = { git = "https://github.com/oxidecomputer/amd-apcb.git", branch = "issue-135", features = ["std", "serde", "schemars"] }
 amd-efs = { git = "ssh://git@github.com/oxidecomputer/amd-efs.git", tag = "v0.4.0", features = ["std", "serde", "schemars"] }
 schemars = "0.8.8"
 serde = { version = "1.0", default-features = false, features = ["derive"] }

amd-host-image-builder-config/Cargo.lock

@@ -1,4 +1,4 @@
-use amd_apcb::{Apcb, ApcbIoOptions};
+use amd_apcb::{Apcb, ApcbIoOptions, Context};
 
 use amd_efs::{
     AddressMode, BhdDirectory, BhdDirectoryEntry, BhdDirectoryEntryType,
@@ -772,6 +772,7 @@ fn dump_bhd_directory<'a, T: FlashRead + FlashWrite>(
     bhd_directory: &BhdDirectory,
     apcb_buffer_option: &mut Option<&'a mut [u8]>,
     blob_dump_dirname: &Option<PathBuf>,
+    context: Context,
 ) -> SerdeBhdDirectoryVariant<'a> {
     if let Some(blob_dump_dirname) = &blob_dump_dirname {
         let mut path = PathBuf::new();
@@ -808,7 +809,7 @@ fn dump_bhd_directory<'a, T: FlashRead + FlashWrite>(
                                 std::borrow::Cow::Borrowed(
                                     apcb_buffer,
                                 ),
-                                &ApcbIoOptions::default(),
+                                &ApcbIoOptions::default().with_context(context).build(),
                             )
                             .unwrap();
                             apcb.validate(None).unwrap(); // TODO: abl0 version ?
@@ -836,7 +837,7 @@ fn dump_bhd_directory<'a, T: FlashRead + FlashWrite>(
                                 t.push("bhd-second-level");
                                 t
                             });
-                            let variant = dump_bhd_directory(storage, &sub_bhd_directory, apcb_buffer_option, &subdir); //SerdeBhdDirectoryVariant
+                            let variant = dump_bhd_directory(storage, &sub_bhd_directory, apcb_buffer_option, &subdir, context); //SerdeBhdDirectoryVariant
                             Some(SerdeBhdEntry {
                                 source: SerdeBhdSource::SecondLevelDirectory(match variant {
                                     SerdeBhdDirectoryVariant::BhdDirectory(d) => d,
@@ -922,6 +923,13 @@ fn dump(
         Some(efs.psp_directory().unwrap().beginning());
     let bhd_main_directory_flash_location =
         Some(efs.bhd_directory(None).unwrap().beginning());
+
+    let psp = dump_psp_directory(
+        &storage,
+        &efs.psp_directory().unwrap(),
+        &blob_dump_dirname,
+    );
+
     let config = SerdeConfig {
         processor_generation: *gen,
         spi_mode_bulldozer: efs.spi_mode_bulldozer().unwrap(),
@@ -932,17 +940,30 @@ fn dump(
         psp_main_directory_flash_location,
         bhd_main_directory_flash_location,
         // TODO: psp_directory or psp_combo_directory
-        psp: dump_psp_directory(
-            &storage,
-            &efs.psp_directory().unwrap(),
-            &blob_dump_dirname,
-        ),
+        psp,
         // TODO: bhd_directory or bhd_combo_directory
         bhd: dump_bhd_directory(
             &storage,
             &efs.bhd_directory(None).unwrap(),
             &mut apcb_buffer_option,
             &blob_dump_dirname,
+            match *gen {
+                ProcessorGeneration::Naples => {
+                    Context::builder().with_generation(1).build() // FIXME abl0 version (from "psp" variable)
+                } // FIXME
+                ProcessorGeneration::Rome => {
+                    Context::builder().with_generation(2).build()
+                }
+                ProcessorGeneration::Milan => {
+                    Context::builder().with_generation(3).build()
+                }
+                ProcessorGeneration::Genoa => {
+                    Context::builder().with_generation(4).build()
+                }
+                ProcessorGeneration::Turin => {
+                    Context::builder().with_generation(5).build()
+                }
+            },
         ),
     };
     if let Some(blob_dump_dirname) = &blob_dump_dirname {
@@ -1183,6 +1204,8 @@ fn prepare_bhd_directory_contents<'a>(
                     // Note: We need to do this
                     // manually because validation
                     // needs ABL_VERSION.
+                    // FIXME make sure to compare apcb.context() with our processor generation here.
+                    // Since the context is actually serialized to the JSON5 it could be messed with by the user and then deserialized again.
                     apcb.validate(None)
                         .map_err(apcb_to_io_error)
                         .unwrap();
@@ -1227,7 +1250,7 @@ fn generate(
     blobdirs: Vec<PathBuf>,
     verbose: bool,
 ) -> std::io::Result<()> {
-    let filename = &output_filename;
+    let filename = output_filename;
     let flash_to_io_error = |e: amd_efs::flash::Error| {
         std::io::Error::new(
             std::io::ErrorKind::Other,