Skip to content

Commit 60065b6

Browse files
ruck314ruck314
authored
Merge pull request #1220 from slaclab/pre-release
Release Candidate v2.53.0
2 parents 18541d2 + e3fbc5f commit 60065b6

File tree

88 files changed

+3526
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3526
-256
lines changed

‎axi/axi-stream/rtl/AxiStreamResize.vhd

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,10 @@ begin
8989
-- Make sure data widths are appropriate.
9090
assert ((SLV_BYTES_C >= MST_BYTES_C and SLV_BYTES_C mod MST_BYTES_C = 0) or
9191
(MST_BYTES_C >= SLV_BYTES_C and MST_BYTES_C mod SLV_BYTES_C = 0))
92-
report "Data widths must be even number multiples of each other" severity failure;
92+
report "Data widths must be even number multiples of each other" & LF &
93+
"SLV_BYTES_C= " & integer'image(SLV_BYTES_C) & LF &
94+
"MST_BYTES_C= " & integer'image(MST_BYTES_C)
95+
severity failure;
9396

9497
-- When going from a large bus to a small bus, ready is necessary
9598
assert (SLV_BYTES_C <= MST_BYTES_C or READY_EN_G = true)

‎devices/AnalogDevices/ad9249/UltraScale/rtl/Ad9249ReadoutGroup2.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ architecture rtl of Ad9249ReadoutGroup2 is
137137

138138
signal debugDataValid : sl;
139139
signal debugDataOut : slv(NUM_CHANNELS_G*16-1 downto 0);
140-
signal debugDataTmp : slv16Array(7 downto 0);
140+
signal debugDataTmp : slv16Array(7 downto 0) := (others => (others => '0'));
141141

142142
signal invertSync : sl;
143143
signal bitSlip : sl;

‎devices/AnalogDevices/ad9249/tb/Ad9249Group.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ begin
532532
end if;
533533
end process seq;
534534

535-
adcComb : process (adcR) is
535+
adcComb : process (adcR, r, vin) is
536536
variable v : AdcRegType := ADC_REG_INIT_C;
537537
begin
538538
v := adcR;

‎ethernet/RoCEv2/README.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,19 @@
1-
@FilMarini: Please write up some text about how these modules were auto-generated from BlueRdma
1+
# Hardware Implementation of RoCEv2 Engine
2+
This folder contains files generated from Bluespec SystemVerilog (BSV) source code located in different repositories: [blue-rdma](https://github.com/datenlord/blue-rdma), [blue-crc](https://github.com/datenlord/blue-crc)
3+
4+
## Description
5+
The verilog files in the `blue-rdma` and `blue-crc` folders represent a hardware implementation of the RoCEv2 engine and a iCRC calculation engine, respectively.
6+
These files have been generated from a modified version of the BSV sources. The forked repo with the modifed version can be found [here](https://github.com/FilMarini/blue-rdma)
7+
8+
The modifications consists in:
9+
10+
* **Receiving Path Removed**: The RoCEv2 engine's receiving path as well as support for RDMA-Read operations has been entirely removed.
11+
12+
* **Resource Optimization**: By removing the receiving path, the core now consumes fewer hardware resources, allowing it to fit on smaller FPGAs.
13+
14+
* **Fixed settings**: the generated verilog has support for 1 PD, 1 QP, 2 CQ and 2 MR, in order to be as light as possible. To change these settings, the core needs to be re-generated from its original or modified repo
15+
16+
## License information
17+
The BSV-generated files follow the licensing terms from the original repositories. A copy of the original license can be found in the folders.
18+
19+
Please ensure compliance with both licenses when using or modifying these files.

‎ethernet/RoCEv2/blue-lib/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
These files are taken from the [B-Lang-org/bsc](https://github.com/B-Lang-org/bsc) repo.
2+
3+
The license file from the original repo applies to the files in this folder

‎ethernet/RoCEv2/blue-rdma/LICENSE

Lines changed: 340 additions & 0 deletions
Large diffs are not rendered by default.

‎protocols/pgp/pgp2fc/README.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎protocols/pgp/pgp2fc/core/rtl/CRC7Rtl.vhd

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ entity CRC7Rtl is
2626
end CRC7Rtl;
2727

2828
architecture imp_crc of CRC7Rtl is
29-
signal lfsr_q: std_logic_vector (7 downto 0);
30-
signal lfsr_c: std_logic_vector (7 downto 0);
29+
30+
signal lfsr_q: std_logic_vector (7 downto 0) := (others => '0');
31+
signal lfsr_c: std_logic_vector (7 downto 0) := (others => '0');
32+
3133
begin
34+
3235
crc_out <= lfsr_c when crc_en = '1' else lfsr_q;
3336
crc_out_r <= lfsr_q;
3437

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcAlignmentChecker.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcAlignmentController.vhd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
-------------------------------------------------------------------------------
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
3+
-------------------------------------------------------------------------------
24
-- Company : SLAC National Accelerator Laboratory
35
-------------------------------------------------------------------------------
46
-- Description: GTH RX Byte Alignment Controller

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcAxi.vhd

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------
@@ -40,11 +40,11 @@ entity Pgp2fcAxi is
4040
port (
4141

4242
-- TX PGP Interface (pgpTxClk domain)
43-
pgpTxClk : in sl;
44-
pgpTxClkRst : in sl;
45-
pgpTxIn : out Pgp2fcTxInType;
46-
pgpTxOut : in Pgp2fcTxOutType;
47-
locTxIn : in Pgp2fcTxInType := PGP2FC_TX_IN_INIT_C;
43+
pgpTxClk : in sl;
44+
pgpTxClkRst : in sl;
45+
pgpTxIn : out Pgp2fcTxInType;
46+
pgpTxOut : in Pgp2fcTxOutType;
47+
locTxIn : in Pgp2fcTxInType := PGP2FC_TX_IN_INIT_C;
4848

4949
-- RX PGP Interface (pgpRxClk domain)
5050
pgpRxClk : in sl;
@@ -331,9 +331,9 @@ begin
331331
generic map (
332332
TPD_G => TPD_G,
333333
REF_CLK_FREQ_G => AXI_CLK_FREQ_G,
334-
REFRESH_RATE_G => 100.0,
335-
CLK_LOWER_LIMIT_G => 155.0E+6,
336-
CLK_UPPER_LIMIT_G => 158.0E+6,
334+
REFRESH_RATE_G => 1.0,
335+
CLK_LOWER_LIMIT_G => 185.0E+6,
336+
CLK_UPPER_LIMIT_G => 187.0E+6,
337337
CNT_WIDTH_G => 32)
338338
port map (
339339
freqOut => rxStatusSync.rxClkFreq,
@@ -446,9 +446,9 @@ begin
446446
generic map (
447447
TPD_G => TPD_G,
448448
REF_CLK_FREQ_G => AXI_CLK_FREQ_G,
449-
REFRESH_RATE_G => 100.0,
450-
CLK_LOWER_LIMIT_G => 155.0E+6,
451-
CLK_UPPER_LIMIT_G => 158.0E+6,
449+
REFRESH_RATE_G => 1.0,
450+
CLK_LOWER_LIMIT_G => 185.0E+6,
451+
CLK_UPPER_LIMIT_G => 187.0E+6,
452452
CNT_WIDTH_G => 32)
453453
port map (
454454
freqOut => txStatusSync.txClkFreq,
@@ -518,6 +518,8 @@ begin
518518
pgpTxIn.flowCntlDis <= locTxIn.flowCntlDis or syncFlowCntlDis;
519519
pgpTxIn.resetTx <= locTxIn.resetTx or txReset;
520520
pgpTxIn.resetGt <= r.resetGt;
521+
pgpTxIn.fcValid <= locTxIn.fcValid;
522+
pgpTxIn.fcWord <= locTxIn.fcWord;
521523

522524

523525
-------------------------------------

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcLane.vhd

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------
@@ -68,6 +68,7 @@ entity Pgp2fcLane is
6868
pgpRxClkEn : in sl := '1';
6969
pgpRxClk : in sl := '0';
7070
pgpRxClkRst : in sl := '0';
71+
pgpRxPhyRst : in sl := '0';
7172

7273
-- Non-VC related IO
7374
pgpRxIn : in Pgp2fcRxInType := PGP2FC_RX_IN_INIT_C;
@@ -152,6 +153,7 @@ begin
152153
pgpRxClkEn => pgpRxClkEn,
153154
pgpRxClk => pgpRxClk,
154155
pgpRxClkRst => pgpRxClkRst,
156+
pgpRxPhyRst => pgpRxPhyRst,
155157
pgpRxIn => pgpRxIn,
156158
pgpRxOut => intRxOut,
157159
pgpRxMaster => intRxMaster,

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcPkg.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcRx.vhd

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------
@@ -38,6 +38,7 @@ entity Pgp2fcRx is
3838
pgpRxClkEn : in sl := '1'; -- Master clock enable
3939
pgpRxClk : in sl; -- Master clock
4040
pgpRxClkRst : in sl; -- Synchronous reset input
41+
pgpRxPhyRst : in sl := '0';
4142

4243
-- Non-VC related IO
4344
pgpRxIn : in Pgp2fcRxInType;
@@ -87,6 +88,7 @@ architecture Pgp2fcRx of Pgp2fcRx is
8788
signal overflow : slv(3 downto 0);
8889
signal intFcValid : sl;
8990
signal intFcError : sl;
91+
signal phyRxRst : sl;
9092

9193
attribute KEEP_HIERARCHY : string;
9294
attribute KEEP_HIERARCHY of
@@ -101,6 +103,7 @@ begin
101103
pgpRxOut.phyRxReady <= phyRxReady;
102104
pgpRxOut.remOverflow <= overflow;
103105
pgpRxOut.remPause <= pause;
106+
phyRxRst <= pgpRxPhyRst;
104107

105108
-- Interface connection
106109
intPhyRxData <= phyRxLaneIn.data;
@@ -117,7 +120,7 @@ begin
117120
) port map (
118121
pgpRxClkEn => pgpRxClkEn,
119122
pgpRxClk => pgpRxClk,
120-
pgpRxClkRst => pgpRxClkRst,
123+
pgpRxClkRst => phyRxRst,
121124
pgpRxLinkReady => intRxLinkReady,
122125
pgpRxLinkDown => pgpRxOut.linkDown,
123126
pgpRxLinkError => pgpRxOut.linkError,

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcRxCell.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcRxPhy.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcTx.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxCell.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxPhy.vhd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------
@@ -322,7 +322,7 @@ begin
322322
end process;
323323

324324
crcRst <= '1' when fcWordCount = FC_WORDS_G else '0';
325-
crcEn <= '1' when curState = ST_FC_C else '0';
325+
crcEn <= '1' when curState = ST_FC_C else '0';
326326

327327
U_Crc7 : entity surf.CRC7Rtl
328328
port map (

‎protocols/pgp/pgp2fc/core/rtl/Pgp2fcTxSched.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/tb/Pgp2fcLane_tb.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2b: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/core/tb/RoguePgp2fcSim.vhd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
-------------------------------------------------------------------------------
2-
-- Title : PGPv2fc: https://confluence.slac.stanford.edu/x/q86fD
2+
-- Title : PGP2fc: https://confluence.slac.stanford.edu/x/JhItHw
33
-------------------------------------------------------------------------------
44
-- Company : SLAC National Accelerator Laboratory
55
-------------------------------------------------------------------------------

‎protocols/pgp/pgp2fc/gthUltraScale+/ip/Pgp2fcGthCore.dcp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:6e46ae2eb23a233cbf69adcf67ae5ad33e207faae05f7efd66d5ce2bd46a7228
3+
size 269166

0 commit comments

Comments
 (0)