diff options
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.19.8/0787-drm-amdgpu-refactor-smu8_send_msg_to_smc-and-WARN_ON.patch')
| -rw-r--r-- | common/recipes-kernel/linux/linux-yocto-4.19.8/0787-drm-amdgpu-refactor-smu8_send_msg_to_smc-and-WARN_ON.patch | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.19.8/0787-drm-amdgpu-refactor-smu8_send_msg_to_smc-and-WARN_ON.patch b/common/recipes-kernel/linux/linux-yocto-4.19.8/0787-drm-amdgpu-refactor-smu8_send_msg_to_smc-and-WARN_ON.patch new file mode 100644 index 00000000..c3c222d4 --- /dev/null +++ b/common/recipes-kernel/linux/linux-yocto-4.19.8/0787-drm-amdgpu-refactor-smu8_send_msg_to_smc-and-WARN_ON.patch @@ -0,0 +1,110 @@ +From cd6e2e59e7b2cbe6dcd1c252a3710da07240046c Mon Sep 17 00:00:00 2001 +From: Daniel Kurtz <djkurtz@chromium.org> +Date: Mon, 12 Nov 2018 14:48:12 +0530 +Subject: [PATCH 0787/2940] drm/amdgpu: refactor smu8_send_msg_to_smc and + WARN_ON time out + +This patch refactors smu8_send_msg_to_smc_with_parameter() to include +smu8_send_msg_to_smc_async() so that all the messages sent to SMU can be +profiled and appropriately reported if they fail. + +Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> +Signed-off-by: Shirish S <shirish.s@amd.com> +Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + .../drm/amd/powerplay/smumgr/smu8_smumgr.c | 45 +++++++++---------- + 1 file changed, 21 insertions(+), 24 deletions(-) + +diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +index 09b844ec3eab..b6e8c89ca03a 100644 +--- a/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c ++++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +@@ -24,6 +24,7 @@ + #include <linux/delay.h> + #include <linux/gfp.h> + #include <linux/kernel.h> ++#include <linux/ktime.h> + #include <linux/slab.h> + #include <linux/types.h> + +@@ -61,9 +62,13 @@ static uint32_t smu8_get_argument(struct pp_hwmgr *hwmgr) + mmSMU_MP1_SRBM2P_ARG_0); + } + +-static int smu8_send_msg_to_smc_async(struct pp_hwmgr *hwmgr, uint16_t msg) ++/* Send a message to the SMC, and wait for its response.*/ ++static int smu8_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr, ++ uint16_t msg, uint32_t parameter) + { + int result = 0; ++ ktime_t t_start; ++ s64 elapsed_us; + + if (hwmgr == NULL || hwmgr->device == NULL) + return -EINVAL; +@@ -74,28 +79,31 @@ static int smu8_send_msg_to_smc_async(struct pp_hwmgr *hwmgr, uint16_t msg) + /* Read the last message to SMU, to report actual cause */ + uint32_t val = cgs_read_register(hwmgr->device, + mmSMU_MP1_SRBM2P_MSG_0); +- pr_err("smu8_send_msg_to_smc_async (0x%04x) failed\n", msg); +- pr_err("SMU still servicing msg (0x%04x)\n", val); ++ pr_err("%s(0x%04x) aborted; SMU still servicing msg (0x%04x)\n", ++ __func__, msg, val); + return result; + } ++ t_start = ktime_get(); ++ ++ cgs_write_register(hwmgr->device, mmSMU_MP1_SRBM2P_ARG_0, parameter); + + cgs_write_register(hwmgr->device, mmSMU_MP1_SRBM2P_RESP_0, 0); + cgs_write_register(hwmgr->device, mmSMU_MP1_SRBM2P_MSG_0, msg); + +- return 0; ++ result = PHM_WAIT_FIELD_UNEQUAL(hwmgr, ++ SMU_MP1_SRBM2P_RESP_0, CONTENT, 0); ++ ++ elapsed_us = ktime_us_delta(ktime_get(), t_start); ++ ++ WARN(result, "%s(0x%04x, %#x) timed out after %lld us\n", ++ __func__, msg, parameter, elapsed_us); ++ ++ return result; + } + +-/* Send a message to the SMC, and wait for its response.*/ + static int smu8_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg) + { +- int result = 0; +- +- result = smu8_send_msg_to_smc_async(hwmgr, msg); +- if (result != 0) +- return result; +- +- return PHM_WAIT_FIELD_UNEQUAL(hwmgr, +- SMU_MP1_SRBM2P_RESP_0, CONTENT, 0); ++ return smu8_send_msg_to_smc_with_parameter(hwmgr, msg, 0); + } + + static int smu8_set_smc_sram_address(struct pp_hwmgr *hwmgr, +@@ -135,17 +143,6 @@ static int smu8_write_smc_sram_dword(struct pp_hwmgr *hwmgr, + return result; + } + +-static int smu8_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr, +- uint16_t msg, uint32_t parameter) +-{ +- if (hwmgr == NULL || hwmgr->device == NULL) +- return -EINVAL; +- +- cgs_write_register(hwmgr->device, mmSMU_MP1_SRBM2P_ARG_0, parameter); +- +- return smu8_send_msg_to_smc(hwmgr, msg); +-} +- + static int smu8_check_fw_load_finish(struct pp_hwmgr *hwmgr, + uint32_t firmware) + { +-- +2.17.1 + |