[PATCH Review 1/1] drm/amdgpu: fix smu not match warning

[Quan, Evan]

[AMD Official Use Only]

Reviewed-by: Evan Quan <evan.quan at amd.com>

> -----Original Message-----
> From: Stanley.Yang <Stanley.Yang at amd.com>
> Sent: Tuesday, November 16, 2021 4:03 PM
> To: amd-gfx at lists.freedesktop.org; Zhang, Hawking
> <Hawking.Zhang at amd.com>; Clements, John <John.Clements at amd.com>;
> Zhou1, Tao <Tao.Zhou1 at amd.com>; Quan, Evan <Evan.Quan at amd.com>
> Cc: Yang, Stanley <Stanley.Yang at amd.com>
> Subject: [PATCH Review 1/1] drm/amdgpu: fix smu not match warning
> 
> update smu driver if and version to avoid mismatch log
> 
> v2:
>     update smu driver interface
> 
> Change-Id: I97f2bc4ed9a9cba313b744e2ff6812c90b244935
> Signed-off-by: Stanley.Yang <Stanley.Yang at amd.com>
> ---
>  .../drm/amd/pm/inc/smu13_driver_if_aldebaran.h | 18
> +++++++++++++++++-
>  drivers/gpu/drm/amd/pm/inc/smu_v13_0.h         |  2 +-
>  2 files changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h
> b/drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h
> index a017983ff1fa..0f67c56c2863 100644
> --- a/drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h
> +++ b/drivers/gpu/drm/amd/pm/inc/smu13_driver_if_aldebaran.h
> @@ -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
> diff --git a/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
> b/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
> index e5d3b0d1a032..2e35885c7287 100644
> --- a/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
> +++ b/drivers/gpu/drm/amd/pm/inc/smu_v13_0.h
> @@ -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
> 
>  /* MP Apertures */
>  #define MP0_Public			0x03800000
> --
> 2.17.1