Re: [PATCH V2] accel/amdxdna: Add hardware scheduler time quantum support

From: Lizhi Hou

Date: Thu Apr 16 2026 - 11:59:00 EST


Applied to drm-misc-next.

On 4/15/26 13:10, Mario Limonciello wrote:


On 4/15/26 12:11, Lizhi Hou wrote:
From: Max Zhen <max.zhen@xxxxxxx>

Add support for configuring the hardware scheduler time quantum to
improve fairness across concurrent contexts.

The scheduler enforces a fixed time slice per context, preventing
long-running workloads from monopolizing the device and allowing
other contexts to make forward progress.

The default time quantum is 30ms and can be configured via the
time_quantum_ms module parameter.

Signed-off-by: Max Zhen <max.zhen@xxxxxxx>
Signed-off-by: Lizhi Hou <lizhi.hou@xxxxxxx>
Reviewed-by: Mario Limonciello (AMD) <superm1@xxxxxxxxxx>
---
  drivers/accel/amdxdna/aie2_message.c  | 44 +++++++++++++++++++++++++++
  drivers/accel/amdxdna/aie2_msg_priv.h | 16 ++++++++++
  drivers/accel/amdxdna/aie2_pci.c      |  8 +++++
  drivers/accel/amdxdna/aie2_pci.h      |  2 ++
  drivers/accel/amdxdna/npu4_regs.c     |  3 +-
  5 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/drivers/accel/amdxdna/aie2_message.c b/drivers/accel/amdxdna/aie2_message.c
index e52dc7ea9fc7..976ad6281078 100644
--- a/drivers/accel/amdxdna/aie2_message.c
+++ b/drivers/accel/amdxdna/aie2_message.c
@@ -1200,3 +1200,47 @@ int aie2_query_app_health(struct amdxdna_dev_hdl *ndev, u32 context_id,
      aie2_free_msg_buffer(ndev, buf_size, buf, dma_addr);
      return ret;
  }
+
+static int
+aie2_runtime_update_ctx_prop(struct amdxdna_dev_hdl *ndev,
+                 struct amdxdna_hwctx *ctx, u32 type, u32 value)
+{
+    DECLARE_AIE_MSG(update_property, MSG_OP_UPDATE_PROPERTY);
+    struct amdxdna_dev *xdna = ndev->aie.xdna;
+    int ret;
+
+    if (!AIE_FEATURE_ON(&ndev->aie, AIE2_UPDATE_PROPERTY))
+        return -EOPNOTSUPP;
+
+    if (ctx)
+        req.context_id = ctx->fw_ctx_id;
+    else
+        req.context_id = AIE2_UPDATE_PROPERTY_ALL_CTX;
+
+    req.time_quota_us = value;
+    req.type = type;
+
+    ret = aie_send_mgmt_msg_wait(&ndev->aie, &msg);
+    if (ret) {
+        XDNA_ERR(xdna, "%s update property failed, type %d ret %d",
+             ctx ? ctx->name : "ctx.all", type, ret);
+        return ret;
+    }
+
+    return 0;
+}
+
+int aie2_update_prop_time_quota(struct amdxdna_dev_hdl *ndev, u32 us)
+{
+    struct amdxdna_dev *xdna = ndev->aie.xdna;
+    int ret;
+
+    ret = aie2_runtime_update_ctx_prop(ndev, NULL, UPDATE_PROPERTY_TIME_QUOTA, us);
+    if (ret == -EOPNOTSUPP) {
+        XDNA_DBG(xdna, "update time quota not support, skipped");
+        ret = 0;
+    } else if (!ret) {
+        XDNA_DBG(xdna, "Ctx exec time quantum updated to %u us", us);
+    }
+    return ret;
+}
diff --git a/drivers/accel/amdxdna/aie2_msg_priv.h b/drivers/accel/amdxdna/aie2_msg_priv.h
index f18e89a39e35..fc2e99510980 100644
--- a/drivers/accel/amdxdna/aie2_msg_priv.h
+++ b/drivers/accel/amdxdna/aie2_msg_priv.h
@@ -31,6 +31,7 @@ enum aie2_msg_opcode {
      MSG_OP_SET_RUNTIME_CONFIG          = 0x10A,
      MSG_OP_GET_RUNTIME_CONFIG          = 0x10B,
      MSG_OP_REGISTER_ASYNC_EVENT_MSG    = 0x10C,
+    MSG_OP_UPDATE_PROPERTY             = 0x113,
      MSG_OP_GET_APP_HEALTH              = 0x114,
      MSG_OP_MAX_DRV_OPCODE,
      MSG_OP_GET_PROTOCOL_VERSION        = 0x301,
@@ -503,4 +504,19 @@ struct get_app_health_resp {
      __u32 required_buffer_size;
      __u32 reserved[7];
  } __packed;
+
+struct update_property_req {
+#define UPDATE_PROPERTY_TIME_QUOTA 0
+    __u32 type;
+#define AIE2_UPDATE_PROPERTY_ALL_CTX    0xFF
+    __u8 context_id;
+    __u8 reserved[7];
+    __u32 time_quota_us;
+    __u32 reserved1;
+} __packed;
+
+struct update_property_resp {
+    enum aie2_msg_status status;
+} __packed;
+
  #endif /* _AIE2_MSG_PRIV_H_ */
diff --git a/drivers/accel/amdxdna/aie2_pci.c b/drivers/accel/amdxdna/aie2_pci.c
index c9c23c889c78..afbe3f8f67ce 100644
--- a/drivers/accel/amdxdna/aie2_pci.c
+++ b/drivers/accel/amdxdna/aie2_pci.c
@@ -33,6 +33,8 @@ static int aie2_max_col = XRS_MAX_COL;
  module_param(aie2_max_col, uint, 0600);
  MODULE_PARM_DESC(aie2_max_col, "Maximum column could be used");
  +#define DEFAULT_TIME_QUANTUM 30000 /* microseconds */
+
  static char *npu_fw[] = {
      "npu_7.sbin",
      "npu.sbin"
@@ -186,6 +188,12 @@ static int aie2_mgmt_fw_init(struct amdxdna_dev_hdl *ndev)
          return ret;
      }
  +    ret = aie2_update_prop_time_quota(ndev, DEFAULT_TIME_QUANTUM);
+    if (ret) {
+        XDNA_ERR(ndev->aie.xdna, "Failed to update execution time quantum");
+        return ret;
+    }
+
      ret = aie2_xdna_reset(ndev);
      if (ret) {
          XDNA_ERR(ndev->aie.xdna, "Reset firmware failed");
diff --git a/drivers/accel/amdxdna/aie2_pci.h b/drivers/accel/amdxdna/aie2_pci.h
index f83deca2b51a..69b53c7bcb86 100644
--- a/drivers/accel/amdxdna/aie2_pci.h
+++ b/drivers/accel/amdxdna/aie2_pci.h
@@ -222,6 +222,7 @@ enum aie2_fw_feature {
      AIE2_PREEMPT,
      AIE2_TEMPORAL_ONLY,
      AIE2_APP_HEALTH,
+    AIE2_UPDATE_PROPERTY,
      AIE2_FEATURE_MAX
  };
  @@ -308,6 +309,7 @@ int aie2_sync_bo(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
           int (*notify_cb)(void *, void __iomem *, size_t));
  int aie2_config_debug_bo(struct amdxdna_hwctx *hwctx, struct amdxdna_sched_job *job,
               int (*notify_cb)(void *, void __iomem *, size_t));
+int aie2_update_prop_time_quota(struct amdxdna_dev_hdl *ndev, u32 us);
  void *aie2_alloc_msg_buffer(struct amdxdna_dev_hdl *ndev, u32 *size,
                  dma_addr_t *dma_addr);
  void aie2_free_msg_buffer(struct amdxdna_dev_hdl *ndev, size_t size,
diff --git a/drivers/accel/amdxdna/npu4_regs.c b/drivers/accel/amdxdna/npu4_regs.c
index a3b6df56abd0..6ebf75ad5fb4 100644
--- a/drivers/accel/amdxdna/npu4_regs.c
+++ b/drivers/accel/amdxdna/npu4_regs.c
@@ -93,9 +93,10 @@ const struct dpm_clk_freq npu4_dpm_clk_table[] = {
    const struct amdxdna_fw_feature_tbl npu4_fw_feature_table[] = {
      { .major = 6, .min_minor = 12 },
-    { .features = BIT_U64(AIE2_NPU_COMMAND), .major = 6, .min_minor = 15 },
      { .features = BIT_U64(AIE2_PREEMPT), .major = 6, .min_minor = 12 },
      { .features = BIT_U64(AIE2_TEMPORAL_ONLY), .major = 6, .min_minor = 12 },
+    { .features = BIT_U64(AIE2_NPU_COMMAND), .major = 6, .min_minor = 15 },
+    { .features = BIT_U64(AIE2_UPDATE_PROPERTY), .major = 6, .min_minor = 15 },
      { .features = BIT_U64(AIE2_APP_HEALTH), .major = 6, .min_minor = 18 },
      { .features = AIE2_ALL_FEATURES, .major = 7 },
      { 0 }