janky working sharkfin vpd

Author: hawkw

Cargo.lock

@@ -490,6 +490,7 @@ description = "U.2 Sharkfin A VPD"
 name = "sharkfin_a_vpd"
 refdes = ["J206", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -526,6 +527,7 @@ description = "U.2 Sharkfin B VPD"
 name = "sharkfin_b_vpd"
 refdes = ["J207", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -562,6 +564,7 @@ description = "U.2 Sharkfin C VPD"
 name = "sharkfin_c_vpd"
 refdes = ["J208", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -598,6 +601,7 @@ description = "U.2 Sharkfin D VPD"
 name = "sharkfin_d_vpd"
 refdes = ["J209", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -634,6 +638,7 @@ description = "U.2 Sharkfin E VPD"
 name = "sharkfin_e_vpd"
 refdes = ["J210", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -670,6 +675,7 @@ description = "U.2 Sharkfin F VPD"
 name = "sharkfin_f_vpd"
 refdes = ["J211", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -706,6 +712,7 @@ description = "U.2 Sharkfin G VPD"
 name = "sharkfin_g_vpd"
 refdes = ["J212", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -742,6 +749,7 @@ description = "U.2 Sharkfin H VPD"
 name = "sharkfin_h_vpd"
 refdes = ["J213", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -778,6 +786,7 @@ description = "U.2 Sharkfin I VPD"
 name = "sharkfin_i_vpd"
 refdes = ["J214", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -814,6 +823,7 @@ description = "U.2 Sharkfin J VPD"
 name = "sharkfin_j_vpd"
 refdes = ["J215", "U7"]
 removable = true
+fruid = "single-barcode"
 
 [[config.i2c.devices]]
 bus = "front"
@@ -840,7 +850,7 @@ name = "U2_N9"
 refdes = ["J215", "J1"]
 removable = true
 
-[[config.i2c.devices]]
+[[config.i2c.devices]]faux_mgs
 bus = "front"
 mux = 3
 segment = 4
@@ -849,6 +859,7 @@ device = "at24csw080"
 name = "local_vpd"
 description = "Gimlet VPD"
 refdes = "U615"
+fruid = "single-barcode"
 
 #
 # M.2 NVMe bus mux. Segments:

app/gimlet/base.toml

@@ -233,6 +233,7 @@ pub enum Refdes {
 }
 
 #[derive(Clone, Debug, Deserialize, PartialOrd, Ord, Eq, PartialEq)]
+#[serde(rename_all = "kebab-case")]
 pub enum FruidMode {
     SingleBarcode,
     NestedBarcode,

build/i2c/src/lib.rs

@@ -14,6 +14,7 @@ num-traits.workspace = true
 serde.workspace = true
 ssmarshal.workspace = true
 static_assertions.workspace = true
+tlvc.workspace = true
 zerocopy.workspace = true
 zerocopy-derive.workspace = true
 
@@ -30,6 +31,7 @@ drv-i2c-devices = { path = "../../drv/i2c-devices" }
 drv-ignition-api = { path = "../../drv/ignition-api", optional = true }
 drv-lpc55-update-api = { path = "../../drv/lpc55-update-api" }
 drv-monorail-api = { path = "../../drv/monorail-api", optional = true }
+drv-oxide-vpd = { path = "../../drv/oxide-vpd" }
 drv-sidecar-seq-api = { path = "../../drv/sidecar-seq-api", optional = true }
 drv-sprot-api = { path = "../../drv/sprot-api" }
 drv-stm32h7-update-api = { path = "../../drv/stm32h7-update-api" }
@@ -42,6 +44,7 @@ dump-agent-api = { path = "../dump-agent-api" }
 task-vpd-api = { path = "../../task/vpd-api", optional = true }
 host-sp-messages = { path = "../../lib/host-sp-messages" }
 lpc55-rom-data = { path = "../../lib/lpc55-rom-data" }
+oxide-barcode = { path = "../../lib/oxide-barcode" }
 ringbuf = { path = "../../lib/ringbuf" }
 counters = { path = "../../lib/counters" }
 task-control-plane-agent-api = { path = "../control-plane-agent-api" }

task/control-plane-agent/Cargo.toml

@@ -2,13 +2,16 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+use drv_i2c_api::{self as i2c, I2cDevice};
 use drv_i2c_devices::at24csw080::At24Csw080;
 use gateway_messages::measurement::{
     Measurement, MeasurementError, MeasurementKind,
 };
 use gateway_messages::sp_impl::{BoundsChecked, DeviceDescription};
+use gateway_messages::vpd::{OxideVpd, Vpd};
 use gateway_messages::{
     ComponentDetails, DeviceCapabilities, DevicePresence, SpComponent, SpError,
+    VpdError,
 };
 use task_sensor_api::Sensor as SensorTask;
 use task_sensor_api::SensorError;
@@ -88,7 +91,7 @@ impl Inventory {
                 let nfruid = match dev.fruid {
                     Some(FruidMode::At24Csw080Barcode(_)) => 1,
                     Some(FruidMode::At24Csw080Nested(_)) => 0, // TODO(eliza): implement nested SASY barcodes
-                    Some(FruidMode::Tmp117(_)) => 1,
+                    Some(FruidMode::Tmp117(_)) => 0, // TODO(eliza): implement tmp117 fruid
                     None => 0,
                 };
                 Ok(nsensors + nfruid)
@@ -138,7 +141,18 @@ impl Inventory {
         match fruid {
             FruidMode::At24Csw080Barcode(f) => {
                 let dev = f(I2C.get_task_id());
-                todo!()
+                match read_one_barcode(dev, &[(*b"BARC", 0)]) {
+                    Ok(oxide_barcode::VpdIdentity {
+                        revision,
+                        serial,
+                        part_number,
+                    }) => ComponentDetails::Vpd(Vpd::Oxide(OxideVpd {
+                        rev: revision,
+                        serial,
+                        part_number,
+                    })),
+                    Err(err) => panic!(), // TODO(eliza): figure out this
+                }
             }
             FruidMode::At24Csw080Nested(_) => todo!(),
             FruidMode::Tmp117(_) => todo!(),
@@ -179,6 +193,9 @@ impl Inventory {
         if !device.sensors.is_empty() {
             capabilities |= DeviceCapabilities::HAS_MEASUREMENT_CHANNELS;
         }
+        if device.fruid.is_some() {
+            capabilities |= DeviceCapabilities::HAS_VPD;
+        }
         DeviceDescription {
             component: SpComponent { id: device.id },
             device: device.device,
@@ -245,6 +262,42 @@ impl TryFrom<&'_ SpComponent> for Index {
     }
 }
 
+/// Free function to read a nested barcode, translating errors appropriately
+fn read_one_barcode(
+    dev: I2cDevice,
+    path: &[([u8; 4], usize)],
+) -> Result<oxide_barcode::VpdIdentity, VpdError> {
+    let eeprom = At24Csw080::new(dev);
+    let mut barcode = [0; 32];
+    match drv_oxide_vpd::read_config_nested_from_into(
+        eeprom,
+        path,
+        &mut barcode,
+    ) {
+        Ok(n) => {
+            // extract barcode!
+            let identity = oxide_barcode::VpdIdentity::parse(&barcode[..n])
+                .map_err(|_| VpdError::DeviceError)?;
+            Ok(identity)
+        }
+        Err(
+            drv_oxide_vpd::VpdError::ErrorOnBegin(err)
+            | drv_oxide_vpd::VpdError::ErrorOnRead(err)
+            | drv_oxide_vpd::VpdError::ErrorOnNext(err)
+            | drv_oxide_vpd::VpdError::InvalidChecksum(err),
+        ) if err
+            == tlvc::TlvcReadError::User(
+                drv_i2c_devices::at24csw080::Error::I2cError(
+                    i2c::ResponseCode::NoDevice,
+                ),
+            ) =>
+        {
+            Err(VpdError::NotPresent)
+        }
+        Err(..) => Err(VpdError::DeviceError),
+    }
+}
+
 use devices_with_static_validation::OUR_DEVICES;
 // We tag this with module `#[allow(dead_code)]` to prevent warnings about the
 // contents of this module not being used; it contains constants used in static

task/control-plane-agent/src/inventory.rs

@@ -127,13 +127,10 @@ fn write_pub_device_descriptions() -> anyhow::Result<()> {
                         &dev.device,
                         id.to_lower_ident()
                     );
-                    writeln!(
-                        file,
-                        "            fruid: Some({mode}({devname})),"
-                    )?;
+                    writeln!(file, "        fruid: Some({mode}({devname})),")?;
                 }
                 (None, _) => {
-                    writeln!(file, "            fruid: None,")?;
+                    writeln!(file, "        fruid: None,")?;
                 }
                 (Some(mode), None) => {
                     println!(