Skip to contentSkip to conversation

accel/amdxdna: Fill invalid payload for failed command

PATCH In review Lizhi Hou 2 participants 4 messages Feb 27 – Feb 28

Subsystems (2)
lore
Share & tools
lore

Lizhi Hou

author maintainer
#0 lore raw

PATCH v2 9/9 accel/amdxdna: Fill invalid payload for failed command

Newer userspace applications may read the payload of a failed command to obtain detailed error information. However, the driver and old firmware versions may not support returning advanced error information. In this case, initialize the command payload with an invalid value so userspace can detect that no detailed error information is available.

Fixes aac243092b70 ("accel/amdxdna: Add command execution")
---
 drivers/accel/amdxdna/aie2_ctx.c    | 23 ++++++++---------------
 drivers/accel/amdxdna/amdxdna_ctx.c | 27 +++++++++++++++++++++++++++
 drivers/accel/amdxdna/amdxdna_ctx.h |  3 +++
 3 files changed, 38 insertions(+), 15 deletions(-)
drivers/accel/amdxdna/aie2_ctx.c +8 -15
index 622ddbf7fb6f..eb4c9d919885 100644
@@ -186,13 +186,13 @@ aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size)
 	cmd_abo = job->cmd_bo;
 
 	if (unlikely(job->job_timeout)) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
 		ret = -EINVAL;
 		goto out;
 	}
 
 	if (unlikely(!data) || unlikely(size != sizeof(u32))) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
 		ret = -EINVAL;
 		goto out;
 	}
@@ -202,7 +202,7 @@ aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size)
 	if (status == AIE2_STATUS_SUCCESS)
 		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_COMPLETED);
 	else
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ERROR);
 
 out:
 	aie2_sched_notify(job);
@@ -244,13 +244,13 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size)
 	cmd_abo = job->cmd_bo;
 
 	if (unlikely(job->job_timeout)) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
 		ret = -EINVAL;
 		goto out;
 	}
 
 	if (unlikely(!data) || unlikely(size != sizeof(u32) * 3)) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
 		ret = -EINVAL;
 		goto out;
 	}
@@ -270,19 +270,12 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size)
 		 fail_cmd_idx, fail_cmd_status);
 
 	if (fail_cmd_status == AIE2_STATUS_SUCCESS) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+		amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, ERT_CMD_STATE_ABORT);
 		ret = -EINVAL;
-		goto out;
+	} else {
+		amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, ERT_CMD_STATE_ERROR);
 	}
-	amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);
 
-	if (amdxdna_cmd_get_op(cmd_abo) == ERT_CMD_CHAIN) {
-		struct amdxdna_cmd_chain *cc = amdxdna_cmd_get_payload(cmd_abo, NULL);
-
-		cc->error_index = fail_cmd_idx;
-		if (cc->error_index >= cc->command_count)
-			cc->error_index = 0;
-	}
 out:
 	aie2_sched_notify(job);
 	return ret;
drivers/accel/amdxdna/amdxdna_ctx.c +27 -0
index db3aa26fb55f..405d2c62789d 100644
@@ -132,6 +132,33 @@ u32 amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo)
 	return INVALID_CU_IDX;
 }
 
+int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+			  struct amdxdna_sched_job *job, u32 cmd_idx,
+			  enum ert_cmd_state error_state)
+{
+	struct amdxdna_client *client = job->hwctx->client;
+	struct amdxdna_cmd *cmd = abo->mem.kva;
+	struct amdxdna_cmd_chain *cc = NULL;
+
+	cmd->header &= ~AMDXDNA_CMD_STATE;
+	cmd->header |= FIELD_PREP(AMDXDNA_CMD_STATE, error_state);
+
+	if (amdxdna_cmd_get_op(abo) == ERT_CMD_CHAIN) {
+		cc = amdxdna_cmd_get_payload(abo, NULL);
+		cc->error_index = (cmd_idx < cc->command_count) ? cmd_idx : 0;
+		abo = amdxdna_gem_get_obj(client, cc->data[0], AMDXDNA_BO_CMD);
+		if (!abo)
+			return -EINVAL;
+		cmd = abo->mem.kva;
+	}
+
+	memset(cmd->data, 0xff, abo->mem.size - sizeof(*cmd));
+	if (cc)
+		amdxdna_gem_put_obj(abo);
+
+	return 0;
+}
+
 /*
  * This should be called in close() and remove(). DO NOT call in other syscalls.
  * This guarantee that when hwctx and resources will be released, if user
drivers/accel/amdxdna/amdxdna_ctx.h +3 -0
index 16c85f08f03c..fbdf9d000871 100644
@@ -167,6 +167,9 @@ amdxdna_cmd_get_state(struct amdxdna_gem_obj *abo)
 
 void *amdxdna_cmd_get_payload(struct amdxdna_gem_obj *abo, u32 *size);
 u32 amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo);
+int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+			  struct amdxdna_sched_job *job, u32 cmd_idx,
+			  enum ert_cmd_state error_state);
 
 void amdxdna_sched_job_cleanup(struct amdxdna_sched_job *job);
 void amdxdna_hwctx_remove_all(struct amdxdna_client *client);
Signature · 1 line
2.34.1
Reviewed-by on v2 9/9
#1 lore raw

The title is 9/9, but I didn't get copied on 0 through 8. Was that just a mistake when you made the patch you sent out one patch instead of 9?

Quoted 8 lines · Lizhi Hou

Newer userspace applications may read the payload of a failed command to obtain detailed error information. However, the driver and old firmware versions may not support returning advanced error information. In this case, initialize the command payload with an invalid value so userspace can detect that no detailed error information is available.

Fixes aac243092b70 ("accel/amdxdna: Add command execution")

Would it also make sense to also detect the firmware version and indicate in the logs, IOCTL or a sysfs the feature is available for user space to detect?

Nonetheless, this approach is scalable.

Quoted 126 lines
---
  drivers/accel/amdxdna/aie2_ctx.c    | 23 ++++++++---------------
  drivers/accel/amdxdna/amdxdna_ctx.c | 27 +++++++++++++++++++++++++++
  drivers/accel/amdxdna/amdxdna_ctx.h |  3 +++
  3 files changed, 38 insertions(+), 15 deletions(-)
drivers/accel/amdxdna/aie2_ctx.c +8 -15
index 622ddbf7fb6f..eb4c9d919885 100644
@@ -186,13 +186,13 @@ aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size)
  	cmd_abo = job->cmd_bo;
 
  	if (unlikely(job->job_timeout)) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
  		ret = -EINVAL;
  		goto out;
  	}
 
  	if (unlikely(!data) || unlikely(size != sizeof(u32))) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
  		ret = -EINVAL;
  		goto out;
  	}
@@ -202,7 +202,7 @@ aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size)
  	if (status == AIE2_STATUS_SUCCESS)
  		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_COMPLETED);
  	else
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ERROR);
 
  out:
  	aie2_sched_notify(job);
@@ -244,13 +244,13 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size)
  	cmd_abo = job->cmd_bo;
 
  	if (unlikely(job->job_timeout)) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
  		ret = -EINVAL;
  		goto out;
  	}
 
  	if (unlikely(!data) || unlikely(size != sizeof(u32) * 3)) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+		amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
  		ret = -EINVAL;
  		goto out;
  	}
@@ -270,19 +270,12 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size)
  		 fail_cmd_idx, fail_cmd_status);
 
  	if (fail_cmd_status == AIE2_STATUS_SUCCESS) {
-		amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+		amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, ERT_CMD_STATE_ABORT);
  		ret = -EINVAL;
-		goto out;
+	} else {
+		amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, ERT_CMD_STATE_ERROR);
  	}
-	amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);
 
-	if (amdxdna_cmd_get_op(cmd_abo) == ERT_CMD_CHAIN) {
-		struct amdxdna_cmd_chain *cc = amdxdna_cmd_get_payload(cmd_abo, NULL);
-
-		cc->error_index = fail_cmd_idx;
-		if (cc->error_index >= cc->command_count)
-			cc->error_index = 0;
-	}
  out:
  	aie2_sched_notify(job);
  	return ret;
drivers/accel/amdxdna/amdxdna_ctx.c +27 -0
index db3aa26fb55f..405d2c62789d 100644
@@ -132,6 +132,33 @@ u32 amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo)
  	return INVALID_CU_IDX;
  }
 
+int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+			  struct amdxdna_sched_job *job, u32 cmd_idx,
+			  enum ert_cmd_state error_state)
+{
+	struct amdxdna_client *client = job->hwctx->client;
+	struct amdxdna_cmd *cmd = abo->mem.kva;
+	struct amdxdna_cmd_chain *cc = NULL;
+
+	cmd->header &= ~AMDXDNA_CMD_STATE;
+	cmd->header |= FIELD_PREP(AMDXDNA_CMD_STATE, error_state);
+
+	if (amdxdna_cmd_get_op(abo) == ERT_CMD_CHAIN) {
+		cc = amdxdna_cmd_get_payload(abo, NULL);
+		cc->error_index = (cmd_idx < cc->command_count) ? cmd_idx : 0;
+		abo = amdxdna_gem_get_obj(client, cc->data[0], AMDXDNA_BO_CMD);
+		if (!abo)
+			return -EINVAL;
+		cmd = abo->mem.kva;
+	}
+
+	memset(cmd->data, 0xff, abo->mem.size - sizeof(*cmd));
+	if (cc)
+		amdxdna_gem_put_obj(abo);
+
+	return 0;
+}
+
  /*
   * This should be called in close() and remove(). DO NOT call in other syscalls.
   * This guarantee that when hwctx and resources will be released, if user
drivers/accel/amdxdna/amdxdna_ctx.h +3 -0
index 16c85f08f03c..fbdf9d000871 100644
@@ -167,6 +167,9 @@ amdxdna_cmd_get_state(struct amdxdna_gem_obj *abo)
 
  void *amdxdna_cmd_get_payload(struct amdxdna_gem_obj *abo, u32 *size);
  u32 amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo);
+int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+			  struct amdxdna_sched_job *job, u32 cmd_idx,
+			  enum ert_cmd_state error_state);
 
  void amdxdna_sched_job_cleanup(struct amdxdna_sched_job *job);
  void amdxdna_hwctx_remove_all(struct amdxdna_client *client);
author maintainer
#2 lore raw
Quoted 1 line · Mario Limonciello

The title is 9/9, but I didn't get copied on 0 through 8.  Was that just a mistake when you made the patch you sent out one patch instead of 9?

Sorry for the confusion. Yes, this is just a mistake. There is not 0-8.

Quoted 8 lines · Lizhi Hou
Quoted 6 lines

Newer userspace applications may read the payload of a failed command to obtain detailed error information. However, the driver and old firmware versions may not support returning advanced error information. In this case, initialize the command payload with an invalid value so userspace can detect that no detailed error information is available.

Quoted 4 lines
Quoted 2 lines
Fixes aac243092b70 ("accel/amdxdna: Add command execution")

Would it also make sense to also detect the firmware version and indicate in the logs, IOCTL or a sysfs the feature is available for user space to detect?

Thanks for the suggestion. I will discuss with the team and see if there is good way to describe the features firmware provides.

Lizhi

Quoted 130 lines

Nonetheless, this approach is scalable.

Quoted 124 lines

---
  drivers/accel/amdxdna/aie2_ctx.c    | 23 ++++++++--------------- drivers/accel/amdxdna/amdxdna_ctx.c | 27 +++++++++++++++++++++++++++ drivers/accel/amdxdna/amdxdna_ctx.h |  3 +++

  3 files changed, 38 insertions(+), 15 deletions(-)
drivers/accel/amdxdna/aie2_ctx.c +2 -2
index 622ddbf7fb6f..eb4c9d919885 100644
@@ -186,13 +186,13 @@ aie2_sched_resp_handler(void *handle, void 
 __iomem *data, size_t size)
       cmd_abo = job->cmd_bo;
         if (unlikely(job->job_timeout)) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
           ret = -EINVAL;
           goto out;
       }
         if (unlikely(!data) || unlikely(size != sizeof(u32))) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
           ret = -EINVAL;
           goto out;
       }
@@ -202,7 +202,7 @@ aie2_sched_resp_handler(void *handle, void 
 __iomem *data, size_t size)
       if (status == AIE2_STATUS_SUCCESS)
           amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_COMPLETED);

      else
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR); +        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ERROR); out:
      aie2_sched_notify(job);

drivers/accel/amdxdna/aie2_ctx.c +5 -11
@@ -244,13 +244,13 @@ aie2_sched_cmdlist_resp_handler(void *handle, 
 void __iomem *data, size_t size)
       cmd_abo = job->cmd_bo;
         if (unlikely(job->job_timeout)) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
           ret = -EINVAL;
           goto out;
       }
         if (unlikely(!data) || unlikely(size != sizeof(u32) * 3)) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
           ret = -EINVAL;
           goto out;
       }
@@ -270,19 +270,12 @@ aie2_sched_cmdlist_resp_handler(void *handle, 
 void __iomem *data, size_t size)
            fail_cmd_idx, fail_cmd_status);
         if (fail_cmd_status == AIE2_STATUS_SUCCESS) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+        amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, 
 ERT_CMD_STATE_ABORT);
           ret = -EINVAL;
-        goto out;
+    } else {
+        amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, 
 ERT_CMD_STATE_ERROR);
       }
-    amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);
   -    if (amdxdna_cmd_get_op(cmd_abo) == ERT_CMD_CHAIN) {
-        struct amdxdna_cmd_chain *cc = 
 amdxdna_cmd_get_payload(cmd_abo, NULL);
-
-        cc->error_index = fail_cmd_idx;
-        if (cc->error_index >= cc->command_count)
-            cc->error_index = 0;
-    }

  out:
      aie2_sched_notify(job);
      return ret;

drivers/accel/amdxdna/amdxdna_ctx.c +26 -0
index db3aa26fb55f..405d2c62789d 100644
@@ -132,6 +132,33 @@ u32 amdxdna_cmd_get_cu_idx(struct 
 amdxdna_gem_obj *abo)
       return INVALID_CU_IDX;
   }
   +int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+              struct amdxdna_sched_job *job, u32 cmd_idx,
+              enum ert_cmd_state error_state)
+{
+    struct amdxdna_client *client = job->hwctx->client;
+    struct amdxdna_cmd *cmd = abo->mem.kva;
+    struct amdxdna_cmd_chain *cc = NULL;
+
+    cmd->header &= ~AMDXDNA_CMD_STATE;
+    cmd->header |= FIELD_PREP(AMDXDNA_CMD_STATE, error_state);
+
+    if (amdxdna_cmd_get_op(abo) == ERT_CMD_CHAIN) {
+        cc = amdxdna_cmd_get_payload(abo, NULL);
+        cc->error_index = (cmd_idx < cc->command_count) ? cmd_idx : 0;
+        abo = amdxdna_gem_get_obj(client, cc->data[0], AMDXDNA_BO_CMD);
+        if (!abo)
+            return -EINVAL;
+        cmd = abo->mem.kva;
+    }
+
+    memset(cmd->data, 0xff, abo->mem.size - sizeof(*cmd));
+    if (cc)
+        amdxdna_gem_put_obj(abo);
+
+    return 0;
+}
+
   /*
    * This should be called in close() and remove(). DO NOT call in other syscalls.

   * This guarantee that when hwctx and resources will be released, if user

drivers/accel/amdxdna/amdxdna_ctx.h +3 -0
index 16c85f08f03c..fbdf9d000871 100644
@@ -167,6 +167,9 @@ amdxdna_cmd_get_state(struct amdxdna_gem_obj *abo)
     void *amdxdna_cmd_get_payload(struct amdxdna_gem_obj *abo, u32 *size);
   u32 amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo);
+int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+              struct amdxdna_sched_job *job, u32 cmd_idx,
+              enum ert_cmd_state error_state);
     void amdxdna_sched_job_cleanup(struct amdxdna_sched_job *job);
   void amdxdna_hwctx_remove_all(struct amdxdna_client *client);
author maintainer Applied
#3 lore raw
In reply to Mario Limonciello

Applied to drm-misc-fixes

Quoted 143 lines · Mario Limonciello

The title is 9/9, but I didn't get copied on 0 through 8.  Was that just a mistake when you made the patch you sent out one patch instead of 9?

Quoted 8 lines · Lizhi Hou

Newer userspace applications may read the payload of a failed command to obtain detailed error information. However, the driver and old firmware versions may not support returning advanced error information. In this case, initialize the command payload with an invalid value so userspace can detect that no detailed error information is available.

Fixes aac243092b70 ("accel/amdxdna: Add command execution")

Would it also make sense to also detect the firmware version and indicate in the logs, IOCTL or a sysfs the feature is available for user space to detect?

Nonetheless, this approach is scalable.

Quoted 124 lines

---
  drivers/accel/amdxdna/aie2_ctx.c    | 23 ++++++++--------------- drivers/accel/amdxdna/amdxdna_ctx.c | 27 +++++++++++++++++++++++++++ drivers/accel/amdxdna/amdxdna_ctx.h |  3 +++

  3 files changed, 38 insertions(+), 15 deletions(-)
drivers/accel/amdxdna/aie2_ctx.c +2 -2
index 622ddbf7fb6f..eb4c9d919885 100644
@@ -186,13 +186,13 @@ aie2_sched_resp_handler(void *handle, void 
 __iomem *data, size_t size)
       cmd_abo = job->cmd_bo;
         if (unlikely(job->job_timeout)) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
           ret = -EINVAL;
           goto out;
       }
         if (unlikely(!data) || unlikely(size != sizeof(u32))) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
           ret = -EINVAL;
           goto out;
       }
@@ -202,7 +202,7 @@ aie2_sched_resp_handler(void *handle, void 
 __iomem *data, size_t size)
       if (status == AIE2_STATUS_SUCCESS)
           amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_COMPLETED);

      else
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR); +        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ERROR); out:
      aie2_sched_notify(job);

drivers/accel/amdxdna/aie2_ctx.c +5 -11
@@ -244,13 +244,13 @@ aie2_sched_cmdlist_resp_handler(void *handle, 
 void __iomem *data, size_t size)
       cmd_abo = job->cmd_bo;
         if (unlikely(job->job_timeout)) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_TIMEOUT);
           ret = -EINVAL;
           goto out;
       }
         if (unlikely(!data) || unlikely(size != sizeof(u32) * 3)) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+        amdxdna_cmd_set_error(cmd_abo, job, 0, ERT_CMD_STATE_ABORT);
           ret = -EINVAL;
           goto out;
       }
@@ -270,19 +270,12 @@ aie2_sched_cmdlist_resp_handler(void *handle, 
 void __iomem *data, size_t size)
            fail_cmd_idx, fail_cmd_status);
         if (fail_cmd_status == AIE2_STATUS_SUCCESS) {
-        amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
+        amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, 
 ERT_CMD_STATE_ABORT);
           ret = -EINVAL;
-        goto out;
+    } else {
+        amdxdna_cmd_set_error(cmd_abo, job, fail_cmd_idx, 
 ERT_CMD_STATE_ERROR);
       }
-    amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ERROR);
   -    if (amdxdna_cmd_get_op(cmd_abo) == ERT_CMD_CHAIN) {
-        struct amdxdna_cmd_chain *cc = 
 amdxdna_cmd_get_payload(cmd_abo, NULL);
-
-        cc->error_index = fail_cmd_idx;
-        if (cc->error_index >= cc->command_count)
-            cc->error_index = 0;
-    }

  out:
      aie2_sched_notify(job);
      return ret;

drivers/accel/amdxdna/amdxdna_ctx.c +26 -0
index db3aa26fb55f..405d2c62789d 100644
@@ -132,6 +132,33 @@ u32 amdxdna_cmd_get_cu_idx(struct 
 amdxdna_gem_obj *abo)
       return INVALID_CU_IDX;
   }
   +int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+              struct amdxdna_sched_job *job, u32 cmd_idx,
+              enum ert_cmd_state error_state)
+{
+    struct amdxdna_client *client = job->hwctx->client;
+    struct amdxdna_cmd *cmd = abo->mem.kva;
+    struct amdxdna_cmd_chain *cc = NULL;
+
+    cmd->header &= ~AMDXDNA_CMD_STATE;
+    cmd->header |= FIELD_PREP(AMDXDNA_CMD_STATE, error_state);
+
+    if (amdxdna_cmd_get_op(abo) == ERT_CMD_CHAIN) {
+        cc = amdxdna_cmd_get_payload(abo, NULL);
+        cc->error_index = (cmd_idx < cc->command_count) ? cmd_idx : 0;
+        abo = amdxdna_gem_get_obj(client, cc->data[0], AMDXDNA_BO_CMD);
+        if (!abo)
+            return -EINVAL;
+        cmd = abo->mem.kva;
+    }
+
+    memset(cmd->data, 0xff, abo->mem.size - sizeof(*cmd));
+    if (cc)
+        amdxdna_gem_put_obj(abo);
+
+    return 0;
+}
+
   /*
    * This should be called in close() and remove(). DO NOT call in other syscalls.

   * This guarantee that when hwctx and resources will be released, if user

drivers/accel/amdxdna/amdxdna_ctx.h +3 -0
index 16c85f08f03c..fbdf9d000871 100644
@@ -167,6 +167,9 @@ amdxdna_cmd_get_state(struct amdxdna_gem_obj *abo)
     void *amdxdna_cmd_get_payload(struct amdxdna_gem_obj *abo, u32 *size);
   u32 amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo);
+int amdxdna_cmd_set_error(struct amdxdna_gem_obj *abo,
+              struct amdxdna_sched_job *job, u32 cmd_idx,
+              enum ert_cmd_state error_state);
     void amdxdna_sched_job_cleanup(struct amdxdna_sched_job *job);
   void amdxdna_hwctx_remove_all(struct amdxdna_client *client);