Remove redundant reset

bittide · Jan 28, 2025 · 9433beb · 9433beb
1 parent e6b168b
commit 9433beb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/bittide-instances/src/Bittide/Instances/Hitl/Driver/SwCcTopologies.hs b/bittide-instances/src/Bittide/Instances/Hitl/Driver/SwCcTopologies.hs
@@ -143,10 +143,9 @@ driverFunc testName targets = do
 
         return (gdb, gdbClean2)
 
-    loadBinary :: (HwTarget, DeviceInfo) -> ProcessStdIoHandles -> VivadoM ()
-    loadBinary (hwT, d) gdb = do
+    loadBinary :: ProcessStdIoHandles -> VivadoM ()
+    loadBinary gdb = do
       liftIO $ do
-        putStrLn $ "Loading binary onto target " <> show d.deviceId
         runGdbCommands gdb.stdinHandle ["load"]
         tryWithTimeout "Waiting for program load to finish" 120_000_000
           $ expectLine gdb.stdoutHandle gdbWaitForLoad
@@ -226,7 +225,7 @@ driverFunc testName targets = do
     let gdbPorts = fmap (fst . fst) initOcdsData
     brackets (liftIO <$> initGdbs gdbPorts) (liftIO . snd) $ \initGdbsData -> do
       let gdbs = fmap fst initGdbsData
-      zipWithM_ loadBinary targets gdbs
+      mapM_ loadBinary gdbs
       zipWithM_ startBinary targets gdbs
 
       testResults <- getTestResults targets (L.replicate (L.length targets) TestRunning)

diff --git a/bittide-instances/src/Bittide/Instances/Hitl/SwCcTopologies.hs b/bittide-instances/src/Bittide/Instances/Hitl/SwCcTopologies.hs
@@ -333,9 +333,7 @@ topologyTest refClk sysClk IlaControl{syncRst = rst, ..} rxNs rxPs miso cfg prog
       <*> (startupDelay <$> cfg)
 
   -- Clock control
-  clockControlReset =
-    startupDelayRst
-      `orReset` unsafeFromActiveLow ((<=) <$> delayCount <*> (startupDelay <$> cfg))
+  clockControlReset = unsafeFromActiveLow ((<=) <$> delayCount <*> (startupDelay <$> cfg))
 
   clockMod = callistoResult.maybeSpeedChange
   allStable0 = callistoResult.allStable
@@ -922,7 +920,7 @@ swCcTopologyTest refClkDiff sysClkDiff syncIn rxns rxps miso jtagIn =
               .&&. (not <$> (transceiversFailedAfterUp .||. startBeforeAllReady))
            )
 
-  (unbundle -> (testStart, testConfig0, progEn)) =
+  (unbundle -> (testStart, testConfig0, _progEn)) =
     setName @"vioHitlt"
       $ vioProbe
         ("probe_test_done" :> "probe_test_success" :> Nil)
@@ -933,7 +931,7 @@ swCcTopologyTest refClkDiff sysClkDiff syncIn rxns rxps miso jtagIn =
         testSuccess
 
   testConfig = mux testStart (Just <$> testConfig0) (pure Nothing)
-  progEnRst = unsafeFromActiveLow progEn
+  progEnRst = noReset -- unsafeFromActiveLow progEn
 {-# OPAQUE swCcTopologyTest #-}
 
 makeTopEntity 'swCcTopologyTest