Commit 79a0f441 authored by John Clements's avatar John Clements Committed by Alex Deucher
Browse files

drm/amdgpu: Updated fw header structure source 



synchronized fw header with latest source

Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarJohn Clements <john.clements@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bc05716d

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

+20 −20
Original line number Diff line number Diff line
@@ -2749,7 +2749,7 @@ int psp_init_asd_microcode(struct psp_context *psp, 


	asd_hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.asd_fw->data;

	adev->psp.asd_fw_version = le32_to_cpu(asd_hdr->header.ucode_version);

	adev->psp.asd_feature_version = le32_to_cpu(asd_hdr->ucode_feature_version);

	adev->psp.asd_feature_version = le32_to_cpu(asd_hdr->sos.fw_version);

	adev->psp.asd_ucode_size = le32_to_cpu(asd_hdr->header.ucode_size_bytes);

	adev->psp.asd_start_addr = (uint8_t *)asd_hdr +

				le32_to_cpu(asd_hdr->header.ucode_array_offset_bytes);
@@ -2785,7 +2785,7 @@ int psp_init_toc_microcode(struct psp_context *psp, 


	toc_hdr = (const struct psp_firmware_header_v1_0 *)adev->psp.toc_fw->data;

	adev->psp.toc_fw_version = le32_to_cpu(toc_hdr->header.ucode_version);

	adev->psp.toc_feature_version = le32_to_cpu(toc_hdr->ucode_feature_version);

	adev->psp.toc_feature_version = le32_to_cpu(toc_hdr->sos.fw_version);

	adev->psp.toc_bin_size = le32_to_cpu(toc_hdr->header.ucode_size_bytes);

	adev->psp.toc_start_addr = (uint8_t *)toc_hdr +

				le32_to_cpu(toc_hdr->header.ucode_array_offset_bytes);
@@ -2828,42 +2828,42 @@ int psp_init_sos_microcode(struct psp_context *psp, 
	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.sos_feature_version = le32_to_cpu(sos_hdr->sos.fw_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);

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

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

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

						    le32_to_cpu(sos_hdr_v1_2->kdb.offset_bytes);

		}

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

			sos_hdr_v1_3 = (const struct psp_firmware_header_v1_3 *)adev->psp.sos_fw->data;

			adev->psp.toc_bin_size = le32_to_cpu(sos_hdr_v1_3->v1_1.toc_size_bytes);

			adev->psp.toc_bin_size = le32_to_cpu(sos_hdr_v1_3->v1_1.toc.size_bytes);

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

				le32_to_cpu(sos_hdr_v1_3->v1_1.toc_offset_bytes);

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

				le32_to_cpu(sos_hdr_v1_3->v1_1.toc.offset_bytes);

			adev->psp.kdb_bin_size = le32_to_cpu(sos_hdr_v1_3->v1_1.kdb.size_bytes);

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

				le32_to_cpu(sos_hdr_v1_3->v1_1.kdb_offset_bytes);

			adev->psp.spl_bin_size = le32_to_cpu(sos_hdr_v1_3->spl_size_bytes);

				le32_to_cpu(sos_hdr_v1_3->v1_1.kdb.offset_bytes);

			adev->psp.spl_bin_size = le32_to_cpu(sos_hdr_v1_3->spl.size_bytes);

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

				le32_to_cpu(sos_hdr_v1_3->spl_offset_bytes);

			adev->psp.rl_bin_size = le32_to_cpu(sos_hdr_v1_3->rl_size_bytes);

				le32_to_cpu(sos_hdr_v1_3->spl.offset_bytes);

			adev->psp.rl_bin_size = le32_to_cpu(sos_hdr_v1_3->rl.size_bytes);

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

				le32_to_cpu(sos_hdr_v1_3->rl_offset_bytes);

				le32_to_cpu(sos_hdr_v1_3->rl.offset_bytes);

		}

		break;

	default:

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

+21 −21
Original line number Diff line number Diff line
@@ -257,36 +257,36 @@ void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr) 
			container_of(hdr, struct psp_firmware_header_v1_0, header);



		DRM_DEBUG("ucode_feature_version: %u\n",

			  le32_to_cpu(psp_hdr->ucode_feature_version));

			  le32_to_cpu(psp_hdr->sos.fw_version));

		DRM_DEBUG("sos_offset_bytes: %u\n",

			  le32_to_cpu(psp_hdr->sos_offset_bytes));

			  le32_to_cpu(psp_hdr->sos.offset_bytes));

		DRM_DEBUG("sos_size_bytes: %u\n",

			  le32_to_cpu(psp_hdr->sos_size_bytes));

			  le32_to_cpu(psp_hdr->sos.size_bytes));

		if (version_minor == 1) {

			const struct psp_firmware_header_v1_1 *psp_hdr_v1_1 =

				container_of(psp_hdr, struct psp_firmware_header_v1_1, v1_0);

			DRM_DEBUG("toc_header_version: %u\n",

				  le32_to_cpu(psp_hdr_v1_1->toc_header_version));

				  le32_to_cpu(psp_hdr_v1_1->toc.fw_version));

			DRM_DEBUG("toc_offset_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_1->toc_offset_bytes));

				  le32_to_cpu(psp_hdr_v1_1->toc.offset_bytes));

			DRM_DEBUG("toc_size_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_1->toc_size_bytes));

				  le32_to_cpu(psp_hdr_v1_1->toc.size_bytes));

			DRM_DEBUG("kdb_header_version: %u\n",

				  le32_to_cpu(psp_hdr_v1_1->kdb_header_version));

				  le32_to_cpu(psp_hdr_v1_1->kdb.fw_version));

			DRM_DEBUG("kdb_offset_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_1->kdb_offset_bytes));

				  le32_to_cpu(psp_hdr_v1_1->kdb.offset_bytes));

			DRM_DEBUG("kdb_size_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_1->kdb_size_bytes));

				  le32_to_cpu(psp_hdr_v1_1->kdb.size_bytes));

		}

		if (version_minor == 2) {

			const struct psp_firmware_header_v1_2 *psp_hdr_v1_2 =

				container_of(psp_hdr, struct psp_firmware_header_v1_2, v1_0);

			DRM_DEBUG("kdb_header_version: %u\n",

				  le32_to_cpu(psp_hdr_v1_2->kdb_header_version));

				  le32_to_cpu(psp_hdr_v1_2->kdb.fw_version));

			DRM_DEBUG("kdb_offset_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_2->kdb_offset_bytes));

				  le32_to_cpu(psp_hdr_v1_2->kdb.offset_bytes));

			DRM_DEBUG("kdb_size_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_2->kdb_size_bytes));

				  le32_to_cpu(psp_hdr_v1_2->kdb.size_bytes));

		}

		if (version_minor == 3) {

			const struct psp_firmware_header_v1_1 *psp_hdr_v1_1 =
@@ -294,23 +294,23 @@ void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr) 
			const struct psp_firmware_header_v1_3 *psp_hdr_v1_3 =

				container_of(psp_hdr_v1_1, struct psp_firmware_header_v1_3, v1_1);

			DRM_DEBUG("toc_header_version: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->v1_1.toc_header_version));

				  le32_to_cpu(psp_hdr_v1_3->v1_1.toc.fw_version));

			DRM_DEBUG("toc_offset_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->v1_1.toc_offset_bytes));

				  le32_to_cpu(psp_hdr_v1_3->v1_1.toc.offset_bytes));

			DRM_DEBUG("toc_size_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->v1_1.toc_size_bytes));

				  le32_to_cpu(psp_hdr_v1_3->v1_1.toc.size_bytes));

			DRM_DEBUG("kdb_header_version: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->v1_1.kdb_header_version));

				  le32_to_cpu(psp_hdr_v1_3->v1_1.kdb.fw_version));

			DRM_DEBUG("kdb_offset_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->v1_1.kdb_offset_bytes));

				  le32_to_cpu(psp_hdr_v1_3->v1_1.kdb.offset_bytes));

			DRM_DEBUG("kdb_size_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->v1_1.kdb_size_bytes));

				  le32_to_cpu(psp_hdr_v1_3->v1_1.kdb.size_bytes));

			DRM_DEBUG("spl_header_version: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->spl_header_version));

				  le32_to_cpu(psp_hdr_v1_3->spl.fw_version));

			DRM_DEBUG("spl_offset_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->spl_offset_bytes));

				  le32_to_cpu(psp_hdr_v1_3->spl.offset_bytes));

			DRM_DEBUG("spl_size_bytes: %u\n",

				  le32_to_cpu(psp_hdr_v1_3->spl_size_bytes));

				  le32_to_cpu(psp_hdr_v1_3->spl.size_bytes));

		}

	} else {

		DRM_ERROR("Unknown PSP ucode version: %u.%u\n",

drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h

+15 −19
Original line number Diff line number Diff line
@@ -71,43 +71,39 @@ struct smc_firmware_header_v2_1 { 
        uint32_t pptable_entry_offset;

};



struct psp_fw_bin_desc {

	uint32_t fw_version;

	uint32_t offset_bytes;

	uint32_t size_bytes;

};



/* version_major=1, version_minor=0 */

struct psp_firmware_header_v1_0 {

	struct common_firmware_header header;

	uint32_t ucode_feature_version;

	uint32_t sos_offset_bytes;

	uint32_t sos_size_bytes;

	struct psp_fw_bin_desc sos;

};



/* version_major=1, version_minor=1 */

struct psp_firmware_header_v1_1 {

	struct psp_firmware_header_v1_0 v1_0;

	uint32_t toc_header_version;

	uint32_t toc_offset_bytes;

	uint32_t toc_size_bytes;

	uint32_t kdb_header_version;

	uint32_t kdb_offset_bytes;

	uint32_t kdb_size_bytes;

	struct psp_fw_bin_desc toc;

	struct psp_fw_bin_desc kdb;

};



/* version_major=1, version_minor=2 */

struct psp_firmware_header_v1_2 {

	struct psp_firmware_header_v1_0 v1_0;

	uint32_t reserve[3];

	uint32_t kdb_header_version;

	uint32_t kdb_offset_bytes;

	uint32_t kdb_size_bytes;

	struct psp_fw_bin_desc res;

	struct psp_fw_bin_desc kdb;

};



/* version_major=1, version_minor=3 */

struct psp_firmware_header_v1_3 {

	struct psp_firmware_header_v1_1 v1_1;

	uint32_t spl_header_version;

	uint32_t spl_offset_bytes;

	uint32_t spl_size_bytes;

	uint32_t rl_header_version;

	uint32_t rl_offset_bytes;

	uint32_t rl_size_bytes;

	struct psp_fw_bin_desc spl;

	struct psp_fw_bin_desc rl;

	struct psp_fw_bin_desc sys_drv_aux;

	struct psp_fw_bin_desc sos_aux;

};



/* version_major=1, version_minor=0 */