From 6ee81231a66f46dc7191620a5f2170180be340ce Mon Sep 17 00:00:00 2001
From: donker <donker@astron.nl>
Date: Wed, 20 Jan 2021 12:07:17 +0100
Subject: [PATCH] L2SDP-200: now with received bsn and data_id
---
applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd | 8 +++++---
.../libraries/sdp/src/vhdl/sdp_statistics_offload.vhd | 2 +-
.../libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
index b434b86e18..487fef2361 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
@@ -200,8 +200,8 @@ PACKAGE sdp_pkg is
CONSTANT c_sdp_reg_nw_10GbE_eth10g_addr_w : NATURAL := 1;
-- statistics SST offload
- CONSTANT c_sdp_stat_nof_hdr_fields : NATURAL := 3+12+4+20+1; -- 592b; 9.25 64b words
- CONSTANT c_sdp_stat_hdr_field_sel : STD_LOGIC_VECTOR(c_sdp_stat_nof_hdr_fields-1 DOWNTO 0) := "101"&"111111111001"&"0111"&"11111111111111111110"&"1"; -- 0=data path, 1=MM controlled TODO
+ CONSTANT c_sdp_stat_nof_hdr_fields : NATURAL := 3+12+4+20+1+1; -- 592b; 9.25 64b words
+ CONSTANT c_sdp_stat_hdr_field_sel : STD_LOGIC_VECTOR(c_sdp_stat_nof_hdr_fields-1 DOWNTO 0) := "101"&"111111111001"&"0111"&"11111111111111000000"&"0"&"0"; -- 0=data path, 1=MM controlled TODO
CONSTANT c_sdp_stat_hdr_field_arr : t_common_field_arr(c_sdp_stat_nof_hdr_fields-1 DOWNTO 0) := (
( field_name_pad("eth_dst_mac" ), "RW", 48, field_default(x"00074306C700") ), -- 00074306C700=DOP36-eth0
@@ -249,7 +249,9 @@ PACKAGE sdp_pkg is
( field_name_pad("sdp_nof_statistics_per_package" ), "RW", 16, field_default(0) ),
( field_name_pad("sdp_block_period" ), "RW", 16, field_default(5120) ),
- ( field_name_pad("dp_bsn" ), "RW", 64, field_default(0) )
+ ( field_name_pad("dp_bsn" ), "RW", 64, field_default(0) ),
+ ( field_name_pad("pad_to_32b" ), "RW", 16, field_default(0) )
+
);
END PACKAGE sdp_pkg;
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_statistics_offload.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_statistics_offload.vhd
index a24e376463..171ef0d5de 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_statistics_offload.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_statistics_offload.vhd
@@ -301,7 +301,7 @@ BEGIN
GENERIC MAP (
g_nof_streams => c_nof_streams,
g_data_w => c_word_w,
- g_symbol_w => c_word_w,
+ g_symbol_w => c_word_w, -- if header is 32b alligned else c_byte_w
g_hdr_field_arr => c_sdp_stat_hdr_field_arr,
g_hdr_field_sel => c_sdp_stat_hdr_field_sel,
g_pipeline_ready => TRUE
diff --git a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd
index 884b9f723e..1495ce8949 100644
--- a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd
+++ b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_statistics_offload.vhd
@@ -196,7 +196,7 @@ BEGIN
WAIT;
END PROCESS;
- p_verify : PROCESS(test_offload_sosi, rx_hdr_fields_out, rx_hdr_fields_raw)
+ p_verify : PROCESS(test_offload_sosi, rx_hdr_fields_raw)
BEGIN
IF test_offload_sosi.sop = '1' THEN
rx_bsn <= TO_UINT(rx_hdr_fields_raw(field_hi(c_sdp_stat_hdr_field_arr, "dp_bsn") DOWNTO field_lo(c_sdp_stat_hdr_field_arr, "dp_bsn")));
--
GitLab