Commit 6c565218 authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amd/pm: Add GetStaticMetricTable message 



Add GetStaticMetricTable message for smu_v13_0_12

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e2b3f95b

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

+2 −1
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ 
	__SMU_DUMMY_MAP(SetThrottlingPolicy), \

	__SMU_DUMMY_MAP(MALLPowerController), \

	__SMU_DUMMY_MAP(MALLPowerState), \

	__SMU_DUMMY_MAP(ResetSDMA),

	__SMU_DUMMY_MAP(ResetSDMA), \

	__SMU_DUMMY_MAP(GetStaticMetricsTable),



#undef __SMU_DUMMY_MAP

#define __SMU_DUMMY_MAP(type)	SMU_MSG_##type

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

+1 −0
Original line number Diff line number Diff line
@@ -308,5 +308,6 @@ int smu_v13_0_get_boot_freq_by_index(struct smu_context *smu, 
void smu_v13_0_interrupt_work(struct smu_context *smu);

bool smu_v13_0_12_is_dpm_running(struct smu_context *smu);

extern const struct cmn2asic_mapping smu_v13_0_12_feature_mask_map[];

extern const struct cmn2asic_msg_mapping smu_v13_0_12_message_map[];

#endif

#endif

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c

+58 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "amdgpu_smu.h"

#include "smu_v13_0_12_pmfw.h"

#include "smu_v13_0_6_ppt.h"

#include "smu_v13_0_12_ppsmc.h"

#include "smu_v13_0.h"

#include "amdgpu_xgmi.h"

#include <linux/pci.h>
@@ -72,6 +73,63 @@ const struct cmn2asic_mapping smu_v13_0_12_feature_mask_map[SMU_FEATURE_COUNT] = 
	SMU_13_0_12_FEA_MAP(SMU_FEATURE_XGMI_PER_LINK_PWR_DWN_BIT,	FEATURE_XGMI_PER_LINK_PWR_DOWN),

};



// clang-format off

const struct cmn2asic_msg_mapping smu_v13_0_12_message_map[SMU_MSG_MAX_COUNT] = {

	MSG_MAP(TestMessage,			     PPSMC_MSG_TestMessage,			0),

	MSG_MAP(GetSmuVersion,			     PPSMC_MSG_GetSmuVersion,			1),

	MSG_MAP(GetDriverIfVersion,		     PPSMC_MSG_GetDriverIfVersion,		1),

	MSG_MAP(EnableAllSmuFeatures,		     PPSMC_MSG_EnableAllSmuFeatures,		0),

	MSG_MAP(DisableAllSmuFeatures,		     PPSMC_MSG_DisableAllSmuFeatures,		0),

	MSG_MAP(RequestI2cTransaction,		     PPSMC_MSG_RequestI2cTransaction,		0),

	MSG_MAP(GetMetricsTable,		     PPSMC_MSG_GetMetricsTable,			1),

	MSG_MAP(GetMetricsVersion,		     PPSMC_MSG_GetMetricsVersion,		1),

	MSG_MAP(GetEnabledSmuFeaturesHigh,	     PPSMC_MSG_GetEnabledSmuFeaturesHigh,	1),

	MSG_MAP(GetEnabledSmuFeaturesLow,	     PPSMC_MSG_GetEnabledSmuFeaturesLow,	1),

	MSG_MAP(SetDriverDramAddrHigh,		     PPSMC_MSG_SetDriverDramAddrHigh,		1),

	MSG_MAP(SetDriverDramAddrLow,		     PPSMC_MSG_SetDriverDramAddrLow,		1),

	MSG_MAP(SetToolsDramAddrHigh,		     PPSMC_MSG_SetToolsDramAddrHigh,		0),

	MSG_MAP(SetToolsDramAddrLow,		     PPSMC_MSG_SetToolsDramAddrLow,		0),

	MSG_MAP(SetSoftMinByFreq,		     PPSMC_MSG_SetSoftMinByFreq,		0),

	MSG_MAP(SetSoftMaxByFreq,		     PPSMC_MSG_SetSoftMaxByFreq,		1),

	MSG_MAP(GetMinDpmFreq,			     PPSMC_MSG_GetMinDpmFreq,			1),

	MSG_MAP(GetMaxDpmFreq,			     PPSMC_MSG_GetMaxDpmFreq,			1),

	MSG_MAP(GetDpmFreqByIndex,		     PPSMC_MSG_GetDpmFreqByIndex,		1),

	MSG_MAP(SetPptLimit,			     PPSMC_MSG_SetPptLimit,			0),

	MSG_MAP(GetPptLimit,			     PPSMC_MSG_GetPptLimit,			1),

	MSG_MAP(GfxDeviceDriverReset,		     PPSMC_MSG_GfxDriverReset,			SMU_MSG_RAS_PRI),

	MSG_MAP(DramLogSetDramAddrHigh,		     PPSMC_MSG_DramLogSetDramAddrHigh,		0),

	MSG_MAP(DramLogSetDramAddrLow,		     PPSMC_MSG_DramLogSetDramAddrLow,		0),

	MSG_MAP(DramLogSetDramSize,		     PPSMC_MSG_DramLogSetDramSize,		0),

	MSG_MAP(GetDebugData,			     PPSMC_MSG_GetDebugData,			0),

	MSG_MAP(SetNumBadHbmPagesRetired,	     PPSMC_MSG_SetNumBadHbmPagesRetired,	0),

	MSG_MAP(DFCstateControl,		     PPSMC_MSG_DFCstateControl,			0),

	MSG_MAP(GetGmiPwrDnHyst,		     PPSMC_MSG_GetGmiPwrDnHyst,			0),

	MSG_MAP(SetGmiPwrDnHyst,		     PPSMC_MSG_SetGmiPwrDnHyst,			0),

	MSG_MAP(GmiPwrDnControl,		     PPSMC_MSG_GmiPwrDnControl,			0),

	MSG_MAP(EnterGfxoff,			     PPSMC_MSG_EnterGfxoff,			0),

	MSG_MAP(ExitGfxoff,			     PPSMC_MSG_ExitGfxoff,			0),

	MSG_MAP(EnableDeterminism,		     PPSMC_MSG_EnableDeterminism,		0),

	MSG_MAP(DisableDeterminism,		     PPSMC_MSG_DisableDeterminism,		0),

	MSG_MAP(GfxDriverResetRecovery,		     PPSMC_MSG_GfxDriverResetRecovery,		0),

	MSG_MAP(GetMinGfxclkFrequency,               PPSMC_MSG_GetMinGfxDpmFreq,                1),

	MSG_MAP(GetMaxGfxclkFrequency,               PPSMC_MSG_GetMaxGfxDpmFreq,                1),

	MSG_MAP(SetSoftMinGfxclk,                    PPSMC_MSG_SetSoftMinGfxClk,                1),

	MSG_MAP(SetSoftMaxGfxClk,                    PPSMC_MSG_SetSoftMaxGfxClk,                1),

	MSG_MAP(PrepareMp1ForUnload,                 PPSMC_MSG_PrepareForDriverUnload,          0),

	MSG_MAP(GetCTFLimit,                         PPSMC_MSG_GetCTFLimit,                     0),

	MSG_MAP(GetThermalLimit,                     PPSMC_MSG_ReadThrottlerLimit,              0),

	MSG_MAP(ClearMcaOnRead,	                     PPSMC_MSG_ClearMcaOnRead,                  0),

	MSG_MAP(QueryValidMcaCount,                  PPSMC_MSG_QueryValidMcaCount,              SMU_MSG_RAS_PRI),

	MSG_MAP(QueryValidMcaCeCount,                PPSMC_MSG_QueryValidMcaCeCount,            SMU_MSG_RAS_PRI),

	MSG_MAP(McaBankDumpDW,                       PPSMC_MSG_McaBankDumpDW,                   SMU_MSG_RAS_PRI),

	MSG_MAP(McaBankCeDumpDW,                     PPSMC_MSG_McaBankCeDumpDW,                 SMU_MSG_RAS_PRI),

	MSG_MAP(SelectPLPDMode,                      PPSMC_MSG_SelectPLPDMode,                  0),

	MSG_MAP(RmaDueToBadPageThreshold,            PPSMC_MSG_RmaDueToBadPageThreshold,        0),

	MSG_MAP(SetThrottlingPolicy,                 PPSMC_MSG_SetThrottlingPolicy,             0),

	MSG_MAP(ResetSDMA,                           PPSMC_MSG_ResetSDMA,                       0),

	MSG_MAP(GetStaticMetricsTable,               PPSMC_MSG_GetStaticMetricsTable,           1),

};



static int smu_v13_0_12_get_enabled_mask(struct smu_context *smu,

					 uint64_t *feature_mask)

{

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+2 −1
Original line number Diff line number Diff line
@@ -3616,7 +3616,8 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs = { 
void smu_v13_0_6_set_ppt_funcs(struct smu_context *smu)

{

	smu->ppt_funcs = &smu_v13_0_6_ppt_funcs;

	smu->message_map = smu_v13_0_6_message_map;

	smu->message_map = (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12)) ?

		smu_v13_0_12_message_map : smu_v13_0_6_message_map;

	smu->clock_map = smu_v13_0_6_clk_map;

	smu->feature_map = (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12)) ?

		smu_v13_0_12_feature_mask_map : smu_v13_0_6_feature_mask_map;