From 56382874139f424f256ad819f856ac75f9afab1f Mon Sep 17 00:00:00 2001
From: Alex Forencich <alex@alexforencich.com>
Date: Wed, 7 Jun 2023 11:09:33 -0700
Subject: [PATCH] fpga/mqnic: Fix P-tile parameter names

Signed-off-by: Alex Forencich <alex@alexforencich.com>
---
 fpga/mqnic/DE10_Agilex/fpga_100g/fpga/config.tcl          | 8 ++++----
 fpga/mqnic/DE10_Agilex/fpga_100g/fpga_24AR0/config.tcl    | 8 ++++----
 .../DE10_Agilex/fpga_100g/fpga_app_dma_bench/config.tcl   | 8 ++++----
 .../fpga_100g/fpga_app_dma_bench_24AR0/config.tcl         | 8 ++++----
 fpga/mqnic/DE10_Agilex/fpga_25g/fpga/config.tcl           | 8 ++++----
 fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g/config.tcl       | 8 ++++----
 fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g_24AR0/config.tcl | 8 ++++----
 fpga/mqnic/DE10_Agilex/fpga_25g/fpga_24AR0/config.tcl     | 8 ++++----
 fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga/config.tcl      | 8 ++++----
 .../fpga_100g/fpga_app_dma_bench/config.tcl               | 8 ++++----
 fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga/config.tcl       | 8 ++++----
 fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga_10g/config.tcl   | 8 ++++----
 fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga/config.tcl      | 8 ++++----
 .../mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_24AR0/config.tcl | 8 ++++----
 .../fpga_100g/fpga_app_dma_bench/config.tcl               | 8 ++++----
 .../fpga_100g/fpga_app_dma_bench_24AR0/config.tcl         | 8 ++++----
 fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga/config.tcl       | 8 ++++----
 fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g/config.tcl   | 8 ++++----
 .../DK_DEV_AGF014EA/fpga_25g/fpga_10g_24AR0/config.tcl    | 8 ++++----
 fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_24AR0/config.tcl | 8 ++++----
 20 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga/config.tcl
index 42433e5f7..f48aeb56f 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_24AR0/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_24AR0/config.tcl
index c0bbdeb6c..dcffabe42 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_24AR0/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_24AR0/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench/config.tcl
index 0e552ee40..b4cdec324 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl
index 921b45b6d..0cdd9fd72 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga/config.tcl
index df8bd6996..c53ed9b9b 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g/config.tcl
index 1397dc21a..f00a8a2e4 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g_24AR0/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g_24AR0/config.tcl
index 7c83bfedb..a4a656be0 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g_24AR0/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_10g_24AR0/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_24AR0/config.tcl b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_24AR0/config.tcl
index 2017e1939..7f53a86f0 100644
--- a/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_24AR0/config.tcl
+++ b/fpga/mqnic/DE10_Agilex/fpga_25g/fpga_24AR0/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga/config.tcl b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga/config.tcl
index 9538abb4e..b326ae4f7 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga/config.tcl
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_app_dma_bench/config.tcl b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_app_dma_bench/config.tcl
index 6552601ae..2cd47cb2e 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_app_dma_bench/config.tcl
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_100g/fpga_app_dma_bench/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga/config.tcl b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga/config.tcl
index ca59edd8f..101c365c0 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga/config.tcl
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga_10g/config.tcl b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga_10g/config.tcl
index fd020ccd6..5afde62f6 100644
--- a/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga_10g/config.tcl
+++ b/fpga/mqnic/DK_DEV_1SDX_P_A/fpga_25g/fpga_10g/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga/config.tcl
index 0c9fb8b99..a7e77133d 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_24AR0/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_24AR0/config.tcl
index 5805c9bb8..fa4a61ab9 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_24AR0/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_24AR0/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench/config.tcl
index afc294ad4..37e7f7068 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl
index 09614c360..fc07c02a2 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_100g/fpga_app_dma_bench_24AR0/config.tcl
@@ -204,15 +204,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga/config.tcl
index 9e41f675d..594b017ed 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g/config.tcl
index d18213283..41aa4d605 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g_24AR0/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g_24AR0/config.tcl
index 0ee98bcd7..f906e6535 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g_24AR0/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_10g_24AR0/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)
diff --git a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_24AR0/config.tcl b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_24AR0/config.tcl
index df190bfe7..94aa01903 100644
--- a/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_24AR0/config.tcl
+++ b/fpga/mqnic/DK_DEV_AGF014EA/fpga_25g/fpga_24AR0/config.tcl
@@ -206,15 +206,15 @@ proc configure_bar {fp pcie core pf bar aperture} {
     if {$aperture > 0} {
         puts "PF${pf} BAR${bar}: aperture ${aperture} bits"
 
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {${aperture}}"
-        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {64-bit prefetchable memory}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {${aperture}}"
+        puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {64-bit prefetchable memory}"
 
         return
     }
     puts "PF${pf} BAR${bar}: disabled"
 
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_hwtcl} {0}"
-    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_hwtcl} {Disabled}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_address_width_user_hwtcl} {0}"
+    puts $fp "set_instance_parameter_value ${pcie} {${core}_pf${pf}_bar${bar}_type_user_hwtcl} {Disabled}"
 }
 
 # Control BAR (BAR 0)