[PATCH] drm/amd/amdgpu: consolidate PSP TA context

Li, Candice Candice.Li at amd.com
Fri Aug 13 07:21:31 UTC 2021


[Public]

Signed-off-by: Candice Li candice.li at amd.com<mailto:candice.li at amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c   |  16 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c   | 162 +++++++++++-----------
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h   |  37 ++---
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c   |   2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h   |   4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c |   6 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h |  20 +--
drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c  |   6 +-
drivers/gpu/drm/amd/amdgpu/psp_v10_0.c    |  40 +++---
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c    |  28 ++--
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c    |  24 ++--
11 files changed, 158 insertions(+), 187 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 20b049ad61c1..7e45640fbee0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -341,27 +341,27 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info,
                            switch (query_fw->index) {
                            case TA_FW_TYPE_PSP_XGMI:
                                          fw_info->ver = adev->psp.ta_fw_version;
-                                          fw_info->feature = adev->psp.ta_xgmi_ucode_version;
+                                         fw_info->feature = adev->psp.xgmi.feature_version;
                                          break;
                            case TA_FW_TYPE_PSP_RAS:
                                          fw_info->ver = adev->psp.ta_fw_version;
-                                          fw_info->feature = adev->psp.ta_ras_ucode_version;
+                                         fw_info->feature = adev->psp.ras.feature_version;
                                          break;
                            case TA_FW_TYPE_PSP_HDCP:
                                          fw_info->ver = adev->psp.ta_fw_version;
-                                          fw_info->feature = adev->psp.ta_hdcp_ucode_version;
+                                         fw_info->feature = adev->psp.hdcp.feature_version;
                                          break;
                            case TA_FW_TYPE_PSP_DTM:
                                          fw_info->ver = adev->psp.ta_fw_version;
-                                          fw_info->feature = adev->psp.ta_dtm_ucode_version;
+                                         fw_info->feature = adev->psp.dtm.feature_version;
                                          break;
                            case TA_FW_TYPE_PSP_RAP:
                                          fw_info->ver = adev->psp.ta_fw_version;
-                                          fw_info->feature = adev->psp.ta_rap_ucode_version;
+                                         fw_info->feature = adev->psp.rap.feature_version;
                                          break;
                            case TA_FW_TYPE_PSP_SECUREDISPLAY:
                                          fw_info->ver = adev->psp.ta_fw_version;
-                                          fw_info->feature = adev->psp.ta_securedisplay_ucode_version;
+                                         fw_info->feature = adev->psp.securedisplay.feature_version;
                                          break;
                            default:
                                          return -EINVAL;
@@ -378,8 +378,8 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info,
                            fw_info->feature = adev->psp.sos.feature_version;
                            break;
             case AMDGPU_INFO_FW_ASD:
-                           fw_info->ver = adev->psp.asd_fw_version;
-                           fw_info->feature = adev->psp.asd_feature_version;
+                           fw_info->ver = adev->psp.asd.fw_version;
+                           fw_info->feature = adev->psp.asd.feature_version;
                            break;
             case AMDGPU_INFO_FW_DMCU:
                            fw_info->ver = adev->dm.dmcu_fw_version;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 9dc2d6d9712a..cf40609f39d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -799,15 +799,15 @@ static int psp_asd_load(struct psp_context *psp)
              * add workaround to bypass it for sriov now.
              * TODO: add version check to make it common
              */
-             if (amdgpu_sriov_vf(psp->adev) || !psp->asd_ucode_size)
+            if (amdgpu_sriov_vf(psp->adev) || !psp->asd.size_bytes)
                            return 0;
              cmd = acquire_psp_cmd_buf(psp);
-             psp_copy_fw(psp, psp->asd_start_addr, psp->asd_ucode_size);
+            psp_copy_fw(psp, psp->asd.start_addr, psp->asd.size_bytes);
              psp_prep_asd_load_cmd_buf(cmd, psp->fw_pri_mc_addr,
-                                                          psp->asd_ucode_size);
+                                                         psp->asd.size_bytes);
              ret = psp_cmd_submit_buf(psp, NULL, cmd,
                                                          psp->fence_buf_mc_addr);
@@ -952,11 +952,11 @@ static int psp_xgmi_load(struct psp_context *psp)
              cmd = acquire_psp_cmd_buf(psp);
-             psp_copy_fw(psp, psp->ta_xgmi_start_addr, psp->ta_xgmi_ucode_size);
+            psp_copy_fw(psp, psp->xgmi.start_addr, psp->xgmi.size_bytes);
              psp_prep_ta_load_cmd_buf(cmd,
                                                          psp->fw_pri_mc_addr,
-                                                        psp->ta_xgmi_ucode_size,
+                                                       psp->xgmi.size_bytes,
                                                          psp->xgmi_context.xgmi_shared_mc_addr,
                                                          PSP_XGMI_SHARED_MEM_SIZE);
@@ -1031,9 +1031,9 @@ int psp_xgmi_initialize(struct psp_context *psp)
             struct ta_xgmi_shared_memory *xgmi_cmd;
             int ret;
-             if (!psp->adev->psp.ta_fw ||
-                 !psp->adev->psp.ta_xgmi_ucode_size ||
-                 !psp->adev->psp.ta_xgmi_start_addr)
+            if (!psp->ta_fw ||
+                !psp->xgmi.size_bytes ||
+                !psp->xgmi.start_addr)
                            return -ENOENT;
              if (!psp->xgmi_context.initialized) {
@@ -1100,7 +1100,7 @@ int psp_xgmi_get_node_id(struct psp_context *psp, uint64_t *node_id)
static bool psp_xgmi_peer_link_info_supported(struct psp_context *psp)
{
             return psp->adev->asic_type == CHIP_ALDEBARAN &&
-                                                        psp->ta_xgmi_ucode_version >= 0x2000000b;
+                                                       psp->xgmi.feature_version >= 0x2000000b;
}
 int psp_xgmi_get_topology_info(struct psp_context *psp,
@@ -1206,9 +1206,9 @@ static int psp_ras_init_shared_buf(struct psp_context *psp)
              */
             ret = amdgpu_bo_create_kernel(psp->adev, PSP_RAS_SHARED_MEM_SIZE,
                                          PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM,
-                                          &psp->ras.ras_shared_bo,
-                                          &psp->ras.ras_shared_mc_addr,
-                                          &psp->ras.ras_shared_buf);
+                                         &psp->ras_context.ras_shared_bo,
+                                         &psp->ras_context.ras_shared_mc_addr,
+                                         &psp->ras_context.ras_shared_buf);
              return ret;
}
@@ -1225,9 +1225,9 @@ static int psp_ras_load(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             psp_copy_fw(psp, psp->ta_ras_start_addr, psp->ta_ras_ucode_size);
+            psp_copy_fw(psp, psp->ras.start_addr, psp->ras.size_bytes);
-             ras_cmd = (struct ta_ras_shared_memory *)psp->ras.ras_shared_buf;
+            ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
              if (psp->adev->gmc.xgmi.connected_to_cpu)
                            ras_cmd->ras_in_message.init_flags.poison_mode_en = 1;
@@ -1238,18 +1238,18 @@ static int psp_ras_load(struct psp_context *psp)
              psp_prep_ta_load_cmd_buf(cmd,
                                                          psp->fw_pri_mc_addr,
-                                                        psp->ta_ras_ucode_size,
-                                                        psp->ras.ras_shared_mc_addr,
+                                                       psp->ras.size_bytes,
+                                                       psp->ras_context.ras_shared_mc_addr,
                                                          PSP_RAS_SHARED_MEM_SIZE);
              ret = psp_cmd_submit_buf(psp, NULL, cmd,
                                          psp->fence_buf_mc_addr);
              if (!ret) {
-                           psp->ras.session_id = cmd->resp.session_id;
+                           psp->ras_context.session_id = cmd->resp.session_id;
                             if (!ras_cmd->ras_status)
-                                          psp->ras.ras_initialized = true;
+                                         psp->ras_context.ras_initialized = true;
                            else
                                          dev_warn(psp->adev->dev, "RAS Init Status: 0x%X\n", ras_cmd->ras_status);
             }
@@ -1275,7 +1275,7 @@ static int psp_ras_unload(struct psp_context *psp)
              cmd = acquire_psp_cmd_buf(psp);
-             psp_prep_ta_unload_cmd_buf(cmd, psp->ras.session_id);
+            psp_prep_ta_unload_cmd_buf(cmd, psp->ras_context.session_id);
              ret = psp_cmd_submit_buf(psp, NULL, cmd,
                                          psp->fence_buf_mc_addr);
@@ -1290,7 +1290,7 @@ int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
             struct ta_ras_shared_memory *ras_cmd;
             int ret;
-             ras_cmd = (struct ta_ras_shared_memory *)psp->ras.ras_shared_buf;
+            ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
              /*
              * TODO: bypass the loading in sriov for now
@@ -1298,7 +1298,7 @@ int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             ret = psp_ta_invoke(psp, ta_cmd_id, psp->ras.session_id);
+            ret = psp_ta_invoke(psp, ta_cmd_id, psp->ras_context.session_id);
              if (amdgpu_ras_intr_triggered())
                            return ret;
@@ -1354,10 +1354,10 @@ int psp_ras_enable_features(struct psp_context *psp,
             struct ta_ras_shared_memory *ras_cmd;
             int ret;
-             if (!psp->ras.ras_initialized)
+            if (!psp->ras_context.ras_initialized)
                            return -EINVAL;
-             ras_cmd = (struct ta_ras_shared_memory *)psp->ras.ras_shared_buf;
+            ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
             memset(ras_cmd, 0, sizeof(struct ta_ras_shared_memory));
              if (enable)
@@ -1384,19 +1384,19 @@ static int psp_ras_terminate(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             if (!psp->ras.ras_initialized)
+            if (!psp->ras_context.ras_initialized)
                            return 0;
              ret = psp_ras_unload(psp);
             if (ret)
                            return ret;
-             psp->ras.ras_initialized = false;
+            psp->ras_context.ras_initialized = false;
              /* free ras shared memory */
-             amdgpu_bo_free_kernel(&psp->ras.ras_shared_bo,
-                                          &psp->ras.ras_shared_mc_addr,
-                                          &psp->ras.ras_shared_buf);
+            amdgpu_bo_free_kernel(&psp->ras_context.ras_shared_bo,
+                                         &psp->ras_context.ras_shared_mc_addr,
+                                         &psp->ras_context.ras_shared_buf);
              return 0;
}
@@ -1413,8 +1413,8 @@ static int psp_ras_initialize(struct psp_context *psp)
             if (amdgpu_sriov_vf(adev))
                            return 0;
-             if (!adev->psp.ta_ras_ucode_size ||
-                 !adev->psp.ta_ras_start_addr) {
+            if (!adev->psp.ras.size_bytes ||
+                !adev->psp.ras.start_addr) {
                            dev_info(adev->dev, "RAS: optional ras ta ucode is not available\n");
                            return 0;
             }
@@ -1460,7 +1460,7 @@ static int psp_ras_initialize(struct psp_context *psp)
                            }
             }
-             if (!psp->ras.ras_initialized) {
+            if (!psp->ras_context.ras_initialized) {
                            ret = psp_ras_init_shared_buf(psp);
                            if (ret)
                                          return ret;
@@ -1479,10 +1479,10 @@ int psp_ras_trigger_error(struct psp_context *psp,
             struct ta_ras_shared_memory *ras_cmd;
             int ret;
-             if (!psp->ras.ras_initialized)
+            if (!psp->ras_context.ras_initialized)
                            return -EINVAL;
-             ras_cmd = (struct ta_ras_shared_memory *)psp->ras.ras_shared_buf;
+            ras_cmd = (struct ta_ras_shared_memory *)psp->ras_context.ras_shared_buf;
             memset(ras_cmd, 0, sizeof(struct ta_ras_shared_memory));
              ras_cmd->cmd_id = TA_RAS_COMMAND__TRIGGER_ERROR;
@@ -1530,14 +1530,14 @@ static int psp_hdcp_load(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             psp_copy_fw(psp, psp->ta_hdcp_start_addr,
-                               psp->ta_hdcp_ucode_size);
+            psp_copy_fw(psp, psp->hdcp.start_addr,
+                               psp->hdcp.size_bytes);
              cmd = acquire_psp_cmd_buf(psp);
              psp_prep_ta_load_cmd_buf(cmd,
                                                          psp->fw_pri_mc_addr,
-                                                        psp->ta_hdcp_ucode_size,
+                                                       psp->hdcp.size_bytes,
                                                          psp->hdcp_context.hdcp_shared_mc_addr,
                                                          PSP_HDCP_SHARED_MEM_SIZE);
@@ -1563,8 +1563,8 @@ static int psp_hdcp_initialize(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             if (!psp->adev->psp.ta_hdcp_ucode_size ||
-                 !psp->adev->psp.ta_hdcp_start_addr) {
+            if (!psp->hdcp.size_bytes ||
+                !psp->hdcp.start_addr) {
                            dev_info(psp->adev->dev, "HDCP: optional hdcp ta ucode is not available\n");
                            return 0;
             }
@@ -1677,13 +1677,13 @@ static int psp_dtm_load(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             psp_copy_fw(psp, psp->ta_dtm_start_addr, psp->ta_dtm_ucode_size);
+            psp_copy_fw(psp, psp->dtm.start_addr, psp->dtm.size_bytes);
              cmd = acquire_psp_cmd_buf(psp);
              psp_prep_ta_load_cmd_buf(cmd,
                                                          psp->fw_pri_mc_addr,
-                                                        psp->ta_dtm_ucode_size,
+                                                       psp->dtm.size_bytes,
                                                          psp->dtm_context.dtm_shared_mc_addr,
                                                          PSP_DTM_SHARED_MEM_SIZE);
@@ -1710,8 +1710,8 @@ static int psp_dtm_initialize(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             if (!psp->adev->psp.ta_dtm_ucode_size ||
-                 !psp->adev->psp.ta_dtm_start_addr) {
+            if (!psp->dtm.size_bytes ||
+                !psp->dtm.start_addr) {
                            dev_info(psp->adev->dev, "DTM: optional dtm ta ucode is not available\n");
                            return 0;
             }
@@ -1818,13 +1818,13 @@ static int psp_rap_load(struct psp_context *psp)
             int ret;
             struct psp_gfx_cmd_resp *cmd;
-             psp_copy_fw(psp, psp->ta_rap_start_addr, psp->ta_rap_ucode_size);
+            psp_copy_fw(psp, psp->rap.start_addr, psp->rap.size_bytes);
              cmd = acquire_psp_cmd_buf(psp);
              psp_prep_ta_load_cmd_buf(cmd,
                                                          psp->fw_pri_mc_addr,
-                                                        psp->ta_rap_ucode_size,
+                                                       psp->rap.size_bytes,
                                                          psp->rap_context.rap_shared_mc_addr,
                                                          PSP_RAP_SHARED_MEM_SIZE);
@@ -1866,8 +1866,8 @@ static int psp_rap_initialize(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             if (!psp->adev->psp.ta_rap_ucode_size ||
-                 !psp->adev->psp.ta_rap_start_addr) {
+            if (!psp->rap.size_bytes ||
+                !psp->rap.start_addr) {
                            dev_info(psp->adev->dev, "RAP: optional rap ta ucode is not available\n");
                            return 0;
             }
@@ -1979,11 +1979,11 @@ static int psp_securedisplay_load(struct psp_context *psp)
             struct psp_gfx_cmd_resp *cmd = acquire_psp_cmd_buf(psp);
              memset(psp->fw_pri_buf, 0, PSP_1_MEG);
-             memcpy(psp->fw_pri_buf, psp->ta_securedisplay_start_addr, psp->ta_securedisplay_ucode_size);
+            memcpy(psp->fw_pri_buf, psp->securedisplay.start_addr, psp->securedisplay.size_bytes);
              psp_prep_ta_load_cmd_buf(cmd,
                                                          psp->fw_pri_mc_addr,
-                                                        psp->ta_securedisplay_ucode_size,
+                                                       psp->securedisplay.size_bytes,
                                                          psp->securedisplay_context.securedisplay_shared_mc_addr,
                                                          PSP_SECUREDISPLAY_SHARED_MEM_SIZE);
@@ -2025,8 +2025,8 @@ static int psp_securedisplay_initialize(struct psp_context *psp)
             if (amdgpu_sriov_vf(psp->adev))
                            return 0;
-             if (!psp->adev->psp.ta_securedisplay_ucode_size ||
-                 !psp->adev->psp.ta_securedisplay_start_addr) {
+            if (!psp->securedisplay.size_bytes ||
+                !psp->securedisplay.start_addr) {
                            dev_info(psp->adev->dev, "SECUREDISPLAY: securedisplay ta ucode is not available\n");
                            return 0;
             }
@@ -2420,7 +2420,7 @@ static int psp_load_smu_fw(struct psp_context *psp)
             struct amdgpu_device *adev = psp->adev;
             struct amdgpu_firmware_info *ucode =
                                          &adev->firmware.ucode[AMDGPU_UCODE_ID_SMC];
-             struct amdgpu_ras *ras = psp->ras.ras;
+            struct amdgpu_ras *ras = psp->ras_context.ras;
              if (!ucode->fw || amdgpu_sriov_vf(psp->adev))
                            return 0;
@@ -2625,7 +2625,7 @@ static int psp_load_fw(struct amdgpu_device *adev)
                            return ret;
             }
-             if (psp->adev->psp.ta_fw) {
+            if (psp->ta_fw) {
                            ret = psp_ras_initialize(psp);
                            if (ret)
                                          dev_err(psp->adev->dev,
@@ -2697,7 +2697,7 @@ static int psp_hw_fini(void *handle)
             struct amdgpu_device *adev = (struct amdgpu_device *)handle;
             struct psp_context *psp = &adev->psp;
-             if (psp->adev->psp.ta_fw) {
+            if (psp->ta_fw) {
                            psp_ras_terminate(psp);
                            psp_securedisplay_terminate(psp);
                            psp_rap_terminate(psp);
@@ -2735,7 +2735,7 @@ static int psp_suspend(void *handle)
                            }
             }
-             if (psp->adev->psp.ta_fw) {
+            if (psp->ta_fw) {
                            ret = psp_ras_terminate(psp);
                            if (ret) {
                                          DRM_ERROR("Failed to terminate ras ta\n");
@@ -2826,7 +2826,7 @@ static int psp_resume(void *handle)
                                                         "XGMI: Failed to initialize XGMI session\n");
             }
-             if (psp->adev->psp.ta_fw) {
+            if (psp->ta_fw) {
                            ret = psp_ras_initialize(psp);
                            if (ret)
                                          dev_err(psp->adev->dev,
@@ -2978,10 +2978,10 @@ int psp_init_asd_microcode(struct psp_context *psp,
                            goto out;
              asd_hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.asd_fw->data;
-             adev->psp.asd_fw_version = le32_to_cpu(asd_hdr->header.ucode_version);
-             adev->psp.asd_feature_version = le32_to_cpu(asd_hdr->sos.fw_version);
-             adev->psp.asd_ucode_size = le32_to_cpu(asd_hdr->header.ucode_size_bytes);
-             adev->psp.asd_start_addr = (uint8_t *)asd_hdr +
+            adev->psp.asd.fw_version = le32_to_cpu(asd_hdr->header.ucode_version);
+            adev->psp.asd.feature_version = le32_to_cpu(asd_hdr->sos.fw_version);
+            adev->psp.asd.size_bytes = le32_to_cpu(asd_hdr->header.ucode_size_bytes);
+            adev->psp.asd.start_addr = (uint8_t *)asd_hdr +
                                                        le32_to_cpu(asd_hdr->header.ucode_array_offset_bytes);
             return 0;
out:
@@ -3266,40 +3266,40 @@ static int parse_ta_bin_descriptor(struct psp_context *psp,
              switch (desc->fw_type) {
             case TA_FW_TYPE_PSP_ASD:
-                           psp->asd_fw_version        = le32_to_cpu(desc->fw_version);
-                           psp->asd_feature_version   = le32_to_cpu(desc->fw_version);
-                           psp->asd_ucode_size        = le32_to_cpu(desc->size_bytes);
-                           psp->asd_start_addr         = ucode_start_addr;
+                           psp->asd.fw_version        = le32_to_cpu(desc->fw_version);
+                           psp->asd.feature_version   = le32_to_cpu(desc->fw_version);
+                           psp->asd.size_bytes        = le32_to_cpu(desc->size_bytes);
+                           psp->asd.start_addr          = ucode_start_addr;
                            break;
             case TA_FW_TYPE_PSP_XGMI:
-                           psp->ta_xgmi_ucode_version = le32_to_cpu(desc->fw_version);
-                           psp->ta_xgmi_ucode_size    = le32_to_cpu(desc->size_bytes);
-                           psp->ta_xgmi_start_addr    = ucode_start_addr;
+                           psp->xgmi.feature_version  = le32_to_cpu(desc->fw_version);
+                           psp->xgmi.size_bytes       = le32_to_cpu(desc->size_bytes);
+                           psp->xgmi.start_addr       = ucode_start_addr;
                            break;
             case TA_FW_TYPE_PSP_RAS:
-                           psp->ta_ras_ucode_version  = le32_to_cpu(desc->fw_version);
-                           psp->ta_ras_ucode_size     = le32_to_cpu(desc->size_bytes);
-                           psp->ta_ras_start_addr     = ucode_start_addr;
+                           psp->ras.feature_version   = le32_to_cpu(desc->fw_version);
+                           psp->ras.size_bytes        = le32_to_cpu(desc->size_bytes);
+                           psp->ras.start_addr        = ucode_start_addr;
                            break;
             case TA_FW_TYPE_PSP_HDCP:
-                           psp->ta_hdcp_ucode_version = le32_to_cpu(desc->fw_version);
-                           psp->ta_hdcp_ucode_size    = le32_to_cpu(desc->size_bytes);
-                           psp->ta_hdcp_start_addr    = ucode_start_addr;
+                           psp->hdcp.feature_version  = le32_to_cpu(desc->fw_version);
+                           psp->hdcp.size_bytes       = le32_to_cpu(desc->size_bytes);
+                           psp->hdcp.start_addr       = ucode_start_addr;
                            break;
             case TA_FW_TYPE_PSP_DTM:
-                           psp->ta_dtm_ucode_version  = le32_to_cpu(desc->fw_version);
-                           psp->ta_dtm_ucode_size     = le32_to_cpu(desc->size_bytes);
-                           psp->ta_dtm_start_addr     = ucode_start_addr;
+                           psp->dtm.feature_version  = le32_to_cpu(desc->fw_version);
+                           psp->dtm.size_bytes       = le32_to_cpu(desc->size_bytes);
+                           psp->dtm.start_addr       = ucode_start_addr;
                            break;
             case TA_FW_TYPE_PSP_RAP:
-                           psp->ta_rap_ucode_version  = le32_to_cpu(desc->fw_version);
-                           psp->ta_rap_ucode_size     = le32_to_cpu(desc->size_bytes);
-                           psp->ta_rap_start_addr     = ucode_start_addr;
+                           psp->rap.feature_version  = le32_to_cpu(desc->fw_version);
+                           psp->rap.size_bytes       = le32_to_cpu(desc->size_bytes);
+                           psp->rap.start_addr       = ucode_start_addr;
                            break;
             case TA_FW_TYPE_PSP_SECUREDISPLAY:
-                           psp->ta_securedisplay_ucode_version  = le32_to_cpu(desc->fw_version);
-                           psp->ta_securedisplay_ucode_size     = le32_to_cpu(desc->size_bytes);
-                           psp->ta_securedisplay_start_addr     = ucode_start_addr;
+                           psp->securedisplay.feature_version  = le32_to_cpu(desc->fw_version);
+                           psp->securedisplay.size_bytes       = le32_to_cpu(desc->size_bytes);
+                           psp->securedisplay.start_addr       = ucode_start_addr;
                            break;
             default:
                            dev_warn(psp->adev->dev, "Unsupported TA type: %d\n", desc->fw_type);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index 6b1645598fa3..2cd84e21592a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -327,11 +327,8 @@ struct psp_context
             uint64_t                                          tmr_mc_addr;
              /* asd firmware */
-             const struct firmware                   *asd_fw;
-             uint32_t                                          asd_fw_version;
-             uint32_t                                          asd_feature_version;
-             uint32_t                                          asd_ucode_size;
-             uint8_t                                             *asd_start_addr;
+            const struct firmware    *asd_fw;
+            struct psp_bin_desc                     asd;
              /* toc firmware */
             const struct firmware                   *toc_fw;
@@ -356,32 +353,16 @@ struct psp_context
             /* xgmi ta firmware and buffer */
             const struct firmware                   *ta_fw;
             uint32_t                                          ta_fw_version;
-             uint32_t                                          ta_xgmi_ucode_version;
-             uint32_t                                          ta_xgmi_ucode_size;
-             uint8_t                                             *ta_xgmi_start_addr;
-             uint32_t                                          ta_ras_ucode_version;
-             uint32_t                                          ta_ras_ucode_size;
-             uint8_t                                             *ta_ras_start_addr;
-
-             uint32_t                                          ta_hdcp_ucode_version;
-             uint32_t                                          ta_hdcp_ucode_size;
-             uint8_t                                             *ta_hdcp_start_addr;
-
-             uint32_t                                          ta_dtm_ucode_version;
-             uint32_t                                          ta_dtm_ucode_size;
-             uint8_t                                             *ta_dtm_start_addr;
-
-             uint32_t                                          ta_rap_ucode_version;
-             uint32_t                                          ta_rap_ucode_size;
-             uint8_t                                             *ta_rap_start_addr;
-
-             uint32_t                                          ta_securedisplay_ucode_version;
-             uint32_t                                          ta_securedisplay_ucode_size;
-             uint8_t                                             *ta_securedisplay_start_addr;
+            struct psp_bin_desc                     xgmi;
+            struct psp_bin_desc                     ras;
+            struct psp_bin_desc                     hdcp;
+            struct psp_bin_desc                     dtm;
+            struct psp_bin_desc                     rap;
+            struct psp_bin_desc                     securedisplay;
              struct psp_asd_context               asd_context;
             struct psp_xgmi_context                           xgmi_context;
-             struct psp_ras_context                ras;
+            struct psp_ras_context                ras_context;
             struct psp_hdcp_context             hdcp_context;
             struct psp_dtm_context              dtm_context;
             struct psp_rap_context               rap_context;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 194f7ccfbf94..3811b6b6a192 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -1866,7 +1866,7 @@ int amdgpu_ras_save_bad_pages(struct amdgpu_device *adev)
static int amdgpu_ras_load_bad_pages(struct amdgpu_device *adev)
{
             struct amdgpu_ras_eeprom_control *control =
-                           &adev->psp.ras.ras->eeprom_control;
+                           &adev->psp.ras_context.ras->eeprom_control;
             struct eeprom_table_record *bps;
             int ret;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index 4d9c63f2f377..471ffe885fdf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -470,8 +470,8 @@ struct ras_debug_if {
  * 8: feature disable
  */
-#define amdgpu_ras_get_context(adev)                           ((adev)->psp.ras.ras)
-#define amdgpu_ras_set_context(adev, ras_con)              ((adev)->psp.ras.ras = (ras_con))
+#define amdgpu_ras_get_context(adev)                          ((adev)->psp.ras_context.ras)
+#define amdgpu_ras_set_context(adev, ras_con)              ((adev)->psp.ras_context.ras = (ras_con))
 /* check if ras is supported on block, say, sdma, gfx */
static inline int amdgpu_ras_is_supported(struct amdgpu_device *adev,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
index 5fdeceaa979f..abd8469380e5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
@@ -525,9 +525,9 @@ FW_VERSION_ATTR(rlc_srls_fw_version, 0444, gfx.rlc_srls_fw_version);
FW_VERSION_ATTR(mec_fw_version, 0444, gfx.mec_fw_version);
FW_VERSION_ATTR(mec2_fw_version, 0444, gfx.mec2_fw_version);
FW_VERSION_ATTR(sos_fw_version, 0444, psp.sos.fw_version);
-FW_VERSION_ATTR(asd_fw_version, 0444, psp.asd_fw_version);
-FW_VERSION_ATTR(ta_ras_fw_version, 0444, psp.ta_ras_ucode_version);
-FW_VERSION_ATTR(ta_xgmi_fw_version, 0444, psp.ta_xgmi_ucode_version);
+FW_VERSION_ATTR(asd_fw_version, 0444, psp.asd.fw_version);
+FW_VERSION_ATTR(ta_ras_fw_version, 0444, psp.ras.feature_version);
+FW_VERSION_ATTR(ta_xgmi_fw_version, 0444, psp.xgmi.feature_version);
FW_VERSION_ATTR(smc_fw_version, 0444, pm.fw_version);
FW_VERSION_ATTR(sdma_fw_version, 0444, sdma.instance[0].fw_version);
FW_VERSION_ATTR(sdma2_fw_version, 0444, sdma.instance[1].fw_version);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
index e2e2624ac653..7c2538db3cd5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h
@@ -136,21 +136,11 @@ struct psp_firmware_header_v2_0 {
/* version_major=1, version_minor=0 */
struct ta_firmware_header_v1_0 {
             struct common_firmware_header header;
-             uint32_t ta_xgmi_ucode_version;
-             uint32_t ta_xgmi_offset_bytes;
-             uint32_t ta_xgmi_size_bytes;
-             uint32_t ta_ras_ucode_version;
-             uint32_t ta_ras_offset_bytes;
-             uint32_t ta_ras_size_bytes;
-             uint32_t ta_hdcp_ucode_version;
-             uint32_t ta_hdcp_offset_bytes;
-             uint32_t ta_hdcp_size_bytes;
-             uint32_t ta_dtm_ucode_version;
-             uint32_t ta_dtm_offset_bytes;
-             uint32_t ta_dtm_size_bytes;
-             uint32_t ta_securedisplay_ucode_version;
-             uint32_t ta_securedisplay_offset_bytes;
-             uint32_t ta_securedisplay_size_bytes;
+            struct psp_fw_legacy_bin_desc xgmi;
+            struct psp_fw_legacy_bin_desc ras;
+            struct psp_fw_legacy_bin_desc hdcp;
+            struct psp_fw_legacy_bin_desc dtm;
+            struct psp_fw_legacy_bin_desc securedisplay;
};
 enum ta_fw_type {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index 12a7cc2f01cd..ca058fbcccd4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -532,9 +532,9 @@ static void amdgpu_virt_populate_vf2pf_ucode_info(struct amdgpu_device *adev)
             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_MEC,      adev->gfx.mec_fw_version);
             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_MEC2,     adev->gfx.mec2_fw_version);
             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_SOS,      adev->psp.sos.fw_version);
-             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_ASD,      adev->psp.asd_fw_version);
-             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_TA_RAS,   adev->psp.ta_ras_ucode_version);
-             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_TA_XGMI,  adev->psp.ta_xgmi_ucode_version);
+            POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_ASD,      adev->psp.asd.fw_version);
+            POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_TA_RAS,   adev->psp.ras.feature_version);
+            POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_TA_XGMI,  adev->psp.xgmi.feature_version);
             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_SMC,      adev->pm.fw_version);
             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_SDMA,     adev->sdma.instance[0].fw_version);
             POPULATE_UCODE_INFO(vf2pf_info, AMD_SRIOV_UCODE_ID_SDMA2,    adev->sdma.instance[1].fw_version);
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index 4b1cc5e9ee92..5872d68ed13d 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -84,29 +84,29 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
                             ta_hdr = (const struct ta_firmware_header_v1_0 *)
                                                          adev->psp.ta_fw->data;
-                           adev->psp.ta_hdcp_ucode_version =
-                                          le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
-                           adev->psp.ta_hdcp_ucode_size =
-                                          le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
-                           adev->psp.ta_hdcp_start_addr =
+                           adev->psp.hdcp.feature_version =
+                                         le32_to_cpu(ta_hdr->hdcp.fw_version);
+                           adev->psp.hdcp.size_bytes =
+                                         le32_to_cpu(ta_hdr->hdcp.size_bytes);
+                           adev->psp.hdcp.start_addr =
                                          (uint8_t *)ta_hdr +
                                          le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
-                           adev->psp.ta_dtm_ucode_version =
-                                          le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
-                           adev->psp.ta_dtm_ucode_size =
-                                          le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
-                           adev->psp.ta_dtm_start_addr =
-                                          (uint8_t *)adev->psp.ta_hdcp_start_addr +
-                                          le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
-
-                           adev->psp.ta_securedisplay_ucode_version =
-                                         le32_to_cpu(ta_hdr->ta_securedisplay_ucode_version);
-                           adev->psp.ta_securedisplay_ucode_size =
-                                         le32_to_cpu(ta_hdr->ta_securedisplay_size_bytes);
-                           adev->psp.ta_securedisplay_start_addr =
-                                          (uint8_t *)adev->psp.ta_hdcp_start_addr +
-                                         le32_to_cpu(ta_hdr->ta_securedisplay_offset_bytes);
+                           adev->psp.dtm.feature_version =
+                                         le32_to_cpu(ta_hdr->dtm.fw_version);
+                           adev->psp.dtm.size_bytes =
+                                         le32_to_cpu(ta_hdr->dtm.size_bytes);
+                           adev->psp.dtm.start_addr =
+                                         (uint8_t *)adev->psp.hdcp.start_addr +
+                                         le32_to_cpu(ta_hdr->dtm.offset_bytes);
+
+                           adev->psp.securedisplay.feature_version =
+                                         le32_to_cpu(ta_hdr->securedisplay.fw_version);
+                           adev->psp.securedisplay.size_bytes =
+                                         le32_to_cpu(ta_hdr->securedisplay.size_bytes);
+                           adev->psp.securedisplay.start_addr =
+                                         (uint8_t *)adev->psp.hdcp.start_addr +
+                                         le32_to_cpu(ta_hdr->securedisplay.offset_bytes);
                             adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
             }
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index 8862684f8b43..29bf9f09944b 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -151,15 +151,15 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                                                         goto out2;
                                           ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
-                                          adev->psp.ta_xgmi_ucode_version = le32_to_cpu(ta_hdr->ta_xgmi_ucode_version);
-                                          adev->psp.ta_xgmi_ucode_size = le32_to_cpu(ta_hdr->ta_xgmi_size_bytes);
-                                          adev->psp.ta_xgmi_start_addr = (uint8_t *)ta_hdr +
+                                         adev->psp.xgmi.feature_version = le32_to_cpu(ta_hdr->xgmi.fw_version);
+                                         adev->psp.xgmi.size_bytes = le32_to_cpu(ta_hdr->xgmi.size_bytes);
+                                         adev->psp.xgmi.start_addr = (uint8_t *)ta_hdr +
                                                        le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
                                          adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
-                                          adev->psp.ta_ras_ucode_version = le32_to_cpu(ta_hdr->ta_ras_ucode_version);
-                                          adev->psp.ta_ras_ucode_size = le32_to_cpu(ta_hdr->ta_ras_size_bytes);
-                                          adev->psp.ta_ras_start_addr = (uint8_t *)adev->psp.ta_xgmi_start_addr +
-                                                        le32_to_cpu(ta_hdr->ta_ras_offset_bytes);
+                                         adev->psp.ras.feature_version = le32_to_cpu(ta_hdr->ras.fw_version);
+                                         adev->psp.ras.size_bytes = le32_to_cpu(ta_hdr->ras.size_bytes);
+                                         adev->psp.ras.start_addr = (uint8_t *)adev->psp.xgmi.start_addr +
+                                                       le32_to_cpu(ta_hdr->ras.offset_bytes);
                            }
                            break;
             case CHIP_NAVI10:
@@ -186,17 +186,17 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                                                         goto out2;
                                           ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
-                                          adev->psp.ta_hdcp_ucode_version = le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
-                                          adev->psp.ta_hdcp_ucode_size = le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
-                                          adev->psp.ta_hdcp_start_addr = (uint8_t *)ta_hdr +
+                                         adev->psp.hdcp.feature_version = le32_to_cpu(ta_hdr->hdcp.fw_version);
+                                         adev->psp.hdcp.size_bytes = le32_to_cpu(ta_hdr->hdcp.size_bytes);
+                                         adev->psp.hdcp.start_addr = (uint8_t *)ta_hdr +
                                                        le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
                                           adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
-                                          adev->psp.ta_dtm_ucode_version = le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
-                                          adev->psp.ta_dtm_ucode_size = le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
-                                          adev->psp.ta_dtm_start_addr = (uint8_t *)adev->psp.ta_hdcp_start_addr +
-                                                        le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
+                                         adev->psp.dtm.feature_version = le32_to_cpu(ta_hdr->dtm.fw_version);
+                                         adev->psp.dtm.size_bytes = le32_to_cpu(ta_hdr->dtm.size_bytes);
+                                         adev->psp.dtm.start_addr = (uint8_t *)adev->psp.hdcp.start_addr +
+                                                       le32_to_cpu(ta_hdr->dtm.offset_bytes);
                            }
                            break;
             case CHIP_SIENNA_CICHLID:
diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
index 0c908d4566e8..cc649406234b 100644
--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
@@ -84,23 +84,23 @@ static int psp_v12_0_init_microcode(struct psp_context *psp)
                             ta_hdr = (const struct ta_firmware_header_v1_0 *)
                                                          adev->psp.ta_fw->data;
-                           adev->psp.ta_hdcp_ucode_version =
-                                          le32_to_cpu(ta_hdr->ta_hdcp_ucode_version);
-                           adev->psp.ta_hdcp_ucode_size =
-                                          le32_to_cpu(ta_hdr->ta_hdcp_size_bytes);
-                           adev->psp.ta_hdcp_start_addr =
+                           adev->psp.hdcp.feature_version =
+                                         le32_to_cpu(ta_hdr->hdcp.fw_version);
+                           adev->psp.hdcp.size_bytes =
+                                         le32_to_cpu(ta_hdr->hdcp.size_bytes);
+                           adev->psp.hdcp.start_addr =
                                          (uint8_t *)ta_hdr +
                                          le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);
                             adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
-                           adev->psp.ta_dtm_ucode_version =
-                                          le32_to_cpu(ta_hdr->ta_dtm_ucode_version);
-                           adev->psp.ta_dtm_ucode_size =
-                                          le32_to_cpu(ta_hdr->ta_dtm_size_bytes);
-                           adev->psp.ta_dtm_start_addr =
-                                          (uint8_t *)adev->psp.ta_hdcp_start_addr +
-                                          le32_to_cpu(ta_hdr->ta_dtm_offset_bytes);
+                           adev->psp.dtm.feature_version =
+                                         le32_to_cpu(ta_hdr->dtm.fw_version);
+                           adev->psp.dtm.size_bytes =
+                                         le32_to_cpu(ta_hdr->dtm.size_bytes);
+                           adev->psp.dtm.start_addr =
+                                         (uint8_t *)adev->psp.hdcp.start_addr +
+                                         le32_to_cpu(ta_hdr->dtm.offset_bytes);
             }
              return 0;
--
2.17.1




Thanks,
Candice

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20210813/ef8f5a8d/attachment-0001.htm>


More information about the amd-gfx mailing list