CCC: ignore BCAST_SETAASA if address is set, set addresses to both targets

Signed-off-by: Karol Gugala <[email protected]>

Author: kgugala

src/ctrl/ccc.sv

@@ -194,6 +194,8 @@ module ccc
     output logic [6:0] set_dasa_o,
     output logic set_dasa_valid_o,
     output logic set_dasa_virtual_device_o,
+    output logic set_aasa_o,
+    output logic set_aasa_virt_o,
 
     // Target Reset Action
     // I3C_BCAST_RSTACT
@@ -321,7 +323,7 @@ module ccc
   logic       set_dasa_valid;
   logic [6:0] set_dasa_addr;
   logic       set_aasa_valid;
-  logic [6:0] set_aasa_addr;
+  logic       set_aasa_virt_valid;
 
   logic       set_newda_valid;
   logic [6:0] set_newda_addr;
@@ -789,12 +791,11 @@ module ccc
     endcase
   end
 
-  // Connect dynamic address setter mux
-  always_comb begin : dyn_addr_set_mux
-    set_dasa_valid_o = set_aasa_valid ? set_aasa_valid : set_dasa_valid;
-    set_dasa_o = set_aasa_valid ? set_aasa_addr : set_dasa_addr;
-    set_dasa_virtual_device_o = is_byte_virtual_addr ? (set_aasa_valid ? set_aasa_valid : set_dasa_valid) : 1'b0;
-  end
+  assign set_dasa_valid_o = set_dasa_valid;
+  assign set_dasa_o = set_dasa_addr;
+  assign set_dasa_virtual_device_o = is_byte_virtual_addr ? set_dasa_valid : 1'b0;
+  assign set_aasa_o = set_aasa_valid;
+  assign set_aasa_virt_o = set_aasa_virt_valid;
 
   // connect entdaa/setnewda
   always_comb begin: entdaa_setnewda_mux
@@ -939,8 +940,8 @@ module ccc
   always_ff @(posedge clk_i or negedge rst_ni) begin : bcast_ccc
     if (~rst_ni) begin
       rstdaa_o <= '0;
-      set_aasa_addr <= '0;
       set_aasa_valid <= 1'b0;
+      set_aasa_virt_valid <= 1'b0;
     end else begin
       case (command_code)
         `I3C_BCAST_RSTDAA: begin
@@ -955,10 +956,15 @@ module ccc
         // be set
         `I3C_BCAST_SETAASA: begin
           if (state_q == RxTbit && bus_rx_done_i) begin
-            set_aasa_addr  <= target_sta_address_i;
-            set_aasa_valid <= 1'b1;
+            if (~target_dyn_address_valid_i) begin
+                set_aasa_valid <= 1'b1;
+              end
+              if (~virtual_target_dyn_address_valid_i) begin
+                set_aasa_virt_valid <= 1'b1;
+              end
           end else begin
             set_aasa_valid <= 1'b0;
+            set_aasa_virt_valid <= 1'b0;
           end
         end
         default: begin

src/ctrl/controller.sv

@@ -224,6 +224,8 @@ module controller
     output logic [6:0] set_dasa_o,
     output logic       set_dasa_valid_o,
     output logic       set_dasa_virtual_device_o,
+    output logic       set_aasa_o,
+    output logic       set_aasa_virt_o,
     output logic       set_newda_o,
     output logic       set_newda_virtual_device_o,
     output logic [6:0] newda_o,
@@ -559,6 +561,8 @@ module controller
       .set_dasa_o(set_dasa_o),
       .set_dasa_valid_o(set_dasa_valid_o),
       .set_dasa_virtual_device_o(set_dasa_virtual_device_o),
+      .set_aasa_o(set_aasa_o),
+      .set_aasa_virt_o(set_aasa_virt_o),
       .rstdaa_o(rstdaa_o),
       .set_newda_o,
       .set_newda_virtual_device_o,

src/ctrl/controller_standby.sv

@@ -147,6 +147,8 @@ module controller_standby
     output logic [6:0] set_dasa_o,
     output logic set_dasa_valid_o,
     output logic set_dasa_virtual_device_o,
+    output logic set_aasa_o,
+    output logic set_aasa_virt_o,
     output logic set_newda_o,
     output logic set_newda_virtual_device_o,
     output logic [6:0] newda_o,
@@ -453,6 +455,8 @@ module controller_standby
       .set_dasa_o(set_dasa_o),
       .set_dasa_valid_o(set_dasa_valid_o),
       .set_dasa_virtual_device_o(set_dasa_virtual_device_o),
+      .set_aasa_o(set_aasa_o),
+      .set_aasa_virt_o(set_aasa_virt_o),
       .set_newda_o,
       .set_newda_virtual_device_o,
       .newda_o,

src/ctrl/controller_standby_i3c.sv

@@ -102,6 +102,8 @@ module controller_standby_i3c
     output logic [6:0] set_dasa_o,
     output logic set_dasa_valid_o,
     output logic set_dasa_virtual_device_o,
+    output logic set_aasa_o,
+    output logic set_aasa_virt_o,
     output logic set_newda_o,
     output logic set_newda_virtual_device_o,
     output logic [6:0] newda_o,
@@ -528,6 +530,8 @@ module controller_standby_i3c
       .set_dasa_o                (set_dasa_o),
       .set_dasa_valid_o          (set_dasa_valid_o),
       .set_dasa_virtual_device_o (set_dasa_virtual_device_o),
+      .set_aasa_o                (set_aasa_o),
+      .set_aasa_virt_o           (set_aasa_virt_o),
       .rst_action_o,
       .rst_action_valid_o,
       .set_newda_o,

src/hci/hci.sv

@@ -142,6 +142,8 @@ module hci
     input logic [6:0] set_dasa_i,
     input logic       set_dasa_valid_i,
     input logic       set_dasa_virtual_device_i,
+    input logic       set_aasa_i,
+    input logic       set_aasa_virt_i,
     input logic       rstdaa_i,
     input logic [6:0] newda_i,
     input logic       set_newda_i,
@@ -330,6 +332,16 @@ module hci
       hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR_VALID.next = 1'b1;
       hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR.we = set_newda_i && set_newda_virtual_device_i;
       hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR.next = newda_i;
+    end else if (set_aasa_i | set_aasa_virt_i) begin
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR_VALID.we = set_aasa_i;
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR_VALID.next = 1'b1;
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR.we = set_aasa_i;
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR.next = hwif_out_o.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_ADDR.STATIC_ADDR.value;
+      // Virtual device address
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR_VALID.we = set_aasa_virt_i;
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR_VALID.next = 1'b1;
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR.we = set_aasa_virt_i;
+      hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR.next = hwif_out_o.I3C_EC.StdbyCtrlMode.STBY_CR_VIRT_DEVICE_ADDR.VIRT_STATIC_ADDR.value;
     end else begin
       hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR_VALID.we = 1'b0;
       hwif_in.I3C_EC.StdbyCtrlMode.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR_VALID.next = '0;

src/i3c.sv

@@ -510,6 +510,8 @@ module i3c
   logic [6:0] set_dasa;
   logic set_dasa_valid;
   logic set_dasa_virtual_device;
+  logic set_aasa;
+  logic set_aasa_virt;
   logic set_newda;
   logic set_newda_virtual_device;
   logic [6:0] newda;
@@ -722,6 +724,8 @@ module i3c
       .set_dasa_o(set_dasa),
       .set_dasa_valid_o(set_dasa_valid),
       .set_dasa_virtual_device_o(set_dasa_virtual_device),
+      .set_aasa_o(set_aasa),
+      .set_aasa_virt_o(set_aasa_virt),
       .rstdaa_o(rstdaa),
       .set_newda_o(set_newda),
       .set_newda_virtual_device_o(set_newda_virtual_device),
@@ -865,6 +869,8 @@ module i3c
       .set_dasa_i(set_dasa),
       .set_dasa_valid_i(set_dasa_valid),
       .set_dasa_virtual_device_i(set_dasa_virtual_device),
+      .set_aasa_i(set_aasa),
+      .set_aasa_virt_i(set_aasa_virt),
       .rstdaa_i(rstdaa),
       .set_newda_i(set_newda),
       .set_newda_virtual_device_i(set_newda_virtual_device),

verification/cocotb/top/lib_i3c_top/test_ccc.py

@@ -345,12 +345,25 @@ async def test_ccc_getmrl(dut):
 async def test_ccc_setaasa(dut):
 
     STATIC_ADDR = 0x5A
+    VIRT_STATIC_ADDR = 0x5B
     I3C_BCAST_SETAASA = 0x29
     i3c_controller, i3c_target, tb = await test_setup(dut)
     await ClockCycles(tb.clk, 50)
     dynamic_address_reg_addr = tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_DEVICE_ADDR.base_addr
-    dynamic_address_reg_value = tb.reg_map.I3CBASE.CONTROLLER_DEVICE_ADDR.DYNAMIC_ADDR
-    dynamic_address_reg_valid = tb.reg_map.I3CBASE.CONTROLLER_DEVICE_ADDR.DYNAMIC_ADDR_VALID
+    dynamic_address_reg_value = tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR
+    dynamic_address_reg_valid = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR_VALID
+    )
+    virtual_dynamic_address_reg_addr = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_VIRT_DEVICE_ADDR.base_addr
+    )
+    virtual_dynamic_address_reg_value = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR
+    )
+    virtual_dynamic_address_reg_valid = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR_VALID
+    )
+
 
     # reset Dynamic Address
     await i3c_controller.i3c_ccc_write(ccc=I3C_BCAST_SETAASA)
@@ -362,6 +375,65 @@ async def test_ccc_setaasa(dut):
     )
     assert dynamic_address == STATIC_ADDR, "Unexpected DYNAMIC ADDRESS read from the CSR"
     assert dynamic_address_valid == 1, "New DYNAMIC ADDRESS is not set as valid"
+    virt_dynamic_address = await tb.read_csr_field(
+        virtual_dynamic_address_reg_addr, virtual_dynamic_address_reg_value
+    )
+    virt_dynamic_address_valid = await tb.read_csr_field(
+        virtual_dynamic_address_reg_addr, virtual_dynamic_address_reg_valid
+    )
+    assert virt_dynamic_address == VIRT_STATIC_ADDR, "Unexpected VIRT DYNAMIC ADDRESS read from the CSR"
+    assert virt_dynamic_address_valid == 1, "New VIRT DYNAMIC ADDRESS is not set as valid"
+
+
+@cocotb.test()
+async def test_ccc_setaasa_ignore(dut):
+
+    STATIC_ADDR = 0x5A
+    VIRT_STATIC_ADDR = 0x5B
+    DYNAMIC_ADDR = 0x3A
+    VIRT_DYNAMIC_ADDR = 0x3B
+    I3C_BCAST_SETAASA = 0x29
+
+    i3c_controller, i3c_target, tb = await test_setup(dut)
+    dynamic_address_reg_addr = tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_DEVICE_ADDR.base_addr
+    dynamic_address_reg_value = tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR
+    dynamic_address_reg_valid = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_DEVICE_ADDR.DYNAMIC_ADDR_VALID
+    )
+    virtual_dynamic_address_reg_addr = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_VIRT_DEVICE_ADDR.base_addr
+    )
+    virtual_dynamic_address_reg_value = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR
+    )
+    virtual_dynamic_address_reg_valid = (
+        tb.reg_map.I3C_EC.STDBYCTRLMODE.STBY_CR_VIRT_DEVICE_ADDR.VIRT_DYNAMIC_ADDR_VALID
+    )
+    # set dynamic address CSRs
+    await tb.write_csr_field(dynamic_address_reg_addr, dynamic_address_reg_value, DYNAMIC_ADDR)
+    await tb.write_csr_field(dynamic_address_reg_addr, dynamic_address_reg_valid, 1)
+    await tb.write_csr_field(virtual_dynamic_address_reg_addr, virtual_dynamic_address_reg_value, VIRT_DYNAMIC_ADDR)
+    await tb.write_csr_field(virtual_dynamic_address_reg_addr, virtual_dynamic_address_reg_valid, 1)
+
+    # Send SETAASA
+    await i3c_controller.i3c_ccc_write(ccc=I3C_BCAST_SETAASA)
+
+    # check if the address was not changed
+    dynamic_address = await tb.read_csr_field(dynamic_address_reg_addr, dynamic_address_reg_value)
+    dynamic_address_valid = await tb.read_csr_field(
+        dynamic_address_reg_addr, dynamic_address_reg_valid
+    )
+    assert dynamic_address == DYNAMIC_ADDR, "Unexpected DYNAMIC ADDRESS read from the CSR"
+    assert dynamic_address_valid == 1, "New DYNAMIC ADDRESS is not set as valid"
+
+    virt_dynamic_address = await tb.read_csr_field(
+        virtual_dynamic_address_reg_addr, virtual_dynamic_address_reg_value
+    )
+    virt_dynamic_address_valid = await tb.read_csr_field(
+        virtual_dynamic_address_reg_addr, virtual_dynamic_address_reg_valid
+    )
+    assert virt_dynamic_address == VIRT_DYNAMIC_ADDR, "Unexpected VIRT DYNAMIC ADDRESS read from the CSR"
+    assert virt_dynamic_address_valid == 1, "New VIRT DYNAMIC ADDRESS is not set as valid"
 
 
 @cocotb.test()