From 96813c5802b7c75eacce25ccefecf03c43c22829 Mon Sep 17 00:00:00 2001 From: Priest <priest> Date: Mon, 24 Oct 2016 07:45:08 +0000 Subject: [PATCH] Added bsn monitor --- .../quartus/qsys_compaan_io_test_fn.qsys | 236 ++++++++++++------ 1 file changed, 160 insertions(+), 76 deletions(-) diff --git a/applications/compaan/designs/compaan_io_test_fn/quartus/qsys_compaan_io_test_fn.qsys b/applications/compaan/designs/compaan_io_test_fn/quartus/qsys_compaan_io_test_fn.qsys index bb32e7a0e8..a312be4767 100644 --- a/applications/compaan/designs/compaan_io_test_fn/quartus/qsys_compaan_io_test_fn.qsys +++ b/applications/compaan/designs/compaan_io_test_fn/quartus/qsys_compaan_io_test_fn.qsys @@ -16,7 +16,7 @@ { datum baseAddress { - value = "1600"; + value = "12296"; type = "long"; } } @@ -85,61 +85,69 @@ type = "boolean"; } } - element reg_tr_10GbE.mem + element reg_mdio_0.mem { - datum _tags + datum baseAddress { - value = ""; - type = "String"; + value = "2016"; + type = "long"; + } + } + element rom_system_info.mem + { + datum _lockedAddress + { + value = "1"; + type = "boolean"; } datum baseAddress { - value = "262144"; + value = "4096"; type = "long"; } } - element reg_dp_offload_tx_hdr_dat.mem + element reg_compaan.mem { datum baseAddress { - value = "256"; + value = "2097152"; type = "long"; } } - element pio_pps.mem + element reg_diagnostics.mem { datum baseAddress { - value = "1608"; + value = "1536"; type = "long"; } } - element reg_unb_sens.mem + element pio_pps.mem { datum baseAddress { - value = "1536"; + value = "12368"; type = "long"; } } - element pio_system_info.mem + element reg_tr_10GbE.mem { - datum _lockedAddress + datum _tags { - value = "1"; - type = "boolean"; + value = ""; + type = "String"; } datum baseAddress { - value = "0"; + value = "262144"; type = "long"; } } - element reg_diagnostics.mem + element reg_dp_offload_tx_hdr_ovr.mem { datum baseAddress { - value = "1024"; + value = "128"; type = "long"; } } @@ -147,23 +155,28 @@ { datum baseAddress { - value = "1344"; + value = "1856"; type = "long"; } } - element reg_mdio_0.mem + element reg_dp_offload_rx_hdr_dat.mem { datum baseAddress { - value = "1504"; + value = "512"; type = "long"; } } - element reg_tr_xaui.mem + element pio_system_info.mem { + datum _lockedAddress + { + value = "1"; + type = "boolean"; + } datum baseAddress { - value = "16384"; + value = "0"; type = "long"; } } @@ -171,73 +184,68 @@ { datum baseAddress { - value = "1472"; + value = "1984"; type = "long"; } } - element reg_dp_offload_tx_hdr_ovr.mem + element reg_tr_xaui.mem { datum baseAddress { - value = "128"; + value = "16384"; type = "long"; } } - element reg_mdio_1.mem + element reg_wdi.mem { + datum _lockedAddress + { + value = "1"; + type = "boolean"; + } datum baseAddress { - value = "1440"; + value = "12288"; type = "long"; } } - element reg_compaan.mem + element reg_bsn_monitor.mem { datum baseAddress { - value = "2097152"; + value = "1024"; type = "long"; } } - element rom_system_info.mem + element reg_unb_sens.mem { - datum _lockedAddress - { - value = "1"; - type = "boolean"; - } datum baseAddress { - value = "4096"; + value = "12320"; type = "long"; } } - element reg_dp_offload_tx.mem + element reg_dp_offload_tx_hdr_dat.mem { datum baseAddress { - value = "1616"; + value = "256"; type = "long"; } } - element reg_dp_offload_rx_hdr_dat.mem + element reg_mdio_1.mem { datum baseAddress { - value = "512"; + value = "1952"; type = "long"; } } - element reg_wdi.mem + element reg_dp_offload_tx.mem { - datum _lockedAddress - { - value = "1"; - type = "boolean"; - } datum baseAddress { - value = "12288"; + value = "12376"; type = "long"; } } @@ -253,7 +261,7 @@ { datum baseAddress { - value = "1280"; + value = "1792"; type = "long"; } } @@ -348,6 +356,19 @@ type = "String"; } } + element reg_bsn_monitor + { + datum _sortIndex + { + value = "25"; + type = "int"; + } + datum sopceditor_expanded + { + value = "0"; + type = "boolean"; + } + } element reg_compaan { datum _sortIndex @@ -543,6 +564,14 @@ type = "boolean"; } } + element pio_wdi.s1 + { + datum baseAddress + { + value = "12352"; + type = "long"; + } + } element onchip_memory2_0.s1 { datum _lockedAddress @@ -556,19 +585,11 @@ type = "long"; } } - element pio_wdi.s1 - { - datum baseAddress - { - value = "1584"; - type = "long"; - } - } element pio_debug_wave.s1 { datum baseAddress { - value = "1568"; + value = "12304"; type = "long"; } } @@ -576,7 +597,7 @@ { datum baseAddress { - value = "1408"; + value = "1920"; type = "long"; } } @@ -624,7 +645,7 @@ <parameter name="projectName" value="" /> <parameter name="sopcBorderPoints" value="false" /> <parameter name="systemHash" value="1" /> - <parameter name="timeStamp" value="1475832231911" /> + <parameter name="timeStamp" value="1476714280450" /> <parameter name="useTestBenchNamingPattern" value="false" /> <instanceScript></instanceScript> <interface @@ -1323,13 +1344,48 @@ internal="reg_tr_nonbonded.readdata" type="conduit" dir="end" /> + <interface + name="reg_bsn_monitor_reset" + internal="reg_bsn_monitor.reset" + type="conduit" + dir="end" /> + <interface + name="reg_bsn_monitor_clk" + internal="reg_bsn_monitor.clk" + type="conduit" + dir="end" /> + <interface + name="reg_bsn_monitor_address" + internal="reg_bsn_monitor.address" + type="conduit" + dir="end" /> + <interface + name="reg_bsn_monitor_write" + internal="reg_bsn_monitor.write" + type="conduit" + dir="end" /> + <interface + name="reg_bsn_monitor_writedata" + internal="reg_bsn_monitor.writedata" + type="conduit" + dir="end" /> + <interface + name="reg_bsn_monitor_read" + internal="reg_bsn_monitor.read" + type="conduit" + dir="end" /> + <interface + name="reg_bsn_monitor_readdata" + internal="reg_bsn_monitor.readdata" + type="conduit" + dir="end" /> <module kind="altera_avalon_onchip_memory2" version="11.1" enabled="1" name="onchip_memory2_0"> <parameter name="allowInSystemMemoryContentEditor" value="false" /> - <parameter name="autoInitializationFileName">qsys_compaan_io_test_onchip_memory2_0</parameter> + <parameter name="autoInitializationFileName">qsys_compaan_io_test_fn_onchip_memory2_0</parameter> <parameter name="blockType" value="M144K" /> <parameter name="dataWidth" value="32" /> <parameter name="deviceFamily" value="Stratix IV" /> @@ -1499,7 +1555,7 @@ q]]></parameter> <parameter name="tightlyCoupledInstructionMaster2AddrWidth" value="1" /> <parameter name="tightlyCoupledInstructionMaster3AddrWidth" value="1" /> <parameter name="instSlaveMapParam"><![CDATA[<address-map><slave name='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /></address-map>]]></parameter> - <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_dp_offload_tx_hdr_ovr.mem' start='0x80' end='0x100' /><slave name='reg_dp_offload_tx_hdr_dat.mem' start='0x100' end='0x200' /><slave name='reg_dp_offload_rx_hdr_dat.mem' start='0x200' end='0x400' /><slave name='reg_diagnostics.mem' start='0x400' end='0x500' /><slave name='avs_eth_0.mms_reg' start='0x500' end='0x540' /><slave name='reg_tr_nonbonded.mem' start='0x540' end='0x580' /><slave name='timer_0.s1' start='0x580' end='0x5A0' /><slave name='reg_mdio_1.mem' start='0x5A0' end='0x5C0' /><slave name='reg_mdio_2.mem' start='0x5C0' end='0x5E0' /><slave name='reg_mdio_0.mem' start='0x5E0' end='0x600' /><slave name='reg_unb_sens.mem' start='0x600' end='0x620' /><slave name='pio_debug_wave.s1' start='0x620' end='0x630' /><slave name='pio_wdi.s1' start='0x630' end='0x640' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x640' end='0x648' /><slave name='pio_pps.mem' start='0x648' end='0x650' /><slave name='reg_dp_offload_tx.mem' start='0x650' end='0x658' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='reg_tr_xaui.mem' start='0x4000' end='0x6000' /><slave name='avs_eth_0.mms_ram' start='0x6000' end='0x7000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='reg_tr_10GbE.mem' start='0x40000' end='0x60000' /><slave name='reg_compaan.mem' start='0x200000' end='0x400000' /></address-map>]]></parameter> + <parameter name="dataSlaveMapParam"><![CDATA[<address-map><slave name='pio_system_info.mem' start='0x0' end='0x80' /><slave name='reg_dp_offload_tx_hdr_ovr.mem' start='0x80' end='0x100' /><slave name='reg_dp_offload_tx_hdr_dat.mem' start='0x100' end='0x200' /><slave name='reg_dp_offload_rx_hdr_dat.mem' start='0x200' end='0x400' /><slave name='reg_bsn_monitor.mem' start='0x400' end='0x600' /><slave name='reg_diagnostics.mem' start='0x600' end='0x700' /><slave name='avs_eth_0.mms_reg' start='0x700' end='0x740' /><slave name='reg_tr_nonbonded.mem' start='0x740' end='0x780' /><slave name='timer_0.s1' start='0x780' end='0x7A0' /><slave name='reg_mdio_1.mem' start='0x7A0' end='0x7C0' /><slave name='reg_mdio_2.mem' start='0x7C0' end='0x7E0' /><slave name='reg_mdio_0.mem' start='0x7E0' end='0x800' /><slave name='rom_system_info.mem' start='0x1000' end='0x2000' /><slave name='avs_eth_0.mms_tse' start='0x2000' end='0x3000' /><slave name='reg_wdi.mem' start='0x3000' end='0x3008' /><slave name='jtag_uart_0.avalon_jtag_slave' start='0x3008' end='0x3010' /><slave name='pio_debug_wave.s1' start='0x3010' end='0x3020' /><slave name='reg_unb_sens.mem' start='0x3020' end='0x3040' /><slave name='pio_wdi.s1' start='0x3040' end='0x3050' /><slave name='pio_pps.mem' start='0x3050' end='0x3058' /><slave name='reg_dp_offload_tx.mem' start='0x3058' end='0x3060' /><slave name='cpu_0.jtag_debug_module' start='0x3800' end='0x4000' /><slave name='reg_tr_xaui.mem' start='0x4000' end='0x6000' /><slave name='avs_eth_0.mms_ram' start='0x6000' end='0x7000' /><slave name='onchip_memory2_0.s1' start='0x20000' end='0x40000' /><slave name='reg_tr_10GbE.mem' start='0x40000' end='0x60000' /><slave name='reg_compaan.mem' start='0x200000' end='0x400000' /></address-map>]]></parameter> <parameter name="clockFrequency" value="25000000" /> <parameter name="deviceFamilyName" value="Stratix IV" /> <parameter name="internalIrqMaskSystemInfo" value="7" /> @@ -1636,6 +1692,11 @@ q]]></parameter> <parameter name="g_dat_w" value="32" /> <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="25000000" /> </module> + <module kind="avs_common_mm" version="1.0" enabled="1" name="reg_bsn_monitor"> + <parameter name="g_adr_w" value="7" /> + <parameter name="g_dat_w" value="32" /> + <parameter name="AUTO_SYSTEM_CLOCK_RATE" value="25000000" /> + </module> <connection kind="avalon" version="11.1" @@ -1674,7 +1735,7 @@ q]]></parameter> start="cpu_0.data_master" end="jtag_uart_0.avalon_jtag_slave"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0640" /> + <parameter name="baseAddress" value="0x3008" /> </connection> <connection kind="interrupt" @@ -1689,7 +1750,7 @@ q]]></parameter> start="cpu_0.data_master" end="pio_debug_wave.s1"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0620" /> + <parameter name="baseAddress" value="0x3010" /> </connection> <connection kind="avalon" @@ -1697,7 +1758,7 @@ q]]></parameter> start="cpu_0.data_master" end="pio_wdi.s1"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0630" /> + <parameter name="baseAddress" value="0x3040" /> </connection> <connection kind="avalon" @@ -1705,7 +1766,7 @@ q]]></parameter> start="cpu_0.data_master" end="timer_0.s1"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0580" /> + <parameter name="baseAddress" value="0x0780" /> </connection> <connection kind="interrupt" version="11.1" start="cpu_0.d_irq" end="timer_0.irq"> <parameter name="irqNumber" value="1" /> @@ -1751,7 +1812,7 @@ q]]></parameter> start="cpu_0.data_master" end="reg_mdio_1.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x05a0" /> + <parameter name="baseAddress" value="0x07a0" /> </connection> <connection kind="reset" @@ -1769,7 +1830,7 @@ q]]></parameter> start="cpu_0.data_master" end="reg_mdio_2.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x05c0" /> + <parameter name="baseAddress" value="0x07c0" /> </connection> <connection kind="reset" @@ -1790,7 +1851,7 @@ q]]></parameter> start="cpu_0.data_master" end="reg_mdio_0.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x05e0" /> + <parameter name="baseAddress" value="0x07e0" /> </connection> <connection kind="avalon" @@ -1806,7 +1867,7 @@ q]]></parameter> start="cpu_0.data_master" end="avs_eth_0.mms_reg"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0500" /> + <parameter name="baseAddress" value="0x0700" /> </connection> <connection kind="avalon" @@ -1827,7 +1888,7 @@ q]]></parameter> start="cpu_0.data_master" end="reg_unb_sens.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0600" /> + <parameter name="baseAddress" value="0x3020" /> </connection> <connection kind="reset" @@ -1853,7 +1914,7 @@ q]]></parameter> start="cpu_0.data_master" end="pio_pps.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0648" /> + <parameter name="baseAddress" value="0x3050" /> </connection> <connection kind="reset" @@ -2145,7 +2206,7 @@ q]]></parameter> start="cpu_0.data_master" end="reg_dp_offload_tx.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0650" /> + <parameter name="baseAddress" value="0x3058" /> </connection> <connection kind="reset" @@ -2186,7 +2247,7 @@ q]]></parameter> start="cpu_0.data_master" end="reg_diagnostics.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0400" /> + <parameter name="baseAddress" value="0x0600" /> </connection> <connection kind="clock" @@ -2204,6 +2265,29 @@ q]]></parameter> start="cpu_0.data_master" end="reg_tr_nonbonded.mem"> <parameter name="arbitrationPriority" value="1" /> - <parameter name="baseAddress" value="0x0540" /> + <parameter name="baseAddress" value="0x0740" /> + </connection> + <connection + kind="clock" + version="11.1" + start="clk_input.clk" + end="reg_bsn_monitor.system" /> + <connection + kind="reset" + version="11.1" + start="clk_input.clk_reset" + end="reg_bsn_monitor.system_reset" /> + <connection + kind="reset" + version="11.1" + start="cpu_0.jtag_debug_module_reset" + end="reg_bsn_monitor.system_reset" /> + <connection + kind="avalon" + version="11.1" + start="cpu_0.data_master" + end="reg_bsn_monitor.mem"> + <parameter name="arbitrationPriority" value="1" /> + <parameter name="baseAddress" value="0x0400" /> </connection> </system> -- GitLab