refine resets

slaclab · Oct 3, 2024 · 3033857 · 3033857
1 parent 7f00903
commit 3033857
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/protocols/pgp/pgp2fc/gtyUltraScale+/rtl/Pgp2fcGtyCoreWrapper.vhd b/protocols/pgp/pgp2fc/gtyUltraScale+/rtl/Pgp2fcGtyCoreWrapper.vhd
@@ -449,9 +449,8 @@ begin
 
    cPllRefClkSel     <= ite(SEL_FABRIC_REFCLK_G, "111", "001");
 
-   rstSyncRxIn       <= rxResetAlignCheck or rxReset;
-   rxResetGt         <= rxResetAlignCheck or rxReset;
-
+   rstSyncRxIn       <= rxResetAlignCheck;
+   rxResetGt         <= rxResetAlignCheck;
 
    txOutClk          <= txOutClkB;
    rxOutClk          <= rxOutClkB;

diff --git a/protocols/pgp/pgp2fc/gtyUltraScale+/rtl/Pgp2fcGtyUltra.vhd b/protocols/pgp/pgp2fc/gtyUltraScale+/rtl/Pgp2fcGtyUltra.vhd
@@ -129,7 +129,7 @@ begin
    U_RstSync_4 : entity surf.SynchronizerOneShot
       generic map (
          TPD_G         => TPD_G,
-         PULSE_WIDTH_G => ite(SIMULATION_G, 12500, 125000000))  -- 100us in sim; 1s in silicon
+         PULSE_WIDTH_G => 12500)  -- 100us in sim and silicon; otherwise it takes forever to lock
       port map (
          clk     => stableClk,                                  -- [in]
          dataIn  => phyRxInit,                                  -- [in]