Commit 70509057 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu/psp: support for loading PSP SPL fw 



Add support for loading SPL firmware.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 43a188e0

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

+8 −0
Original line number Diff line number Diff line
@@ -1355,6 +1355,14 @@ static int psp_hw_start(struct psp_context *psp) 
			}

		}



		if (psp->spl_bin_size) {

			ret = psp_bootloader_load_spl(psp);

			if (ret) {

				DRM_ERROR("PSP load spl failed!\n");

				return ret;

			}

		}



		ret = psp_bootloader_load_sysdrv(psp);

		if (ret) {

			DRM_ERROR("PSP load sysdrv failed!\n");

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

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ enum psp_bootloader_cmd { 
	PSP_BL__LOAD_KEY_DATABASE	= 0x80000,

	PSP_BL__DRAM_LONG_TRAIN		= 0x100000,

	PSP_BL__DRAM_SHORT_TRAIN	= 0x200000,

	PSP_BL__LOAD_TOS_SPL_TABLE	= 0x10000000,

};



enum psp_ring_type
@@ -84,6 +85,7 @@ struct psp_funcs 
{

	int (*init_microcode)(struct psp_context *psp);

	int (*bootloader_load_kdb)(struct psp_context *psp);

	int (*bootloader_load_spl)(struct psp_context *psp);

	int (*bootloader_load_sysdrv)(struct psp_context *psp);

	int (*bootloader_load_sos)(struct psp_context *psp);

	int (*ring_init)(struct psp_context *psp, enum psp_ring_type ring_type);
@@ -298,6 +300,8 @@ struct amdgpu_psp_funcs { 
		((psp)->funcs->init_microcode ? (psp)->funcs->init_microcode((psp)) : 0)

#define psp_bootloader_load_kdb(psp) \

		((psp)->funcs->bootloader_load_kdb ? (psp)->funcs->bootloader_load_kdb((psp)) : 0)

#define psp_bootloader_load_spl(psp) \

		((psp)->funcs->bootloader_load_spl ? (psp)->funcs->bootloader_load_spl((psp)) : 0)

#define psp_bootloader_load_sysdrv(psp) \

		((psp)->funcs->bootloader_load_sysdrv ? (psp)->funcs->bootloader_load_sysdrv((psp)) : 0)

#define psp_bootloader_load_sos(psp) \

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

+34 −0
Original line number Diff line number Diff line
@@ -252,6 +252,39 @@ static int psp_v11_0_bootloader_load_kdb(struct psp_context *psp) 
	return ret;

}



static int psp_v11_0_bootloader_load_spl(struct psp_context *psp)

{

	int ret;

	uint32_t psp_gfxdrv_command_reg = 0;

	struct amdgpu_device *adev = psp->adev;



	/* Check tOS sign of life register to confirm sys driver and sOS

	 * are already been loaded.

	 */

	if (psp_v11_0_is_sos_alive(psp))

		return 0;



	ret = psp_v11_0_wait_for_bootloader(psp);

	if (ret)

		return ret;



	memset(psp->fw_pri_buf, 0, PSP_1_MEG);



	/* Copy PSP SPL binary to memory */

	memcpy(psp->fw_pri_buf, psp->spl_start_addr, psp->spl_bin_size);



	/* Provide the PSP SPL to bootloader */

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_36,

	       (uint32_t)(psp->fw_pri_mc_addr >> 20));

	psp_gfxdrv_command_reg = PSP_BL__LOAD_TOS_SPL_TABLE;

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_35,

	       psp_gfxdrv_command_reg);



	ret = psp_v11_0_wait_for_bootloader(psp);



	return ret;

}



static int psp_v11_0_bootloader_load_sysdrv(struct psp_context *psp)

{

	int ret;
@@ -785,6 +818,7 @@ static int psp_v11_0_read_usbc_pd_fw(struct psp_context *psp, uint32_t *fw_ver) 
static const struct psp_funcs psp_v11_0_funcs = {

	.init_microcode = psp_v11_0_init_microcode,

	.bootloader_load_kdb = psp_v11_0_bootloader_load_kdb,

	.bootloader_load_spl = psp_v11_0_bootloader_load_spl,

	.bootloader_load_sysdrv = psp_v11_0_bootloader_load_sysdrv,

	.bootloader_load_sos = psp_v11_0_bootloader_load_sos,

	.ring_init = psp_v11_0_ring_init,