FPGA/corundum
1
0
Fork 0
mirror of https://github.com/corundum/corundum.git synced 2025-01-30 08:32:52 +08:00
Code Issues Projects Releases Wiki Activity

Use internal BYTE_LANES parameter

Browse Source 
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich 2023-07-06 16:28:08 -07:00
parent 9159425cd8
commit 9dafc3aaee
4 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rtl/arp_eth_rx.v
View File

@ -86,17 +86,19 @@ module arp_eth_rx #
output wire error_invalid_header output wire error_invalid_header
); );
parameter BYTE_LANES = KEEP_ENABLE ? KEEP_WIDTH : 1;
parameter HDR_SIZE = 28; parameter HDR_SIZE = 28;
parameter CYCLE_COUNT = (HDR_SIZE+KEEP_WIDTH-1)/KEEP_WIDTH; parameter CYCLE_COUNT = (HDR_SIZE+BYTE_LANES-1)/BYTE_LANES;
parameter PTR_WIDTH = $clog2(CYCLE_COUNT); parameter PTR_WIDTH = $clog2(CYCLE_COUNT);
parameter OFFSET = HDR_SIZE % KEEP_WIDTH; parameter OFFSET = HDR_SIZE % BYTE_LANES;
// bus width assertions // bus width assertions
initial begin initial begin
if (KEEP_WIDTH * 8 != DATA_WIDTH) begin if (BYTE_LANES * 8 != DATA_WIDTH) begin
$error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)"); $error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)");
$finish; $finish;
end end
@ -215,8 +217,8 @@ always @* begin
ptr_next = ptr_reg + 1; ptr_next = ptr_reg + 1;
`define _HEADER_FIELD_(offset, field) \ `define _HEADER_FIELD_(offset, field) \
if (ptr_reg == offset/KEEP_WIDTH && (!KEEP_ENABLE || s_eth_payload_axis_tkeep[offset%KEEP_WIDTH])) begin \ if (ptr_reg == offset/BYTE_LANES && (!KEEP_ENABLE || s_eth_payload_axis_tkeep[offset%BYTE_LANES])) begin \
field = s_eth_payload_axis_tdata[(offset%KEEP_WIDTH)*8 +: 8]; \ field = s_eth_payload_axis_tdata[(offset%BYTE_LANES)*8 +: 8]; \
end end
`_HEADER_FIELD_(0, m_arp_htype_next[1*8 +: 8]) `_HEADER_FIELD_(0, m_arp_htype_next[1*8 +: 8])
@ -248,7 +250,7 @@ always @* begin
`_HEADER_FIELD_(26, m_arp_tpa_next[1*8 +: 8]) `_HEADER_FIELD_(26, m_arp_tpa_next[1*8 +: 8])
`_HEADER_FIELD_(27, m_arp_tpa_next[0*8 +: 8]) `_HEADER_FIELD_(27, m_arp_tpa_next[0*8 +: 8])
if (ptr_reg == 27/KEEP_WIDTH && (!KEEP_ENABLE || s_eth_payload_axis_tkeep[27%KEEP_WIDTH])) begin if (ptr_reg == 27/BYTE_LANES && (!KEEP_ENABLE || s_eth_payload_axis_tkeep[27%BYTE_LANES])) begin
read_arp_header_next = 1'b0; read_arp_header_next = 1'b0;
end end

16
rtl/arp_eth_tx.v
View File

@ -82,17 +82,19 @@ module arp_eth_tx #
output wire busy output wire busy
); );
parameter BYTE_LANES = KEEP_ENABLE ? KEEP_WIDTH : 1;
parameter HDR_SIZE = 28; parameter HDR_SIZE = 28;
parameter CYCLE_COUNT = (HDR_SIZE+KEEP_WIDTH-1)/KEEP_WIDTH; parameter CYCLE_COUNT = (HDR_SIZE+BYTE_LANES-1)/BYTE_LANES;
parameter PTR_WIDTH = $clog2(CYCLE_COUNT); parameter PTR_WIDTH = $clog2(CYCLE_COUNT);
parameter OFFSET = HDR_SIZE % KEEP_WIDTH; parameter OFFSET = HDR_SIZE % BYTE_LANES;
// bus width assertions // bus width assertions
initial begin initial begin
if (KEEP_WIDTH * 8 != DATA_WIDTH) begin if (BYTE_LANES * 8 != DATA_WIDTH) begin
$error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)"); $error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)");
$finish; $finish;
end end
@ -196,9 +198,9 @@ always @* begin
m_eth_payload_axis_tuser_int = 1'b0; m_eth_payload_axis_tuser_int = 1'b0;
`define _HEADER_FIELD_(offset, field) \ `define _HEADER_FIELD_(offset, field) \
if (ptr_reg == offset/KEEP_WIDTH) begin \ if (ptr_reg == offset/BYTE_LANES) begin \
m_eth_payload_axis_tdata_int[(offset%KEEP_WIDTH)*8 +: 8] = field; \ m_eth_payload_axis_tdata_int[(offset%BYTE_LANES)*8 +: 8] = field; \
m_eth_payload_axis_tkeep_int[offset%KEEP_WIDTH] = 1'b1; \ m_eth_payload_axis_tkeep_int[offset%BYTE_LANES] = 1'b1; \
end end
`_HEADER_FIELD_(0, arp_htype_reg[1*8 +: 8]) `_HEADER_FIELD_(0, arp_htype_reg[1*8 +: 8])
@ -230,7 +232,7 @@ always @* begin
`_HEADER_FIELD_(26, arp_tpa_reg[1*8 +: 8]) `_HEADER_FIELD_(26, arp_tpa_reg[1*8 +: 8])
`_HEADER_FIELD_(27, arp_tpa_reg[0*8 +: 8]) `_HEADER_FIELD_(27, arp_tpa_reg[0*8 +: 8])
if (ptr_reg == 27/KEEP_WIDTH) begin if (ptr_reg == 27/BYTE_LANES) begin
m_eth_payload_axis_tlast_int = 1'b1; m_eth_payload_axis_tlast_int = 1'b1;
send_arp_header_next = 1'b0; send_arp_header_next = 1'b0;
end end

14
rtl/eth_axis_rx.v
View File

@ -77,17 +77,19 @@ module eth_axis_rx #
output wire error_header_early_termination output wire error_header_early_termination
); );
parameter BYTE_LANES = KEEP_ENABLE ? KEEP_WIDTH : 1;
parameter HDR_SIZE = 14; parameter HDR_SIZE = 14;
parameter CYCLE_COUNT = (HDR_SIZE+KEEP_WIDTH-1)/KEEP_WIDTH; parameter CYCLE_COUNT = (HDR_SIZE+BYTE_LANES-1)/BYTE_LANES;
parameter PTR_WIDTH = $clog2(CYCLE_COUNT); parameter PTR_WIDTH = $clog2(CYCLE_COUNT);
parameter OFFSET = HDR_SIZE % KEEP_WIDTH; parameter OFFSET = HDR_SIZE % BYTE_LANES;
// bus width assertions // bus width assertions
initial begin initial begin
if (KEEP_WIDTH * 8 != DATA_WIDTH) begin if (BYTE_LANES * 8 != DATA_WIDTH) begin
$error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)"); $error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)");
$finish; $finish;
end end
@ -215,8 +217,8 @@ always @* begin
ptr_next = ptr_reg + 1; ptr_next = ptr_reg + 1;
`define _HEADER_FIELD_(offset, field) \ `define _HEADER_FIELD_(offset, field) \
if (ptr_reg == offset/KEEP_WIDTH && (!KEEP_ENABLE || s_axis_tkeep[offset%KEEP_WIDTH])) begin \ if (ptr_reg == offset/BYTE_LANES && (!KEEP_ENABLE || s_axis_tkeep[offset%BYTE_LANES])) begin \
field = s_axis_tdata[(offset%KEEP_WIDTH)*8 +: 8]; \ field = s_axis_tdata[(offset%BYTE_LANES)*8 +: 8]; \
end end
`_HEADER_FIELD_(0, m_eth_dest_mac_next[5*8 +: 8]) `_HEADER_FIELD_(0, m_eth_dest_mac_next[5*8 +: 8])
@ -234,7 +236,7 @@ always @* begin
`_HEADER_FIELD_(12, m_eth_type_next[1*8 +: 8]) `_HEADER_FIELD_(12, m_eth_type_next[1*8 +: 8])
`_HEADER_FIELD_(13, m_eth_type_next[0*8 +: 8]) `_HEADER_FIELD_(13, m_eth_type_next[0*8 +: 8])
if (ptr_reg == 13/KEEP_WIDTH && (!KEEP_ENABLE || s_axis_tkeep[13%KEEP_WIDTH])) begin if (ptr_reg == 13/BYTE_LANES && (!KEEP_ENABLE || s_axis_tkeep[13%BYTE_LANES])) begin
if (!shift_axis_tlast) begin if (!shift_axis_tlast) begin
m_eth_hdr_valid_next = 1'b1; m_eth_hdr_valid_next = 1'b1;
read_eth_header_next = 1'b0; read_eth_header_next = 1'b0;

16
rtl/eth_axis_tx.v
View File

@ -76,17 +76,19 @@ module eth_axis_tx #
output wire busy output wire busy
); );
parameter BYTE_LANES = KEEP_ENABLE ? KEEP_WIDTH : 1;
parameter HDR_SIZE = 14; parameter HDR_SIZE = 14;
parameter CYCLE_COUNT = (HDR_SIZE+KEEP_WIDTH-1)/KEEP_WIDTH; parameter CYCLE_COUNT = (HDR_SIZE+BYTE_LANES-1)/BYTE_LANES;
parameter PTR_WIDTH = $clog2(CYCLE_COUNT); parameter PTR_WIDTH = $clog2(CYCLE_COUNT);
parameter OFFSET = HDR_SIZE % KEEP_WIDTH; parameter OFFSET = HDR_SIZE % BYTE_LANES;
// bus width assertions // bus width assertions
initial begin initial begin
if (KEEP_WIDTH * 8 != DATA_WIDTH) begin if (BYTE_LANES * 8 != DATA_WIDTH) begin
$error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)"); $error("Error: AXI stream interface requires byte (8-bit) granularity (instance %m)");
$finish; $finish;
end end
@ -240,9 +242,9 @@ always @* begin
m_axis_tvalid_int = 1'b1; m_axis_tvalid_int = 1'b1;
`define _HEADER_FIELD_(offset, field) \ `define _HEADER_FIELD_(offset, field) \
if (ptr_reg == offset/KEEP_WIDTH) begin \ if (ptr_reg == offset/BYTE_LANES) begin \
m_axis_tdata_int[(offset%KEEP_WIDTH)*8 +: 8] = field; \ m_axis_tdata_int[(offset%BYTE_LANES)*8 +: 8] = field; \
m_axis_tkeep_int[offset%KEEP_WIDTH] = 1'b1; \ m_axis_tkeep_int[offset%BYTE_LANES] = 1'b1; \
end end
`_HEADER_FIELD_(0, eth_dest_mac_reg[5*8 +: 8]) `_HEADER_FIELD_(0, eth_dest_mac_reg[5*8 +: 8])
@ -260,7 +262,7 @@ always @* begin
`_HEADER_FIELD_(12, eth_type_reg[1*8 +: 8]) `_HEADER_FIELD_(12, eth_type_reg[1*8 +: 8])
`_HEADER_FIELD_(13, eth_type_reg[0*8 +: 8]) `_HEADER_FIELD_(13, eth_type_reg[0*8 +: 8])
if (ptr_reg == 13/KEEP_WIDTH) begin if (ptr_reg == 13/BYTE_LANES) begin
if (!send_eth_payload_reg) begin if (!send_eth_payload_reg) begin
s_eth_payload_axis_tready_next = m_axis_tready_int_early; s_eth_payload_axis_tready_next = m_axis_tready_int_early;
send_eth_payload_next = 1'b1; send_eth_payload_next = 1'b1;