Commit 893d14cb authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

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



call common helper function to init sos ucode, instead
of duplicate codes per ip version

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1c301f44

drivers/gpu/drm/amd/amdgpu/psp_v11_0.c

+3 −53
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ static int psp_v11_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 *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 ta_firmware_header_v1_0 *ta_hdr;



	DRM_DEBUG("\n");
@@ -102,54 +99,13 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 
		BUG();

	}



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);

	err = request_firmware(&adev->psp.sos_fw, fw_name, adev->dev);

	err = psp_init_sos_microcode(psp, chip_name);

	if (err)

		goto out;



	err = amdgpu_ucode_validate(adev->psp.sos_fw);

	if (err)

		goto out;



	sos_hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.sos_fw->data;

	amdgpu_ucode_print_psp_hdr(&sos_hdr->header);



	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->sos_offset_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 +

				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);

			adev->psp.kdb_bin_size = le32_to_cpu(sos_hdr_v1_1->kdb_size_bytes);

			adev->psp.kdb_start_addr = (uint8_t *)adev->psp.sys_start_addr +

					le32_to_cpu(sos_hdr_v1_1->kdb_offset_bytes);

		}

		if (sos_hdr->header.header_version_minor == 2) {

			sos_hdr_v1_2 = (const struct psp_firmware_header_v1_2 *)adev->psp.sos_fw->data;

			adev->psp.kdb_bin_size = le32_to_cpu(sos_hdr_v1_2->kdb_size_bytes);

			adev->psp.kdb_start_addr = (uint8_t *)adev->psp.sys_start_addr +

						    le32_to_cpu(sos_hdr_v1_2->kdb_offset_bytes);

		}

		break;

	default:

		dev_err(adev->dev,

			"Unsupported psp sos firmware\n");

		err = -EINVAL;

		goto out;

	}

		return err;



	err = psp_init_asd_microcode(psp, chip_name);

	if (err)

		goto out;

		return err;



	switch (adev->asic_type) {

	case CHIP_VEGA20:
@@ -216,12 +172,6 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 
out2:

	release_firmware(adev->psp.ta_fw);

	adev->psp.ta_fw = NULL;

out:

	dev_err(adev->dev,

		"psp v11.0: Failed to load firmware \"%s\"\n", fw_name);

	release_firmware(adev->psp.sos_fw);

	adev->psp.sos_fw = NULL;



	return err;

}

drivers/gpu/drm/amd/amdgpu/psp_v3_1.c

+3 −31
Original line number Diff line number Diff line
@@ -59,9 +59,7 @@ static int psp_v3_1_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 *hdr;



	DRM_DEBUG("\n");
@@ -75,41 +73,15 @@ static int psp_v3_1_init_microcode(struct psp_context *psp) 
	default: BUG();

	}



	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_sos.bin", chip_name);

	err = request_firmware(&adev->psp.sos_fw, fw_name, adev->dev);

	err = psp_init_sos_microcode(psp, chip_name);

	if (err)

		goto out;



	err = amdgpu_ucode_validate(adev->psp.sos_fw);

	if (err)

		goto out;



	hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.sos_fw->data;

	adev->psp.sos_fw_version = le32_to_cpu(hdr->header.ucode_version);

	adev->psp.sos_feature_version = le32_to_cpu(hdr->ucode_feature_version);

	adev->psp.sos_bin_size = le32_to_cpu(hdr->sos_size_bytes);

	adev->psp.sys_bin_size = le32_to_cpu(hdr->header.ucode_size_bytes) -

					le32_to_cpu(hdr->sos_size_bytes);

	adev->psp.sys_start_addr = (uint8_t *)hdr +

				le32_to_cpu(hdr->header.ucode_array_offset_bytes);

	adev->psp.sos_start_addr = (uint8_t *)adev->psp.sys_start_addr +

				le32_to_cpu(hdr->sos_offset_bytes);

		return err;



	err = psp_init_asd_microcode(psp, chip_name);

	if (err)

		goto out;

		return err;



	return 0;

out:

	if (err) {

		dev_err(adev->dev,

			"psp v3.1: Failed to load firmware \"%s\"\n",

			fw_name);

		release_firmware(adev->psp.sos_fw);

		adev->psp.sos_fw = NULL;

	}



	return err;

}



static int psp_v3_1_bootloader_load_sysdrv(struct psp_context *psp)

CRA Git | Maintained and supported by SUSTech CRA and CCSE