Commit 132a6a78 authored by Ma Jun's avatar Ma Jun Committed by Alex Deucher

drm/amdgpu/pm: Use macro definitions in the smu IH process function

Replace the hard-coded numbers with macro definition
Signed-off-by: default avatarMa Jun <Jun.Ma2@amd.com>
Reviewed-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2bf85adf
...@@ -1432,24 +1432,24 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev, ...@@ -1432,24 +1432,24 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,
dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU HW CTF!\n"); dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU HW CTF!\n");
orderly_poweroff(true); orderly_poweroff(true);
} else if (client_id == SOC15_IH_CLIENTID_MP1) { } else if (client_id == SOC15_IH_CLIENTID_MP1) {
if (src_id == 0xfe) { if (src_id == SMU_IH_INTERRUPT_ID_TO_DRIVER) {
/* ACK SMUToHost interrupt */ /* ACK SMUToHost interrupt */
data = RREG32_SOC15(MP1, 0, mmMP1_SMN_IH_SW_INT_CTRL); data = RREG32_SOC15(MP1, 0, mmMP1_SMN_IH_SW_INT_CTRL);
data = REG_SET_FIELD(data, MP1_SMN_IH_SW_INT_CTRL, INT_ACK, 1); data = REG_SET_FIELD(data, MP1_SMN_IH_SW_INT_CTRL, INT_ACK, 1);
WREG32_SOC15(MP1, 0, mmMP1_SMN_IH_SW_INT_CTRL, data); WREG32_SOC15(MP1, 0, mmMP1_SMN_IH_SW_INT_CTRL, data);
switch (ctxid) { switch (ctxid) {
case 0x3: case SMU_IH_INTERRUPT_CONTEXT_ID_AC:
dev_dbg(adev->dev, "Switched to AC mode!\n"); dev_dbg(adev->dev, "Switched to AC mode!\n");
schedule_work(&smu->interrupt_work); schedule_work(&smu->interrupt_work);
adev->pm.ac_power = true; adev->pm.ac_power = true;
break; break;
case 0x4: case SMU_IH_INTERRUPT_CONTEXT_ID_DC:
dev_dbg(adev->dev, "Switched to DC mode!\n"); dev_dbg(adev->dev, "Switched to DC mode!\n");
schedule_work(&smu->interrupt_work); schedule_work(&smu->interrupt_work);
adev->pm.ac_power = false; adev->pm.ac_power = false;
break; break;
case 0x7: case SMU_IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING:
/* /*
* Increment the throttle interrupt counter * Increment the throttle interrupt counter
*/ */
...@@ -1508,7 +1508,7 @@ int smu_v11_0_register_irq_handler(struct smu_context *smu) ...@@ -1508,7 +1508,7 @@ int smu_v11_0_register_irq_handler(struct smu_context *smu)
return ret; return ret;
ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_MP1, ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_MP1,
0xfe, SMU_IH_INTERRUPT_ID_TO_DRIVER,
irq_src); irq_src);
if (ret) if (ret)
return ret; return ret;
......
...@@ -1369,24 +1369,24 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, ...@@ -1369,24 +1369,24 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU HW CTF!\n"); dev_emerg(adev->dev, "ERROR: System is going to shutdown due to GPU HW CTF!\n");
orderly_poweroff(true); orderly_poweroff(true);
} else if (client_id == SOC15_IH_CLIENTID_MP1) { } else if (client_id == SOC15_IH_CLIENTID_MP1) {
if (src_id == 0xfe) { if (src_id == SMU_IH_INTERRUPT_ID_TO_DRIVER) {
/* ACK SMUToHost interrupt */ /* ACK SMUToHost interrupt */
data = RREG32_SOC15(MP1, 0, regMP1_SMN_IH_SW_INT_CTRL); data = RREG32_SOC15(MP1, 0, regMP1_SMN_IH_SW_INT_CTRL);
data = REG_SET_FIELD(data, MP1_SMN_IH_SW_INT_CTRL, INT_ACK, 1); data = REG_SET_FIELD(data, MP1_SMN_IH_SW_INT_CTRL, INT_ACK, 1);
WREG32_SOC15(MP1, 0, regMP1_SMN_IH_SW_INT_CTRL, data); WREG32_SOC15(MP1, 0, regMP1_SMN_IH_SW_INT_CTRL, data);
switch (ctxid) { switch (ctxid) {
case 0x3: case SMU_IH_INTERRUPT_CONTEXT_ID_AC:
dev_dbg(adev->dev, "Switched to AC mode!\n"); dev_dbg(adev->dev, "Switched to AC mode!\n");
smu_v13_0_ack_ac_dc_interrupt(smu); smu_v13_0_ack_ac_dc_interrupt(smu);
adev->pm.ac_power = true; adev->pm.ac_power = true;
break; break;
case 0x4: case SMU_IH_INTERRUPT_CONTEXT_ID_DC:
dev_dbg(adev->dev, "Switched to DC mode!\n"); dev_dbg(adev->dev, "Switched to DC mode!\n");
smu_v13_0_ack_ac_dc_interrupt(smu); smu_v13_0_ack_ac_dc_interrupt(smu);
adev->pm.ac_power = false; adev->pm.ac_power = false;
break; break;
case 0x7: case SMU_IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING:
/* /*
* Increment the throttle interrupt counter * Increment the throttle interrupt counter
*/ */
...@@ -1399,7 +1399,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, ...@@ -1399,7 +1399,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
schedule_work(&smu->throttling_logging_work); schedule_work(&smu->throttling_logging_work);
break; break;
case 0x8: case SMU_IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL:
high = smu->thermal_range.software_shutdown_temp + high = smu->thermal_range.software_shutdown_temp +
smu->thermal_range.software_shutdown_temp_offset; smu->thermal_range.software_shutdown_temp_offset;
high = min_t(typeof(high), high = min_t(typeof(high),
...@@ -1416,7 +1416,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, ...@@ -1416,7 +1416,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,
data = data & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK); data = data & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK);
WREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL, data); WREG32_SOC15(THM, 0, regTHM_THERMAL_INT_CTRL, data);
break; break;
case 0x9: case SMU_IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY:
high = min_t(typeof(high), high = min_t(typeof(high),
SMU_THERMAL_MAXIMUM_ALERT_TEMP, SMU_THERMAL_MAXIMUM_ALERT_TEMP,
smu->thermal_range.software_shutdown_temp); smu->thermal_range.software_shutdown_temp);
...@@ -1477,7 +1477,7 @@ int smu_v13_0_register_irq_handler(struct smu_context *smu) ...@@ -1477,7 +1477,7 @@ int smu_v13_0_register_irq_handler(struct smu_context *smu)
return ret; return ret;
ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_MP1, ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_MP1,
0xfe, SMU_IH_INTERRUPT_ID_TO_DRIVER,
irq_src); irq_src);
if (ret) if (ret)
return ret; return ret;
......
...@@ -892,7 +892,7 @@ int smu_v14_0_register_irq_handler(struct smu_context *smu) ...@@ -892,7 +892,7 @@ int smu_v14_0_register_irq_handler(struct smu_context *smu)
// TODO: THM related // TODO: THM related
ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_MP1, ret = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_MP1,
0xfe, SMU_IH_INTERRUPT_ID_TO_DRIVER,
irq_src); irq_src);
if (ret) if (ret)
return ret; return ret;
......
...@@ -30,6 +30,16 @@ ...@@ -30,6 +30,16 @@
#define FDO_PWM_MODE_STATIC 1 #define FDO_PWM_MODE_STATIC 1
#define FDO_PWM_MODE_STATIC_RPM 5 #define FDO_PWM_MODE_STATIC_RPM 5
#define SMU_IH_INTERRUPT_ID_TO_DRIVER 0xFE
#define SMU_IH_INTERRUPT_CONTEXT_ID_BACO 0x2
#define SMU_IH_INTERRUPT_CONTEXT_ID_AC 0x3
#define SMU_IH_INTERRUPT_CONTEXT_ID_DC 0x4
#define SMU_IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5
#define SMU_IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6
#define SMU_IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7
#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8
#define SMU_IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9
extern const int link_speed[]; extern const int link_speed[];
/* Helper to Convert from PCIE Gen 1/2/3/4/5/6 to 0.1 GT/s speed units */ /* Helper to Convert from PCIE Gen 1/2/3/4/5/6 to 0.1 GT/s speed units */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment