Commit dc4e45f9 authored by Lijo Lazar's avatar Lijo Lazar Committed by Zheng Zengkai
Browse files

drm/amdgpu: Restrict extended wait to PSP v13.0.6 

stable inclusion
from stable-v6.6.7
commit 71a1ffe22d3382f61a6988a273733ac4212335d6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8SSQ4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=71a1ffe22d3382f61a6988a273733ac4212335d6

--------------------------------

[ Upstream commit 6fce23a4d8c5f93bf80b7f122449fbb97f1e40dd ]

Only PSPv13.0.6 SOCs take a longer time to reach steady state. Other
PSPv13 based SOCs don't need extended wait. Also, reduce PSPv13.0.6 wait
time.

Cc: stable@vger.kernel.org
Fixes: fc5988907156 ("drm/amdgpu: update retry times for psp vmbx wait")
Fixes: d8c1925ba8cd ("drm/amdgpu: update retry times for psp BL wait")
Link: https://lore.kernel.org/amd-gfx/34dd4c66-f7bf-44aa-af8f-c82889dd652c@amd.com/


Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 4d7bbed6

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

+7 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ MODULE_FIRMWARE("amdgpu/psp_14_0_0_ta.bin"); 
#define GFX_CMD_USB_PD_USE_LFB 0x480



/* Retry times for vmbx ready wait */

#define PSP_VMBX_POLLING_LIMIT 20000

#define PSP_VMBX_POLLING_LIMIT 3000



/* VBIOS gfl defines */

#define MBOX_READY_MASK 0x80000000
@@ -161,14 +161,18 @@ static int psp_v13_0_wait_for_vmbx_ready(struct psp_context *psp) 
static int psp_v13_0_wait_for_bootloader(struct psp_context *psp)

{

	struct amdgpu_device *adev = psp->adev;

	int retry_loop, ret;

	int retry_loop, retry_cnt, ret;



	retry_cnt =

		(adev->ip_versions[MP0_HWIP][0] == IP_VERSION(13, 0, 6)) ?

			PSP_VMBX_POLLING_LIMIT :

			10;

	/* Wait for bootloader to signify that it is ready having bit 31 of

	 * C2PMSG_35 set to 1. All other bits are expected to be cleared.

	 * If there is an error in processing command, bits[7:0] will be set.

	 * This is applicable for PSP v13.0.6 and newer.

	 */

	for (retry_loop = 0; retry_loop < PSP_VMBX_POLLING_LIMIT; retry_loop++) {

	for (retry_loop = 0; retry_loop < retry_cnt; retry_loop++) {

		ret = psp_wait_for(

			psp, SOC15_REG_OFFSET(MP0, 0, regMP0_SMN_C2PMSG_35),

			0x80000000, 0xffffffff, false);