drm/amdgpu: Conform ASD header/loading to generic TA systems

Update asd_context structure and add asd_initialize function to
conform ASD header/loading to generic TA systems.

Signed-off-by: Candice Li <candice.li@amd.com>
Reviewed-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 071dadf3a4509f94065886122b450b397a0a0080..bc861f2fe0ecf63bb65dc77723b84ac7ac4a0849 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -47,6 +47,7 @@ static void psp_sysfs_fini(struct amdgpu_device *adev);
 
 static int psp_load_smu_fw(struct psp_context *psp);
 static int psp_ta_unload(struct psp_context *psp, uint32_t session_id);
+static int psp_ta_load(struct psp_context *psp, struct ta_context *context);
 static int psp_rap_terminate(struct psp_context *psp);
 static int psp_securedisplay_terminate(struct psp_context *psp);
 
@@ -781,23 +782,14 @@ static int psp_rl_load(struct amdgpu_device *adev)
        return ret;
 }
 
-static void psp_prep_asd_load_cmd_buf(struct psp_gfx_cmd_resp *cmd,
-                               uint64_t asd_mc, uint32_t size)
+static int psp_asd_load(struct psp_context *psp)
 {
-       cmd->cmd_id = GFX_CMD_ID_LOAD_ASD;
-       cmd->cmd.cmd_load_ta.app_phy_addr_lo = lower_32_bits(asd_mc);
-       cmd->cmd.cmd_load_ta.app_phy_addr_hi = upper_32_bits(asd_mc);
-       cmd->cmd.cmd_load_ta.app_len = size;
-
-       cmd->cmd.cmd_load_ta.cmd_buf_phy_addr_lo = 0;
-       cmd->cmd.cmd_load_ta.cmd_buf_phy_addr_hi = 0;
-       cmd->cmd.cmd_load_ta.cmd_buf_len = 0;
+       return psp_ta_load(psp, &psp->asd_context);
 }
 
-static int psp_asd_load(struct psp_context *psp)
+static int psp_asd_initialize(struct psp_context *psp)
 {
        int ret;
-       struct psp_gfx_cmd_resp *cmd;
 
        /* If PSP version doesn't match ASD version, asd loading will be failed.
         * add workaround to bypass it for sriov now.
@@ -806,22 +798,13 @@ static int psp_asd_load(struct psp_context *psp)
        if (amdgpu_sriov_vf(psp->adev) || !psp->asd_context.bin_desc.size_bytes)
                return 0;
 
-       cmd = acquire_psp_cmd_buf(psp);
+       psp->asd_context.mem_context.shared_mc_addr  = 0;
+       psp->asd_context.mem_context.shared_mem_size = PSP_ASD_SHARED_MEM_SIZE;
+       psp->asd_context.ta_load_type                = GFX_CMD_ID_LOAD_ASD;
 
-       psp_copy_fw(psp, psp->asd_context.bin_desc.start_addr,
-                   psp->asd_context.bin_desc.size_bytes);
-
-       psp_prep_asd_load_cmd_buf(cmd, psp->fw_pri_mc_addr,
-                                 psp->asd_context.bin_desc.size_bytes);
-
-       ret = psp_cmd_submit_buf(psp, NULL, cmd,
-                                psp->fence_buf_mc_addr);
-       if (!ret) {
-               psp->asd_context.asd_initialized = true;
-               psp->asd_context.session_id = cmd->resp.session_id;
-       }
-
-       release_psp_cmd_buf(psp);
+       ret = psp_asd_load(psp);
+       if (!ret)
+               psp->asd_context.initialized = true;
 
        return ret;
 }
@@ -859,13 +842,13 @@ static int psp_asd_terminate(struct psp_context *psp)
        if (amdgpu_sriov_vf(psp->adev))
                return 0;
 
-       if (!psp->asd_context.asd_initialized)
+       if (!psp->asd_context.initialized)
                return 0;
 
        ret = psp_asd_unload(psp);
 
        if (!ret)
-               psp->asd_context.asd_initialized = false;
+               psp->asd_context.initialized = false;
 
        return ret;
 }
@@ -903,7 +886,7 @@ static void psp_prep_ta_load_cmd_buf(struct psp_gfx_cmd_resp *cmd,
                                     uint64_t ta_bin_mc,
                                     struct ta_context *context)
 {
-       cmd->cmd_id                             = GFX_CMD_ID_LOAD_TA;
+       cmd->cmd_id                             = context->ta_load_type;
        cmd->cmd.cmd_load_ta.app_phy_addr_lo    = lower_32_bits(ta_bin_mc);
        cmd->cmd.cmd_load_ta.app_phy_addr_hi    = upper_32_bits(ta_bin_mc);
        cmd->cmd.cmd_load_ta.app_len            = context->bin_desc.size_bytes;
@@ -970,8 +953,7 @@ static int psp_ta_invoke(struct psp_context *psp,
        return ret;
 }
 
-static int psp_ta_load(struct psp_context *psp,
-                          struct ta_context *context)
+static int psp_ta_load(struct psp_context *psp, struct ta_context *context)
 {
        int ret;
        struct psp_gfx_cmd_resp *cmd;
@@ -981,9 +963,7 @@ static int psp_ta_load(struct psp_context *psp,
        psp_copy_fw(psp, context->bin_desc.start_addr,
                    context->bin_desc.size_bytes);
 
-       psp_prep_ta_load_cmd_buf(cmd,
-                                psp->fw_pri_mc_addr,
-                                context);
+       psp_prep_ta_load_cmd_buf(cmd, psp->fw_pri_mc_addr, context);
 
        ret = psp_cmd_submit_buf(psp, NULL, cmd,
                                 psp->fence_buf_mc_addr);
@@ -1051,6 +1031,7 @@ int psp_xgmi_initialize(struct psp_context *psp, bool set_extended_data, bool lo
                goto invoke;
 
        psp->xgmi_context.context.mem_context.shared_mem_size = PSP_XGMI_SHARED_MEM_SIZE;
+       psp->xgmi_context.context.ta_load_type = GFX_CMD_ID_LOAD_TA;
 
        if (!psp->xgmi_context.context.initialized) {
                ret = psp_xgmi_init_shared_buf(psp);
@@ -1450,6 +1431,7 @@ static int psp_ras_initialize(struct psp_context *psp)
        }
 
        psp->ras_context.context.mem_context.shared_mem_size = PSP_RAS_SHARED_MEM_SIZE;
+       psp->ras_context.context.ta_load_type = GFX_CMD_ID_LOAD_TA;
 
        if (!psp->ras_context.context.initialized) {
                ret = psp_ras_init_shared_buf(psp);
@@ -1539,6 +1521,7 @@ static int psp_hdcp_initialize(struct psp_context *psp)
        }
 
        psp->hdcp_context.context.mem_context.shared_mem_size = PSP_HDCP_SHARED_MEM_SIZE;
+       psp->hdcp_context.context.ta_load_type = GFX_CMD_ID_LOAD_TA;
 
        if (!psp->hdcp_context.context.initialized) {
                ret = psp_hdcp_init_shared_buf(psp);
@@ -1630,6 +1613,7 @@ static int psp_dtm_initialize(struct psp_context *psp)
        }
 
        psp->dtm_context.context.mem_context.shared_mem_size = PSP_DTM_SHARED_MEM_SIZE;
+       psp->dtm_context.context.ta_load_type = GFX_CMD_ID_LOAD_TA;
 
        if (!psp->dtm_context.context.initialized) {
                ret = psp_dtm_init_shared_buf(psp);
@@ -1727,6 +1711,7 @@ static int psp_rap_initialize(struct psp_context *psp)
        }
 
        psp->rap_context.context.mem_context.shared_mem_size = PSP_RAP_SHARED_MEM_SIZE;
+       psp->rap_context.context.ta_load_type = GFX_CMD_ID_LOAD_TA;
 
        if (!psp->rap_context.context.initialized) {
                ret = psp_rap_init_shared_buf(psp);
@@ -1842,6 +1827,7 @@ static int psp_securedisplay_initialize(struct psp_context *psp)
 
        psp->securedisplay_context.context.mem_context.shared_mem_size =
                PSP_SECUREDISPLAY_SHARED_MEM_SIZE;
+       psp->securedisplay_context.context.ta_load_type = GFX_CMD_ID_LOAD_TA;
 
        if (!psp->securedisplay_context.context.initialized) {
                ret = psp_securedisplay_init_shared_buf(psp);
@@ -2419,7 +2405,7 @@ skip_memalloc:
        if (ret)
                goto failed;
 
-       ret = psp_asd_load(psp);
+       ret = psp_asd_initialize(psp);
        if (ret) {
                DRM_ERROR("PSP load asd failed!\n");
                return ret;
@@ -2616,7 +2602,7 @@ static int psp_resume(void *handle)
        if (ret)
                goto failed;
 
-       ret = psp_asd_load(psp);
+       ret = psp_asd_initialize(psp);
        if (ret) {
                DRM_ERROR("PSP load asd failed!\n");
                goto failed;

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
index cfd7ac976cd1e6b5150a53205cd1aea198809a9d..f29afabbff1fbee6509742901466fe57ebc17478 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
@@ -39,6 +39,7 @@
 #define PSP_FW_NAME_LEN                0x24
 
 enum psp_shared_mem_size {
+       PSP_ASD_SHARED_MEM_SIZE                         = 0x0,
        PSP_XGMI_SHARED_MEM_SIZE                        = 0x4000,
        PSP_RAS_SHARED_MEM_SIZE                         = 0x4000,
        PSP_HDCP_SHARED_MEM_SIZE                        = 0x4000,
@@ -140,12 +141,6 @@ struct psp_bin_desc {
        uint8_t *start_addr;
 };
 
-struct psp_asd_context {
-       bool                    asd_initialized;
-       uint32_t                session_id;
-       struct psp_bin_desc             bin_desc;
-};
-
 struct ta_mem_context {
        struct amdgpu_bo                *shared_bo;
        uint64_t                shared_mc_addr;
@@ -158,6 +153,7 @@ struct ta_context {
        uint32_t                session_id;
        struct ta_mem_context   mem_context;
        struct psp_bin_desc             bin_desc;
+       enum psp_gfx_cmd_id             ta_load_type;
 };
 
 struct ta_cp_context {
@@ -331,7 +327,7 @@ struct psp_context
        const struct firmware           *ta_fw;
        uint32_t                        ta_fw_version;
 
-       struct psp_asd_context          asd_context;
+       struct ta_context               asd_context;
        struct psp_xgmi_context         xgmi_context;
        struct psp_ras_context          ras_context;
        struct ta_cp_context            hdcp_context;