From bafa9d95453387814ef25e6b6256ba8db2df612f Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 23 Jan 2020 16:10:22 -0800 Subject: Merge FPGA repository back into UHD repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Co-authored-by: Andrej Rode Co-authored-by: Ashish Chaudhari Co-authored-by: Ben Hilburn Co-authored-by: Ciro Nishiguchi Co-authored-by: Daniel Jepson Co-authored-by: Derek Kozel Co-authored-by: EJ Kreinar Co-authored-by: Humberto Jimenez Co-authored-by: Ian Buckley Co-authored-by: Jörg Hofrichter Co-authored-by: Jon Kiser Co-authored-by: Josh Blum Co-authored-by: Jonathon Pendlum Co-authored-by: Martin Braun Co-authored-by: Matt Ettus Co-authored-by: Michael West Co-authored-by: Moritz Fischer Co-authored-by: Nick Foster Co-authored-by: Nicolas Cuervo Co-authored-by: Paul Butler Co-authored-by: Paul David Co-authored-by: Ryan Marlow Co-authored-by: Sugandha Gupta Co-authored-by: Sylvain Munaut Co-authored-by: Trung Tran Co-authored-by: Vidush Vishwanath Co-authored-by: Wade Fife --- fpga/usrp3/lib/rfnoc/axi_drop_partial_packet.v | 140 +++++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 fpga/usrp3/lib/rfnoc/axi_drop_partial_packet.v (limited to 'fpga/usrp3/lib/rfnoc/axi_drop_partial_packet.v') diff --git a/fpga/usrp3/lib/rfnoc/axi_drop_partial_packet.v b/fpga/usrp3/lib/rfnoc/axi_drop_partial_packet.v new file mode 100644 index 000000000..a4dbae654 --- /dev/null +++ b/fpga/usrp3/lib/rfnoc/axi_drop_partial_packet.v @@ -0,0 +1,140 @@ +// +// Copyright 2016 Ettus Research +// Copyright 2018 Ettus Research, a National Instruments Company +// +// SPDX-License-Identifier: LGPL-3.0-or-later +// +// Drop packets that are larger or smaller than the allowed packet size. +// + +module axi_drop_partial_packet #( + parameter WIDTH = 32, + parameter MAX_PKT_SIZE = 1024, + parameter HOLD_LAST_WORD = 0, // Hold off sending last word until next full packet arrives + parameter SR_PKT_SIZE_ADDR = 1 +)( + input clk, input reset, input clear, + input flush, // If using HOLD_LAST_WORD, will forcibly release all words in FIFO + input set_stb, input [7:0] set_addr, input [31:0] set_data, + input [WIDTH-1:0] i_tdata, input i_tlast, input i_tvalid, output i_tready, + output [WIDTH-1:0] o_tdata, output o_tlast, output o_tvalid, input o_tready +); + + generate + // Packet size of 1 means it is impossible to form a partial packet, so this module does nothing... + if (MAX_PKT_SIZE == 1) begin + assign o_tdata = i_tdata; + assign o_tlast = i_tlast; + assign o_tvalid = i_tvalid; + assign i_tready = o_tready; + // All other packet sizes + end else begin + // Settings register + wire [$clog2(MAX_PKT_SIZE+1)-1:0] sr_pkt_size; + setting_reg #(.my_addr(SR_PKT_SIZE_ADDR), .width($clog2(MAX_PKT_SIZE+1)), .at_reset(1)) set_pkt_size ( + .clk(clk), .rst(reset), .strobe(set_stb), .addr(set_addr), .in(set_data), + .out(sr_pkt_size), .changed()); + + // Do not change n unless block is not active + reg active; + reg [$clog2(MAX_PKT_SIZE+1)-1:0] pkt_size = 1; + always @(posedge clk) begin + if (reset | clear) begin + active <= 1'b0; + end else begin + if (i_tready & i_tvalid) begin + active <= 1'b1; + end + end + if (clear | ~active) begin + pkt_size <= (sr_pkt_size == 0) ? 1 : sr_pkt_size; + end + end + + wire [WIDTH-1:0] int_tdata; + wire int_tlast, int_tvalid, int_tready; + wire i_tlast_int, i_terror; + + reg small_pkt, large_pkt; + wire hold_last_sample; + reg release_last; + reg [$clog2(MAX_PKT_SIZE+1)-1:0] in_cnt; + reg [15:0] in_pkt_cnt, in_pkt_cnt_hold, out_pkt_cnt; + always @(posedge clk) begin + if (reset | clear) begin + small_pkt <= 1'b0; + large_pkt <= 1'b0; + release_last <= 1'b0; + in_cnt <= 1; + in_pkt_cnt <= 0; + in_pkt_cnt_hold <= 0; + out_pkt_cnt <= 0; + end else begin + if (i_tvalid & i_tready) begin + if (in_cnt == pkt_size | i_tlast_int) begin + in_cnt <= 1; + end else begin + in_cnt <= in_cnt + 1; + end + end + if (pkt_size == 1) begin + small_pkt <= 1'b0; + large_pkt <= 1'b0; + end else begin + if (i_tvalid & i_tready) begin + if ((in_cnt == pkt_size-1'b1) & ~i_tlast) begin + small_pkt <= 1'b0; + end else begin + small_pkt <= 1'b1; + end + if ((in_cnt == pkt_size) & ~i_tlast) begin + large_pkt <= 1'b1; + end + if (large_pkt) begin + large_pkt <= 1'b0; + end + end + end + if (i_tvalid & i_tready & i_tlast & ~i_terror) begin + in_pkt_cnt <= in_pkt_cnt + 1'b1; + end + if (int_tvalid & int_tready & int_tlast & ~hold_last_sample) begin + out_pkt_cnt <= out_pkt_cnt + 1'b1; + end + if ((i_tvalid & i_tready & i_terror) | flush) begin + release_last <= 1'b1; + in_pkt_cnt_hold <= in_pkt_cnt; + end else if (in_pkt_cnt_hold == out_pkt_cnt) begin + release_last <= 1'b0; + end + end + end + + assign hold_last_sample = ((in_pkt_cnt == out_pkt_cnt) | ((in_pkt_cnt == out_pkt_cnt+1) & ~release_last)) & (pkt_size != 1); + + assign i_tlast_int = i_tlast | large_pkt; + assign i_terror = i_tlast & i_tvalid & (small_pkt | large_pkt); + + // FIFO with ability to rewind write pointer back if input packet is flagged as bad + axi_packet_gate #(.WIDTH(WIDTH+1), .SIZE($clog2(MAX_PKT_SIZE+1)), .USE_AS_BUFF(1)) pkt_gate_i ( + .clk(clk), .reset(reset), .clear(clear), + .i_tdata({i_tlast,i_tdata}), .i_tvalid(i_tvalid), .i_tlast(i_tlast_int), .i_terror(i_terror), .i_tready(i_tready), + .o_tdata({int_tlast,int_tdata}), .o_tvalid(int_tvalid), .o_tlast(), .o_tready(int_tready & ~(hold_last_sample & int_tlast))); + + // Generate output register to hold on to last word + if (HOLD_LAST_WORD) begin + axi_fifo_flop2 #(.WIDTH(WIDTH+1)) axi_fifo_flop2 ( + .clk(clk), .reset(reset), .clear(clear), + .i_tdata({int_tlast,int_tdata}), .i_tvalid(int_tvalid & ~(hold_last_sample & int_tlast)), .i_tready(int_tready), + .o_tdata({o_tlast,o_tdata}), .o_tvalid(o_tvalid), .o_tready(o_tready), + .space(), .occupied()); + end else begin + assign o_tdata = int_tdata; + assign o_tlast = int_tlast; + assign o_tvalid = int_tvalid; + assign int_tready = o_tready; + end + end + endgenerate + +endmodule -- cgit v1.2.3