Commit 6edc8f8a authored by Stanley.Yang's avatar Stanley.Yang Committed by Alex Deucher
Browse files

drm/amd/pm: Update smu driver interface for aldebaran 



update smu driver if version to 0x08 to avoid mismatch log
A version mismatch can still happen with an older FW

Signed-off-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 92020e81

drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h

+17 −1
Original line number Diff line number Diff line
@@ -140,6 +140,8 @@ 


#define MAX_SW_I2C_COMMANDS                24



#define ALDEBARAN_UMC_CHANNEL_NUM    32



typedef enum {

  I2C_CONTROLLER_PORT_0, //CKSVII2C0

  I2C_CONTROLLER_PORT_1, //CKSVII2C1
@@ -507,6 +509,19 @@ typedef struct { 
  uint32_t MmHubPadding[8]; // SMU internal use

} AvfsDebugTable_t;



typedef struct {

	uint64_t mca_umc_status;

	uint64_t mca_umc_addr;

	uint16_t ce_count_lo_chip;

	uint16_t ce_count_hi_chip;



	uint32_t eccPadding;

} EccInfo_t;



typedef struct {

	EccInfo_t  EccInfo[ALDEBARAN_UMC_CHANNEL_NUM];

} EccInfoTable_t;



// These defines are used with the following messages:

// SMC_MSG_TransferTableDram2Smu

// SMC_MSG_TransferTableSmu2Dram
@@ -517,6 +532,7 @@ typedef struct { 
#define TABLE_SMU_METRICS             4

#define TABLE_DRIVER_SMU_CONFIG       5

#define TABLE_I2C_COMMANDS            6

#define TABLE_COUNT                   7

#define TABLE_ECCINFO                 7

#define TABLE_COUNT                   8



#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#define SMU13_DRIVER_IF_VERSION_INV 0xFFFFFFFF

#define SMU13_DRIVER_IF_VERSION_YELLOW_CARP 0x04

#define SMU13_DRIVER_IF_VERSION_ALDE 0x07

#define SMU13_DRIVER_IF_VERSION_ALDE 0x08



#define SMU13_MODE1_RESET_WAIT_TIME_IN_MS 500  //500ms