Include timestamp fractional ns in completion record

Signed-off-by: Alex Forencich <[email protected]>
ucsdsysnet · Feb 13, 2024 · 435871c · 435871c
1 parent 110c89f
commit 435871c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/fpga/common/rtl/rx_engine.v b/fpga/common/rtl/rx_engine.v
@@ -943,16 +943,15 @@ always @* begin
             m_axis_cpl_req_data_next[31:16] = desc_table_queue_ptr[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             m_axis_cpl_req_data_next[47:32] = desc_table_dma_len[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             if (PTP_TS_ENABLE) begin
-                //m_axis_cpl_req_data_next[127:64] = desc_table_ptp_ts[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK] >> 16;
-                m_axis_cpl_req_data_next[111:64] = desc_table_ptp_ts[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK] >> 16;
+                m_axis_cpl_req_data_next[111:48] = desc_table_ptp_ts[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
+            end
+            if (RX_CHECKSUM_ENABLE) begin
+                m_axis_cpl_req_data_next[127:112] = desc_table_csum[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             end
             if (RX_HASH_ENABLE) begin
                 m_axis_cpl_req_data_next[159:128] = desc_table_hash[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
                 m_axis_cpl_req_data_next[167:160] = desc_table_hash_type[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             end
-            if (RX_CHECKSUM_ENABLE) begin
-                m_axis_cpl_req_data_next[127:112] = desc_table_csum[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
-            end
             m_axis_cpl_req_data_next[176:168] = desc_table_id[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             m_axis_cpl_req_valid_next = 1'b1;
         end

diff --git a/fpga/common/rtl/tx_engine.v b/fpga/common/rtl/tx_engine.v
@@ -860,8 +860,7 @@ always @* begin
             m_axis_cpl_req_data_next[31:16] = desc_table_queue_ptr[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             m_axis_cpl_req_data_next[47:32] = desc_table_len[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             if (PTP_TS_ENABLE) begin
-                //m_axis_cpl_req_data_next[127:64] = desc_table_ptp_ts[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK] >> 16;
-                m_axis_cpl_req_data_next[111:64] = desc_table_ptp_ts[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK] >> 16;
+                m_axis_cpl_req_data_next[111:48] = desc_table_ptp_ts[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             end
             m_axis_cpl_req_data_next[176:168] = desc_table_dest[desc_table_cpl_enqueue_start_ptr_reg & DESC_PTR_MASK];
             m_axis_cpl_req_valid_next = 1'b1;

diff --git a/modules/mqnic/mqnic_hw.h b/modules/mqnic/mqnic_hw.h
@@ -395,7 +395,7 @@ struct mqnic_cpl {
 	__le16 queue;
 	__le16 index;
 	__le16 len;
-	__le16 rsvd0;
+	__le16 ts_fns;
 	__le32 ts_ns;
 	__le16 ts_s;
 	__le16 rx_csum;