AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-05 13:55:20 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/amd/powerplay: add sensor lock support for smu

Browse Source 
when multithreading access sysfs of amdgpu_pm_info at the sametime.
the swsmu driver cause smu firmware hang.

eg:
single thread access:
Message A + Param A ==> right
Message B + Param B ==> right
Message C + Param C ==> right
multithreading access:
Message A + Param B ==> error
Message B + Param A ==> error
Message C + Param C ==> right

the patch will add sensor lock(mutex) to avoid this error.

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Kevin Wang 2019-09-26 16:22:13 +08:00 committed by Alex Deucher
parent 64e51a1b55
commit 95f71bfad2
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
View File

@ -840,6 +840,8 @@ static int smu_sw_init(void *handle)
smu->smu_baco.state = SMU_BACO_STATE_EXIT; smu->smu_baco.state = SMU_BACO_STATE_EXIT;
smu->smu_baco.platform_support = false; smu->smu_baco.platform_support = false;
mutex_init(&smu->sensor_lock);
smu->watermarks_bitmap = 0; smu->watermarks_bitmap = 0;
smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT; smu->power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;
smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT; smu->default_power_profile_mode = PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT;

2
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
View File

@ -1025,6 +1025,7 @@ static int arcturus_read_sensor(struct smu_context *smu,
if (!data || !size) if (!data || !size)
return -EINVAL; return -EINVAL;
mutex_lock(&smu->sensor_lock);
switch (sensor) { switch (sensor) {
case AMDGPU_PP_SENSOR_MAX_FAN_RPM: case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
*(uint32_t *)data = pptable->FanMaximumRpm; *(uint32_t *)data = pptable->FanMaximumRpm;
@ -1051,6 +1052,7 @@ static int arcturus_read_sensor(struct smu_context *smu,
default: default:
ret = smu_smc_read_sensor(smu, sensor, data, size); ret = smu_smc_read_sensor(smu, sensor, data, size);
} }
mutex_unlock(&smu->sensor_lock);
return ret; return ret;
} }

1
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
View File

@ -350,6 +350,7 @@ struct smu_context
const struct smu_funcs *funcs; const struct smu_funcs *funcs;
const struct pptable_funcs *ppt_funcs; const struct pptable_funcs *ppt_funcs;
struct mutex mutex; struct mutex mutex;
struct mutex sensor_lock;
uint64_t pool_size; uint64_t pool_size;
struct smu_table_context smu_table; struct smu_table_context smu_table;

2
drivers/gpu/drm/amd/powerplay/navi10_ppt.c
View File

@ -1387,6 +1387,7 @@ static int navi10_read_sensor(struct smu_context *smu,
if(!data || !size) if(!data || !size)
return -EINVAL; return -EINVAL;
mutex_lock(&smu->sensor_lock);
switch (sensor) { switch (sensor) {
case AMDGPU_PP_SENSOR_MAX_FAN_RPM: case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
*(uint32_t *)data = pptable->FanMaximumRpm; *(uint32_t *)data = pptable->FanMaximumRpm;
@ -1410,6 +1411,7 @@ static int navi10_read_sensor(struct smu_context *smu,
default: default:
ret = smu_smc_read_sensor(smu, sensor, data, size); ret = smu_smc_read_sensor(smu, sensor, data, size);
} }
mutex_unlock(&smu->sensor_lock);
return ret; return ret;
} }

2
drivers/gpu/drm/amd/powerplay/vega20_ppt.c
View File

@ -3017,6 +3017,7 @@ static int vega20_read_sensor(struct smu_context *smu,
if(!data || !size) if(!data || !size)
return -EINVAL; return -EINVAL;
mutex_lock(&smu->sensor_lock);
switch (sensor) { switch (sensor) {
case AMDGPU_PP_SENSOR_MAX_FAN_RPM: case AMDGPU_PP_SENSOR_MAX_FAN_RPM:
*(uint32_t *)data = pptable->FanMaximumRpm; *(uint32_t *)data = pptable->FanMaximumRpm;
@ -3042,6 +3043,7 @@ static int vega20_read_sensor(struct smu_context *smu,
default: default:
ret = smu_smc_read_sensor(smu, sensor, data, size); ret = smu_smc_read_sensor(smu, sensor, data, size);
} }
mutex_unlock(&smu->sensor_lock);
return ret; return ret;
} }