From c560496dc6765599f2a3b5fb6326c281ce4e0164 Mon Sep 17 00:00:00 2001
From: Leon Hiemstra <hiemstra@astron.nl>
Date: Mon, 22 Jun 2015 13:20:58 +0000
Subject: [PATCH] restored to 6xQSFP and 2xRING
---
.../revisions/unb2_test_10GbE/hdllib.cfg | 1 +
.../unb2_test_10GbE/unb2_test_10GbE.vhd | 3 ++-
.../designs/unb2_test/src/vhdl/unb2_test.vhd | 26 +++++++++----------
.../unb2_test/tb/vhdl/tb_unb2_test.vhd | 22 ++++++++--------
4 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg
index 051ef126b7..0ce16e0948 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/hdllib.cfg
@@ -25,6 +25,7 @@ quartus_qsf_files =
$RADIOHDL/boards/uniboard2/libraries/unb2_board/quartus/unb2_board.qsf
quartus_sdc_files =
+ quartus/unb2_test_10GbE.sdc
$RADIOHDL/boards/uniboard2/libraries/unb2_board/quartus/unb2_board.sdc
quartus_tcl_files =
diff --git a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd
index 81251b2151..d9a70e0a5b 100644
--- a/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd
+++ b/boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd
@@ -31,7 +31,8 @@ USE technology_lib.technology_pkg.ALL;
ENTITY unb2_test_10GbE IS
GENERIC (
g_design_name : STRING := "unb2_test_10GbE";
- g_design_note : STRING := "10GbE: 6xQSFP and 2xRING";
+ --g_design_note : STRING := "10GbE: 3xQSFP";
+ g_design_note : STRING := "10GbE: 6xQSFP 2xRING";
g_sim : BOOLEAN := FALSE; --Overridden by TB
g_sim_unb_nr : NATURAL := 0;
g_sim_node_nr : NATURAL := 0;
diff --git a/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd b/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd
index 8308431ca7..87a2029fc5 100644
--- a/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd
+++ b/boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd
@@ -150,13 +150,13 @@ ARCHITECTURE str OF unb2_test IS
CONSTANT c_use_MB_both : BOOLEAN := FALSE; -- FIXME: c_use_MB_I OR c_use_MB_II;
-- transceivers
- CONSTANT c_nof_qsfp : NATURAL := c_unb2_board_tr_qsfp.nof_bus * c_unb2_board_tr_qsfp.bus_w;
+ CONSTANT c_nof_qsfp : NATURAL := c_unb2_board_tr_qsfp.nof_bus * c_unb2_board_tr_qsfp.bus_w;--8
CONSTANT c_nof_ring : NATURAL := c_unb2_board_tr_ring.nof_bus * c_unb2_board_tr_ring.bus_w;
CONSTANT c_nof_back0 : NATURAL := c_unb2_board_tr_back.bus_w;
CONSTANT c_nof_back1 : NATURAL := c_unb2_board_tr_back.bus_w;
-- 1GbE
- CONSTANT c_nof_streams_1GbE : NATURAL := sel_a_b(c_use_1GbE,c_unb2_board_nof_eth,0);
+ CONSTANT c_nof_streams_1GbE : NATURAL := sel_a_b(c_use_1GbE,1,0); --sel_a_b(c_use_1GbE,c_unb2_board_nof_eth,0);
-- 10GbE
CONSTANT c_nof_streams_qsfp : NATURAL := sel_a_b(c_use_10GbE_qsfp,c_nof_qsfp,0);
@@ -517,7 +517,7 @@ BEGIN
g_technology => g_technology,
g_bg_block_size => c_bg_block_size,
g_hdr_field_arr => c_hdr_field_arr,
- g_nof_streams_1GbE => 1,--c_nof_streams_1GbE,
+ g_nof_streams_1GbE => c_unb2_board_nof_eth,
g_nof_streams_qsfp => c_unb2_board_tr_qsfp.nof_bus * c_unb2_board_tr_qsfp.bus_w,
g_nof_streams_ring => c_unb2_board_tr_ring.nof_bus * c_unb2_board_tr_ring.bus_w,
g_nof_streams_back0 => c_unb2_board_tr_back.bus_w,
@@ -775,15 +775,15 @@ BEGIN
);
- u_sa_clk_buf : ENTITY tech_clkbuf_lib.tech_clkbuf
- GENERIC MAP (
- g_technology => g_technology,
- g_clock_net => "GLOBAL"
- )
- PORT MAP (
- inclk => SA_CLK,
- outclk => SA_CLK_buf
- );
+-- u_sa_clk_buf : ENTITY tech_clkbuf_lib.tech_clkbuf
+-- GENERIC MAP (
+-- g_technology => g_technology,
+-- g_clock_net => "GLOBAL"
+-- )
+-- PORT MAP (
+-- inclk => SA_CLK,
+-- outclk => SA_CLK_buf
+-- );
u_tr_10GbE_qsfp_and_ring: ENTITY unb2_board_lib.unb2_board_10gbe -- QSFP and Ring lines
GENERIC MAP (
@@ -795,7 +795,7 @@ BEGIN
g_tx_fifo_size => c_def_10GbE_block_size*2
)
PORT MAP (
- tr_ref_clk => SA_CLK_buf,
+ tr_ref_clk => SA_CLK,
mm_rst => mm_rst,
mm_clk => mm_clk,
reg_mac_mosi => reg_tr_10GbE_qsfp_ring_mosi,
diff --git a/boards/uniboard2/designs/unb2_test/tb/vhdl/tb_unb2_test.vhd b/boards/uniboard2/designs/unb2_test/tb/vhdl/tb_unb2_test.vhd
index 75686dec57..85e5b0f46c 100644
--- a/boards/uniboard2/designs/unb2_test/tb/vhdl/tb_unb2_test.vhd
+++ b/boards/uniboard2/designs/unb2_test/tb/vhdl/tb_unb2_test.vhd
@@ -225,17 +225,17 @@ BEGIN
QSFP_1_RX => si_lpbk_1,
QSFP_2_TX => si_lpbk_2,
QSFP_2_RX => si_lpbk_2,
- QSFP_3_TX => si_lpbk_3,
- QSFP_3_RX => si_lpbk_3,
- QSFP_4_TX => si_lpbk_4,
- QSFP_4_RX => si_lpbk_4,
- QSFP_5_TX => si_lpbk_5,
- QSFP_5_RX => si_lpbk_5,
-
- RING_0_TX => si_lpbk_6,
- RING_0_RX => si_lpbk_6,
- RING_1_TX => si_lpbk_7,
- RING_1_RX => si_lpbk_7,
+-- QSFP_3_TX => si_lpbk_3,
+-- QSFP_3_RX => si_lpbk_3,
+-- QSFP_4_TX => si_lpbk_4,
+-- QSFP_4_RX => si_lpbk_4,
+-- QSFP_5_TX => si_lpbk_5,
+-- QSFP_5_RX => si_lpbk_5,
+--
+-- RING_0_TX => si_lpbk_6,
+-- RING_0_RX => si_lpbk_6,
+-- RING_1_TX => si_lpbk_7,
+-- RING_1_RX => si_lpbk_7,
--
-- BCK_TX => si_lpbk_8,
-- BCK_RX => si_lpbk_8,
--
GitLab