diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2194-drm-amdgpu-psp-support-init-psp-sos-microcode-with-b.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2194-drm-amdgpu-psp-support-init-psp-sos-microcode-with-b.patch | 83 |
1 files changed, 83 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2194-drm-amdgpu-psp-support-init-psp-sos-microcode-with-b.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2194-drm-amdgpu-psp-support-init-psp-sos-microcode-with-b.patch new file mode 100644 index 00000000..590f3585 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2194-drm-amdgpu-psp-support-init-psp-sos-microcode-with-b.patch @@ -0,0 +1,83 @@ +From 1af7abac30c223ed6c1f9a2f859238adba89958e Mon Sep 17 00:00:00 2001 +From: Hawking Zhang <Hawking.Zhang@amd.com> +Date: Mon, 22 Oct 2018 20:34:17 +0800 +Subject: [PATCH 2194/2940] drm/amdgpu/psp: support init psp sos microcode with + build-in toc + +psp_firmware_header_v1_1 is used for psp sos with build-in toc + +Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com> +Reviewed-by: Le Ma <Le.Ma@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 31 +++++++++++++++++++------ + 2 files changed, 25 insertions(+), 8 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +index 9cc741800682..c222edf992bc 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +@@ -157,7 +157,7 @@ struct psp_context + uint32_t toc_bin_size; + uint8_t *sys_start_addr; + uint8_t *sos_start_addr; +- uint8_t *toc_start_addr ++ uint8_t *toc_start_addr; + + /* tmr buffer */ + struct amdgpu_bo *tmr_bo; +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +index 3e756fca1492..0e76af8efe0a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +@@ -59,6 +59,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) + char fw_name[30]; + int err = 0; + 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_0 *asd_hdr; + const struct ta_firmware_header_v1_0 *ta_hdr; + uint32_t bl_version; +@@ -92,15 +93,31 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) + goto out; + + sos_hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.sos_fw->data; +- adev->psp.sos_fw_version = le32_to_cpu(sos_hdr->header.ucode_version); +- adev->psp.sos_feature_version = le32_to_cpu(sos_hdr->ucode_feature_version); +- adev->psp.sos_bin_size = le32_to_cpu(sos_hdr->sos_size_bytes); +- adev->psp.sys_bin_size = le32_to_cpu(sos_hdr->header.ucode_size_bytes) - +- le32_to_cpu(sos_hdr->sos_size_bytes); +- adev->psp.sys_start_addr = (uint8_t *)sos_hdr + ++ ++ switch (sos_hdr->header.header_version_major) { ++ case 1: ++ adev->psp.sos_fw_version = le32_to_cpu(sos_hdr->header.ucode_version); ++ adev->psp.sos_feature_version = le32_to_cpu(sos_hdr->ucode_feature_version); ++ adev->psp.sos_bin_size = le32_to_cpu(sos_hdr->sos_size_bytes); ++ adev->psp.sys_bin_size = le32_to_cpu(sos_hdr->header.ucode_size_bytes) - ++ le32_to_cpu(sos_hdr->sos_size_bytes); ++ adev->psp.sys_start_addr = (uint8_t *)sos_hdr + + le32_to_cpu(sos_hdr->header.ucode_array_offset_bytes); +- adev->psp.sos_start_addr = (uint8_t *)adev->psp.sys_start_addr + ++ adev->psp.sos_start_addr = (uint8_t *)adev->psp.sys_start_addr + + le32_to_cpu(sos_hdr->sos_offset_bytes); ++ if (sos_hdr->header.header_version_minor == 1) { ++ sos_hdr_v1_1 = (const struct psp_firmware_header_v1_1 *)adev->psp.sos_fw->data; ++ adev->psp.toc_bin_size = le32_to_cpu(sos_hdr_v1_1->toc_size_bytes); ++ adev->psp.toc_start_addr = (uint8_t *)adev->psp.sys_start_addr + ++ le32_to_cpu(sos_hdr_v1_1->toc_offset_bytes); ++ } ++ break; ++ default: ++ dev_err(adev->dev, ++ "Unsupported psp sos firmware\n"); ++ err = -EINVAL; ++ 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); +-- +2.17.1 + |