entdaa fsm

Author: kgugala

src/ctrl/ccc.sv

@@ -91,7 +91,6 @@ module ccc
     input logic rst_ni, // Async reset, active low
     input logic [47:0] id_i,
 
-    input logic arbitration_lost_i,
     // CC is decoded from the frame by the primary FSM
     input logic [7:0] ccc_i,
     // Assert valid when you want to give control to this FSM
@@ -339,13 +338,13 @@ module ccc
   // Mux TX access between regular CCC and ENTDAA
   logic entdaa_tx_req_bit;
   logic entdaa_tx_req_byte;
-  logic entdaa_tx_req_value;
+  logic [7:0] entdaa_tx_req_value;
   logic entdaa_tx_sel_od_pp;
   logic entdaa_rx_req_bit;
   logic entdaa_rx_req_byte;
   logic ccc_tx_req_bit;
   logic ccc_tx_req_byte;
-  logic ccc_tx_req_value;
+  logic [7:0] ccc_tx_req_value;
   logic ccc_tx_sel_od_pp;
   logic ccc_rx_req_bit;
   logic ccc_rx_req_byte;
@@ -967,7 +966,6 @@ module ccc
   assign entas1_o = '0;
   assign entas2_o = '0;
   assign entas3_o = '0;
-  assign entdaa_o = '0;
   assign ent_tm_o = '0;
   assign tm_o = '0;
   assign ent_hdr_0_o = '0;
@@ -985,7 +983,7 @@ module ccc
     .rst_ni, // Async reset, active low
     .id_i,
 
-    .start_daa_i(entdaa_start),
+    .start_daa_i(entdaa_o),
     .done_daa_o(entdaa_done),
 
     // Bus RX interface
@@ -995,7 +993,7 @@ module ccc
     .bus_rx_req_byte_o(entdaa_rx_req_byte),
 
     // Bus TX interface
-    .bus_tx_done_i,
+    .bus_tx_done_i(bus_tx_done_i),
     .bus_tx_req_byte_o(entdaa_tx_req_byte),
     .bus_tx_req_bit_o(entdaa_tx_req_bit),
     .bus_tx_req_value_o(entdaa_tx_req_value),

src/ctrl/ccc_entdaa.sv

@@ -36,17 +36,17 @@ module ccc_entdaa
 
 
   typedef enum logic [7:0] {
-    Idle,
-    WaitStart,
-    ReceiveRsvdByte,
-    AckRsvdByte,
-    SendNack,
-    SendID,
-    LostArbitration,
-    ReceiveAddr,
-    AckAddr,
-    Done,
-    Error
+    Idle = 'h0,
+    WaitStart = 'h1,
+    ReceiveRsvdByte = 'h2,
+    AckRsvdByte = 'h3,
+    SendNack = 'h4,
+    SendID = 'h5,
+    LostArbitration = 'h6,
+    ReceiveAddr = 'h7,
+    AckAddr = 'h8,
+    Done = 'h9,
+    Error = 'ha
   } state_e;
 
   state_e state_q, state_d;
@@ -55,7 +55,7 @@ module ccc_entdaa
 
   logic parity_ok;
 
-  assign reserved_word_det = (bus_rx_data_i[7:1] == 7'h7e && bus_rx_data_i[0] == 0);
+  assign reserved_word_det = (bus_rx_data_i[7:1] == 7'h7e && bus_rx_data_i[0] == 1'b1);
 
   always_comb begin: state_functions
     state_d = state_q;
@@ -77,17 +77,25 @@ module ccc_entdaa
         end
       end
       AckRsvdByte: begin
-        state_d <= SendID;
+        if (bus_tx_done_i) begin
+	  state_d <= SendID;
+	end
       end
       SendNack: begin
-        state_d <= Error;
+        if (bus_tx_done_i) begin
+          state_d <= Error;
+	end
       end
       SendID: begin
-        // our Id was overwritten by some other device
-        if (arbitration_lost_i) begin
-          state_d <= LostArbitration;
+        if (bus_tx_done_i) begin
+          // our Id was overwritten by some other device
+          if (arbitration_lost_i) begin
+            state_d <= LostArbitration;
+          end
         end
       end
+      LostArbitration: begin
+      end
       ReceiveAddr: begin
         if (bus_rx_done_i) begin
           if (parity_ok) state_d <= AckAddr;
@@ -106,7 +114,9 @@ module ccc_entdaa
 
   always_comb begin : state_outputs
     bus_rx_req_byte_o = '0;
+    bus_rx_req_bit_o = '0;
 
+    bus_tx_req_byte_o = '0;
     bus_tx_req_bit_o = '0;
     bus_tx_req_value_o = '0;
     bus_tx_sel_od_pp_o = '0;
@@ -119,12 +129,13 @@ module ccc_entdaa
         bus_rx_req_byte_o = '1;
       end
       AckRsvdByte: begin
+        bus_tx_req_byte_o = '0;
         bus_tx_req_bit_o = '1;
         bus_tx_req_value_o = '0;
       end
       SendNack: begin
         bus_tx_req_bit_o = '1;
-        bus_tx_req_value_o = '0;
+        bus_tx_req_value_o = '1;
       end
       SendID: begin
       end

src/i3c.sv

@@ -541,7 +541,7 @@ module i3c
 
   logic arbitration_lost;
 
-  assign arbitration_lost = sda_i != sda_o;
+  assign arbitration_lost = i3c_sda_i != i3c_sda_o;
 
   // HCI
   I3CCSR_pkg::I3CCSR__I3C_EC__TTI__out_t             hwif_tti_out;