diff options
author | Martin Braun <martin.braun@ettus.com> | 2020-01-23 16:10:22 -0800 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2020-01-28 09:35:36 -0800 |
commit | bafa9d95453387814ef25e6b6256ba8db2df612f (patch) | |
tree | 39ba24b5b67072d354775272e687796bb511848d /fpga/usrp3/lib/simple_gemac/gmii_to_axis.v | |
parent | 3075b981503002df3115d5f1d0b97d2619ba30f2 (diff) | |
download | uhd-bafa9d95453387814ef25e6b6256ba8db2df612f.tar.gz uhd-bafa9d95453387814ef25e6b6256ba8db2df612f.tar.bz2 uhd-bafa9d95453387814ef25e6b6256ba8db2df612f.zip |
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>
Diffstat (limited to 'fpga/usrp3/lib/simple_gemac/gmii_to_axis.v')
-rw-r--r-- | fpga/usrp3/lib/simple_gemac/gmii_to_axis.v | 239 |
1 files changed, 239 insertions, 0 deletions
diff --git a/fpga/usrp3/lib/simple_gemac/gmii_to_axis.v b/fpga/usrp3/lib/simple_gemac/gmii_to_axis.v new file mode 100644 index 000000000..956f1cbcd --- /dev/null +++ b/fpga/usrp3/lib/simple_gemac/gmii_to_axis.v @@ -0,0 +1,239 @@ +// +// Copyright 2017 Ettus Research LLC +// Copyright 2018 Ettus Research, a National Instruments Company +// +// SPDX-License-Identifier: LGPL-3.0-or-later +// + +module gmii_to_axis +#( + parameter RX_FLOW_CTRL=0, + parameter PORTNUM=8'd0 +) +( + input clk125, + input reset, + + // GMII + output gmii_gtx_clk, + + output gmii_tx_en, + output gmii_tx_er, + output [7:0] gmii_txd, + + input gmii_rx_clk, + input gmii_rx_dv, + input gmii_rx_er, + input [7:0] gmii_rxd, + + // Client FIFO Interfaces + input sys_clk, + output [63:0] rx_tdata, + output [3:0] rx_tuser, + output rx_tlast, + output rx_tvalid, + input rx_tready, + + input [63:0] tx_tdata, + input [3:0] tx_tuser, + input tx_tlast, + input tx_tvalid, + output tx_tready, + + output [31:0] debug_rx, + output [31:0] debug_tx +); + + wire clear = 1'b0; + wire [7:0] rx_data, tx_data; + wire tx_clk, tx_valid, tx_error, tx_ack; + wire rx_clk, rx_valid, rx_error, rx_ack; + + wire pause_req; + wire pause_request_en, pause_respect_en; + wire [15:0] pause_time, pause_thresh, pause_time_req, rx_fifo_space; + + wire [31:0] debug_state; + + wire tx_reset, rx_reset; + reset_sync reset_sync_tx + ( + .clk(tx_clk), + .reset_in(reset), + .reset_out(tx_reset) + ); + + reset_sync reset_sync_rx ( + .clk(rx_clk), + .reset_in(reset), + .reset_out(rx_reset) + ); + + simple_gemac simple_gemac + ( + .clk125(clk125), .reset(reset), + .GMII_GTX_CLK(gmii_gtx_clk), + .GMII_TX_EN(gmii_tx_en), + .GMII_TX_ER(gmii_tx_er), + .GMII_TXD(gmii_txd), + .GMII_RX_CLK(gmii_rx_clk), + .GMII_RX_DV(gmii_rx_dv), + .GMII_RX_ER(gmii_rx_er), + .GMII_RXD(gmii_rxd), + .pause_req(RX_FLOW_CTRL ? pause_req : 1'b0), + .pause_time_req(RX_FLOW_CTRL ? pause_time_req : 16'd0), + .pause_respect_en(pause_respect_en), + .ucast_addr(48'h0), + .mcast_addr(48'h0), + .pass_ucast(1'b0), + .pass_mcast(1'b0), + .pass_bcast(1'b0), + .pass_pause(1'b0), + .pass_all(1'b1), + .rx_clk(rx_clk), + .rx_data(rx_data), + .rx_valid(rx_valid), + .rx_error(rx_error), + .rx_ack(rx_ack), + .tx_clk(tx_clk), + .tx_data(tx_data), + .tx_valid(tx_valid), + .tx_error(tx_error), + .tx_ack(tx_ack), + .debug(debug_state) + ); + + assign pause_respect_en = 1'b0; + assign pause_request_en = 1'b0; + + /////////////////////////////////////////////////////////////////////////////////////// + // RX FIFO Chain + wire rx_ll_eof; + wire rx_ll_error; + wire rx_ll_src_rdy; + wire rx_ll_dst_rdy; + wire [7:0] rx_ll_data; + + wire [63:0] rx_tdata_int; + wire [3:0] rx_tuser_int; + wire rx_tlast_int; + wire rx_tvalid_int; + wire rx_tready_int; + + rxmac_to_ll8 rxmac_to_ll8 + ( + .clk(rx_clk), + .reset(rx_reset), + .clear(clear), + .rx_data(rx_data), + .rx_valid(rx_valid), + .rx_error(rx_error), + .rx_ack(rx_ack), + + .ll_data(rx_ll_data), + .ll_sof(), + .ll_eof(rx_ll_eof), + .ll_error(rx_ll_error), // ignore sof + .ll_src_rdy(rx_ll_src_rdy), + .ll_dst_rdy(rx_ll_dst_rdy) + ); + + ll8_to_axi64 #(.START_BYTE(6), .LABEL(PORTNUM)) ll8_to_axi64 + ( + .clk(rx_clk), + .reset(rx_reset), + .clear(clear), + .ll_data(rx_ll_data), + .ll_eof(rx_ll_eof), + .ll_error(rx_ll_error), + .ll_src_rdy(rx_ll_src_rdy), + .ll_dst_rdy(rx_ll_dst_rdy), + .axi64_tdata(rx_tdata_int), + .axi64_tlast(rx_tlast_int), + .axi64_tuser(rx_tuser_int), + .axi64_tvalid(rx_tvalid_int), + .axi64_tready(rx_tready_int) + ); + + axi64_8k_2clk_fifo rxfifo_2clk + ( + .s_aresetn(~rx_reset), + .s_aclk(rx_clk), + .s_axis_tvalid(rx_tvalid_int), + .s_axis_tready(rx_tready_int), + .s_axis_tdata(rx_tdata_int), + .s_axis_tlast(rx_tlast_int), + .s_axis_tuser(rx_tuser_int), + .axis_wr_data_count(), + + .m_aclk(sys_clk), + .m_axis_tvalid(rx_tvalid), + .m_axis_tready(rx_tready), + .m_axis_tdata(rx_tdata), + .m_axis_tlast(rx_tlast), + .m_axis_tuser(rx_tuser), + .axis_rd_data_count() + ); + + /////////////////////////////////////////////////////////////////////////////////////// + // TX FIFO Chain + wire tx_ll_eof, tx_ll_src_rdy, tx_ll_dst_rdy; + wire [7:0] tx_ll_data; + + wire [63:0] tx_tdata_int; + wire [3:0] tx_tuser_int; + wire tx_tlast_int; + wire tx_tvalid_int; + wire tx_tready_int; + + axi64_8k_2clk_fifo txfifo_2clk + ( + .s_aresetn(~tx_reset), + .s_aclk(sys_clk), + .s_axis_tvalid(tx_tvalid), + .s_axis_tready(tx_tready), + .s_axis_tdata(tx_tdata), + .s_axis_tlast(tx_tlast), + .s_axis_tuser(tx_tuser), + .axis_wr_data_count(), + .m_aclk(tx_clk), + .m_axis_tvalid(tx_tvalid_int), + .m_axis_tready(tx_tready_int), + .m_axis_tdata(tx_tdata_int), + .m_axis_tlast(tx_tlast_int), + .m_axis_tuser(tx_tuser_int), + .axis_rd_data_count() + ); + + axi64_to_ll8 #(.START_BYTE(6)) axi64_to_ll8 + ( + .clk(tx_clk), + .reset(tx_reset), + .clear(clear), + .axi64_tdata(tx_tdata_int), + .axi64_tlast(tx_tlast_int), + .axi64_tuser(tx_tuser_int), + .axi64_tvalid(tx_tvalid_int), + .axi64_tready(tx_tready_int), + .ll_data(tx_ll_data), + .ll_eof(tx_ll_eof), + .ll_src_rdy(tx_ll_src_rdy), + .ll_dst_rdy(tx_ll_dst_rdy) + ); + + ll8_to_txmac ll8_to_txmac + ( + .clk(tx_clk), + .reset(tx_reset), + .clear(clear), + .ll_data(tx_ll_data), + .ll_eof(tx_ll_eof), + .ll_src_rdy(tx_ll_src_rdy), + .ll_dst_rdy(tx_ll_dst_rdy), + .tx_data(tx_data), + .tx_valid(tx_valid), + .tx_error(tx_error), + .tx_ack(tx_ack) + ); + +endmodule |