drm/amdgpu/pm: Add default case for smu IH process func
Subsystems (3)
PATCH 1/2 drm/amdgpu/pm: Add default case for smu IH process func
Add default case for smu IH process func.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 ++++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 ++++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +4 -0
@@ -1462,6 +1462,10 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,schedule_work (&smu->throttling_logging_work);break ; +default : +dev_dbg (adev->dev,"Unhandled contxt id %d from client:%d!\n" , + ctxid, client_id); +break ; } } }
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +4 -0
@@ -1428,6 +1428,10 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, data = data & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , regTHM_THERMAL_INT_CTRL, data);break ; +default : +dev_dbg (adev->dev,"Unhandled contxt id %d from client:%d!\n" , + ctxid, client_id); +break ; } } }
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +4 -1
@@ -1439,7 +1439,10 @@ static int smu_v13_0_6_irq_process(struct amdgpu_device *adev, entry->src_data[1]);schedule_work (&smu->throttling_logging_work); } - +break ; +default : +dev_dbg (adev->dev,"Unhandled contxt id %d from client:%d!\n" , + ctxid, client_id);break ; } }
Signature · 1 line
2.34.1
PATCH 2/2 drm/amdgpu/pm: Use macro definitions in the smu IH process function
Replace the hard-coded numbers with macro definition
--- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 11 +---------- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 11 ----------- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 5 +++++ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 10 ++++++++++ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 10 +++++----- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 14 +++++++------- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +- 8 files changed, 31 insertions(+), 34 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +1 -10
@@ -1618,15 +1618,6 @@ typedef struct {#define TABLE_WIFIBAND 12#define TABLE_COUNT 13 -//IH Interupt ID -#define IH_INTERRUPT_ID_TO_DRIVER 0xFE -#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 -#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 -#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 -#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 -#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 -#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 +#endif
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h +0 -11
@@ -1608,15 +1608,4 @@ typedef struct {#define TABLE_WIFIBAND 12#define TABLE_COUNT 13 -//IH Interupt ID -#define IH_INTERRUPT_ID_TO_DRIVER 0xFE -#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 -#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 -#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 -#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 -#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 -#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 -#endif
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h +5 -0
@@ -63,6 +63,11 @@#define LINK_WIDTH_MAX 6#define LINK_SPEED_MAX 3 +#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 +#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 +#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 +static const __maybe_unused uint16_t link_width[] = {0 ,1 ,2 ,4 ,8 ,12 ,16 }; static const
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +10 -0
@@ -59,6 +59,16 @@ extern const int pmfw_decoded_link_width[7];#define DECODE_GEN_SPEED (gen_speed_idx) (pmfw_decoded_link_speed[gen_speed_idx])#define DECODE_LANE_WIDTH (lane_width_idx) (pmfw_decoded_link_width[lane_width_idx]) +#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 +#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 +#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 +#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 +#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 +#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 +#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 +#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 +struct smu_13_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h +2 -0
@@ -44,6 +44,8 @@#define MAX_DPM_LEVELS 16#define MAX_PCIE_CONF 3 +#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +struct smu_14_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +5 -5
@@ -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" );orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) { -if (src_id ==0xfe ) { +if (src_id ==IH_INTERRUPT_ID_TO_DRIVER ) {/* ACK SMUToHost interrupt */ 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 );WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, data);switch (ctxid) { -case 0x3 : +case IH_INTERRUPT_CONTEXT_ID_AC :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); adev->pm.ac_power = true;break ; -case 0x4 : +case IH_INTERRUPT_CONTEXT_ID_DC :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); adev->pm.ac_power = false;break ; -case 0x7 : +case IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING :/* * Increment the throttle interrupt counter */
@@ -1508,7 +1508,7 @@ int smu_v11_0_register_irq_handler(struct smu_context *smu)return ret; ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +7 -7
@@ -1368,24 +1368,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" );orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) { -if (src_id ==0xfe ) { +if (src_id ==IH_INTERRUPT_ID_TO_DRIVER ) {/* ACK SMUToHost interrupt */ 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 );WREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL, data);switch (ctxid) { -case 0x3 : +case IH_INTERRUPT_CONTEXT_ID_AC :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); adev->pm.ac_power = true;break ; -case 0x4 : +case IH_INTERRUPT_CONTEXT_ID_DC :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); adev->pm.ac_power = false;break ; -case 0x7 : +case IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING :/* * Increment the throttle interrupt counter */
@@ -1398,7 +1398,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,schedule_work (&smu->throttling_logging_work);break ; -case 0x8 : +case IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL : high = smu->thermal_range.software_shutdown_temp + smu->thermal_range.software_shutdown_temp_offset; high = min_t(typeof(high),
@@ -1415,7 +1415,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, data = data & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , regTHM_THERMAL_INT_CTRL, data);break ; -case 0x9 : +case IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY : high =min_t (typeof (high),SMU_THERMAL_MAXIMUM_ALERT_TEMP , smu->thermal_range.software_shutdown_temp);
@@ -1476,7 +1476,7 @@ int smu_v13_0_register_irq_handler(struct smu_context *smu)return ret; ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +1 -1
@@ -892,7 +892,7 @@ int smu_v14_0_register_irq_handler(struct smu_context *smu)// TODO: THM related ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;
Signature · 1 line
2.34.1
Re: [PATCH 2/2] drm/amdgpu/pm: Use macro definitions in the smu IH process function
Quoted 79 lines · Ma Jun
Replace the hard-coded numbers with macro definition
Signed-off-by Ma Jun <[email protected]>--- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 11 +---------- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 11 ----------- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 5 +++++ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 10 ++++++++++ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 10 +++++----- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 14 +++++++------- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +- 8 files changed, 31 insertions(+), 34 deletions(-)drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +1
-10@@ -1618,15 +1618,6 @@ typedef struct {#define TABLE_WIFIBAND 12#define TABLE_COUNT 13 -//IH Interupt ID -#define IH_INTERRUPT_ID_TO_DRIVER 0xFE -#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 -#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 -#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 -#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 -#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 -#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 +#endif drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h +0
-11@@ -1608,15 +1608,4 @@ typedef struct {#define TABLE_WIFIBAND 12#define TABLE_COUNT 13 -//IH Interupt ID -#define IH_INTERRUPT_ID_TO_DRIVER 0xFE -#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 -#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 -#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 -#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 -#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 -#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 -#endif drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h +5
-0@@ -63,6 +63,11 @@#define LINK_WIDTH_MAX 6#define LINK_SPEED_MAX 3 +#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 +#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 +#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 +static const __maybe_unused uint16_t link_width[] = {0 ,1 ,2 ,4 ,8 ,12 ,16 }; static constdrivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +0
-0@@ -59,6 +59,16 @@ extern const int pmfw_decoded_link_width[7];#define DECODE_GEN_SPEED (gen_speed_idx) (pmfw_decoded_link_speed[gen_speed_idx])#define DECODE_LANE_WIDTH (lane_width_idx) (pmfw_decoded_link_width[lane_width_idx])
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h extern const int pmfw_decoded_link_width[7]; · line 71
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +10
-0+#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 +#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 +#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 +#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 +#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 +#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 +#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 +#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 +
Since the context_ids are unique across SOCs, these may be kept in smu_cmn.h.
Thanks,
Lijo
Quoted 131 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +0
-0struct smu_13_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h +2
-0@@ -44,6 +44,8 @@#define MAX_DPM_LEVELS 16#define MAX_PCIE_CONF 3 +#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +struct smu_14_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +5
-5@@ -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" );orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) { -if (src_id ==0xfe ) { +if (src_id ==IH_INTERRUPT_ID_TO_DRIVER ) {/* ACK SMUToHost interrupt */ 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 );WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, data);switch (ctxid) { -case 0x3 : +case IH_INTERRUPT_CONTEXT_ID_AC :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); adev->pm.ac_power = true;break ; -case 0x4 : +case IH_INTERRUPT_CONTEXT_ID_DC :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); adev->pm.ac_power = false;break ; -case 0x7 : +case IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING :/* * Increment the throttle interrupt counter */ @@ -1508,7 +1508,7 @@ int smu_v11_0_register_irq_handler(struct smu_context *smu)return ret; ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +7
-7@@ -1368,24 +1368,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" );orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) { -if (src_id ==0xfe ) { +if (src_id ==IH_INTERRUPT_ID_TO_DRIVER ) {/* ACK SMUToHost interrupt */ 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 );WREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL, data);switch (ctxid) { -case 0x3 : +case IH_INTERRUPT_CONTEXT_ID_AC :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); adev->pm.ac_power = true;break ; -case 0x4 : +case IH_INTERRUPT_CONTEXT_ID_DC :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); adev->pm.ac_power = false;break ; -case 0x7 : +case IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING :/* * Increment the throttle interrupt counter */ @@ -1398,7 +1398,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,schedule_work (&smu->throttling_logging_work);break ; -case 0x8 : +case IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL : high = smu->thermal_range.software_shutdown_temp + smu->thermal_range.software_shutdown_temp_offset; high = min_t(typeof(high),@@ -1415,7 +1415,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, data = data & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , regTHM_THERMAL_INT_CTRL, data);break ; -case 0x9 : +case IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY : high =min_t (typeof (high),SMU_THERMAL_MAXIMUM_ALERT_TEMP , smu->thermal_range.software_shutdown_temp);@@ -1476,7 +1476,7 @@ int smu_v13_0_register_irq_handler(struct smu_context *smu)return ret; ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +1
-1@@ -892,7 +892,7 @@ int smu_v14_0_register_irq_handler(struct smu_context *smu)// TODO: THM related ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;
Re: [PATCH 2/2] drm/amdgpu/pm: Use macro definitions in the smu IH process function
Quoted 82 lines · Lijo
Quoted 79 lines · Ma Jun
Replace the hard-coded numbers with macro definition
Signed-off-by Ma Jun <[email protected]>--- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h | 11 +---------- .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h | 11 ----------- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 5 +++++ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 10 ++++++++++ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 10 +++++----- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 14 +++++++------- drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +- 8 files changed, 31 insertions(+), 34 deletions(-)drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +1
-10@@ -1618,15 +1618,6 @@ typedef struct {#define TABLE_WIFIBAND 12#define TABLE_COUNT 13 -//IH Interupt ID -#define IH_INTERRUPT_ID_TO_DRIVER 0xFE -#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 -#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 -#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 -#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 -#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 -#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 +#endif drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h +0
-11@@ -1608,15 +1608,4 @@ typedef struct {#define TABLE_WIFIBAND 12#define TABLE_COUNT 13 -//IH Interupt ID -#define IH_INTERRUPT_ID_TO_DRIVER 0xFE -#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 -#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 -#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 -#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 -#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 -#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 -#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 -#endif drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h +5
-0@@ -63,6 +63,11 @@#define LINK_WIDTH_MAX 6#define LINK_SPEED_MAX 3 +#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 +#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 +#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 +static const __maybe_unused uint16_t link_width[] = {0 ,1 ,2 ,4 ,8 ,12 ,16 }; static constdrivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +0
-0@@ -59,6 +59,16 @@ extern const int pmfw_decoded_link_width[7];#define DECODE_GEN_SPEED (gen_speed_idx) (pmfw_decoded_link_speed[gen_speed_idx])#define DECODE_LANE_WIDTH (lane_width_idx) (pmfw_decoded_link_width[lane_width_idx])
Quoted 14 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h extern const int pmfw_decoded_link_width[7]; · line 71
Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +10
-0+#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +#define IH_INTERRUPT_CONTEXT_ID_BACO 0x2 +#define IH_INTERRUPT_CONTEXT_ID_AC 0x3 +#define IH_INTERRUPT_CONTEXT_ID_DC 0x4 +#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D0 0x5 +#define IH_INTERRUPT_CONTEXT_ID_AUDIO_D3 0x6 +#define IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING 0x7 +#define IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL 0x8 +#define IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY 0x9 +Since the
context_idsare unique across SOCs, these may be kept insmu_cmn.h.
Thanks, will fix this in v2.
Regards,
Ma Jun
Quoted 134 lines
Thanks,
LijoQuoted 131 lines
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +0
-0struct smu_13_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h +2
-0@@ -44,6 +44,8 @@#define MAX_DPM_LEVELS 16#define MAX_PCIE_CONF 3 +#define IH_INTERRUPT_ID_TO_DRIVER 0xFE +struct smu_14_0_max_sustainable_clocks {uint32_t display_clock;uint32_t phy_clock;drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +5
-5@@ -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" );orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) { -if (src_id ==0xfe ) { +if (src_id ==IH_INTERRUPT_ID_TO_DRIVER ) {/* ACK SMUToHost interrupt */ 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 );WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_IH_SW_INT_CTRL, data);switch (ctxid) { -case 0x3 : +case IH_INTERRUPT_CONTEXT_ID_AC :dev_dbg (adev->dev,"Switched to AC mode!\n" );schedule_work (&smu->interrupt_work); adev->pm.ac_power = true;break ; -case 0x4 : +case IH_INTERRUPT_CONTEXT_ID_DC :dev_dbg (adev->dev,"Switched to DC mode!\n" );schedule_work (&smu->interrupt_work); adev->pm.ac_power = false;break ; -case 0x7 : +case IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING :/* * Increment the throttle interrupt counter */ @@ -1508,7 +1508,7 @@ int smu_v11_0_register_irq_handler(struct smu_context *smu)return ret; ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +7
-7@@ -1368,24 +1368,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" );orderly_poweroff (true); }else if (client_id ==SOC15_IH_CLIENTID_MP1 ) { -if (src_id ==0xfe ) { +if (src_id ==IH_INTERRUPT_ID_TO_DRIVER ) {/* ACK SMUToHost interrupt */ 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 );WREG32_SOC15 (MP1 ,0 , regMP1_SMN_IH_SW_INT_CTRL, data);switch (ctxid) { -case 0x3 : +case IH_INTERRUPT_CONTEXT_ID_AC :dev_dbg (adev->dev,"Switched to AC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); adev->pm.ac_power = true;break ; -case 0x4 : +case IH_INTERRUPT_CONTEXT_ID_DC :dev_dbg (adev->dev,"Switched to DC mode!\n" );smu_v13_0_ack_ac_dc_interrupt (smu); adev->pm.ac_power = false;break ; -case 0x7 : +case IH_INTERRUPT_CONTEXT_ID_THERMAL_THROTTLING :/* * Increment the throttle interrupt counter */ @@ -1398,7 +1398,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev,schedule_work (&smu->throttling_logging_work);break ; -case 0x8 : +case IH_INTERRUPT_CONTEXT_ID_FAN_ABNORMAL : high = smu->thermal_range.software_shutdown_temp + smu->thermal_range.software_shutdown_temp_offset; high = min_t(typeof(high),@@ -1415,7 +1415,7 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, data = data & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , regTHM_THERMAL_INT_CTRL, data);break ; -case 0x9 : +case IH_INTERRUPT_CONTEXT_ID_FAN_RECOVERY : high =min_t (typeof (high),SMU_THERMAL_MAXIMUM_ALERT_TEMP , smu->thermal_range.software_shutdown_temp);@@ -1476,7 +1476,7 @@ int smu_v13_0_register_irq_handler(struct smu_context *smu)return ret; ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +1
-1@@ -892,7 +892,7 @@ int smu_v14_0_register_irq_handler(struct smu_context *smu)// TODO: THM related ret =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_MP1 , -0xfe , +IH_INTERRUPT_ID_TO_DRIVER , irq_src);if (ret)return ret;
Quoted 15 lines · Ma Jun
Add default case for smu IH process func.
Signed-off-by Ma Jun <[email protected]>--- drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 ++++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 4 ++++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +0
-0
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c static int smu_v11_0_irq_process(struct amdgpu_device *adev, · line 1467
Quoted 6 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +3
-0@@ -1462,6 +1462,10 @@ static int smu_v11_0_irq_process(struct amdgpu_device *adev,schedule_work (&smu->throttling_logging_work);break ; +default : +dev_dbg (adev->dev,"Unhandled contxt id %d from client:%d!\n" , + ctxid, client_id);
Typo: contxt -> context. Same issue in the other files as well. With those fixed:
Quoted 38 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-0+break ; } } }drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +4
-0@@ -1428,6 +1428,10 @@ static int smu_v13_0_irq_process(struct amdgpu_device *adev, data = data & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK );WREG32_SOC15 (THM ,0 , regTHM_THERMAL_INT_CTRL, data);break ; +default : +dev_dbg (adev->dev,"Unhandled contxt id %d from client:%d!\n" , + ctxid, client_id); +break ; } } }drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +4
-2@@ -1439,7 +1439,10 @@ static int smu_v13_0_6_irq_process(struct amdgpu_device *adev, entry->src_data[1]);schedule_work (&smu->throttling_logging_work); } - +break ; +default : +dev_dbg (adev->dev,"Unhandled contxt id %d from client:%d!\n" , + ctxid, client_id);break ; } } --2.34.1