+18









Martin Braun
Alex Williams
Andrej Rode
Ashish Chaudhari
Ben Hilburn
Ciro Nishiguchi
Daniel Jepson
Derek Kozel
EJ Kreinar
Humberto Jimenez
Ian Buckley
Jörg Hofrichter
Jon Kiser
Josh Blum
Jonathon Pendlum
Matt Ettus
Michael West
Moritz Fischer
Nick Foster
Nicolas Cuervo
Paul Butler
Paul David
Ryan Marlow
Sugandha Gupta
Sylvain Munaut
Trung Tran
Vidush Vishwanath
Wade Fife
6b67702ad7
The FPGA codebase was removed from the UHD repository in 2014 to reduce the size of the repository. However, over the last half-decade, the split between the repositories has proven more burdensome than it has been helpful. By merging the FPGA code back, it will be possible to create atomic commits that touch both FPGA and UHD codebases. Continuous integration testing is also simplified by merging the repositories, because it was previously difficult to automatically derive the correct UHD branch when testing a feature branch on the FPGA repository. This commit also updates the license files and paths therein. We are therefore merging the repositories again. Future development for FPGA code will happen in the same repository as the UHD host code and MPM code. == Original Codebase and Rebasing == The original FPGA repository will be hosted for the foreseeable future at its original local location: https://github.com/EttusResearch/fpga/ It can be used for bisecting, reference, and a more detailed history. The final commit from said repository to be merged here is 05003794e2da61cabf64dd278c45685a7abad7ec. This commit is tagged as v4.0.0.0-pre-uhd-merge. If you have changes in the FPGA repository that you want to rebase onto the UHD repository, simply run the following commands: - Create a directory to store patches (this should be an empty directory): mkdir ~/patches - Now make sure that your FPGA codebase is based on the same state as the code that was merged: cd src/fpga # Or wherever your FPGA code is stored git rebase v4.0.0.0-pre-uhd-merge Note: The rebase command may look slightly different depending on what exactly you're trying to rebase. - Create a patch set for your changes versus v4.0.0.0-pre-uhd-merge: git format-patch v4.0.0.0-pre-uhd-merge -o ~/patches Note: Make sure that only patches are stored in your output directory. It should otherwise be empty. Make sure that you picked the correct range of commits, and only commits you wanted to rebase were exported as patch files. - Go to the UHD repository and apply the patches: cd src/uhd # Or wherever your UHD repository is stored git am --directory fpga ~/patches/* rm -rf ~/patches # This is for cleanup == Contributors == The following people have contributed mainly to these files (this list is not complete): Co-authored-by: Alex Williams <alex.williams@ni.com> Co-authored-by: Andrej Rode <andrej.rode@ettus.com> Co-authored-by: Ashish Chaudhari <ashish@ettus.com> Co-authored-by: Ben Hilburn <ben.hilburn@ettus.com> Co-authored-by: Ciro Nishiguchi <ciro.nishiguchi@ni.com> Co-authored-by: Daniel Jepson <daniel.jepson@ni.com> Co-authored-by: Derek Kozel <derek.kozel@ettus.com> Co-authored-by: EJ Kreinar <ej@he360.com> Co-authored-by: Humberto Jimenez <humberto.jimenez@ni.com> Co-authored-by: Ian Buckley <ian.buckley@gmail.com> Co-authored-by: Jörg Hofrichter <joerg.hofrichter@ni.com> Co-authored-by: Jon Kiser <jon.kiser@ni.com> Co-authored-by: Josh Blum <josh@joshknows.com> Co-authored-by: Jonathon Pendlum <jonathan.pendlum@ettus.com> Co-authored-by: Martin Braun <martin.braun@ettus.com> Co-authored-by: Matt Ettus <matt@ettus.com> Co-authored-by: Michael West <michael.west@ettus.com> Co-authored-by: Moritz Fischer <moritz.fischer@ettus.com> Co-authored-by: Nick Foster <nick@ettus.com> Co-authored-by: Nicolas Cuervo <nicolas.cuervo@ettus.com> Co-authored-by: Paul Butler <paul.butler@ni.com> Co-authored-by: Paul David <paul.david@ettus.com> Co-authored-by: Ryan Marlow <ryan.marlow@ettus.com> Co-authored-by: Sugandha Gupta <sugandha.gupta@ettus.com> Co-authored-by: Sylvain Munaut <tnt@246tNt.com> Co-authored-by: Trung Tran <trung.tran@ettus.com> Co-authored-by: Vidush Vishwanath <vidush.vishwanath@ettus.com> Co-authored-by: Wade Fife <wade.fife@ettus.com> Original-commit: bafa9d95453387814ef25e6b6256ba8db2df612f
159 lines
3.9 KiB
Verilog
159 lines
3.9 KiB
Verilog
//
|
|
// Copyright 2013 Ettus Research LLC
|
|
// Copyright 2018 Ettus Research, a National Instruments Company
|
|
//
|
|
// SPDX-License-Identifier: LGPL-3.0-or-later
|
|
//
|
|
|
|
|
|
//
|
|
// Tracks the number of complete packets in an AXI FIFO so that
|
|
// the XGE MAC can commit to transmitting a packet.
|
|
//
|
|
|
|
module axi_count_packets_in_fifo
|
|
(
|
|
input clk,
|
|
input reset,
|
|
input in_axis_tvalid,
|
|
input in_axis_tready,
|
|
input in_axis_tlast,
|
|
input out_axis_tvalid,
|
|
input out_axis_tready,
|
|
input out_axis_tlast,
|
|
input pkt_tx_full,
|
|
output enable_tx
|
|
);
|
|
|
|
localparam WAIT_SOF = 0;
|
|
localparam WAIT_EOF = 1;
|
|
|
|
localparam WAIT_FULL = 0;
|
|
localparam DELAY_TO_EOF = 1;
|
|
localparam WAIT_SPACE = 2;
|
|
|
|
|
|
reg in_state, out_state;
|
|
reg [1:0] full_state;
|
|
reg pause_tx;
|
|
|
|
reg [7:0] pkt_count;
|
|
|
|
|
|
//
|
|
// Count packets arriving into large FIFO
|
|
//
|
|
always @(posedge clk)
|
|
if (reset) begin
|
|
in_state <= WAIT_SOF;
|
|
end else
|
|
case(in_state)
|
|
WAIT_SOF:
|
|
if (in_axis_tvalid && in_axis_tready) begin
|
|
in_state <= WAIT_EOF;
|
|
end else begin
|
|
in_state <= WAIT_SOF;
|
|
end
|
|
WAIT_EOF:
|
|
if (in_axis_tlast && in_axis_tvalid && in_axis_tready) begin
|
|
in_state <= WAIT_SOF;
|
|
end else begin
|
|
in_state <= WAIT_EOF;
|
|
end
|
|
endcase // case(in_state)
|
|
|
|
|
|
//
|
|
// Count packets leaving large FIFO
|
|
//
|
|
always @(posedge clk)
|
|
if (reset) begin
|
|
out_state <= WAIT_SOF;
|
|
end else
|
|
case(out_state)
|
|
WAIT_SOF:
|
|
if (out_axis_tvalid && out_axis_tready) begin
|
|
out_state <= WAIT_EOF;
|
|
end else begin
|
|
out_state <= WAIT_SOF;
|
|
end
|
|
WAIT_EOF:
|
|
if (out_axis_tlast && out_axis_tvalid && out_axis_tready) begin
|
|
out_state <= WAIT_SOF;
|
|
end else begin
|
|
out_state <= WAIT_EOF;
|
|
end
|
|
endcase // case(in_state)
|
|
|
|
|
|
//
|
|
// Count packets in FIFO.
|
|
// No protection on counter wrap,
|
|
// unclear how such an error could occur or how to gracefully deal with it.
|
|
//
|
|
always @(posedge clk)
|
|
if (reset)
|
|
pkt_count <= 0;
|
|
else if (((out_state==WAIT_EOF) && out_axis_tlast && out_axis_tvalid && out_axis_tready)
|
|
&& ((in_state==WAIT_EOF) && in_axis_tlast && in_axis_tvalid && in_axis_tready))
|
|
pkt_count <= pkt_count;
|
|
else if ((out_state==WAIT_EOF) && out_axis_tlast && out_axis_tvalid && out_axis_tready)
|
|
pkt_count <= pkt_count - 1;
|
|
else if ((in_state==WAIT_EOF) && in_axis_tlast && in_axis_tvalid && in_axis_tready)
|
|
pkt_count <= pkt_count + 1;
|
|
|
|
|
|
//
|
|
// Guard against Tx MAC overflow (as indicated by pkt_tx_full)
|
|
//
|
|
always @(posedge clk)
|
|
if (reset) begin
|
|
pause_tx <= 0;
|
|
full_state <= WAIT_FULL;
|
|
end
|
|
else begin
|
|
pause_tx <= 0;
|
|
case(full_state)
|
|
WAIT_FULL:
|
|
// Search for pkt_tx_full going asserted
|
|
if (pkt_tx_full && (out_state == WAIT_SOF)) begin
|
|
full_state <= WAIT_SPACE;
|
|
pause_tx <= 1;
|
|
end else if (pkt_tx_full && (out_state == WAIT_EOF)) begin
|
|
full_state <= DELAY_TO_EOF;
|
|
end
|
|
|
|
DELAY_TO_EOF:
|
|
// pkt_tx_full has gone asserted during Tx of a packet from FIFO.
|
|
// Wait until either FIFO has space again and transition direct to WAIT_FULL
|
|
// or at EOF if pkt_tx_full is still asserted the transition to WAIT_SPACE until
|
|
// MAC flags there is space again.
|
|
if (pkt_tx_full && out_axis_tlast && out_axis_tvalid && out_axis_tready) begin
|
|
full_state <= WAIT_SPACE;
|
|
pause_tx <= 1;
|
|
end else if (pkt_tx_full) begin
|
|
full_state <= DELAY_TO_EOF;
|
|
end else
|
|
full_state <= WAIT_FULL;
|
|
|
|
WAIT_SPACE:
|
|
// Wait for MAC to flag space in internal Tx FIFO again then transition to WAIT_FULL.
|
|
if (pkt_tx_full) begin
|
|
full_state <= WAIT_SPACE;
|
|
pause_tx <= 1;
|
|
end else
|
|
full_state <= WAIT_FULL;
|
|
|
|
endcase // case(full_state)
|
|
end
|
|
|
|
|
|
// Enable Tx to MAC
|
|
assign enable_tx = (pkt_count != 0) && ~pause_tx;
|
|
|
|
|
|
|
|
|
|
endmodule // count_tx_packets
|
|
|