Commit fcb1fe9c authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: pre-check the SMU state before issuing message 



Abort the message issuing if the SMU was not in the right state.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ebcef76b

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

+8 −8
Original line number Diff line number Diff line
@@ -80,15 +80,13 @@ static int smu_v11_0_wait_for_response(struct smu_context *smu) 
	for (i = 0; i < timeout; i++) {

		cur_value = RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90);

		if ((cur_value & MP1_C2PMSG_90__CONTENT_MASK) != 0)

			break;

			return cur_value == 0x1 ? 0 : -EIO;



		udelay(1);

	}



	/* timeout means wrong logic */

	if (i == timeout)

	return -ETIME;



	return RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90) == 0x1 ? 0 : -EIO;

}



int
@@ -104,9 +102,11 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu, 
		return index;



	ret = smu_v11_0_wait_for_response(smu);

	if (ret)

		pr_err("failed send message: %10s (%d) \tparam: 0x%08x response %#x\n",

		       smu_get_message_name(smu, msg), index, param, ret);

	if (ret) {

		pr_err("Msg issuing pre-check failed and "

		       "SMU may be not in the right state!\n");

		return ret;

	}



	WREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90, 0);

drivers/gpu/drm/amd/powerplay/smu_v12_0.c

+8 −8
Original line number Diff line number Diff line
@@ -66,15 +66,13 @@ int smu_v12_0_wait_for_response(struct smu_context *smu) 
	for (i = 0; i < adev->usec_timeout; i++) {

		cur_value = RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90);

		if ((cur_value & MP1_C2PMSG_90__CONTENT_MASK) != 0)

			break;

			return cur_value == 0x1 ? 0 : -EIO;



		udelay(1);

	}



	/* timeout means wrong logic */

	if (i == adev->usec_timeout)

	return -ETIME;



	return RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90) == 0x1 ? 0 : -EIO;

}



int
@@ -90,9 +88,11 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu, 
		return index;



	ret = smu_v12_0_wait_for_response(smu);

	if (ret)

		pr_err("Failed to send message 0x%x, response 0x%x, param 0x%x\n",

		       index, ret, param);

	if (ret) {

		pr_err("Msg issuing pre-check failed and "

		       "SMU may be not in the right state!\n");

		return ret;

	}



	WREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90, 0);