[RTL]

Author: Abdullah Mughrabi

00_bench/include/capi_utils/capienv.h

@@ -29,10 +29,11 @@
 #define CU_RETURN_ACK           0x3FFFFA8
 
 #define  CU_RETURN_DONE         0x3FFFFA0
-#define  CU_RETURN_DONE_ACK     0x3FFFF98
+#define  CU_RETURN_DONE_2       0x3FFFF98
+#define  CU_RETURN_DONE_ACK     0x3FFFF90
 
-#define ERROR_REG               0x3FFFF90
-#define ERROR_REG_ACK           0x3FFFF88
+#define ERROR_REG               0x3FFFF88
+#define ERROR_REG_ACK           0x3FFFF80
 
 // ********************************************************************************************
 // ***************                  AFU  Stats                                   **************
@@ -85,6 +86,7 @@ struct AFUStatus
     uint64_t cu_return; // running return
     uint64_t cu_return_2; // running return
     uint64_t cu_return_done; // final return when cu send done
+    uint64_t cu_return_done_2;
 };
 
 

00_bench/src/capi_utils/capienv.c

@@ -169,6 +169,7 @@ void waitAFU(struct cxl_afu_h **afu, struct AFUStatus *afu_status)
 
         // read final return result
         cxl_mmio_read64((*afu), CU_RETURN_DONE, (uint64_t *) & (afu_status->cu_return_done));
+        cxl_mmio_read64((*afu), CU_RETURN_DONE_2, (uint64_t *) & (afu_status->cu_return_done_2));
 
 #ifdef  VERBOSE_2
         cxl_mmio_read64((*afu), CU_RETURN, (uint64_t *) & (afu_status->cu_return));

01_capi_integration/accelerator_rtl/afu_control/cached_afu.sv

@@ -45,7 +45,7 @@ module cached_afu #(parameter NUM_EXTERNAL_RESETS = 3) (
   logic [                   0:63] external_errors        ;
   logic [                   0:63] report_errors          ;
   cu_return_type                  cu_return              ;
-  logic [                   0:63] cu_return_done         ;
+  cu_return_type                  cu_return_done         ;
   cu_configure_type               cu_configure           ;
   afu_configure_type              afu_configure          ;
   logic                           report_errors_ack      ;

01_capi_integration/accelerator_rtl/afu_control/done_control.sv

@@ -25,15 +25,15 @@ module done_control (
 	input  logic                      cu_done                   ,
 	input  logic                      cu_return_done_ack        ,
 	output logic                      reset_done                ,
-	output logic [0:63]               cu_return_done            ,
+	output cu_return_type             cu_return_done            ,
 	output ResponseStatistcsInterface report_response_statistics
 );
 
-	logic                      rstn                              ;
-	done_state                 current_state, next_state;
-	logic                      done_flag                         ;
-	logic                      enabled                           ;
-	logic [0:63]               cu_return_done_latched            ;
+	logic      rstn         ;
+	done_state current_state, next_state;
+	logic      done_flag    ;
+	logic      enabled      ;
+	cu_return_type             cu_return_done_latched            ;
 	logic                      prev_soft_rstn                    ;
 	logic                      next_soft_rstn                    ;
 	logic                      done_soft_rstn                    ;
@@ -132,7 +132,7 @@ module done_control (
 			end
 			DONE_IDLE : begin
 				cu_return_done                     <= 0;
-				cu_return_done_latched             <= cu_return.var1;
+				cu_return_done_latched             <= cu_return;
 				report_response_statistics         <= response_statistics;
 				report_response_statistics_latched <= response_statistics;
 				reset_done                         <= 1'b1;

01_capi_integration/accelerator_rtl/afu_control/mmio.sv

@@ -21,7 +21,7 @@ module mmio (
   input  logic                      rstn_in               ,
   input  logic [0:63]               report_errors         ,
   input  cu_return_type             cu_return             ,
-  input  logic [0:63]               cu_return_done        ,
+  input  cu_return_type             cu_return_done        ,
   input  logic [0:63]               cu_status             ,
   input  logic [0:63]               afu_status            ,
   input  ResponseStatistcsInterface response_statistics   ,
@@ -84,7 +84,7 @@ module mmio (
   logic              data_ack              ;
   logic [0:63]       report_errors_latched ;
   cu_return_type     cu_return_latched     ;
-  logic [0:63]       cu_return_done_latched;
+  cu_return_type     cu_return_done_latched;
   logic [0:63]       afu_status_latched    ;
   logic [0:63]       cu_status_latched     ;
   logic [0:63]       cu_return_mmio_ack    ;
@@ -298,7 +298,10 @@ module mmio (
             data_out <= cu_return_latched.var2;
           end
           CU_RETURN_DONE : begin
-            data_out <= cu_return_done_latched;
+            data_out <= cu_return_done_latched.var1;
+          end
+          CU_RETURN_DONE_2 : begin
+            data_out <= cu_return_done_latched.var2;
           end
           ERROR_REG : begin
             data_out <= report_errors_latched;

01_capi_integration/accelerator_rtl/afu_pkgs/globals_afu_pkg.sv

@@ -95,10 +95,11 @@ package GLOBALS_AFU_PKG;
     parameter CU_RETURN_ACK = 26'h 3FFFFA8 >> 2;
 
     parameter CU_RETURN_DONE     = 26'h 3FFFFA0 >> 2;
-    parameter CU_RETURN_DONE_ACK = 26'h 3FFFF98 >> 2;
+    parameter CU_RETURN_DONE_2   = 26'h 3FFFF98 >> 2;
+    parameter CU_RETURN_DONE_ACK = 26'h 3FFFF90 >> 2;
 
-    parameter ERROR_REG     = 26'h 3FFFF90 >> 2;
-    parameter ERROR_REG_ACK = 26'h 3FFFF88 >> 2;
+    parameter ERROR_REG     = 26'h 3FFFF88 >> 2;
+    parameter ERROR_REG_ACK = 26'h 3FFFF80 >> 2;
 
 // ********************************************************************************************
 // ***************                  AFU  Stats                                   **************