Explicitly clear the CSR_done bit and bump the CSR version

Author: shuoniu-intel

src/acl_kernel_if.cpp

@@ -43,8 +43,10 @@ acl_process_autorun_profiler_scan_chain(unsigned int physical_device_id,
 // Version number in the top 16-bits of the 32-bit status register.  Used
 // to verify that the hardware and HAL have an identical view of the CSR
 // address map.
-#define CSR_VERSION_ID_181 (3)
-#define CSR_VERSION_ID (4)
+#define CSR_VERSION_ID_18_1 (3)
+#define CSR_VERSION_ID_19_1 (4)
+#define CSR_VERSION_ID_2022_3 (5)
+#define CSR_VERSION_ID CSR_VERSION_ID_2022_3
 
 // Address map
 // For unit tests to work, these defines must match those in the unit test
@@ -1137,8 +1139,8 @@ void acl_kernel_if_launch_kernel_on_custom_sof(
   // Version is defined in upper 16-bits of the status register and cached
   // in the kern->csr_version field.  The value is cached after PLL init to
   // avoid reading back on every kernel launch, which would add overhead.
-  if (kern->csr_version != CSR_VERSION_ID &&
-      kern->csr_version != CSR_VERSION_ID_181) {
+  if (!(kern->csr_version >= CSR_VERSION_ID_18_1 &&
+        kern->csr_version <= CSR_VERSION_ID)) {
     kern->io.printf("Hardware CSR version ID differs from version expected by "
                     "software.  Either:\n");
     kern->io.printf("   a) Ensure your compiled design was generated by the "
@@ -1185,7 +1187,7 @@ void acl_kernel_if_launch_kernel_on_custom_sof(
   size_t image_size_static;
   unsigned int offset;
   acl_dev_kernel_invocation_image_181_t image_181;
-  if (kern->csr_version == CSR_VERSION_ID_181) {
+  if (kern->csr_version == CSR_VERSION_ID_18_1) {
     offset = (unsigned int)KERNEL_OFFSET_INVOCATION_IMAGE_181;
     image_p = (uintptr_t)&image_181;
     image_size_static =
@@ -1224,7 +1226,7 @@ void acl_kernel_if_launch_kernel_on_custom_sof(
           (void *)(offset + p), pword);
     }
 
-    if (kern->csr_version != CSR_VERSION_ID_181) {
+    if (kern->csr_version != CSR_VERSION_ID_18_1) {
       for (uintptr_t p = 0; p < image->arg_value_size; p += sizeof(int)) {
         unsigned int pword = *(unsigned int *)(image->arg_value + p);
         ACL_KERNEL_IF_DEBUG_MSG_VERBOSE(
@@ -1238,7 +1240,7 @@ void acl_kernel_if_launch_kernel_on_custom_sof(
   // it is in dynamic memory
   acl_kernel_cra_write_block(kern, accel_id, offset, (unsigned int *)image_p,
                              image_size_static);
-  if (kern->csr_version != CSR_VERSION_ID_181) {
+  if (kern->csr_version != CSR_VERSION_ID_18_1) {
     acl_kernel_cra_write_block(
         kern, accel_id, offset + (unsigned int)image_size_static,
         (unsigned int *)image->arg_value, image->arg_value_size);
@@ -1439,7 +1441,7 @@ void acl_kernel_if_update_status(acl_kernel_if *kern) {
 
     kern->last_kern_update = acl_kernel_if_get_time_us(kern);
 
-    if (kern->csr_version == CSR_VERSION_ID_181) {
+    if (kern->csr_version == CSR_VERSION_ID_18_1) {
       // Only expect single completion for older csr version
       finish_counter = 1;
     } else {
@@ -1470,8 +1472,10 @@ void acl_kernel_if_update_status(acl_kernel_if *kern) {
 
       // Just clear the "done" bit.  The "go" bit should already have been
       // cleared, but this is harmless anyway.
-      // Since csr version 19, done bit is cleared when finish counter is read
-      if (kern->csr_version == CSR_VERSION_ID_181) {
+      // Since csr version 19, done bit is cleared when finish counter is read.
+      // Since csr version 2022.3, done bit needs to be cleared explicitly.
+      if (kern->csr_version == CSR_VERSION_ID_18_1 ||
+          kern->csr_version >= CSR_VERSION_ID_2022_3) {
         unsigned int dum;
         acl_kernel_cra_write(kern, k, KERNEL_OFFSET_CSR, 0);
         acl_kernel_cra_read(kern, k, KERNEL_OFFSET_CSR, &dum);