Fix 10G watchdog checks (#1464)

oxidecomputer · Jul 18, 2023 · db91285 · db91285
1 parent 68d4310
commit db91285
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/task/monorail-server/Cargo.toml b/task/monorail-server/Cargo.toml
@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 drv-monorail-api = { path = "../../drv/monorail-api"  }
+drv-sidecar-mainboard-controller = { path = "../../drv/sidecar-mainboard-controller"  }
 drv-sidecar-front-io = { path = "../../drv/sidecar-front-io", features = ["phy_smi"], optional = true }
 drv-sidecar-seq-api = { path = "../../drv/sidecar-seq-api", optional = true }
 drv-spi-api = { path = "../../drv/spi-api" }

diff --git a/task/monorail-server/src/bsp/sidecar_bc.rs b/task/monorail-server/src/bsp/sidecar_bc.rs
@@ -3,6 +3,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use drv_sidecar_front_io::phy_smi::PhySmi;
+use drv_sidecar_mainboard_controller::Reg;
 use drv_sidecar_seq_api::{SeqError, Sequencer, TofinoSeqState};
 use ringbuf::*;
 use userlib::{hl::sleep_for, task_slot};
@@ -479,7 +480,8 @@ impl<'a, R: Vsc7448Rw> Bsp<'a, R> {
             Ok(TofinoSeqState::A0) => {
                 match self.seq.tofino_pcie_hotplug_status() {
                     Ok(pcie_hotplug_status) => {
-                        let host_reset = pcie_hotplug_status & 1;
+                        let host_reset = pcie_hotplug_status
+                            & Reg::PCIE_HOTPLUG_STATUS::HOST_RESET;
                         host_reset == 0
                     }
                     Err(e) => {