Rename RDL parameters

mtdudek · kgugala · commit 48cbce58b7ed · 2025-08-20T13:32:55.000+02:00
Signed-off-by: Maciej Dudek &lt;mdudek@antmicro.com&gt;
diff --git a/src/rdl/base_registers.rdl b/src/rdl/base_registers.rdl
@@ -8,10 +8,10 @@ regfile BaseRegs #(
     bit Data_endianness = 1'b0,
     boolean AUTOCMD_separated_reporting_dynamic = false,
     bit AUTOCMD_separated_reporting_support = 1'b0,
-    boolean DEV_ctx_SG_support = false,
+    boolean DEV_CTX_SG_support = false,
     boolean DEV_IBI_SG_support = false,
     boolean DEV_CR_SG_support = false,
-    bit CMD_size = 2'b0,
+    bit CMD_size_reset = 2'b0,
     boolean Scheduled_commands_support = false,
     boolean IBI_credit_count_support = false,
     boolean IBI_data_abort_support = false,
@@ -178,7 +178,7 @@ regfile BaseRegs #(
                 1 - controller supports scatter-gather";
             sw = r;
             hw = na;
-            reset = DEV_ctx_SG_support;
+            reset = DEV_CTX_SG_support;
         } SG_CAPABILITY_DC_EN[30:30];
         field {
             name = "SG_CAPABILITY_IBI_EN";
@@ -211,7 +211,7 @@ regfile BaseRegs #(
                 all other reserved.";
             sw = r;
             hw = na;
-            reset = CMD_size;
+            reset = CMD_size_reset;
         } CMD_SIZE[21:20];
         field {
             name = "SCHEDULED_COMMANDS_EN";
@@ -766,16 +766,16 @@ regfile BaseRegs #(
                 0 - continuous physical memory region,
 
                 1 - pointer to SG descriptor list.";
-            sw = DEV_ctx_SG_support ? rw : r;
-            hw = DEV_ctx_SG_support ? r : na;
+            sw = DEV_CTX_SG_support ? rw : r;
+            hw = DEV_CTX_SG_support ? r : na;
             reset = 1'b0;
         } BLP[31:31];
         // We don't support SG, so it always reads 0
         field {
             name = "LIST_SIZE";
             desc = "Number of SG entries.";
-            sw = DEV_ctx_SG_support ? rw : r;
-            hw = DEV_ctx_SG_support ? r : na;
+            sw = DEV_CTX_SG_support ? rw : r;
+            hw = DEV_CTX_SG_support ? r : na;
             reset = 16'h0;
         } LIST_SIZE[15:0];
     } DEV_CTX_SG @ 0x68;
diff --git a/src/rdl/ec_registers.rdl b/src/rdl/ec_registers.rdl
@@ -12,18 +12,18 @@ regfile ECRegisters #(
     bit tti_rx_fifo_size = 0x5, // 64 DWORDs by default
     bit tti_tx_fifo_size = 0x5, // 64 DWORDs by default
     bit tti_ibi_fifo_size = 0x5, // 64 DWORDs by default
-    bit pid_hi = 0x0,
-    bit pid_lo = 0x0,
-    bit virtual_pid_hi = 0x0,
-    bit virtual_pid_lo = 0x0
+    bit pid_hi_reset = 0x0,
+    bit pid_lo_reset = 0x0,
+    bit virtual_pid_hi_reset = 0x0,
+    bit virtual_pid_lo_reset = 0x0
 ){
     name = "Extended Capabilities";
     SecureFirmwareRecoveryInterfaceRegisters SecFwRecoveryIf @ 0x0;
     StandbyControllerModeRegisters #(
-        .pid_hi(pid_hi),
-        .pid_lo(pid_lo),
-        .virtual_pid_hi(virtual_pid_hi),
-        .virtual_pid_lo(virtual_pid_lo)
+        .pid_hi_reset(pid_hi_reset),
+        .pid_lo_reset(pid_lo_reset),
+        .virtual_pid_hi_reset(virtual_pid_hi_reset),
+        .virtual_pid_lo_reset(virtual_pid_lo_reset)
     ) StdbyCtrlMode;
     TargetTransactionInterfaceRegisters #(
         .rx_desc_fifo_size(tti_rx_desc_fifo_size),
diff --git a/src/rdl/registers.rdl b/src/rdl/registers.rdl
@@ -25,10 +25,10 @@ addrmap I3CCSR #(
     bit tti_rx_fifo_size = 0x5, // 64 DWORDs by default
     bit tti_tx_fifo_size = 0x5, // 64 DWORDs by default
     bit tti_ibi_fifo_size = 0x5, // 64 DWORDs by default
-    bit pid_hi = 0x7FFF, // Vendor-specific values
-    bit pid_lo = 0x005A00A5, // Vendor-specific values, test value
-    bit virtual_pid_hi = 0x7FFF, // Virtual device Vendor-specific values
-    bit virtual_pid_lo = 0x005A10A5 // Virtual device Vendor-specific values, test value
+    bit pid_hi_reset = 0x7FFF, // Vendor-specific values
+    bit pid_lo_reset = 0x005A00A5, // Vendor-specific values, test value
+    bit virtual_pid_hi_reset = 0x7FFF, // Virtual device Vendor-specific values
+    bit virtual_pid_lo_reset = 0x005A10A5 // Virtual device Vendor-specific values, test value
 ){
     signal {activelow; async; cpuif_reset; field_reset;} rst_ni;
     BaseRegs #(
@@ -42,7 +42,7 @@ addrmap I3CCSR #(
         // TODO: Update to correct values after implementation is done
         .AUTOCMD_separated_reporting_dynamic(false),
         .AUTOCMD_separated_reporting_support(1'b0),
-        .DEV_ctx_SG_support(false),
+        .DEV_CTX_SG_support(false),
         .DEV_IBI_SG_support(false),
         .DEV_CR_SG_support(false),
         .Scheduled_commands_support(false),
@@ -76,10 +76,10 @@ addrmap I3CCSR #(
         .tti_rx_fifo_size(tti_rx_fifo_size),
         .tti_tx_fifo_size(tti_tx_fifo_size),
         .tti_ibi_fifo_size(tti_ibi_fifo_size),
-        .pid_hi(pid_hi),
-        .pid_lo(pid_lo),
-        .virtual_pid_hi(virtual_pid_hi),
-        .virtual_pid_lo(virtual_pid_lo)
+        .pid_hi_reset(pid_hi_reset),
+        .pid_lo_reset(pid_lo_reset),
+        .virtual_pid_hi_reset(virtual_pid_hi_reset),
+        .virtual_pid_lo_reset(virtual_pid_lo_reset)
     ) I3C_EC @ EC_offset;
     mem {
         name = "Device Address Table";
diff --git a/src/rdl/standby_controller_mode.rdl b/src/rdl/standby_controller_mode.rdl
@@ -2,10 +2,10 @@
 
 
 regfile StandbyControllerModeRegisters#(
-    bit pid_hi,
-    bit pid_lo,
-    bit virtual_pid_hi,
-    bit virtual_pid_lo
+    bit pid_hi_reset,
+    bit pid_lo_reset,
+    bit virtual_pid_hi_reset,
+    bit virtual_pid_lo_reset
 ){
     name = "Standby Controller Mode";
     default regwidth = 32;
@@ -325,7 +325,7 @@ regfile StandbyControllerModeRegisters#(
             desc = "High part of the 48-bit Target Device Provisioned ID.";
             hw   = r;
             sw   = rw;
-            reset = virtual_pid_hi;
+            reset = virtual_pid_hi_reset;
         } PID_HI[15:1];
     } STBY_CR_VIRTUAL_DEVICE_CHAR;
     reg {
@@ -397,7 +397,7 @@ regfile StandbyControllerModeRegisters#(
             desc = "High part of the 48-bit Target Device Provisioned ID.";
             hw   = r;
             sw   = rw;
-            reset = pid_hi;
+            reset = pid_hi_reset;
         } PID_HI[15:1];
     } STBY_CR_DEVICE_CHAR;
     reg {
@@ -408,7 +408,7 @@ regfile StandbyControllerModeRegisters#(
             desc = "Low part of the 48-bit Target Device Provisioned ID.";
             hw   = r;
             sw   = rw;
-            reset = pid_lo;
+            reset = pid_lo_reset;
         } PID_LO[31:0];
     } STBY_CR_DEVICE_PID_LO;
     reg {
@@ -505,7 +505,7 @@ regfile StandbyControllerModeRegisters#(
             desc = "Low part of the 48-bit Target Virtual Device Provisioned ID.";
             hw   = r;
             sw   = rw;
-            reset = virtual_pid_lo;
+            reset = virtual_pid_lo_reset;
         } PID_LO[31:0];
     } STBY_CR_VIRTUAL_DEVICE_PID_LO;
     reg {
