zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
pluto_hdl_adi/projects/m2k/common/m2k_bd.tcl

292 lines
14 KiB
Tcl
Raw Normal View History

M2K: initial commit
2017-01-31 14:43:40 +00:00
m2k: standalone: Disable DMA debug registers The debug register logic for the DMA take up a fair amount of resources. Disabling them frees up space in the FPGA and also helps a bit with power. Since those registers are mainly useful in development and not so much in production the change shouldn't have any visible external effects. It is possible to re-enable the debug registers by setting DEBUG_BUILD=1. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-30 15:43:40 +00:00
if {[info exists DEBUG_BUILD] == 0} {
set DEBUG_BUILD 1
}
set DISABLE_DMAC_DEBUG [expr !$DEBUG_BUILD]
M2K: initial commit
2017-01-31 14:43:40 +00:00
create_bd_port -dir I -from 15 -to 0 data_i
create_bd_port -dir I -from 1 -to 0 trigger_i
create_bd_port -dir O -from 15 -to 0 data_o
create_bd_port -dir O -from 15 -to 0 data_t
create_bd_port -dir O -from 1 -to 0 trigger_o
create_bd_port -dir O -from 1 -to 0 trigger_t
create_bd_port -dir I rx_clk
create_bd_port -dir I rxiq
create_bd_port -dir I -from 11 -to 0 rxd
m2k: Updated project to use new tx path with serdes
2017-03-29 07:31:16 +00:00
create_bd_port -dir I tx_clk
M2K: initial commit
2017-01-31 14:43:40 +00:00
create_bd_port -dir O txiq
create_bd_port -dir O -from 11 -to 0 txd
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
# AXI control interface and logic analyzer DMA (FCLK0): 27.8 MHz
m2k: Replace logic analyzer MMCM The MMCM generating the logic analyzer clock unfortunately consumes a disproportionately large amount of power compared to the rest of the design. Replace it by sourcing the logic analyzer clock from one of the Zynq FCLKs. The IO PLL is running anyway so the power requirement is much lower. For the time being this means we loose the ability to source the clock from an external pin. But that feature is not supported by software at the moment anyway. We'll bring it eventually when required. This changes reduces power consumption by roughly 100mW. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-23 13:56:35 +00:00
# Logic analyzer (FCLK2): 100 MHz
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
# Converter DMA (FCLK3): 55.6 MHz
m2k: Replace logic analyzer MMCM The MMCM generating the logic analyzer clock unfortunately consumes a disproportionately large amount of power compared to the rest of the design. Replace it by sourcing the logic analyzer clock from one of the Zynq FCLKs. The IO PLL is running anyway so the power requirement is much lower. For the time being this means we loose the ability to source the clock from an external pin. But that feature is not supported by software at the moment anyway. We'll bring it eventually when required. This changes reduces power consumption by roughly 100mW. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-23 13:56:35 +00:00
set_property -dict [list CONFIG.PCW_EN_CLK2_PORT {1}] $sys_ps7
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
set_property -dict [list CONFIG.PCW_EN_CLK3_PORT {1}] $sys_ps7
set_property -dict [list CONFIG.PCW_FPGA0_PERIPHERAL_FREQMHZ {27.778}] $sys_ps7
m2k: Replace logic analyzer MMCM The MMCM generating the logic analyzer clock unfortunately consumes a disproportionately large amount of power compared to the rest of the design. Replace it by sourcing the logic analyzer clock from one of the Zynq FCLKs. The IO PLL is running anyway so the power requirement is much lower. For the time being this means we loose the ability to source the clock from an external pin. But that feature is not supported by software at the moment anyway. We'll bring it eventually when required. This changes reduces power consumption by roughly 100mW. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-23 13:56:35 +00:00
set_property -dict [list CONFIG.PCW_FPGA2_PERIPHERAL_FREQMHZ {100.0}] $sys_ps7
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
set_property -dict [list CONFIG.PCW_FPGA3_PERIPHERAL_FREQMHZ {55.556}] $sys_ps7
m2k: Replace logic analyzer MMCM The MMCM generating the logic analyzer clock unfortunately consumes a disproportionately large amount of power compared to the rest of the design. Replace it by sourcing the logic analyzer clock from one of the Zynq FCLKs. The IO PLL is running anyway so the power requirement is much lower. For the time being this means we loose the ability to source the clock from an external pin. But that feature is not supported by software at the moment anyway. We'll bring it eventually when required. This changes reduces power consumption by roughly 100mW. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-23 13:56:35 +00:00
m2k: Connect logic_analyzer path to clk_out instead of clk - this allows for the clock switching to be done inside axi_logic_analyzer core
2017-03-31 09:29:29 +00:00
ad_connect logic_analyzer_clk_in sys_ps7/FCLK_CLK2
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
ad_connect converter_dma_clk sys_ps7/FCLK_CLK3
M2K: initial commit
2017-01-31 14:43:40 +00:00
set logic_analyzer [create_bd_cell -type ip -vlnv analog.com:user:axi_logic_analyzer:1.0 logic_analyzer]
set la_trigger_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_var_fifo:1.0 la_trigger_fifo]
set_property -dict [list CONFIG.DATA_WIDTH {16} ] $la_trigger_fifo
set_property -dict [list CONFIG.ADDRESS_WIDTH {13} ] $la_trigger_fifo
set logic_analyzer_dmac [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 logic_analyzer_dmac]
set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {16} ] $logic_analyzer_dmac
set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_DEST {1} ] $logic_analyzer_dmac
set_property -dict [list CONFIG.SYNC_TRANSFER_START {true} ] $logic_analyzer_dmac
m2k: standalone: Disable DMA debug registers The debug register logic for the DMA take up a fair amount of resources. Disabling them frees up space in the FPGA and also helps a bit with power. Since those registers are mainly useful in development and not so much in production the change shouldn't have any visible external effects. It is possible to re-enable the debug registers by setting DEBUG_BUILD=1. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-30 15:43:40 +00:00
set_property -dict [list CONFIG.DISABLE_DEBUG_REGISTERS $DISABLE_DMAC_DEBUG] $logic_analyzer_dmac
M2K: initial commit
2017-01-31 14:43:40 +00:00
set pattern_generator_dmac [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 pattern_generator_dmac]
set_property -dict [list CONFIG.DMA_TYPE_DEST {2} ] $pattern_generator_dmac
set_property -dict [list CONFIG.DMA_TYPE_SRC {0}] $pattern_generator_dmac
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
set_property -dict [list CONFIG.MAX_BYTES_PER_BURST {128}] $pattern_generator_dmac
M2K: initial commit
2017-01-31 14:43:40 +00:00
set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_SRC {1}] $pattern_generator_dmac
set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {16} ] $pattern_generator_dmac
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $pattern_generator_dmac
M2K: initial commit
2017-01-31 14:43:40 +00:00
set_property -dict [list CONFIG.CYCLIC {true}] $pattern_generator_dmac
m2k: standalone: Disable DMA debug registers The debug register logic for the DMA take up a fair amount of resources. Disabling them frees up space in the FPGA and also helps a bit with power. Since those registers are mainly useful in development and not so much in production the change shouldn't have any visible external effects. It is possible to re-enable the debug registers by setting DEBUG_BUILD=1. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-30 15:43:40 +00:00
set_property -dict [list CONFIG.DISABLE_DEBUG_REGISTERS $DISABLE_DMAC_DEBUG] $pattern_generator_dmac
M2K: initial commit
2017-01-31 14:43:40 +00:00
set axi_ad9963 [create_bd_cell -type ip -vlnv analog.com:user:axi_ad9963:1.0 axi_ad9963]
m2k: Disabled DDS cores for the generic project
2017-02-28 08:10:28 +00:00
set_property -dict [list CONFIG.DAC_DATAPATH_DISABLE {1}] $axi_ad9963
m2k: Disable AD9963 core RX datapath again The RX datapath has a lot of things (IQ correction, DC filter, ...) that take up a lot of space which are all not really needed in this project. So disable the RX datapath. It was previously enabled because the ad9963 core did not perform sign-extension on the ADC data signal when the datapath was disabled. But this has now been addressed. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-24 17:19:05 +00:00
set_property -dict [list CONFIG.ADC_DATAPATH_DISABLE {1}] $axi_ad9963
M2K: initial commit
2017-01-31 14:43:40 +00:00
set adc_trigger_fifo [create_bd_cell -type ip -vlnv analog.com:user:util_var_fifo:1.0 adc_trigger_fifo]
set_property -dict [list CONFIG.DATA_WIDTH {32} ] $adc_trigger_fifo
set_property -dict [list CONFIG.ADDRESS_WIDTH {13} ] $adc_trigger_fifo
set adc_trigger_extract [create_bd_cell -type ip -vlnv analog.com:user:util_extract:1.0 adc_trigger_extract]
m2k: Remove channel pack core for now We always have both ADC channels enabled and the cpack core takes up a fair amount of space, so remove it for now. Might come back later when we really need it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-24 14:03:58 +00:00
# FIXME: Bring this back eventually
#set util_cpack_ad9963 [create_bd_cell -type ip -vlnv analog.com:user:util_cpack:1.0 util_cpack_ad9963]
#set_property -dict [list CONFIG.NUM_OF_CHANNELS {2}] $util_cpack_ad9963
#set_property -dict [list CONFIG.CHANNEL_DATA_WIDTH {16}] $util_cpack_ad9963
create_bd_cell -type ip -vlnv xilinx.com:ip:xlconcat:2.1 ad9963_adc_concat
M2K: initial commit
2017-01-31 14:43:40 +00:00
set ad9963_adc_dmac [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 ad9963_adc_dmac]
set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {32}] $ad9963_adc_dmac
set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_DEST {1}] $ad9963_adc_dmac
set_property -dict [list CONFIG.SYNC_TRANSFER_START {true}] $ad9963_adc_dmac
m2k: standalone: Disable DMA debug registers The debug register logic for the DMA take up a fair amount of resources. Disabling them frees up space in the FPGA and also helps a bit with power. Since those registers are mainly useful in development and not so much in production the change shouldn't have any visible external effects. It is possible to re-enable the debug registers by setting DEBUG_BUILD=1. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-30 15:43:40 +00:00
set_property -dict [list CONFIG.DISABLE_DEBUG_REGISTERS $DISABLE_DMAC_DEBUG] $ad9963_adc_dmac
M2K: initial commit
2017-01-31 14:43:40 +00:00
set ad9963_dac_dmac_a [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 ad9963_dac_dmac_a]
set_property -dict [list CONFIG.DMA_TYPE_DEST {2}] $ad9963_dac_dmac_a
set_property -dict [list CONFIG.DMA_TYPE_SRC {0}] $ad9963_dac_dmac_a
set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_SRC {1}] $ad9963_dac_dmac_a
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
set_property -dict [list CONFIG.MAX_BYTES_PER_BURST {128}] $ad9963_dac_dmac_a
M2K: initial commit
2017-01-31 14:43:40 +00:00
set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {16}] $ad9963_dac_dmac_a
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $ad9963_dac_dmac_a
M2K: initial commit
2017-01-31 14:43:40 +00:00
set_property -dict [list CONFIG.CYCLIC {true}] $ad9963_dac_dmac_a
m2k: standalone: Disable DMA debug registers The debug register logic for the DMA take up a fair amount of resources. Disabling them frees up space in the FPGA and also helps a bit with power. Since those registers are mainly useful in development and not so much in production the change shouldn't have any visible external effects. It is possible to re-enable the debug registers by setting DEBUG_BUILD=1. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-30 15:43:40 +00:00
set_property -dict [list CONFIG.DISABLE_DEBUG_REGISTERS $DISABLE_DMAC_DEBUG] $ad9963_dac_dmac_a
M2K: initial commit
2017-01-31 14:43:40 +00:00
set ad9963_dac_dmac_b [create_bd_cell -type ip -vlnv analog.com:user:axi_dmac:1.0 ad9963_dac_dmac_b]
set_property -dict [list CONFIG.DMA_TYPE_DEST {2}] $ad9963_dac_dmac_b
set_property -dict [list CONFIG.DMA_TYPE_SRC {0}] $ad9963_dac_dmac_b
set_property -dict [list CONFIG.DMA_AXI_PROTOCOL_SRC {1}] $ad9963_dac_dmac_b
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
set_property -dict [list CONFIG.MAX_BYTES_PER_BURST {128}] $ad9963_dac_dmac_b
M2K: initial commit
2017-01-31 14:43:40 +00:00
set_property -dict [list CONFIG.DMA_DATA_WIDTH_DEST {16}] $ad9963_dac_dmac_b
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
set_property -dict [list CONFIG.DMA_DATA_WIDTH_SRC {64}] $ad9963_dac_dmac_a
M2K: initial commit
2017-01-31 14:43:40 +00:00
set_property -dict [list CONFIG.CYCLIC {true}] $ad9963_dac_dmac_b
m2k: standalone: Disable DMA debug registers The debug register logic for the DMA take up a fair amount of resources. Disabling them frees up space in the FPGA and also helps a bit with power. Since those registers are mainly useful in development and not so much in production the change shouldn't have any visible external effects. It is possible to re-enable the debug registers by setting DEBUG_BUILD=1. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-30 15:43:40 +00:00
set_property -dict [list CONFIG.DISABLE_DEBUG_REGISTERS $DISABLE_DMAC_DEBUG] $ad9963_dac_dmac_b
M2K: initial commit
2017-01-31 14:43:40 +00:00
set adc_trigger [create_bd_cell -type ip -vlnv analog.com:user:axi_adc_trigger:1.0 adc_trigger]
set axi_adc_decimate [create_bd_cell -type ip -vlnv analog.com:user:axi_adc_decimate:1.0 axi_adc_decimate]
set axi_dac_interpolate [create_bd_cell -type ip -vlnv analog.com:user:axi_dac_interpolate:1.0 axi_dac_interpolate]
m2k: Add reset circuitry on the logic_analyzer clock domain
2017-02-13 10:02:11 +00:00
set logic_analyzer_reset [create_bd_cell -type ip -vlnv xilinx.com:ip:proc_sys_reset:5.0 logic_analyzer_reset]
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
set axi_rd_wr_combiner_logic [create_bd_cell -type ip -vlnv analog.com:user:axi_rd_wr_combiner:1.0 axi_rd_wr_combiner_logic]
set axi_rd_wr_combiner_converter [create_bd_cell -type ip -vlnv analog.com:user:axi_rd_wr_combiner:1.0 axi_rd_wr_combiner_converter]
m2k: Add reset circuitry on the logic_analyzer clock domain
2017-02-13 10:02:11 +00:00
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_connect data_i logic_analyzer/data_i
ad_connect trigger_i logic_analyzer/trigger_i
ad_connect data_o logic_analyzer/data_o
ad_connect data_t logic_analyzer/data_t
m2k: Connect logic_analyzer path to clk_out instead of clk - this allows for the clock switching to be done inside axi_logic_analyzer core
2017-03-31 09:29:29 +00:00
ad_connect logic_analyzer_clk_in logic_analyzer/clk
ad_connect logic_analyzer_clk logic_analyzer/clk_out
M2K: initial commit
2017-01-31 14:43:40 +00:00
m2k: Replace logic analyzer MMCM The MMCM generating the logic analyzer clock unfortunately consumes a disproportionately large amount of power compared to the rest of the design. Replace it by sourcing the logic analyzer clock from one of the Zynq FCLKs. The IO PLL is running anyway so the power requirement is much lower. For the time being this means we loose the ability to source the clock from an external pin. But that feature is not supported by software at the moment anyway. We'll bring it eventually when required. This changes reduces power consumption by roughly 100mW. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-23 13:56:35 +00:00
ad_connect logic_analyzer_clk pattern_generator_dmac/fifo_rd_clk
M2K: initial commit
2017-01-31 14:43:40 +00:00
m2k: Replace logic analyzer MMCM The MMCM generating the logic analyzer clock unfortunately consumes a disproportionately large amount of power compared to the rest of the design. Replace it by sourcing the logic analyzer clock from one of the Zynq FCLKs. The IO PLL is running anyway so the power requirement is much lower. For the time being this means we loose the ability to source the clock from an external pin. But that feature is not supported by software at the moment anyway. We'll bring it eventually when required. This changes reduces power consumption by roughly 100mW. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-23 13:56:35 +00:00
ad_connect logic_analyzer_clk la_trigger_fifo/clk
ad_connect logic_analyzer_clk logic_analyzer_dmac/fifo_wr_clk
ad_connect logic_analyzer_clk logic_analyzer_reset/slowest_sync_clk
m2k: Add reset circuitry on the logic_analyzer clock domain
2017-02-13 10:02:11 +00:00
ad_connect logic_analyzer_reset/ext_reset_in sys_rstgen/peripheral_aresetn
ad_connect logic_analyzer_reset/bus_struct_reset la_trigger_fifo/rst
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_connect la_trigger_fifo/data_in logic_analyzer/adc_data
ad_connect la_trigger_fifo/data_in_valid logic_analyzer/adc_valid
ad_connect logic_analyzer_dmac/fifo_wr_din la_trigger_fifo/data_out
ad_connect logic_analyzer_dmac/fifo_wr_en la_trigger_fifo/data_out_valid
ad_connect logic_analyzer/trigger_offset la_trigger_fifo/depth
ad_connect logic_analyzer/trigger_out logic_analyzer_dmac/fifo_wr_sync
ad_connect pattern_generator_dmac/fifo_rd_en logic_analyzer/dac_read
ad_connect pattern_generator_dmac/fifo_rd_dout logic_analyzer/dac_data
ad_connect pattern_generator_dmac/fifo_rd_valid logic_analyzer/dac_valid
ad_connect sys_200m_clk axi_ad9963/delay_clk
m2k: Renamed l_clk to adc_clk and rst to adc_rst
2017-03-29 08:03:00 +00:00
ad_connect axi_ad9963/adc_clk adc_trigger_fifo/clk
m2k: Remove channel pack core for now We always have both ADC channels enabled and the cpack core takes up a fair amount of space, so remove it for now. Might come back later when we really need it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-24 14:03:58 +00:00
#ad_connect axi_ad9963/adc_clk util_cpack_ad9963/adc_clk
m2k: Renamed l_clk to adc_clk and rst to adc_rst
2017-03-29 08:03:00 +00:00
ad_connect axi_adc_decimate/adc_clk axi_ad9963/adc_clk
m2k: Connected adc/dac resets to decimation/interpolation cores
2017-03-29 09:07:44 +00:00
ad_connect axi_adc_decimate/adc_rst axi_ad9963/adc_rst
m2k: Renamed l_clk to adc_clk and rst to adc_rst
2017-03-29 08:03:00 +00:00
ad_connect adc_trigger_extract/clk axi_ad9963/adc_clk
ad_connect ad9963_adc_dmac/fifo_wr_clk axi_ad9963/adc_clk
M2K: initial commit
2017-01-31 14:43:40 +00:00
m2k: Remove channel pack core for now We always have both ADC channels enabled and the cpack core takes up a fair amount of space, so remove it for now. Might come back later when we really need it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-24 14:03:58 +00:00
#ad_connect axi_ad9963/adc_rst util_cpack_ad9963/adc_rst
m2k: Renamed l_clk to adc_clk and rst to adc_rst
2017-03-29 08:03:00 +00:00
ad_connect axi_ad9963/adc_rst adc_trigger_fifo/rst
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_connect axi_adc_decimate/adc_data_a axi_ad9963/adc_data_i
ad_connect axi_adc_decimate/adc_data_b axi_ad9963/adc_data_q
ad_connect axi_adc_decimate/adc_valid_a axi_ad9963/adc_valid_i
ad_connect axi_adc_decimate/adc_valid_b axi_ad9963/adc_valid_q
m2k: Remove channel pack core for now We always have both ADC channels enabled and the cpack core takes up a fair amount of space, so remove it for now. Might come back later when we really need it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-24 14:03:58 +00:00
#ad_connect axi_ad9963/adc_enable_i util_cpack_ad9963/adc_enable_0
#ad_connect adc_trigger/data_valid_a_trig util_cpack_ad9963/adc_valid_0
#ad_connect adc_trigger/data_a_trig util_cpack_ad9963/adc_data_0
#ad_connect axi_ad9963/adc_enable_q util_cpack_ad9963/adc_enable_1
#ad_connect adc_trigger/data_valid_b_trig util_cpack_ad9963/adc_valid_1
#ad_connect adc_trigger/data_b_trig util_cpack_ad9963/adc_data_1
#ad_connect adc_trigger_fifo/data_in util_cpack_ad9963/adc_data
#ad_connect adc_trigger_fifo/data_in_valid util_cpack_ad9963/adc_valid
#ad_connect util_cpack_ad9963/adc_data adc_trigger_extract/data_in_trigger
ad_connect adc_trigger/data_a_trig ad9963_adc_concat/In0
ad_connect adc_trigger/data_b_trig ad9963_adc_concat/In1
ad_connect adc_trigger/data_valid_a_trig adc_trigger_fifo/data_in_valid
ad_connect ad9963_adc_concat/dout adc_trigger_fifo/data_in
ad_connect ad9963_adc_concat/dout adc_trigger_extract/data_in_trigger
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_connect adc_trigger_fifo/depth adc_trigger/trigger_offset
ad_connect adc_trigger_fifo/data_out adc_trigger_extract/data_in
ad_connect adc_trigger_fifo/data_out_valid adc_trigger_extract/data_valid
ad_connect adc_trigger_extract/data_out ad9963_adc_dmac/fifo_wr_din
ad_connect adc_trigger_extract/trigger_out ad9963_adc_dmac/fifo_wr_sync
ad_connect adc_trigger_fifo/data_out_valid ad9963_adc_dmac/fifo_wr_en
ad_connect axi_dac_interpolate/dac_clk axi_ad9963/dac_clk
m2k: Connected adc/dac resets to decimation/interpolation cores
2017-03-29 09:07:44 +00:00
ad_connect axi_dac_interpolate/dac_rst axi_ad9963/dac_rst
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_connect axi_dac_interpolate/dac_valid_a axi_ad9963/dac_valid_i
ad_connect axi_dac_interpolate/dac_valid_b axi_ad9963/dac_valid_q
ad_connect axi_dac_interpolate/dac_int_data_a axi_ad9963/dac_data_i
ad_connect axi_dac_interpolate/dac_int_data_b axi_ad9963/dac_data_q
ad_connect ad9963_dac_dmac_a/fifo_rd_clk axi_ad9963/dac_clk
ad_connect ad9963_dac_dmac_b/fifo_rd_clk axi_ad9963/dac_clk
ad_connect axi_dac_interpolate/dac_data_a ad9963_dac_dmac_a/fifo_rd_dout
ad_connect axi_dac_interpolate/dac_int_valid_a ad9963_dac_dmac_a/fifo_rd_en
ad_connect axi_dac_interpolate/dac_data_b ad9963_dac_dmac_b/fifo_rd_dout
ad_connect axi_dac_interpolate/dac_int_valid_b ad9963_dac_dmac_b/fifo_rd_en
ad_connect /axi_ad9963/tx_data txd
ad_connect /axi_ad9963/tx_iq txiq
ad_connect /axi_ad9963/tx_clk tx_clk
ad_connect /axi_ad9963/trx_data rxd
ad_connect /axi_ad9963/trx_clk rx_clk
ad_connect /axi_ad9963/trx_iq rxiq
ad_connect adc_trigger/data_a axi_adc_decimate/adc_dec_data_a
ad_connect adc_trigger/data_valid_a axi_adc_decimate/adc_dec_valid_a
ad_connect adc_trigger/data_b axi_adc_decimate/adc_dec_data_b
ad_connect adc_trigger/data_valid_b axi_adc_decimate/adc_dec_valid_b
m2k: Renamed l_clk to adc_clk and rst to adc_rst
2017-03-29 08:03:00 +00:00
ad_connect adc_trigger/clk axi_ad9963/adc_clk
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_connect trigger_i adc_trigger/trigger_i
ad_connect trigger_o adc_trigger/trigger_o
ad_connect trigger_t adc_trigger/trigger_t
ad_connect axi_ad9963/dac_sync_in axi_ad9963/dac_sync_out
ad_connect axi_ad9963/adc_dovf ad9963_adc_dmac/fifo_wr_overflow
ad_connect axi_ad9963/dac_dunf ad9963_dac_dmac_a/fifo_rd_underflow
# interconnects
m2k: Replace logic analyzer MMCM The MMCM generating the logic analyzer clock unfortunately consumes a disproportionately large amount of power compared to the rest of the design. Replace it by sourcing the logic analyzer clock from one of the Zynq FCLKs. The IO PLL is running anyway so the power requirement is much lower. For the time being this means we loose the ability to source the clock from an external pin. But that feature is not supported by software at the moment anyway. We'll bring it eventually when required. This changes reduces power consumption by roughly 100mW. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-23 13:56:35 +00:00
#ad_cpu_interconnect 0x70000000 clk_generator
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_cpu_interconnect 0x70100000 logic_analyzer
ad_cpu_interconnect 0x70200000 axi_ad9963
ad_cpu_interconnect 0x7C400000 logic_analyzer_dmac
ad_cpu_interconnect 0x7C420000 pattern_generator_dmac
ad_cpu_interconnect 0x7C440000 ad9963_adc_dmac
ad_cpu_interconnect 0x7C460000 ad9963_dac_dmac_b
ad_cpu_interconnect 0x7C480000 ad9963_dac_dmac_a
ad_cpu_interconnect 0x7C4c0000 adc_trigger
ad_cpu_interconnect 0x7C500000 axi_adc_decimate
ad_cpu_interconnect 0x7C5a0000 axi_dac_interpolate
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
# Logic analyzer DMA
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
ad_connect sys_cpu_clk axi_rd_wr_combiner_logic/clk
ad_connect sys_cpu_clk logic_analyzer_dmac/m_dest_axi_aclk
ad_connect sys_cpu_clk pattern_generator_dmac/m_src_axi_aclk
ad_connect logic_analyzer_dmac/m_dest_axi axi_rd_wr_combiner_logic/s_wr_axi
ad_connect pattern_generator_dmac/m_src_axi axi_rd_wr_combiner_logic/s_rd_axi
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
ad_mem_hp1_interconnect sys_cpu_clk sys_ps7/S_AXI_HP1
ad_mem_hp1_interconnect sys_cpu_clk axi_rd_wr_combiner_logic/m_axi
# Converter DMA
ad_connect converter_dma_clk axi_rd_wr_combiner_converter/clk
ad_connect converter_dma_clk ad9963_adc_dmac/m_dest_axi_aclk
ad_connect converter_dma_clk ad9963_dac_dmac_a/m_src_axi_aclk
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
ad_connect ad9963_adc_dmac/m_dest_axi axi_rd_wr_combiner_converter/s_wr_axi
ad_connect ad9963_dac_dmac_a/m_src_axi axi_rd_wr_combiner_converter/s_rd_axi
m2k: Rework clocking domains At the moment the register map fabric and DMA system memory side are clocked by the 100MHz sys_cpu_clk. While this works fine that is a lot faster than the clock has to run. There are only a few 100 register map accesses per seconds at most and they are not on timing critical paths. The penalty from clocking them at a lower rate is negligible for the overall system performance. The maximum clock rate for the DMAs is determined by the throughput requirements. This is 200 Mbytes/s for the logic analyzer, pattern generator and each of the DAC DMAs and 400 Mbytes/s for the ADC DMA. The DMA datapath width is 64-bit so the required clock rates are 25MHz and 50MHz respectively. Some headroom is required to accommodate for occasional bubble cycles on the data bus and the difference in reference clocks for the converter and processing system. The sys_cpu_clk is reduced to 27.8MHz which is fast enough for all but the ADC DMA. For the ADC DMA a new clock domain running at 55.6 MHz is introduced. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-27 14:53:38 +00:00
ad_mem_hp2_interconnect converter_dma_clk sys_ps7/S_AXI_HP2
ad_mem_hp2_interconnect converter_dma_clk axi_rd_wr_combiner_converter/m_axi
# Only 16-bit we can run at a slower clock
m2k: Changed the way DMAs connect to the PS7 DDR, to optimize resources use
2017-03-14 11:57:50 +00:00
ad_mem_hp3_interconnect sys_cpu_clk sys_ps7/S_AXI_HP3
ad_mem_hp3_interconnect sys_cpu_clk ad9963_dac_dmac_b/m_src_axi
m2k: Reduce AXI interconnect utilization Use the new axi_rd_wr_combiner module to ... the read and write DMA interfaces into a single interface. This allows the AXI interconnect completely optimize itself away and reduce the overall resource utilization of the project. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
2017-03-17 12:05:34 +00:00
# Map rd-wr combiner
assign_bd_address [get_bd_addr_segs { \
axi_rd_wr_combiner_converter/s_rd_axi/reg0 \
axi_rd_wr_combiner_converter/s_wr_axi/reg0 \
axi_rd_wr_combiner_logic/s_rd_axi/reg0 \
axi_rd_wr_combiner_logic/s_wr_axi/reg0 \
}]
set_property range 512M [get_bd_addr_segs { \
ad9963_dac_dmac_a/m_src_axi/SEG_axi_rd_wr_combiner_converter_reg0 \
ad9963_adc_dmac/m_dest_axi/SEG_axi_rd_wr_combiner_converter_reg0 \
pattern_generator_dmac/m_src_axi/SEG_axi_rd_wr_combiner_logic_reg0 \
logic_analyzer_dmac/m_dest_axi/SEG_axi_rd_wr_combiner_logic_reg0 \
}]
M2K: initial commit
2017-01-31 14:43:40 +00:00
ad_connect sys_cpu_resetn logic_analyzer_dmac/m_dest_axi_aresetn
ad_connect sys_cpu_resetn pattern_generator_dmac/m_src_axi_aresetn
ad_connect sys_cpu_resetn ad9963_adc_dmac/m_dest_axi_aresetn
ad_connect sys_cpu_resetn ad9963_dac_dmac_a/m_src_axi_aresetn
ad_connect sys_cpu_resetn ad9963_dac_dmac_b/m_src_axi_aresetn
# interrupts
ad_cpu_interrupt ps-13 mb-12 logic_analyzer_dmac/irq
ad_cpu_interrupt ps-12 mb-13 pattern_generator_dmac/irq
ad_cpu_interrupt ps-10 mb-14 ad9963_adc_dmac/irq
ad_cpu_interrupt ps-9 mb-15 ad9963_dac_dmac_a/irq
ad_cpu_interrupt ps-8 mb-16 ad9963_dac_dmac_b/irq