drm/amdgpu: add SMC firmware into global ucode list for psp loading

Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index f0e36240365a..7836cd6fc3d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -837,6 +837,8 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                 uint32_t ucode_start_address;
                 const uint8_t *src;
                 const struct smc_firmware_header_v1_0 *hdr;
+                const struct common_firmware_header *header;
+                struct amdgpu_firmware_info *ucode = NULL;
 
                 if (CGS_UCODE_ID_SMU_SK == type)
                         amdgpu_cgs_rel_firmware(cgs_device, CGS_UCODE_ID_SMU);
@@ -919,6 +921,15 @@ static int amdgpu_cgs_get_firmware_info(struct cgs_device *cgs_device,
                                 adev->pm.fw = NULL;
                                 return err;
                         }
+
+                        if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
+                                ucode = &adev->firmware.ucode[AMDGPU_UCODE_ID_SMC];
+                                ucode->ucode_id = AMDGPU_UCODE_ID_SMC;
+                                ucode->fw = adev->pm.fw;
+                                header = (const struct common_firmware_header *)ucode->fw->data;
+                                adev->firmware.fw_size +=
+                                        ALIGN(le32_to_cpu(header->ucode_size_bytes), PAGE_SIZE);
+                        }
                 }
 
                 hdr = (const struct smc_firmware_header_v1_0 *) adev->pm.fw->data;