drm/amdgpu: Rename ras table version
Subsystems (2)
PATCH 1/6 drm/amdgpu: Rename ras table version
Rename RAS_TABLE_VER to RAS_TABLE_VER_V1,
move RAS_TABLE_VER_V1 from amdgpu_ras_eeprom.c to amdgpu_ras_eeprom.h.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 5 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +2 -3
@@ -68,7 +68,6 @@/* Table hdr is 'AMDR' */ #define RAS_TABLE_HDR_VAL 0x414d4452 -#define RAS_TABLE_VER 0x00010000/* Bad GPU tag ‘BADG’ */ #define RAS_TABLE_HDR_BAD 0x42414447
@@ -289,7 +288,7 @@ int amdgpu_ras_eeprom_reset_table(struct amdgpu_ras_eeprom_control *control)mutex_lock (&control->ras_tbl_mutex); hdr->header =RAS_TABLE_HDR_VAL ; - hdr->version =RAS_TABLE_VER ; + hdr->version =RAS_TABLE_VER_V1 ; hdr->first_rec_offset =RAS_RECORD_START ; hdr->tbl_size =RAS_TABLE_HEADER_SIZE ;
@@ -575,7 +574,7 @@ amdgpu_ras_eeprom_update_header(struct amdgpu_ras_eeprom_control *control) control->tbl_hdr.header =RAS_TABLE_HDR_BAD ; } - control->tbl_hdr.version =RAS_TABLE_VER ; + control->tbl_hdr.version =RAS_TABLE_VER_V1 ; control->tbl_hdr.first_rec_offset =RAS_INDEX_TO_OFFSET (control, control->ras_fri); control->tbl_hdr.tbl_size =RAS_TABLE_HEADER_SIZE + control->ras_num_recs *RAS_TABLE_RECORD_SIZE ; control->tbl_hdr.checksum =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h +2 -0
@@ -26,6 +26,8 @@#include <linux/i2c.h> +#define RAS_TABLE_VER_V1 0x00010000 +struct amdgpu_device ;enum amdgpu_ras_eeprom_err_type {
Signature · 1 line
2.17.1
PATCH 2/6 drm/amdgpu: Add RAS table v2.1 macro definition
Add RAS EEPROM table version 2.1 macro definition.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 13 +++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 1 + 2 files changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +13 -0
@@ -80,6 +80,15 @@#define RAS_MAX_RECORD_COUNT ((RAS_TBL_SIZE_BYTES - RAS_TABLE_HEADER_SIZE) \ / RAS_TABLE_RECORD_SIZE) +/* EEPROM Table V2_1 */ +#define RAS_TABLE_V2_1_INFO_SIZE 256 +#define RAS_TABLE_V2_1_INFO_START RAS_TABLE_HEADER_SIZE +#define RAS_RECORD_START_V2_1 (RAS_HDR_START + RAS_TABLE_HEADER_SIZE + \ + RAS_TABLE_V2_1_INFO_SIZE) +#define RAS_MAX_RECORD_COUNT_V2_1 ((RAS_TBL_SIZE_BYTES - RAS_TABLE_HEADER_SIZE - \ + RAS_TABLE_V2_1_INFO_SIZE) \ + / RAS_TABLE_RECORD_SIZE) +/* Given a zero-based index of an EEPROM RAS record, yields the EEPROM * offset off of RAS_TABLE_START. That is, this is something you can * add to control->i2c_address, and then tell I2C layer to read
@@ -102,6 +111,10 @@#define RAS_NUM_RECS (_tbl_hdr) (((_tbl_hdr)->tbl_size - \ RAS_TABLE_HEADER_SIZE) / RAS_TABLE_RECORD_SIZE) +#define RAS_NUM_RECS_V2_1 (_tbl_hdr) (((_tbl_hdr)->tbl_size - \ + RAS_TABLE_HEADER_SIZE - \ + RAS_TABLE_V2_1_INFO_SIZE) / RAS_TABLE_RECORD_SIZE) +#define to_amdgpu_device (x) (container_of(x, struct amdgpu_ras, eeprom_control))->adevstatic bool __is_ras_eeprom_supported (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h +1 -0
@@ -27,6 +27,7 @@#include <linux/i2c.h> #define RAS_TABLE_VER_V1 0x00010000 +#define RAS_TABLE_VER_V2_1 0x00021000struct amdgpu_device ;
Signature · 1 line
2.17.1
PATCH 3/6 drm/amdgpu: Support setting EEPROM table version
In reply to Stanley.YangAdd setting EEPROM table version interface for umcv8.10, Add EEPROM table v2.1 to UMC v8.10.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 ++ drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 6 ++++++ 2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h +2 -0
@@ -59,6 +59,8 @@ struct amdgpu_umc_ras { void *ras_error_status);void (*ecc_info_query_ras_error_address)(struct amdgpu_device *adev,void *ras_error_status); +/* support different eeprom table version for different asic */ +void (*set_eeprom_table_version)(struct amdgpu_ras_eeprom_table_header *hdr); };struct amdgpu_umc_funcs {
drivers/gpu/drm/amd/amdgpu/umc_v8_10.c +6 -0
@@ -444,6 +444,11 @@ static void umc_v8_10_ecc_info_query_ras_error_address(struct amdgpu_device *ade umc_v8_10_ecc_info_query_error_address, ras_error_status); } +static void umc_v8_10_set_eeprom_table_version (struct amdgpu_ras_eeprom_table_header *hdr) +{ + hdr->version =RAS_TABLE_VER_V2_1 ; +} +const struct amdgpu_ras_block_hw_ops umc_v8_10_ras_hw_ops = { .query_ras_error_count = umc_v8_10_query_ras_error_count, .query_ras_error_address = umc_v8_10_query_ras_error_address,
@@ -457,4 +462,5 @@ struct amdgpu_umc_ras umc_v8_10_ras = { .query_ras_poison_mode = umc_v8_10_query_ras_poison_mode, .ecc_info_query_ras_error_count = umc_v8_10_ecc_info_query_ras_error_count, .ecc_info_query_ras_error_address = umc_v8_10_ecc_info_query_ras_error_address, + .set_eeprom_table_version = umc_v8_10_set_eeprom_table_version, };
Signature · 1 line
2.17.1
PATCH 4/6 drm/amdgpu: Add support EEPROM table v2.1
In reply to Stanley.YangAdd ras info to EEPROM table, app can analyse device ECC status without GPU driver through EEPROM table ras info.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 204 ++++++++++++++++-- .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 12 +- 3 files changed, 203 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 -1
@@ -2314,7 +2314,7 @@ int amdgpu_ras_recovery_init(struct amdgpu_device *adev)atomic_set (&con->in_recovery,0 ); con->eeprom_control.bad_channel_bitmap =0 ; - max_eeprom_records_count =amdgpu_ras_eeprom_max_record_count (); + max_eeprom_records_count =amdgpu_ras_eeprom_max_record_count (&con->eeprom_control);amdgpu_ras_validate_threshold (adev, max_eeprom_records_count);/* Todo: During test the SMU might fail to read the eeprom through I2C
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +191 -13
287 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h +11 -1
@@ -46,9 +46,18 @@ struct amdgpu_ras_eeprom_table_header {uint32_t checksum; } __packed; +struct amdgpu_ras_eeprom_table_ras_info { +u8 rma_status; +u8 health_percent; +u16 ecc_page_threshold; +u32 padding[64 -1 ]; +} __packed; +struct amdgpu_ras_eeprom_control {struct amdgpu_ras_eeprom_table_header tbl_hdr; +struct amdgpu_ras_eeprom_table_ras_info tbl_rai; +/* Base I2C EEPPROM 19-bit memory address, * where the table is located. For more information, * see top of amdgpu_eeprom.c.
@@ -61,6 +70,7 @@ struct amdgpu_ras_eeprom_control {* right after the header. */ u32 ras_header_offset; +u32 ras_info_offset;u32 ras_record_offset;/* Number of records in the table.
@@ -127,7 +137,7 @@ int amdgpu_ras_eeprom_read(struct amdgpu_ras_eeprom_control *control,int amdgpu_ras_eeprom_append (struct amdgpu_ras_eeprom_control *control,struct eeprom_table_record *records,const u32 num); -uint32_t amdgpu_ras_eeprom_max_record_count (void ); +uint32_t amdgpu_ras_eeprom_max_record_count (struct amdgpu_ras_eeprom_control *control);void amdgpu_ras_debugfs_set_ret_size (struct amdgpu_ras_eeprom_control *control);
Signature · 1 line
2.17.1
PATCH 5/6 drm/amdgpu: Calculate EEPROM table ras info bytes sum
In reply to Stanley.YangIt's more reasonable to check EEPROM table ras info bytes.
--- .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +19 -0
@@ -355,6 +355,21 @@ static u8 __calc_hdr_byte_sum(const struct amdgpu_ras_eeprom_control *control)return csum; } +static u8 __calc_ras_info_byte_sum (const struct amdgpu_ras_eeprom_control *control) +{ +int ii; +u8 *pp, csum; +size_t sz; + + sz =sizeof (control->tbl_rai); + pp = (u8 *) &control->tbl_rai; + csum =0 ; +for (ii =0 ; ii < sz; ii++, pp++) + csum += *pp; + +return csum; +} +static int amdgpu_ras_eeprom_correct_header_tag (struct amdgpu_ras_eeprom_control *control,uint32_t header)
@@ -414,6 +429,8 @@ int amdgpu_ras_eeprom_reset_table(struct amdgpu_ras_eeprom_control *control) } csum =__calc_hdr_byte_sum (control); +if (hdr->version ==RAS_TABLE_VER_V2_1 ) + csum +=__calc_ras_info_byte_sum (control); csum = -csum; hdr->checksum = csum; res =__write_table_header (control);
@@ -739,6 +756,8 @@ amdgpu_ras_eeprom_update_header(struct amdgpu_ras_eeprom_control *control) csum += *pp; csum +=__calc_hdr_byte_sum (control); +if (control->tbl_hdr.version ==RAS_TABLE_VER_V2_1 ) + csum +=__calc_ras_info_byte_sum (control);/* avoid sign extension when assigning to "checksum" */ csum = -csum; control->tbl_hdr.checksum = csum;
Signature · 1 line
2.17.1
PATCH 6/6 drm/amdgpu: Set EEPROM ras info
In reply to Stanley.YangSet EEPROM ras info: rma status, health percent and bad page threshold.
--- .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 24 +++++++++++++++++++ .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 5 ++++ 2 files changed, 29 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +24 -0
@@ -406,6 +406,7 @@ int amdgpu_ras_eeprom_reset_table(struct amdgpu_ras_eeprom_control *control) {struct amdgpu_device *adev =to_amdgpu_device (control);struct amdgpu_ras_eeprom_table_header *hdr = &control->tbl_hdr; +struct amdgpu_ras_eeprom_table_ras_info *rai = &control->tbl_rai;struct amdgpu_ras *con =amdgpu_ras_get_context (adev);u8 csum;int res;
@@ -423,6 +424,14 @@ int amdgpu_ras_eeprom_reset_table(struct amdgpu_ras_eeprom_control *control) hdr->first_rec_offset =RAS_RECORD_START_V2_1 ; hdr->tbl_size =RAS_TABLE_HEADER_SIZE +RAS_TABLE_V2_1_INFO_SIZE ; + rai->rma_status =GPU_HEALTH_USABLE ; +/** +* GPU health represented as a percentage. +* 0 means worst health, 100 means fully health. +*/ + rai->health_percent =100 ; +/* ecc_page_threshold = 0 means disable bad page retirement */ + rai->ecc_page_threshold = con->bad_page_cnt_threshold; }else { hdr->first_rec_offset =RAS_RECORD_START ; hdr->tbl_size =RAS_TABLE_HEADER_SIZE ;
@@ -712,6 +721,10 @@ amdgpu_ras_eeprom_update_header(struct amdgpu_ras_eeprom_control *control)"Saved bad pages %d reaches threshold value %d\n" , control->ras_num_recs, ras->bad_page_cnt_threshold); control->tbl_hdr.header =RAS_TABLE_HDR_BAD ; +if (control->tbl_hdr.version ==RAS_TABLE_VER_V2_1 ) { + control->tbl_rai.rma_status =GPU_RETIRED__ECC_REACH_THRESHOLD ; + control->tbl_rai.health_percent =0 ; + } }if (control->tbl_hdr.version ==RAS_TABLE_VER_V2_1 )
@@ -749,6 +762,17 @@ amdgpu_ras_eeprom_update_header(struct amdgpu_ras_eeprom_control *control) goto Out; } +/** +* bad page records have been stored in eeprom, +* now calculate gpu health percent +*/ +if (amdgpu_bad_page_threshold !=0 && + control->tbl_hdr.version ==RAS_TABLE_VER_V2_1 && + control->ras_num_recs < ras->bad_page_cnt_threshold) + control->tbl_rai.health_percent = ((ras->bad_page_cnt_threshold - + control->ras_num_recs) *100 ) / + ras->bad_page_cnt_threshold; +/* Recalc the checksum. */ csum =0 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h +5 -0
@@ -31,6 +31,11 @@struct amdgpu_device ; +enum amdgpu_ras_gpu_health_status { +GPU_HEALTH_USABLE =0 , +GPU_RETIRED__ECC_REACH_THRESHOLD =2 , +}; +enum amdgpu_ras_eeprom_err_type {AMDGPU_RAS_EEPROM_ERR_NA ,AMDGPU_RAS_EEPROM_ERR_RECOVERABLE ,
Signature · 1 line
2.17.1
RE: [PATCH Review 6/6] drm/amdgpu: Set EEPROM ras info
[AMD Official Use Only - General]
Series is
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Stanley.Yang
Sent: Wednesday, June 7, 2023 14:48
To: [email protected]; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Chai, Thomas <[email protected]>; Li, Candice <[email protected]>
Cc: Yang, Stanley <[email protected]>
Subject: [PATCH Review 6/6] drm/amdgpu: Set EEPROM ras info
Set EEPROM ras info: rma status, health percent and bad page threshold.
--- .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 24 +++++++++++++++++++ .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 5 ++++ 2 files changed, 29 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +9 -0
@@ -406,6 +406,7 @@ int amdgpu_ras_eeprom_reset_table(struct amdgpu_ras_eeprom_control *control) {struct amdgpu_device *adev =to_amdgpu_device (control);struct amdgpu_ras_eeprom_table_header *hdr = &control->tbl_hdr; +struct amdgpu_ras_eeprom_table_ras_info *rai = &control->tbl_rai;struct amdgpu_ras *con =amdgpu_ras_get_context (adev);u8 csum;int res;
@@ -423,6 +424,14 @@ int amdgpu_ras_eeprom_reset_table(struct amdgpu_ras_eeprom_control *control) hdr->first_rec_offset =RAS_RECORD_START_V2_1 ; hdr->tbl_size =RAS_TABLE_HEADER_SIZE +RAS_TABLE_V2_1_INFO_SIZE ; + rai->rma_status =GPU_HEALTH_USABLE ; +/** +* GPU health represented as a percentage. +* 0 means worst health, 100 means fully health. +*/ + rai->health_percent =100 ; +/* ecc_page_threshold = 0 means disable bad page retirement */ + rai->ecc_page_threshold = con->bad_page_cnt_threshold; }else { hdr->first_rec_offset =RAS_RECORD_START ; hdr->tbl_size = RAS_TABLE_HEADER_SIZE; @@ -712,6 +721,10 @@ amdgpu_ras_eeprom_update_header(struct amdgpu_ras_eeprom_control *control)
"Saved bad pages %d reaches threshold value %d\n",
control->ras_num_recs, ras->bad_page_cnt_threshold);
control->tbl_hdr.header = RAS_TABLE_HDR_BAD;+ if (control->tbl_hdr.version == RAS_TABLE_VER_V2_1) {
+ control->tbl_rai.rma_status = GPU_RETIRED__ECC_REACH_THRESHOLD;
+ control->tbl_rai.health_percent = 0;
+ }
}
if (control->tbl_hdr.version == RAS_TABLE_VER_V2_1) @@ -749,6 +762,17 @@ amdgpu_ras_eeprom_update_header(struct amdgpu_ras_eeprom_control *control)
goto Out;
}+ /**
+ * bad page records have been stored in eeprom, + * now calculate gpu health percent + */
+ if (amdgpu_bad_page_threshold != 0 &&
+ control->tbl_hdr.version == RAS_TABLE_VER_V2_1 &&
+ control->ras_num_recs < ras->bad_page_cnt_threshold)
+ control->tbl_rai.health_percent = ((ras->bad_page_cnt_threshold -
+ control->ras_num_recs) * 100) /
+ ras->bad_page_cnt_threshold;
+
/* Recalc the checksum.
*/
csum = 0;drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h +5 -0
@@ -31,6 +31,11 @@struct amdgpu_device ; +enum amdgpu_ras_gpu_health_status { +GPU_HEALTH_USABLE =0 , +GPU_RETIRED__ECC_REACH_THRESHOLD =2 , +}; +enum amdgpu_ras_eeprom_err_type {AMDGPU_RAS_EEPROM_ERR_NA ,AMDGPU_RAS_EEPROM_ERR_RECOVERABLE ,
--
2.17.1