CCC: Nack DIRECT_SETDASA if dynamic addr is set

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

Author: kgugala

src/ctrl/ccc.sv

@@ -464,6 +464,11 @@ module ccc
   assign is_byte_our_virtual_static_addr = ((command_addr == virtual_target_sta_address_i) && virtual_target_sta_address_valid_i);
   assign is_byte_virtual_addr = is_byte_our_virtual_dynamic_addr | is_byte_our_virtual_static_addr;
 
+  logic direct_addr_ack;
+
+  assign direct_addr_ack = (command_code == `I3C_DIRECT_SETDASA) ? ((is_byte_our_static_addr && ~target_dyn_address_valid_i) | (is_byte_our_virtual_static_addr && ~virtual_target_dyn_address_valid_i)) :
+                                                                 (is_byte_our_addr | is_byte_rsvd_addr | is_byte_virtual_addr);
+
   always_ff @(posedge clk_i or negedge rst_ni) begin : proc_addr
     if (~rst_ni) begin
       command_addr  <= '0;
@@ -573,12 +578,19 @@ module ccc
       end
       TxDirectAddrAck: begin
         if (bus_tx_done_i) begin
-          if (is_byte_rsvd_addr) state_d = NextCCC;
-          else if ((is_byte_our_addr || is_byte_virtual_addr) && command_rnw) state_d = TxData;
-          else if ((is_byte_our_addr || is_byte_virtual_addr) && ~command_rnw) begin
-            if (command_code == `I3C_DIRECT_SETXTIME) state_d = RxSubCmdByte;
+          if (command_code == `I3C_DIRECT_SETDASA) begin
+            if (is_byte_our_static_addr && target_dyn_address_valid_i) state_d = WaitForBusCond;
+            else if (is_byte_our_virtual_static_addr && virtual_target_dyn_address_valid_i) state_d = WaitForBusCond;
             else state_d = RxData;
-          end else state_d = WaitForBusCond;
+          end
+          else begin
+            if (is_byte_rsvd_addr) state_d = NextCCC;
+            else if ((is_byte_our_addr || is_byte_virtual_addr) && command_rnw) state_d = TxData;
+            else if ((is_byte_our_addr || is_byte_virtual_addr) && ~command_rnw) begin
+              if (command_code == `I3C_DIRECT_SETXTIME) state_d = RxSubCmdByte;
+              else state_d = RxData;
+            end else state_d = WaitForBusCond;
+          end
         end
       end
 
@@ -664,7 +676,7 @@ module ccc
       TxDirectAddrAck: begin
         ccc_tx_req_byte  = '0;
         ccc_tx_req_bit   = '1;
-        ccc_tx_req_value = {7'h00, ~(is_byte_our_addr | is_byte_rsvd_addr | is_byte_virtual_addr)};
+        ccc_tx_req_value = {7'h00, ~direct_addr_ack};
       end
       RxSubCmdByte: begin
       end

verification/cocotb/top/lib_i3c_top/test_ccc.py

@@ -129,6 +129,42 @@ async def test_ccc_setdasa(dut):
     assert virt_dynamic_address_valid == 1, "New VIRT DYNAMIC ADDRESS is not set as valid"
 
 
+@cocotb.test()
+async def test_ccc_setdasa_nack(dut):
+
+    STATIC_ADDR = 0x5A
+    VIRT_STATIC_ADDR = 0x5B
+    DYNAMIC_ADDR = 0x52
+    VIRT_DYNAMIC_ADDR = 0x53
+
+    i3c_controller, i3c_target, tb = await test_setup(dut)
+    # set regular device dynamic address
+    ack = await i3c_controller.i3c_ccc_write(
+        ccc=CCC.DIRECT.SETDASA, directed_data=[(STATIC_ADDR, [DYNAMIC_ADDR << 1])], stop=False
+    )
+    # check ACK
+    assert ack[0] == True
+
+    # try to send SETDASA again (should be NACKed)
+    ack = await i3c_controller.i3c_ccc_write(
+        ccc=CCC.DIRECT.SETDASA, directed_data=[(STATIC_ADDR, [DYNAMIC_ADDR << 1])], stop=False
+    )
+    assert ack[0] == False
+
+    # set virtual device dynamic address
+    ack = await i3c_controller.i3c_ccc_write(
+        ccc=CCC.DIRECT.SETDASA, directed_data=[(VIRT_STATIC_ADDR, [VIRT_DYNAMIC_ADDR << 1])]
+    )
+    # check ACK
+    assert ack[0] == True
+
+    # try to send SETDASA again (should be NACKed)
+    ack = await i3c_controller.i3c_ccc_write(
+        ccc=CCC.DIRECT.SETDASA, directed_data=[(VIRT_STATIC_ADDR, [VIRT_DYNAMIC_ADDR << 1])]
+    )
+    assert ack[0] == False
+
+
 @cocotb.test()
 async def test_ccc_setnewda(dut):