bslathi19/taxi
1
0
Fork 0
mirror of https://github.com/fpganinja/taxi.git synced 2025-12-09 17:08:38 -08:00
Code Issues Packages Projects Releases Wiki Activity

eth: Clean up error detection logic in combined MAC/PCS

Browse Source 
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich
2025-03-27 09:33:56 -07:00
parent 5b16933210
commit df87998a1b
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rtl/eth/taxi_axis_baser_rx_64.sv
View File

@@ -429,9 +429,9 @@ always_ff @(posedge clk) begin
if (lanes_swapped) begin if (lanes_swapped) begin
if (delay_type_valid) begin if (delay_type_valid) begin
input_type_d0 <= delay_type; input_type_d0 <= delay_type;
end else if (encoded_rx_hdr == SYNC_DATA) begin end else if (encoded_rx_hdr[0] == SYNC_DATA[0]) begin
input_type_d0 <= INPUT_TYPE_DATA; input_type_d0 <= INPUT_TYPE_DATA;
end else if (encoded_rx_hdr == SYNC_CTRL) begin end else begin
case (encoded_rx_data[7:4]) case (encoded_rx_data[7:4])
BLOCK_TYPE_TERM_0[7:4]: input_type_d0 <= INPUT_TYPE_TERM_4; BLOCK_TYPE_TERM_0[7:4]: input_type_d0 <= INPUT_TYPE_TERM_4;
BLOCK_TYPE_TERM_1[7:4]: input_type_d0 <= INPUT_TYPE_TERM_5; BLOCK_TYPE_TERM_1[7:4]: input_type_d0 <= INPUT_TYPE_TERM_5;
@@ -458,13 +458,9 @@ always_ff @(posedge clk) begin
BLOCK_TYPE_OS_04[7:4]: input_type_d0 <= INPUT_TYPE_IDLE; BLOCK_TYPE_OS_04[7:4]: input_type_d0 <= INPUT_TYPE_IDLE;
BLOCK_TYPE_OS_0[7:4]: input_type_d0 <= INPUT_TYPE_IDLE; BLOCK_TYPE_OS_0[7:4]: input_type_d0 <= INPUT_TYPE_IDLE;
default: begin default: begin
rx_bad_block_reg <= 1'b1;
input_type_d0 <= INPUT_TYPE_ERROR; input_type_d0 <= INPUT_TYPE_ERROR;
end end
endcase endcase
end else begin
rx_bad_block_reg <= 1'b1;
input_type_d0 <= INPUT_TYPE_ERROR;
end end
if (delay_type_valid) begin if (delay_type_valid) begin
// mask off trailing data // mask off trailing data
@@ -473,9 +469,9 @@ always_ff @(posedge clk) begin
input_data_d0 <= {encoded_rx_data_masked[31:0], swap_data}; input_data_d0 <= {encoded_rx_data_masked[31:0], swap_data};
end end
end else begin end else begin
if (encoded_rx_hdr == SYNC_DATA) begin if (encoded_rx_hdr[0] == SYNC_DATA[0]) begin
input_type_d0 <= INPUT_TYPE_DATA; input_type_d0 <= INPUT_TYPE_DATA;
end else if (encoded_rx_hdr == SYNC_CTRL) begin end else begin
case (encoded_rx_data[7:4]) case (encoded_rx_data[7:4])
BLOCK_TYPE_CTRL[7:4]: input_type_d0 <= INPUT_TYPE_IDLE; BLOCK_TYPE_CTRL[7:4]: input_type_d0 <= INPUT_TYPE_IDLE;
BLOCK_TYPE_OS_4[7:4]: input_type_d0 <= INPUT_TYPE_IDLE; BLOCK_TYPE_OS_4[7:4]: input_type_d0 <= INPUT_TYPE_IDLE;
@@ -490,13 +486,9 @@ always_ff @(posedge clk) begin
BLOCK_TYPE_TERM_6[7:4]: input_type_d0 <= INPUT_TYPE_TERM_6; BLOCK_TYPE_TERM_6[7:4]: input_type_d0 <= INPUT_TYPE_TERM_6;
BLOCK_TYPE_TERM_7[7:4]: input_type_d0 <= INPUT_TYPE_TERM_7; BLOCK_TYPE_TERM_7[7:4]: input_type_d0 <= INPUT_TYPE_TERM_7;
default: begin default: begin
rx_bad_block_reg <= 1'b1;
input_type_d0 <= INPUT_TYPE_ERROR; input_type_d0 <= INPUT_TYPE_ERROR;
end end
endcase endcase
end else begin
rx_bad_block_reg <= 1'b1;
input_type_d0 <= INPUT_TYPE_ERROR;
end end
input_data_d0 <= encoded_rx_data_masked; input_data_d0 <= encoded_rx_data_masked;
end end
@@ -580,10 +572,12 @@ always_ff @(posedge clk) begin
end end
default: begin default: begin
// invalid block type // invalid block type
frame_reg <= 1'b0;
end end
endcase endcase
end else begin end else begin
// invalid header // invalid header
frame_reg <= 1'b0;
end end
// check all block type bits to detect bad encodings // check all block type bits to detect bad encodings
@@ -610,13 +604,11 @@ always_ff @(posedge clk) begin
default: begin default: begin
// invalid block type // invalid block type
rx_bad_block_reg <= 1'b1; rx_bad_block_reg <= 1'b1;
input_type_d0 <= INPUT_TYPE_ERROR;
end end
endcase endcase
end else begin end else begin
// invalid header // invalid header
rx_bad_block_reg <= 1'b1; rx_bad_block_reg <= 1'b1;
input_type_d0 <= INPUT_TYPE_ERROR;
end end
// capture timestamps // capture timestamps