Add power mode support for AIE4 devices via DRM_AMDXDNA_GET_INFO and DRM_AMDXDNA_SET_STATE: - Add AIE4_MSG_OP_POWER_OVERRIDE mailbox support - Add DRM_AMDXDNA_GET_POWER_MODE support - Implement aie4_set_power_mode() and wire .set_aie_state
Firmware boots in POWER_MODE_DEFAULT after a reload, so re-send the cached user power mode override whenever the hardware starts via aie4_restore_power_mode(). On a fresh probe, pw_mode is POWER_MODE_DEFAULT. Co-developed-by: Soham Donwalkar <[email protected]> Signed-off-by: Soham Donwalkar <[email protected]> Co-developed-by: Nishad Saraf <[email protected]> Signed-off-by: Nishad Saraf <[email protected]> Signed-off-by: David Zhang <[email protected]> --- drivers/accel/amdxdna/aie4_message.c | 17 ++++ drivers/accel/amdxdna/aie4_msg_priv.h | 9 ++ drivers/accel/amdxdna/aie4_pci.c | 124 ++++++++++++++++++++++++++ drivers/accel/amdxdna/aie4_pci.h | 6 ++ 4 files changed, 156 insertions(+) diff --git a/drivers/accel/amdxdna/aie4_message.c b/drivers/accel/amdxdna/aie4_message.c index 4814cbb1f2c5..25a510bd7419 100644 --- a/drivers/accel/amdxdna/aie4_message.c +++ b/drivers/accel/amdxdna/aie4_message.c @@ -157,3 +157,20 @@ int aie4_attach_work_buffer(struct amdxdna_dev_hdl *ndev) return ret; } + +int aie4_msg_set_power_mode(struct amdxdna_dev_hdl *ndev, u8 power_mode) +{ + DECLARE_AIE_MSG(aie4_msg_power_override, AIE4_MSG_OP_POWER_OVERRIDE); + int ret; + + req.power_mode = power_mode; + + ret = aie_send_mgmt_msg_wait(&ndev->aie, &msg); + if (ret) + XDNA_WARN(ndev->aie.xdna, + "Failed to set power mode %u, ret %d", (u32)power_mode, ret); + else + XDNA_DBG(ndev->aie.xdna, "Power mode set to %u", (u32)power_mode); + + return ret; +} diff --git a/drivers/accel/amdxdna/aie4_msg_priv.h b/drivers/accel/amdxdna/aie4_msg_priv.h index 81842fa1d6ce..4c06792df1bd 100644 --- a/drivers/accel/amdxdna/aie4_msg_priv.h +++ b/drivers/accel/amdxdna/aie4_msg_priv.h @@ -23,6 +23,7 @@ enum aie4_msg_opcode { AIE4_MSG_OP_DESTROY_HW_CONTEXT = 0x30004, AIE4_MSG_OP_AIE_TILE_INFO = 0x30006, AIE4_MSG_OP_AIE_VERSION_INFO = 0x30007, + AIE4_MSG_OP_POWER_OVERRIDE = 0x3000B, AIE4_MSG_OP_ATTACH_WORK_BUFFER = 0x40001, }; @@ -187,6 +188,14 @@ struct aie4_msg_query_cert_firmware_version_resp { __u16 host_queue_minor; } __packed; +struct aie4_msg_power_override_req { + __u32 power_mode; +} __packed; + +struct aie4_msg_power_override_resp { + enum aie4_msg_status status; +} __packed; + #define AIE4_WORK_BUFFER_MIN_SIZE SZ_4M struct aie4_msg_attach_work_buffer_req { diff --git a/drivers/accel/amdxdna/aie4_pci.c b/drivers/accel/amdxdna/aie4_pci.c index aea3edd51b4f..d11bdbf16881 100644 --- a/drivers/accel/amdxdna/aie4_pci.c +++ b/drivers/accel/amdxdna/aie4_pci.c @@ -4,6 +4,7 @@ */ #include <drm/amdxdna_accel.h> +#include <drm/drm_drv.h> #include <drm/drm_managed.h> #include <drm/drm_print.h> #include <linux/firmware.h> @@ -15,6 +16,7 @@ #include "amdxdna_mailbox.h" #include "amdxdna_mailbox_helper.h" #include "amdxdna_pci_drv.h" +#include "amdxdna_pm.h" #define NO_IOHUB 0 #define PSP_NOTIFY_INTR 0xD007BE11 @@ -293,6 +295,27 @@ static int aie4_query(struct amdxdna_dev_hdl *ndev) return 0; } +/* + * Firmware always boots in POWER_MODE_DEFAULT after a (re)load, so re-send the + * cached user override whenever the hardware starts. This keeps the driver + * cache (ndev->pw_mode) and the firmware power state consistent across + * suspend/resume and runtime PM cycles. On a fresh probe pw_mode is + * POWER_MODE_DEFAULT and this is a no-op. + * + * Power override is a per-VF property in firmware: each supervisor (VF) stores + * its own requested mode and the hypervisor arbitrates globally by taking the + * highest mode across all supervisors. A full firmware reload on suspend clears + * every supervisor override back to default, so each device type (PF, VF and + * classic) must re-send its own cached override on resume. + */ +int aie4_restore_power_mode(struct amdxdna_dev_hdl *ndev) +{ + if (ndev->pw_mode == POWER_MODE_DEFAULT) + return 0; + + return aie4_msg_set_power_mode(ndev, ndev->pw_mode); +} + static int aie4_pf_hw_start(struct amdxdna_dev_hdl *ndev) { int ret; @@ -309,6 +332,10 @@ static int aie4_pf_hw_start(struct amdxdna_dev_hdl *ndev) if (ret) goto mbox_fini; + ret = aie4_restore_power_mode(ndev); + if (ret) + goto mbox_fini; + return 0; mbox_fini: @@ -346,6 +373,10 @@ static int aie4_vf_hw_start(struct amdxdna_dev_hdl *ndev) if (ret) goto mailbox_fini; + ret = aie4_restore_power_mode(ndev); + if (ret) + goto mailbox_fini; + return 0; mailbox_fini: @@ -387,8 +418,14 @@ static int aie4_classic_hw_start(struct amdxdna_dev_hdl *ndev) if (ret) goto mailbox_fini; + ret = aie4_restore_power_mode(ndev); + if (ret) + goto partition_fini; + return 0; +partition_fini: + aie4_partition_fini(ndev); mailbox_fini: aie4_mailbox_fini(ndev); stop_fw: @@ -528,6 +565,7 @@ static int aie4m_pcidev_init(struct amdxdna_dev *xdna) ndev->priv = xdna->dev_info->dev_priv; ndev->aie.xdna = xdna; + ndev->pw_mode = POWER_MODE_DEFAULT; xdna->dev_handle = ndev; xa_init_flags(&ndev->cert_comp_xa, XA_FLAGS_ALLOC); @@ -582,6 +620,24 @@ static int aie4m_pcidev_init(struct amdxdna_dev *xdna) return 0; } +static int aie4_get_power_mode(struct amdxdna_client *client, + struct amdxdna_drm_get_info *args) +{ + struct amdxdna_drm_get_power_mode mode = {}; + struct amdxdna_dev *xdna = client->xdna; + struct amdxdna_dev_hdl *ndev; + u32 buf_sz; + + ndev = xdna->dev_handle; + mode.power_mode = ndev->pw_mode; + + buf_sz = min_t(u32, args->buffer_size, sizeof(mode)); + if (copy_to_user(u64_to_user_ptr(args->buffer), &mode, buf_sz)) + return -EFAULT; + + return 0; +} + static int aie4_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_info *args) { struct amdxdna_dev *xdna = client->xdna; @@ -598,6 +654,9 @@ static int aie4_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_i case DRM_AMDXDNA_QUERY_FIRMWARE_VERSION: ret = amdxdna_get_firmware_version(client, args, &xdna->fw_ver); break; + case DRM_AMDXDNA_GET_POWER_MODE: + ret = aie4_get_power_mode(client, args); + break; default: XDNA_ERR(xdna, "Not supported request parameter %u", args->param); ret = -EOPNOTSUPP; @@ -608,6 +667,69 @@ static int aie4_get_info(struct amdxdna_client *client, struct amdxdna_drm_get_i return ret; } +static int aie4_set_power_mode(struct amdxdna_client *client, + struct amdxdna_drm_set_state *args) +{ + struct amdxdna_drm_set_power_mode power_state = { 0 }; + struct amdxdna_dev *xdna = client->xdna; + struct amdxdna_dev_hdl *ndev = xdna->dev_handle; + u32 buf_sz; + u8 power_mode; + int ret; + + buf_sz = min_t(u32, args->buffer_size, sizeof(power_state)); + if (copy_from_user(&power_state, u64_to_user_ptr(args->buffer), buf_sz)) { + XDNA_ERR(xdna, "Failed to copy power mode request into kernel"); + return -EFAULT; + } + + if (XDNA_MBZ_DBG(xdna, power_state.pad, sizeof(power_state.pad))) + return -EINVAL; + + power_mode = power_state.power_mode; + if (power_mode > POWER_MODE_TURBO) { + XDNA_ERR(xdna, "Invalid power mode %d", power_mode); + return -EINVAL; + } + + ret = aie4_msg_set_power_mode(xdna->dev_handle, power_mode); + if (ret) + return ret; + + ndev->pw_mode = power_mode; + return 0; +} + +static int aie4_set_state(struct amdxdna_client *client, + struct amdxdna_drm_set_state *args) +{ + struct amdxdna_dev *xdna = client->xdna; + int ret, idx; + + if (!drm_dev_enter(&xdna->ddev, &idx)) + return -ENODEV; + + ret = amdxdna_pm_resume_get_locked(xdna); + if (ret) + goto dev_exit; + + switch (args->param) { + case DRM_AMDXDNA_SET_POWER_MODE: + ret = aie4_set_power_mode(client, args); + break; + default: + XDNA_ERR(xdna, "Not supported request parameter %u", args->param); + ret = -EOPNOTSUPP; + break; + } + + amdxdna_pm_suspend_put(xdna); + +dev_exit: + drm_dev_exit(idx); + return ret; +} + static int aie4_alloc_work_buffer(struct amdxdna_dev_hdl *ndev) { struct amdxdna_dev *xdna = ndev->aie.xdna; @@ -730,6 +852,7 @@ const struct amdxdna_dev_ops aie4_vf_ops = { .hwctx_fini = aie4_hwctx_fini, .cmd_wait = aie4_cmd_wait, .get_aie_info = aie4_get_info, + .set_aie_state = aie4_set_state, }; const struct amdxdna_dev_ops aie4_classic_ops = { @@ -739,4 +862,5 @@ const struct amdxdna_dev_ops aie4_classic_ops = { .hwctx_fini = aie4_hwctx_fini, .cmd_wait = aie4_cmd_wait, .get_aie_info = aie4_get_info, + .set_aie_state = aie4_set_state, }; diff --git a/drivers/accel/amdxdna/aie4_pci.h b/drivers/accel/amdxdna/aie4_pci.h index 5ae5e8427a3b..fd2c50dc8080 100644 --- a/drivers/accel/amdxdna/aie4_pci.h +++ b/drivers/accel/amdxdna/aie4_pci.h @@ -58,6 +58,8 @@ struct amdxdna_dev_hdl { dma_addr_t work_buf_addr; u32 work_buf_size; + u8 pw_mode; + struct amdxdna_drm_query_firmware_version cert_version; }; @@ -77,6 +79,7 @@ int aie4_query_npu_firmware_version(struct amdxdna_dev_hdl *ndev, struct amdxdna_drm_query_firmware_version *fw_version); int aie4_query_cert_firmware_version(struct amdxdna_dev_hdl *ndev, struct amdxdna_drm_query_firmware_version *cert_version); +int aie4_msg_set_power_mode(struct amdxdna_dev_hdl *ndev, u8 power_mode); u32 aie4_msg_pasid(struct amdxdna_client *client); /* aie4_ctx.c */ @@ -84,6 +87,9 @@ int aie4_hwctx_init(struct amdxdna_hwctx *hwctx); void aie4_hwctx_fini(struct amdxdna_hwctx *hwctx); int aie4_cmd_wait(struct amdxdna_hwctx *hwctx, u64 seq, u32 timeout); +/* aie4_pci.c */ +int aie4_restore_power_mode(struct amdxdna_dev_hdl *ndev); + /* aie4_sriov.c */ #if IS_ENABLED(CONFIG_PCI_IOV) int aie4_sriov_configure(struct amdxdna_dev *xdna, int num_vfs); -- 2.34.1
