From e0e384c398d4638e54b6d2098f0ceaafdab870ee Mon Sep 17 00:00:00 2001

From: Alex Deucher <alexander.deucher@amd.com>

Date: Tue, 17 Dec 2019 09:50:42 -0500

Subject: drm/amdgpu/smu: add metrics table lock for navi (v2)

Git-commit: e0e384c398d4638e54b6d2098f0ceaafdab870ee

Patch-mainline: v5.5-rc5

References: bsc#1152472

To protect access to the metrics table.

v2: unlock on error

Bug: https://gitlab.freedesktop.org/drm/amd/issues/900

Reviewed-by: Kevin Wang <kevin1.wang@amd.com>

Reviewed-by: Evan Quan <evan.quan@amd.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Cc: stable@vger.kernel.org

Acked-by: Thomas Zimmermann <tzimmermann@suse.de>

---

 drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 3 +++

 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c

index 4a14fd1f9fd5..ca62e92e5a4f 100644

--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c

+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c

@@ -562,17 +562,20 @@ static int navi10_get_metrics_table(struct smu_context *smu,

 	struct smu_table_context *smu_table= &smu->smu_table;

 	int ret = 0;

+	mutex_lock(&smu->metrics_lock);

 	if (!smu_table->metrics_time || time_after(jiffies, smu_table->metrics_time + msecs_to_jiffies(100))) {

 		ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, 0,

 				(void *)smu_table->metrics_table, false);

 		if (ret) {

 			pr_info("Failed to export SMU metrics table!\n");

+			mutex_unlock(&smu->metrics_lock);

 			return ret;

 		}

 		smu_table->metrics_time = jiffies;

 	}

 	memcpy(metrics_table, smu_table->metrics_table, sizeof(SmuMetrics_t));

+	mutex_unlock(&smu->metrics_lock);

 	return ret;

 }

-- 

2.28.0