drm/amd/powerplay: stop thermal IRQs on suspend
Subsystems (2)
PATCH 1/3 drm/amd/powerplay: stop thermal IRQs on suspend
Added missing thermal IRQs disablement on suspend.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +6 -0
@@ -1537,6 +1537,12 @@ static int smu_suspend(void *handle)smu_i2c_eeprom_fini (smu, &adev->pm.smu_i2c); + ret =smu_stop_thermal_control (smu); +if (ret) { +pr_warn ("Fail to stop thermal control!\n" ); +return ret; + } + ret =smu_disable_dpm (smu);if (ret)return ret;
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amd/powerplay: use the common APIs for IRQ disablement/enablement
Also the new logics for MP1 SW IRQs disablement/enablement are added.
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 79 ++++++++++++++++------- 1 file changed, 57 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +57 -22
@@ -1167,8 +1167,6 @@ static int smu_v11_0_set_thermal_range(struct smu_context *smu, val =RREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,MAX_IH_CREDIT ,5 ); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_IH_HW_ENA ,1 ); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_INTH_MASK ,0 ); - val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_INTL_MASK ,0 ); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTH , (high &0xff )); val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,DIG_THERM_INTL , (low &0xff )); val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );
@@ -1178,20 +1176,6 @@ static int smu_v11_0_set_thermal_range(struct smu_context *smu,return 0 ; } -static int smu_v11_0_enable_thermal_alert (struct smu_context *smu) -{ -struct amdgpu_device *adev = smu->adev; -uint32_t val =0 ; - - val |= (1 <<THM_THERMAL_INT_ENA__THERM_INTH_CLR__SHIFT ); - val |= (1 <<THM_THERMAL_INT_ENA__THERM_INTL_CLR__SHIFT ); - val |= (1 <<THM_THERMAL_INT_ENA__THERM_TRIGGER_CLR__SHIFT ); - -WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_ENA, val); - -return 0 ; -} -int smu_v11_0_start_thermal_control (struct smu_context *smu) {int ret =0 ;
@@ -1209,7 +1193,7 @@ int smu_v11_0_start_thermal_control(struct smu_context *smu)if (ret)return ret; - ret =smu_v11_0_enable_thermal_alert (smu); + ret =amdgpu_irq_get (adev, smu->irq_source,0 );if (ret)return ret;
@@ -1233,11 +1217,7 @@ int smu_v11_0_start_thermal_control(struct smu_context *smu)int smu_v11_0_stop_thermal_control (struct smu_context *smu) { -struct amdgpu_device *adev = smu->adev; - -WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_ENA,0 ); - -return 0 ; +return amdgpu_irq_put (smu->adev, smu->irq_source,0 ); }static uint16_t convert_to_vddc (uint8_t vid)
@@ -1508,6 +1488,59 @@ int smu_v11_0_set_xgmi_pstate(struct smu_context *smu,return ret; } +static int smu_v11_0_set_irq_state (struct amdgpu_device *adev, +struct amdgpu_irq_src *source, +unsigned tyep, +enum amdgpu_interrupt_state state) +{ +uint32_t val =0 ; + +switch (state) { +case AMDGPU_IRQ_STATE_DISABLE : +/* For THM irqs */ + val =RREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_INTH_MASK ,1 ); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_INTL_MASK ,1 ); +WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL, val); + +WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_ENA,0 ); + +/* For MP1 SW irqs */ + val =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL); + val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT_CTRL ,INT_MASK ,1 ); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, val); + +break ; +case AMDGPU_IRQ_STATE_ENABLE : +/* For THM irqs */ + val =RREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_INTH_MASK ,0 ); + val =REG_SET_FIELD (val,THM_THERMAL_INT_CTRL ,THERM_INTL_MASK ,0 ); +WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_CTRL, val); + + val = (1 <<THM_THERMAL_INT_ENA__THERM_INTH_CLR__SHIFT ); + val |= (1 <<THM_THERMAL_INT_ENA__THERM_INTL_CLR__SHIFT ); + val |= (1 <<THM_THERMAL_INT_ENA__THERM_TRIGGER_CLR__SHIFT ); +WREG32_SOC15 (THM ,0 , mmTHM_THERMAL_INT_ENA, val); + +/* For MP1 SW irqs */ + val =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT); + val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,ID ,0xFE ); + val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT ,VALID ,0 ); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT, val); + + val =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL); + val =REG_SET_FIELD (val,MP1_SMN_IH_SW_INT_CTRL ,INT_MASK ,0 ); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, val); + +break ; +default : +break ; + } + +return 0 ; +} +static int smu_v11_0_ack_ac_dc_interrupt (struct smu_context *smu) { return smu_send_smc_msg(smu,
@@ -1593,6 +1626,7 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,static const struct amdgpu_irq_src_funcs smu_v11_0_irq_funcs = { + .set = smu_v11_0_set_irq_state, .process = smu_v11_0_irq_process, };
@@ -1611,6 +1645,7 @@ int smu_v11_0_register_irq_handler(struct smu_context *smu)return -ENOMEM ; smu->irq_source = irq_src; + irq_src->num_types =1 ; irq_src->funcs = &smu_v11_0_irq_funcs; ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_THM,
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/powerplay: give better names for the thermal IRQ related APIs
In reply to Evan QuanThermal control is performed by PMFW. What handled in driver is just whether or not to enable the alert(to driver).
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 8 ++++---- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 4 ++-- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ++-- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 4 ++-- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 4 ++-- drivers/gpu/drm/amd/powerplay/smu_internal.h | 8 ++++---- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4 -4
@@ -1350,7 +1350,7 @@ static int smu_hw_init(void *handle)if (ret) goto failed; - ret =smu_start_thermal_control (smu); + ret =smu_enable_thermal_alert (smu);if (ret) goto failed;
@@ -1396,7 +1396,7 @@ static int smu_hw_fini(void *handle)smu_i2c_eeprom_fini (smu, &adev->pm.smu_i2c); - ret =smu_stop_thermal_control (smu); + ret =smu_disable_thermal_alert (smu);if (ret) {pr_warn ("Fail to stop thermal control!\n" );return ret;
@@ -1537,7 +1537,7 @@ static int smu_suspend(void *handle)smu_i2c_eeprom_fini (smu, &adev->pm.smu_i2c); - ret =smu_stop_thermal_control (smu); + ret =smu_disable_thermal_alert (smu);if (ret) {pr_warn ("Fail to stop thermal control!\n" );return ret;
@@ -1582,7 +1582,7 @@ static int smu_resume(void *handle)if (ret) goto failed; - ret =smu_start_thermal_control (smu); + ret =smu_enable_thermal_alert (smu);if (ret) goto failed;
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2 -2
@@ -2442,8 +2442,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .set_power_limit = smu_v11_0_set_power_limit, .get_current_clk_freq = smu_v11_0_get_current_clk_freq, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, - .start_thermal_control = smu_v11_0_start_thermal_control, - .stop_thermal_control = smu_v11_0_stop_thermal_control, + .enable_thermal_alert = smu_v11_0_enable_thermal_alert, + .disable_thermal_alert = smu_v11_0_disable_thermal_alert, .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, .get_fan_control_mode = smu_v11_0_get_fan_control_mode,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -2
@@ -530,8 +530,8 @@ struct pptable_funcs {int (*set_power_limit)(struct smu_context *smu,uint32_t n);int (*get_current_clk_freq)(struct smu_context *smu,enum smu_clk_type clk_id,uint32_t *value);int (*init_max_sustainable_clocks)(struct smu_context *smu); -int (*start_thermal_control)(struct smu_context *smu); -int (*stop_thermal_control)(struct smu_context *smu); +int (*enable_thermal_alert)(struct smu_context *smu); +int (*disable_thermal_alert)(struct smu_context *smu);int (*set_deep_sleep_dcefclk)(struct smu_context *smu,uint32_t clk);int (*set_active_display_count)(struct smu_context *smu,uint32_t count); int (*store_cc6_data)(struct smu_context *smu, uint32_t separation_time,
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +2 -2
@@ -207,9 +207,9 @@ int smu_v11_0_get_current_clk_freq(struct smu_context *smu,int smu_v11_0_init_max_sustainable_clocks (struct smu_context *smu); -int smu_v11_0_start_thermal_control (struct smu_context *smu); +int smu_v11_0_enable_thermal_alert (struct smu_context *smu); -int smu_v11_0_stop_thermal_control (struct smu_context *smu); +int smu_v11_0_disable_thermal_alert (struct smu_context *smu); int smu_v11_0_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +2 -2
@@ -2320,8 +2320,8 @@ static const struct pptable_funcs navi10_ppt_funcs = { .set_power_limit = smu_v11_0_set_power_limit, .get_current_clk_freq = smu_v11_0_get_current_clk_freq, .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, - .start_thermal_control = smu_v11_0_start_thermal_control, - .stop_thermal_control = smu_v11_0_stop_thermal_control, + .enable_thermal_alert = smu_v11_0_enable_thermal_alert, + .disable_thermal_alert = smu_v11_0_disable_thermal_alert, .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, .get_fan_control_mode = smu_v11_0_get_fan_control_mode,
drivers/gpu/drm/amd/powerplay/smu_internal.h +4 -4
@@ -118,10 +118,10 @@ static inline int smu_send_smc_msg(struct smu_context *smu, enum smu_message_typ ((smu)->ppt_funcs->tables_init ? (smu)->ppt_funcs->tables_init((smu), (tab)) : 0)#define smu_set_thermal_fan_table (smu) \ ((smu)->ppt_funcs->set_thermal_fan_table ? (smu)->ppt_funcs->set_thermal_fan_table((smu)) : 0) -#define smu_start_thermal_control (smu) \ - ((smu)->ppt_funcs->start_thermal_control? (smu)->ppt_funcs->start_thermal_control((smu)) : 0) -#define smu_stop_thermal_control (smu) \ - ((smu)->ppt_funcs->stop_thermal_control? (smu)->ppt_funcs->stop_thermal_control((smu)) : 0) +#define smu_enable_thermal_alert (smu) \ + ((smu)->ppt_funcs->enable_thermal_alert? (smu)->ppt_funcs->enable_thermal_alert((smu)) : 0) +#define smu_disable_thermal_alert (smu) \ + ((smu)->ppt_funcs->disable_thermal_alert? (smu)->ppt_funcs->disable_thermal_alert((smu)) : 0)#define smu_smc_read_sensor (smu, sensor, data, size) \ ((smu)->ppt_funcs->read_sensor? (smu)->ppt_funcs->read_sensor((smu), (sensor), (data), (size)) : -EINVAL)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +2 -2
@@ -1176,7 +1176,7 @@ static int smu_v11_0_set_thermal_range(struct smu_context *smu,return 0 ; } -int smu_v11_0_start_thermal_control (struct smu_context *smu) +int smu_v11_0_enable_thermal_alert (struct smu_context *smu) {int ret =0 ;struct smu_temperature_range range;
@@ -1215,7 +1215,7 @@ int smu_v11_0_start_thermal_control(struct smu_context *smu)return ret; } -int smu_v11_0_stop_thermal_control (struct smu_context *smu) +int smu_v11_0_disable_thermal_alert (struct smu_context *smu) {return amdgpu_irq_put (smu->adev, smu->irq_source,0 ); }
Signature · 6 lines
2.26.2 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Series is:
________________________________
From: Quan, Evan <[email protected]>
Sent: Thursday, May 28, 2020 5:02 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 1/3] drm/amd/powerplay: stop thermal IRQs on suspend
Added missing thermal IRQs disablement on suspend.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +6 -0
@@ -1537,6 +1537,12 @@ static int smu_suspend(void *handle)smu_i2c_eeprom_fini (smu, &adev->pm.smu_i2c); + ret =smu_stop_thermal_control (smu); +if (ret) { +pr_warn ("Fail to stop thermal control!\n" ); +return ret; + } + ret =smu_disable_dpm (smu);if (ret)return ret;
--
2.26.2
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx