diff options
author | Borislav Petkov <borislav.petkov@amd.com> | 2009-06-25 13:51:04 -0400 |
---|---|---|
committer | Borislav Petkov <borislav.petkov@amd.com> | 2009-09-14 12:58:25 -0400 |
commit | 5110dbdeab546268dda2e4c6a83448639b2fc5ae (patch) | |
tree | d504eb80a6b77a7511cd8259943d0d746758834d /drivers/edac/amd64_edac.h | |
parent | ef44cc4c2245d3c43f3c11c7bff6239852eef498 (diff) |
amd64_edac: cleanup/complete NB MCE decoding
* don't dump info which mcheck already does
* update to newest BKDG
* mv amd64_process_error_info -> amd64_decode_nb_mce
* shorten error struct names
* remove redundant info ptr in amd64_process_error_info
* remove unused ErrorCodeExt[19:16] (MCx_STATUS) defines
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Diffstat (limited to 'drivers/edac/amd64_edac.h')
-rw-r--r-- | drivers/edac/amd64_edac.h | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h index bde8f78551f9..ecab0c9fd14e 100644 --- a/drivers/edac/amd64_edac.h +++ b/drivers/edac/amd64_edac.h | |||
@@ -306,16 +306,7 @@ enum { | |||
306 | 306 | ||
307 | /* Family F10h: Normalized Extended Error Codes */ | 307 | /* Family F10h: Normalized Extended Error Codes */ |
308 | #define F10_NBSL_EXT_ERR_RES 0x0 | 308 | #define F10_NBSL_EXT_ERR_RES 0x0 |
309 | #define F10_NBSL_EXT_ERR_CRC 0x1 | ||
310 | #define F10_NBSL_EXT_ERR_SYNC 0x2 | ||
311 | #define F10_NBSL_EXT_ERR_MST 0x3 | ||
312 | #define F10_NBSL_EXT_ERR_TGT 0x4 | ||
313 | #define F10_NBSL_EXT_ERR_GART 0x5 | ||
314 | #define F10_NBSL_EXT_ERR_RMW 0x6 | ||
315 | #define F10_NBSL_EXT_ERR_WDT 0x7 | ||
316 | #define F10_NBSL_EXT_ERR_ECC 0x8 | 309 | #define F10_NBSL_EXT_ERR_ECC 0x8 |
317 | #define F10_NBSL_EXT_ERR_DEV 0x9 | ||
318 | #define F10_NBSL_EXT_ERR_LINK_DATA 0xA | ||
319 | 310 | ||
320 | /* Next two are overloaded values */ | 311 | /* Next two are overloaded values */ |
321 | #define F10_NBSL_EXT_ERR_LINK_PROTO 0xB | 312 | #define F10_NBSL_EXT_ERR_LINK_PROTO 0xB |
@@ -360,18 +351,15 @@ enum { | |||
360 | 351 | ||
361 | #define K8_NBSH_VALID_BIT BIT(31) | 352 | #define K8_NBSH_VALID_BIT BIT(31) |
362 | #define K8_NBSH_OVERFLOW BIT(30) | 353 | #define K8_NBSH_OVERFLOW BIT(30) |
363 | #define K8_NBSH_UNCORRECTED_ERR BIT(29) | 354 | #define K8_NBSH_UC_ERR BIT(29) |
364 | #define K8_NBSH_ERR_ENABLE BIT(28) | 355 | #define K8_NBSH_ERR_EN BIT(28) |
365 | #define K8_NBSH_MISC_ERR_VALID BIT(27) | 356 | #define K8_NBSH_MISCV BIT(27) |
366 | #define K8_NBSH_VALID_ERROR_ADDR BIT(26) | 357 | #define K8_NBSH_VALID_ERROR_ADDR BIT(26) |
367 | #define K8_NBSH_PCC BIT(25) | 358 | #define K8_NBSH_PCC BIT(25) |
359 | #define K8_NBSH_ERR_CPU_VAL BIT(24) | ||
368 | #define K8_NBSH_CECC BIT(14) | 360 | #define K8_NBSH_CECC BIT(14) |
369 | #define K8_NBSH_UECC BIT(13) | 361 | #define K8_NBSH_UECC BIT(13) |
370 | #define K8_NBSH_ERR_SCRUBER BIT(8) | 362 | #define K8_NBSH_ERR_SCRUBER BIT(8) |
371 | #define K8_NBSH_CORE3 BIT(3) | ||
372 | #define K8_NBSH_CORE2 BIT(2) | ||
373 | #define K8_NBSH_CORE1 BIT(1) | ||
374 | #define K8_NBSH_CORE0 BIT(0) | ||
375 | 363 | ||
376 | #define EXTRACT_ERR_CPU_MAP(x) ((x) & 0xF) | 364 | #define EXTRACT_ERR_CPU_MAP(x) ((x) & 0xF) |
377 | 365 | ||
@@ -622,8 +610,8 @@ static inline struct low_ops *family_ops(int index) | |||
622 | #define F10_MIN_SCRUB_RATE_BITS 0x5 | 610 | #define F10_MIN_SCRUB_RATE_BITS 0x5 |
623 | #define F11_MIN_SCRUB_RATE_BITS 0x6 | 611 | #define F11_MIN_SCRUB_RATE_BITS 0x6 |
624 | 612 | ||
625 | int amd64_process_error_info(struct mem_ctl_info *mci, | 613 | void amd64_decode_nb_mce(struct mem_ctl_info *mci, struct err_regs *info, |
626 | struct err_regs *info, | 614 | int handle_errors); |
627 | int handle_errors); | 615 | |
628 | int amd64_get_dram_hole_info(struct mem_ctl_info *mci, u64 *hole_base, | 616 | int amd64_get_dram_hole_info(struct mem_ctl_info *mci, u64 *hole_base, |
629 | u64 *hole_offset, u64 *hole_size); | 617 | u64 *hole_offset, u64 *hole_size); |