drm/amdgpu: switch to helper function to init asd ucode

call common helper function to initialize asd ucode

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@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/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
index 6e041b7803706387a0e024b379adb12a9d230d5a..90727cfb4447fe30a53afcc6ce2131ef61bf98d9 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
@@ -50,7 +50,6 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
        const char *chip_name;
        char fw_name[30];
        int err = 0;
-       const struct psp_firmware_header_v1_0 *hdr;
        const struct ta_firmware_header_v1_0 *ta_hdr;
        DRM_DEBUG("\n");
 
@@ -66,22 +65,10 @@ static int psp_v10_0_init_microcode(struct psp_context *psp)
        default: BUG();
        }
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_asd.bin", chip_name);
-       err = request_firmware(&adev->psp.asd_fw, fw_name, adev->dev);
+       err = psp_init_asd_microcode(psp, chip_name);
        if (err)
                goto out;
 
-       err = amdgpu_ucode_validate(adev->psp.asd_fw);
-       if (err)
-               goto out;
-
-       hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.asd_fw->data;
-       adev->psp.asd_fw_version = le32_to_cpu(hdr->header.ucode_version);
-       adev->psp.asd_feature_version = le32_to_cpu(hdr->ucode_feature_version);
-       adev->psp.asd_ucode_size = le32_to_cpu(hdr->header.ucode_size_bytes);
-       adev->psp.asd_start_addr = (uint8_t *)hdr +
-                               le32_to_cpu(hdr->header.ucode_array_offset_bytes);
-
        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) {
@@ -126,8 +113,6 @@ out:
                dev_err(adev->dev,
                        "psp v10.0: Failed to load firmware \"%s\"\n",
                        fw_name);
-               release_firmware(adev->psp.asd_fw);
-               adev->psp.asd_fw = NULL;
        }
 
        return err;

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
index f633577d6134fb9fe0b48ceecd0c8024c8953f44..6d50da01e301fd4ab03aaef5ad72bbd9286e172e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
@@ -78,7 +78,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
        const struct psp_firmware_header_v1_0 *sos_hdr;
        const struct psp_firmware_header_v1_1 *sos_hdr_v1_1;
        const struct psp_firmware_header_v1_2 *sos_hdr_v1_2;
-       const struct psp_firmware_header_v1_0 *asd_hdr;
        const struct ta_firmware_header_v1_0 *ta_hdr;
 
        DRM_DEBUG("\n");
@@ -148,21 +147,9 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
                goto out;
        }
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_asd.bin", chip_name);
-       err = request_firmware(&adev->psp.asd_fw, fw_name, adev->dev);
+       err = psp_init_asd_microcode(psp, chip_name);
        if (err)
-               goto out1;
-
-       err = amdgpu_ucode_validate(adev->psp.asd_fw);
-       if (err)
-               goto out1;
-
-       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->ucode_feature_version);
-       adev->psp.asd_ucode_size = 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);
+               goto out;
 
        switch (adev->asic_type) {
        case CHIP_VEGA20:
@@ -229,9 +216,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp)
 out2:
        release_firmware(adev->psp.ta_fw);
        adev->psp.ta_fw = NULL;
-out1:
-       release_firmware(adev->psp.asd_fw);
-       adev->psp.asd_fw = NULL;
 out:
        dev_err(adev->dev,
                "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
index 42c485bf8fdb4837aa2cf9ae86c95021c17a629d..6c9614f77d33e5ffae5004d6e20bb8cc24a36464 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
@@ -45,11 +45,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp)
 {
        struct amdgpu_device *adev = psp->adev;
        const char *chip_name;
-       char fw_name[30];
        int err = 0;
-       const struct psp_firmware_header_v1_0 *asd_hdr;
-
-       DRM_DEBUG("\n");
 
        switch (adev->asic_type) {
        case CHIP_RENOIR:
@@ -59,28 +55,7 @@ static int psp_v12_0_init_microcode(struct psp_context *psp)
                BUG();
        }
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_asd.bin", chip_name);
-       err = request_firmware(&adev->psp.asd_fw, fw_name, adev->dev);
-       if (err)
-               goto out1;
-
-       err = amdgpu_ucode_validate(adev->psp.asd_fw);
-       if (err)
-               goto out1;
-
-       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->ucode_feature_version);
-       adev->psp.asd_ucode_size = 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;
-
-out1:
-       release_firmware(adev->psp.asd_fw);
-       adev->psp.asd_fw = NULL;
-
+       err = psp_init_asd_microcode(psp, chip_name);
        return err;
 }
 

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index 9ca37d010be417c825d60c8a880d7b4dded05b95..14d17b1df67c225fcfcb5237dffd4da12277c5e1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
@@ -95,22 +95,10 @@ static int psp_v3_1_init_microcode(struct psp_context *psp)
        adev->psp.sos_start_addr = (uint8_t *)adev->psp.sys_start_addr +
                                le32_to_cpu(hdr->sos_offset_bytes);
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_asd.bin", chip_name);
-       err = request_firmware(&adev->psp.asd_fw, fw_name, adev->dev);
+       err = psp_init_asd_microcode(psp, chip_name);
        if (err)
                goto out;
 
-       err = amdgpu_ucode_validate(adev->psp.asd_fw);
-       if (err)
-               goto out;
-
-       hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.asd_fw->data;
-       adev->psp.asd_fw_version = le32_to_cpu(hdr->header.ucode_version);
-       adev->psp.asd_feature_version = le32_to_cpu(hdr->ucode_feature_version);
-       adev->psp.asd_ucode_size = le32_to_cpu(hdr->header.ucode_size_bytes);
-       adev->psp.asd_start_addr = (uint8_t *)hdr +
-                               le32_to_cpu(hdr->header.ucode_array_offset_bytes);
-
        return 0;
 out:
        if (err) {
@@ -119,8 +107,6 @@ out:
                        fw_name);
                release_firmware(adev->psp.sos_fw);
                adev->psp.sos_fw = NULL;
-               release_firmware(adev->psp.asd_fw);
-               adev->psp.asd_fw = NULL;
        }
 
        return err;