drm/amdgpu/pm: adjust EccInfo_t struct
Subsystems (3)
PATCH 1/1 drm/amdgpu/pm: adjust EccInfo_t struct
The EccInfo_t struct in driver_if.h is as below in official release verion 68.55.0
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;
uint64_t mca_ceumc_addr;
} EccInfo_t;
It's different from the debug version druing develop print correctable error address, so adjust EccInfo_t struct.
--- .../drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h +2 -1
@@ -521,12 +521,13 @@ typedef struct {typedef struct {uint64_t mca_umc_status;uint64_t mca_umc_addr; -uint64_t mca_ceumc_addr;uint16_t ce_count_lo_chip;uint16_t ce_count_hi_chip;uint32_t eccPadding; + +uint64_t mca_ceumc_addr; }EccInfo_V2_t ; typedef struct {
Signature · 1 line
2.17.1
[AMD Official Use Only - General]
For the structure itself, the change is okay to me. But you'll have to apply pmfw version check in the implementation to make data matches with fw structure
The patch is
Regards,
Hawking
-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, June 16, 2022 11:22
To: [email protected]; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>; Quan, Evan <[email protected]>
Cc: Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu/pm: adjust EccInfo_t struct
The EccInfo_t struct in driver_if.h is as below in official release verion 68.55.0 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;
uint64_t mca_ceumc_addr;
} EccInfo_t;
It's different from the debug version druing develop print correctable error address, so adjust EccInfo_t struct.
--- .../drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran renamed from drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h +0 -0
+++ .h
@@ -521,12 +521,13 @@ typedef struct {
typedef struct {
uint64_t mca_umc_status;
uint64_t mca_umc_addr;- uint64_t mca_ceumc_addr;
uint16_t ce_count_lo_chip;
uint16_t ce_count_hi_chip;
uint32_t eccPadding;+
+ uint64_t mca_ceumc_addr;
} EccInfo_V2_t;
typedef struct {
--
2.17.1
[AMD Official Use Only - General]
Thanks hawking, in the previous patch it has checked pmfw version and the EccInfo_t struct is consistent on driver side and pmfw side with pmfw debug version 68.54.136 during develop this feature, but it's changed in the official release version 68.55.0, so driver side has to adjust it.
Regards,
Stanley
Quoted 77 lines
-----邮件原件-----
发件人: Zhang, Hawking <[email protected]>
发送时间: Thursday, June 16, 2022 11:50 AM
收件人: Yang, Stanley <[email protected]>; amd- [email protected]; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>; Quan, Evan <[email protected]>
抄送: Yang, Stanley <[email protected]>
主题: RE: [PATCH Review 1/1] drm/amdgpu/pm: adjustEccInfo_tstruct[AMD Official Use Only - General]
For the structure itself, the change is okay to me. But you'll have to apply pmfw version check in the implementation to make data matches with fw structure
The patch is
Reviewed-by Hawking Zhang <[email protected]>Regards,
Hawking-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, June 16, 2022 11:22
To: [email protected]; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>; Quan, Evan <[email protected]>
Cc: Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu/pm: adjustEccInfo_tstructThe
EccInfo_tstruct indriver_if.his as below in official release verion 68.55.0typedef 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; uint64_t mca_ceumc_addr;}
EccInfo_t;
It's different from the debug version druing develop print correctable error address, so adjustEccInfo_tstruct.Signed-off-by Stanley.Yang <[email protected]>--- .../drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git
a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.hb/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.hindex6f92038470ec..7a6075daa7b2100644
---a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h
+++
b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran +++ .h(quoted diff) +2
-2@@ -521,12 +521,13 @@ typedef struct { typedef struct { uint64_t mca_umc_status; uint64_t mca_umc_addr; - uint64_t mca_ceumc_addr; uint16_t ce_count_lo_chip; uint16_t ce_count_hi_chip; uint32_t eccPadding; + + uint64_t mca_ceumc_addr; } EccInfo_V2_t; typedef struct { --2.17.1
[AMD Official Use Only - General]
I see. Thanks for the clarification, Stanley.
Regards,
Hawking
-----Original Message-----
From: Yang, Stanley <[email protected]>
Sent: Thursday, June 16, 2022 12:14
To: Zhang, Hawking <[email protected]>; [email protected]; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>; Quan, Evan <[email protected]>
Subject: 回复: [PATCH Review 1/1] drm/amdgpu/pm: adjust EccInfo_t struct
[AMD Official Use Only - General]
Thanks hawking, in the previous patch it has checked pmfw version and the EccInfo_t struct is consistent on driver side and pmfw side with pmfw debug version 68.54.136 during develop this feature, but it's changed in the official release version 68.55.0, so driver side has to adjust it.
Regards,
Stanley
Quoted 77 lines
-----邮件原件-----
发件人: Zhang, Hawking <[email protected]>
发送时间: Thursday, June 16, 2022 11:50 AM
收件人: Yang, Stanley <[email protected]>; amd- [email protected]; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>; Quan, Evan <[email protected]>
抄送: Yang, Stanley <[email protected]>
主题: RE: [PATCH Review 1/1] drm/amdgpu/pm: adjustEccInfo_tstruct[AMD Official Use Only - General]
For the structure itself, the change is okay to me. But you'll have to apply pmfw version check in the implementation to make data matches with fw structure
The patch is
Reviewed-by Hawking Zhang <[email protected]>Regards,
Hawking-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Thursday, June 16, 2022 11:22
To: [email protected]; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>; Quan, Evan <[email protected]>
Cc: Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu/pm: adjustEccInfo_tstructThe
EccInfo_tstruct indriver_if.his as below in official releaseverion 68.55.0 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; uint64_t mca_ceumc_addr;}
EccInfo_t;
It's different from the debug version druing develop print correctable error address, so adjustEccInfo_tstruct.Signed-off-by Stanley.Yang <[email protected]>--- .../drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)diff --git
a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.hb/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.hindex6f92038470ec..7a6075daa7b2100644
---a/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran.h
+++
b/drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_aldebaran +++ .h(quoted diff) +2
-2@@ -521,12 +521,13 @@ typedef struct { typedef struct { uint64_t mca_umc_status; uint64_t mca_umc_addr; - uint64_t mca_ceumc_addr; uint16_t ce_count_lo_chip; uint16_t ce_count_hi_chip; uint32_t eccPadding; + + uint64_t mca_ceumc_addr; } EccInfo_V2_t; typedef struct { --2.17.1