Skip to content

Commit cff0378

Browse files
LBFFilhoLBFFilho
authored
library/spi_engine: fix inverted interconnect for intel projects (#1873)
On intel projects, the s0,s1 connections were inverted before this commit. s1 is intended for the FIFO mode commands and data, and s0 is intended for the Offload mode ones. This inversion meant that when Offload was enabled, the FIFO commands were sent, and vice-versa. Until recently, before #1502, this was relatively benign, and caused only a priority inversion between the two streams. After #1502, however, it makes the offload enable signal behave wrongly, since it's used for selecting between the s0, s1 interfaces. Signed-off-by: Laez Barbosa <[email protected]>
1 parent 1920f83 commit cff0378

File tree

7 files changed

+62
-62
lines changed

7 files changed

+62
-62
lines changed

‎projects/ad4052_ardz/common/ad4052_qsys.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi
141141
add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data
142142
add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync
143143

144-
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd
145-
add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data
146-
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo
147-
add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync
148-
149-
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd
150-
add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data
151-
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo
152-
add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync
144+
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd
145+
add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data
146+
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo
147+
add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync
148+
149+
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd
150+
add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data
151+
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo
152+
add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync
153153
add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl
154154

155155
add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd

‎projects/ad411x_ad717x/common/ad411x_ad717x_asdz_qsys.tcl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi
108108
add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data
109109
add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync
110110

111-
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd
112-
add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data
113-
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo
114-
add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync
111+
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd
112+
add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data
113+
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo
114+
add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync
115115
add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl
116116

117-
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd
118-
add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data
119-
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo
120-
add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync
117+
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd
118+
add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data
119+
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo
120+
add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync
121121

122122
add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd
123123
add_connection spi_engine_offload_0.ctrl_sdo_wr axi_spi_engine_0.offload0_sdo

‎projects/ad4170_asdz/common/ad4170_asdz_qsys.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi
108108
add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data
109109
add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync
110110

111-
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd
112-
add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data
113-
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo
114-
add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync
115-
116-
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd
117-
add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data
118-
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo
119-
add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync
111+
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd
112+
add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data
113+
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo
114+
add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync
115+
116+
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd
117+
add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data
118+
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo
119+
add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync
120120
add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl
121121

122122
add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd

‎projects/ad469x_evb/common/ad469x_qsys.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi
167167
add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data
168168
add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync
169169

170-
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd
171-
add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data
172-
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo
173-
add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync
174-
175-
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd
176-
add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data
177-
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo
178-
add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync
170+
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd
171+
add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data
172+
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo
173+
add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync
174+
175+
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd
176+
add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data
177+
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo
178+
add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync
179179
add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl
180180

181181
add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd

‎projects/ad57xx_ardz/common/ad57xx_ardz_qsys.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi
143143
add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data
144144
add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync
145145

146-
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd
147-
add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data
148-
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo
149-
add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync
150-
151-
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd
152-
add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data
153-
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo
154-
add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync
146+
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd
147+
add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data
148+
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo
149+
add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync
150+
151+
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd
152+
add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data
153+
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo
154+
add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync
155155
add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl
156156

157157
add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd

‎projects/cn0540/common/cn0540_qsys.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi
8787
add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data
8888
add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync
8989

90-
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd
91-
add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data
92-
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo
93-
add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync
94-
95-
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd
96-
add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data
97-
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo
98-
add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync
90+
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd
91+
add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data
92+
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo
93+
add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync
94+
95+
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd
96+
add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data
97+
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo
98+
add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync
9999
add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl
100100

101101
add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd

‎projects/cn0561/common/cn0561_qsys.tcl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi
144144
add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data
145145
add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync
146146

147-
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd
148-
add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data
149-
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo
150-
add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync
151-
152-
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd
153-
add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data
154-
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo
155-
add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync
147+
add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd
148+
add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data
149+
add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo
150+
add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync
151+
152+
add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd
153+
add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data
154+
add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo
155+
add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync
156156
add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl
157157

158158
add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd

0 commit comments

Comments
 (0)