Commit 1466aa9c authored by Jaco Hofmann's avatar Jaco Hofmann
Browse files

Updates BlueDMA and MSIx Interrupt Controller to newest versions

parent 8040311c
...@@ -1063,28 +1063,6 @@ ...@@ -1063,28 +1063,6 @@
</spirit:parameter> </spirit:parameter>
</spirit:parameters> </spirit:parameters>
</spirit:busInterface> </spirit:busInterface>
<spirit:busInterface>
<spirit:name>IRQ</spirit:name>
<spirit:busType spirit:vendor="xilinx.com" spirit:library="signal" spirit:name="interrupt" spirit:version="1.0"/>
<spirit:abstractionType spirit:vendor="xilinx.com" spirit:library="signal" spirit:name="interrupt_rtl" spirit:version="1.0"/>
<spirit:master/>
<spirit:portMaps>
<spirit:portMap>
<spirit:logicalPort>
<spirit:name>INTERRUPT</spirit:name>
</spirit:logicalPort>
<spirit:physicalPort>
<spirit:name>IRQ</spirit:name>
</spirit:physicalPort>
</spirit:portMap>
</spirit:portMaps>
<spirit:parameters>
<spirit:parameter>
<spirit:name>SENSITIVITY</spirit:name>
<spirit:value spirit:id="BUSIFPARAM_VALUE.IRQ.SENSITIVITY" spirit:choiceRef="choice_list_99a1d2b9">LEVEL_HIGH</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:busInterface>
</spirit:busInterfaces> </spirit:busInterfaces>
<spirit:addressSpaces> <spirit:addressSpaces>
<spirit:addressSpace> <spirit:addressSpace>
...@@ -1104,7 +1082,7 @@ ...@@ -1104,7 +1082,7 @@
<spirit:addressBlock> <spirit:addressBlock>
<spirit:name>reg0</spirit:name> <spirit:name>reg0</spirit:name>
<spirit:baseAddress spirit:format="bitString" spirit:resolve="user" spirit:bitStringLength="32">0</spirit:baseAddress> <spirit:baseAddress spirit:format="bitString" spirit:resolve="user" spirit:bitStringLength="32">0</spirit:baseAddress>
<spirit:range spirit:format="long" spirit:resolve="user" spirit:minimum="4096" spirit:rangeType="long">16777216T</spirit:range> <spirit:range spirit:format="long" spirit:resolve="user" spirit:minimum="4096" spirit:rangeType="long">4096</spirit:range>
<spirit:width spirit:format="long" spirit:resolve="user">64</spirit:width> <spirit:width spirit:format="long" spirit:resolve="user">64</spirit:width>
<spirit:usage>register</spirit:usage> <spirit:usage>register</spirit:usage>
</spirit:addressBlock> </spirit:addressBlock>
...@@ -1124,7 +1102,7 @@ ...@@ -1124,7 +1102,7 @@
<spirit:parameters> <spirit:parameters>
<spirit:parameter> <spirit:parameter>
<spirit:name>viewChecksum</spirit:name> <spirit:name>viewChecksum</spirit:name>
<spirit:value>069857fc</spirit:value> <spirit:value>ff8a092a</spirit:value>
</spirit:parameter> </spirit:parameter>
</spirit:parameters> </spirit:parameters>
</spirit:view> </spirit:view>
...@@ -1140,7 +1118,7 @@ ...@@ -1140,7 +1118,7 @@
<spirit:parameters> <spirit:parameters>
<spirit:parameter> <spirit:parameter>
<spirit:name>viewChecksum</spirit:name> <spirit:name>viewChecksum</spirit:name>
<spirit:value>069857fc</spirit:value> <spirit:value>81bd05da</spirit:value>
</spirit:parameter> </spirit:parameter>
</spirit:parameters> </spirit:parameters>
</spirit:view> </spirit:view>
...@@ -1687,7 +1665,7 @@ ...@@ -1687,7 +1665,7 @@
</spirit:vector> </spirit:vector>
<spirit:wireTypeDefs> <spirit:wireTypeDefs>
<spirit:wireTypeDef> <spirit:wireTypeDef>
<spirit:typeName>reg</spirit:typeName> <spirit:typeName>wire</spirit:typeName>
<spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef>
<spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef>
</spirit:wireTypeDef> </spirit:wireTypeDef>
...@@ -2008,7 +1986,7 @@ ...@@ -2008,7 +1986,7 @@
</spirit:vector> </spirit:vector>
<spirit:wireTypeDefs> <spirit:wireTypeDefs>
<spirit:wireTypeDef> <spirit:wireTypeDef>
<spirit:typeName>reg</spirit:typeName> <spirit:typeName>wire</spirit:typeName>
<spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef>
<spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef>
</spirit:wireTypeDef> </spirit:wireTypeDef>
...@@ -2382,7 +2360,7 @@ ...@@ -2382,7 +2360,7 @@
</spirit:vector> </spirit:vector>
<spirit:wireTypeDefs> <spirit:wireTypeDefs>
<spirit:wireTypeDef> <spirit:wireTypeDef>
<spirit:typeName>reg</spirit:typeName> <spirit:typeName>wire</spirit:typeName>
<spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef>
<spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef>
</spirit:wireTypeDef> </spirit:wireTypeDef>
...@@ -2703,7 +2681,7 @@ ...@@ -2703,7 +2681,7 @@
</spirit:vector> </spirit:vector>
<spirit:wireTypeDefs> <spirit:wireTypeDefs>
<spirit:wireTypeDef> <spirit:wireTypeDef>
<spirit:typeName>reg</spirit:typeName> <spirit:typeName>wire</spirit:typeName>
<spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef>
<spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef> <spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef>
</spirit:wireTypeDef> </spirit:wireTypeDef>
...@@ -2945,7 +2923,20 @@ ...@@ -2945,7 +2923,20 @@
</spirit:wire> </spirit:wire>
</spirit:port> </spirit:port>
<spirit:port> <spirit:port>
<spirit:name>IRQ</spirit:name> <spirit:name>IRQ_write</spirit:name>
<spirit:wire>
<spirit:direction>out</spirit:direction>
<spirit:wireTypeDefs>
<spirit:wireTypeDef>
<spirit:typeName>wire</spirit:typeName>
<spirit:viewNameRef>xilinx_anylanguagesynthesis</spirit:viewNameRef>
<spirit:viewNameRef>xilinx_anylanguagebehavioralsimulation</spirit:viewNameRef>
</spirit:wireTypeDef>
</spirit:wireTypeDefs>
</spirit:wire>
</spirit:port>
<spirit:port>
<spirit:name>IRQ_read</spirit:name>
<spirit:wire> <spirit:wire>
<spirit:direction>out</spirit:direction> <spirit:direction>out</spirit:direction>
<spirit:wireTypeDefs> <spirit:wireTypeDefs>
...@@ -2960,13 +2951,6 @@ ...@@ -2960,13 +2951,6 @@
</spirit:ports> </spirit:ports>
</spirit:model> </spirit:model>
<spirit:choices> <spirit:choices>
<spirit:choice>
<spirit:name>choice_list_99a1d2b9</spirit:name>
<spirit:enumeration>LEVEL_HIGH</spirit:enumeration>
<spirit:enumeration>LEVEL_LOW</spirit:enumeration>
<spirit:enumeration>EDGE_RISING</spirit:enumeration>
<spirit:enumeration>EDGE_FALLING</spirit:enumeration>
</spirit:choice>
<spirit:choice> <spirit:choice>
<spirit:name>choice_list_9d8b0d81</spirit:name> <spirit:name>choice_list_9d8b0d81</spirit:name>
<spirit:enumeration>ACTIVE_HIGH</spirit:enumeration> <spirit:enumeration>ACTIVE_HIGH</spirit:enumeration>
...@@ -2977,8 +2961,25 @@ ...@@ -2977,8 +2961,25 @@
<spirit:fileSet> <spirit:fileSet>
<spirit:name>xilinx_anylanguagesynthesis_view_fileset</spirit:name> <spirit:name>xilinx_anylanguagesynthesis_view_fileset</spirit:name>
<spirit:file> <spirit:file>
<spirit:name>src/SyncFIFO1.v</spirit:name> <spirit:name>constraints/bluedma.xdc</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType> <spirit:userFileType>xdc</spirit:userFileType>
<spirit:userFileType>USED_IN_implementation</spirit:userFileType>
<spirit:userFileType>USED_IN_synthesis</spirit:userFileType>
<spirit:define>
<spirit:name>processing_order</spirit:name>
<spirit:value>late</spirit:value>
</spirit:define>
</spirit:file>
<spirit:file>
<spirit:name>constraints/bluedma.tcl</spirit:name>
<spirit:fileType>tclSource</spirit:fileType>
<spirit:userFileType>USED_IN_implementation</spirit:userFileType>
<spirit:userFileType>USED_IN_simulation</spirit:userFileType>
<spirit:userFileType>USED_IN_synthesis</spirit:userFileType>
<spirit:define>
<spirit:name>processing_order</spirit:name>
<spirit:value>late</spirit:value>
</spirit:define>
</spirit:file> </spirit:file>
<spirit:file> <spirit:file>
<spirit:name>src/FIFO1.v</spirit:name> <spirit:name>src/FIFO1.v</spirit:name>
...@@ -2997,21 +2998,17 @@ ...@@ -2997,21 +2998,17 @@
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
</spirit:file> </spirit:file>
<spirit:file> <spirit:file>
<spirit:name>src/mkBlueDMA.v</spirit:name> <spirit:name>src/SyncFIFO1.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
</spirit:file> </spirit:file>
<spirit:file> <spirit:file>
<spirit:name>src/mkBlueDMAVivado.v</spirit:name> <spirit:name>src/mkBlueDMAVivado.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
<spirit:userFileType>CHECKSUM_abab4df6</spirit:userFileType> <spirit:userFileType>CHECKSUM_f4b809fa</spirit:userFileType>
</spirit:file> </spirit:file>
</spirit:fileSet> </spirit:fileSet>
<spirit:fileSet> <spirit:fileSet>
<spirit:name>xilinx_anylanguagebehavioralsimulation_view_fileset</spirit:name> <spirit:name>xilinx_anylanguagebehavioralsimulation_view_fileset</spirit:name>
<spirit:file>
<spirit:name>src/SyncFIFO1.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType>
</spirit:file>
<spirit:file> <spirit:file>
<spirit:name>src/FIFO1.v</spirit:name> <spirit:name>src/FIFO1.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
...@@ -3029,7 +3026,7 @@ ...@@ -3029,7 +3026,7 @@
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
</spirit:file> </spirit:file>
<spirit:file> <spirit:file>
<spirit:name>src/mkBlueDMA.v</spirit:name> <spirit:name>src/SyncFIFO1.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
</spirit:file> </spirit:file>
<spirit:file> <spirit:file>
...@@ -3057,9 +3054,25 @@ ...@@ -3057,9 +3054,25 @@
<spirit:vendorExtensions> <spirit:vendorExtensions>
<xilinx:coreExtensions> <xilinx:coreExtensions>
<xilinx:supportedFamilies> <xilinx:supportedFamilies>
<xilinx:family xilinx:lifeCycle="Production">zynq</xilinx:family> <xilinx:family xilinx:lifeCycle="Pre-Production">zynq</xilinx:family>
<xilinx:family xilinx:lifeCycle="Production">virtex7</xilinx:family> <xilinx:family xilinx:lifeCycle="Pre-Production">virtex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Production">kintexu</xilinx:family> <xilinx:family xilinx:lifeCycle="Pre-Production">kintex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">artix7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">zynquplus</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qvirtex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">kintex7l</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qkintex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qkintex7l</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">artix7l</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">aartix7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qartix7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qzynq</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">azynq</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">spartan7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">virtexu</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">virtexuplus</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">kintexuplus</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">kintexu</xilinx:family>
</xilinx:supportedFamilies> </xilinx:supportedFamilies>
<xilinx:taxonomies> <xilinx:taxonomies>
<xilinx:taxonomy>/UserIP</xilinx:taxonomy> <xilinx:taxonomy>/UserIP</xilinx:taxonomy>
...@@ -3067,19 +3080,19 @@ ...@@ -3067,19 +3080,19 @@
<xilinx:displayName>BlueDMA</xilinx:displayName> <xilinx:displayName>BlueDMA</xilinx:displayName>
<xilinx:definitionSource>package_project</xilinx:definitionSource> <xilinx:definitionSource>package_project</xilinx:definitionSource>
<xilinx:coreRevision>1</xilinx:coreRevision> <xilinx:coreRevision>1</xilinx:coreRevision>
<xilinx:coreCreationDateTime>2017-07-10T16:46:33Z</xilinx:coreCreationDateTime> <xilinx:coreCreationDateTime>2018-01-30T15:28:45Z</xilinx:coreCreationDateTime>
<xilinx:tags> <xilinx:tags>
<xilinx:tag xilinx:name="nopcore"/> <xilinx:tag xilinx:name="nopcore"/>
</xilinx:tags> </xilinx:tags>
</xilinx:coreExtensions> </xilinx:coreExtensions>
<xilinx:packagingInfo> <xilinx:packagingInfo>
<xilinx:xilinxVersion>2016.4</xilinx:xilinxVersion> <xilinx:xilinxVersion>2017.2</xilinx:xilinxVersion>
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="9aa6aa20"/> <xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="00a31e8a"/>
<xilinx:checksum xilinx:scope="addressSpaces" xilinx:value="39f16c3a"/> <xilinx:checksum xilinx:scope="addressSpaces" xilinx:value="39f16c3a"/>
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="5dd283ff"/> <xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="0f1ff220"/>
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="c93d048c"/> <xilinx:checksum xilinx:scope="fileGroups" xilinx:value="5e367912"/>
<xilinx:checksum xilinx:scope="ports" xilinx:value="8523f8a5"/> <xilinx:checksum xilinx:scope="ports" xilinx:value="d0fc19af"/>
<xilinx:checksum xilinx:scope="parameters" xilinx:value="1bb46e31"/> <xilinx:checksum xilinx:scope="parameters" xilinx:value="4a3aac11"/>
</xilinx:packagingInfo> </xilinx:packagingInfo>
</spirit:vendorExtensions> </spirit:vendorExtensions>
</spirit:component> </spirit:component>
##
## set properties to help out clock domain crossing analysis
##
foreach pat {"reset_hold_reg[*]" "sGEnqPtr*_reg[*]" "dGDeqPtr*_reg[*]" "sSyncReg*_reg[*]" "dSyncReg*_reg[*]" "dEnqPtr*_reg[*]"} {
set cells [get_cells -hier $pat]
if {[llength $cells] > 0} {
puts "ASYNC_REG $cells"
set_property ASYNC_REG 1 $cells
}
}
##
## set properties to help out clock domain crossing analysis
##
set s_clk [get_clocks -of_objects [get_ports -scoped_to_current_instance m32_axi_aclk]]
set m_clk [get_clocks -of_object [get_ports -scoped_to_current_instance m64_axi_aclk]]
set_max_delay -from [filter [all_fanout -from [get_ports -scoped_to_current_instance m32_axi_aclk] -flat -endpoints_only] {IS_LEAF}] -to [filter [all_fanout -from [get_ports -scoped_to_current_instance m64_axi_aclk] -flat -only_cells] {IS_SEQUENTIAL && (NAME !~ *dout_i_reg[*])}] -datapath_only [get_property -min PERIOD $s_clk]
set_max_delay -from [filter [all_fanout -from [get_ports -scoped_to_current_instance m64_axi_aclk] -flat -endpoints_only] {IS_LEAF}] -to [filter [all_fanout -from [get_ports -scoped_to_current_instance m32_axi_aclk] -flat -only_cells] {IS_SEQUENTIAL && (NAME !~ *dout_i_reg[*])}] -datapath_only [get_property -min PERIOD $m_clk]
set g_clk [get_clocks -of_objects [get_ports -scoped_to_current_instance s_axi_aclk]]
set_max_delay -from [filter [all_fanout -from [get_ports -scoped_to_current_instance m32_axi_aclk] -flat -endpoints_only] {IS_LEAF}] -to [filter [all_fanout -from [get_ports -scoped_to_current_instance s_axi_aclk] -flat -only_cells] {IS_SEQUENTIAL && (NAME !~ *dout_i_reg[*])}] -datapath_only [get_property -min PERIOD $s_clk]
set_max_delay -from [filter [all_fanout -from [get_ports -scoped_to_current_instance s_axi_aclk] -flat -endpoints_only] {IS_LEAF}] -to [filter [all_fanout -from [get_ports -scoped_to_current_instance m32_axi_aclk] -flat -only_cells] {IS_SEQUENTIAL && (NAME !~ *dout_i_reg[*])}] -datapath_only [get_property -min PERIOD $g_clk]
set_max_delay -from [filter [all_fanout -from [get_ports -scoped_to_current_instance m64_axi_aclk] -flat -endpoints_only] {IS_LEAF}] -to [filter [all_fanout -from [get_ports -scoped_to_current_instance s_axi_aclk] -flat -only_cells] {IS_SEQUENTIAL && (NAME !~ *dout_i_reg[*])}] -datapath_only [get_property -min PERIOD $m_clk]
set_max_delay -from [filter [all_fanout -from [get_ports -scoped_to_current_instance s_axi_aclk] -flat -endpoints_only] {IS_LEAF}] -to [filter [all_fanout -from [get_ports -scoped_to_current_instance m64_axi_aclk] -flat -only_cells] {IS_SEQUENTIAL && (NAME !~ *dout_i_reg[*])}] -datapath_only [get_property -min PERIOD $g_clk]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *reset_hold_reg*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *sGEnqPtr*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *dGDeqPtr*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *sSyncReg*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *dSyncReg*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *dEnqPtr*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *dEnqToggle*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *dDeqToggle*}] {IS_SEQUENTIAL}]
set_false_path -through [get_ports -scoped_to_current_instance -filter {NAME =~ *_axi_aresetn}] -to [filter [get_cells -hier -filter {NAME =~ *dNotEmpty*}] {IS_SEQUENTIAL}]
\ No newline at end of file
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
// //
// $Revision: 29755 $ // $Revision$
// $Date: 2012-10-22 13:58:12 +0000 (Mon, 22 Oct 2012) $ // $Date$
`ifdef BSV_ASSIGNMENT_DELAY `ifdef BSV_ASSIGNMENT_DELAY
`else `else
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
// //
// $Revision: 29755 $ // $Revision$
// $Date: 2012-10-22 13:58:12 +0000 (Mon, 22 Oct 2012) $ // $Date$
`ifdef BSV_ASSIGNMENT_DELAY `ifdef BSV_ASSIGNMENT_DELAY
`else `else
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
// //
// $Revision: 33367 $ // $Revision$
// $Date: 2014-02-18 17:46:14 +0000 (Tue, 18 Feb 2014) $ // $Date$
`ifdef BSV_ASSIGNMENT_DELAY `ifdef BSV_ASSIGNMENT_DELAY
`else `else
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
// //
// $Revision: 29441 $ // $Revision$
// $Date: 2012-08-27 21:58:03 +0000 (Mon, 27 Aug 2012) $ // $Date$
`ifdef BSV_ASSIGNMENT_DELAY `ifdef BSV_ASSIGNMENT_DELAY
`else `else
......
This diff is collapsed.
This diff is collapsed.
...@@ -427,7 +427,7 @@ ...@@ -427,7 +427,7 @@
<spirit:parameters> <spirit:parameters>
<spirit:parameter> <spirit:parameter>
<spirit:name>viewChecksum</spirit:name> <spirit:name>viewChecksum</spirit:name>
<spirit:value>e07e9e3a</spirit:value> <spirit:value>ba3c4982</spirit:value>
</spirit:parameter> </spirit:parameter>
</spirit:parameters> </spirit:parameters>
</spirit:view> </spirit:view>
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
<spirit:parameters> <spirit:parameters>
<spirit:parameter> <spirit:parameter>
<spirit:name>viewChecksum</spirit:name> <spirit:name>viewChecksum</spirit:name>
<spirit:value>e07e9e3a</spirit:value> <spirit:value>062ac467</spirit:value>
</spirit:parameter> </spirit:parameter>
</spirit:parameters> </spirit:parameters>
</spirit:view> </spirit:view>
...@@ -1248,6 +1248,16 @@ ...@@ -1248,6 +1248,16 @@
<spirit:fileSets> <spirit:fileSets>
<spirit:fileSet> <spirit:fileSet>
<spirit:name>xilinx_anylanguagesynthesis_view_fileset</spirit:name> <spirit:name>xilinx_anylanguagesynthesis_view_fileset</spirit:name>
<spirit:file>
<spirit:name>constraints/msix_intr_ctrl.xdc</spirit:name>
<spirit:userFileType>xdc</spirit:userFileType>
<spirit:userFileType>USED_IN_implementation</spirit:userFileType>
<spirit:userFileType>USED_IN_synthesis</spirit:userFileType>
<spirit:define>
<spirit:name>processing_order</spirit:name>
<spirit:value>late</spirit:value>
</spirit:define>
</spirit:file>
<spirit:file> <spirit:file>
<spirit:name>src/BRAM2BE.v</spirit:name> <spirit:name>src/BRAM2BE.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
...@@ -1267,7 +1277,7 @@ ...@@ -1267,7 +1277,7 @@
<spirit:file> <spirit:file>
<spirit:name>src/mkMSIXIntrCtrl.v</spirit:name> <spirit:name>src/mkMSIXIntrCtrl.v</spirit:name>
<spirit:fileType>verilogSource</spirit:fileType> <spirit:fileType>verilogSource</spirit:fileType>
<spirit:userFileType>CHECKSUM_f02cbad3</spirit:userFileType> <spirit:userFileType>CHECKSUM_8ffb020d</spirit:userFileType>
</spirit:file> </spirit:file>
</spirit:fileSet> </spirit:fileSet>
<spirit:fileSet> <spirit:fileSet>
...@@ -1313,9 +1323,25 @@ ...@@ -1313,9 +1323,25 @@
<spirit:vendorExtensions> <spirit:vendorExtensions>
<xilinx:coreExtensions> <xilinx:coreExtensions>
<xilinx:supportedFamilies> <xilinx:supportedFamilies>
<xilinx:family xilinx:lifeCycle="Production">zynq</xilinx:family> <xilinx:family xilinx:lifeCycle="Pre-Production">zynq</xilinx:family>
<xilinx:family xilinx:lifeCycle="Production">virtex7</xilinx:family> <xilinx:family xilinx:lifeCycle="Pre-Production">virtex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Production">kintexu</xilinx:family> <xilinx:family xilinx:lifeCycle="Pre-Production">kintex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">artix7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">zynquplus</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qvirtex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">kintex7l</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qkintex7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qkintex7l</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">artix7l</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">aartix7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qartix7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">qzynq</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">azynq</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">spartan7</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">virtexu</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">virtexuplus</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">kintexuplus</xilinx:family>
<xilinx:family xilinx:lifeCycle="Pre-Production">kintexu</xilinx:family>
</xilinx:supportedFamilies> </xilinx:supportedFamilies>
<xilinx:taxonomies> <xilinx:taxonomies>
<xilinx:taxonomy>/UserIP</xilinx:taxonomy> <xilinx:taxonomy>/UserIP</xilinx:taxonomy>
...@@ -1323,19 +1349,19 @@ ...@@ -1323,19 +1349,19 @@
<xilinx:displayName>MSIXIntrCtrl</xilinx:displayName> <xilinx:displayName>MSIXIntrCtrl</xilinx:displayName>
<xilinx:definitionSource>package_project</xilinx:definitionSource> <xilinx:definitionSource>package_project</xilinx:definitionSource>
<xilinx:coreRevision>1</xilinx:coreRevision> <xilinx:coreRevision>1</xilinx:coreRevision>
<xilinx:coreCreationDateTime>2017-07-07T08:36:48Z</xilinx:coreCreationDateTime> <xilinx:coreCreationDateTime>2018-01-30T15:21:42Z</xilinx:coreCreationDateTime>
<xilinx:tags> <xilinx:tags>
<xilinx:tag xilinx:name="nopcore"/> <xilinx:tag xilinx:name="nopcore"/>
</xilinx:tags> </xilinx:tags>
</xilinx:coreExtensions> </xilinx:coreExtensions>
<xilinx:packagingInfo> <xilinx:packagingInfo>
<xilinx:xilinxVersion>2016.4</xilinx:xilinxVersion> <xilinx:xilinxVersion>2017.2</xilinx:xilinxVersion>
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="a9103989"/> <xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="21b6542c"/>
<xilinx:checksum xilinx:scope="addressSpaces" xilinx:value="39f94240"/> <xilinx:checksum xilinx:scope="addressSpaces" xilinx:value="39f94240"/>
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="2b2da2c0"/> <xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="2b2da2c0"/>
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="ecf6481e"/> <xilinx:checksum xilinx:scope="fileGroups" xilinx:value="5de90130"/>
<xilinx:checksum xilinx:scope="ports" xilinx:value="19368f77"/> <xilinx:checksum xilinx:scope="ports" xilinx:value="19368f77"/>
<xilinx:checksum xilinx:scope="parameters" xilinx:value="4b2b81b7"/> <xilinx:checksum xilinx:scope="parameters" xilinx:value="1be99b86"/>
</xilinx:packagingInfo> </xilinx:packagingInfo>
</spirit:vendorExtensions> </spirit:vendorExtensions>
</spirit:component> </spirit:component>
set_false_path -through [get_ports -scoped_to_current_instance interrupt*]
set_false_path -through [get_pins system_i/InterruptControl/msix_intr_ctrl/interrupt*]
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
// //
// $Revision: 29755 $ // $Revision$
// $Date: 2012-10-22 13:58:12 +0000 (Mon, 22 Oct 2012) $ // $Date$
`ifdef BSV_ASSIGNMENT_DELAY `ifdef BSV_ASSIGNMENT_DELAY
`else `else
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE. // THE SOFTWARE.
// //
// $Revision: 29755 $ // $Revision$
// $Date: 2012-10-22 13:58:12 +0000 (Mon, 22 Oct 2012) $ // $Date$
`ifdef BSV_ASSIGNMENT_DELAY `ifdef BSV_ASSIGNMENT_DELAY
`else `else
......
This diff is collapsed.
...@@ -137,7 +137,11 @@ static int register_intr_handler(struct pci_dev *pdev, int c) ...@@ -137,7 +137,11 @@ static int register_intr_handler(struct pci_dev *pdev, int c)
err = request_irq(pci_irq_vector(pdev, c), intr_handler_dma, IRQF_EARLY_RESUME, FFLINK_PCI_NAME, pdev); err = request_irq(pci_irq_vector(pdev, c), intr_handler_dma, IRQF_EARLY_RESUME, FFLINK_PCI_NAME, pdev);
} }
if (c == 1 || c == 2 || c == 3) err = -2; if (c == 1) {
err = request_irq(pci_irq_vector(pdev, c), intr_handler_dma, IRQF_EARLY_RESUME, FFLINK_PCI_NAME, pdev);
}
if (c == 2 || c == 3) err = -2;
switch (c) { switch (c) {
case 4: err = request_irq(pci_irq_vector(pdev, c), intr_handler_user_0, IRQF_EARLY_RESUME, FFLINK_PCI_NAME, pdev); break;