TCL: ad_hpmx_interconnect

[liambeguin]

PR Description

Some custom projects might rely on other PS AXI master interfaces, rework ad_cpu_interconnect to allow users to specify other interfaces.

For now, I was only able to test this on a zynqmp project, and don't have the full list of interfaces for other platforms, but I'm happy to update the PR.

PR Type

• Bug fix (change that fixes an issue)
• New feature (change that adds new functionality)
• Breaking change (has dependencies in other repos or will cause CI to fail)

PR Checklist

• I have followed the code style guidelines
• I have performed a self-review of changes
• I have compiled all hdl projects and libraries affected by this PR
• I have tested in hardware affected projects, at least on relevant boards
• I have commented my code, at least hard-to-understand parts
• I have signed off all commits from this PR
• I have updated the documentation (wiki pages, ReadMe files, Copyright etc)
• I have not introduced new Warnings/Critical Warnings on compilation
• I have added new hdl testbenches or updated existing ones

[CLAassistant]

All committers have signed the CLA.

[gastmaier]

Perhaps nest

} elseif {$sys_zynq == 2} {
  if {$p_sel eq "HPM0_FPD"} {
    (...)
  }
  (...)
}

[liambeguin]

Thanks for reviewing!

I went with a single line to stay consistent with ad_mem_hpx_interconnect.
I feel like it's also a bit more readable when we end up having other sys_zynq values.

[liambeguin]

Hi @gastmaier, what do you think of this version?
I got rid of all the indexes, and cleanup a few other minor things. I also tested these changes on a zynq-7000 build.

[gastmaier]

Hi Liam, I liked the changes.
I plan to merge #1054 first since it changes the same file, then yours.
In the next step I will be building your branch on the CI to check if there is no conflict with any project, even though it is extremely unlikely since the index is always 0 and the defaults for the ad_cpu_interconnect didn't change.

Thanks,

[liambeguin]

rebased on the lastest branch that includes changes from #1054.

summary of the changes:

$ git range-diff origin/main lvb/ad_hpmx_interconnect ad_hpmx_interconnect 
1:  61c64f6497a0 ! 1:  afee12284523 adi_board: add support for other AXI master interfaces
    @@ projects/scripts/adi_board.tcl: proc ad_mem_hpx_interconnect {p_sel p_clk p_name
      
        global sys_zynq
     -  global sys_cpu_interconnect_index
    +   global use_smartconnect
      
     -  set i_str "M$sys_cpu_interconnect_index"
     -  if {$sys_cpu_interconnect_index < 10} {
    @@ projects/scripts/adi_board.tcl: proc ad_mem_hpx_interconnect {p_sel p_clk p_name
        }
     +  set i_str [format "M%02d" $interconnect_index]
      
    -   set use_smart_connect 1
    -   # SmartConnect has higher resource utilization and worse timing closure on older families
    -@@ projects/scripts/adi_board.tcl: proc ad_cpu_interconnect {p_address p_name {p_intf_name {}}} {
    -     set use_smart_connect 0
    -   }
    - 
     -  if {$sys_cpu_interconnect_index == 0} {
     +  if {$i_str eq "M00"} {
      
    -     if {$use_smart_connect == 1} {
    +     if {$use_smartconnect == 1} {
     -      ad_ip_instance smartconnect axi_cpu_interconnect [ list \
     +      ad_ip_instance smartconnect $interconnect_name [ list \
              NUM_MI 1 \
    @@ projects/scripts/adi_board.tcl: proc ad_cpu_interconnect {p_address p_name {p_in
     -  set_property CONFIG.NUM_MI $sys_cpu_interconnect_index [get_bd_cells axi_cpu_interconnect]
     +  set_property CONFIG.NUM_MI $interconnect_index [get_bd_cells $interconnect_name]
      
    -   if {$use_smart_connect == 0} {
    +   if {$use_smartconnect == 0} {
     -    ad_connect sys_cpu_clk axi_cpu_interconnect/${i_str}_ACLK
     -    ad_connect sys_cpu_resetn axi_cpu_interconnect/${i_str}_ARESETN
     +    ad_connect sys_cpu_clk $interconnect_name/${i_str}_ACLK
2:  81db033ae062 = 2:  cfeb879e32bc adi_board: ad_hpmx_interconnect: add create_bd_addr_seg logs

[gastmaier]

@bia1708 can we trigger the CI on this one? preferably for all projects

[bia1708]

@gastmaier Unfortunately, I can only trigger the CIs for branches inside the analogdevicesinc repo, and not from forks.

[gastmaier]

Propagate approval from CI PR #1416