Add rev E Gimlet (#1486)

.github/workflows/dist.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        build: [stm32f3, stm32f4, lpc55, stm32h743, stm32h753, gemini, rot-carrier, gimletlet, gimlet-b, gimlet-b-lab, gimlet-b-dev, gimlet-c, gimlet-c-lab, gimlet-c-dev, gimlet-d, gimlet-d-lab, gimlet-d-dev, sidecar-b, sidecar-b-lab, sidecar-b-dev, sidecar-c, sidecar-c-lab, sidecar-c-dev, psc-b, psc-b-dev, psc-c, psc-c-dev, stm32g0, oxide-rot-1, oxide-rot-1-dev, donglet-g031]
+        build: [stm32f3, stm32f4, lpc55, stm32h743, stm32h753, gemini, rot-carrier, gimletlet, gimlet-b, gimlet-b-lab, gimlet-b-dev, gimlet-c, gimlet-c-lab, gimlet-c-dev, gimlet-d, gimlet-d-lab, gimlet-d-dev, gimlet-e, gimlet-e-lab, gimlet-e-dev, sidecar-b, sidecar-b-lab, sidecar-b-dev, sidecar-c, sidecar-c-lab, sidecar-c-dev, psc-b, psc-b-dev, psc-c, psc-c-dev, stm32g0, oxide-rot-1, oxide-rot-1-dev, donglet-g031]
         include:
           - build: stm32g0
             app_name: demo-stm32g070-nucleo
@@ -102,6 +102,21 @@ jobs:
             app_toml: app/gimlet/rev-d-dev.toml
             target: thumbv7em-none-eabihf
             image: default
+          - build: gimlet-e
+            app_name: gimlet-e
+            app_toml: app/gimlet/rev-e.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: gimlet-e-lab
+            app_name: gimlet-e-lab
+            app_toml: app/gimlet/rev-e-lab.toml
+            target: thumbv7em-none-eabihf
+            image: default
+          - build: gimlet-e-dev
+            app_name: gimlet-e-dev
+            app_toml: app/gimlet/rev-e-dev.toml
+            target: thumbv7em-none-eabihf
+            image: default
           - build: sidecar-b
             app_name: sidecar-b
             app_toml: app/sidecar/rev-b.toml

app/gimlet/rev-b.toml

@@ -1,3 +1,71 @@
 name = "gimlet-b"
 board = "gimlet-b"
-inherit = "base-bc.toml"
+inherit = "base.toml"
+
+#
+# I2C2: Front/M.2 bus
+#
+[[config.i2c.controllers]]
+controller = 2
+
+#
+# SMBUS_SP_TO_M2_SMCLK_A2_V3P3
+# SMBUS_SP_TO_M2_SMDAT_A2_V3P3
+#
+[config.i2c.controllers.ports.B]
+name = "m2"
+description = "M.2 bus"
+scl.pin = 10
+sda.pin = 11
+af = 4
+[[config.i2c.controllers.ports.B.muxes]]
+driver = "pca9548"
+address = 0x73
+
+#
+# SMBUS_SP_TO_LVL_FRONT_SMDAT
+# SMBUS_SP_TO_LVL_FRONT_SMCLK
+#
+[config.i2c.controllers.ports.F]
+name = "front"
+description = "Front bus"
+scl.pin = 1
+sda.pin = 0
+af = 4
+
+#
+# Shark fin muxes
+#
+[[config.i2c.controllers.ports.F.muxes]]
+driver = "pca9548"
+address = 0x70
+
+[[config.i2c.controllers.ports.F.muxes]]
+driver = "pca9548"
+address = 0x71
+
+[[config.i2c.controllers.ports.F.muxes]]
+driver = "pca9548"
+address = 0x72
+
+[[config.i2c.devices]]
+bus = "m2"
+mux = 1
+segment = 1
+address = 0b110_1010
+device = "m2_hp_only"
+description = "M.2 A NVMe Basic Management Command"
+name = "M2_A"
+sensors = { temperature = 1 }
+removable = true
+
+[[config.i2c.devices]]
+bus = "m2"
+mux = 1
+segment = 2
+address = 0b110_1010
+device = "m2_hp_only"
+description = "M.2 B NVMe Basic Management Command"
+name = "M2_B"
+sensors = { temperature = 1 }
+removable = true

app/gimlet/rev-c.toml

@@ -1,3 +1,5 @@
 name = "gimlet-c"
 board = "gimlet-c"
-inherit = "base-bc.toml"
+
+# Rev C is mostly identical to Rev B, but with a new name and board
+inherit = "rev-b.toml"

app/gimlet/rev-e-dev.toml

@@ -0,0 +1,2 @@
+name = "gimlet-e-dev"
+inherit = ["rev-e.toml", "dev.toml"]

app/gimlet/rev-e-lab.toml

@@ -0,0 +1,2 @@
+name = "gimlet-e-lab"
+inherit = ["rev-e-dev.toml", "lab.toml"]

app/gimlet/rev-e.toml

@@ -0,0 +1,5 @@
+name = "gimlet-e"
+board = "gimlet-e"
+
+# Rev E is mostly identical to Rev D, but with a new name and board
+inherit = "rev-d.toml"

app/gimlet/src/main.rs

@@ -118,6 +118,8 @@ fn system_init() {
             let expected_rev = 0b010;
         } else if #[cfg(target_board = "gimlet-d")] {
             let expected_rev = 0b011;
+        } else if #[cfg(target_board = "gimlet-e")] {
+            let expected_rev = 0b111; // hardware-gimlet#1952
         } else {
             compile_error!("not a recognized gimlet board")
         }

drv/gimlet-hf-server/src/main.rs

@@ -14,9 +14,10 @@
     any(
         target_board = "gimlet-b",
         target_board = "gimlet-c",
-        target_board = "gimlet-d"
+        target_board = "gimlet-d",
+        target_board = "gimlet-e",
     ),
-    path = "bsp/gimlet_bcd.rs"
+    path = "bsp/gimlet_bcde.rs"
 )]
 #[cfg_attr(target_board = "gemini-bu-1", path = "bsp/gemini_bu_1.rs")]
 #[cfg_attr(target_board = "gimletlet-2", path = "bsp/gimletlet_2.rs")]

drv/gimlet-seq-server/src/main.rs

@@ -34,8 +34,12 @@ include!(concat!(env!("OUT_DIR"), "/i2c_config.rs"));
 
 #[cfg_attr(target_board = "gimlet-b", path = "payload_b.rs")]
 #[cfg_attr(
-    any(target_board = "gimlet-c", target_board = "gimlet-d"),
-    path = "payload_cd.rs"
+    any(
+        target_board = "gimlet-c",
+        target_board = "gimlet-d",
+        target_board = "gimlet-e",
+    ),
+    path = "payload_cde.rs"
 )]
 mod payload;
 
@@ -415,6 +419,7 @@ fn read_spd_data_and_load_packrat(packrat: &Packrat, i2c_task: TaskId) {
             target_board = "gimlet-b",
             target_board = "gimlet-c",
             target_board = "gimlet-d",
+            target_board = "gimlet-e",
         ))] {
             //
             // On Gimlet, we have two banks of up to 8 DIMMs apiece:
@@ -1034,6 +1039,7 @@ cfg_if::cfg_if! {
         target_board = "gimlet-b",
         target_board = "gimlet-c",
         target_board = "gimlet-d",
+        target_board = "gimlet-e",
     ))] {
         const A0_TIMEOUT_MILLIS: u64 = 2000;
 

drv/stm32h7-sprot-server/src/main.rs

@@ -104,6 +104,7 @@ cfg_if::cfg_if! {
             target_board = "gimlet-b",
             target_board = "gimlet-c",
             target_board = "gimlet-d",
+            target_board = "gimlet-e",
             target_board = "sidecar-b",
             target_board = "sidecar-c",
             target_board = "psc-a",

drv/user-leds/src/main.rs

@@ -77,6 +77,7 @@ cfg_if::cfg_if! {
         target_board = "gimlet-b",
         target_board = "gimlet-c",
         target_board = "gimlet-d",
+        target_board = "gimlet-e",
         target_board = "psc-a",
         target_board = "psc-b",
         target_board = "psc-c",
@@ -471,6 +472,7 @@ cfg_if::cfg_if! {
             } else if #[cfg(any(target_board = "gimlet-b",
                                 target_board = "gimlet-c",
                                 target_board = "gimlet-d",
+                                target_board = "gimlet-e",
                                 target_board = "psc-a",
                                 target_board = "psc-b",
                                 target_board = "psc-c",

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

@@ -40,9 +40,10 @@ use inventory::INVENTORY_API_VERSION;
     any(
         target_board = "gimlet-b",
         target_board = "gimlet-c",
-        target_board = "gimlet-d"
+        target_board = "gimlet-d",
+        target_board = "gimlet-e",
     ),
-    path = "bsp/gimlet_bcd.rs"
+    path = "bsp/gimlet_bcde.rs"
 )]
 #[cfg_attr(target_board = "gimletlet-2", path = "bsp/gimletlet.rs")]
 mod bsp;
@@ -1132,6 +1133,7 @@ cfg_if::cfg_if! {
         target_board = "gimlet-b",
         target_board = "gimlet-c",
         target_board = "gimlet-d",
+        target_board = "gimlet-e",
     ))] {
         const SP_TO_SP3_INT_L: sys_api::PinSet = sys_api::Port::I.pin(7);
     } else if #[cfg(target_board = "gimletlet-2")] {

task/net/src/main.rs

@@ -23,9 +23,10 @@ mod server;
     any(
         target_board = "gimlet-b",
         target_board = "gimlet-c",
-        target_board = "gimlet-d"
+        target_board = "gimlet-d",
+        target_board = "gimlet-e",
     ),
-    path = "bsp/gimlet_bcd.rs"
+    path = "bsp/gimlet_bcde.rs"
 )]
 #[cfg_attr(target_board = "psc-a", path = "bsp/psc_a.rs")]
 #[cfg_attr(

task/power/src/bsp.rs

@@ -0,0 +1,6 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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/.
+
+// This file should never be included; if it is, the build configuration is bad
+compile_error!("no BSP for the given target board");

task/power/src/main.rs

@@ -380,9 +380,10 @@ macro_rules! mwocp68_controller {
     any(
         target_board = "gimlet-b",
         target_board = "gimlet-c",
-        target_board = "gimlet-d"
+        target_board = "gimlet-d",
+        target_board = "gimlet-e",
     ),
-    path = "bsp/gimlet_bcd.rs"
+    path = "bsp/gimlet_bcde.rs"
 )]
 #[cfg_attr(
     any(

task/thermal/src/bsp/gimlet_bcd.rs → task/thermal/src/bsp/gimlet_bcde.rs

@@ -25,12 +25,13 @@ task_slot!(SEQ, gimlet_seq);
 // the control loop.
 const NUM_TEMPERATURE_SENSORS: usize = sensors::NUM_TMP117_TEMPERATURE_SENSORS;
 
+// BMC sensors vary depending on hardware revision
 #[cfg(any(target_board = "gimlet-b", target_board = "gimlet-c"))]
 const NUM_NVME_BMC_TEMPERATURE_SENSORS: usize =
     sensors::NUM_NVME_BMC_TEMPERATURE_SENSORS
         + sensors::NUM_M2_HP_ONLY_TEMPERATURE_SENSORS;
 
-#[cfg(target_board = "gimlet-d")]
+#[cfg(any(target_board = "gimlet-d", target_board = "gimlet-e"))]
 const NUM_NVME_BMC_TEMPERATURE_SENSORS: usize =
     sensors::NUM_NVME_BMC_TEMPERATURE_SENSORS;
 
@@ -253,16 +254,15 @@ const INPUTS: [InputChannel; NUM_TEMPERATURE_INPUTS] = [
     // powered, and we want to minimize the TOCTOU window between asking the
     // MAX5970 "is it powered?" and actually reading data.
     //
-    // See hardware-gimlet#1804 for details; this will hopefully be fixed in
-    // later Gimlet revisions.
+    // See hardware-gimlet#1804 for details; this is fixed in later revisions.
     InputChannel::new(
         #[cfg(any(target_board = "gimlet-b", target_board = "gimlet-c"))]
         TemperatureSensor::new(
             Device::M2,
             devices::m2_hp_only_m2_a,
             sensors::M2_HP_ONLY_M2_A_TEMPERATURE_SENSOR,
         ),
-        #[cfg(target_board = "gimlet-d")]
+        #[cfg(any(target_board = "gimlet-d", target_board = "gimlet-e"))]
         TemperatureSensor::new(
             Device::M2,
             devices::nvme_bmc_m2_a,
@@ -279,7 +279,7 @@ const INPUTS: [InputChannel; NUM_TEMPERATURE_INPUTS] = [
             devices::m2_hp_only_m2_b,
             sensors::M2_HP_ONLY_M2_B_TEMPERATURE_SENSOR,
         ),
-        #[cfg(target_board = "gimlet-d")]
+        #[cfg(any(target_board = "gimlet-d", target_board = "gimlet-e"))]
         TemperatureSensor::new(
             Device::M2,
             devices::nvme_bmc_m2_b,

task/thermal/src/main.rs

@@ -16,9 +16,10 @@
     any(
         target_board = "gimlet-b",
         target_board = "gimlet-c",
-        target_board = "gimlet-d"
+        target_board = "gimlet-d",
+        target_board = "gimlet-e",
     ),
-    path = "bsp/gimlet_bcd.rs"
+    path = "bsp/gimlet_bcde.rs"
 )]
 #[cfg_attr(
     any(target_board = "sidecar-b", target_board = "sidecar-c"),