Arcturus updates
Subsystems (2)
cover Arcturus updates
This series updates arcturus support enabling powerplay and assorted bug fixes.
Evan Quan (26):
drm/amd/powerplay: add smcdpminfo table v4_6 support drm/amd/powerplay: add SW SMU interface for dumping pptable out (v2) drm/amd/powerplay: update smu11_driver_if_arcturus.h drm/amd/powerplay: update arcturus_ppsmc.h drm/amd/powerplay: update arcturus_ppt.c/h V3 drm/amd/powerplay: enable SW SMU routine support for arcturus drm/amd/powerplay: initialize arcturus MP1 and THM base address drm/amd/powerplay: enable arcturus powerplay
drm/amdgpu: correct VCN powergate routine for acturus drm/amd/powerplay: hold on the arcturus gfx dpm support in driver drm/amd/powerplay: add new sensor type for VCN powergate status drm/amd/powerplay: support VCN powergate status retrieval on Raven drm/amd/powerplay: support VCN powergate status retrieval for SW SMU drm/amd/powerplay: correct Navi10 VCN powergate control drm/amd/powerplay: correct UVD/VCE/VCN power status retrieval drm/amd/powerplay: init arcturus SMU metrics table on bootup drm/amd/powerplay: support sensor reading on arcturus drm/amd/powerplay: support real-time clock retrieval on arcturus drm/amd/powerplay: support fan speed retrieval on arcturus drm/amd/powerplay: add missing arcturus feature maps drm/amd/powerplay: correct the bitmask used in arcturus drm/amd/powerplay: fix arcturus real-time clock frequency retrieval drm/amd/powerplay: support UMD PSTATE settings on arcturus drm/amd/powerplay: correct arcturus current clock level calculation drm/amd/powerplay: make power limit retrieval as asic specific drm/amd/powerplay: determine the features to enable by pptable only
Hawking Zhang (1):
drm/amdgpu: correct irq type used for sdma ecc
Kevin Wang (1):
drm/amd/powerplay: remove redundancy debug log in smu
Le Ma (2):
drm/amd/include: adjust base offset of SMUIO and THM for Arcturus drm/amdgpu: update more sdma instances irq support
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 56 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +- drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 2 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 77 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + drivers/gpu/drm/amd/include/arct_ip_offset.h | 8 +- drivers/gpu/drm/amd/include/atomfirmware.h | 86 + .../gpu/drm/amd/include/kgd_pp_interface.h | 1 + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 57 +- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1727 ++++++++++++++++- drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 44 + .../gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 9 + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 8 +- .../drm/amd/powerplay/inc/arcturus_ppsmc.h | 4 +- .../powerplay/inc/smu11_driver_if_arcturus.h | 58 +- drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 2 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 77 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 55 +- 18 files changed, 2084 insertions(+), 192 deletions(-)
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20190729201508.16136-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 1/30 drm/amd/powerplay: add smcdpminfo table v4_6 support
From: Evan Quan <[email protected]>
New smcdpminfo table used in arcturus.
--- drivers/gpu/drm/amd/include/atomfirmware.h | 86 ++++++++++++++++++++++ 1 file changed, 86 insertions(+)
drivers/gpu/drm/amd/include/atomfirmware.h +86 -0
@@ -1789,6 +1789,92 @@ struct atom_smc_dpm_info_v4_5 }; +struct atom_smc_dpm_info_v4_6 +{ +struct atom_common_table_header table_header; +// section: board parameters +uint32_t i2c_padding[3 ];// old i2c control are moved to new area + +uint16_t maxvoltagestepgfx;// in mv(q2) max voltage step that smu will request. multiple steps are taken if voltage change exceeds this value. +uint16_t maxvoltagestepsoc;// in mv(q2) max voltage step that smu will request. multiple steps are taken if voltage change exceeds this value. + +uint8_t vddgfxvrmapping;// use vr_mapping* bitfields +uint8_t vddsocvrmapping;// use vr_mapping* bitfields +uint8_t vddmemvrmapping;// use vr_mapping* bitfields +uint8_t boardvrmapping;// use vr_mapping* bitfields + +uint8_t gfxulvphasesheddingmask;// set this to 1 to set psi0/1 to 1 in ulv mode +uint8_t externalsensorpresent;// external rdi connected to tmon (aka temp in) +uint8_t padding8_v[2 ]; + +// telemetry settings +uint16_t gfxmaxcurrent;// in amps +uint8_t gfxoffset;// in amps +uint8_t padding_telemetrygfx; + +uint16_t socmaxcurrent;// in amps +uint8_t socoffset;// in amps +uint8_t padding_telemetrysoc; + +uint16_t memmaxcurrent;// in amps +uint8_t memoffset;// in amps +uint8_t padding_telemetrymem; + +uint16_t boardmaxcurrent;// in amps +uint8_t boardoffset;// in amps +uint8_t padding_telemetryboardinput; + +// gpio settings +uint8_t vr0hotgpio;// gpio pin configured for vr0 hot event +uint8_t vr0hotpolarity;// gpio polarity for vr0 hot event +uint8_t vr1hotgpio;// gpio pin configured for vr1 hot event +uint8_t vr1hotpolarity;// gpio polarity for vr1 hot event + +// gfxclk pll spread spectrum +uint8_t pllgfxclkspreadenabled;// on or off +uint8_t pllgfxclkspreadpercent;// q4.4 +uint16_t pllgfxclkspreadfreq;// khz + +// uclk spread spectrum +uint8_t uclkspreadenabled;// on or off +uint8_t uclkspreadpercent;// q4.4 +uint16_t uclkspreadfreq;// khz + +// fclk spread spectrum +uint8_t fclkspreadenabled;// on or off +uint8_t fclkspreadpercent;// q4.4 +uint16_t fclkspreadfreq;// khz + + +// gfxclk fll spread spectrum +uint8_t fllgfxclkspreadenabled;// on or off +uint8_t fllgfxclkspreadpercent;// q4.4 +uint16_t fllgfxclkspreadfreq;// khz + +// i2c controller structure +struct smudpm_i2c_controller_config_v2 i2ccontrollers[8 ]; + +// memory section +uint32_t memorychannelenabled;// for dram use only, max 32 channels enabled bit mask. + +uint8_t drambitwidth;// for dram use only. see dram bit width type defines +uint8_t paddingmem[3 ]; + +// total board power +uint16_t totalboardpower;//only needed for tcp estimated case, where tcp = tgp+total board power +uint16_t boardpadding; + +// section: xgmi training +uint8_t xgmilinkspeed[4 ]; +uint8_t xgmilinkwidth[4 ]; + +uint16_t xgmifclkfreq[4 ]; +uint16_t xgmisocvoltage[4 ]; + +// reserved +uint32_t boardreserved[10 ]; +}; +/* *************************************************************************** Data Table asic_profiling_info structure
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/30 drm/amd/powerplay: add SW SMU interface for dumping pptable out (v2)
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
This is especially useful in early bring up phase.
v2: disabled by default (Alex)
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++ drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2 -0
@@ -1064,6 +1064,8 @@ static int smu_smc_table_hw_init(struct smu_context *smu,return ret; } +/* smu_dump_pptable(smu); */ +/* * Copy pptable bo in the vram to smc with SMU MSGs such as * SetDriverDramAddr and TransferTableDram2Smu.
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +3 -1
@@ -446,6 +446,7 @@ struct pptable_funcs {int (*get_uclk_dpm_states)(struct smu_context *smu,uint32_t *clocks_in_khz,uint32_t *num_states);int (*set_default_od_settings)(struct smu_context *smu,bool initialize);int (*set_performance_level)(struct smu_context *smu,enum amd_dpm_forced_level level); +void (*dump_pptable)(struct smu_context *smu); };struct smu_funcs
@@ -737,7 +738,8 @@ struct smu_funcs ((smu)->funcs->baco_reset? (smu)->funcs->baco_reset((smu)) : 0)#define smu_asic_set_performance_level (smu, level) \ ((smu)->ppt_funcs->set_performance_level? (smu)->ppt_funcs->set_performance_level((smu), (level)) : -EINVAL); - +#define smu_dump_pptable (smu) \ + ((smu)->ppt_funcs->dump_pptable ? (smu)->ppt_funcs->dump_pptable((smu)) : 0) extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table, uint16_t *size, uint8_t *frev, uint8_t *crev,
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/30 drm/amd/powerplay: update smu11_driver_if_arcturus.h
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
It guides how driver should interface with SMU in arcturus.
--- .../powerplay/inc/smu11_driver_if_arcturus.h | 58 +++++++++++-------- 1 file changed, 33 insertions(+), 25 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if_arcturus.h +33 -25
@@ -21,16 +21,15 @@* */ -#ifndef SMU11_DRIVER_IF_ARCTURUS_H #define SMU11_DRIVER_IF_ARCTURUS_H // *** IMPORTANT *** // SMU TEAM: Always increment the interface version if // any structure is changed in this file -#define SMU11_DRIVER_IF_VERSION 0x06 +#define SMU11_DRIVER_IF_VERSION 0x08 -#define PPTABLE_ARCTURUS_SMU_VERSION 3 +#define PPTABLE_ARCTURUS_SMU_VERSION 4#define NUM_GFXCLK_DPM_LEVELS 16#define NUM_VCLK_DPM_LEVELS 8
@@ -40,6 +39,7 @@#define NUM_UCLK_DPM_LEVELS 4#define NUM_FCLK_DPM_LEVELS 8#define NUM_XGMI_LEVELS 2 +#define NUM_XGMI_PSTATE_LEVELS 4#define MAX_GFXCLK_DPM_LEVEL (NUM_GFXCLK_DPM_LEVELS - 1)#define MAX_VCLK_DPM_LEVEL (NUM_VCLK_DPM_LEVELS - 1)
@@ -49,6 +49,7 @@#define MAX_UCLK_DPM_LEVEL (NUM_UCLK_DPM_LEVELS - 1)#define MAX_FCLK_DPM_LEVEL (NUM_FCLK_DPM_LEVELS - 1)#define MAX_XGMI_LEVEL (NUM_XGMI_LEVELS - 1) +#define MAX_XGMI_PSTATE_LEVEL (NUM_XGMI_PSTATE_LEVELS - 1)// Feature Control Defines // DPM
@@ -213,8 +214,8 @@#define WORKLOAD_PPLIB_COUNT 5//XGMI performance states -#define XGMI_STATE_D0 1 -#define XGMI_STATE_D3 0 +#define XGMI_STATE_D0 1 +#define XGMI_STATE_D3 0#define NUM_I2C_CONTROLLERS 8
@@ -314,7 +315,6 @@ typedef struct { } SwI2cRequest_t;// SW I2C Request Table //D3HOT sequences -//sequence codes from spec: atlvp4p01.amd.com:1677@//gpu/doc/soc_arch/spec/feature/BACO/Navi/Navi2x/ typedef enum { BACO_SEQUENCE, MSR_SEQUENCE,
@@ -368,6 +368,12 @@ typedef enum {PPCLK_COUNT , } PPCLK_e; +typedef enum { +POWER_SOURCE_AC , +POWER_SOURCE_DC , +POWER_SOURCE_COUNT , +}POWER_SOURCE_e ; + typedef enum { TEMP_EDGE, TEMP_HOTSPOT,
@@ -568,14 +574,9 @@ typedef struct {uint16_t DcBtcGb[AVFS_VOLTAGE_COUNT ];// mV Q2 -uint16_t SsFmin[10 ];// PPtable value to function similar to VFTFmin for SS Curve; Size is PPCLK_COUNT rounded to nearest multiple of 2 -// SECTION: XGMI -uint8_t XgmiLinkSpeed [NUM_XGMI_LEVELS ]; -uint8_t XgmiLinkWidth [NUM_XGMI_LEVELS ]; - -uint16_t XgmiFclkFreq [NUM_XGMI_LEVELS ]; -uint16_t XgmiSocVoltage [NUM_XGMI_LEVELS ]; +uint8_t XgmiDpmPstates[NUM_XGMI_LEVELS ];// 2 DPM states, high and low. 0-P0, 1-P1, 2-P2, 3-P3. +uint8_t XgmiDpmSpare[2 ];// Temperature Dependent Vmin uint16_t VDDGFX_TVmin;//Celcius
@@ -683,6 +684,13 @@ typedef struct {uint16_t TotalBoardPower;//Only needed for TCP Estimated case, where TCP = TGP+Total Board Power uint16_t BoardPadding; +// SECTION: XGMI Training +uint8_t XgmiLinkSpeed [NUM_XGMI_PSTATE_LEVELS ]; +uint8_t XgmiLinkWidth [NUM_XGMI_PSTATE_LEVELS ]; + +uint16_t XgmiFclkFreq [NUM_XGMI_PSTATE_LEVELS ]; +uint16_t XgmiSocVoltage [NUM_XGMI_PSTATE_LEVELS ]; +uint32_t BoardReserved[10 ];// Padding for MMHUB - do not modify this
@@ -698,7 +706,7 @@ typedef struct {uint16_t GfxActivityLpfTau;uint16_t UclkActivityLpfTau; -uint16_t Padding; +uint16_t SocketPowerLpfTau;// Padding - ignore uint32_t MmHubPadding[8 ];// SMU internal use
@@ -715,7 +723,7 @@ typedef struct {uint8_t CurrGfxVoltageOffset ;uint8_t CurrMemVidOffset ;uint8_t Padding8 ; -uint16_t CurrSocketPower ; +uint16_t AverageSocketPower ;uint16_t TemperatureEdge ;uint16_t TemperatureHotspot ;uint16_t TemperatureHBM ;
@@ -724,23 +732,23 @@ typedef struct {uint16_t TemperatureVrMem ;uint32_t ThrottlerStatus ; +uint16_t CurrFanSpeed ; +uint16_t Padding16; + +uint32_t Padding[4 ]; +// Padding - ignore uint32_t MmHubPadding[7 ];// SMU internal use } SmuMetrics_t;typedef struct { -uint16_t avgPsmCount[45 ]; -uint16_t minPsmCount[45 ]; -float avgPsmVoltage[45 ]; -float minPsmVoltage[45 ]; - -uint16_t avgScsPsmCount; -uint16_t minScsPsmCount; -float avgScsPsmVoltage; -float minScsPsmVoltage; +uint16_t avgPsmCount[75 ]; +uint16_t minPsmCount[75 ]; +float avgPsmVoltage[75 ]; +float minPsmVoltage[75 ]; -uint32_t MmHubPadding[6 ];// SMU internal use +uint32_t MmHubPadding[3 ];// SMU internal use }AvfsDebugTable_t ; typedef struct {
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/30 drm/amd/powerplay: update arcturus_ppsmc.h
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Correct header and fix typo.
--- drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h +2 -2
@@ -1,5 +1,5 @@/* -* Copyright 2018 Advanced Micro Devices, Inc. +* Copyright 2019 Advanced Micro Devices, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"),
@@ -83,7 +83,7 @@//Power Gating #define PPSMC_MSG_PowerUpVcn0 0x28 -#define PPSMC_MSG_PowerDownVcn01 0x29 +#define PPSMC_MSG_PowerDownVcn0 0x29#define PPSMC_MSG_PowerUpVcn1 0x2A#define PPSMC_MSG_PowerDownVcn1 0x2B
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/30 drm/amd/powerplay: update arcturus_ppt.c/h V3
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Arcturus ASIC specific powerplay interfaces.
V2: correct SMU msg naming
drop unnecessary debugs
V3: rebase (Alex)
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1193 ++++++++++++++++- drivers/gpu/drm/amd/powerplay/arcturus_ppt.h | 44 + drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 2 +- 3 files changed, 1237 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1192 -1
@@ -33,12 +33,22 @@#include "atom.h" #include "power_state.h" #include "arcturus_ppt.h" +#include "smu_v11_0_pptable.h" #include "arcturus_ppsmc.h" #include "nbio/nbio_7_4_sh_mask.h" +#define CTF_OFFSET_EDGE 5 +#define CTF_OFFSET_HOTSPOT 5 +#define CTF_OFFSET_HBM 5 +#define MSG_MAP (msg, index) \ [SMU_MSG_##msg] = {1, (index)} +#define SMU_FEATURES_LOW_MASK 0x00000000FFFFFFFF +#define SMU_FEATURES_LOW_SHIFT 0 +#define SMU_FEATURES_HIGH_MASK 0xFFFFFFFF00000000 +#define SMU_FEATURES_HIGH_SHIFT 32 +static struct smu_11_0_cmn2aisc_mapping arcturus_message_map[SMU_MSG_MAX_COUNT ] = {MSG_MAP (TestMessage, PPSMC_MSG_TestMessage),MSG_MAP (GetSmuVersion, PPSMC_MSG_GetSmuVersion),
@@ -80,7 +90,7 @@ static struct smu_11_0_cmn2aisc_mapping arcturus_message_map[SMU_MSG_MAX_COUNT]MSG_MAP (SetPptLimit, PPSMC_MSG_SetPptLimit),MSG_MAP (GetPptLimit, PPSMC_MSG_GetPptLimit),MSG_MAP (PowerUpVcn0, PPSMC_MSG_PowerUpVcn0), -MSG_MAP (PowerDownVcn01, PPSMC_MSG_PowerDownVcn01), +MSG_MAP (PowerDownVcn0, PPSMC_MSG_PowerDownVcn0),MSG_MAP (PowerUpVcn1, PPSMC_MSG_PowerUpVcn1),MSG_MAP (PowerDownVcn1, PPSMC_MSG_PowerDownVcn1), MSG_MAP(PrepareMp1ForUnload, PPSMC_MSG_PrepareMp1ForUnload),
@@ -99,6 +109,65 @@ static struct smu_11_0_cmn2aisc_mapping arcturus_message_map[SMU_MSG_MAX_COUNT] MSG_MAP(SetMemoryChannelEnable, PPSMC_MSG_SetMemoryChannelEnable), }; +static struct smu_11_0_cmn2aisc_mapping arcturus_clk_map[SMU_CLK_COUNT ] = { +CLK_MAP (GFXCLK ,PPCLK_GFXCLK ), +CLK_MAP (SCLK ,PPCLK_GFXCLK ), +CLK_MAP (SOCCLK ,PPCLK_SOCCLK ), +CLK_MAP (FCLK ,PPCLK_FCLK ), +CLK_MAP (UCLK ,PPCLK_UCLK ), +CLK_MAP (MCLK ,PPCLK_UCLK ), +CLK_MAP (DCLK ,PPCLK_DCLK ), +CLK_MAP (VCLK ,PPCLK_VCLK ), +}; + +static struct smu_11_0_cmn2aisc_mapping arcturus_feature_mask_map[SMU_FEATURE_COUNT ] = { +FEA_MAP (DPM_PREFETCHER ), +FEA_MAP (DPM_GFXCLK ), +FEA_MAP (DPM_UCLK ), +FEA_MAP (DPM_SOCCLK ), +FEA_MAP (DPM_MP0CLK ), +FEA_MAP (DS_GFXCLK ), +FEA_MAP (DS_SOCCLK ), +FEA_MAP (DS_LCLK ), +FEA_MAP (DS_UCLK ), +FEA_MAP (GFX_ULV ), +FEA_MAP (RSMU_SMN_CG ), +FEA_MAP (PPT ), +FEA_MAP (TDC ), +FEA_MAP (APCC_PLUS ), +FEA_MAP (VR0HOT ), +FEA_MAP (VR1HOT ), +FEA_MAP (FW_CTF ), +FEA_MAP (FAN_CONTROL ), +FEA_MAP (THERMAL ), +FEA_MAP (OUT_OF_BAND_MONITOR ), +FEA_MAP (TEMP_DEPENDENT_VMIN ), +}; + +static struct smu_11_0_cmn2aisc_mapping arcturus_table_map[SMU_TABLE_COUNT ] = { +TAB_MAP (PPTABLE ), +TAB_MAP (AVFS ), +TAB_MAP (AVFS_PSM_DEBUG ), +TAB_MAP (AVFS_FUSE_OVERRIDE ), +TAB_MAP (PMSTATUSLOG ), +TAB_MAP (SMU_METRICS ), +TAB_MAP (DRIVER_SMU_CONFIG ), +TAB_MAP (OVERDRIVE ), +}; + +static struct smu_11_0_cmn2aisc_mapping arcturus_pwr_src_map[SMU_POWER_SOURCE_COUNT ] = { +PWR_MAP (AC ), +PWR_MAP (DC ), +}; + +static struct smu_11_0_cmn2aisc_mapping arcturus_workload_map[PP_SMC_POWER_PROFILE_COUNT ] = { +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_BOOTUP_DEFAULT ,WORKLOAD_PPLIB_DEFAULT_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_POWERSAVING ,WORKLOAD_PPLIB_POWER_SAVING_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_VIDEO ,WORKLOAD_PPLIB_VIDEO_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_COMPUTE ,WORKLOAD_PPLIB_CUSTOM_BIT ), +WORKLOAD_MAP (PP_SMC_POWER_PROFILE_CUSTOM ,WORKLOAD_PPLIB_CUSTOM_BIT ), +}; +static int arcturus_get_smu_msg_index (struct smu_context *smc,uint32_t index) {struct smu_11_0_cmn2aisc_mapping mapping;
@@ -115,12 +184,1134 @@ static int arcturus_get_smu_msg_index(struct smu_context *smc, uint32_t index)return mapping.map_to; } +static int arcturus_get_smu_clk_index (struct smu_context *smc,uint32_t index) +{ +struct smu_11_0_cmn2aisc_mapping mapping; + +if (index >=SMU_CLK_COUNT ) +return -EINVAL ; + + mapping = arcturus_clk_map[index]; +if (!(mapping.valid_mapping)) { +pr_warn ("Unsupported SMU clk: %d\n" , index); +return -EINVAL ; + } + +return mapping.map_to; +} + +static int arcturus_get_smu_feature_index (struct smu_context *smc,uint32_t index) +{ +struct smu_11_0_cmn2aisc_mapping mapping; + +if (index >=SMU_FEATURE_COUNT ) +return -EINVAL ; + + mapping = arcturus_feature_mask_map[index]; +if (!(mapping.valid_mapping)) { +pr_warn ("Unsupported SMU feature: %d\n" , index); +return -EINVAL ; + } + +return mapping.map_to; +} + +static int arcturus_get_smu_table_index (struct smu_context *smc,uint32_t index) +{ +struct smu_11_0_cmn2aisc_mapping mapping; + +if (index >=SMU_TABLE_COUNT ) +return -EINVAL ; + + mapping = arcturus_table_map[index]; +if (!(mapping.valid_mapping)) { +pr_warn ("Unsupported SMU table: %d\n" , index); +return -EINVAL ; + } + +return mapping.map_to; +} + +static int arcturus_get_pwr_src_index (struct smu_context *smc,uint32_t index) +{ +struct smu_11_0_cmn2aisc_mapping mapping; + +if (index >=SMU_POWER_SOURCE_COUNT ) +return -EINVAL ; + + mapping = arcturus_pwr_src_map[index]; +if (!(mapping.valid_mapping)) { +pr_warn ("Unsupported SMU power source: %d\n" , index); +return -EINVAL ; + } + +return mapping.map_to; +} + + +static int arcturus_get_workload_type (struct smu_context *smu,enum PP_SMC_POWER_PROFILE profile) +{ +struct smu_11_0_cmn2aisc_mapping mapping; + +if (profile >PP_SMC_POWER_PROFILE_CUSTOM ) +return -EINVAL ; + + mapping = arcturus_workload_map[profile]; +if (!(mapping.valid_mapping)) { +pr_warn ("Unsupported SMU power source: %d\n" , profile); +return -EINVAL ; + } + +return mapping.map_to; +} + +static int arcturus_tables_init (struct smu_context *smu,struct smu_table *tables) +{ +SMU_TABLE_INIT (tables,SMU_TABLE_PPTABLE ,sizeof (PPTable_t), +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM ); + +SMU_TABLE_INIT (tables,SMU_TABLE_PMSTATUSLOG ,SMU11_TOOL_SIZE , +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM ); + +SMU_TABLE_INIT (tables,SMU_TABLE_SMU_METRICS ,sizeof (SmuMetrics_t), +PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM ); + +return 0 ; +} + +static int arcturus_allocate_dpm_context (struct smu_context *smu) +{ +struct smu_dpm_context *smu_dpm = &smu->smu_dpm; + +if (smu_dpm->dpm_context) +return -EINVAL ; + + smu_dpm->dpm_context =kzalloc (sizeof (struct arcturus_dpm_table ), +GFP_KERNEL ); +if (!smu_dpm->dpm_context) +return -ENOMEM ; + +if (smu_dpm->golden_dpm_context) +return -EINVAL ; + + smu_dpm->golden_dpm_context =kzalloc (sizeof (struct arcturus_dpm_table ), +GFP_KERNEL ); +if (!smu_dpm->golden_dpm_context) +return -ENOMEM ; + + smu_dpm->dpm_context_size =sizeof (struct arcturus_dpm_table ); + + smu_dpm->dpm_current_power_state =kzalloc (sizeof (struct smu_power_state ), +GFP_KERNEL ); +if (!smu_dpm->dpm_current_power_state) +return -ENOMEM ; + + smu_dpm->dpm_request_power_state =kzalloc (sizeof (struct smu_power_state ), +GFP_KERNEL ); +if (!smu_dpm->dpm_request_power_state) +return -ENOMEM ; + +return 0 ; +} + +#define FEATURE_MASK (feature) (1ULL << feature) +static int +arcturus_get_allowed_feature_mask (struct smu_context *smu, +uint32_t *feature_mask,uint32_t num) +{ +if (num >2 ) +return -EINVAL ; + +memset (feature_mask,0 ,sizeof (uint32_t ) * num); + + *(uint64_t *)feature_mask |=FEATURE_MASK (FEATURE_DPM_PREFETCHER_BIT ) + |FEATURE_MASK (FEATURE_DPM_GFXCLK_BIT ); + +return 0 ; +} + +static int +arcturus_set_single_dpm_table (struct smu_context *smu, +struct arcturus_single_dpm_table *single_dpm_table, +PPCLK_e clk_id) +{ +int ret =0 ; +uint32_t i, num_of_levels =0 , clk; + + ret =smu_send_smc_msg_with_param (smu, + SMU_MSG_GetDpmFreqByIndex, + (clk_id <<16 |0xFF )); +if (ret) { +pr_err ("[%s] failed to get dpm levels!\n" , __func__); +return ret; + } + +smu_read_smc_arg (smu, &num_of_levels); +if (!num_of_levels) { +pr_err ("[%s] number of clk levels is invalid!\n" , __func__); +return -EINVAL ; + } + + single_dpm_table->count = num_of_levels; +for (i =0 ; i < num_of_levels; i++) { + ret =smu_send_smc_msg_with_param (smu, + SMU_MSG_GetDpmFreqByIndex, + (clk_id <<16 | i)); +if (ret) { +pr_err ("[%s] failed to get dpm freq by index!\n" , __func__); +return ret; + } +smu_read_smc_arg (smu, &clk); +if (!clk) { +pr_err ("[%s] clk value is invalid!\n" , __func__); +return -EINVAL ; + } + single_dpm_table->dpm_levels[i].value = clk; + single_dpm_table->dpm_levels[i].enabled = true; + } +return 0 ; +} + +static void arcturus_init_single_dpm_state (struct arcturus_dpm_state *dpm_state) +{ + dpm_state->soft_min_level =0x0 ; + dpm_state->soft_max_level =0xffff ; + dpm_state->hard_min_level =0x0 ; + dpm_state->hard_max_level =0xffff ; +} + +static int arcturus_set_default_dpm_table (struct smu_context *smu) +{ +int ret; + +struct smu_dpm_context *smu_dpm = &smu->smu_dpm; +struct arcturus_dpm_table *dpm_table =NULL ; +struct arcturus_single_dpm_table *single_dpm_table; + + dpm_table = smu_dpm->dpm_context; + +/* socclk */ + single_dpm_table = &(dpm_table->soc_table); +if (smu_feature_is_enabled (smu,FEATURE_DPM_SOCCLK_BIT )) { + ret =arcturus_set_single_dpm_table (smu, single_dpm_table, +PPCLK_SOCCLK ); +if (ret) { +pr_err ("[%s] failed to get socclk dpm levels!\n" , __func__); +return ret; + } + }else { + single_dpm_table->count =1 ; + single_dpm_table->dpm_levels[0 ].value = smu->smu_table.boot_values.socclk /100 ; + } +arcturus_init_single_dpm_state (&(single_dpm_table->dpm_state)); + +/* gfxclk */ + single_dpm_table = &(dpm_table->gfx_table); +if (smu_feature_is_enabled (smu,FEATURE_DPM_GFXCLK_BIT )) { + ret =arcturus_set_single_dpm_table (smu, single_dpm_table, +PPCLK_GFXCLK ); +if (ret) { +pr_err ("[SetupDefaultDpmTable] failed to get gfxclk dpm levels!" ); +return ret; + } + }else { + single_dpm_table->count =1 ; + single_dpm_table->dpm_levels[0 ].value = smu->smu_table.boot_values.gfxclk /100 ; + } +arcturus_init_single_dpm_state (&(single_dpm_table->dpm_state)); + +/* memclk */ + single_dpm_table = &(dpm_table->mem_table); +if (smu_feature_is_enabled (smu,FEATURE_DPM_UCLK_BIT )) { + ret =arcturus_set_single_dpm_table (smu, single_dpm_table, +PPCLK_UCLK ); +if (ret) { +pr_err ("[SetupDefaultDpmTable] failed to get memclk dpm levels!" ); +return ret; + } + }else { + single_dpm_table->count =1 ; + single_dpm_table->dpm_levels[0 ].value = smu->smu_table.boot_values.uclk /100 ; + } +arcturus_init_single_dpm_state (&(single_dpm_table->dpm_state)); + +/* fclk */ + single_dpm_table = &(dpm_table->fclk_table); +if (smu_feature_is_enabled (smu,FEATURE_DPM_FCLK_BIT )) { + ret =arcturus_set_single_dpm_table (smu, single_dpm_table, +PPCLK_FCLK ); +if (ret) { +pr_err ("[SetupDefaultDpmTable] failed to get fclk dpm levels!" ); +return ret; + } + }else { + single_dpm_table->count =0 ; + } +arcturus_init_single_dpm_state (&(single_dpm_table->dpm_state)); + +memcpy (smu_dpm->golden_dpm_context, dpm_table, +sizeof (struct arcturus_dpm_table )); + +return 0 ; +} + +static int arcturus_check_powerplay_table (struct smu_context *smu) +{ +return 0 ; +} + +static int arcturus_store_powerplay_table (struct smu_context *smu) +{ +struct smu_11_0_powerplay_table *powerplay_table =NULL ; +struct smu_table_context *table_context = &smu->smu_table; +int ret =0 ; + +if (!table_context->power_play_table) +return -EINVAL ; + + powerplay_table = table_context->power_play_table; + +memcpy (table_context->driver_pptable, &powerplay_table->smc_pptable, +sizeof (PPTable_t)); + + table_context->thermal_controller_type = powerplay_table->thermal_controller_type; + +return ret; +} + +static int arcturus_append_powerplay_table (struct smu_context *smu) +{ +struct smu_table_context *table_context = &smu->smu_table; +PPTable_t *smc_pptable = table_context->driver_pptable; +struct atom_smc_dpm_info_v4_6 *smc_dpm_table; +int index, ret; + + index =get_index_into_master_table (atom_master_list_of_data_tables_v2_1, + smc_dpm_info); + + ret =smu_get_atom_data_table (smu, index,NULL ,NULL ,NULL , + (uint8_t **)&smc_dpm_table); +if (ret) +return ret; + +pr_info ("smc_dpm_info table revision(format.content): %d.%d\n" , + smc_dpm_table->table_header.format_revision, + smc_dpm_table->table_header.content_revision); + +if ((smc_dpm_table->table_header.format_revision ==4 ) && + (smc_dpm_table->table_header.content_revision ==6 )) +memcpy (&smc_pptable->MaxVoltageStepGfx, + &smc_dpm_table->maxvoltagestepgfx, +sizeof (*smc_dpm_table) - offsetof(struct atom_smc_dpm_info_v4_6 , maxvoltagestepgfx)); + +return 0 ; +} + +static int arcturus_run_btc_afll (struct smu_context *smu) +{ +return smu_send_smc_msg (smu, SMU_MSG_RunAfllBtc); +} + +static int arcturus_populate_umd_state_clk (struct smu_context *smu) +{ +struct smu_dpm_context *smu_dpm = &smu->smu_dpm; +struct arcturus_dpm_table *dpm_table =NULL ; +struct arcturus_single_dpm_table *gfx_table =NULL ; +struct arcturus_single_dpm_table *mem_table =NULL ; + + dpm_table = smu_dpm->dpm_context; + gfx_table = &(dpm_table->gfx_table); + mem_table = &(dpm_table->mem_table); + + smu->pstate_sclk = gfx_table->dpm_levels[0 ].value; + smu->pstate_mclk = mem_table->dpm_levels[0 ].value; + +if (gfx_table->count >ARCTURUS_UMD_PSTATE_GFXCLK_LEVEL && + mem_table->count >ARCTURUS_UMD_PSTATE_MCLK_LEVEL ) { + smu->pstate_sclk = gfx_table->dpm_levels[ARCTURUS_UMD_PSTATE_GFXCLK_LEVEL ].value; + smu->pstate_mclk = mem_table->dpm_levels[ARCTURUS_UMD_PSTATE_MCLK_LEVEL ].value; + } + + smu->pstate_sclk = smu->pstate_sclk *100 ; + smu->pstate_mclk = smu->pstate_mclk *100 ; + +return 0 ; +} + +static int arcturus_get_clk_table (struct smu_context *smu, +struct pp_clock_levels_with_latency *clocks, +struct arcturus_single_dpm_table *dpm_table) +{ +int i, count; + + count = (dpm_table->count >MAX_NUM_CLOCKS ) ?MAX_NUM_CLOCKS : dpm_table->count; + clocks->num_levels = count; + +for (i =0 ; i < count; i++) { + clocks->data[i].clocks_in_khz = + dpm_table->dpm_levels[i].value *1000 ; + clocks->data[i].latency_in_us =0 ; + } + +return 0 ; +} + +static int arcturus_print_clk_levels (struct smu_context *smu, +enum smu_clk_type type,char *buf) +{ +int i, now, size =0 ; +int ret =0 ; +struct pp_clock_levels_with_latency clocks; +struct arcturus_single_dpm_table *single_dpm_table; +struct smu_dpm_context *smu_dpm = &smu->smu_dpm; +struct arcturus_dpm_table *dpm_table =NULL ; + + dpm_table = smu_dpm->dpm_context; + +switch (type) { +case SMU_SCLK : + ret =smu_get_current_clk_freq (smu,SMU_GFXCLK , &now); +if (ret) { +pr_err ("Attempt to get current gfx clk Failed!" ); +return ret; + } + + single_dpm_table = &(dpm_table->gfx_table); + ret =arcturus_get_clk_table (smu, &clocks, single_dpm_table); +if (ret) { +pr_err ("Attempt to get gfx clk levels Failed!" ); +return ret; + } + +for (i =0 ; i < clocks.num_levels; i++) + size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, + clocks.data[i].clocks_in_khz /1000 , + (clocks.data[i].clocks_in_khz == now *10 ) + ?"*" :"" ); +break ; + +case SMU_MCLK : + ret =smu_get_current_clk_freq (smu,SMU_UCLK , &now); +if (ret) { +pr_err ("Attempt to get current mclk Failed!" ); +return ret; + } + + single_dpm_table = &(dpm_table->mem_table); + ret =arcturus_get_clk_table (smu, &clocks, single_dpm_table); +if (ret) { +pr_err ("Attempt to get memory clk levels Failed!" ); +return ret; + } + +for (i =0 ; i < clocks.num_levels; i++) + size +=sprintf (buf + size,"%d: %uMhz %s\n" , + i, clocks.data[i].clocks_in_khz /1000 , + (clocks.data[i].clocks_in_khz == now *10 ) + ?"*" :"" ); +break ; + +case SMU_SOCCLK : + ret =smu_get_current_clk_freq (smu,SMU_SOCCLK , &now); +if (ret) { +pr_err ("Attempt to get current socclk Failed!" ); +return ret; + } + + single_dpm_table = &(dpm_table->soc_table); + ret =arcturus_get_clk_table (smu, &clocks, single_dpm_table); +if (ret) { +pr_err ("Attempt to get socclk levels Failed!" ); +return ret; + } + +for (i =0 ; i < clocks.num_levels; i++) + size +=sprintf (buf + size,"%d: %uMhz %s\n" , + i, clocks.data[i].clocks_in_khz /1000 , + (clocks.data[i].clocks_in_khz == now *10 ) + ?"*" :"" ); +break ; + +case SMU_FCLK : + ret =smu_get_current_clk_freq (smu,SMU_FCLK , &now); +if (ret) { +pr_err ("Attempt to get current fclk Failed!" ); +return ret; + } + + single_dpm_table = &(dpm_table->fclk_table); +for (i =0 ; i < single_dpm_table->count; i++) + size +=sprintf (buf + size,"%d: %uMhz %s\n" , + i, single_dpm_table->dpm_levels[i].value, + (single_dpm_table->dpm_levels[i].value == now /100 ) + ?"*" :"" ); +break ; + +default : +break ; + } + +return size; +} + +static int arcturus_upload_dpm_level (struct smu_context *smu,bool max, +uint32_t feature_mask) +{ +struct arcturus_dpm_table *dpm_table; +struct arcturus_single_dpm_table *single_dpm_table; +uint32_t freq; +int ret =0 ; + + dpm_table = smu->smu_dpm.dpm_context; +if (smu_feature_is_enabled (smu,FEATURE_DPM_GFXCLK_BIT ) && + (feature_mask &FEATURE_DPM_GFXCLK_MASK )) { + single_dpm_table = &(dpm_table->gfx_table); + freq = max ? single_dpm_table->dpm_state.soft_max_level : + single_dpm_table->dpm_state.soft_min_level; + ret =smu_send_smc_msg_with_param (smu, + (max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq), + (PPCLK_GFXCLK <<16 ) | (freq &0xffff )); +if (ret) { +pr_err ("Failed to set soft %s gfxclk !\n" , + max ?"max" :"min" ); +return ret; + } + } + +return ret; +} + +static int arcturus_force_clk_levels (struct smu_context *smu, +enum smu_clk_type type,uint32_t mask) +{ +struct arcturus_dpm_table *dpm_table; +struct arcturus_single_dpm_table *single_dpm_table; +uint32_t soft_min_level, soft_max_level; +int ret =0 ; + +mutex_lock (&(smu->mutex)); + + soft_min_level = mask ? (ffs (mask) -1 ) :0 ; + soft_max_level = mask ? (fls (mask) -1 ) :0 ; + + dpm_table = smu->smu_dpm.dpm_context; + +switch (type) { +case SMU_SCLK : + single_dpm_table = &(dpm_table->gfx_table); + +if (soft_max_level >= single_dpm_table->count) { +pr_err ("Clock level specified %d is over max allowed %d\n" , + soft_max_level, single_dpm_table->count -1 ); + ret = -EINVAL ; +break ; + } + + single_dpm_table->dpm_state.soft_min_level = + single_dpm_table->dpm_levels[soft_min_level].value; + single_dpm_table->dpm_state.soft_max_level = + single_dpm_table->dpm_levels[soft_max_level].value; + + ret =arcturus_upload_dpm_level (smu, false,FEATURE_DPM_GFXCLK_MASK ); +if (ret) { +pr_err ("Failed to upload boot level to lowest!\n" ); +break ; + } + + ret =arcturus_upload_dpm_level (smu, true,FEATURE_DPM_GFXCLK_MASK ); +if (ret) +pr_err ("Failed to upload dpm max level to highest!\n" ); + +break ; + +case SMU_MCLK : + single_dpm_table = &(dpm_table->mem_table); + +if (soft_max_level >= single_dpm_table->count) { +pr_err ("Clock level specified %d is over max allowed %d\n" , + soft_max_level, single_dpm_table->count -1 ); + ret = -EINVAL ; +break ; + } + + single_dpm_table->dpm_state.soft_min_level = + single_dpm_table->dpm_levels[soft_min_level].value; + single_dpm_table->dpm_state.soft_max_level = + single_dpm_table->dpm_levels[soft_max_level].value; + + ret =arcturus_upload_dpm_level (smu, false,FEATURE_DPM_UCLK_MASK ); +if (ret) { +pr_err ("Failed to upload boot level to lowest!\n" ); +break ; + } + + ret =arcturus_upload_dpm_level (smu, true,FEATURE_DPM_UCLK_MASK ); +if (ret) +pr_err ("Failed to upload dpm max level to highest!\n" ); + +break ; + +case SMU_SOCCLK : + single_dpm_table = &(dpm_table->soc_table); + +if (soft_max_level >= single_dpm_table->count) { +pr_err ("Clock level specified %d is over max allowed %d\n" , + soft_max_level, single_dpm_table->count -1 ); + ret = -EINVAL ; +break ; + } + + single_dpm_table->dpm_state.soft_min_level = + single_dpm_table->dpm_levels[soft_min_level].value; + single_dpm_table->dpm_state.soft_max_level = + single_dpm_table->dpm_levels[soft_max_level].value; + + ret =arcturus_upload_dpm_level (smu, false,FEATURE_DPM_SOCCLK_MASK ); +if (ret) { +pr_err ("Failed to upload boot level to lowest!\n" ); +break ; + } + + ret =arcturus_upload_dpm_level (smu, true,FEATURE_DPM_SOCCLK_MASK ); +if (ret) +pr_err ("Failed to upload dpm max level to highest!\n" ); + +break ; + +case SMU_FCLK : + single_dpm_table = &(dpm_table->fclk_table); + +if (soft_max_level >= single_dpm_table->count) { +pr_err ("Clock level specified %d is over max allowed %d\n" , + soft_max_level, single_dpm_table->count -1 ); + ret = -EINVAL ; +break ; + } + + single_dpm_table->dpm_state.soft_min_level = + single_dpm_table->dpm_levels[soft_min_level].value; + single_dpm_table->dpm_state.soft_max_level = + single_dpm_table->dpm_levels[soft_max_level].value; + + ret =arcturus_upload_dpm_level (smu, false,FEATURE_DPM_FCLK_MASK ); +if (ret) { +pr_err ("Failed to upload boot level to lowest!\n" ); +break ; + } + + ret =arcturus_upload_dpm_level (smu, true,FEATURE_DPM_FCLK_MASK ); +if (ret) +pr_err ("Failed to upload dpm max level to highest!\n" ); + +break ; + +default : +break ; + } + +mutex_unlock (&(smu->mutex)); +return ret; +} + +static const struct smu_temperature_range arcturus_thermal_policy[] = +{ + {-273150 ,99000 ,99000 ,-273150 ,99000 ,99000 ,-273150 ,99000 ,99000 }, + {120000 ,120000 ,120000 ,120000 ,120000 ,120000 ,120000 ,120000 ,120000 }, +}; + +static int arcturus_get_thermal_temperature_range (struct smu_context *smu, +struct smu_temperature_range *range) +{ + +PPTable_t *pptable = smu->smu_table.driver_pptable; + +if (!range) +return -EINVAL ; + +memcpy (range, &arcturus_thermal_policy[0 ],sizeof (struct smu_temperature_range )); + + range->max = pptable->TedgeLimit * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; + range->edge_emergency_max = (pptable->TedgeLimit +CTF_OFFSET_EDGE ) * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; + range->hotspot_crit_max = pptable->ThotspotLimit * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; + range->hotspot_emergency_max = (pptable->ThotspotLimit +CTF_OFFSET_HOTSPOT ) * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; + range->mem_crit_max = pptable->TmemLimit * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; + range->mem_emergency_max = (pptable->TmemLimit +CTF_OFFSET_HBM )* +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; + + +return 0 ; +} + +static void arcturus_dump_pptable (struct smu_context *smu) +{ +struct smu_table_context *table_context = &smu->smu_table; +PPTable_t *pptable = table_context->driver_pptable; +int i; + +pr_info ("Dumped PPTable:\n" ); + +pr_info ("Version = 0x%08x\n" , pptable->Version); + +pr_info ("FeaturesToRun[0] = 0x%08x\n" , pptable->FeaturesToRun[0 ]); +pr_info ("FeaturesToRun[1] = 0x%08x\n" , pptable->FeaturesToRun[1 ]); + +for (i =0 ; i <PPT_THROTTLER_COUNT ; i++) { +pr_info ("SocketPowerLimitAc[%d] = %d\n" , i, pptable->SocketPowerLimitAc[i]); +pr_info ("SocketPowerLimitAcTau[%d] = %d\n" , i, pptable->SocketPowerLimitAcTau[i]); + } + +pr_info ("TdcLimitSoc = %d\n" , pptable->TdcLimitSoc); +pr_info ("TdcLimitSocTau = %d\n" , pptable->TdcLimitSocTau); +pr_info ("TdcLimitGfx = %d\n" , pptable->TdcLimitGfx); +pr_info ("TdcLimitGfxTau = %d\n" , pptable->TdcLimitGfxTau); + +pr_info ("TedgeLimit = %d\n" , pptable->TedgeLimit); +pr_info ("ThotspotLimit = %d\n" , pptable->ThotspotLimit); +pr_info ("TmemLimit = %d\n" , pptable->TmemLimit); +pr_info ("Tvr_gfxLimit = %d\n" , pptable->Tvr_gfxLimit); +pr_info ("Tvr_memLimit = %d\n" , pptable->Tvr_memLimit); +pr_info ("Tvr_socLimit = %d\n" , pptable->Tvr_socLimit); +pr_info ("FitLimit = %d\n" , pptable->FitLimit); + +pr_info ("PpmPowerLimit = %d\n" , pptable->PpmPowerLimit); +pr_info ("PpmTemperatureThreshold = %d\n" , pptable->PpmTemperatureThreshold); + +pr_info ("ThrottlerControlMask = %d\n" , pptable->ThrottlerControlMask); + +pr_info ("UlvVoltageOffsetGfx = %d\n" , pptable->UlvVoltageOffsetGfx); +pr_info ("UlvPadding = 0x%08x\n" , pptable->UlvPadding); + +pr_info ("UlvGfxclkBypass = %d\n" , pptable->UlvGfxclkBypass); +pr_info ("Padding234[0] = 0x%02x\n" , pptable->Padding234[0 ]); +pr_info ("Padding234[1] = 0x%02x\n" , pptable->Padding234[1 ]); +pr_info ("Padding234[2] = 0x%02x\n" , pptable->Padding234[2 ]); + +pr_info ("MinVoltageGfx = %d\n" , pptable->MinVoltageGfx); +pr_info ("MinVoltageSoc = %d\n" , pptable->MinVoltageSoc); +pr_info ("MaxVoltageGfx = %d\n" , pptable->MaxVoltageGfx); +pr_info ("MaxVoltageSoc = %d\n" , pptable->MaxVoltageSoc); + +pr_info ("LoadLineResistanceGfx = %d\n" , pptable->LoadLineResistanceGfx); +pr_info ("LoadLineResistanceSoc = %d\n" , pptable->LoadLineResistanceSoc); + +pr_info ("[PPCLK_GFXCLK]\n" +" .VoltageMode = 0x%02x\n" +" .SnapToDiscrete = 0x%02x\n" +" .NumDiscreteLevels = 0x%02x\n" +" .padding = 0x%02x\n" +" .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n" +" .SsCurve {a = 0x%08x b = 0x%08x c = 0x%08x}\n" +" .SsFmin = 0x%04x\n" +" .Padding_16 = 0x%04x\n" , + pptable->DpmDescriptor[PPCLK_GFXCLK ].VoltageMode, + pptable->DpmDescriptor[PPCLK_GFXCLK ].SnapToDiscrete, + pptable->DpmDescriptor[PPCLK_GFXCLK ].NumDiscreteLevels, + pptable->DpmDescriptor[PPCLK_GFXCLK ].padding, + pptable->DpmDescriptor[PPCLK_GFXCLK ].ConversionToAvfsClk.m, + pptable->DpmDescriptor[PPCLK_GFXCLK ].ConversionToAvfsClk.b, + pptable->DpmDescriptor[PPCLK_GFXCLK ].SsCurve.a, + pptable->DpmDescriptor[PPCLK_GFXCLK ].SsCurve.b, + pptable->DpmDescriptor[PPCLK_GFXCLK ].SsCurve.c, + pptable->DpmDescriptor[PPCLK_GFXCLK ].SsFmin, + pptable->DpmDescriptor[PPCLK_GFXCLK ].Padding16); + +pr_info ("[PPCLK_VCLK]\n" +" .VoltageMode = 0x%02x\n" +" .SnapToDiscrete = 0x%02x\n" +" .NumDiscreteLevels = 0x%02x\n" +" .padding = 0x%02x\n" +" .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n" +" .SsCurve {a = 0x%08x b = 0x%08x c = 0x%08x}\n" +" .SsFmin = 0x%04x\n" +" .Padding_16 = 0x%04x\n" , + pptable->DpmDescriptor[PPCLK_VCLK ].VoltageMode, + pptable->DpmDescriptor[PPCLK_VCLK ].SnapToDiscrete, + pptable->DpmDescriptor[PPCLK_VCLK ].NumDiscreteLevels, + pptable->DpmDescriptor[PPCLK_VCLK ].padding, + pptable->DpmDescriptor[PPCLK_VCLK ].ConversionToAvfsClk.m, + pptable->DpmDescriptor[PPCLK_VCLK ].ConversionToAvfsClk.b, + pptable->DpmDescriptor[PPCLK_VCLK ].SsCurve.a, + pptable->DpmDescriptor[PPCLK_VCLK ].SsCurve.b, + pptable->DpmDescriptor[PPCLK_VCLK ].SsCurve.c, + pptable->DpmDescriptor[PPCLK_VCLK ].SsFmin, + pptable->DpmDescriptor[PPCLK_VCLK ].Padding16); + +pr_info ("[PPCLK_DCLK]\n" +" .VoltageMode = 0x%02x\n" +" .SnapToDiscrete = 0x%02x\n" +" .NumDiscreteLevels = 0x%02x\n" +" .padding = 0x%02x\n" +" .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n" +" .SsCurve {a = 0x%08x b = 0x%08x c = 0x%08x}\n" +" .SsFmin = 0x%04x\n" +" .Padding_16 = 0x%04x\n" , + pptable->DpmDescriptor[PPCLK_DCLK ].VoltageMode, + pptable->DpmDescriptor[PPCLK_DCLK ].SnapToDiscrete, + pptable->DpmDescriptor[PPCLK_DCLK ].NumDiscreteLevels, + pptable->DpmDescriptor[PPCLK_DCLK ].padding, + pptable->DpmDescriptor[PPCLK_DCLK ].ConversionToAvfsClk.m, + pptable->DpmDescriptor[PPCLK_DCLK ].ConversionToAvfsClk.b, + pptable->DpmDescriptor[PPCLK_DCLK ].SsCurve.a, + pptable->DpmDescriptor[PPCLK_DCLK ].SsCurve.b, + pptable->DpmDescriptor[PPCLK_DCLK ].SsCurve.c, + pptable->DpmDescriptor[PPCLK_DCLK ].SsFmin, + pptable->DpmDescriptor[PPCLK_DCLK ].Padding16); + +pr_info ("[PPCLK_SOCCLK]\n" +" .VoltageMode = 0x%02x\n" +" .SnapToDiscrete = 0x%02x\n" +" .NumDiscreteLevels = 0x%02x\n" +" .padding = 0x%02x\n" +" .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n" +" .SsCurve {a = 0x%08x b = 0x%08x c = 0x%08x}\n" +" .SsFmin = 0x%04x\n" +" .Padding_16 = 0x%04x\n" , + pptable->DpmDescriptor[PPCLK_SOCCLK ].VoltageMode, + pptable->DpmDescriptor[PPCLK_SOCCLK ].SnapToDiscrete, + pptable->DpmDescriptor[PPCLK_SOCCLK ].NumDiscreteLevels, + pptable->DpmDescriptor[PPCLK_SOCCLK ].padding, + pptable->DpmDescriptor[PPCLK_SOCCLK ].ConversionToAvfsClk.m, + pptable->DpmDescriptor[PPCLK_SOCCLK ].ConversionToAvfsClk.b, + pptable->DpmDescriptor[PPCLK_SOCCLK ].SsCurve.a, + pptable->DpmDescriptor[PPCLK_SOCCLK ].SsCurve.b, + pptable->DpmDescriptor[PPCLK_SOCCLK ].SsCurve.c, + pptable->DpmDescriptor[PPCLK_SOCCLK ].SsFmin, + pptable->DpmDescriptor[PPCLK_SOCCLK ].Padding16); + +pr_info ("[PPCLK_UCLK]\n" +" .VoltageMode = 0x%02x\n" +" .SnapToDiscrete = 0x%02x\n" +" .NumDiscreteLevels = 0x%02x\n" +" .padding = 0x%02x\n" +" .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n" +" .SsCurve {a = 0x%08x b = 0x%08x c = 0x%08x}\n" +" .SsFmin = 0x%04x\n" +" .Padding_16 = 0x%04x\n" , + pptable->DpmDescriptor[PPCLK_UCLK ].VoltageMode, + pptable->DpmDescriptor[PPCLK_UCLK ].SnapToDiscrete, + pptable->DpmDescriptor[PPCLK_UCLK ].NumDiscreteLevels, + pptable->DpmDescriptor[PPCLK_UCLK ].padding, + pptable->DpmDescriptor[PPCLK_UCLK ].ConversionToAvfsClk.m, + pptable->DpmDescriptor[PPCLK_UCLK ].ConversionToAvfsClk.b, + pptable->DpmDescriptor[PPCLK_UCLK ].SsCurve.a, + pptable->DpmDescriptor[PPCLK_UCLK ].SsCurve.b, + pptable->DpmDescriptor[PPCLK_UCLK ].SsCurve.c, + pptable->DpmDescriptor[PPCLK_UCLK ].SsFmin, + pptable->DpmDescriptor[PPCLK_UCLK ].Padding16); + +pr_info ("[PPCLK_FCLK]\n" +" .VoltageMode = 0x%02x\n" +" .SnapToDiscrete = 0x%02x\n" +" .NumDiscreteLevels = 0x%02x\n" +" .padding = 0x%02x\n" +" .ConversionToAvfsClk{m = 0x%08x b = 0x%08x}\n" +" .SsCurve {a = 0x%08x b = 0x%08x c = 0x%08x}\n" +" .SsFmin = 0x%04x\n" +" .Padding_16 = 0x%04x\n" , + pptable->DpmDescriptor[PPCLK_FCLK ].VoltageMode, + pptable->DpmDescriptor[PPCLK_FCLK ].SnapToDiscrete, + pptable->DpmDescriptor[PPCLK_FCLK ].NumDiscreteLevels, + pptable->DpmDescriptor[PPCLK_FCLK ].padding, + pptable->DpmDescriptor[PPCLK_FCLK ].ConversionToAvfsClk.m, + pptable->DpmDescriptor[PPCLK_FCLK ].ConversionToAvfsClk.b, + pptable->DpmDescriptor[PPCLK_FCLK ].SsCurve.a, + pptable->DpmDescriptor[PPCLK_FCLK ].SsCurve.b, + pptable->DpmDescriptor[PPCLK_FCLK ].SsCurve.c, + pptable->DpmDescriptor[PPCLK_FCLK ].SsFmin, + pptable->DpmDescriptor[PPCLK_FCLK ].Padding16); + + +pr_info ("FreqTableGfx\n" ); +for (i =0 ; i <NUM_GFXCLK_DPM_LEVELS ; i++) +pr_info (" .[%02d] = %d\n" , i, pptable->FreqTableGfx[i]); + +pr_info ("FreqTableVclk\n" ); +for (i =0 ; i <NUM_VCLK_DPM_LEVELS ; i++) +pr_info (" .[%02d] = %d\n" , i, pptable->FreqTableVclk[i]); + +pr_info ("FreqTableDclk\n" ); +for (i =0 ; i <NUM_DCLK_DPM_LEVELS ; i++) +pr_info (" .[%02d] = %d\n" , i, pptable->FreqTableDclk[i]); + +pr_info ("FreqTableSocclk\n" ); +for (i =0 ; i <NUM_SOCCLK_DPM_LEVELS ; i++) +pr_info (" .[%02d] = %d\n" , i, pptable->FreqTableSocclk[i]); + +pr_info ("FreqTableUclk\n" ); +for (i =0 ; i <NUM_UCLK_DPM_LEVELS ; i++) +pr_info (" .[%02d] = %d\n" , i, pptable->FreqTableUclk[i]); + +pr_info ("FreqTableFclk\n" ); +for (i =0 ; i <NUM_FCLK_DPM_LEVELS ; i++) +pr_info (" .[%02d] = %d\n" , i, pptable->FreqTableFclk[i]); + +pr_info ("Mp0clkFreq\n" ); +for (i =0 ; i <NUM_MP0CLK_DPM_LEVELS ; i++) +pr_info (" .[%d] = %d\n" , i, pptable->Mp0clkFreq[i]); + +pr_info ("Mp0DpmVoltage\n" ); +for (i =0 ; i <NUM_MP0CLK_DPM_LEVELS ; i++) +pr_info (" .[%d] = %d\n" , i, pptable->Mp0DpmVoltage[i]); + +pr_info ("GfxclkFidle = 0x%x\n" , pptable->GfxclkFidle); +pr_info ("GfxclkSlewRate = 0x%x\n" , pptable->GfxclkSlewRate); +pr_info ("Padding567[0] = 0x%x\n" , pptable->Padding567[0 ]); +pr_info ("Padding567[1] = 0x%x\n" , pptable->Padding567[1 ]); +pr_info ("Padding567[2] = 0x%x\n" , pptable->Padding567[2 ]); +pr_info ("Padding567[3] = 0x%x\n" , pptable->Padding567[3 ]); +pr_info ("GfxclkDsMaxFreq = %d\n" , pptable->GfxclkDsMaxFreq); +pr_info ("GfxclkSource = 0x%x\n" , pptable->GfxclkSource); +pr_info ("Padding456 = 0x%x\n" , pptable->Padding456); + +pr_info ("EnableTdpm = %d\n" , pptable->EnableTdpm); +pr_info ("TdpmHighHystTemperature = %d\n" , pptable->TdpmHighHystTemperature); +pr_info ("TdpmLowHystTemperature = %d\n" , pptable->TdpmLowHystTemperature); +pr_info ("GfxclkFreqHighTempLimit = %d\n" , pptable->GfxclkFreqHighTempLimit); + +pr_info ("FanStopTemp = %d\n" , pptable->FanStopTemp); +pr_info ("FanStartTemp = %d\n" , pptable->FanStartTemp); + +pr_info ("FanGainEdge = %d\n" , pptable->FanGainEdge); +pr_info ("FanGainHotspot = %d\n" , pptable->FanGainHotspot); +pr_info ("FanGainVrGfx = %d\n" , pptable->FanGainVrGfx); +pr_info ("FanGainVrSoc = %d\n" , pptable->FanGainVrSoc); +pr_info ("FanGainVrMem = %d\n" , pptable->FanGainVrMem); +pr_info ("FanGainHbm = %d\n" , pptable->FanGainHbm); + +pr_info ("FanPwmMin = %d\n" , pptable->FanPwmMin); +pr_info ("FanAcousticLimitRpm = %d\n" , pptable->FanAcousticLimitRpm); +pr_info ("FanThrottlingRpm = %d\n" , pptable->FanThrottlingRpm); +pr_info ("FanMaximumRpm = %d\n" , pptable->FanMaximumRpm); +pr_info ("FanTargetTemperature = %d\n" , pptable->FanTargetTemperature); +pr_info ("FanTargetGfxclk = %d\n" , pptable->FanTargetGfxclk); +pr_info ("FanZeroRpmEnable = %d\n" , pptable->FanZeroRpmEnable); +pr_info ("FanTachEdgePerRev = %d\n" , pptable->FanTachEdgePerRev); +pr_info ("FanTempInputSelect = %d\n" , pptable->FanTempInputSelect); + +pr_info ("FuzzyFan_ErrorSetDelta = %d\n" , pptable->FuzzyFan_ErrorSetDelta); +pr_info ("FuzzyFan_ErrorRateSetDelta = %d\n" , pptable->FuzzyFan_ErrorRateSetDelta); +pr_info ("FuzzyFan_PwmSetDelta = %d\n" , pptable->FuzzyFan_PwmSetDelta); +pr_info ("FuzzyFan_Reserved = %d\n" , pptable->FuzzyFan_Reserved); + +pr_info ("OverrideAvfsGb[AVFS_VOLTAGE_GFX] = 0x%x\n" , pptable->OverrideAvfsGb[AVFS_VOLTAGE_GFX ]); +pr_info ("OverrideAvfsGb[AVFS_VOLTAGE_SOC] = 0x%x\n" , pptable->OverrideAvfsGb[AVFS_VOLTAGE_SOC ]); +pr_info ("Padding8_Avfs[0] = %d\n" , pptable->Padding8_Avfs[0 ]); +pr_info ("Padding8_Avfs[1] = %d\n" , pptable->Padding8_Avfs[1 ]); + +pr_info ("dBtcGbGfxPll{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->dBtcGbGfxPll.a, + pptable->dBtcGbGfxPll.b, + pptable->dBtcGbGfxPll.c); +pr_info ("dBtcGbGfxAfll{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->dBtcGbGfxAfll.a, + pptable->dBtcGbGfxAfll.b, + pptable->dBtcGbGfxAfll.c); +pr_info ("dBtcGbSoc{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->dBtcGbSoc.a, + pptable->dBtcGbSoc.b, + pptable->dBtcGbSoc.c); + +pr_info ("qAgingGb[AVFS_VOLTAGE_GFX]{m = 0x%x b = 0x%x}\n" , + pptable->qAgingGb[AVFS_VOLTAGE_GFX ].m, + pptable->qAgingGb[AVFS_VOLTAGE_GFX ].b); +pr_info ("qAgingGb[AVFS_VOLTAGE_SOC]{m = 0x%x b = 0x%x}\n" , + pptable->qAgingGb[AVFS_VOLTAGE_SOC ].m, + pptable->qAgingGb[AVFS_VOLTAGE_SOC ].b); + +pr_info ("qStaticVoltageOffset[AVFS_VOLTAGE_GFX]{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->qStaticVoltageOffset[AVFS_VOLTAGE_GFX ].a, + pptable->qStaticVoltageOffset[AVFS_VOLTAGE_GFX ].b, + pptable->qStaticVoltageOffset[AVFS_VOLTAGE_GFX ].c); +pr_info ("qStaticVoltageOffset[AVFS_VOLTAGE_SOC]{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->qStaticVoltageOffset[AVFS_VOLTAGE_SOC ].a, + pptable->qStaticVoltageOffset[AVFS_VOLTAGE_SOC ].b, + pptable->qStaticVoltageOffset[AVFS_VOLTAGE_SOC ].c); + +pr_info ("DcTol[AVFS_VOLTAGE_GFX] = 0x%x\n" , pptable->DcTol[AVFS_VOLTAGE_GFX ]); +pr_info ("DcTol[AVFS_VOLTAGE_SOC] = 0x%x\n" , pptable->DcTol[AVFS_VOLTAGE_SOC ]); + +pr_info ("DcBtcEnabled[AVFS_VOLTAGE_GFX] = 0x%x\n" , pptable->DcBtcEnabled[AVFS_VOLTAGE_GFX ]); +pr_info ("DcBtcEnabled[AVFS_VOLTAGE_SOC] = 0x%x\n" , pptable->DcBtcEnabled[AVFS_VOLTAGE_SOC ]); +pr_info ("Padding8_GfxBtc[0] = 0x%x\n" , pptable->Padding8_GfxBtc[0 ]); +pr_info ("Padding8_GfxBtc[1] = 0x%x\n" , pptable->Padding8_GfxBtc[1 ]); + +pr_info ("DcBtcMin[AVFS_VOLTAGE_GFX] = 0x%x\n" , pptable->DcBtcMin[AVFS_VOLTAGE_GFX ]); +pr_info ("DcBtcMin[AVFS_VOLTAGE_SOC] = 0x%x\n" , pptable->DcBtcMin[AVFS_VOLTAGE_SOC ]); +pr_info ("DcBtcMax[AVFS_VOLTAGE_GFX] = 0x%x\n" , pptable->DcBtcMax[AVFS_VOLTAGE_GFX ]); +pr_info ("DcBtcMax[AVFS_VOLTAGE_SOC] = 0x%x\n" , pptable->DcBtcMax[AVFS_VOLTAGE_SOC ]); + +pr_info ("DcBtcGb[AVFS_VOLTAGE_GFX] = 0x%x\n" , pptable->DcBtcGb[AVFS_VOLTAGE_GFX ]); +pr_info ("DcBtcGb[AVFS_VOLTAGE_SOC] = 0x%x\n" , pptable->DcBtcGb[AVFS_VOLTAGE_SOC ]); + +pr_info ("XgmiDpmPstates\n" ); +for (i =0 ; i <NUM_XGMI_LEVELS ; i++) +pr_info (" .[%d] = %d\n" , i, pptable->XgmiDpmPstates[i]); +pr_info ("XgmiDpmSpare[0] = 0x%02x\n" , pptable->XgmiDpmSpare[0 ]); +pr_info ("XgmiDpmSpare[1] = 0x%02x\n" , pptable->XgmiDpmSpare[1 ]); + +pr_info ("VDDGFX_TVmin = %d\n" , pptable->VDDGFX_TVmin); +pr_info ("VDDSOC_TVmin = %d\n" , pptable->VDDSOC_TVmin); +pr_info ("VDDGFX_Vmin_HiTemp = %d\n" , pptable->VDDGFX_Vmin_HiTemp); +pr_info ("VDDGFX_Vmin_LoTemp = %d\n" , pptable->VDDGFX_Vmin_LoTemp); +pr_info ("VDDSOC_Vmin_HiTemp = %d\n" , pptable->VDDSOC_Vmin_HiTemp); +pr_info ("VDDSOC_Vmin_LoTemp = %d\n" , pptable->VDDSOC_Vmin_LoTemp); +pr_info ("VDDGFX_TVminHystersis = %d\n" , pptable->VDDGFX_TVminHystersis); +pr_info ("VDDSOC_TVminHystersis = %d\n" , pptable->VDDSOC_TVminHystersis); + +pr_info ("DebugOverrides = 0x%x\n" , pptable->DebugOverrides); +pr_info ("ReservedEquation0{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->ReservedEquation0.a, + pptable->ReservedEquation0.b, + pptable->ReservedEquation0.c); +pr_info ("ReservedEquation1{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->ReservedEquation1.a, + pptable->ReservedEquation1.b, + pptable->ReservedEquation1.c); +pr_info ("ReservedEquation2{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->ReservedEquation2.a, + pptable->ReservedEquation2.b, + pptable->ReservedEquation2.c); +pr_info ("ReservedEquation3{a = 0x%x b = 0x%x c = 0x%x}\n" , + pptable->ReservedEquation3.a, + pptable->ReservedEquation3.b, + pptable->ReservedEquation3.c); + +pr_info ("MinVoltageUlvGfx = %d\n" , pptable->MinVoltageUlvGfx); +pr_info ("PaddingUlv = %d\n" , pptable->PaddingUlv); + +pr_info ("TotalPowerConfig = %d\n" , pptable->TotalPowerConfig); +pr_info ("TotalPowerSpare1 = %d\n" , pptable->TotalPowerSpare1); +pr_info ("TotalPowerSpare2 = %d\n" , pptable->TotalPowerSpare2); + +pr_info ("PccThresholdLow = %d\n" , pptable->PccThresholdLow); +pr_info ("PccThresholdHigh = %d\n" , pptable->PccThresholdHigh); + +pr_info ("Board Parameters:\n" ); +pr_info ("MaxVoltageStepGfx = 0x%x\n" , pptable->MaxVoltageStepGfx); +pr_info ("MaxVoltageStepSoc = 0x%x\n" , pptable->MaxVoltageStepSoc); + +pr_info ("VddGfxVrMapping = 0x%x\n" , pptable->VddGfxVrMapping); +pr_info ("VddSocVrMapping = 0x%x\n" , pptable->VddSocVrMapping); +pr_info ("VddMemVrMapping = 0x%x\n" , pptable->VddMemVrMapping); +pr_info ("BoardVrMapping = 0x%x\n" , pptable->BoardVrMapping); + +pr_info ("GfxUlvPhaseSheddingMask = 0x%x\n" , pptable->GfxUlvPhaseSheddingMask); +pr_info ("ExternalSensorPresent = 0x%x\n" , pptable->ExternalSensorPresent); + +pr_info ("GfxMaxCurrent = 0x%x\n" , pptable->GfxMaxCurrent); +pr_info ("GfxOffset = 0x%x\n" , pptable->GfxOffset); +pr_info ("Padding_TelemetryGfx = 0x%x\n" , pptable->Padding_TelemetryGfx); + +pr_info ("SocMaxCurrent = 0x%x\n" , pptable->SocMaxCurrent); +pr_info ("SocOffset = 0x%x\n" , pptable->SocOffset); +pr_info ("Padding_TelemetrySoc = 0x%x\n" , pptable->Padding_TelemetrySoc); + +pr_info ("MemMaxCurrent = 0x%x\n" , pptable->MemMaxCurrent); +pr_info ("MemOffset = 0x%x\n" , pptable->MemOffset); +pr_info ("Padding_TelemetryMem = 0x%x\n" , pptable->Padding_TelemetryMem); + +pr_info ("BoardMaxCurrent = 0x%x\n" , pptable->BoardMaxCurrent); +pr_info ("BoardOffset = 0x%x\n" , pptable->BoardOffset); +pr_info ("Padding_TelemetryBoardInput = 0x%x\n" , pptable->Padding_TelemetryBoardInput); + +pr_info ("VR0HotGpio = %d\n" , pptable->VR0HotGpio); +pr_info ("VR0HotPolarity = %d\n" , pptable->VR0HotPolarity); +pr_info ("VR1HotGpio = %d\n" , pptable->VR1HotGpio); +pr_info ("VR1HotPolarity = %d\n" , pptable->VR1HotPolarity); + +pr_info ("PllGfxclkSpreadEnabled = %d\n" , pptable->PllGfxclkSpreadEnabled); +pr_info ("PllGfxclkSpreadPercent = %d\n" , pptable->PllGfxclkSpreadPercent); +pr_info ("PllGfxclkSpreadFreq = %d\n" , pptable->PllGfxclkSpreadFreq); + +pr_info ("UclkSpreadEnabled = %d\n" , pptable->UclkSpreadEnabled); +pr_info ("UclkSpreadPercent = %d\n" , pptable->UclkSpreadPercent); +pr_info ("UclkSpreadFreq = %d\n" , pptable->UclkSpreadFreq); + +pr_info ("FclkSpreadEnabled = %d\n" , pptable->FclkSpreadEnabled); +pr_info ("FclkSpreadPercent = %d\n" , pptable->FclkSpreadPercent); +pr_info ("FclkSpreadFreq = %d\n" , pptable->FclkSpreadFreq); + +pr_info ("FllGfxclkSpreadEnabled = %d\n" , pptable->FllGfxclkSpreadEnabled); +pr_info ("FllGfxclkSpreadPercent = %d\n" , pptable->FllGfxclkSpreadPercent); +pr_info ("FllGfxclkSpreadFreq = %d\n" , pptable->FllGfxclkSpreadFreq); + +for (i =0 ; i <NUM_I2C_CONTROLLERS ; i++) { +pr_info ("I2cControllers[%d]:\n" , i); +pr_info (" .Enabled = %d\n" , + pptable->I2cControllers[i].Enabled); +pr_info (" .SlaveAddress = 0x%x\n" , + pptable->I2cControllers[i].SlaveAddress); +pr_info (" .ControllerPort = %d\n" , + pptable->I2cControllers[i].ControllerPort); +pr_info (" .ControllerName = %d\n" , + pptable->I2cControllers[i].ControllerName); +pr_info (" .ThermalThrottler = %d\n" , + pptable->I2cControllers[i].ThermalThrotter); +pr_info (" .I2cProtocol = %d\n" , + pptable->I2cControllers[i].I2cProtocol); +pr_info (" .Speed = %d\n" , + pptable->I2cControllers[i].Speed); + } + +pr_info ("MemoryChannelEnabled = %d\n" , pptable->MemoryChannelEnabled); +pr_info ("DramBitWidth = %d\n" , pptable->DramBitWidth); + +pr_info ("TotalBoardPower = %d\n" , pptable->TotalBoardPower); + +pr_info ("XgmiLinkSpeed\n" ); +for (i =0 ; i <NUM_XGMI_PSTATE_LEVELS ; i++) +pr_info (" .[%d] = %d\n" , i, pptable->XgmiLinkSpeed[i]); +pr_info ("XgmiLinkWidth\n" ); +for (i =0 ; i <NUM_XGMI_PSTATE_LEVELS ; i++) +pr_info (" .[%d] = %d\n" , i, pptable->XgmiLinkWidth[i]); +pr_info ("XgmiFclkFreq\n" ); +for (i =0 ; i <NUM_XGMI_PSTATE_LEVELS ; i++) +pr_info (" .[%d] = %d\n" , i, pptable->XgmiFclkFreq[i]); +pr_info ("XgmiSocVoltage\n" ); +for (i =0 ; i <NUM_XGMI_PSTATE_LEVELS ; i++) +pr_info (" .[%d] = %d\n" , i, pptable->XgmiSocVoltage[i]); + +} +static const struct pptable_funcs arcturus_ppt_funcs = { +/* translate smu index into arcturus specific index */ .get_smu_msg_index = arcturus_get_smu_msg_index, + .get_smu_clk_index = arcturus_get_smu_clk_index, + .get_smu_feature_index = arcturus_get_smu_feature_index, + .get_smu_table_index = arcturus_get_smu_table_index, + .get_smu_power_index= arcturus_get_pwr_src_index, + .get_workload_type = arcturus_get_workload_type, +/* internal structurs allocations */ + .tables_init = arcturus_tables_init, + .alloc_dpm_context = arcturus_allocate_dpm_context, +/* pptable related */ + .check_powerplay_table = arcturus_check_powerplay_table, + .store_powerplay_table = arcturus_store_powerplay_table, + .append_powerplay_table = arcturus_append_powerplay_table, +/* init dpm */ + .get_allowed_feature_mask = arcturus_get_allowed_feature_mask, +/* btc */ + .run_afll_btc = arcturus_run_btc_afll, +/* dpm/clk tables */ + .set_default_dpm_table = arcturus_set_default_dpm_table, + .populate_umd_state_clk = arcturus_populate_umd_state_clk, + .get_thermal_temperature_range = arcturus_get_thermal_temperature_range, + .print_clk_levels = arcturus_print_clk_levels, + .force_clk_levels = arcturus_force_clk_levels, +/* debug (internal used) */ + .dump_pptable = arcturus_dump_pptable, };void arcturus_set_ppt_funcs (struct smu_context *smu) { +struct smu_table_context *smu_table = &smu->smu_table; + smu->ppt_funcs = &arcturus_ppt_funcs; smu->smc_if_version =SMU11_DRIVER_IF_VERSION ; + smu_table->table_count =TABLE_COUNT ; }
drivers/gpu/drm/amd/powerplay/arcturus_ppt.h +44 -0
50 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -1
@@ -121,7 +121,7 @@__SMU_DUMMY_MAP (GetVoltageByDpm), \__SMU_DUMMY_MAP (GetVoltageByDpmOverdrive), \__SMU_DUMMY_MAP (PowerUpVcn0), \ -__SMU_DUMMY_MAP (PowerDownVcn01), \ +__SMU_DUMMY_MAP (PowerDownVcn0), \__SMU_DUMMY_MAP (PowerUpVcn1), \ __SMU_DUMMY_MAP(PowerDownVcn1), \
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/30 drm/amd/powerplay: enable SW SMU routine support for arcturus
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Enable arcturus SW SMU routines.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 49 +++++++++++++--------- 1 file changed, 30 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +30 -19
@@ -476,7 +476,7 @@ bool is_support_sw_smu(struct amdgpu_device *adev) {if (adev->asic_type ==CHIP_VEGA20 )return (amdgpu_dpm ==2 ) ? true: false; -else if (adev->asic_type >=CHIP_NAVI10 ) +else if (adev->asic_type >=CHIP_ARCTURUS )return true;else return false;
@@ -708,6 +708,7 @@ static int smu_set_funcs(struct amdgpu_device *adev)case CHIP_VEGA20 :case CHIP_NAVI10 :case CHIP_NAVI14 : +case CHIP_ARCTURUS :if (adev->pm.pp_feature &PP_OVERDRIVE_MASK ) smu->od_enabled = true;smu_v11_0_set_smu_funcs (smu);
@@ -1013,9 +1014,11 @@ static int smu_smc_table_hw_init(struct smu_context *smu,return 0 ; } - ret =smu_init_display_count (smu,0 ); -if (ret) -return ret; +if (adev->asic_type !=CHIP_ARCTURUS ) { + ret =smu_init_display_count (smu,0 ); +if (ret) +return ret; + }if (initialize) {/* get boot_values from vbios to set revision, gfxclk, and etc. */
@@ -1091,17 +1094,19 @@ static int smu_smc_table_hw_init(struct smu_context *smu,if (ret)return ret; - ret =smu_notify_display_change (smu); -if (ret) -return ret; +if (adev->asic_type !=CHIP_ARCTURUS ) { + ret =smu_notify_display_change (smu); +if (ret) +return ret; -/* -* Set min deep sleep dce fclk with bootup value from vbios via -* SetMinDeepSleepDcefclk MSG. -*/ - ret =smu_set_min_dcef_deep_sleep (smu); -if (ret) -return ret; +/* +* Set min deep sleep dce fclk with bootup value from vbios via +* SetMinDeepSleepDcefclk MSG. +*/ + ret =smu_set_min_dcef_deep_sleep (smu); +if (ret) +return ret; + }/* * Set initialized values (get from vbios) to dpm tables context such as
@@ -1212,14 +1217,20 @@ static int smu_hw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;struct smu_context *smu = &adev->smu; -if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP ) { - ret =smu_check_fw_status (smu); -if (ret) { -pr_err ("SMC firmware status is not correct\n" ); -return ret; +if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) { +if (adev->asic_type <CHIP_NAVI10 ) { + ret =smu_load_microcode (smu); +if (ret) +return ret; } } + ret =smu_check_fw_status (smu); +if (ret) { +pr_err ("SMC firmware status is not correct\n" ); +return ret; + } +if (!smu->pm_enabled)return 0 ;
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/30 drm/amd/powerplay: initialize arcturus MP1 and THM base address
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Initialize base address for those IPs which are used in powerplay.
--- drivers/gpu/drm/amd/amdgpu/arct_reg_init.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpu/drm/amd/amdgpu/arct_reg_init.c +2 -0
@@ -38,6 +38,7 @@ int arct_reg_base_init(struct amdgpu_device *adev) adev->reg_offset[ATHUB_HWIP ][i] = (uint32_t *)(&(ATHUB_BASE .instance[i])); adev->reg_offset[NBIO_HWIP ][i] = (uint32_t *)(&(NBIF0_BASE .instance[i])); adev->reg_offset[MP0_HWIP ][i] = (uint32_t *)(&(MP0_BASE .instance[i])); + adev->reg_offset[MP1_HWIP ][i] = (uint32_t *)(&(MP1_BASE .instance[i])); adev->reg_offset[UVD_HWIP ][i] = (uint32_t *)(&(UVD_BASE .instance[i])); adev->reg_offset[DF_HWIP ][i] = (uint32_t *)(&(DF_BASE .instance[i])); adev->reg_offset[OSSSYS_HWIP ][i] = (uint32_t *)(&(OSSSYS_BASE .instance[i]));
@@ -50,6 +51,7 @@ int arct_reg_base_init(struct amdgpu_device *adev) adev->reg_offset[SDMA6_HWIP ][i] = (uint32_t *)(&(SDMA6_BASE .instance[i])); adev->reg_offset[SDMA7_HWIP ][i] = (uint32_t *)(&(SDMA7_BASE .instance[i])); adev->reg_offset[SMUIO_HWIP ][i] = (uint32_t *)(&(SMUIO_BASE .instance[i])); + adev->reg_offset[THM_HWIP ][i] = (uint32_t *)(&(THM_BASE .instance[i])); }return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/30 drm/amd/powerplay: enable arcturus powerplay
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Arcturus powerplay is ready to use.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -0
@@ -696,6 +696,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)amdgpu_device_ip_block_add (adev, &dce_virtual_ip_block);amdgpu_device_ip_block_add (adev, &gfx_v9_0_ip_block);amdgpu_device_ip_block_add (adev, &sdma_v4_0_ip_block); +amdgpu_device_ip_block_add (adev, &smu_v11_0_ip_block);amdgpu_device_ip_block_add (adev, &vcn_v2_5_ip_block);break ;default :
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 9/30 drm/amdgpu: correct VCN powergate routine for acturus
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Arcturus VCN should powergate in the way as Navi.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +2 -2
@@ -304,7 +304,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work)if (fences ==0 ) {amdgpu_gfx_off_ctrl (adev, true); -if (adev->asic_type <CHIP_NAVI10 && adev->pm.dpm_enabled) +if (adev->asic_type <CHIP_ARCTURUS && adev->pm.dpm_enabled)amdgpu_dpm_enable_uvd (adev, false);else amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,
@@ -321,7 +321,7 @@ void amdgpu_vcn_ring_begin_use(struct amdgpu_ring *ring)if (set_clocks) {amdgpu_gfx_off_ctrl (adev, false); -if (adev->asic_type <CHIP_NAVI10 && adev->pm.dpm_enabled) +if (adev->asic_type <CHIP_ARCTURUS && adev->pm.dpm_enabled)amdgpu_dpm_enable_uvd (adev, true);else amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_VCN,
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 10/30 drm/amd/powerplay: hold on the arcturus gfx dpm support in driver
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
As for now, only "Prefetcher" is guarded to be working from SMU firmware.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -2
@@ -324,8 +324,7 @@ arcturus_get_allowed_feature_mask(struct smu_context *smu,memset (feature_mask,0 ,sizeof (uint32_t ) * num); - *(uint64_t *)feature_mask |=FEATURE_MASK (FEATURE_DPM_PREFETCHER_BIT ) - |FEATURE_MASK (FEATURE_DPM_GFXCLK_BIT ); + *(uint64_t *)feature_mask |=FEATURE_MASK (FEATURE_DPM_PREFETCHER_BIT );return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 11/30 drm/amd/include: adjust base offset of SMUIO and THM for Arcturus
In reply to a message not in the archiveFrom: Le Ma <[email protected]>
Arcturus has different _BASE_IDX value in some HWIP_offset.h. To make source files like smu_v11_0.c and soc15.c that include HWIP_offset.h of Vega20 reusable for Arcturus, align this base offset with Vega20.
--- drivers/gpu/drm/amd/include/arct_ip_offset.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/include/arct_ip_offset.h +2 -6
@@ -196,17 +196,13 @@ static const struct IP_BASE SDMA7_BASE ={ { { { 0x00013800, 0x0001F40 { { 0, 0, 0, 0, 0, 0 } }, { { 0, 0, 0, 0, 0, 0 } }, { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SMUIO_BASE ={ { { {0x00012080 ,0x00016800 ,0x00016A00 ,0x00401000 ,0x00440000 ,0 } }, - { {0 ,0 ,0 ,0 ,0 ,0 } }, - { {0 ,0 ,0 ,0 ,0 ,0 } }, +static const struct IP_BASE SMUIO_BASE ={ { { {0x00016800 ,0x00016A00 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } } } }; -static const struct IP_BASE THM_BASE ={ { { {0x00012060 ,0x00016600 ,0x00400C00 ,0 ,0 ,0 } }, - { {0 ,0 ,0 ,0 ,0 ,0 } }, - { {0 ,0 ,0 ,0 ,0 ,0 } }, +static const struct IP_BASE THM_BASE ={ { { {0x00016600 ,0 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } }, { {0 ,0 ,0 ,0 ,0 ,0 } },
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 12/30 drm/amdgpu: update more sdma instances irq support
In reply to a message not in the archiveFrom: Le Ma <[email protected]>
Update for sdma ras ecc_irq and other minors.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 77 +++++++++----------------- 1 file changed, 27 insertions(+), 50 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +27 -50
@@ -295,7 +295,7 @@ static unsigned sdma_v4_0_seq_to_irq_id(int seq_num)default :break ; } -return 0 ; +return -EINVAL ; }static int sdma_v4_0_irq_id_to_seq (unsigned client_id)
@@ -320,7 +320,7 @@ static int sdma_v4_0_irq_id_to_seq(unsigned client_id)default :break ; } -return 0 ; +return -EINVAL ; }static void sdma_v4_0_init_golden_registers (struct amdgpu_device *adev)
@@ -1643,7 +1643,7 @@ static int sdma_v4_0_late_init(void *handle) .sub_block_index = 0, .name = "sdma", }; -int r; +int r, i;if (!amdgpu_ras_is_supported (adev,AMDGPU_RAS_BLOCK__SDMA )) {amdgpu_ras_feature_enable_on_boot (adev, &ras_block,0 );
@@ -1700,14 +1700,11 @@ static int sdma_v4_0_late_init(void *handle)if (r) goto sysfs; resume: - r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 ); -if (r) - goto irq; - - r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE1 ); -if (r) { -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 ); - goto irq; +for (i =0 ; i < adev->sdma.num_instances; i++) { + r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq, +sdma_v4_0_seq_to_irq_id (i)); +if (r) + goto irq; }return 0 ;
@@ -1740,16 +1737,13 @@ static int sdma_v4_0_sw_init(void *handle) }/* SDMA SRAM ECC event */ - r =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_SDMA0 ,SDMA0_4_0__SRCID__SDMA_SRAM_ECC , - &adev->sdma.ecc_irq); -if (r) -return r; - -/* SDMA SRAM ECC event */ - r =amdgpu_irq_add_id (adev,SOC15_IH_CLIENTID_SDMA1 ,SDMA1_4_0__SRCID__SDMA_SRAM_ECC , - &adev->sdma.ecc_irq); -if (r) -return r; +for (i =0 ; i < adev->sdma.num_instances; i++) { + r =amdgpu_irq_add_id (adev,sdma_v4_0_seq_to_irq_id (i), +SDMA0_4_0__SRCID__SDMA_SRAM_ECC , + &adev->sdma.ecc_irq); +if (r) +return r; + }for (i =0 ; i < adev->sdma.num_instances; i++) { ring = &adev->sdma.instance[i].ring;
@@ -1782,9 +1776,7 @@ static int sdma_v4_0_sw_init(void *handle)sprintf (ring->name,"page%d" , i); r =amdgpu_ring_init (adev, ring,1024 , &adev->sdma.trap_irq, - (i ==0 ) ? -AMDGPU_SDMA_IRQ_INSTANCE0 : -AMDGPU_SDMA_IRQ_INSTANCE1 ); +AMDGPU_SDMA_IRQ_INSTANCE0 + i);if (r)return r; }
@@ -1847,12 +1839,15 @@ static int sdma_v4_0_hw_init(void *handle)static int sdma_v4_0_hw_fini (void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; +int i;if (amdgpu_sriov_vf (adev))return 0 ; -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE0 ); -amdgpu_irq_put (adev, &adev->sdma.ecc_irq,AMDGPU_SDMA_IRQ_INSTANCE1 ); +for (i =0 ; i < adev->sdma.num_instances; i++) { +amdgpu_irq_put (adev, &adev->sdma.ecc_irq, +sdma_v4_0_seq_to_irq_id (i)); + }sdma_v4_0_ctx_switch_enable (adev, false);sdma_v4_0_enable (adev, false);
@@ -1966,16 +1961,9 @@ static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev, {uint32_t instance, err_source; -switch (entry->client_id) { -case SOC15_IH_CLIENTID_SDMA0 : - instance =0 ; -break ; -case SOC15_IH_CLIENTID_SDMA1 : - instance =1 ; -break ; -default : + instance =sdma_v4_0_irq_id_to_seq (entry->client_id); +if (instance <0 )return 0 ; - }switch (entry->src_id) {case SDMA0_4_0__SRCID__SDMA_SRAM_ECC :
@@ -2021,16 +2009,9 @@ static int sdma_v4_0_process_illegal_inst_irq(struct amdgpu_device *adev,DRM_ERROR ("Illegal instruction in SDMA command stream\n" ); -switch (entry->client_id) { -case SOC15_IH_CLIENTID_SDMA0 : - instance =0 ; -break ; -case SOC15_IH_CLIENTID_SDMA1 : - instance =1 ; -break ; -default : + instance =sdma_v4_0_irq_id_to_seq (entry->client_id); +if (instance <0 )return 0 ; - }switch (entry->ring_id) {case 0 :
@@ -2047,14 +2028,10 @@ static int sdma_v4_0_set_ecc_irq_state(struct amdgpu_device *adev, {u32 sdma_edc_config; -u32 reg_offset = (type ==AMDGPU_SDMA_IRQ_INSTANCE0 ) ? -sdma_v4_0_get_reg_offset (adev,0 , mmSDMA0_EDC_CONFIG) : -sdma_v4_0_get_reg_offset (adev,1 , mmSDMA0_EDC_CONFIG); - - sdma_edc_config =RREG32 (reg_offset); + sdma_edc_config =RREG32_SDMA (type, mmSDMA0_EDC_CONFIG); sdma_edc_config =REG_SET_FIELD (sdma_edc_config,SDMA0_EDC_CONFIG ,ECC_INT_ENABLE , state ==AMDGPU_IRQ_STATE_ENABLE ?1 :0 ); -WREG32 (reg_offset, sdma_edc_config); +WREG32_SDMA (type, mmSDMA0_EDC_CONFIG, sdma_edc_config);return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 13/30 drm/amd/powerplay: add new sensor type for VCN powergate status
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
VCN is widely used in new ASICs and different from tranditional UVD and VCE.
--- drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +1 -0
@@ -123,6 +123,7 @@ enum amd_pp_sensors {AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK ,AMDGPU_PP_SENSOR_MIN_FAN_RPM ,AMDGPU_PP_SENSOR_MAX_FAN_RPM , + AMDGPU_PP_SENSOR_VCN_POWER_STATE, }; enum amd_pp_task {
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 14/30 drm/amd/powerplay: support VCN powergate status retrieval on Raven
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Enable VCN powergate status report on Raven.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +9 -0
@@ -1111,6 +1111,7 @@ static int smu10_thermal_get_temperature(struct pp_hwmgr *hwmgr)static int smu10_read_sensor (struct pp_hwmgr *hwmgr,int idx,void *value,int *size) { +struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend);uint32_t sclk, mclk;int ret =0 ;
@@ -1132,6 +1133,10 @@ static int smu10_read_sensor(struct pp_hwmgr *hwmgr, int idx,case AMDGPU_PP_SENSOR_GPU_TEMP : *((uint32_t *)value) =smu10_thermal_get_temperature (hwmgr);break ; +case AMDGPU_PP_SENSOR_VCN_POWER_STATE : + *(uint32_t *)value = smu10_data->vcn_power_gated ?0 :1 ; + *size =4 ; +break ;default : ret = -EINVAL ;break ;
@@ -1175,18 +1180,22 @@ static int smu10_powergate_sdma(struct pp_hwmgr *hwmgr, bool gate)static void smu10_powergate_vcn (struct pp_hwmgr *hwmgr,bool bgate) { +struct smu10_hwmgr *smu10_data = (struct smu10_hwmgr *)(hwmgr->backend); +if (bgate) {amdgpu_device_ip_set_powergating_state (hwmgr->adev,AMD_IP_BLOCK_TYPE_VCN ,AMD_PG_STATE_GATE );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_PowerDownVcn,0 ); + smu10_data->vcn_power_gated = true; }else {smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_PowerUpVcn,0 );amdgpu_device_ip_set_powergating_state (hwmgr->adev,AMD_IP_BLOCK_TYPE_VCN ,AMD_PG_STATE_UNGATE ); + smu10_data->vcn_power_gated = false; } }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 15/30 drm/amd/powerplay: support VCN powergate status retrieval for SW SMU
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Commonly used for VCN powergate status retrieval for SW SMU.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4 -0
@@ -424,6 +424,10 @@ int smu_common_read_sensor(struct smu_context *smu, enum amd_pp_sensors sensor, *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_DPM_VCE_BIT ) ?1 :0 ; *size =4 ;break ; +case AMDGPU_PP_SENSOR_VCN_POWER_STATE : + *(uint32_t *)data =smu_feature_is_enabled (smu,SMU_FEATURE_VCN_PG_BIT ) ?1 :0 ; + *size =4 ; +break ;default : ret = -EINVAL ;break ;
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 16/30 drm/amd/powerplay: correct Navi10 VCN powergate control
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
No VCN DPM bit check as that's different from VCN PG. Also no extra check for possible double enablement/disablement as that's already done by VCN.
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 26 ++++++++-------------- 1 file changed, 9 insertions(+), 17 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +9 -17
@@ -591,27 +591,19 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)static int navi10_dpm_set_uvd_enable (struct smu_context *smu,bool enable) {int ret =0 ; -struct smu_power_context *smu_power = &smu->smu_power; -struct smu_power_gate *power_gate = &smu_power->power_gate; -if (enable && power_gate->uvd_gated) { -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,1 ); -if (ret) -return ret; - } - power_gate->uvd_gated = false; +if (enable) { + ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,1 ); +if (ret) +return ret; }else { -if (!enable && !power_gate->uvd_gated) { -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT )) { - ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn); -if (ret) -return ret; - } - power_gate->uvd_gated = true; - } + ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn); +if (ret) +return ret; } +smu_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT , enable); +return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20190729201508.16136-17-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 16/30] drm/amd/powerplay: correct Navi10 VCN powergate control
Quoted 40 lines · Alex Deucher
From: Evan Quan <[email protected]>
No VCN DPM bit check as that's different from VCN PG. Also no extra check for possible double enablement/disablement as that's already done by VCN.
Signed-off-by Evan Quan <[email protected]>Reviewed-by Kenneth Feng <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 26 ++++++++-------------- 1 file changed, 9 insertions(+), 17 deletions(-)drivers/gpu/drm/amd/powerplay/navi10_ppt.c +4
-13@@ -591,27 +591,19 @@ static int navi10_set_default_dpm_table(struct smu_context *smu)static int navi10_dpm_set_uvd_enable (struct smu_context *smu,bool enable) {int ret =0 ; -struct smu_power_context *smu_power = &smu->smu_power; -struct smu_power_gate *power_gate = &smu_power->power_gate; -if (enable && power_gate->uvd_gated) { -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT )) { - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,1 ); -if (ret) -return ret; - } - power_gate->uvd_gated = false; +if (enable) { + ret =smu_send_smc_msg_with_param (smu, SMU_MSG_PowerUpVcn,1 ); +if (ret) +return ret; }else { -if (!enable && !power_gate->uvd_gated) { -if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UVD_BIT )) { - ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn); -if (ret)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c static int navi10_set_default_dpm_table(struct smu_context *smu) · line 605
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +4
-4-return ret; - } - power_gate->uvd_gated = true; - } + ret =smu_send_smc_msg (smu, SMU_MSG_PowerDownVcn); +if (ret) +return ret; } +smu_feature_set_enabled (smu,SMU_FEATURE_VCN_PG_BIT , enable);
[kevin]:
you should check return value, this should not be based on some assumptions.
drivers/gpu/drm/amd/powerplay/navi10_ppt.c static int navi10_set_default_dpm_table(struct smu_context *smu) · line 609
Quoted 4 lines
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-0+return 0 ; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 17/30 drm/amd/powerplay: correct UVD/VCE/VCN power status retrieval
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
VCN should be used for Vega20 later ASICs while UVD and VCE are for previous ASICs.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 56 +++++++++++++++++--------- 1 file changed, 36 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +36 -20
@@ -3070,28 +3070,44 @@ static int amdgpu_debugfs_pm_info_pp(struct seq_file *m, struct amdgpu_device *aif (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_ENABLED_SMC_FEATURES_MASK , (void *)&value64, &size))seq_printf (m,"SMC Feature Mask: 0x%016llx\n" , value64); -/* UVD clocks */ -if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_POWER , (void *)&value, &size)) { -if (!value) { -seq_printf (m,"UVD: Disabled\n" ); - }else { -seq_printf (m,"UVD: Enabled\n" ); -if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_DCLK , (void *)&value, &size)) -seq_printf (m,"\t%u MHz (DCLK)\n" , value/100 ); -if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_VCLK , (void *)&value, &size)) -seq_printf (m,"\t%u MHz (VCLK)\n" , value/100 ); +if (adev->asic_type >CHIP_VEGA20 ) { +/* VCN clocks */ +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_VCN_POWER_STATE , (void *)&value, &size)) { +if (!value) { +seq_printf (m,"VCN: Disabled\n" ); + }else { +seq_printf (m,"VCN: Enabled\n" ); +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_DCLK , (void *)&value, &size)) +seq_printf (m,"\t%u MHz (DCLK)\n" , value/100 ); +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_VCLK , (void *)&value, &size)) +seq_printf (m,"\t%u MHz (VCLK)\n" , value/100 ); + } } - } -seq_printf (m,"\n" ); +seq_printf (m,"\n" ); + }else { +/* UVD clocks */ +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_POWER , (void *)&value, &size)) { +if (!value) { +seq_printf (m,"UVD: Disabled\n" ); + }else { +seq_printf (m,"UVD: Enabled\n" ); +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_DCLK , (void *)&value, &size)) +seq_printf (m,"\t%u MHz (DCLK)\n" , value/100 ); +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_UVD_VCLK , (void *)&value, &size)) +seq_printf (m,"\t%u MHz (VCLK)\n" , value/100 ); + } + } +seq_printf (m,"\n" ); -/* VCE clocks */ -if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_VCE_POWER , (void *)&value, &size)) { -if (!value) { -seq_printf (m,"VCE: Disabled\n" ); - }else { -seq_printf (m,"VCE: Enabled\n" ); -if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_VCE_ECCLK , (void *)&value, &size)) -seq_printf (m,"\t%u MHz (ECCLK)\n" , value/100 ); +/* VCE clocks */ +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_VCE_POWER , (void *)&value, &size)) { +if (!value) { +seq_printf (m,"VCE: Disabled\n" ); + }else { +seq_printf (m,"VCE: Enabled\n" ); +if (!amdgpu_dpm_read_sensor (adev,AMDGPU_PP_SENSOR_VCE_ECCLK , (void *)&value, &size)) +seq_printf (m,"\t%u MHz (ECCLK)\n" , value/100 ); + } } }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 18/30 drm/amd/powerplay: init arcturus SMU metrics table on bootup
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Initialize arcturus SMU metrics table.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +7 -0
@@ -267,6 +267,8 @@ static int arcturus_get_workload_type(struct smu_context *smu, enum PP_SMC_POWERstatic int arcturus_tables_init (struct smu_context *smu,struct smu_table *tables) { +struct smu_table_context *smu_table = &smu->smu_table; +SMU_TABLE_INIT (tables,SMU_TABLE_PPTABLE ,sizeof (PPTable_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );
@@ -276,6 +278,11 @@ static int arcturus_tables_init(struct smu_context *smu, struct smu_table *tableSMU_TABLE_INIT (tables,SMU_TABLE_SMU_METRICS ,sizeof (SmuMetrics_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM ); + smu_table->metrics_table =kzalloc (sizeof (SmuMetrics_t),GFP_KERNEL ); +if (!smu_table->metrics_table) +return -ENOMEM ; + smu_table->metrics_time =0 ; +return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20190729201508.16136-19-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 18/30] drm/amd/powerplay: init arcturus SMU metrics table on bootup
Quoted 32 lines · Alex Deucher
From: Evan Quan <[email protected]>
Initialize arcturus SMU metrics table.
Signed-off-by Evan Quan <[email protected]>Reviewed-by Kevin Wang <[email protected]>Reviewed-by Alex Deucher <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +3
-0@@ -267,6 +267,8 @@ static int arcturus_get_workload_type(struct smu_context *smu, enum PP_SMC_POWERstatic int arcturus_tables_init (struct smu_context *smu,struct smu_table *tables) { +struct smu_table_context *smu_table = &smu->smu_table; +SMU_TABLE_INIT (tables,SMU_TABLE_PPTABLE ,sizeof (PPTable_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );@@ -276,6 +278,11 @@ static int arcturus_tables_init(struct smu_context *smu, struct smu_table *tableSMU_TABLE_INIT (tables,SMU_TABLE_SMU_METRICS ,sizeof (SmuMetrics_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM ); + smu_table->metrics_table =kzalloc (sizeof (SmuMetrics_t),GFP_KERNEL );[kevin]: where is do free operation in driver code ?
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static int arcturus_tables_init(struct smu_context *smu, struct smu_table *table · line 287
Quoted 6 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +4
-0+if (!smu_table->metrics_table) +return -ENOMEM ; + smu_table->metrics_time =0 ; +return 0 ; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 9594f6ed-de3d-71ac-aefe-e20e4d4f83f4-5C7GfCeVMHo@public.gmane.org
Re: [PATCH 18/30] drm/amd/powerplay: init arcturus SMU metrics table on bootup
Quoted 28 lines · Kevin Wang
Quoted 25 lines · Alex Deucher
From: Evan Quan <[email protected]>
Initialize arcturus SMU metrics table.
Signed-off-by Evan Quan <[email protected]>Reviewed-by Kevin Wang <[email protected]>Reviewed-by Alex Deucher <[email protected]>Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 7 +++++++ 1 file changed, 7 insertions(+)drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2
-0@@ -267,6 +267,8 @@ static int arcturus_get_workload_type(struct smu_context *smu, enum PP_SMC_POWERstatic int arcturus_tables_init (struct smu_context *smu,struct smu_table *tables) { +struct smu_table_context *smu_table = &smu->smu_table; +SMU_TABLE_INIT (tables,SMU_TABLE_PPTABLE ,sizeof (PPTable_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM );
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1
-0@@ -276,6 +278,11 @@ static int arcturus_tables_init(struct smu_context *smu, struct smu_table *tableSMU_TABLE_INIT (tables,SMU_TABLE_SMU_METRICS ,sizeof (SmuMetrics_t),PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM ); + smu_table->metrics_table =kzalloc (sizeof (SmuMetrics_t),GFP_KERNEL );[kevin]: where is do free operation in driver code ?
It's freed in smu_v11_0_fini_smc_tables()
Alex
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static int arcturus_tables_init(struct smu_context *smu, struct smu_table *table · line 287
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +4
-0+if (!smu_table->metrics_table) +return -ENOMEM ; + smu_table->metrics_time =0 ; +return 0 ; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 19/30 drm/amd/powerplay: support sensor reading on arcturus
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Support sensor reading for gpu loading, power and temperatures.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 142 +++++++++++++++++++ 1 file changed, 142 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +142 -0
@@ -853,6 +853,147 @@ static int arcturus_get_thermal_temperature_range(struct smu_context *smu,return 0 ; } +static int arcturus_get_metrics_table (struct smu_context *smu, +SmuMetrics_t *metrics_table) +{ +struct smu_table_context *smu_table= &smu->smu_table; +int ret =0 ; + +if (!smu_table->metrics_time || +time_after (jiffies, smu_table->metrics_time +HZ /1000 )) { + ret =smu_update_table (smu,SMU_TABLE_SMU_METRICS ,0 , + (void *)smu_table->metrics_table, false); +if (ret) { +pr_info ("Failed to export SMU metrics table!\n" ); +return ret; + } + smu_table->metrics_time = jiffies; + } + +memcpy (metrics_table, smu_table->metrics_table,sizeof (SmuMetrics_t)); + +return ret; +} + +static int arcturus_get_current_activity_percent (struct smu_context *smu, +enum amd_pp_sensors sensor, +uint32_t *value) +{ +SmuMetrics_t metrics; +int ret =0 ; + +if (!value) +return -EINVAL ; + + ret =arcturus_get_metrics_table (smu, &metrics); +if (ret) +return ret; + +switch (sensor) { +case AMDGPU_PP_SENSOR_GPU_LOAD : + *value = metrics.AverageGfxActivity; +break ; +case AMDGPU_PP_SENSOR_MEM_LOAD : + *value = metrics.AverageUclkActivity; +break ; +default : +pr_err ("Invalid sensor for retrieving clock activity\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int arcturus_get_gpu_power (struct smu_context *smu,uint32_t *value) +{ +SmuMetrics_t metrics; +int ret =0 ; + +if (!value) +return -EINVAL ; + + ret =arcturus_get_metrics_table (smu, &metrics); +if (ret) +return ret; + + *value = metrics.AverageSocketPower <<8 ; + +return 0 ; +} + +static int arcturus_thermal_get_temperature (struct smu_context *smu, +enum amd_pp_sensors sensor, +uint32_t *value) +{ +SmuMetrics_t metrics; +int ret =0 ; + +if (!value) +return -EINVAL ; + + ret =arcturus_get_metrics_table (smu, &metrics); +if (ret) +return ret; + +switch (sensor) { +case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : + *value = metrics.TemperatureHotspot * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; +break ; +case AMDGPU_PP_SENSOR_EDGE_TEMP : + *value = metrics.TemperatureEdge * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; +break ; +case AMDGPU_PP_SENSOR_MEM_TEMP : + *value = metrics.TemperatureHBM * +SMU_TEMPERATURE_UNITS_PER_CENTIGRADES ; +break ; +default : +pr_err ("Invalid sensor for retrieving temp\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int arcturus_read_sensor (struct smu_context *smu, +enum amd_pp_sensors sensor, +void *data,uint32_t *size) +{ +struct smu_table_context *table_context = &smu->smu_table; +PPTable_t *pptable = table_context->driver_pptable; +int ret =0 ; + +switch (sensor) { +case AMDGPU_PP_SENSOR_MAX_FAN_RPM : + *(uint32_t *)data = pptable->FanMaximumRpm; + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_MEM_LOAD : +case AMDGPU_PP_SENSOR_GPU_LOAD : + ret =arcturus_get_current_activity_percent (smu, + sensor, + (uint32_t *)data); + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_GPU_POWER : + ret =arcturus_get_gpu_power (smu, (uint32_t *)data); + *size =4 ; +break ; +case AMDGPU_PP_SENSOR_HOTSPOT_TEMP : +case AMDGPU_PP_SENSOR_EDGE_TEMP : +case AMDGPU_PP_SENSOR_MEM_TEMP : + ret =arcturus_thermal_get_temperature (smu, sensor, + (uint32_t *)data); + *size =4 ; +break ; +default : +return -EINVAL ; + } + +return ret; +} +static void arcturus_dump_pptable (struct smu_context *smu) {struct smu_table_context *table_context = &smu->smu_table;
@@ -1309,6 +1450,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .get_thermal_temperature_range = arcturus_get_thermal_temperature_range, .print_clk_levels = arcturus_print_clk_levels, .force_clk_levels = arcturus_force_clk_levels, + .read_sensor = arcturus_read_sensor, /* debug (internal used) */ .dump_pptable = arcturus_dump_pptable, };
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 20/30 drm/amd/powerplay: support real-time clock retrieval on arcturus
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Enable arcturus real-time clock retrieval.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +24 -0
@@ -994,6 +994,29 @@ static int arcturus_read_sensor(struct smu_context *smu,return ret; } +static int arcturus_get_current_clk_freq_by_table (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *value) +{ +static SmuMetrics_t metrics; +int ret =0 , clk_id =0 ; + +if (!value) +return -EINVAL ; + + clk_id =smu_clk_get_index (smu, clk_type); +if (clk_id <0 ) +return -EINVAL ; + + ret =arcturus_get_metrics_table (smu, &metrics); +if (ret) +return ret; + + *value = metrics.CurrClock[clk_id]; + +return ret; +} +static void arcturus_dump_pptable (struct smu_context *smu) {struct smu_table_context *table_context = &smu->smu_table;
@@ -1448,6 +1471,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .set_default_dpm_table = arcturus_set_default_dpm_table, .populate_umd_state_clk = arcturus_populate_umd_state_clk, .get_thermal_temperature_range = arcturus_get_thermal_temperature_range, + .get_current_clk_freq_by_table = arcturus_get_current_clk_freq_by_table, .print_clk_levels = arcturus_print_clk_levels, .force_clk_levels = arcturus_force_clk_levels, .read_sensor = arcturus_read_sensor,
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 21/30 drm/amd/powerplay: support fan speed retrieval on arcturus
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Support arcturus fan speed retrieval.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 40 ++++++++++++++++++++ 1 file changed, 40 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +40 -0
@@ -994,6 +994,44 @@ static int arcturus_read_sensor(struct smu_context *smu,return ret; } +static int arcturus_get_fan_speed_rpm (struct smu_context *smu, +uint32_t *speed) +{ +SmuMetrics_t metrics; +int ret =0 ; + +if (!speed) +return -EINVAL ; + + ret =arcturus_get_metrics_table (smu, &metrics); +if (ret) +return ret; + + *speed = metrics.CurrFanSpeed; + +return ret; +} + +static int arcturus_get_fan_speed_percent (struct smu_context *smu, +uint32_t *speed) +{ +PPTable_t *pptable = smu->smu_table.driver_pptable; +uint32_t percent, current_rpm; +int ret =0 ; + +if (!speed) +return -EINVAL ; + + ret =arcturus_get_fan_speed_rpm (smu, ¤t_rpm); +if (ret) +return ret; + + percent = current_rpm *100 / pptable->FanMaximumRpm; + *speed = percent >100 ?100 : percent; + +return ret; +} +static int arcturus_get_current_clk_freq_by_table (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *value)
@@ -1475,6 +1513,8 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .print_clk_levels = arcturus_print_clk_levels, .force_clk_levels = arcturus_force_clk_levels, .read_sensor = arcturus_read_sensor, + .get_fan_speed_percent = arcturus_get_fan_speed_percent, + .get_fan_speed_rpm = arcturus_get_fan_speed_rpm, /* debug (internal used) */ .dump_pptable = arcturus_dump_pptable, };
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 22/30 drm/amd/powerplay: add missing arcturus feature maps
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Add missing feature maps for arcturus.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +5 -0
@@ -43,6 +43,8 @@#define MSG_MAP (msg, index) \ [SMU_MSG_##msg] = {1, (index)} +#define ARCTURUS_FEA_MAP (smu_feature, arcturus_feature) \ + [smu_feature] = {1, (arcturus_feature)}#define SMU_FEATURES_LOW_MASK 0x00000000FFFFFFFF#define SMU_FEATURES_LOW_SHIFT 0
@@ -125,12 +127,15 @@ static struct smu_11_0_cmn2aisc_mapping arcturus_feature_mask_map[SMU_FEATURE_COFEA_MAP (DPM_GFXCLK ),FEA_MAP (DPM_UCLK ),FEA_MAP (DPM_SOCCLK ), +FEA_MAP (DPM_FCLK ),FEA_MAP (DPM_MP0CLK ),FEA_MAP (DS_GFXCLK ),FEA_MAP (DS_SOCCLK ),FEA_MAP (DS_LCLK ), +FEA_MAP (DS_FCLK ),FEA_MAP (DS_UCLK ),FEA_MAP (GFX_ULV ), +ARCTURUS_FEA_MAP (SMU_FEATURE_VCN_PG_BIT ,FEATURE_DPM_VCN_BIT ),FEA_MAP (RSMU_SMN_CG ),FEA_MAP (PPT ), FEA_MAP(TDC),
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 23/30 drm/amd/powerplay: correct the bitmask used in arcturus
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Those bitmask prefixed by "SMU_" should be used.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +4 -4
@@ -403,7 +403,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* socclk */ single_dpm_table = &(dpm_table->soc_table); -if (smu_feature_is_enabled (smu,FEATURE_DPM_SOCCLK_BIT )) { +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) { ret =arcturus_set_single_dpm_table (smu, single_dpm_table,PPCLK_SOCCLK );if (ret) {
@@ -418,7 +418,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* gfxclk */ single_dpm_table = &(dpm_table->gfx_table); -if (smu_feature_is_enabled (smu,FEATURE_DPM_GFXCLK_BIT )) { +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) { ret =arcturus_set_single_dpm_table (smu, single_dpm_table,PPCLK_GFXCLK );if (ret) {
@@ -433,7 +433,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* memclk */ single_dpm_table = &(dpm_table->mem_table); -if (smu_feature_is_enabled (smu,FEATURE_DPM_UCLK_BIT )) { +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { ret =arcturus_set_single_dpm_table (smu, single_dpm_table,PPCLK_UCLK );if (ret) {
@@ -448,7 +448,7 @@ static int arcturus_set_default_dpm_table(struct smu_context *smu)/* fclk */ single_dpm_table = &(dpm_table->fclk_table); -if (smu_feature_is_enabled (smu,FEATURE_DPM_FCLK_BIT )) { +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_FCLK_BIT )) { ret =arcturus_set_single_dpm_table (smu, single_dpm_table,PPCLK_FCLK );if (ret) {
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 24/30 drm/amd/powerplay: remove redundancy debug log in smu
In reply to a message not in the archiveFrom: Kevin Wang <[email protected]>
remove redundacy debug log in smu.
eg:
[ 6897.969447] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6897.969448] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6897.969448] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6899.024114] amdgpu: [powerplay] Unsupported SMU message: 38 [ 6899.024151] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6899.024151] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6899.024152] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6900.078296] amdgpu: [powerplay] Unsupported SMU message: 38 [ 6900.078332] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6900.078332] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6900.078333] amdgpu: [powerplay] smu 11 clk dpm feature 1 is not enabled [ 6901.133230] amdgpu: [powerplay] Unsupported SMU message: 38
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -3
@@ -181,10 +181,8 @@ static int arcturus_get_smu_msg_index(struct smu_context *smc, uint32_t index)return -EINVAL ; mapping = arcturus_message_map[index]; -if (!(mapping.valid_mapping)) { -pr_warn ("Unsupported SMU message: %d\n" , index); +if (!(mapping.valid_mapping))return -EINVAL ; - }return mapping.map_to; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 25/30 drm/amd/powerplay: fix arcturus real-time clock frequency retrieval
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Make sure we can still get the accurate gfxclk/uclk/socclk frequency even on dpm disabled.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 30 +++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +29 -1
@@ -1053,7 +1053,35 @@ static int arcturus_get_current_clk_freq_by_table(struct smu_context *smu,if (ret)return ret; - *value = metrics.CurrClock[clk_id]; +switch (clk_id) { +case PPCLK_GFXCLK : +/* +* CurrClock[clk_id] can provide accurate +* output only when the dpm feature is enabled. +* We can use Average_* for dpm disabled case. +* But this is available for gfxclk/uclk/socclk. +*/ +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT )) + *value = metrics.CurrClock[PPCLK_GFXCLK ]; +else + *value = metrics.AverageGfxclkFrequency; +break ; +case PPCLK_UCLK : +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) + *value = metrics.CurrClock[PPCLK_UCLK ]; +else + *value = metrics.AverageUclkFrequency; +break ; +case PPCLK_SOCCLK : +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT )) + *value = metrics.CurrClock[PPCLK_SOCCLK ]; +else + *value = metrics.AverageSocclkFrequency; +break ; +default : + *value = metrics.CurrClock[clk_id]; +break ; + }return ret; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 26/30 drm/amd/powerplay: support UMD PSTATE settings on arcturus
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Enable arcturus UMD PSTATE support.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 229 ++++++++++++++++++- 1 file changed, 225 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +225 -4
@@ -664,15 +664,15 @@ static int arcturus_print_clk_levels(struct smu_context *smu, }static int arcturus_upload_dpm_level (struct smu_context *smu,bool max, -uint32_t feature_mask) +uint32_t feature_mask) { -struct arcturus_dpm_table *dpm_table;struct arcturus_single_dpm_table *single_dpm_table; +struct arcturus_dpm_table *dpm_table = + smu->smu_dpm.dpm_context;uint32_t freq;int ret =0 ; - dpm_table = smu->smu_dpm.dpm_context; -if (smu_feature_is_enabled (smu,FEATURE_DPM_GFXCLK_BIT ) && +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_GFXCLK_BIT ) && (feature_mask &FEATURE_DPM_GFXCLK_MASK )) { single_dpm_table = &(dpm_table->gfx_table); freq = max ? single_dpm_table->dpm_state.soft_max_level :
@@ -687,6 +687,36 @@ static int arcturus_upload_dpm_level(struct smu_context *smu, bool max, } } +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT ) && + (feature_mask &FEATURE_DPM_UCLK_MASK )) { + single_dpm_table = &(dpm_table->mem_table); + freq = max ? single_dpm_table->dpm_state.soft_max_level : + single_dpm_table->dpm_state.soft_min_level; + ret =smu_send_smc_msg_with_param (smu, + (max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq), + (PPCLK_UCLK <<16 ) | (freq &0xffff )); +if (ret) { +pr_err ("Failed to set soft %s memclk !\n" , + max ?"max" :"min" ); +return ret; + } + } + +if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_SOCCLK_BIT ) && + (feature_mask &FEATURE_DPM_SOCCLK_MASK )) { + single_dpm_table = &(dpm_table->soc_table); + freq = max ? single_dpm_table->dpm_state.soft_max_level : + single_dpm_table->dpm_state.soft_min_level; + ret =smu_send_smc_msg_with_param (smu, + (max ? SMU_MSG_SetSoftMaxByFreq : SMU_MSG_SetSoftMinByFreq), + (PPCLK_SOCCLK <<16 ) | (freq &0xffff )); +if (ret) { +pr_err ("Failed to set soft %s socclk !\n" , + max ?"max" :"min" ); +return ret; + } + } +return ret; }
@@ -1086,6 +1116,194 @@ static int arcturus_get_current_clk_freq_by_table(struct smu_context *smu,return ret; } +static uint32_t arcturus_find_lowest_dpm_level (struct arcturus_single_dpm_table *table) +{ +uint32_t i; + +for (i =0 ; i < table->count; i++) { +if (table->dpm_levels[i].enabled) +break ; + } +if (i >= table->count) { + i =0 ; + table->dpm_levels[i].enabled = true; + } + +return i; +} + +static uint32_t arcturus_find_highest_dpm_level (struct arcturus_single_dpm_table *table) +{ +int i =0 ; + +if (table->count <=0 ) { +pr_err ("[%s] DPM Table has no entry!" , __func__); +return 0 ; + } +if (table->count >MAX_DPM_NUMBER ) { +pr_err ("[%s] DPM Table has too many entries!" , __func__); +return MAX_DPM_NUMBER -1 ; + } + +for (i = table->count -1 ; i >=0 ; i--) { +if (table->dpm_levels[i].enabled) +break ; + } +if (i <0 ) { + i =0 ; + table->dpm_levels[i].enabled = true; + } + +return i; +} + + + +static int arcturus_force_dpm_limit_value (struct smu_context *smu,bool highest) +{ +struct arcturus_dpm_table *dpm_table = + (struct arcturus_dpm_table *)smu->smu_dpm.dpm_context; +uint32_t soft_level; +int ret =0 ; + +/* gfxclk */ +if (highest) + soft_level =arcturus_find_highest_dpm_level (&(dpm_table->gfx_table)); +else + soft_level =arcturus_find_lowest_dpm_level (&(dpm_table->gfx_table)); + + dpm_table->gfx_table.dpm_state.soft_min_level = + dpm_table->gfx_table.dpm_state.soft_max_level = + dpm_table->gfx_table.dpm_levels[soft_level].value; + +/* uclk */ +if (highest) + soft_level =arcturus_find_highest_dpm_level (&(dpm_table->mem_table)); +else + soft_level =arcturus_find_lowest_dpm_level (&(dpm_table->mem_table)); + + dpm_table->mem_table.dpm_state.soft_min_level = + dpm_table->mem_table.dpm_state.soft_max_level = + dpm_table->mem_table.dpm_levels[soft_level].value; + +/* socclk */ +if (highest) + soft_level =arcturus_find_highest_dpm_level (&(dpm_table->soc_table)); +else + soft_level =arcturus_find_lowest_dpm_level (&(dpm_table->soc_table)); + + dpm_table->soc_table.dpm_state.soft_min_level = + dpm_table->soc_table.dpm_state.soft_max_level = + dpm_table->soc_table.dpm_levels[soft_level].value; + + ret =arcturus_upload_dpm_level (smu, false,0xFFFFFFFF ); +if (ret) { +pr_err ("Failed to upload boot level to %s!\n" , + highest ?"highest" :"lowest" ); +return ret; + } + + ret =arcturus_upload_dpm_level (smu, true,0xFFFFFFFF ); +if (ret) { +pr_err ("Failed to upload dpm max level to %s!\n!" , + highest ?"highest" :"lowest" ); +return ret; + } + +return ret; +} + +static int arcturus_unforce_dpm_levels (struct smu_context *smu) +{ +struct arcturus_dpm_table *dpm_table = + (struct arcturus_dpm_table *)smu->smu_dpm.dpm_context; +uint32_t soft_min_level, soft_max_level; +int ret =0 ; + +/* gfxclk */ + soft_min_level =arcturus_find_lowest_dpm_level (&(dpm_table->gfx_table)); + soft_max_level =arcturus_find_highest_dpm_level (&(dpm_table->gfx_table)); + dpm_table->gfx_table.dpm_state.soft_min_level = + dpm_table->gfx_table.dpm_levels[soft_min_level].value; + dpm_table->gfx_table.dpm_state.soft_max_level = + dpm_table->gfx_table.dpm_levels[soft_max_level].value; + +/* uclk */ + soft_min_level =arcturus_find_lowest_dpm_level (&(dpm_table->mem_table)); + soft_max_level =arcturus_find_highest_dpm_level (&(dpm_table->mem_table)); + dpm_table->mem_table.dpm_state.soft_min_level = + dpm_table->gfx_table.dpm_levels[soft_min_level].value; + dpm_table->mem_table.dpm_state.soft_max_level = + dpm_table->gfx_table.dpm_levels[soft_max_level].value; + +/* socclk */ + soft_min_level =arcturus_find_lowest_dpm_level (&(dpm_table->soc_table)); + soft_max_level =arcturus_find_highest_dpm_level (&(dpm_table->soc_table)); + dpm_table->soc_table.dpm_state.soft_min_level = + dpm_table->soc_table.dpm_levels[soft_min_level].value; + dpm_table->soc_table.dpm_state.soft_max_level = + dpm_table->soc_table.dpm_levels[soft_max_level].value; + + ret =arcturus_upload_dpm_level (smu, false,0xFFFFFFFF ); +if (ret) { +pr_err ("Failed to upload DPM Bootup Levels!" ); +return ret; + } + + ret =arcturus_upload_dpm_level (smu, true,0xFFFFFFFF ); +if (ret) { +pr_err ("Failed to upload DPM Max Levels!" ); +return ret; + } + +return ret; +} + +static int +arcturus_get_profiling_clk_mask (struct smu_context *smu, +enum amd_dpm_forced_level level, +uint32_t *sclk_mask, +uint32_t *mclk_mask, +uint32_t *soc_mask) +{ +struct arcturus_dpm_table *dpm_table = + (struct arcturus_dpm_table *)smu->smu_dpm.dpm_context; +struct arcturus_single_dpm_table *gfx_dpm_table; +struct arcturus_single_dpm_table *mem_dpm_table; +struct arcturus_single_dpm_table *soc_dpm_table; + +if (!smu->smu_dpm.dpm_context) +return -EINVAL ; + + gfx_dpm_table = &dpm_table->gfx_table; + mem_dpm_table = &dpm_table->mem_table; + soc_dpm_table = &dpm_table->soc_table; + + *sclk_mask =0 ; + *mclk_mask =0 ; + *soc_mask =0 ; + +if (gfx_dpm_table->count >ARCTURUS_UMD_PSTATE_GFXCLK_LEVEL && + mem_dpm_table->count >ARCTURUS_UMD_PSTATE_MCLK_LEVEL && + soc_dpm_table->count >ARCTURUS_UMD_PSTATE_SOCCLK_LEVEL ) { + *sclk_mask =ARCTURUS_UMD_PSTATE_GFXCLK_LEVEL ; + *mclk_mask =ARCTURUS_UMD_PSTATE_MCLK_LEVEL ; + *soc_mask =ARCTURUS_UMD_PSTATE_SOCCLK_LEVEL ; + } + +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) { + *sclk_mask =0 ; + }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) { + *mclk_mask =0 ; + }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) { + *sclk_mask = gfx_dpm_table->count -1 ; + *mclk_mask = mem_dpm_table->count -1 ; + *soc_mask = soc_dpm_table->count -1 ; + } + +return 0 ; +} +static void arcturus_dump_pptable (struct smu_context *smu) {struct smu_table_context *table_context = &smu->smu_table;
@@ -1546,6 +1764,9 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .read_sensor = arcturus_read_sensor, .get_fan_speed_percent = arcturus_get_fan_speed_percent, .get_fan_speed_rpm = arcturus_get_fan_speed_rpm, + .force_dpm_limit_value = arcturus_force_dpm_limit_value, + .unforce_dpm_levels = arcturus_unforce_dpm_levels, + .get_profiling_clk_mask = arcturus_get_profiling_clk_mask, /* debug (internal used) */ .dump_pptable = arcturus_dump_pptable, };
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 27/30 drm/amd/powerplay: correct arcturus current clock level calculation
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
There may be 1Mhz delta between target and actual frequency. That should be taken into consideration for current level check.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 35 +++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +27 -8
@@ -51,6 +51,9 @@#define SMU_FEATURES_HIGH_MASK 0xFFFFFFFF00000000#define SMU_FEATURES_HIGH_SHIFT 32 +/* possible frequency drift (1Mhz) */ +#define EPSILON 1 +static struct smu_11_0_cmn2aisc_mapping arcturus_message_map[SMU_MSG_MAX_COUNT ] = {MSG_MAP (TestMessage, PPSMC_MSG_TestMessage),MSG_MAP (GetSmuVersion, PPSMC_MSG_GetSmuVersion),
@@ -565,6 +568,12 @@ static int arcturus_get_clk_table(struct smu_context *smu,return 0 ; } +static int arcturus_freqs_in_same_level (int32_t frequency1, +int32_t frequency2) +{ +return (abs (frequency1 - frequency2) <=EPSILON ); +} +static int arcturus_print_clk_levels (struct smu_context *smu,enum smu_clk_type type,char *buf) {
@@ -595,8 +604,9 @@ static int arcturus_print_clk_levels(struct smu_context *smu,for (i =0 ; i < clocks.num_levels; i++) size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , - (clocks.data[i].clocks_in_khz == now *10 ) - ?"*" :"" ); +arcturus_freqs_in_same_level ( + clocks.data[i].clocks_in_khz /1000 , + now /100 ) ?"*" :"" );break ;case SMU_MCLK :
@@ -616,8 +626,9 @@ static int arcturus_print_clk_levels(struct smu_context *smu,for (i =0 ; i < clocks.num_levels; i++) size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , - (clocks.data[i].clocks_in_khz == now *10 ) - ?"*" :"" ); +arcturus_freqs_in_same_level ( + clocks.data[i].clocks_in_khz /1000 , + now /100 ) ?"*" :"" );break ;case SMU_SOCCLK :
@@ -637,8 +648,9 @@ static int arcturus_print_clk_levels(struct smu_context *smu,for (i =0 ; i < clocks.num_levels; i++) size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , - (clocks.data[i].clocks_in_khz == now *10 ) - ?"*" :"" ); +arcturus_freqs_in_same_level ( + clocks.data[i].clocks_in_khz /1000 , + now /100 ) ?"*" :"" );break ;case SMU_FCLK :
@@ -649,11 +661,18 @@ static int arcturus_print_clk_levels(struct smu_context *smu, } single_dpm_table = &(dpm_table->fclk_table); + ret =arcturus_get_clk_table (smu, &clocks, single_dpm_table); +if (ret) { +pr_err ("Attempt to get fclk levels Failed!" ); +return ret; + } +for (i =0 ; i < single_dpm_table->count; i++) size +=sprintf (buf + size,"%d: %uMhz %s\n" , i, single_dpm_table->dpm_levels[i].value, - (single_dpm_table->dpm_levels[i].value == now /100 ) - ?"*" :"" ); +arcturus_freqs_in_same_level ( + clocks.data[i].clocks_in_khz /1000 , + now /100 ) ?"*" :"" );break ;default :
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 28/30 drm/amd/powerplay: make power limit retrieval as asic specific
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
The power limit retrieval should be done per asic. Since we may need to lookup in the pptable and that's really asic specific.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 51 +++++++++++++++++ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 51 +++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 55 ++++--------------- 5 files changed, 116 insertions(+), 47 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
@@ -1136,7 +1136,7 @@ static int smu_smc_table_hw_init(struct smu_context *smu,if (ret)return ret; - ret =smu_get_power_limit (smu, &smu->default_power_limit, false); + ret =smu_get_power_limit (smu, &smu->default_power_limit, true);if (ret)return ret; }
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +51 -0
63 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -2
@@ -447,6 +447,7 @@ struct pptable_funcs {int (*set_default_od_settings)(struct smu_context *smu,bool initialize);int (*set_performance_level)(struct smu_context *smu,enum amd_dpm_forced_level level);void (*dump_pptable)(struct smu_context *smu); +int (*get_power_limit)(struct smu_context *smu,uint32_t *limit,bool asic_default); };struct smu_funcs
@@ -479,7 +480,6 @@ struct smu_funcsint (*set_allowed_mask)(struct smu_context *smu);int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num);int (*notify_display_change)(struct smu_context *smu); -int (*get_power_limit)(struct smu_context *smu,uint32_t *limit,bool def);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);
@@ -608,7 +608,7 @@ struct smu_funcs#define smu_set_default_od8_settings (smu) \ ((smu)->ppt_funcs->set_default_od8_settings ? (smu)->ppt_funcs->set_default_od8_settings((smu)) : 0)#define smu_get_power_limit (smu, limit, def) \ - ((smu)->funcs->get_power_limit ? (smu)->funcs->get_power_limit((smu), (limit), (def)) : 0) + ((smu)->ppt_funcs->get_power_limit ? (smu)->ppt_funcs->get_power_limit((smu), (limit), (def)) : 0)#define smu_set_power_limit (smu, limit) \ ((smu)->funcs->set_power_limit ? (smu)->funcs->set_power_limit((smu), (limit)) : 0)#define smu_get_current_clk_freq (smu, clk_id, value) \
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +51 -0
63 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +11 -44
82 lines not on this page · raw message
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 29/30 drm/amdgpu: correct irq type used for sdma ecc
In reply to a message not in the archiveFrom: Hawking Zhang <[email protected]>
we should pass irq type, instead of irq client id, to irq_get/put interface
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +2 -2
@@ -1702,7 +1702,7 @@ static int sdma_v4_0_late_init(void *handle) resume:for (i =0 ; i < adev->sdma.num_instances; i++) { r =amdgpu_irq_get (adev, &adev->sdma.ecc_irq, -sdma_v4_0_seq_to_irq_id (i)); +AMDGPU_SDMA_IRQ_INSTANCE0 + i);if (r) goto irq; }
@@ -1846,7 +1846,7 @@ static int sdma_v4_0_hw_fini(void *handle)for (i =0 ; i < adev->sdma.num_instances; i++) {amdgpu_irq_put (adev, &adev->sdma.ecc_irq, -sdma_v4_0_seq_to_irq_id (i)); +AMDGPU_SDMA_IRQ_INSTANCE0 + i); }sdma_v4_0_ctx_switch_enable (adev, false);
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 30/30 drm/amd/powerplay: determine the features to enable by pptable only
In reply to a message not in the archiveFrom: Evan Quan <[email protected]>
Per current logics, the features to enable are determined together by driver and pptable. This is not efficient in co-debug with firmware team.
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2 -4
@@ -327,7 +327,6 @@ static int arcturus_allocate_dpm_context(struct smu_context *smu)return 0 ; } -#define FEATURE_MASK (feature) (1ULL << feature)static int arcturus_get_allowed_feature_mask (struct smu_context *smu,uint32_t *feature_mask,uint32_t num)
@@ -335,9 +334,8 @@ arcturus_get_allowed_feature_mask(struct smu_context *smu,if (num >2 )return -EINVAL ; -memset (feature_mask,0 ,sizeof (uint32_t ) * num); - - *(uint64_t *)feature_mask |=FEATURE_MASK (FEATURE_DPM_PREFETCHER_BIT ); +/* pptable will handle the features to enable */ +memset (feature_mask,0xFF ,sizeof (uint32_t ) * num);return 0 ; }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx