accel/amdxdna: Fix incorrect command state for timed out job

[ Upstream commit 6fb7f298883246e21f60f971065adcb789ae6eba ]

When a command times out, mark it as ERT_CMD_STATE_TIMEOUT. Any other
commands that are canceled due to this timeout should be marked as
ERT_CMD_STATE_ABORT.

Fixes: aac243092b70 ("accel/amdxdna: Add command execution")
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Signed-off-by: Lizhi Hou <lizhi.hou@amd.com>
Link: https://patch.msgid.link/20251029193423.2430463-1-lizhi.hou@amd.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/accel/amdxdna/aie2_ctx.c b/drivers/accel/amdxdna/aie2_ctx.c
index e9f9b1fa5dc1b164de29ef8f6dfad3d3bd824e59..c9f712f0ec00ccfdac3d4792bb872bc9754915f0 100644 (file)
--- a/drivers/accel/amdxdna/aie2_ctx.c
+++ b/drivers/accel/amdxdna/aie2_ctx.c
@@ -204,10 +204,13 @@ aie2_sched_resp_handler(void *handle, void __iomem *data, size_t size)
 
        cmd_abo = job->cmd_bo;
 
-       if (unlikely(!data))
+       if (unlikely(job->job_timeout)) {
+               amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_TIMEOUT);
+               ret = -EINVAL;
                goto out;
+       }
 
-       if (unlikely(size != sizeof(u32))) {
+       if (unlikely(!data) || unlikely(size != sizeof(u32))) {
                amdxdna_cmd_set_state(cmd_abo, ERT_CMD_STATE_ABORT);
                ret = -EINVAL;
                goto out;
@@ -260,6 +263,13 @@ aie2_sched_cmdlist_resp_handler(void *handle, void __iomem *data, size_t size)
        int ret = 0;
 
        cmd_abo = job->cmd_bo;
+
+       if (unlikely(job->job_timeout)) {
+               amdxdna_cmd_set_state(cmd_abo, 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);
                ret = -EINVAL;
@@ -362,6 +372,7 @@ aie2_sched_job_timedout(struct drm_sched_job *sched_job)
 
        xdna = hwctx->client->xdna;
        trace_xdna_job(sched_job, hwctx->name, "job timedout", job->seq);
+       job->job_timeout = true;
        mutex_lock(&xdna->dev_lock);
        aie2_hwctx_stop(xdna, hwctx, sched_job);
 

diff --git a/drivers/accel/amdxdna/amdxdna_ctx.h b/drivers/accel/amdxdna/amdxdna_ctx.h
index 7cd7a55936f09939fa7ea5a6e9d48c9169fc1e16..8c1d181df6e794b54532e357254a059bfbc3b22c 100644 (file)
--- a/drivers/accel/amdxdna/amdxdna_ctx.h
+++ b/drivers/accel/amdxdna/amdxdna_ctx.h
@@ -105,6 +105,7 @@ struct amdxdna_sched_job {
        /* user can wait on this fence */
        struct dma_fence        *out_fence;
        bool                    job_done;
+       bool                    job_timeout;
        u64                     seq;
        struct amdxdna_gem_obj  *cmd_bo;
        size_t                  bo_cnt;