From 45f03506c96b6b2a656de6c0a59a6d1a41a75556 Mon Sep 17 00:00:00 2001 From: Benjamin Reese Date: Tue, 29 Oct 2024 09:29:33 -0700 Subject: [PATCH] Make gth match gty --- .../pgp2fc/gthUltraScale+/rtl/Pgp2fcGthCoreWrapper.vhd | 4 ++-- .../pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthUltra.vhd | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/protocols/pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthCoreWrapper.vhd b/protocols/pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthCoreWrapper.vhd index 4dd2d6b469..2426c04a87 100644 --- a/protocols/pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthCoreWrapper.vhd +++ b/protocols/pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthCoreWrapper.vhd @@ -447,8 +447,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/gthUltraScale+/rtl/Pgp2fcGthUltra.vhd b/protocols/pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthUltra.vhd index 807b8dd020..bf8186b6f8 100644 --- a/protocols/pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthUltra.vhd +++ b/protocols/pgp/pgp2fc/gthUltraScale+/rtl/Pgp2fcGthUltra.vhd @@ -115,10 +115,11 @@ begin pgpTxResetDone <= phyTxReady; + -- assuming a 185.714/2 = 92.857 MHz stableClk U_RstSync_1 : entity surf.PwrUpRst generic map ( TPD_G => TPD_G, - DURATION_G => ite(SIMULATION_G, 7813, 78130000)) -- 100us in sim; 1s in silicon + DURATION_G => ite(SIMULATION_G, 9285, 92850000)) -- 100us in sim; 1s in silicon port map ( arst => pgpTxIn.resetGt, -- [in] clk => stableClk, -- [in] @@ -133,12 +134,12 @@ begin clk => stableClk, -- [in] dataIn => phyRxInit, -- [in] dataOut => phyRxInitSync); -- [out] - + -- Sync pgpRxIn.rxReset to stableClk and tie to gtRxUserReset U_RstSync_2 : entity surf.PwrUpRst generic map ( TPD_G => TPD_G, - DURATION_G => ite(SIMULATION_G, 7813, 78130000)) -- 100us in sim; 1s in silicon + DURATION_G => ite(SIMULATION_G, 9285, 92850000)) -- 100us in sim; 1s in silicon port map ( arst => pgpRxIn.resetRx, -- [in] clk => stableClk, -- [in] @@ -149,7 +150,7 @@ begin U_RstSync_3 : entity surf.PwrUpRst generic map ( TPD_G => TPD_G, - DURATION_G => ite(SIMULATION_G, 7813, 78130000)) -- 100us in sim; 1s in silicon + DURATION_G => ite(SIMULATION_G, 9285, 92850000)) -- 100us in sim; 1s in silicon port map ( arst => pgpTxIn.resetTx, -- [in] clk => stableClk, -- [in]