drm/amdgpu: Add ReadSerial defines for Arcturus
Subsystems (2)
PATCH 1/2 drm/amdgpu: Add ReadSerial defines for Arcturus
Add the ReadSerial definitions for Arcturus to the arcturus_ppsmc.h header for use with unique_id
Unrevert: Supported in SMU 54.23, update values to match SMU spec
--- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 2 ++ drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h | 3 +++ 2 files changed, 5 insertions(+)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +2 -0
@@ -129,6 +129,8 @@ static struct smu_11_0_msg_mapping arcturus_message_map[SMU_MSG_MAX_COUNT] = {MSG_MAP (SetMemoryChannelEnable, PPSMC_MSG_SetMemoryChannelEnable,0 ),MSG_MAP (DFCstateControl, PPSMC_MSG_DFCstateControl,0 ),MSG_MAP (GmiPwrDnControl, PPSMC_MSG_GmiPwrDnControl,0 ), +MSG_MAP (ReadSerialNumTop32, PPSMC_MSG_ReadSerialNumTop32,1 ), + MSG_MAP(ReadSerialNumBottom32, PPSMC_MSG_ReadSerialNumBottom32, 1), }; static struct smu_11_0_cmn2aisc_mapping arcturus_clk_map[SMU_CLK_COUNT] = {
drivers/gpu/drm/amd/powerplay/inc/arcturus_ppsmc.h +3 -0
@@ -117,6 +117,9 @@#define PPSMC_MSG_GmiPwrDnControl 0x3D#define PPSMC_Message_Count 0x3E +#define PPSMC_MSG_ReadSerialNumTop32 0x40 +#define PPSMC_MSG_ReadSerialNumBottom32 0x41 +typedef uint32_t PPSMC_Result ;typedef uint32_t PPSMC_Msg ;#pragma pack(pop)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: Add unique_id and serial_number for Arcturus v2
Add support for unique_id and serial_number, as these are now the same value, and will be for future ASICs as well.
v2: Explicitly create unique_id only for VG10/20/ARC
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 ++- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 32 +++++++++++++++++++ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 ++ 5 files changed, 40 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +3 -1
@@ -1940,7 +1940,9 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_if (adev->flags &AMD_IS_APU ) *states =ATTR_STATE_UNSUPPORTED ; }else if (DEVICE_ATTR_IS (unique_id)) { -if (!adev->unique_id) +if (asic_type !=CHIP_VEGA10 && + asic_type !=CHIP_VEGA20 && + asic_type !=CHIP_ARCTURUS ) *states =ATTR_STATE_UNSUPPORTED ; }else if (DEVICE_ATTR_IS (pp_features)) {if (adev->flags &AMD_IS_APU || asic_type <CHIP_VEGA10 )
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2 -0
@@ -793,6 +793,8 @@ static int smu_late_init(void *handle)if (!smu->pm_enabled)return 0 ; +smu_set_unique_id (smu); + smu_handle_task(&adev->smu, smu->smu_dpm.dpm_level, AMD_PP_TASK_COMPLETE_INIT,
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +32 -0
@@ -2262,6 +2262,37 @@ static void arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)i2c_del_adapter (control); } +static void arcturus_set_unique_id (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t top32, bottom32, smu_version, size; +char sn[16 ]; +uint64_t id; + +if (smu_get_smc_version (smu,NULL , &smu_version)) { +pr_warn ("Failed to get smu version, cannot get unique_id or serial_number\n" ); +return ; + } + +/* PPSMC_MSG_ReadSerial* is supported by 54.23.0 and onwards */ +if (smu_version <0x361700 ) { +pr_warn ("ReadSerial is only supported by PMFW 54.23.0 and onwards\n" ); +return ; + } + +/* Get the SN to turn into a Unique ID */ +smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumTop32, &top32); +smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumBottom32, &bottom32); + + id = ((uint64_t )bottom32 <<32 ) | top32; + adev->unique_id = id; +/* For Arcturus-and-later, unique_id == serial_number, so convert it to a +* 16-digit HEX string for convenience and backwards-compatibility +*/ + size =sprintf (sn,"%llx" , id); +memcpy (adev->serial, &sn, size); +} +static bool arcturus_is_baco_supported (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;
@@ -2416,6 +2447,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .dpm_set_uvd_enable = arcturus_dpm_set_uvd_enable, .i2c_eeprom_init = arcturus_i2c_eeprom_control_init, .i2c_eeprom_fini = arcturus_i2c_eeprom_control_fini, + .set_unique_id = arcturus_set_unique_id, .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, .init_smc_tables = smu_v11_0_init_smc_tables,
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -0
@@ -495,6 +495,7 @@ struct pptable_funcs {int (*update_pcie_parameters)(struct smu_context *smu,uint32_t pcie_gen_cap,uint32_t pcie_width_cap);int (*i2c_eeprom_init)(struct i2c_adapter *control);void (*i2c_eeprom_fini)(struct i2c_adapter *control); +void (*set_unique_id)(struct smu_context *smu);int (*get_dpm_clock_table)(struct smu_context *smu,struct dpm_clocks *clock_table);int (*init_microcode)(struct smu_context *smu);int (*load_microcode)(struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/smu_internal.h +2 -0
@@ -218,6 +218,8 @@ static inline int smu_send_smc_msg(struct smu_context *smu, enum smu_message_typ ((smu)->ppt_funcs->i2c_eeprom_init ? (smu)->ppt_funcs->i2c_eeprom_init((control)) : 0)#define smu_i2c_eeprom_fini (smu, control) \ ((smu)->ppt_funcs->i2c_eeprom_fini ? (smu)->ppt_funcs->i2c_eeprom_fini((control)) : 0) +#define smu_set_unique_id (smu) \ + ((smu)->ppt_funcs->set_unique_id ? (smu)->ppt_funcs->set_unique_id((smu)) : 0)#define smu_log_thermal_throttling (smu) \ ((smu)->ppt_funcs->log_thermal_throttling_event ? (smu)->ppt_funcs->log_thermal_throttling_event((smu)) : 0)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu: Add unique_id and serial_number for Arcturus v2
Quoted 99 lines · Kent Russell
Add support for
unique_idandserial_number, as these are now the same value, and will be for future ASICs as well.v2: Explicitly create
unique_idonly for VG10/20/ARCSigned-off-by Kent Russell <[email protected]>Change-Id I3b036a38b19cd84025399b0706b2dad9b7aff713--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 ++- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 32 +++++++++++++++++++ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 ++ 5 files changed, 40 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +3
-1@@ -1940,7 +1940,9 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_if (adev->flags &AMD_IS_APU ) *states =ATTR_STATE_UNSUPPORTED ; }else if (DEVICE_ATTR_IS (unique_id)) { -if (!adev->unique_id) +if (asic_type !=CHIP_VEGA10 && + asic_type !=CHIP_VEGA20 && + asic_type !=CHIP_ARCTURUS ) *states =ATTR_STATE_UNSUPPORTED ; }else if (DEVICE_ATTR_IS (pp_features)) {if (adev->flags &AMD_IS_APU || asic_type <CHIP_VEGA10 )drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2
-0@@ -793,6 +793,8 @@ static int smu_late_init(void *handle)if (!smu->pm_enabled)return 0 ; +smu_set_unique_id (smu); + smu_handle_task(&adev->smu, smu->smu_dpm.dpm_level, AMD_PP_TASK_COMPLETE_INIT,drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +32
-0@@ -2262,6 +2262,37 @@ static void arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)i2c_del_adapter (control); } +static void arcturus_set_unique_id (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t top32, bottom32, smu_version, size; +char sn[16 ]; +uint64_t id; + +if (smu_get_smc_version (smu,NULL , &smu_version)) { +pr_warn ("Failed to get smu version, cannot get unique_id or serial_number\n" ); +return ; + } + +/* PPSMC_MSG_ReadSerial* is supported by 54.23.0 and onwards */ +if (smu_version <0x361700 ) { +pr_warn ("ReadSerial is only supported by PMFW 54.23.0 and onwards\n" ); +return ; + } + +/* Get the SN to turn into a Unique ID */ +smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumTop32, &top32); +smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumBottom32, &bottom32); + + id = ((uint64_t )bottom32 <<32 ) | top32; + adev->unique_id = id; +/* For Arcturus-and-later, unique_id == serial_number, so convert it to a +* 16-digit HEX string for convenience and backwards-compatibility +*/ + size =sprintf (sn,"%llx" , id); +memcpy (adev->serial, &sn, size); +} +static bool arcturus_is_baco_supported (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;@@ -2416,6 +2447,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .dpm_set_uvd_enable = arcturus_dpm_set_uvd_enable, .i2c_eeprom_init = arcturus_i2c_eeprom_control_init, .i2c_eeprom_fini = arcturus_i2c_eeprom_control_fini, + .set_unique_id = arcturus_set_unique_id, .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, .init_smc_tables = smu_v11_0_init_smc_tables,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h struct pptable_funcs { · line 498
Quoted 4 lines
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-0@@ -495,6 +495,7 @@ struct pptable_funcs {int (*update_pcie_parameters)(struct smu_context *smu,uint32_t pcie_gen_cap,uint32_t pcie_width_cap);int (*i2c_eeprom_init)(struct i2c_adapter *control);void (*i2c_eeprom_fini)(struct i2c_adapter *control); +void (*set_unique_id)(struct smu_context *smu);
As I mentioned in my previous email, I think these functions would be better worded as "get_unique_id" since we are fetching it from the hardware not storing it to the hardware.
Alex
Quoted 19 lines
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0int (*get_dpm_clock_table)(struct smu_context *smu,struct dpm_clocks *clock_table);int (*init_microcode)(struct smu_context *smu);int (*load_microcode)(struct smu_context *smu);drivers/gpu/drm/amd/powerplay/smu_internal.h +2
-1@@ -218,6 +218,8 @@ static inline int smu_send_smc_msg(struct smu_context *smu, enum smu_message_typ ((smu)->ppt_funcs->i2c_eeprom_init ? (smu)->ppt_funcs->i2c_eeprom_init((control)) : 0)#define smu_i2c_eeprom_fini (smu, control) \ ((smu)->ppt_funcs->i2c_eeprom_fini ? (smu)->ppt_funcs->i2c_eeprom_fini((control)) : 0) +#define smu_set_unique_id (smu) \ + ((smu)->ppt_funcs->set_unique_id ? (smu)->ppt_funcs->set_unique_id((smu)) : 0)#define smu_log_thermal_throttling (smu) \ ((smu)->ppt_funcs->log_thermal_throttling_event ? (smu)->ppt_funcs->log_thermal_throttling_event((smu)) : 0) --2.17.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amdgpu: Add unique_id and serial_number for Arcturus v2
[AMD Public Use]
Quoted 117 lines
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Tuesday, June 2, 2020 10:45 AM
To: Russell, Kent <[email protected]>
Cc: amd-gfx list <[email protected]>
Subject: Re: [PATCH 2/2] drm/amdgpu: Addunique_idandserial_numberfor Arcturus v2Quoted 4 lines · Kent Russell
Add support for
unique_idandserial_number, as these are now the same value, and will be for future ASICs as well.Quoted 8 lines
v2: Explicitly create
unique_idonly for VG10/20/ARCSigned-off-by Kent Russell <[email protected]>Change-Id I3b036a38b19cd84025399b0706b2dad9b7aff713--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 4 ++- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 ++ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 32+++++++++++++++++++
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c static int default_attr_update(struct
Quoted 10 lines
.../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + drivers/gpu/drm/amd/powerplay/smu_internal.h | 2 ++ 5 files changed, 40 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +0
-0@@ -1940,7 +1940,9 @@ static int default_attr_update(struct
amdgpu_device*adev, structamdgpu_device_drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static void
Quoted 30 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +3
-1if (adev->flags &AMD_IS_APU ) *states =ATTR_STATE_UNSUPPORTED ; } else if (DEVICE_ATTR_IS(unique_id)) { -if (!adev->unique_id) +if (asic_type !=CHIP_VEGA10 && + asic_type !=CHIP_VEGA20 && + asic_type !=CHIP_ARCTURUS ) *states =ATTR_STATE_UNSUPPORTED ; } else if (DEVICE_ATTR_IS(pp_features)) { if (adev->flags & AMD_IS_APU || asic_type <
CHIP_VEGA10) diff --gita/drivers/gpu/drm/amd/powerplay/amdgpu_smu.cb/drivers/gpu/drm/amd/powerplay/amdgpu_smu.c
index5294aa7cdde1..7946fd8444a3100644drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2
-0@@ -793,6 +793,8 @@ static int smu_late_init(void *handle)if (!smu->pm_enabled)return 0 ; +smu_set_unique_id (smu); + smu_handle_task(&adev->smu, smu->smu_dpm.dpm_level, AMD_PP_TASK_COMPLETE_INIT, diff --git
a/drivers/gpu/drm/amd/powerplay/arcturus_ppt.cb/drivers/gpu/drm/amd/powerplay/arcturus_ppt.c
indexd66ac7457574..855e609650d9100644drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0
-0@@ -2262,6 +2262,37 @@ static void
arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static void arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)
Quoted 11 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +8
-0i2c_del_adapter (control); } +static void arcturus_set_unique_id (struct smu_context *smu) { +struct amdgpu_device *adev = smu->adev; +uint32_t top32, bottom32, smu_version, size; +char sn[16 ]; +uint64_t id; + +if (smu_get_smc_version (smu,NULL , &smu_version)) { + pr_warn("Failed to get smu version, cannot get unique_id orserial_number\n");
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static void arcturus_i2c_eeprom_control_fini(struct i2c_adapter *control)
Quoted 6 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +6
-0+return ; + } + +/* PPSMC_MSG_ReadSerial* is supported by 54.23.0 and onwards */ +if (smu_version <0x361700 ) { + pr_warn("ReadSerial is only supported by PMFW 54.23.0 andonwards\n");
Quoted 32 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +17
-0+return ; + } + +/* Get the SN to turn into a Unique ID */ +smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumTop32, &top32); +smu_send_smc_msg (smu, SMU_MSG_ReadSerialNumBottom32, + &bottom32); + + id = ((uint64_t )bottom32 <<32 ) | top32; + adev->unique_id = id; +/* For Arcturus-and-later, unique_id == serial_number, so convert it to a +* 16-digit HEX string for convenience and backwards-compatibility +*/ + size =sprintf (sn,"%llx" , id); +memcpy (adev->serial, &sn, size); } +static bool arcturus_is_baco_supported (struct smu_context *smu) { struct amdgpu_device *adev = smu->adev; @@ -2416,6 +2447,7 @@static const struct pptable_funcs arcturus_ppt_funcs = { .dpm_set_uvd_enable = arcturus_dpm_set_uvd_enable, .i2c_eeprom_init = arcturus_i2c_eeprom_control_init, .i2c_eeprom_fini = arcturus_i2c_eeprom_control_fini, + .set_unique_id = arcturus_set_unique_id, .init_microcode = smu_v11_0_init_microcode, .load_microcode = smu_v11_0_load_microcode, .init_smc_tables = smu_v11_0_init_smc_tables, diff --git
a/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.hb/drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h
index5bb1ac821aeb..bfa5211de079100644drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h struct pptable_funcs { · line 495
Quoted 1 line
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0@@ -495,6 +495,7 @@ struct pptable_funcs { int (*update_pcie_parameters)(struct smu_context *smu, uint32_t
pcie_gen_cap,uint32_tpcie_width_cap);
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h struct pptable_funcs { · line 498
Quoted 3 lines
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-0int (*i2c_eeprom_init)(struct i2c_adapter *control);void (*i2c_eeprom_fini)(struct i2c_adapter *control); +void (*set_unique_id)(struct smu_context *smu);As I mentioned in my previous email, I think these functions would be better worded as "
get_unique_id" since we are fetching it from the hardware not storing it to the hardware.
Sorry, I missed that in the previous e-mail. I'll do that now. I was torn between get and set, since it gets it from the SMU, but it sets the variable, so that decision helps for clarity. Thanks!
Kent
Quoted 36 lines
Alex
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h struct pptable_funcs { · line 499
Quoted 1 line
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0int (*get_dpm_clock_table)(struct smu_context *smu, struct dpm_clocks
*clock_table);drivers/gpu/drm/amd/powerplay/smu_internal.h static inline int smu_send_smc_msg(struct
Quoted 8 lines
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0int (*init_microcode)(struct smu_context *smu); int (*load_microcode)(struct smu_context *smu); diff --git
a/drivers/gpu/drm/amd/powerplay/smu_internal.hb/drivers/gpu/drm/amd/powerplay/smu_internal.h
index6c59eeef2590..125d976215a6100644drivers/gpu/drm/amd/powerplay/smu_internal.h +0
-0@@ -218,6 +218,8 @@ static inline int smu_send_smc_msg(struct
smu_context*smu, enumsmu_message_typQuoted 2 lines
drivers/gpu/drm/amd/powerplay/smu_internal.h +0
-0((smu)->ppt_funcs->i2c_eeprom_init ?(smu)->ppt_funcs->i2c_eeprom_init((control)) : 0) #define
smu_i2c_eeprom_fini(smu, control)\Quoted 12 lines
((smu)->ppt_funcs->i2c_eeprom_fini ?(smu)->ppt_funcs->i2c_eeprom_fini((control)) : 0)
drivers/gpu/drm/amd/powerplay/smu_internal.h +3
-0+#define smu_set_unique_id (smu) \ + ((smu)->ppt_funcs->set_unique_id ? +(smu)->ppt_funcs->set_unique_id((smu)) : 0)#define smu_log_thermal_throttling (smu) \ ((smu)->ppt_funcs->log_thermal_throttling_event ?(smu)->ppt_funcs->log_thermal_throttling_event((smu)) : 0) --
2.17.1Quoted 5 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cke
Quoted 1 line
Quoted 6 lines
nt.russell%40amd.com%7C06d9eed695b04346a48408d8070397ef%7C3dd896 1fe488
Quoted 1 line
4e608e11a82d994e183d%7C0%7C0%7C637267059312215967&sdata=Se XIr7DB5A
Quoted 1 line
Vc%2Fk%2B6bFd448Ydvt%2F%2BKKWJHMd6MkQLL1I%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx