Files
b210-k7-fpga/lib/rfnoc/utils/chdr_pad_packet.v
T
+18 6b67702ad7 Merge FPGA repository back into UHD repository
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
2020-01-28 09:35:36 -08:00

133 lines
3.7 KiB
Verilog

//
// Copyright 2019 Ettus Research, A National Instruments Company
//
// SPDX-License-Identifier: LGPL-3.0-or-later
//
// Module: chdr_pad_packet
// Description:
// This module pads extra data on the AXI-Stream bus
// to the requested packet size. This module is for
// creating len-sized packets, for DMA engines that
// do not support partial transfers.
//
// Parameters:
// - CHDR_W: Width of the CHDR tdata bus in bits
//
// Signals:
// - s_axis_* : Input AXI-Stream CHDR bus
// - m_axis_* : Output AXI-Stream CHDR bus
// - len : Requested number of CHDR_W lines in the packet (must be > 1)
`default_nettype none
module chdr_pad_packet #(
parameter CHDR_W = 256
)(
input wire clk,
input wire rst,
input wire [15:0] len,
input wire [CHDR_W-1:0] s_axis_tdata,
input wire s_axis_tlast,
input wire s_axis_tvalid,
output reg s_axis_tready,
output wire [CHDR_W-1:0] m_axis_tdata,
output reg m_axis_tlast,
output reg m_axis_tvalid,
input wire m_axis_tready
);
localparam [1:0] ST_HEADER = 2'd0;
localparam [1:0] ST_BODY = 2'd1;
localparam [1:0] ST_PAD = 2'd2;
localparam [1:0] ST_DROP = 2'd3;
reg [1:0] state;
reg [15:0] lines_left;
always @(posedge clk) begin
if (rst || (len <= 16'd1)) begin
state <= ST_HEADER;
end else begin
case(state)
ST_HEADER: begin
lines_left <= len - 16'd1;
if (s_axis_tvalid && m_axis_tready) begin
if (!s_axis_tlast) begin
// Packet is more than one line and length not reached
state <= ST_BODY;
end else begin
// Packet is only one line and length not reached
state <= ST_PAD;
end
end
end
ST_BODY: begin
if (s_axis_tvalid && m_axis_tready) begin
lines_left <= lines_left - 16'd1;
if (s_axis_tlast && (lines_left == 16'd1)) begin
// End of input and reached length
state <= ST_HEADER;
end else if (s_axis_tlast && (lines_left != 16'd1)) begin
// End of input, but length not reached
state <= ST_PAD;
end else if (!s_axis_tlast && (lines_left == 16'd1)) begin
// Reached length, but input continues...
state <= ST_DROP;
end
end
end
ST_PAD: begin
if (m_axis_tready) begin
lines_left <= lines_left - 16'd1;
if (lines_left == 16'd1) begin
state <= ST_HEADER;
end
end
end
ST_DROP: begin
if (s_axis_tvalid && s_axis_tlast) begin
state <= ST_HEADER;
end
end
default: begin
// We should never get here
state <= ST_HEADER;
end
endcase
end
end
assign m_axis_tdata = s_axis_tdata;
always @(*) begin
case(state)
ST_HEADER: begin
if (len <= 16'd1) begin
s_axis_tready <= 1'b0;
m_axis_tvalid <= 1'b0;
end else begin
s_axis_tready <= m_axis_tready;
m_axis_tvalid <= s_axis_tvalid;
end
m_axis_tlast <= 1'b0;
end
ST_BODY: begin
s_axis_tready <= m_axis_tready;
m_axis_tvalid <= s_axis_tvalid;
m_axis_tlast <= (lines_left == 16'd1);
end
ST_PAD: begin
s_axis_tready <= 1'b0;
m_axis_tvalid <= 1'b1;
m_axis_tlast <= (lines_left == 16'd1);
end
ST_DROP: begin
s_axis_tready <= 1'b1;
m_axis_tvalid <= 1'b0;
m_axis_tlast <= 1'b0;
end
endcase
end
endmodule // chdr_pad_packet
`default_nettype wire