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

drm/amdgpu: add wait_for helper for spirom update 



Spirom update typically requires extremely long
duration for command execution, and special helper
function to wait for it completion.

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 ebbb0b10

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

+20 −0
Original line number Diff line number Diff line
@@ -569,6 +569,26 @@ int psp_wait_for(struct psp_context *psp, uint32_t reg_index, 
	return -ETIME;

}



int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_index,

			       uint32_t reg_val, uint32_t mask, uint32_t msec_timeout)

{

	uint32_t val;

	int i;

	struct amdgpu_device *adev = psp->adev;



	if (psp->adev->no_hw_access)

		return 0;



	for (i = 0; i < msec_timeout; i++) {

		val = RREG32(reg_index);

		if ((val & mask) == reg_val)

			return 0;

		msleep(1);

	}



	return -ETIME;

}



static const char *psp_gfx_cmd_name(enum psp_gfx_cmd_id cmd_id)

{

	switch (cmd_id) {

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

+2 −0
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ extern const struct amdgpu_ip_block_version psp_v13_0_4_ip_block; 


extern int psp_wait_for(struct psp_context *psp, uint32_t reg_index,

			uint32_t field_val, uint32_t mask, bool check_changed);

extern int psp_wait_for_spirom_update(struct psp_context *psp, uint32_t reg_index,

			uint32_t field_val, uint32_t mask, uint32_t msec_timeout);



int psp_gpu_reset(struct amdgpu_device *adev);

int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,

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

+5 −4
Original line number Diff line number Diff line
@@ -624,8 +624,9 @@ static int psp_v13_0_exec_spi_cmd(struct psp_context *psp, int cmd) 
	WREG32_SOC15(MP0, 0, regMP0_SMN_C2PMSG_73, 1);



	if (cmd == C2PMSG_CMD_SPI_UPDATE_FLASH_IMAGE)

		return 0;



		ret = psp_wait_for_spirom_update(psp, SOC15_REG_OFFSET(MP0, 0, regMP0_SMN_C2PMSG_115),

						 MBOX_READY_FLAG, MBOX_READY_MASK, PSP_SPIROM_UPDATE_TIMEOUT);

	else

		ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, regMP0_SMN_C2PMSG_115),

				   MBOX_READY_FLAG, MBOX_READY_MASK, false);

	if (ret) {

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

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 


#include "amdgpu_psp.h"



#define PSP_SPIROM_UPDATE_TIMEOUT   60000   /* 60s */



void psp_v13_0_set_psp_funcs(struct psp_context *psp);



#endif