+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
160 lines
5.0 KiB
Tcl
160 lines
5.0 KiB
Tcl
set scriptDir [file dirname [info script]]
|
|
|
|
source "$scriptDir/chdr_dma_rx.tcl"
|
|
source "$scriptDir/chdr_dma_tx.tcl"
|
|
|
|
# Hierarchical cell: dma
|
|
proc create_hier_cell_dma { parentCell nameHier numPorts } {
|
|
|
|
if { $parentCell eq "" || $nameHier eq "" || $numPorts eq "" } {
|
|
puts "ERROR: create_hier_cell_dma() - Empty argument(s)!"
|
|
return
|
|
}
|
|
|
|
# Get object for parentCell
|
|
set parentObj [get_bd_cells $parentCell]
|
|
if { $parentObj == "" } {
|
|
puts "ERROR: Unable to find parent cell <$parentCell>!"
|
|
return
|
|
}
|
|
|
|
if { $numPorts < 2 } {
|
|
puts "ERROR: numPorts invalid: $numPorts"
|
|
return
|
|
}
|
|
|
|
# Make sure parentObj is hier blk
|
|
set parentType [get_property TYPE $parentObj]
|
|
if { $parentType ne "hier" } {
|
|
puts "ERROR: Parent <$parentObj> has TYPE = <$parentType>. Expected to be <hier>."
|
|
return
|
|
}
|
|
|
|
# Save current instance; Restore later
|
|
set oldCurInst [current_bd_instance .]
|
|
|
|
# Set parent object as current
|
|
current_bd_instance $parentObj
|
|
|
|
# Create cell and set as current instance
|
|
set hier_obj [create_bd_cell -type hier $nameHier]
|
|
current_bd_instance $hier_obj
|
|
|
|
#########################
|
|
# Pin list
|
|
#########################
|
|
create_bd_intf_pin -mode Master -vlnv xilinx.com:interface:axis_rtl:1.0 m_axis_dma
|
|
create_bd_intf_pin -mode Master -vlnv xilinx.com:interface:aximm_rtl:1.0 M_AXI_RX_DMA
|
|
create_bd_intf_pin -mode Master -vlnv xilinx.com:interface:aximm_rtl:1.0 M_AXI_TX_DMA
|
|
create_bd_intf_pin -mode Slave -vlnv xilinx.com:interface:axis_rtl:1.0 s_axis_dma
|
|
create_bd_intf_pin -mode Slave -vlnv xilinx.com:interface:aximm_rtl:1.0 s_axi_rx_dmac
|
|
create_bd_intf_pin -mode Slave -vlnv xilinx.com:interface:aximm_rtl:1.0 s_axi_tx_dmac
|
|
create_bd_intf_pin -mode Slave -vlnv xilinx.com:interface:aximm_rtl:1.0 s_axi_regfile
|
|
|
|
create_bd_pin -dir I bus_clk
|
|
create_bd_pin -dir I bus_rstn
|
|
create_bd_pin -dir I clk40
|
|
create_bd_pin -dir I clk40_rstn
|
|
create_bd_pin -dir O rx_irq
|
|
create_bd_pin -dir O tx_irq
|
|
|
|
#########################
|
|
# Instantiate IPs
|
|
#########################
|
|
# Create instance: rx
|
|
create_hier_cell_rx_dma $hier_obj rx $numPorts
|
|
|
|
# Create instance: tx
|
|
create_hier_cell_tx_dma $hier_obj tx $numPorts
|
|
|
|
# Used to set frame size of RX DMA engines
|
|
set axi_regfile_0 [ create_bd_cell -type ip -vlnv ettus.com:ip:axi_regfile:1.0 axi_regfile_0 ]
|
|
set_property -dict [ list \
|
|
CONFIG.NUM_REGS $numPorts \
|
|
] $axi_regfile_0
|
|
|
|
set util_reduced_logic_0 [ create_bd_cell -type ip -vlnv xilinx.com:ip:util_reduced_logic:2.0 util_reduced_logic_0 ]
|
|
set_property -dict [ list \
|
|
CONFIG.C_OPERATION {or} \
|
|
CONFIG.C_SIZE $numPorts \
|
|
] $util_reduced_logic_0
|
|
|
|
set util_reduced_logic_1 [ create_bd_cell -type ip -vlnv xilinx.com:ip:util_reduced_logic:2.0 util_reduced_logic_1 ]
|
|
set_property -dict [ list \
|
|
CONFIG.C_OPERATION {or} \
|
|
CONFIG.C_SIZE $numPorts \
|
|
] $util_reduced_logic_1
|
|
|
|
#########################
|
|
# Wiring
|
|
#########################
|
|
# Clocks and resets
|
|
connect_bd_net -net bus_clk_1 \
|
|
[get_bd_pins bus_clk] \
|
|
[get_bd_pins rx/bus_clk] \
|
|
[get_bd_pins tx/bus_clk]
|
|
connect_bd_net -net bus_rstn_1 \
|
|
[get_bd_pins bus_rstn] \
|
|
[get_bd_pins rx/bus_rstn] \
|
|
[get_bd_pins tx/bus_rstn]
|
|
connect_bd_net -net clk40_1 \
|
|
[get_bd_pins clk40] \
|
|
[get_bd_pins rx/clk40] \
|
|
[get_bd_pins tx/clk40] \
|
|
[get_bd_pins axi_regfile_0/S_AXI_ACLK]
|
|
connect_bd_net -net clk40_rstn_1 \
|
|
[get_bd_pins clk40_rstn] \
|
|
[get_bd_pins axi_regfile_0/S_AXI_ARESETN] \
|
|
[get_bd_pins rx/clk40_rstn] \
|
|
[get_bd_pins tx/clk40_rstn]
|
|
|
|
# AXI buses
|
|
connect_bd_intf_net -intf_net s_axi_rx_dmac_1 \
|
|
[get_bd_intf_pins s_axi_rx_dmac] \
|
|
[get_bd_intf_pins rx/s_axi_rx_dmac]
|
|
connect_bd_intf_net -intf_net rx_dma_M_AXI_RX_DMA \
|
|
[get_bd_intf_pins M_AXI_RX_DMA] \
|
|
[get_bd_intf_pins rx/M_AXI_RX_DMA]
|
|
connect_bd_intf_net -intf_net s_axi_tx_dmac_1 \
|
|
[get_bd_intf_pins s_axi_tx_dmac] \
|
|
[get_bd_intf_pins tx/s_axi_tx_dmac]
|
|
connect_bd_intf_net -intf_net tx_M_AXI_TX_DMA \
|
|
[get_bd_intf_pins M_AXI_TX_DMA] \
|
|
[get_bd_intf_pins tx/M_AXI_TX_DMA]
|
|
connect_bd_intf_net -intf_net s_axi_regfile_1 \
|
|
[get_bd_intf_pins s_axi_regfile] \
|
|
[get_bd_intf_pins axi_regfile_0/S_AXI]
|
|
|
|
# RX CHDR
|
|
connect_bd_intf_net -intf_net s_axis_dma_1 \
|
|
[get_bd_intf_pins s_axis_dma] \
|
|
[get_bd_intf_pins rx/S_AXIS_DMA]
|
|
|
|
# TX CHDR
|
|
connect_bd_intf_net -intf_net m_axis_dma_1 \
|
|
[get_bd_intf_pins tx/M_AXIS_DMA] \
|
|
[get_bd_intf_pins m_axis_dma]
|
|
|
|
# IRQs and Frame Sizes
|
|
connect_bd_net -net frame_sizes \
|
|
[get_bd_pins axi_regfile_0/regs] \
|
|
[get_bd_pins rx/mtu_regs]
|
|
connect_bd_net -net rx_irq1 \
|
|
[get_bd_pins rx/irq] \
|
|
[get_bd_pins util_reduced_logic_0/Op1]
|
|
connect_bd_net -net tx_irq1 \
|
|
[get_bd_pins tx/irq] \
|
|
[get_bd_pins util_reduced_logic_1/Op1]
|
|
connect_bd_net -net util_reduced_logic_0_Res \
|
|
[get_bd_pins rx_irq] \
|
|
[get_bd_pins util_reduced_logic_0/Res]
|
|
connect_bd_net -net util_reduced_logic_1_Res \
|
|
[get_bd_pins tx_irq] \
|
|
[get_bd_pins util_reduced_logic_1/Res]
|
|
|
|
# Restore current instance
|
|
current_bd_instance $oldCurInst
|
|
}
|
|
|
|
|