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

Update async FIFO instances

Browse Source
This commit is contained in:
Alex Forencich 2015-10-09 22:35:25 -07:00
parent 98b15b6226
commit 55071645fd
2 changed files with 32 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
rtl/eth_mac_10g_fifo.v
View File

@ -104,40 +104,6 @@ wire rx_fifo_axis_tvalid;
wire rx_fifo_axis_tlast; wire rx_fifo_axis_tlast;
wire rx_fifo_axis_tuser; wire rx_fifo_axis_tuser;
// synchronize FIFO status signals into logic clock domain (only required for RX FIFO)
wire rx_fifo_overflow_int;
wire rx_fifo_bad_frame_int;
wire rx_fifo_good_frame_int;
reg [2:0] rx_sync_reg_1 = 0;
reg [2:0] rx_sync_reg_2 = 0;
reg [2:0] rx_sync_reg_3 = 0;
reg [2:0] rx_sync_reg_4 = 0;
assign rx_fifo_overflow = rx_sync_reg_3[0] ^ rx_sync_reg_4[0];
assign rx_fifo_bad_frame = rx_sync_reg_3[1] ^ rx_sync_reg_4[1];
assign rx_fifo_good_frame = rx_sync_reg_3[2] ^ rx_sync_reg_4[2];
always @(posedge rx_clk or posedge rx_rst) begin
if (rx_rst) begin
rx_sync_reg_1 <= 0;
end else begin
rx_sync_reg_1 <= rx_sync_reg_1 ^ {rx_fifo_good_frame_int, rx_fifo_bad_frame_int, rx_fifo_overflow_int};
end
end
always @(posedge logic_clk or posedge logic_rst) begin
if (logic_rst) begin
rx_sync_reg_2 <= 0;
rx_sync_reg_3 <= 0;
rx_sync_reg_4 <= 0;
end else begin
rx_sync_reg_2 <= rx_sync_reg_1;
rx_sync_reg_3 <= rx_sync_reg_2;
rx_sync_reg_4 <= rx_sync_reg_3;
end
end
eth_mac_10g #( eth_mac_10g #(
.ENABLE_PADDING(ENABLE_PADDING), .ENABLE_PADDING(ENABLE_PADDING),
.ENABLE_DIC(ENABLE_DIC), .ENABLE_DIC(ENABLE_DIC),
@ -174,9 +140,10 @@ axis_async_frame_fifo_64 #(
.DROP_WHEN_FULL(0) .DROP_WHEN_FULL(0)
) )
tx_fifo ( tx_fifo (
// Common reset
.async_rst(logic_rst | tx_rst),
// AXI input // AXI input
.input_clk(logic_clk), .input_clk(logic_clk),
.input_rst(logic_rst),
.input_axis_tdata(tx_axis_tdata), .input_axis_tdata(tx_axis_tdata),
.input_axis_tkeep(tx_axis_tkeep), .input_axis_tkeep(tx_axis_tkeep),
.input_axis_tvalid(tx_axis_tvalid), .input_axis_tvalid(tx_axis_tvalid),
@ -185,16 +152,18 @@ tx_fifo (
.input_axis_tuser(tx_axis_tuser), .input_axis_tuser(tx_axis_tuser),
// AXI output // AXI output
.output_clk(tx_clk), .output_clk(tx_clk),
.output_rst(tx_rst),
.output_axis_tdata(tx_fifo_axis_tdata), .output_axis_tdata(tx_fifo_axis_tdata),
.output_axis_tkeep(tx_fifo_axis_tkeep), .output_axis_tkeep(tx_fifo_axis_tkeep),
.output_axis_tvalid(tx_fifo_axis_tvalid), .output_axis_tvalid(tx_fifo_axis_tvalid),
.output_axis_tready(tx_fifo_axis_tready), .output_axis_tready(tx_fifo_axis_tready),
.output_axis_tlast(tx_fifo_axis_tlast), .output_axis_tlast(tx_fifo_axis_tlast),
// Status // Status
.overflow(tx_fifo_overflow), .input_status_overflow(tx_fifo_overflow),
.bad_frame(tx_fifo_bad_frame), .input_status_bad_frame(tx_fifo_bad_frame),
.good_frame(tx_fifo_good_frame) .input_status_good_frame(tx_fifo_good_frame),
.output_status_overflow(),
.output_status_bad_frame(),
.output_status_good_frame()
); );
assign tx_fifo_axis_tuser = 1'b0; assign tx_fifo_axis_tuser = 1'b0;
@ -205,9 +174,10 @@ axis_async_frame_fifo_64 #(
.DROP_WHEN_FULL(1) .DROP_WHEN_FULL(1)
) )
rx_fifo ( rx_fifo (
// Common reset
.async_rst(rx_rst | logic_rst),
// AXI input // AXI input
.input_clk(rx_clk), .input_clk(rx_clk),
.input_rst(rx_rst),
.input_axis_tdata(rx_fifo_axis_tdata), .input_axis_tdata(rx_fifo_axis_tdata),
.input_axis_tkeep(rx_fifo_axis_tkeep), .input_axis_tkeep(rx_fifo_axis_tkeep),
.input_axis_tvalid(rx_fifo_axis_tvalid), .input_axis_tvalid(rx_fifo_axis_tvalid),
@ -216,16 +186,18 @@ rx_fifo (
.input_axis_tuser(rx_fifo_axis_tuser), .input_axis_tuser(rx_fifo_axis_tuser),
// AXI output // AXI output
.output_clk(logic_clk), .output_clk(logic_clk),
.output_rst(logic_rst),
.output_axis_tdata(rx_axis_tdata), .output_axis_tdata(rx_axis_tdata),
.output_axis_tkeep(rx_axis_tkeep), .output_axis_tkeep(rx_axis_tkeep),
.output_axis_tvalid(rx_axis_tvalid), .output_axis_tvalid(rx_axis_tvalid),
.output_axis_tready(rx_axis_tready), .output_axis_tready(rx_axis_tready),
.output_axis_tlast(rx_axis_tlast), .output_axis_tlast(rx_axis_tlast),
// Status // Status
.overflow(rx_fifo_overflow_int), .input_status_overflow(),
.bad_frame(rx_fifo_bad_frame_int), .input_status_bad_frame(),
.good_frame(rx_fifo_good_frame_int) .input_status_good_frame(),
.output_status_overflow(rx_fifo_overflow),
.output_status_bad_frame(rx_fifo_bad_frame),
.output_status_good_frame(rx_fifo_good_frame)
); );
assign rx_axis_tuser = 1'b0; assign rx_axis_tuser = 1'b0;

60
rtl/eth_mac_1g_fifo.v
View File

@ -101,40 +101,6 @@ wire rx_fifo_axis_tvalid;
wire rx_fifo_axis_tlast; wire rx_fifo_axis_tlast;
wire rx_fifo_axis_tuser; wire rx_fifo_axis_tuser;
// synchronize FIFO status signals into logic clock domain (only required for RX FIFO)
wire rx_fifo_overflow_int;
wire rx_fifo_bad_frame_int;
wire rx_fifo_good_frame_int;
reg [2:0] rx_sync_reg_1 = 0;
reg [2:0] rx_sync_reg_2 = 0;
reg [2:0] rx_sync_reg_3 = 0;
reg [2:0] rx_sync_reg_4 = 0;
assign rx_fifo_overflow = rx_sync_reg_3[0] ^ rx_sync_reg_4[0];
assign rx_fifo_bad_frame = rx_sync_reg_3[1] ^ rx_sync_reg_4[1];
assign rx_fifo_good_frame = rx_sync_reg_3[2] ^ rx_sync_reg_4[2];
always @(posedge rx_clk or posedge rx_rst) begin
if (rx_rst) begin
rx_sync_reg_1 <= 0;
end else begin
rx_sync_reg_1 <= rx_sync_reg_1 ^ {rx_fifo_good_frame_int, rx_fifo_bad_frame_int, rx_fifo_overflow_int};
end
end
always @(posedge logic_clk or posedge logic_rst) begin
if (logic_rst) begin
rx_sync_reg_2 <= 0;
rx_sync_reg_3 <= 0;
rx_sync_reg_4 <= 0;
end else begin
rx_sync_reg_2 <= rx_sync_reg_1;
rx_sync_reg_3 <= rx_sync_reg_2;
rx_sync_reg_4 <= rx_sync_reg_3;
end
end
eth_mac_1g #( eth_mac_1g #(
.ENABLE_PADDING(ENABLE_PADDING), .ENABLE_PADDING(ENABLE_PADDING),
.MIN_FRAME_LENGTH(MIN_FRAME_LENGTH) .MIN_FRAME_LENGTH(MIN_FRAME_LENGTH)
@ -170,9 +136,10 @@ axis_async_frame_fifo #(
.DROP_WHEN_FULL(0) .DROP_WHEN_FULL(0)
) )
tx_fifo ( tx_fifo (
// Common reset
.async_rst(logic_rst | tx_rst),
// AXI input // AXI input
.input_clk(logic_clk), .input_clk(logic_clk),
.input_rst(logic_rst),
.input_axis_tdata(tx_axis_tdata), .input_axis_tdata(tx_axis_tdata),
.input_axis_tvalid(tx_axis_tvalid), .input_axis_tvalid(tx_axis_tvalid),
.input_axis_tready(tx_axis_tready), .input_axis_tready(tx_axis_tready),
@ -180,15 +147,17 @@ tx_fifo (
.input_axis_tuser(tx_axis_tuser), .input_axis_tuser(tx_axis_tuser),
// AXI output // AXI output
.output_clk(tx_clk), .output_clk(tx_clk),
.output_rst(tx_rst),
.output_axis_tdata(tx_fifo_axis_tdata), .output_axis_tdata(tx_fifo_axis_tdata),
.output_axis_tvalid(tx_fifo_axis_tvalid), .output_axis_tvalid(tx_fifo_axis_tvalid),
.output_axis_tready(tx_fifo_axis_tready), .output_axis_tready(tx_fifo_axis_tready),
.output_axis_tlast(tx_fifo_axis_tlast), .output_axis_tlast(tx_fifo_axis_tlast),
// Status // Status
.overflow(tx_fifo_overflow), .input_status_overflow(tx_fifo_overflow),
.bad_frame(tx_fifo_bad_frame), .input_status_bad_frame(tx_fifo_bad_frame),
.good_frame(tx_fifo_good_frame) .input_status_good_frame(tx_fifo_good_frame),
.output_status_overflow(),
.output_status_bad_frame(),
.output_status_good_frame()
); );
assign tx_fifo_axis_tuser = 1'b0; assign tx_fifo_axis_tuser = 1'b0;
@ -199,9 +168,10 @@ axis_async_frame_fifo #(
.DROP_WHEN_FULL(1) .DROP_WHEN_FULL(1)
) )
rx_fifo ( rx_fifo (
// Common reset
.async_rst(rx_rst | logic_rst),
// AXI input // AXI input
.input_clk(rx_clk), .input_clk(rx_clk),
.input_rst(rx_rst),
.input_axis_tdata(rx_fifo_axis_tdata), .input_axis_tdata(rx_fifo_axis_tdata),
.input_axis_tvalid(rx_fifo_axis_tvalid), .input_axis_tvalid(rx_fifo_axis_tvalid),
.input_axis_tready(), .input_axis_tready(),
@ -209,15 +179,17 @@ rx_fifo (
.input_axis_tuser(rx_fifo_axis_tuser), .input_axis_tuser(rx_fifo_axis_tuser),
// AXI output // AXI output
.output_clk(logic_clk), .output_clk(logic_clk),
.output_rst(logic_rst),
.output_axis_tdata(rx_axis_tdata), .output_axis_tdata(rx_axis_tdata),
.output_axis_tvalid(rx_axis_tvalid), .output_axis_tvalid(rx_axis_tvalid),
.output_axis_tready(rx_axis_tready), .output_axis_tready(rx_axis_tready),
.output_axis_tlast(rx_axis_tlast), .output_axis_tlast(rx_axis_tlast),
// Status // Status
.overflow(rx_fifo_overflow_int), .input_status_overflow(),
.bad_frame(rx_fifo_bad_frame_int), .input_status_bad_frame(),
.good_frame(rx_fifo_good_frame_int) .input_status_good_frame(),
.output_status_overflow(rx_fifo_overflow),
.output_status_bad_frame(rx_fifo_bad_frame),
.output_status_good_frame(rx_fifo_good_frame)
); );
assign rx_axis_tuser = 1'b0; assign rx_axis_tuser = 1'b0;