Merge remote-tracking branch 'origin/ldmx-dev' into ldmx-dev3

slaclab · Sep 27, 2024 · fa4b25e · fa4b25e
2 parents 5002cd3 + 84dcb34
commit fa4b25e
Show file tree

Hide file tree

Showing 26 changed files with 103 additions and 130 deletions.
diff --git a/protocols/pgp/pgp2fc/README.md b/protocols/pgp/pgp2fc/README.md
diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcAlignmentChecker.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcAlignmentChecker.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcAlignmentController.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcAlignmentController.vhd
@@ -1,4 +1,6 @@
 -------------------------------------------------------------------------------
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
+-------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------
 -- Description: GTH RX Byte Alignment Controller

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcAxi.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcAxi.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcLane.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcLane.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------
@@ -68,6 +68,7 @@ entity Pgp2fcLane is
       pgpRxClkEn  : in sl := '1';
       pgpRxClk    : in sl := '0';
       pgpRxClkRst : in sl := '0';
+      pgpRxPhyRst : in sl := '0';
 
       -- Non-VC related IO
       pgpRxIn  : in  Pgp2fcRxInType := PGP2FC_RX_IN_INIT_C;
@@ -152,6 +153,7 @@ begin
                pgpRxClkEn    => pgpRxClkEn,
                pgpRxClk      => pgpRxClk,
                pgpRxClkRst   => pgpRxClkRst,
+               pgpRxPhyRst   => pgpRxPhyRst,
                pgpRxIn       => pgpRxIn,
                pgpRxOut      => intRxOut,
                pgpRxMaster   => intRxMaster,

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcPkg.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcPkg.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcRx.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcRx.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------
@@ -38,6 +38,7 @@ entity Pgp2fcRx is
       pgpRxClkEn  : in sl := '1';       -- Master clock enable
       pgpRxClk    : in sl;              -- Master clock
       pgpRxClkRst : in sl;              -- Synchronous reset input
+      pgpRxPhyRst : in sl := '0';
 
       -- Non-VC related IO
       pgpRxIn  : in  Pgp2fcRxInType;
@@ -87,6 +88,7 @@ architecture Pgp2fcRx of Pgp2fcRx is
    signal overflow         : slv(3 downto 0);
    signal intFcValid       : sl;
    signal intFcError       : sl;
+   signal phyRxRst         : sl;
 
    attribute KEEP_HIERARCHY : string;
    attribute KEEP_HIERARCHY of
@@ -101,6 +103,7 @@ begin
    pgpRxOut.phyRxReady  <= phyRxReady;
    pgpRxOut.remOverflow <= overflow;
    pgpRxOut.remPause    <= pause;
+   phyRxRst             <= pgpRxPhyRst;
 
    -- Interface connection
    intPhyRxData    <= phyRxLaneIn.data;
@@ -117,7 +120,7 @@ begin
          ) port map (
             pgpRxClkEn      => pgpRxClkEn,
             pgpRxClk        => pgpRxClk,
-            pgpRxClkRst     => pgpRxClkRst,
+            pgpRxClkRst     => phyRxRst,
             pgpRxLinkReady  => intRxLinkReady,
             pgpRxLinkDown   => pgpRxOut.linkDown,
             pgpRxLinkError  => pgpRxOut.linkError,

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcRxCell.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcRxCell.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcRxPhy.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcRxPhy.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTx.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTx.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxCell.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxCell.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxPhy.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxPhy.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxSched.vhd b/protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxSched.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/tb/Pgp2fcLane_tb.vhd b/protocols/pgp/pgp2fc/core/tb/Pgp2fcLane_tb.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2b: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/core/tb/RoguePgp2fcSim.vhd b/protocols/pgp/pgp2fc/core/tb/RoguePgp2fcSim.vhd
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- Title      : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
+-- Title      : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
 -------------------------------------------------------------------------------
 -- Company    : SLAC National Accelerator Laboratory
 -------------------------------------------------------------------------------

diff --git a/protocols/pgp/pgp2fc/gthUltraScale+/ip/Pgp2fcGthCore.dcp b/protocols/pgp/pgp2fc/gthUltraScale+/ip/Pgp2fcGthCore.dcp