drm/amd: Parse both v1 and v2 TA microcode headers using same function

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / psp_v11_0.c

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index bd3e3e2..41e29b7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -89,9 +89,8 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
 {
        struct amdgpu_device *adev = psp->adev;
        const char *chip_name;
-       char fw_name[PSP_FW_NAME_LEN];
+       char ucode_prefix[30];
        int err = 0;
-       const struct ta_firmware_header_v1_0 *ta_hdr;
 
        DRM_DEBUG("\n");
 
@@ -129,7 +128,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
        default:
                BUG();
        }
-
+       amdgpu_ucode_ip_version_decode(adev, MP0_HWIP, ucode_prefix, sizeof(ucode_prefix));
 
        switch (adev->ip_versions[MP0_HWIP][0]) {
        case IP_VERSION(11, 0, 2):
@@ -140,35 +139,8 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                err = psp_init_asd_microcode(psp, chip_name);
                if (err)
                        return err;
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
-               err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
-               if (err) {
-                       release_firmware(adev->psp.ta_fw);
-                       adev->psp.ta_fw = NULL;
-                       dev_info(adev->dev,
-                                "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
-               } else {
-                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
-                       if (err)
-                               goto out2;
-
-                       ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
-                       adev->psp.xgmi_context.context.bin_desc.fw_version =
-                               le32_to_cpu(ta_hdr->xgmi.fw_version);
-                       adev->psp.xgmi_context.context.bin_desc.size_bytes =
-                               le32_to_cpu(ta_hdr->xgmi.size_bytes);
-                       adev->psp.xgmi_context.context.bin_desc.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.ras_context.context.bin_desc.fw_version =
-                               le32_to_cpu(ta_hdr->ras.fw_version);
-                       adev->psp.ras_context.context.bin_desc.size_bytes =
-                               le32_to_cpu(ta_hdr->ras.size_bytes);
-                       adev->psp.ras_context.context.bin_desc.start_addr =
-                               (uint8_t *)adev->psp.xgmi_context.context.bin_desc.start_addr +
-                               le32_to_cpu(ta_hdr->ras.offset_bytes);
-               }
+               err = psp_init_ta_microcode(psp, ucode_prefix);
+               adev->psp.securedisplay_context.context.bin_desc.size_bytes = 0;
                break;
        case IP_VERSION(11, 0, 0):
        case IP_VERSION(11, 0, 5):
@@ -179,39 +151,8 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                err = psp_init_asd_microcode(psp, chip_name);
                if (err)
                        return err;
-               snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
-               err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);
-               if (err) {
-                       release_firmware(adev->psp.ta_fw);
-                       adev->psp.ta_fw = NULL;
-                       dev_info(adev->dev,
-                                "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);
-               } else {
-                       err = amdgpu_ucode_validate(adev->psp.ta_fw);
-                       if (err)
-                               goto out2;
-
-                       ta_hdr = (const struct ta_firmware_header_v1_0 *)adev->psp.ta_fw->data;
-                       adev->psp.hdcp_context.context.bin_desc.fw_version =
-                               le32_to_cpu(ta_hdr->hdcp.fw_version);
-                       adev->psp.hdcp_context.context.bin_desc.size_bytes =
-                               le32_to_cpu(ta_hdr->hdcp.size_bytes);
-                       adev->psp.hdcp_context.context.bin_desc.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.dtm_context.context.bin_desc.fw_version =
-                               le32_to_cpu(ta_hdr->dtm.fw_version);
-                       adev->psp.dtm_context.context.bin_desc.size_bytes =
-                               le32_to_cpu(ta_hdr->dtm.size_bytes);
-                       adev->psp.dtm_context.context.bin_desc.start_addr =
-                               (uint8_t *)adev->psp.hdcp_context.context
-                                       .bin_desc.start_addr +
-                               le32_to_cpu(ta_hdr->dtm.offset_bytes);
-               }
+               err = psp_init_ta_microcode(psp, ucode_prefix);
+               adev->psp.securedisplay_context.context.bin_desc.size_bytes = 0;
                break;
        case IP_VERSION(11, 0, 7):
        case IP_VERSION(11, 0, 11):
@@ -221,26 +162,17 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                if (err)
                        return err;
                err = psp_init_ta_microcode(psp, chip_name);
-               if (err)
-                       return err;
                break;
        case IP_VERSION(11, 5, 0):
                err = psp_init_asd_microcode(psp, chip_name);
                if (err)
                        return err;
                err = psp_init_toc_microcode(psp, chip_name);
-               if (err)
-                       return err;
                break;
        default:
                BUG();
        }
 
-       return 0;
-
-out2:
-       release_firmware(adev->psp.ta_fw);
-       adev->psp.ta_fw = NULL;
        return err;
 }