On Wed, Dec 28, 2022 at 11:32 AM Mario Limonciello
<mario.limonciello@xxxxxxx> wrote:
>
> If PSP microcode is required but not available during early init, the
> firmware framebuffer will have already been released and the screen will
> freeze.
>
> Move the request for PSP microcode into the IP discovery phase
> so that if it's not available, IP discovery will fail.
>
> Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
This is probably ok, but I think I'd prefer to just move the
request_firwmare() calls out into ip discovery and leave the rest of
the logic in the PSP code.
Alex
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 120 ++++++++++++-
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 -
> drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 106 +++--------
> drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 165 ++++--------------
> drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 102 +++--------
> drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 82 ---------
> drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 36 ----
> drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 36 ----
> 8 files changed, 202 insertions(+), 447 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> index c8c538a768fe..6199ab078bc7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
> @@ -158,6 +158,40 @@ MODULE_FIRMWARE("amdgpu/gc_11_0_2_mes1.bin");
> MODULE_FIRMWARE("amdgpu/gc_11_0_3_mes.bin");
> MODULE_FIRMWARE("amdgpu/gc_11_0_3_mes1.bin");
>
> +MODULE_FIRMWARE("amdgpu/aldebaran_sos.bin");
> +MODULE_FIRMWARE("amdgpu/aldebaran_ta.bin");
> +MODULE_FIRMWARE("amdgpu/aldebaran_cap.bin");
> +MODULE_FIRMWARE("amdgpu/green_sardine_asd.bin");
> +MODULE_FIRMWARE("amdgpu/green_sardine_ta.bin");
> +MODULE_FIRMWARE("amdgpu/raven_asd.bin");
> +MODULE_FIRMWARE("amdgpu/picasso_asd.bin");
> +MODULE_FIRMWARE("amdgpu/raven2_asd.bin");
> +MODULE_FIRMWARE("amdgpu/picasso_ta.bin");
> +MODULE_FIRMWARE("amdgpu/raven2_ta.bin");
> +MODULE_FIRMWARE("amdgpu/raven_ta.bin");
> +MODULE_FIRMWARE("amdgpu/renoir_asd.bin");
> +MODULE_FIRMWARE("amdgpu/renoir_ta.bin");
> +MODULE_FIRMWARE("amdgpu/yellow_carp_toc.bin");
> +MODULE_FIRMWARE("amdgpu/yellow_carp_ta.bin");
> +MODULE_FIRMWARE("amdgpu/vega10_sos.bin");
> +MODULE_FIRMWARE("amdgpu/vega10_asd.bin");
> +MODULE_FIRMWARE("amdgpu/vega10_cap.bin");
> +MODULE_FIRMWARE("amdgpu/vega12_sos.bin");
> +MODULE_FIRMWARE("amdgpu/vega12_asd.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_5_toc.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_5_ta.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_8_toc.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_8_ta.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_0_sos.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_0_ta.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_7_sos.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_7_ta.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_10_sos.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_10_ta.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_4_toc.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_4_ta.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_11_toc.bin");
> +MODULE_FIRMWARE("amdgpu/psp_13_0_11_ta.bin");
>
> /* gfx9 */
> MODULE_FIRMWARE("amdgpu/vega10_ce.bin");
> @@ -1858,12 +1892,30 @@ static int amdgpu_discovery_set_ih_ip_blocks(struct amdgpu_device *adev)
>
> static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
> {
> + char ucode_prefix[30];
> + int r;
> +
> + amdgpu_ucode_ip_version_decode(adev, MP0_HWIP, ucode_prefix, sizeof(ucode_prefix));
> + adev->psp.adev = adev;
> +
> switch (adev->ip_versions[MP0_HWIP][0]) {
> case IP_VERSION(9, 0, 0):
> + r = psp_init_sos_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_asd_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block);
> break;
> case IP_VERSION(10, 0, 0):
> case IP_VERSION(10, 0, 1):
> + r = psp_init_asd_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> amdgpu_device_ip_block_add(adev, &psp_v10_0_ip_block);
> break;
> case IP_VERSION(11, 0, 0):
> @@ -1871,11 +1923,34 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
> case IP_VERSION(11, 0, 4):
> case IP_VERSION(11, 0, 5):
> case IP_VERSION(11, 0, 9):
> + r = psp_init_sos_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_asd_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + break;
> case IP_VERSION(11, 0, 7):
> case IP_VERSION(11, 0, 11):
> case IP_VERSION(11, 0, 12):
> case IP_VERSION(11, 0, 13):
> + r = psp_init_sos_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + break;
> case IP_VERSION(11, 5, 0):
> + r = psp_init_asd_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_toc_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> amdgpu_device_ip_block_add(adev, &psp_v11_0_ip_block);
> break;
> case IP_VERSION(11, 0, 8):
> @@ -1883,20 +1958,57 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)
> break;
> case IP_VERSION(11, 0, 3):
> case IP_VERSION(12, 0, 1):
> + r = psp_init_asd_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> amdgpu_device_ip_block_add(adev, &psp_v12_0_ip_block);
> break;
> - case IP_VERSION(13, 0, 0):
> - case IP_VERSION(13, 0, 1):
> case IP_VERSION(13, 0, 2):
> + r = psp_init_sos_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + /* It's not necessary to load ras ta on Guest side */
> + if (!amdgpu_sriov_vf(adev)) {
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + }
> + amdgpu_device_ip_block_add(adev, &psp_v13_0_ip_block);
> + break;
> + case IP_VERSION(13, 0, 1):
> case IP_VERSION(13, 0, 3):
> case IP_VERSION(13, 0, 5):
> - case IP_VERSION(13, 0, 7):
> case IP_VERSION(13, 0, 8):
> - case IP_VERSION(13, 0, 10):
> case IP_VERSION(13, 0, 11):
> + r = psp_init_toc_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + amdgpu_device_ip_block_add(adev, &psp_v13_0_ip_block);
> + break;
> + case IP_VERSION(13, 0, 0):
> + case IP_VERSION(13, 0, 7):
> + case IP_VERSION(13, 0, 10):
> + r = psp_init_sos_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> amdgpu_device_ip_block_add(adev, &psp_v13_0_ip_block);
> break;
> case IP_VERSION(13, 0, 4):
> + r = psp_init_toc_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> + r = psp_init_ta_microcode(&adev->psp, ucode_prefix);
> + if (r)
> + return r;
> amdgpu_device_ip_block_add(adev, &psp_v13_0_4_ip_block);
> break;
> default:
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 7a2fc920739b..f7103b3354c6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -188,8 +188,6 @@ static int psp_early_init(void *handle)
> return -EINVAL;
> }
>
> - psp->adev = adev;
> -
> psp_check_pmfw_centralized_cstate_management(psp);
>
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
> index 9de46fa8f46c..710445d39df1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
> @@ -37,93 +37,37 @@
> #include "gc/gc_9_1_offset.h"
> #include "sdma0/sdma0_4_1_offset.h"
>
> -MODULE_FIRMWARE("amdgpu/raven_asd.bin");
> -MODULE_FIRMWARE("amdgpu/picasso_asd.bin");
> -MODULE_FIRMWARE("amdgpu/raven2_asd.bin");
> -MODULE_FIRMWARE("amdgpu/picasso_ta.bin");
> -MODULE_FIRMWARE("amdgpu/raven2_ta.bin");
> -MODULE_FIRMWARE("amdgpu/raven_ta.bin");
> -
> static int psp_v10_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 ta_firmware_header_v1_0 *ta_hdr;
> - DRM_DEBUG("\n");
> -
> - switch (adev->asic_type) {
> - case CHIP_RAVEN:
> - if (adev->apu_flags & AMD_APU_IS_RAVEN2)
> - chip_name = "raven2";
> - else if (adev->apu_flags & AMD_APU_IS_PICASSO)
> - chip_name = "picasso";
> - else
> - chip_name = "raven";
> - break;
> - default: BUG();
> - }
> -
> - err = psp_init_asd_microcode(psp, chip_name);
> - if (err)
> - goto out;
> -
> - 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 v10.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.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);
> -
> - adev->psp.securedisplay_context.context.bin_desc.fw_version =
> - le32_to_cpu(ta_hdr->securedisplay.fw_version);
> - adev->psp.securedisplay_context.context.bin_desc.size_bytes =
> - le32_to_cpu(ta_hdr->securedisplay.size_bytes);
> - adev->psp.securedisplay_context.context.bin_desc.start_addr =
> - (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr +
> - le32_to_cpu(ta_hdr->securedisplay.offset_bytes);
> -
> - adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
> - }
>
> - return 0;
> + 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.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);
> + adev->psp.securedisplay_context.context.bin_desc.fw_version =
> + le32_to_cpu(ta_hdr->securedisplay.fw_version);
> + adev->psp.securedisplay_context.context.bin_desc.size_bytes =
> + le32_to_cpu(ta_hdr->securedisplay.size_bytes);
> + adev->psp.securedisplay_context.context.bin_desc.start_addr =
> + (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr +
> + le32_to_cpu(ta_hdr->securedisplay.offset_bytes);
> + adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);
>
> -out2:
> - release_firmware(adev->psp.ta_fw);
> - adev->psp.ta_fw = NULL;
> -out:
> - if (err) {
> - dev_err(adev->dev,
> - "psp v10.0: Failed to load firmware \"%s\"\n",
> - fw_name);
> - }
> -
> - return err;
> + return 0;
> }
>
> static int psp_v10_0_ring_create(struct psp_context *psp,
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> index bd3e3e23a939..880fd90311e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
> @@ -88,160 +88,63 @@ MODULE_FIRMWARE("amdgpu/beige_goby_ta.bin");
> 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];
> - int err = 0;
> const struct ta_firmware_header_v1_0 *ta_hdr;
>
> DRM_DEBUG("\n");
>
> - switch (adev->ip_versions[MP0_HWIP][0]) {
> - case IP_VERSION(11, 0, 2):
> - chip_name = "vega20";
> - break;
> - case IP_VERSION(11, 0, 0):
> - chip_name = "navi10";
> - break;
> - case IP_VERSION(11, 0, 5):
> - chip_name = "navi14";
> - break;
> - case IP_VERSION(11, 0, 9):
> - chip_name = "navi12";
> - break;
> - case IP_VERSION(11, 0, 4):
> - chip_name = "arcturus";
> - break;
> - case IP_VERSION(11, 0, 7):
> - chip_name = "sienna_cichlid";
> - break;
> - case IP_VERSION(11, 0, 11):
> - chip_name = "navy_flounder";
> - break;
> - case IP_VERSION(11, 5, 0):
> - chip_name = "vangogh";
> - break;
> - case IP_VERSION(11, 0, 12):
> - chip_name = "dimgrey_cavefish";
> - break;
> - case IP_VERSION(11, 0, 13):
> - chip_name = "beige_goby";
> - break;
> - default:
> - BUG();
> - }
> -
> -
> switch (adev->ip_versions[MP0_HWIP][0]) {
> case IP_VERSION(11, 0, 2):
> case IP_VERSION(11, 0, 4):
> - err = psp_init_sos_microcode(psp, chip_name);
> - if (err)
> - return err;
> - 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);
> - }
> + 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);
> break;
> case IP_VERSION(11, 0, 0):
> case IP_VERSION(11, 0, 5):
> case IP_VERSION(11, 0, 9):
> - err = psp_init_sos_microcode(psp, chip_name);
> - if (err)
> - return err;
> - 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);
> - }
> + 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);
> break;
> case IP_VERSION(11, 0, 7):
> case IP_VERSION(11, 0, 11):
> case IP_VERSION(11, 0, 12):
> case IP_VERSION(11, 0, 13):
> - err = psp_init_sos_microcode(psp, chip_name);
> - 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;
> }
>
> static int psp_v11_0_wait_for_bootloader(struct psp_context *psp)
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> index 8ed2281b6557..0b5d63735f39 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> @@ -37,94 +37,46 @@
> #include "oss/osssys_4_0_offset.h"
> #include "oss/osssys_4_0_sh_mask.h"
>
> -MODULE_FIRMWARE("amdgpu/renoir_asd.bin");
> -MODULE_FIRMWARE("amdgpu/renoir_ta.bin");
> -MODULE_FIRMWARE("amdgpu/green_sardine_asd.bin");
> -MODULE_FIRMWARE("amdgpu/green_sardine_ta.bin");
> -
> /* address block */
> #define smnMP1_FIRMWARE_FLAGS 0x3010024
>
> 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 ta_firmware_header_v1_0 *ta_hdr;
> DRM_DEBUG("\n");
>
> - switch (adev->asic_type) {
> - case CHIP_RENOIR:
> - if (adev->apu_flags & AMD_APU_IS_RENOIR)
> - chip_name = "renoir";
> - else
> - chip_name = "green_sardine";
> - break;
> - default:
> - BUG();
> - }
> -
> - 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 v12.0: Failed to load firmware \"%s\"\n",
> - fw_name);
> - } else {
> - err = amdgpu_ucode_validate(adev->psp.ta_fw);
> - if (err)
> - goto out;
> -
> - 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 =
> + 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);
> +
> + if (adev->apu_flags & AMD_APU_IS_RENOIR) {
> + adev->psp.securedisplay_context.context.bin_desc.fw_version =
> + le32_to_cpu(ta_hdr->securedisplay.fw_version);
> + adev->psp.securedisplay_context.context.bin_desc.size_bytes =
> + le32_to_cpu(ta_hdr->securedisplay.size_bytes);
> + adev->psp.securedisplay_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);
> -
> - if (adev->apu_flags & AMD_APU_IS_RENOIR) {
> - adev->psp.securedisplay_context.context.bin_desc.fw_version =
> - le32_to_cpu(ta_hdr->securedisplay.fw_version);
> - adev->psp.securedisplay_context.context.bin_desc.size_bytes =
> - le32_to_cpu(ta_hdr->securedisplay.size_bytes);
> - adev->psp.securedisplay_context.context.bin_desc.start_addr =
> - (uint8_t *)adev->psp.hdcp_context.context.bin_desc.start_addr +
> - le32_to_cpu(ta_hdr->securedisplay.offset_bytes);
> - }
> + le32_to_cpu(ta_hdr->securedisplay.offset_bytes);
> }
>
> return 0;
> -
> -out:
> - release_firmware(adev->psp.ta_fw);
> - adev->psp.ta_fw = NULL;
> - if (err) {
> - dev_err(adev->dev,
> - "psp v12.0: Failed to load firmware \"%s\"\n",
> - fw_name);
> - }
> -
> - return err;
> }
>
> static int psp_v12_0_bootloader_load_sysdrv(struct psp_context *psp)
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
> index e6a26a7e5e5e..2228994ef096 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0.c
> @@ -31,24 +31,6 @@
> #include "mp/mp_13_0_2_offset.h"
> #include "mp/mp_13_0_2_sh_mask.h"
>
> -MODULE_FIRMWARE("amdgpu/aldebaran_sos.bin");
> -MODULE_FIRMWARE("amdgpu/aldebaran_ta.bin");
> -MODULE_FIRMWARE("amdgpu/aldebaran_cap.bin");
> -MODULE_FIRMWARE("amdgpu/yellow_carp_toc.bin");
> -MODULE_FIRMWARE("amdgpu/yellow_carp_ta.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_5_toc.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_5_ta.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_8_toc.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_8_ta.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_0_sos.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_0_ta.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_7_sos.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_7_ta.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_10_sos.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_10_ta.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_11_toc.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_11_ta.bin");
> -
> /* For large FW files the time to complete can be very long */
> #define USBC_PD_POLLING_LIMIT_S 240
>
> @@ -67,69 +49,6 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_11_ta.bin");
> /* memory training timeout define */
> #define MEM_TRAIN_SEND_MSG_TIMEOUT_US 3000000
>
> -static int psp_v13_0_init_microcode(struct psp_context *psp)
> -{
> - struct amdgpu_device *adev = psp->adev;
> - const char *chip_name;
> - char ucode_prefix[30];
> - int err = 0;
> -
> - switch (adev->ip_versions[MP0_HWIP][0]) {
> - case IP_VERSION(13, 0, 2):
> - chip_name = "aldebaran";
> - break;
> - case IP_VERSION(13, 0, 1):
> - case IP_VERSION(13, 0, 3):
> - chip_name = "yellow_carp";
> - break;
> - default:
> - amdgpu_ucode_ip_version_decode(adev, MP0_HWIP, ucode_prefix, sizeof(ucode_prefix));
> - chip_name = ucode_prefix;
> - break;
> - }
> -
> - switch (adev->ip_versions[MP0_HWIP][0]) {
> - case IP_VERSION(13, 0, 2):
> - err = psp_init_sos_microcode(psp, chip_name);
> - if (err)
> - return err;
> - /* It's not necessary to load ras ta on Guest side */
> - if (!amdgpu_sriov_vf(adev)) {
> - err = psp_init_ta_microcode(&adev->psp, chip_name);
> - if (err)
> - return err;
> - }
> - break;
> - case IP_VERSION(13, 0, 1):
> - case IP_VERSION(13, 0, 3):
> - case IP_VERSION(13, 0, 5):
> - case IP_VERSION(13, 0, 8):
> - case IP_VERSION(13, 0, 11):
> - err = psp_init_toc_microcode(psp, chip_name);
> - if (err)
> - return err;
> - err = psp_init_ta_microcode(psp, chip_name);
> - if (err)
> - return err;
> - break;
> - case IP_VERSION(13, 0, 0):
> - case IP_VERSION(13, 0, 7):
> - case IP_VERSION(13, 0, 10):
> - err = psp_init_sos_microcode(psp, chip_name);
> - if (err)
> - return err;
> - /* It's not necessary to load ras ta on Guest side */
> - err = psp_init_ta_microcode(psp, chip_name);
> - if (err)
> - return err;
> - break;
> - default:
> - BUG();
> - }
> -
> - return 0;
> -}
> -
> static bool psp_v13_0_is_sos_alive(struct psp_context *psp)
> {
> struct amdgpu_device *adev = psp->adev;
> @@ -697,7 +616,6 @@ static int psp_v13_0_vbflash_status(struct psp_context *psp)
> }
>
> static const struct psp_funcs psp_v13_0_funcs = {
> - .init_microcode = psp_v13_0_init_microcode,
> .bootloader_load_kdb = psp_v13_0_bootloader_load_kdb,
> .bootloader_load_spl = psp_v13_0_bootloader_load_spl,
> .bootloader_load_sysdrv = psp_v13_0_bootloader_load_sysdrv,
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c b/drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c
> index 9d4e24e518e8..9e34c7ee9304 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c
> @@ -29,41 +29,6 @@
> #include "mp/mp_13_0_4_offset.h"
> #include "mp/mp_13_0_4_sh_mask.h"
>
> -MODULE_FIRMWARE("amdgpu/psp_13_0_4_toc.bin");
> -MODULE_FIRMWARE("amdgpu/psp_13_0_4_ta.bin");
> -
> -static int psp_v13_0_4_init_microcode(struct psp_context *psp)
> -{
> - struct amdgpu_device *adev = psp->adev;
> - const char *chip_name;
> - char ucode_prefix[30];
> - int err = 0;
> -
> - switch (adev->ip_versions[MP0_HWIP][0]) {
> - case IP_VERSION(13, 0, 4):
> - amdgpu_ucode_ip_version_decode(adev, MP0_HWIP, ucode_prefix, sizeof(ucode_prefix));
> - chip_name = ucode_prefix;
> - break;
> - default:
> - BUG();
> - }
> -
> - switch (adev->ip_versions[MP0_HWIP][0]) {
> - case IP_VERSION(13, 0, 4):
> - err = psp_init_toc_microcode(psp, chip_name);
> - if (err)
> - return err;
> - err = psp_init_ta_microcode(psp, chip_name);
> - if (err)
> - return err;
> - break;
> - default:
> - BUG();
> - }
> -
> - return 0;
> -}
> -
> static bool psp_v13_0_4_is_sos_alive(struct psp_context *psp)
> {
> struct amdgpu_device *adev = psp->adev;
> @@ -339,7 +304,6 @@ static void psp_v13_0_4_ring_set_wptr(struct psp_context *psp, uint32_t value)
> }
>
> static const struct psp_funcs psp_v13_0_4_funcs = {
> - .init_microcode = psp_v13_0_4_init_microcode,
> .bootloader_load_kdb = psp_v13_0_4_bootloader_load_kdb,
> .bootloader_load_spl = psp_v13_0_4_bootloader_load_spl,
> .bootloader_load_sysdrv = psp_v13_0_4_bootloader_load_sysdrv,
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> index 157147c6c94e..a04ca4cdf211 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> @@ -42,46 +42,11 @@
> #include "oss/osssys_4_0_offset.h"
> #include "oss/osssys_4_0_sh_mask.h"
>
> -MODULE_FIRMWARE("amdgpu/vega10_sos.bin");
> -MODULE_FIRMWARE("amdgpu/vega10_asd.bin");
> -MODULE_FIRMWARE("amdgpu/vega10_cap.bin");
> -MODULE_FIRMWARE("amdgpu/vega12_sos.bin");
> -MODULE_FIRMWARE("amdgpu/vega12_asd.bin");
> -
> -
> #define smnMP1_FIRMWARE_FLAGS 0x3010028
>
> static int psp_v3_1_ring_stop(struct psp_context *psp,
> enum psp_ring_type ring_type);
>
> -static int psp_v3_1_init_microcode(struct psp_context *psp)
> -{
> - struct amdgpu_device *adev = psp->adev;
> - const char *chip_name;
> - int err = 0;
> -
> - DRM_DEBUG("\n");
> -
> - switch (adev->asic_type) {
> - case CHIP_VEGA10:
> - chip_name = "vega10";
> - break;
> - case CHIP_VEGA12:
> - chip_name = "vega12";
> - break;
> - default: BUG();
> - }
> -
> - err = psp_init_sos_microcode(psp, chip_name);
> - if (err)
> - return err;
> -
> - err = psp_init_asd_microcode(psp, chip_name);
> - if (err)
> - return err;
> -
> - return 0;
> -}
>
> static int psp_v3_1_bootloader_load_sysdrv(struct psp_context *psp)
> {
> @@ -372,7 +337,6 @@ static void psp_v3_1_ring_set_wptr(struct psp_context *psp, uint32_t value)
> }
>
> static const struct psp_funcs psp_v3_1_funcs = {
> - .init_microcode = psp_v3_1_init_microcode,
> .bootloader_load_sysdrv = psp_v3_1_bootloader_load_sysdrv,
> .bootloader_load_sos = psp_v3_1_bootloader_load_sos,
> .ring_create = psp_v3_1_ring_create,
> --
> 2.34.1
>
