Make recovery mode enable/disable dependent entirely on target address of a transfer

Internal-tag: [#72196]
Signed-off-by: Maciej Kurc <[email protected]>

Author: mkurc-ant

src/ctrl/controller.sv

@@ -239,8 +239,9 @@ module controller
 
     output logic err_o,
     input  logic recovery_mode_enter_i,
-    output logic virtual_device_tx_o,
-    input  logic virtual_device_tx_done_i
+    output logic virtual_device_sel_o,
+    input  logic virtual_device_rdy_i,
+    output logic xfer_in_progress_o
 );
 
   logic phy_en;
@@ -565,9 +566,9 @@ module controller
       .peripheral_reset_done_i,
       .escalated_reset_o,
       .recovery_mode_enter_i(recovery_mode_enter_i),
-      .virtual_device_tx_o(virtual_device_tx_o),
-      .virtual_device_tx_done_i(virtual_device_tx_done_i),
-      .recovery_mode_i(recovery_mode)
+      .virtual_device_sel_o(virtual_device_sel_o),
+      .virtual_device_rdy_i(virtual_device_rdy_i),
+      .xfer_in_progress_o(xfer_in_progress_o)
   );
 
 endmodule

src/ctrl/controller_standby.sv

@@ -170,9 +170,9 @@ module controller_standby
 
     output logic err_o,
     input  logic recovery_mode_enter_i,
-    output logic virtual_device_tx_o,
-    input  logic virtual_device_tx_done_i,
-    input  logic recovery_mode_i
+    output logic virtual_device_sel_o,
+    input  logic virtual_device_rdy_i,
+    output logic xfer_in_progress_o
 );
 
   logic sel_i2c_i3c;  // i2c = 0; i3c = 1;
@@ -421,9 +421,9 @@ module controller_standby
       .peripheral_reset_done_i,
       .escalated_reset_o,
       .recovery_mode_enter_i(recovery_mode_enter_i),
-      .virtual_device_tx_o(virtual_device_tx_o),
-      .virtual_device_tx_done_i(virtual_device_tx_done_i),
-      .recovery_mode_i(recovery_mode_i)
+      .virtual_device_sel_o(virtual_device_sel_o),
+      .virtual_device_rdy_i(virtual_device_rdy_i),
+      .xfer_in_progress_o(xfer_in_progress_o)
   );
 
   always_comb begin

src/ctrl/controller_standby_i3c.sv

@@ -125,9 +125,9 @@ module controller_standby_i3c
 
     // recovery mode
     input  logic recovery_mode_enter_i,
-    output logic virtual_device_tx_o,
-    input  logic virtual_device_tx_done_i,
-    input  logic recovery_mode_i
+    output logic virtual_device_sel_o,
+    input  logic virtual_device_rdy_i,
+    output logic xfer_in_progress_o
 );
   logic i3c_standby_en;
   assign i3c_standby_en = i3c_standby_en_i;
@@ -456,9 +456,9 @@ module controller_standby_i3c
       .sda_posedge_i              (ctrl_bus_i.sda.pos_edge),
       .parity_err_o,
       .rx_overflow_err_o          (rx_overflow_err),
-      .virtual_device_tx_o        (virtual_device_tx_o),
-      .virtual_device_tx_done_i   (virtual_device_tx_done_i),
-      .recovery_mode_i            (recovery_mode_i)
+      .virtual_device_sel_o       (virtual_device_sel_o),
+      .virtual_device_rdy_i       (virtual_device_rdy_i),
+      .xfer_in_progress_o         (xfer_in_progress_o)
   );
 
   ccc xccc (

src/ctrl/i3c_target_fsm.sv

@@ -122,9 +122,9 @@ module i3c_target_fsm #(
 
     output logic parity_err_o,
     output logic rx_overflow_err_o,
-    output logic virtual_device_tx_o,
-    input  logic virtual_device_tx_done_i,
-    input  logic recovery_mode_i,
+    output logic virtual_device_sel_o,
+    input  logic virtual_device_rdy_i,
+    output logic xfer_in_progress_o,
 
     output logic tx_pr_start_o,
     output logic tx_pr_abort_o
@@ -235,13 +235,15 @@ module i3c_target_fsm #(
   logic bus_rnw_d, bus_rnw_q;
   logic [6:0] bus_addr_d, bus_addr_q;
   logic is_our_addr_match, is_rsvd_byte_match, is_virtual_addr_match;
-  assign is_our_addr_match = recovery_mode_i ? 1'b0 :
-                             target_dyn_address_valid_i ? (target_dyn_address_i == bus_addr_q) :
+
+  assign is_our_addr_match = target_dyn_address_valid_i ? (target_dyn_address_i == bus_addr_q) :
                              target_sta_address_valid_i ? (target_sta_address_i == bus_addr_q) :
                              1'b0;
+
   assign is_virtual_addr_match = virtual_target_dyn_address_valid_i ? (virtual_target_dyn_address_i == bus_addr_q) :
-                             virtual_target_sta_address_valid_i ? (virtual_target_sta_address_i == bus_addr_q) :
-                             1'b0;
+                                 virtual_target_sta_address_valid_i ? (virtual_target_sta_address_i == bus_addr_q) :
+                                 1'b0;
+
   assign is_rsvd_byte_match = ({bus_addr_q, bus_rnw_q} == 8'hFC);
 
   always_ff @(posedge clk_i or negedge rst_ni) begin : update_bus_addr_matcher
@@ -580,15 +582,36 @@ module i3c_target_fsm #(
 
   assign target_idle_o = (state_q == Idle);
 
-  always_ff @(posedge clk_i or negedge rst_ni) begin : virtual_device_tx_latch
+  always_ff @(posedge clk_i or negedge rst_ni) begin : virtual_device_sel_latch
     if (!rst_ni) begin
-      virtual_device_tx_o <= 1'b0;
-    end else begin
-      if ((state_q == TxAckSByte) && is_virtual_addr_match) begin
-        virtual_device_tx_o <= 1'b1;
-      end else if (state_q == Idle) virtual_device_tx_o <= 1'b0;
-    end
+      virtual_device_sel_o <= '0;
+    end else unique case(state_q)
+      CheckFByte:
+        if (!is_rsvd_byte_match && virtual_device_sel_o != is_virtual_addr_match)
+            virtual_device_sel_o <= is_virtual_addr_match;
+      CheckSByte:
+        if (!is_rsvd_byte_match && virtual_device_sel_o != is_virtual_addr_match)
+            virtual_device_sel_o <= is_virtual_addr_match;
+      default:
+        virtual_device_sel_o <= virtual_device_sel_o;
+    endcase
   end
+
+  always_ff @(posedge clk_i or negedge rst_ni) begin
+    if (!rst_ni) begin
+      xfer_in_progress_o <= '0;
+    end else unique case(state_q)
+      Idle:
+        xfer_in_progress_o <= '0;
+      CheckFByte:
+        xfer_in_progress_o <= (is_our_addr_match || is_virtual_addr_match);
+      CheckSByte:
+        xfer_in_progress_o <= (is_our_addr_match || is_virtual_addr_match);
+      default:
+        xfer_in_progress_o <= xfer_in_progress_o;
+    endcase
+  end
+
   // TODO: Also sub FSM should contribute
   // TODO: Maybe we can do it based on write module rather than states
   assign target_transmitting_o =

src/i3c.sv

@@ -506,8 +506,9 @@ module i3c
 
   logic recovery_mode_enter;
   logic recovery_mode_enabled;
-  logic virtual_device_tx;
-  logic virtual_device_tx_done;
+  logic virtual_device_sel;
+  logic virtual_device_rdy;
+  logic xfer_in_progress;
 
   // HCI
   I3CCSR_pkg::I3CCSR__I3C_EC__TTI__out_t             hwif_tti_out;
@@ -695,8 +696,9 @@ module i3c
 
       .err_o(controller_error),
       .recovery_mode_enter_i(recovery_mode_enter),
-      .virtual_device_tx_o(virtual_device_tx),
-      .virtual_device_tx_done_i(virtual_device_tx_done)
+      .virtual_device_sel_o(virtual_device_sel),
+      .virtual_device_rdy_i(virtual_device_rdy),
+      .xfer_in_progress_o(xfer_in_progress)
   );
 
   // HCI
@@ -1104,8 +1106,8 @@ module i3c
       .ctl_bus_addr_valid_i(rx_bus_addr_valid),
       .recovery_mode_enter_o(recovery_mode_enter),
       .recovery_mode_enabled_o(recovery_mode_enabled),
-      .virtual_device_tx_i(virtual_device_tx),
-      .virtual_device_tx_done_o(virtual_device_tx_done)
+      .virtual_device_sel_i(virtual_device_sel),
+      .xfer_in_progress_i(xfer_in_progress)
   );
 
   // I3C PHY

src/recovery/recovery_executor.sv

@@ -61,6 +61,7 @@ module recovery_executor
     output logic indirect_rx_clr_o,
 
     // Others
+    output logic pending_o,
     input logic host_abort_i,
 
     // queues clr signals
@@ -77,9 +78,7 @@ module recovery_executor
     input  I3CCSR_pkg::I3CCSR__I3C_EC__SecFwRecoveryIf__out_t hwif_rec_i,
     output I3CCSR_pkg::I3CCSR__I3C_EC__SecFwRecoveryIf__in_t  hwif_rec_o,
 
-    // virtual device interface
-    input  logic virtual_device_tx_i,
-    output logic virtual_device_tx_done_o,
+    // Recovery mode enabled via a CSR
     input  recovery_mode_enabled_i
 );
 
@@ -220,19 +219,6 @@ module recovery_executor
 
   // ....................................................
 
-  // Queue flush
-  logic flush_queues;
-
-  always_ff @(posedge clk_i or negedge rst_ni)
-    if (!rst_ni) flush_queues <= 1'b0;
-    else begin
-        unique case (state_q)
-          Idle:
-          if (cmd_valid_i) flush_queues <= 1'b1;
-          default: flush_queues <= 1'b0;
-        endcase
-    end
-
   // Data counter
   assign dcnt_next = (|cmd_len_i[1:0]) ? (cmd_len_i / 4 + 1) : (cmd_len_i / 4);  // Divide by 4, round up
 
@@ -397,7 +383,6 @@ module recovery_executor
 
   // Update status on command done
   assign status_protocol_we = (state_q == Done);
-  assign virtual_device_tx_done_o = (state_q == Done) & virtual_device_tx_i;
 
   // ....................................................
 
@@ -496,8 +481,8 @@ module recovery_executor
   assign tti_rx_sel_o = 1'b1;
   assign rx_data_queue_clr_o = (state_q == Error);
   assign rx_desc_queue_clr_o = (state_q == Error);
-  assign tx_data_queue_clr_o = (state_q == Error) | flush_queues;
-  assign tx_desc_queue_clr_o = (state_q == Error) | flush_queues;
+  assign tx_data_queue_clr_o = '0;
+  assign tx_desc_queue_clr_o = '0;
 
   // RX TTI FIFO data request
   always_ff @(posedge clk_i)