Commit 78825df9 authored by Li Ma's avatar Li Ma Committed by Alex Deucher
Browse files

drm/amd/swsmu: update smu v14_0_0 driver if version and metrics table 



Increment the driver if version and add new mems to the mertics table.

Signed-off-by: default avatarLi Ma <li.ma@amd.com>
Reviewed-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9f7cb03e

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+17 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,10 @@ struct gpu_metrics_v3_0 { 
	uint16_t			average_dram_reads;

	/* time filtered DRAM write bandwidth [MB/sec] */

	uint16_t			average_dram_writes;

	/* time filtered IPU read bandwidth [MB/sec] */

	uint16_t			average_ipu_reads;

	/* time filtered IPU write bandwidth [MB/sec] */

	uint16_t			average_ipu_writes;



	/* Driver attached timestamp (in ns) */

	uint64_t			system_clock_counter;
@@ -1104,6 +1108,8 @@ struct gpu_metrics_v3_0 { 
	uint32_t			average_all_core_power;

	/* calculated core power [mW] */

	uint16_t			average_core_power[16];

	/* time filtered total system power [mW] */

	uint16_t			average_sys_power;

	/* maximum IRM defined STAPM power limit [mW] */

	uint16_t			stapm_power_limit;

	/* time filtered STAPM power limit [mW] */
@@ -1116,6 +1122,8 @@ struct gpu_metrics_v3_0 { 
	uint16_t			average_ipuclk_frequency;

	uint16_t			average_fclk_frequency;

	uint16_t			average_vclk_frequency;

	uint16_t			average_uclk_frequency;

	uint16_t			average_mpipu_frequency;



	/* Current clocks */

	/* target core frequency [MHz] */
@@ -1125,6 +1133,15 @@ struct gpu_metrics_v3_0 { 
	/* GFXCLK frequency limit enforced on GFX [MHz] */

	uint16_t			current_gfx_maxfreq;



	/* Throttle Residency (ASIC dependent) */

	uint32_t			throttle_residency_prochot;

	uint32_t			throttle_residency_spl;

	uint32_t			throttle_residency_fppt;

	uint32_t			throttle_residency_sppt;

	uint32_t			throttle_residency_thm_core;

	uint32_t			throttle_residency_thm_gfx;

	uint32_t			throttle_residency_thm_soc;



	/* Metrics table alpha filter time constant [us] */

	uint32_t			time_filter_alphavalue;

};

drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h

+10 −0
Original line number Diff line number Diff line
@@ -1408,6 +1408,16 @@ typedef enum { 
	METRICS_PCIE_WIDTH,

	METRICS_CURR_FANPWM,

	METRICS_CURR_SOCKETPOWER,

	METRICS_AVERAGE_VPECLK,

	METRICS_AVERAGE_IPUCLK,

	METRICS_AVERAGE_MPIPUCLK,

	METRICS_THROTTLER_RESIDENCY_PROCHOT,

	METRICS_THROTTLER_RESIDENCY_SPL,

	METRICS_THROTTLER_RESIDENCY_FPPT,

	METRICS_THROTTLER_RESIDENCY_SPPT,

	METRICS_THROTTLER_RESIDENCY_THM_CORE,

	METRICS_THROTTLER_RESIDENCY_THM_GFX,

	METRICS_THROTTLER_RESIDENCY_THM_SOC,

} MetricsMember_t;



enum smu_cmn2asic_mapping_type {

drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h

+45 −32
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
// *** IMPORTANT ***

// SMU TEAM: Always increment the interface version if

// any structure is changed in this file

#define PMFW_DRIVER_IF_VERSION 6

#define PMFW_DRIVER_IF_VERSION 7



typedef struct {

  int32_t value;
@@ -180,7 +180,20 @@ typedef struct { 
  uint32_t AllCorePower;               //Time filtered sum of core power across all cores in the socket [mW]

  uint32_t FilterAlphaValue;           //Metrics table alpha filter time constant [us]

  uint32_t MetricsCounter;             //Counter that is incremented on every metrics table update [PM_TIMER cycles]

  uint32_t spare[16];

  uint16_t MemclkFrequency;            //Time filtered target MEMCLK frequency [MHz]

  uint16_t MpipuclkFrequency;          //Time filtered target MPIPUCLK frequency [MHz]

  uint16_t IpuReads;                   //Time filtered IPU read bandwidth [MB/sec]

  uint16_t IpuWrites;                  //Time filtered IPU write bandwidth [MB/sec]

  uint32_t ThrottleResidency_PROCHOT;  //Counter that is incremented on every metrics table update when PROCHOT was engaged [PM_TIMER cycles]

  uint32_t ThrottleResidency_SPL;      //Counter that is incremented on every metrics table update when SPL was engaged [PM_TIMER cycles]

  uint32_t ThrottleResidency_FPPT;     //Counter that is incremented on every metrics table update when fast PPT was engaged [PM_TIMER cycles]

  uint32_t ThrottleResidency_SPPT;     //Counter that is incremented on every metrics table update when slow PPT was engaged [PM_TIMER cycles]

  uint32_t ThrottleResidency_THM_CORE; //Counter that is incremented on every metrics table update when CORE thermal throttling was engaged [PM_TIMER cycles]

  uint32_t ThrottleResidency_THM_GFX;  //Counter that is incremented on every metrics table update when GFX thermal throttling was engaged [PM_TIMER cycles]

  uint32_t ThrottleResidency_THM_SOC;  //Counter that is incremented on every metrics table update when SOC thermal throttling was engaged [PM_TIMER cycles]

  uint16_t Psys;                       //Time filtered Psys power [mW]

  uint16_t spare1;

  uint32_t spare[6];

} SmuMetrics_t;



//ISP tile definitions

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c

+43 −3
Original line number Diff line number Diff line
@@ -246,11 +246,20 @@ static int smu_v14_0_0_get_smu_metrics_data(struct smu_context *smu, 
		*value = 0;

		break;

	case METRICS_AVERAGE_UCLK:

		*value = 0;

		*value = metrics->MemclkFrequency;

		break;

	case METRICS_AVERAGE_FCLK:

		*value = metrics->FclkFrequency;

		break;

	case METRICS_AVERAGE_VPECLK:

		*value = metrics->VpeclkFrequency;

		break;

	case METRICS_AVERAGE_IPUCLK:

		*value = metrics->IpuclkFrequency;

		break;

	case METRICS_AVERAGE_MPIPUCLK:

		*value = metrics->MpipuclkFrequency;

		break;

	case METRICS_AVERAGE_GFXACTIVITY:

		*value = metrics->GfxActivity / 100;

		break;
@@ -270,8 +279,26 @@ static int smu_v14_0_0_get_smu_metrics_data(struct smu_context *smu, 
		*value = metrics->SocTemperature / 100 *

		SMU_TEMPERATURE_UNITS_PER_CENTIGRADES;

		break;

	case METRICS_THROTTLER_STATUS:

		*value = 0;

	case METRICS_THROTTLER_RESIDENCY_PROCHOT:

		*value = metrics->ThrottleResidency_PROCHOT;

		break;

	case METRICS_THROTTLER_RESIDENCY_SPL:

		*value = metrics->ThrottleResidency_SPL;

		break;

	case METRICS_THROTTLER_RESIDENCY_FPPT:

		*value = metrics->ThrottleResidency_FPPT;

		break;

	case METRICS_THROTTLER_RESIDENCY_SPPT:

		*value = metrics->ThrottleResidency_SPPT;

		break;

	case METRICS_THROTTLER_RESIDENCY_THM_CORE:

		*value = metrics->ThrottleResidency_THM_CORE;

		break;

	case METRICS_THROTTLER_RESIDENCY_THM_GFX:

		*value = metrics->ThrottleResidency_THM_GFX;

		break;

	case METRICS_THROTTLER_RESIDENCY_THM_SOC:

		*value = metrics->ThrottleResidency_THM_SOC;

		break;

	case METRICS_VOLTAGE_VDDGFX:

		*value = 0;
@@ -498,6 +525,8 @@ static ssize_t smu_v14_0_0_get_gpu_metrics(struct smu_context *smu, 
		sizeof(uint16_t) * 16);

	gpu_metrics->average_dram_reads = metrics.DRAMReads;

	gpu_metrics->average_dram_writes = metrics.DRAMWrites;

	gpu_metrics->average_ipu_reads = metrics.IpuReads;

	gpu_metrics->average_ipu_writes = metrics.IpuWrites;



	gpu_metrics->average_socket_power = metrics.SocketPower;

	gpu_metrics->average_ipu_power = metrics.IpuPower;
@@ -505,6 +534,7 @@ static ssize_t smu_v14_0_0_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->average_gfx_power = metrics.GfxPower;

	gpu_metrics->average_dgpu_power = metrics.dGpuPower;

	gpu_metrics->average_all_core_power = metrics.AllCorePower;

	gpu_metrics->average_sys_power = metrics.Psys;

	memcpy(&gpu_metrics->average_core_power[0],

		&metrics.CorePower[0],

		sizeof(uint16_t) * 16);
@@ -515,6 +545,8 @@ static ssize_t smu_v14_0_0_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->average_fclk_frequency = metrics.FclkFrequency;

	gpu_metrics->average_vclk_frequency = metrics.VclkFrequency;

	gpu_metrics->average_ipuclk_frequency = metrics.IpuclkFrequency;

	gpu_metrics->average_uclk_frequency = metrics.MemclkFrequency;

	gpu_metrics->average_mpipu_frequency = metrics.MpipuclkFrequency;



	memcpy(&gpu_metrics->current_coreclk[0],

		&metrics.CoreFrequency[0],
@@ -522,6 +554,14 @@ static ssize_t smu_v14_0_0_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->current_core_maxfreq = metrics.InfrastructureCpuMaxFreq;

	gpu_metrics->current_gfx_maxfreq = metrics.InfrastructureGfxMaxFreq;



	gpu_metrics->throttle_residency_prochot = metrics.ThrottleResidency_PROCHOT;

	gpu_metrics->throttle_residency_spl = metrics.ThrottleResidency_SPL;

	gpu_metrics->throttle_residency_fppt = metrics.ThrottleResidency_FPPT;

	gpu_metrics->throttle_residency_sppt = metrics.ThrottleResidency_SPPT;

	gpu_metrics->throttle_residency_thm_core = metrics.ThrottleResidency_THM_CORE;

	gpu_metrics->throttle_residency_thm_gfx = metrics.ThrottleResidency_THM_GFX;

	gpu_metrics->throttle_residency_thm_soc = metrics.ThrottleResidency_THM_SOC;



	gpu_metrics->time_filter_alphavalue = metrics.FilterAlphaValue;

	gpu_metrics->system_clock_counter = ktime_get_boottime_ns();