From 20e5ddfb8602c879cb3ae9a2cd198ab13996bed7 Mon Sep 17 00:00:00 2001 From: Laez Barbosa Date: Thu, 7 Aug 2025 16:46:53 -0300 Subject: [PATCH] library/spi_engine: fix inverted interconnect for intel projects 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 both the 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 --- projects/ad4052_ardz/common/ad4052_qsys.tcl | 18 +++++++++--------- .../common/ad411x_ad717x_asdz_qsys.tcl | 16 ++++++++-------- .../ad4170_asdz/common/ad4170_asdz_qsys.tcl | 18 +++++++++--------- projects/ad469x_evb/common/ad469x_qsys.tcl | 18 +++++++++--------- .../ad57xx_ardz/common/ad57xx_ardz_qsys.tcl | 18 +++++++++--------- projects/cn0540/common/cn0540_qsys.tcl | 18 +++++++++--------- projects/cn0561/common/cn0561_qsys.tcl | 18 +++++++++--------- 7 files changed, 62 insertions(+), 62 deletions(-) diff --git a/projects/ad4052_ardz/common/ad4052_qsys.tcl b/projects/ad4052_ardz/common/ad4052_qsys.tcl index 8fcfd726de8..89e0f8c2c3d 100644 --- a/projects/ad4052_ardz/common/ad4052_qsys.tcl +++ b/projects/ad4052_ardz/common/ad4052_qsys.tcl @@ -141,15 +141,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync -add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd -add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data -add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo -add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync - -add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd -add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data -add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo -add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync +add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd +add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data +add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo +add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync + +add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd +add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data +add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo +add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd diff --git a/projects/ad411x_ad717x/common/ad411x_ad717x_asdz_qsys.tcl b/projects/ad411x_ad717x/common/ad411x_ad717x_asdz_qsys.tcl index db6df8bfb4a..a8151e9a89b 100644 --- a/projects/ad411x_ad717x/common/ad411x_ad717x_asdz_qsys.tcl +++ b/projects/ad411x_ad717x/common/ad411x_ad717x_asdz_qsys.tcl @@ -108,16 +108,16 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync -add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd -add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data -add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo -add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync +add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd +add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data +add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo +add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl -add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd -add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data -add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo -add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync +add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd +add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data +add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo +add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd add_connection spi_engine_offload_0.ctrl_sdo_wr axi_spi_engine_0.offload0_sdo diff --git a/projects/ad4170_asdz/common/ad4170_asdz_qsys.tcl b/projects/ad4170_asdz/common/ad4170_asdz_qsys.tcl index a3930001aec..a156b0a7b2d 100644 --- a/projects/ad4170_asdz/common/ad4170_asdz_qsys.tcl +++ b/projects/ad4170_asdz/common/ad4170_asdz_qsys.tcl @@ -108,15 +108,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync -add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd -add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data -add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo -add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync - -add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd -add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data -add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo -add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync +add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd +add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data +add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo +add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync + +add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd +add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data +add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo +add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd diff --git a/projects/ad469x_evb/common/ad469x_qsys.tcl b/projects/ad469x_evb/common/ad469x_qsys.tcl index 9f65c2bf607..87572337c6d 100644 --- a/projects/ad469x_evb/common/ad469x_qsys.tcl +++ b/projects/ad469x_evb/common/ad469x_qsys.tcl @@ -167,15 +167,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync -add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd -add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data -add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo -add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync - -add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd -add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data -add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo -add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync +add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd +add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data +add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo +add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync + +add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd +add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data +add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo +add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd diff --git a/projects/ad57xx_ardz/common/ad57xx_ardz_qsys.tcl b/projects/ad57xx_ardz/common/ad57xx_ardz_qsys.tcl index e19c5a53202..170d5c9e0a1 100644 --- a/projects/ad57xx_ardz/common/ad57xx_ardz_qsys.tcl +++ b/projects/ad57xx_ardz/common/ad57xx_ardz_qsys.tcl @@ -143,15 +143,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync -add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd -add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data -add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo -add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync - -add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd -add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data -add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo -add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync +add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd +add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data +add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo +add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync + +add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd +add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data +add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo +add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd diff --git a/projects/cn0540/common/cn0540_qsys.tcl b/projects/cn0540/common/cn0540_qsys.tcl index b1864195538..1eec853d626 100755 --- a/projects/cn0540/common/cn0540_qsys.tcl +++ b/projects/cn0540/common/cn0540_qsys.tcl @@ -87,15 +87,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync -add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd -add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data -add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo -add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync - -add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd -add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data -add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo -add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync +add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd +add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data +add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo +add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync + +add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd +add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data +add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo +add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd diff --git a/projects/cn0561/common/cn0561_qsys.tcl b/projects/cn0561/common/cn0561_qsys.tcl index d9776bf7872..7e245f9d810 100644 --- a/projects/cn0561/common/cn0561_qsys.tcl +++ b/projects/cn0561/common/cn0561_qsys.tcl @@ -144,15 +144,15 @@ add_connection spi_engine_execution_0.sdi_data spi_engine_interconnect_0.m_sdi add_connection spi_engine_interconnect_0.m_sdo spi_engine_execution_0.sdo_data add_connection spi_engine_execution_0.sync spi_engine_interconnect_0.m_sync -add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s0_cmd -add_connection spi_engine_interconnect_0.s0_sdi axi_spi_engine_0.sdi_data -add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s0_sdo -add_connection spi_engine_interconnect_0.s0_sync axi_spi_engine_0.sync - -add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s1_cmd -add_connection spi_engine_interconnect_0.s1_sdi spi_engine_offload_0.sdi_data -add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s1_sdo -add_connection spi_engine_interconnect_0.s1_sync spi_engine_offload_0.sync +add_connection axi_spi_engine_0.cmd spi_engine_interconnect_0.s1_cmd +add_connection spi_engine_interconnect_0.s1_sdi axi_spi_engine_0.sdi_data +add_connection axi_spi_engine_0.sdo_data spi_engine_interconnect_0.s1_sdo +add_connection spi_engine_interconnect_0.s1_sync axi_spi_engine_0.sync + +add_connection spi_engine_offload_0.cmd spi_engine_interconnect_0.s0_cmd +add_connection spi_engine_interconnect_0.s0_sdi spi_engine_offload_0.sdi_data +add_connection spi_engine_offload_0.sdo_data spi_engine_interconnect_0.s0_sdo +add_connection spi_engine_interconnect_0.s0_sync spi_engine_offload_0.sync add_connection spi_engine_offload_0.m_interconnect_ctrl spi_engine_interconnect_0.s_interconnect_ctrl add_connection spi_engine_offload_0.ctrl_cmd_wr axi_spi_engine_0.offload0_cmd