drm/amdgpu: refine psp firmware loading

refine psp firmware loading

Signed-off-by: Yang Wang <kevinyang.wang@amd.com>
Reviewed-by: Christian König <christian.koenig@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 5a648a6..9302552 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -3181,12 +3181,10 @@ int psp_ring_cmd_submit(struct psp_context *psp,
 int psp_init_asd_microcode(struct psp_context *psp, const char *chip_name)
 {
        struct amdgpu_device *adev = psp->adev;
-       char fw_name[PSP_FW_NAME_LEN];
        const struct psp_firmware_header_v1_0 *asd_hdr;
        int err = 0;
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_asd.bin", chip_name);
-       err = amdgpu_ucode_request(adev, &adev->psp.asd_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->psp.asd_fw, "amdgpu/%s_asd.bin", chip_name);
        if (err)
                goto out;
 
@@ -3205,12 +3203,10 @@ out:
 int psp_init_toc_microcode(struct psp_context *psp, const char *chip_name)
 {
        struct amdgpu_device *adev = psp->adev;
-       char fw_name[PSP_FW_NAME_LEN];
        const struct psp_firmware_header_v1_0 *toc_hdr;
        int err = 0;
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_toc.bin", chip_name);
-       err = amdgpu_ucode_request(adev, &adev->psp.toc_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->psp.toc_fw, "amdgpu/%s_toc.bin", chip_name);
        if (err)
                goto out;
 
@@ -3362,7 +3358,6 @@ static int psp_init_sos_base_fw(struct amdgpu_device *adev)
 int psp_init_sos_microcode(struct psp_context *psp, const char *chip_name)
 {
        struct amdgpu_device *adev = psp->adev;
-       char fw_name[PSP_FW_NAME_LEN];
        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;
@@ -3372,8 +3367,7 @@ int psp_init_sos_microcode(struct psp_context *psp, const char *chip_name)
        uint8_t *ucode_array_start_addr;
        int fw_index = 0;
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);
-       err = amdgpu_ucode_request(adev, &adev->psp.sos_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->psp.sos_fw, "amdgpu/%s_sos.bin", chip_name);
        if (err)
                goto out;
 
@@ -3598,11 +3592,9 @@ int psp_init_ta_microcode(struct psp_context *psp, const char *chip_name)
 {
        const struct common_firmware_header *hdr;
        struct amdgpu_device *adev = psp->adev;
-       char fw_name[PSP_FW_NAME_LEN];
        int err;
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);
-       err = amdgpu_ucode_request(adev, &adev->psp.ta_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->psp.ta_fw, "amdgpu/%s_ta.bin", chip_name);
        if (err)
                return err;
 
@@ -3628,7 +3620,6 @@ int psp_init_ta_microcode(struct psp_context *psp, const char *chip_name)
 int psp_init_cap_microcode(struct psp_context *psp, const char *chip_name)
 {
        struct amdgpu_device *adev = psp->adev;
-       char fw_name[PSP_FW_NAME_LEN];
        const struct psp_firmware_header_v1_0 *cap_hdr_v1_0;
        struct amdgpu_firmware_info *info = NULL;
        int err = 0;
@@ -3638,8 +3629,7 @@ int psp_init_cap_microcode(struct psp_context *psp, const char *chip_name)
                return -EINVAL;
        }
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_cap.bin", chip_name);
-       err = amdgpu_ucode_request(adev, &adev->psp.cap_fw, fw_name);
+       err = amdgpu_ucode_request(adev, &adev->psp.cap_fw, "amdgpu/%s_cap.bin", chip_name);
        if (err) {
                if (err == -ENODEV) {
                        dev_warn(adev->dev, "cap microcode does not exist, skip\n");
@@ -3713,7 +3703,6 @@ static ssize_t psp_usbc_pd_fw_sysfs_write(struct device *dev,
        struct drm_device *ddev = dev_get_drvdata(dev);
        struct amdgpu_device *adev = drm_to_adev(ddev);
        int ret, idx;
-       char fw_name[100];
        const struct firmware *usbc_pd_fw;
        struct amdgpu_bo *fw_buf_bo = NULL;
        uint64_t fw_pri_mc_addr;
@@ -3727,8 +3716,7 @@ static ssize_t psp_usbc_pd_fw_sysfs_write(struct device *dev,
        if (!drm_dev_enter(ddev, &idx))
                return -ENODEV;
 
-       snprintf(fw_name, sizeof(fw_name), "amdgpu/%s", buf);
-       ret = request_firmware(&usbc_pd_fw, fw_name, adev->dev);
+       ret = amdgpu_ucode_request(adev, &usbc_pd_fw, "amdgpu/%s", buf);
        if (ret)
                goto fail;
 
@@ -3750,7 +3738,7 @@ static ssize_t psp_usbc_pd_fw_sysfs_write(struct device *dev,
        amdgpu_bo_free_kernel(&fw_buf_bo, &fw_pri_mc_addr, &fw_pri_cpu_addr);
 
 rel_buf:
-       release_firmware(usbc_pd_fw);
+       amdgpu_ucode_release(&usbc_pd_fw);
 fail:
        if (ret) {
                dev_err(adev->dev, "Failed to load USBC PD FW, err = %d", ret);