Commit 3840fe25 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: switch to macro for psp bootloader command 



The command will be sent to psp bootloader from driver
to ask psp bootloader to exerise tOS, sys_drv and kdb loading

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarXiaojie Yuan <xiaojie.yuan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5f0f531c

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

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,12 @@ struct psp_context; 
struct psp_xgmi_node_info;

struct psp_xgmi_topology_info;



enum psp_bootloader_cmd {

	PSP_BL__LOAD_SYSDRV		= 0x10000,

	PSP_BL__LOAD_SOSDRV		= 0x20000,

	PSP_BL__LOAD_KEY_DATABASE	= 0x80000,

};



enum psp_ring_type

{

	PSP_RING_TYPE__INVALID = 0,

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

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int psp_v11_0_bootloader_load_sysdrv(struct psp_context *psp) 
	/* Provide the sys driver to bootloader */

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_36,

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

	psp_gfxdrv_command_reg = 1 << 16;

	psp_gfxdrv_command_reg = PSP_BL__LOAD_SYSDRV;

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_35,

	       psp_gfxdrv_command_reg);
@@ -249,7 +249,7 @@ static int psp_v11_0_bootloader_load_sos(struct psp_context *psp) 
	/* Provide the PSP secure OS to bootloader */

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_36,

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

	psp_gfxdrv_command_reg = 2 << 16;

	psp_gfxdrv_command_reg = PSP_BL__LOAD_SOSDRV;

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_35,

	       psp_gfxdrv_command_reg);

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

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int psp_v3_1_bootloader_load_sysdrv(struct psp_context *psp) 
	/* Provide the sys driver to bootloader */

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_36,

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

	psp_gfxdrv_command_reg = 1 << 16;

	psp_gfxdrv_command_reg = PSP_BL__LOAD_SYSDRV;

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_35,

	       psp_gfxdrv_command_reg);
@@ -218,7 +218,7 @@ static int psp_v3_1_bootloader_load_sos(struct psp_context *psp) 
	/* Provide the PSP secure OS to bootloader */

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_36,

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

	psp_gfxdrv_command_reg = 2 << 16;

	psp_gfxdrv_command_reg = PSP_BL__LOAD_SOSDRV;

	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_35,

	       psp_gfxdrv_command_reg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE