drm/amd/pm: enhance the real response for smu message (v2)

The user prefers to know the real response value from C2PMSG 90 register
which is written by firmware not -EIO.

v2: return C2PMSG 90 value

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
index f8260769061c538e630b60f1857d161806d9ba48..e0557c81e892c95131d96615b8d35ff408509013 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
@@ -92,7 +92,7 @@ static int smu_cmn_wait_for_response(struct smu_context *smu)
        for (i = 0; i < timeout; i++) {
                cur_value = RREG32_SOC15_NO_KIQ(MP1, 0, mmMP1_SMN_C2PMSG_90);
                if ((cur_value & MP1_C2PMSG_90__CONTENT_MASK) != 0)
-                       return cur_value == 0x1 ? 0 : -EIO;
+                       return cur_value;
 
                udelay(1);
        }
@@ -101,7 +101,7 @@ static int smu_cmn_wait_for_response(struct smu_context *smu)
        if (i == timeout)
                return -ETIME;
 
-       return RREG32_SOC15_NO_KIQ(MP1, 0, mmMP1_SMN_C2PMSG_90) == 0x1 ? 0 : -EIO;
+       return RREG32_SOC15_NO_KIQ(MP1, 0, mmMP1_SMN_C2PMSG_90);
 }
 
 int smu_cmn_send_smc_msg_with_param(struct smu_context *smu,
@@ -123,9 +123,11 @@ int smu_cmn_send_smc_msg_with_param(struct smu_context *smu,
 
        mutex_lock(&smu->message_lock);
        ret = smu_cmn_wait_for_response(smu);
-       if (ret) {
+       if (ret != 0x1) {
                dev_err(adev->dev, "Msg issuing pre-check failed and "
                       "SMU may be not in the right state!\n");
+               if (ret != -ETIME)
+                       ret = -EIO;
                goto out;
        }
 
@@ -136,9 +138,11 @@ int smu_cmn_send_smc_msg_with_param(struct smu_context *smu,
        smu_cmn_send_msg_without_waiting(smu, (uint16_t)index);
 
        ret = smu_cmn_wait_for_response(smu);
-       if (ret) {
+       if (ret != 0x1) {
                dev_err(adev->dev, "failed send message: %10s (%d) \tparam: 0x%08x response %#x\n",
-                      smu_get_message_name(smu, msg), index, param, ret);
+                       smu_get_message_name(smu, msg), index, param, ret);
+               if (ret != -ETIME)
+                       ret = -EIO;
                goto out;
        }