Support mixed size peripherals in support of espi post-code buffer

build/xtask/src/config.rs

@@ -177,23 +177,40 @@ impl Config {
             let Node::Addrmap { children, .. } = root else {
                 bail!("top-level node is not addrmap");
             };
-            for (i, p) in children.iter().enumerate() {
+            for p in children.iter() {
                 let Node::Addrmap {
                     inst_name,
                     addr_offset,
+                    addr_span_bytes,
                     ..
                 } = &p
                 else {
                     bail!("second-level node must be Addrmap");
                 };
-                if *addr_offset != i * 256 {
-                    bail!("mmio peripherals must be spaced at 256 bytes");
+                let address = *addr_offset as u32 + base_address;
+                let size: u32 = addr_span_bytes
+                    .ok_or_else(|| {
+                        anyhow!(
+                            "mmio peripheral {inst_name} must \
+                             include `addr_span_bytes`"
+                        )
+                    })?
+                    .next_power_of_two()
+                    .try_into()
+                    .unwrap();
+                let size = size.max(32); // min MPU size for STM32H7
+                if !address.is_multiple_of(size) {
+                    bail!(
+                        "address of mmio peripheral `{inst_name}` \
+                         ({address:#x}) is not a multiple of its size \
+                         ({size:#x})"
+                    );
                 }
                 peripherals.insert(
                     format!("mmio_{inst_name}"),
                     Peripheral {
-                        address: *addr_offset as u32 + base_address,
-                        size: 256,
+                        address,
+                        size,
                         interrupts: BTreeMap::new(),
                     },
                 );

drv/spartan7-loader/cosmo-seq/README.md

@@ -1,3 +1,3 @@
 FPGA images and collateral are generated from:
-[this sha](https://github.com/oxidecomputer/quartz/commit/ea24194b8b1c0354fff327edbcfb3d970148ac5a)
-[release](https://api.github.com/repos/oxidecomputer/quartz/releases/255334408)
+[this sha](https://github.com/oxidecomputer/quartz/commit/cc132979ecf494ada44c99d614719d68784a0d49)
+[release](https://api.github.com/repos/oxidecomputer/quartz/releases/259632098)

drv/spartan7-loader/cosmo-seq/cosmo_seq_top.json

@@ -1,6 +1,6 @@
 {
     "type": "addrmap",
-    "addr_span_bytes": 1840,
+    "addr_span_bytes": 49408,
     "inst_name": "cosmo_seq_top",
     "orig_type_name": "cosmo_seq_top",
     "addr_offset": 0,
@@ -21,52 +21,52 @@
             "addr_offset": 256,
             "children": []
         },
-        {
-            "type": "addrmap",
-            "addr_span_bytes": 40,
-            "inst_name": "espi",
-            "orig_type_name": "espi_regs",
-            "addr_offset": 512,
-            "children": []
-        },
         {
             "type": "addrmap",
             "addr_span_bytes": 88,
             "inst_name": "sequencer",
             "orig_type_name": "sequencer_regs",
-            "addr_offset": 768,
+            "addr_offset": 512,
             "children": []
         },
         {
             "type": "addrmap",
             "addr_span_bytes": 4,
             "inst_name": "sp_i2c",
             "orig_type_name": "sp_i2c_regs",
-            "addr_offset": 1024,
+            "addr_offset": 768,
             "children": []
         },
         {
             "type": "addrmap",
             "addr_span_bytes": 148,
             "inst_name": "fpga1_hotplug",
             "orig_type_name": "pca9506_axi_regs",
-            "addr_offset": 1280,
+            "addr_offset": 1024,
             "children": []
         },
         {
             "type": "addrmap",
             "addr_span_bytes": 76,
             "inst_name": "dimms",
             "orig_type_name": "dimm_regs",
-            "addr_offset": 1536,
+            "addr_offset": 1280,
             "children": []
         },
         {
             "type": "addrmap",
             "addr_span_bytes": 48,
             "inst_name": "debug_ctrl",
             "orig_type_name": "debug_regs",
-            "addr_offset": 1792,
+            "addr_offset": 1536,
+            "children": []
+        },
+        {
+            "type": "addrmap",
+            "addr_span_bytes": 16640,
+            "inst_name": "espi",
+            "orig_type_name": "espi_regs",
+            "addr_offset": 32768,
             "children": []
         }
     ]

drv/spartan7-loader/cosmo-seq/debug_regs.json

@@ -336,6 +336,10 @@
                         {
                             "name": "mux3_sel",
                             "value": 14
+                        },
+                        {
+                            "name": "i2c_sp5_sec_bus",
+                            "value": 15
                         }
                     ]
                 },
@@ -409,6 +413,10 @@
                         {
                             "name": "mux3_sel",
                             "value": 14
+                        },
+                        {
+                            "name": "i2c_sp5_sec_bus",
+                            "value": 15
                         }
                     ]
                 },
@@ -482,6 +490,10 @@
                         {
                             "name": "mux3_sel",
                             "value": 14
+                        },
+                        {
+                            "name": "i2c_sp5_sec_bus",
+                            "value": 15
                         }
                     ]
                 },
@@ -555,6 +567,10 @@
                         {
                             "name": "mux3_sel",
                             "value": 14
+                        },
+                        {
+                            "name": "i2c_sp5_sec_bus",
+                            "value": 15
                         }
                     ]
                 }

drv/spartan7-loader/cosmo-seq/espi_regs.json

@@ -1,6 +1,6 @@
 {
     "type": "addrmap",
-    "addr_span_bytes": 40,
+    "addr_span_bytes": 16640,
     "inst_name": "espi_regs",
     "addr_offset": 0,
     "children": [
@@ -85,6 +85,17 @@
                     "se_onread": null,
                     "se_onwrite": null,
                     "desc": "Respond back on periph 0 channel vs oob"
+                },
+                {
+                    "type": "field",
+                    "inst_name": "espi_reset",
+                    "lsb": 5,
+                    "msb": 5,
+                    "reset": 0,
+                    "sw_access": "rw",
+                    "se_onread": null,
+                    "se_onwrite": null,
+                    "desc": "Issue an espi reset via the debug logic. Cleared by hardware after reset."
                 }
             ]
         },
@@ -258,6 +269,13 @@
                     "desc": ""
                 }
             ]
+        },
+        {
+            "type": "mem",
+            "inst_name": "post_code_buffer",
+            "addr_offset": 256,
+            "memwidth": 32,
+            "mementries": 4096
         }
     ]
 }