use of 2xqsfp (8lines) of 10GbE

boards/uniboard2/designs/unb2_test/revisions/unb2_test_10GbE/unb2_test_10GbE.vhd

@@ -85,8 +85,8 @@ ENTITY unb2_test_10GbE IS
     -- front transceivers
     QSFP_0_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
     QSFP_0_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
-    --QSFP_1_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
-    --QSFP_1_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
+    QSFP_1_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
+    QSFP_1_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
     --QSFP_2_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
     --QSFP_2_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
     --QSFP_3_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
@@ -164,8 +164,8 @@ BEGIN
     -- front transceivers
     QSFP_0_RX    => QSFP_0_RX,
     QSFP_0_TX    => QSFP_0_TX,
-    --QSFP_1_RX    => QSFP_1_RX,
-    --QSFP_1_TX    => QSFP_1_TX,
+    QSFP_1_RX    => QSFP_1_RX,
+    QSFP_1_TX    => QSFP_1_TX,
     --QSFP_2_RX    => QSFP_2_RX,
     --QSFP_2_TX    => QSFP_2_TX,
     --QSFP_3_RX    => QSFP_3_RX,

boards/uniboard2/designs/unb2_test/src/vhdl/unb2_test.vhd

@@ -96,8 +96,8 @@ ENTITY unb2_test IS
     -- front transceivers
     QSFP_0_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0) := (OTHERS=>'0');
     QSFP_0_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
-    --QSFP_1_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0) := (OTHERS=>'0');
-    --QSFP_1_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
+    QSFP_1_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0) := (OTHERS=>'0');
+    QSFP_1_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
     --QSFP_2_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0) := (OTHERS=>'0');
     --QSFP_2_TX    : OUT   STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0);
     --QSFP_3_RX    : IN    STD_LOGIC_VECTOR(c_unb2_board_tr_qsfp.bus_w-1 downto 0) := (OTHERS=>'0');
@@ -148,7 +148,7 @@ ARCHITECTURE str OF unb2_test IS
   CONSTANT c_use_MB_I                   : NATURAL := sel_a_b(c_use_ddr,1,0); -- 1: use MB_I  0: do not use
   CONSTANT c_use_MB_II                  : NATURAL := 0;
 
-  CONSTANT c_nof_qsfp                   : NATURAL := 4;--c_unb2_board_tr_qsfp.nof_bus * c_unb2_board_tr_qsfp.bus_w;
+  CONSTANT c_nof_qsfp                   : NATURAL := 8;--c_unb2_board_tr_qsfp.nof_bus * c_unb2_board_tr_qsfp.bus_w;
   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;
@@ -745,13 +745,13 @@ BEGIN
     GENERIC MAP (
       g_sim                       => g_sim,
       g_nof_streams               => c_nof_streams_qsfp + c_nof_streams_ring + c_nof_streams_back0 + c_nof_streams_back1,
-      g_data_w                    => c_data_w_32, -- c_data_w_64
+      g_data_w                    => c_data_w_64,
       g_bg_block_size             => c_bg_block_size,
       g_bg_gapsize                => c_bg_gapsize,
       g_bg_blocks_per_sync        => c_bg_blocks_per_sync,
       g_def_block_size            => c_def_10GbE_block_size,
       g_max_nof_blocks_per_packet => c_max_nof_blocks_per_packet_10GbE,
-      g_remove_crc                => TRUE -- FALSE
+      g_remove_crc                => FALSE
     )
     PORT MAP (
       mm_rst                         => mm_rst,
@@ -816,10 +816,21 @@ BEGIN
       i_serial_10G_rx_qsfp_ring_arr(i) <=   serial_10G_rx_qsfp_arr(i);
     END GENERATE;
 
-    gen_qsfp_pins: FOR i IN 0 TO c_nof_qsfp_bus-1 GENERATE
-      i_QSFP_RX(i) <= QSFP_0_RX;
-      QSFP_0_TX <= i_QSFP_TX(i);
-    END GENERATE;
+
+    i_QSFP_RX(0) <= QSFP_0_RX;
+    i_QSFP_RX(1) <= QSFP_1_RX;
+    --i_QSFP_RX(2) <= QSFP_2_RX;
+    --i_QSFP_RX(3) <= QSFP_3_RX;
+    --i_QSFP_RX(4) <= QSFP_4_RX;
+    --i_QSFP_RX(5) <= QSFP_5_RX;
+
+    QSFP_0_TX <= i_QSFP_TX(0);
+    QSFP_1_TX <= i_QSFP_TX(1);
+    --QSFP_2_TX <= i_QSFP_TX(2);
+    --QSFP_3_TX <= i_QSFP_TX(3);
+    --QSFP_4_TX <= i_QSFP_TX(4);
+    --QSFP_5_TX <= i_QSFP_TX(5);
+
 
 
     u_front_io : ENTITY unb2_board_lib.unb2_board_front_io

boards/uniboard2/designs/unb2_test/tb/vhdl/tb_unb2_test.vhd

@@ -204,8 +204,8 @@ BEGIN
       -- Serial I/O
       QSFP_0_TX  => si_lpbk_0,
       QSFP_0_RX  => si_lpbk_0,
---      QSFP_1_TX  => si_lpbk_1,
---      QSFP_1_RX  => si_lpbk_1,
+      QSFP_1_TX  => si_lpbk_1,
+      QSFP_1_RX  => si_lpbk_1,
 --      QSFP_2_TX  => si_lpbk_2,
 --      QSFP_2_RX  => si_lpbk_2,
 --      QSFP_3_TX  => si_lpbk_3,