* [PATCH Review 1/1] drm/amdgpu: fix smu not match warning
@ 2021-11-16 8:01 Stanley.Yang
0 siblings, 0 replies; 6+ messages in thread
From: Stanley.Yang @ 2021-11-16 8:01 UTC (permalink / raw)
To: amd-gfx, Hawking.Zhang, John.Clements, Tao.Zhou1, Evan.Quan; +Cc: Stanley.Yang
update smu driver if version to avoid mismatch log
Change-Id: I97f2bc4ed9a9cba313b744e2ff6812c90b244935
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
---
drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH Review 1/1] drm/amdgpu: fix smu not match warning
@ 2021-11-16 8:02 Stanley.Yang
2021-11-16 8:31 ` Lazar, Lijo
2021-11-17 1:51 ` Quan, Evan
0 siblings, 2 replies; 6+ messages in thread
From: Stanley.Yang @ 2021-11-16 8:02 UTC (permalink / raw)
To: amd-gfx, Hawking.Zhang, John.Clements, Tao.Zhou1, Evan.Quan; +Cc: Stanley.Yang
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@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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH Review 1/1] drm/amdgpu: fix smu not match warning
2021-11-16 8:02 Stanley.Yang
@ 2021-11-16 8:31 ` Lazar, Lijo
2021-11-17 1:51 ` Quan, Evan
1 sibling, 0 replies; 6+ messages in thread
From: Lazar, Lijo @ 2021-11-16 8:31 UTC (permalink / raw)
To: Stanley.Yang, amd-gfx, Hawking.Zhang, John.Clements, Tao.Zhou1,
Evan.Quan
On 11/16/2021 1:32 PM, Stanley.Yang wrote:
> update smu driver if and version to avoid mismatch log
>
> v2:
> update smu driver interface
A version mismatch can still happen with an older FW. I think it's
better to change the patch subject also as - "Update smu driver
interface for aldebaran" and provide the version number in comments.
With that changed,
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Thanks,
Lijo
>
> Change-Id: I97f2bc4ed9a9cba313b744e2ff6812c90b244935
> Signed-off-by: Stanley.Yang <Stanley.Yang@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
>
^ permalink raw reply [flat|nested] 6+ messages in thread* RE: [PATCH Review 1/1] drm/amdgpu: fix smu not match warning
2021-11-16 8:02 Stanley.Yang
2021-11-16 8:31 ` Lazar, Lijo
@ 2021-11-17 1:51 ` Quan, Evan
1 sibling, 0 replies; 6+ messages in thread
From: Quan, Evan @ 2021-11-17 1:51 UTC (permalink / raw)
To: Yang, Stanley, amd-gfx@lists.freedesktop.org, Zhang, Hawking,
Clements, John, Zhou1, Tao
Cc: Yang, Stanley
[AMD Official Use Only]
Reviewed-by: Evan Quan <evan.quan@amd.com>
> -----Original Message-----
> From: Stanley.Yang <Stanley.Yang@amd.com>
> Sent: Tuesday, November 16, 2021 4:03 PM
> To: amd-gfx@lists.freedesktop.org; Zhang, Hawking
> <Hawking.Zhang@amd.com>; Clements, John <John.Clements@amd.com>;
> Zhou1, Tao <Tao.Zhou1@amd.com>; Quan, Evan <Evan.Quan@amd.com>
> Cc: Yang, Stanley <Stanley.Yang@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@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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH Review 1/1] drm/amdgpu: fix smu not match warning
@ 2021-11-16 7:43 Stanley.Yang
2021-11-16 7:49 ` Lazar, Lijo
0 siblings, 1 reply; 6+ messages in thread
From: Stanley.Yang @ 2021-11-16 7:43 UTC (permalink / raw)
To: amd-gfx, Hawking.Zhang, John.Clements, Tao.Zhou1, Evan.Quan; +Cc: Stanley.Yang
update smu driver if version to avoid mismatch log
Change-Id: I97f2bc4ed9a9cba313b744e2ff6812c90b244935
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
---
drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH Review 1/1] drm/amdgpu: fix smu not match warning
2021-11-16 7:43 Stanley.Yang
@ 2021-11-16 7:49 ` Lazar, Lijo
0 siblings, 0 replies; 6+ messages in thread
From: Lazar, Lijo @ 2021-11-16 7:49 UTC (permalink / raw)
To: Stanley.Yang, amd-gfx, Hawking.Zhang, John.Clements, Tao.Zhou1,
Evan.Quan
On 11/16/2021 1:13 PM, Stanley.Yang wrote:
> update smu driver if version to avoid mismatch log
>
> Change-Id: I97f2bc4ed9a9cba313b744e2ff6812c90b244935
> Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
> ---
> drivers/gpu/drm/amd/pm/inc/smu_v13_0.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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
>
This is not an independent change, it should go along with a change in
interface file. Please post the changes in smu13_driver_if_aldebaran.h
along with this as one patch.
Thanks,
Lijo
> /* MP Apertures */
> #define MP0_Public 0x03800000
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-17 1:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-16 8:01 [PATCH Review 1/1] drm/amdgpu: fix smu not match warning Stanley.Yang
-- strict thread matches above, loose matches on Subject: below --
2021-11-16 8:02 Stanley.Yang
2021-11-16 8:31 ` Lazar, Lijo
2021-11-17 1:51 ` Quan, Evan
2021-11-16 7:43 Stanley.Yang
2021-11-16 7:49 ` Lazar, Lijo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox