miegl/b210-k7-fpga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fpga: lib: add register stage in ipv4 chdr adapter

Browse Source 
Original-commit: 2b9504d84d8f8e5dd7156498b4c8b5db5a2c84da
This commit is contained in:
Max Köhler
2025-02-05 09:14:26 -06:00
committed by Wade Fife
parent 8aefaa7582
commit 40ce83817a
2 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/rfnoc/xport_sv/eth_ipv4_chdr_adapter.sv
+1 -1
View File
@@ -500,7 +500,7 @@ module eth_ipv4_chdr_adapter #(
c2e3.tready = c2e3_tready; c2e3.tready = c2e3_tready;
end end
axi_mux #( axi_mux #(
.SIZE(2), .PRIO(0), .WIDTH(ENET_W+ENET_USER_W), .PRE_FIFO_SIZE(0), .POST_FIFO_SIZE(1) .SIZE(2), .PRIO(0), .WIDTH(ENET_W+ENET_USER_W), .PRE_FIFO_SIZE(1), .POST_FIFO_SIZE(1)
) eth_mux_i ( ) eth_mux_i (
.clk(eth_rx.clk), .reset(eth_rx.rst), .clear(1'b0), .clk(eth_rx.clk), .reset(eth_rx.rst), .clear(1'b0),
.i_tdata({c2e3.tuser, c2e3.tdata, v2e3.tuser, v2e3.tdata}), .i_tlast({c2e3.tlast, v2e3.tlast}), .i_tdata({c2e3.tuser, c2e3.tdata, v2e3.tuser, v2e3.tdata}), .i_tlast({c2e3.tlast, v2e3.tlast}),
lib/rfnoc/xport_sv/eth_ipv4_chdr_dispatch.sv
+51 -41
View File
@@ -109,15 +109,18 @@ module eth_ipv4_chdr_dispatch #(
AxiStreamPacketIf #(.DATA_WIDTH(ENET_W),.USER_WIDTH(ENET_USER_W), AxiStreamPacketIf #(.DATA_WIDTH(ENET_W),.USER_WIDTH(ENET_USER_W),
.TKEEP(0),.MAX_PACKET_BYTES(MAX_PACKET_BYTES)) .TKEEP(0),.MAX_PACKET_BYTES(MAX_PACKET_BYTES))
in0(eth_rx.clk,eth_rx.rst); in0(eth_rx.clk,eth_rx.rst);
// in_reg // in_regs
// tUser = {error,trailing bytes}; // tUser = {error,trailing bytes};
AxiStreamPacketIf #(.DATA_WIDTH(ENET_W),.USER_WIDTH(ENET_USER_W), AxiStreamPacketIf #(.DATA_WIDTH(ENET_W),.USER_WIDTH(ENET_USER_W),
.TKEEP(0),.MAX_PACKET_BYTES(MAX_PACKET_BYTES)) .TKEEP(0),.MAX_PACKET_BYTES(MAX_PACKET_BYTES))
in1(eth_rx.clk,eth_rx.rst); in1(eth_rx.clk,eth_rx.rst);
AxiStreamPacketIf #(.DATA_WIDTH(ENET_W),.USER_WIDTH(ENET_USER_W),
.TKEEP(0),.MAX_PACKET_BYTES(MAX_PACKET_BYTES))
in2(eth_rx.clk,eth_rx.rst);
// STATEMACHINE // STATEMACHINE
// tUser = {error,trailing bytes}; // tUser = {error,trailing bytes};
AxiStreamIf #(.DATA_WIDTH(ENET_W),.USER_WIDTH(ENET_USER_W),.TKEEP(0)) AxiStreamIf #(.DATA_WIDTH(ENET_W),.USER_WIDTH(ENET_USER_W),.TKEEP(0))
in2(eth_rx.clk,eth_rx.rst); in3(eth_rx.clk,eth_rx.rst);
// CPU_BRANCH // CPU_BRANCH
// tUser = {error,trailing bytes}; // tUser = {error,trailing bytes};
@@ -163,7 +166,7 @@ module eth_ipv4_chdr_dispatch #(
end end
//--------------------------------------- //---------------------------------------
// Input pipeline stage // Input pipeline stages
//--------------------------------------- //---------------------------------------
axi4s_fifo #( axi4s_fifo #(
.SIZE(1) .SIZE(1)
@@ -172,6 +175,13 @@ module eth_ipv4_chdr_dispatch #(
.i(in0), .o(in1) .i(in0), .o(in1)
); );
axi4s_fifo #(
.SIZE(1)
) in_reg2_i (
.clear(1'b0),.space(),.occupied(),
.i(in1), .o(in2)
);
//--------------------------------------- //---------------------------------------
// Classification state machine // Classification state machine
//--------------------------------------- //---------------------------------------
@@ -245,13 +255,13 @@ module eth_ipv4_chdr_dispatch #(
udp_dst_port_old <= udp_dst_port_new; udp_dst_port_old <= udp_dst_port_new;
eth_type_old <= eth_type_new; eth_type_old <= eth_type_new;
if (in0.tvalid && in0.tready) begin if (in1.tvalid && in1.tready) begin
eth_dst_is_broadcast <= eth_dst_addr_new == ETH_ADDR_BCAST; eth_dst_is_broadcast <= eth_dst_addr_old == ETH_ADDR_BCAST;
eth_dst_is_me <= eth_dst_addr_new == e_my_mac; eth_dst_is_me <= eth_dst_addr_old == e_my_mac;
udp_dst_is_me <= udp_dst_port_new == e_my_udp_chdr_port; udp_dst_is_me <= udp_dst_port_old == e_my_udp_chdr_port;
ipv4_dst_is_me <= ipv4_dst_addr_new == e_my_ip; ipv4_dst_is_me <= ipv4_dst_addr_old == e_my_ip;
ipv4_protocol_is_udp <= ip_protocol_new == IPV4_PROTO_UDP; ipv4_protocol_is_udp <= ip_protocol_old == IPV4_PROTO_UDP;
eth_type_is_ipv4 <= eth_type_new == ETH_TYPE_IPV4; eth_type_is_ipv4 <= eth_type_old == ETH_TYPE_IPV4;
end end
end end
end end
@@ -271,19 +281,19 @@ module eth_ipv4_chdr_dispatch #(
eth_type_new = in0.get_packet_field16(eth_type_old, OFFSET+ETH_TYPE_BYTE, .NETWORK_ORDER(1)); eth_type_new = in0.get_packet_field16(eth_type_old, OFFSET+ETH_TYPE_BYTE, .NETWORK_ORDER(1));
end end
always_comb begin : reached_bytes always_ff @(posedge eth_rx.clk) begin : reached_bytes
reached_min_packet_new = in1.reached_packet_byte(OFFSET+MIN_PACKET_SIZE_BYTE); reached_min_packet_new = in1.reached_packet_byte(OFFSET+MIN_PACKET_SIZE_BYTE);
reached_end_of_udp = in1.reached_packet_byte(OFFSET+DST_PORT_BYTE+3);// we have enough to decide reached_end_of_udp = in1.reached_packet_byte(OFFSET+DST_PORT_BYTE+3);// we have enough to decide
end end
// calculate error conditions // calculate error conditions
assign mac_error = in1.tuser[ERROR_BIT] && in1.tvalid; assign mac_error = in2.tuser[ERROR_BIT] && in2.tvalid;
assign cpu_push_error = (in2.tvalid && !cpu0.tready); assign cpu_push_error = (in3.tvalid && !cpu0.tready);
assign chdr_push_error = (in2.tvalid && !chdr0.tready); assign chdr_push_error = (in3.tvalid && !chdr0.tready);
if (DROP_MIN_PACKET) begin if (DROP_MIN_PACKET) begin
assign reached_min_packet = (reached_min_packet_new && in1.tuser[BYTES_MSB:0] ==0) || reached_min_packet_old; assign reached_min_packet = (reached_min_packet_new && in2.tuser[BYTES_MSB:0] ==0) || reached_min_packet_old;
assign min_packet_error = (in1.tlast && !reached_min_packet); assign min_packet_error = (in2.tlast && !reached_min_packet);
end else begin end else begin
assign reached_min_packet = 1'b1; assign reached_min_packet = 1'b1;
assign min_packet_error = 1'b0; assign min_packet_error = 1'b0;
@@ -293,8 +303,8 @@ module eth_ipv4_chdr_dispatch #(
if (eth_rx.rst) begin if (eth_rx.rst) begin
dispatch_state <= ST_IDLE_ETH_L0; dispatch_state <= ST_IDLE_ETH_L0;
end else begin end else begin
if (in1.tvalid && in1.tready) begin if (in2.tvalid && in2.tready) begin
if (in1.tlast) if (in2.tlast)
dispatch_state <= ST_IDLE_ETH_L0; dispatch_state <= ST_IDLE_ETH_L0;
else else
dispatch_state <= next_dispatch_state; dispatch_state <= next_dispatch_state;
@@ -305,10 +315,10 @@ module eth_ipv4_chdr_dispatch #(
always_comb begin : dispatch_sm_next_state always_comb begin : dispatch_sm_next_state
//defaults //defaults
next_dispatch_state = dispatch_state; next_dispatch_state = dispatch_state;
`AXI4S_ASSIGN(in2,in1); `AXI4S_ASSIGN(in3,in2);
cpu_error = 1'b0; cpu_error = 1'b0;
chdr_error = 1'b0; chdr_error = 1'b0;
in1.tready = 1'b1; // never hold off in2.tready = 1'b1; // never hold off
// Statemachine always returns to ST_IDLE_ETH_L0 when tlast is set // Statemachine always returns to ST_IDLE_ETH_L0 when tlast is set
case (dispatch_state) case (dispatch_state)
@@ -375,8 +385,8 @@ module eth_ipv4_chdr_dispatch #(
ST_DROP_TERM: begin ST_DROP_TERM: begin
cpu_error = 1'b1; cpu_error = 1'b1;
chdr_error = 1'b1; chdr_error = 1'b1;
in2.tlast = 1'b1; in3.tlast = 1'b1;
in2.tvalid = 1'b1; in3.tvalid = 1'b1;
next_dispatch_state = ST_DROP_WAIT; next_dispatch_state = ST_DROP_WAIT;
end end
@@ -384,16 +394,16 @@ module eth_ipv4_chdr_dispatch #(
ST_DROP_WAIT: begin ST_DROP_WAIT: begin
cpu_error = 1'b0; cpu_error = 1'b0;
chdr_error = 1'b0; chdr_error = 1'b0;
in2.tlast = 1'b0; in3.tlast = 1'b0;
in2.tvalid = 1'b0; in3.tvalid = 1'b0;
end end
// We should never get here // We should never get here
default: begin default: begin
cpu_error = 1'b0; cpu_error = 1'b0;
chdr_error = 1'b0; chdr_error = 1'b0;
in2.tvalid = 1'b0; in3.tvalid = 1'b0;
in2.tlast = 1'b0; in3.tlast = 1'b0;
next_dispatch_state = ST_IDLE_ETH_L0; next_dispatch_state = ST_IDLE_ETH_L0;
end end
endcase endcase
@@ -410,25 +420,25 @@ module eth_ipv4_chdr_dispatch #(
logic cpu0_error, cpu0_error_old = 1'b0; logic cpu0_error, cpu0_error_old = 1'b0;
always_comb begin : cpu0_assign always_comb begin : cpu0_assign
cpu0_error = (cpu_error && in2.tvalid) || cpu0_error_old; cpu0_error = (cpu_error && in3.tvalid) || cpu0_error_old;
cpu0_push_error = (cpu_push_error && in2.tvalid)|| cpu0_push_error_old; cpu0_push_error = (cpu_push_error && in3.tvalid)|| cpu0_push_error_old;
cpu0.tdata = in2.tdata; cpu0.tdata = in3.tdata;
cpu0.tuser = in2.tuser; cpu0.tuser = in3.tuser;
cpu0.tlast = in2.tlast || cpu0_error; cpu0.tlast = in3.tlast || cpu0_error;
cpu0.tvalid = in2.tvalid || cpu0_error; cpu0.tvalid = in3.tvalid || cpu0_error;
chdr0_error = (chdr_error && in2.tvalid) || chdr0_error_old; chdr0_error = (chdr_error && in3.tvalid) || chdr0_error_old;
chdr0_push_error = (chdr_push_error && in2.tvalid) || chdr0_push_error_old; chdr0_push_error = (chdr_push_error && in3.tvalid) || chdr0_push_error_old;
chdr0.tdata = in2.tdata; chdr0.tdata = in3.tdata;
chdr0.tuser = in2.tuser; chdr0.tuser = in3.tuser;
chdr0.tlast = in2.tlast || chdr0_error; chdr0.tlast = in3.tlast || chdr0_error;
chdr0.tvalid = in2.tvalid || chdr0_error; chdr0.tvalid = in3.tvalid || chdr0_error;
// If the downstream sections are not ready, then the packet is dropped // If the downstream sections are not ready, then the packet is dropped
// there isn't really any buffer up stream, so a hold off here would // there isn't really any buffer up stream, so a hold off here would
// mean pushing back on a mac that doesn't have the capability to slow // mean pushing back on a mac that doesn't have the capability to slow
// down, and a data word would be lost. // down, and a data word would be lost.
in2.tready = 1'b1; in3.tready = 1'b1;
end end
@@ -449,9 +459,9 @@ module eth_ipv4_chdr_dispatch #(
// NOTE: Drop counts don't have to be perfect. This gets pretty close though. // NOTE: Drop counts don't have to be perfect. This gets pretty close though.
// I.e. Don't sweat this more in the future. // I.e. Don't sweat this more in the future.
chdr_dropped <= (chdr0_push_error && chdr0.tlast && chdr0.tvalid && chdr0.tready) || chdr_dropped <= (chdr0_push_error && chdr0.tlast && chdr0.tvalid && chdr0.tready) ||
(chdr0_push_error && in1.tlast && in1.tvalid); (chdr0_push_error && in2.tlast && in2.tvalid);
cpu_dropped <= (cpu0_push_error && cpu0.tlast && cpu0.tvalid && cpu0.tready) || cpu_dropped <= (cpu0_push_error && cpu0.tlast && cpu0.tvalid && cpu0.tready) ||
(cpu0_push_error && in1.tlast && in1.tvalid); (cpu0_push_error && in2.tlast && in2.tvalid);
// don't clear till we discard a packet // don't clear till we discard a packet
if (cpu0.tlast && cpu0.tvalid && cpu0.tready) begin if (cpu0.tlast && cpu0.tvalid && cpu0.tready) begin