Merge branch 'master' into james/i2c-cleanup

Author: jamesmunns

.github/workflows/release.yml

@@ -63,10 +63,16 @@ jobs:
           if [[ "${override_version}" != "" ]]; then
             flags+=("--override-version=${override_version}")
           fi
-          brussels init "$group" HEAD "${flags[@]}" >brussels-manifest.json
+          brussels init "$group" "$ref" "${flags[@]}" >brussels-manifest.json
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           group: ${{ github.event.inputs.group }}
+          # We choose to release the commit in which the workflow is defined.
+          # Most of the times this will be the "main" branch. If the developer
+          # chooses a different branch to run the workflow on though (in the
+          # GitHub "Run Workflow" UI), this will correctly release the branch
+          # they requested (as that will be the executed workflow).
+          ref: ${{ github.workflow_sha }}
           override_version: ${{ github.event.inputs.override-version }}
 
       - name: Upload the release manifest

app/gimlet/base.toml

@@ -991,7 +991,7 @@ device = "isl68224"
 description = "DIMM/SP3 1.8V A0 power controller"
 power.rails = [ "VPP_ABCD", "VPP_EFGH", "V1P8_SP3" ]
 power.phases = [ [ 0 ], [ 1 ], [ 2 ] ]
-sensors = { voltage = 3, current = 3 }
+sensors = { temperature = 3, voltage = 3, current = 3 }
 refdes = "U352"
 
 [[config.i2c.devices]]

task/idle/src/main.rs

@@ -11,21 +11,20 @@ extern crate userlib;
 
 #[unsafe(export_name = "main")]
 fn main() -> ! {
+    #[allow(clippy::empty_loop)]
     loop {
-        if cfg!(feature = "insomniac") {
-            // In insomniac-mode, we just spinloop to absorb idle cycles. This
-            // is useful on certain processors where entering a low-power state
-            // interrupts debugging.
-            //
-            // Note that this is an explicit nop rather than an empty block
-            // because an empty `loop {}` is technically UB and will be replaced
-            // by a trap, bringing the system to a halt with no tasks runnable.
-            // So, do not get clever and remove this.
-            cortex_m::asm::nop();
-        } else {
-            // Wait For Interrupt to pause the processor until an ISR arrives,
-            // which could wake some higher-priority task.
-            cortex_m::asm::wfi();
-        }
+        // In insomniac-mode, we just spinloop to absorb idle cycles. This
+        // is useful on certain processors where entering a low-power state
+        // interrupts debugging.
+        //
+        // An empty loop *used* to cause UB, due to a bug in LLVM (see
+        // https://github.com/rust-lang/rust/issues/28728), but was later fixed
+        // by the upgrade to LLVM12, which resolved this in Rust 1.52.0 (see
+        // https://github.com/rust-lang/rust/pull/81451).
+        //
+        // Wait For Interrupt to pause the processor until an ISR arrives,
+        // which could wake some higher-priority task.
+        #[cfg(not(feature = "insomniac"))]
+        cortex_m::asm::wfi();
     }
 }

task/power/src/bsp/gimlet_bcdef.rs

@@ -21,9 +21,9 @@ pub(crate) static CONTROLLER_CONFIG: [PowerControllerConfig;
     rail_controller!(Core, raa229618, vddcr_soc, A0),
     rail_controller!(Mem, raa229618, vdd_mem_abcd, A0),
     rail_controller!(Mem, raa229618, vdd_mem_efgh, A0),
-    rail_controller_notemp!(MemVpp, isl68224, vpp_abcd, A0),
-    rail_controller_notemp!(MemVpp, isl68224, vpp_efgh, A0),
-    rail_controller_notemp!(MemVpp, isl68224, v1p8_sp3, A0),
+    rail_controller!(MemVpp, isl68224, vpp_abcd, A0),
+    rail_controller!(MemVpp, isl68224, vpp_efgh, A0),
+    rail_controller!(MemVpp, isl68224, v1p8_sp3, A0),
     rail_controller!(Sys, tps546B24A, v3p3_sp_a2, A2),
     rail_controller!(Sys, tps546B24A, v3p3_sys_a0, A0),
     rail_controller!(Sys, tps546B24A, v5_sys_a2, A2),