Add flash index field as requested

Author: jamesmunns

app/cosmo/base.toml

@@ -258,7 +258,7 @@ features = ["stm32h753", "usart6", "baud_rate_3M", "hardware_flow_control", "vla
 uses = ["usart6", "dbgmcu"]
 interrupts = {"usart6.irq" = "usart-irq"}
 priority = 9
-max-sizes = {flash = 72000, ram = 65536}
+max-sizes = {flash = 74000, ram = 65536}
 stacksize = 5400
 start = true
 task-slots = ["sys", { cpu_seq = "cosmo_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot", "auxflash"]

app/gimlet/base.toml

@@ -243,7 +243,7 @@ features = ["stm32h753", "uart7", "baud_rate_3M", "hardware_flow_control", "vlan
 uses = ["uart7", "dbgmcu"]
 interrupts = {"uart7.irq" = "usart-irq"}
 priority = 8
-max-sizes = {flash = 72000, ram = 65536}
+max-sizes = {flash = 74000, ram = 65536}
 stacksize = 5376
 start = true
 task-slots = ["sys", { cpu_seq = "gimlet_seq" }, "hf", "control_plane_agent", "net", "packrat", "i2c_driver", { spi_driver = "spi2_driver" }, "sprot"]

task/host-sp-comms/src/main.rs

@@ -1027,11 +1027,18 @@ impl ServerImpl {
                     total_count: new_ct,
                 });
 
+                let flashidx = match self.hf.get_dev() {
+                    Ok(HfDevSelect::Flash0) => 0,
+                    Ok(HfDevSelect::Flash1) => 1,
+                    Err(_) => 0xFF,
+                };
+
                 // ereport!
                 _ = self.ereporter.deliver_ereport(&HostBootFail {
                     n: new_ct,
                     msglen: n as u32,
                     reason,
+                    flashidx,
                 });
                 Some(SpToHost::Ack)
             }
@@ -1071,9 +1078,17 @@ impl ServerImpl {
                     total_count: new_ct,
                 });
 
+                let flashidx = match self.hf.get_dev() {
+                    Ok(HfDevSelect::Flash0) => 0,
+                    Ok(HfDevSelect::Flash1) => 1,
+                    Err(_) => 0xFF,
+                };
+
+                // ereport!
                 _ = self.ereporter.deliver_ereport(&HostPanic {
                     n: new_ct,
                     msglen: n as u32,
+                    flashidx,
                 });
 
                 Some(SpToHost::Ack)
@@ -2094,6 +2109,9 @@ struct HostPanic {
     /// This quantity may be less than the amount received, as it is capped
     /// by the available storage space allocated (`MAX_HOST_FAIL_MESSAGE_LEN`).
     msglen: u32,
+    /// The flash boot index, directly correlated to which boot slot we are
+    /// operating from. Currently 0 (BSU: A), 1 (BSU: B), or 0xFF (unknown).
+    flashidx: u8,
 }
 
 /// An ereport represent a host reported boot failure
@@ -2112,4 +2130,7 @@ struct HostBootFail {
     msglen: u32,
     /// The reported reason code for the host boot failure
     reason: u8,
+    /// The flash boot index, directly correlated to which boot slot we are
+    /// operating from. Currently 0 (BSU: A), 1 (BSU: B), or 0xFF (unknown).
+    flashidx: u8,
 }