rasdaemon: Add Ice Lake and Sapphire Rapids MSCOD values
PATCH 1/1 rasdaemon: Add Ice Lake and Sapphire Rapids MSCOD values
Based on mcelog commits:
ee90ff20ce6a ("mcelog: Add support for Icelake server, Icelake-D, and Snow Ridge") 391abaac9bdf ("mcelog: Add decode for MCi_MISC from 10nm memory controller") 59cb7ad4bc72 ("mcelog: i10nm: Fix mapping from bank number to functional unit") c0acd0e6a639 ("mcelog: Add support for Sapphirerapids server.")
--- Makefile.am | 2 +- mce-intel-i10nm.c | 509 ++++++++++++++++++++++++++++++++++++++++++++++ mce-intel.c | 5 + ras-mce-handler.c | 14 +- ras-mce-handler.h | 5 + 5 files changed, 533 insertions(+), 2 deletions(-) create mode 100644 mce-intel-i10nm.c
Makefile.am +1 -1
@@ -37,7 +37,7 @@ if WITH_MCE mce-intel-sb.c mce-intel-ivb.c mce-intel-haswell.c \ mce-intel-knl.c mce-intel-broadwell-de.c \ mce-intel-broadwell-epex.c mce-intel-skylake-xeon.c \ - mce-amd-k8.c mce-amd-smca.c + mce-amd-k8.c mce-amd-smca.c mce-intel-i10nm.c endif if WITH_EXTLOG rasdaemon_SOURCES += ras-extlog-handler.c
mce-intel-i10nm.c new file +509 -0
509 lines not on this page · raw message
mce-intel.c +5 -0
@@ -411,6 +411,11 @@ int parse_intel_event(struct ras_events *ras, struct mce_event *e)case CPU_SKYLAKE_XEON :skylake_s_decode_model (ras, e);break ; +case CPU_ICELAKE_XEON : +case CPU_ICELAKE_DE : +case CPU_TREMONT_D : +case CPU_SAPPHIRERAPIDS : +i10nm_decode_model (mce->cputype, ras, e);default :break ; }
ras-mce-handler.c +13 -1
@@ -56,7 +56,11 @@ static char *cputype_name[] = { [CPU_KNIGHTS_MILL] = "Knights Mill", [CPU_SKYLAKE_XEON] = "Skylake server", [CPU_AMD_SMCA] = "AMD Scalable MCA", - [CPU_DHYANA] = "Hygon Family 18h Moksha" + [CPU_DHYANA] = "Hygon Family 18h Moksha", + [CPU_ICELAKE_XEON] = "Icelake server", + [CPU_ICELAKE_DE] = "Icelake server D Family", + [CPU_TREMONT_D] = "Tremont microserver", + [CPU_SAPPHIRERAPIDS] = "Sapphirerapids server", };static enum cputype select_intel_cputype (struct ras_events *ras)
@@ -108,6 +112,14 @@ static enum cputype select_intel_cputype(struct ras_events *ras)return CPU_KNIGHTS_MILL ; else if (mce->model == 0x55) return CPU_SKYLAKE_XEON; + else if (mce->model == 0x6a) + return CPU_ICELAKE_XEON; + else if (mce->model == 0x6c) + return CPU_ICELAKE_DE; + else if (mce->model == 0x86) + return CPU_TREMONT_D; + else if (mce->model == 0x8f) + return CPU_SAPPHIRERAPIDS;if (mce->model >0x1a ) { log(ALL, LOG_INFO,
ras-mce-handler.h +5 -0
@@ -49,6 +49,10 @@ enum cputype {CPU_SKYLAKE_XEON ,CPU_AMD_SMCA ,CPU_DHYANA , +CPU_ICELAKE_XEON , +CPU_ICELAKE_DE , +CPU_TREMONT_D , + CPU_SAPPHIRERAPIDS, }; struct mce_event {
@@ -129,6 +133,7 @@ void tulsa_decode_model(struct mce_event *e);void broadwell_de_decode_model (struct ras_events *ras,struct mce_event *e);void broadwell_epex_decode_model (struct ras_events *ras,struct mce_event *e);void skylake_s_decode_model (struct ras_events *ras,struct mce_event *e); +void i10nm_decode_model (enum cputype cputype,struct ras_events *ras,struct mce_event *e);/* AMD error code decode function */ void decode_amd_errcode (struct mce_event *e);
Signature · 1 line
2.31.1
Mauro Carvalho Chehab
AppliedEm Thu, 8 Apr 2021 15:03:30 -0600
Greg Edwards <[email protected]> escreveu:
Quoted 8 lines
Based on mcelog commits:
ee90ff20ce6a("mcelog: Add support for Icelake server, Icelake-D, and Snow Ridge")391abaac9bdf("mcelog: Add decode forMCi_MISCfrom 10nm memory controller")59cb7ad4bc72("mcelog: i10nm: Fix mapping from bank number to functional unit")c0acd0e6a639("mcelog: Add support for Sapphirerapids server.")Signed-off-by Greg Edwards <[email protected]>
Applied, thanks!
Regards,
Mauro
Quoted 601 lines
--- Makefile.am | 2 +- mce-intel-i10nm.c | 509 ++++++++++++++++++++++++++++++++++++++++++++++ mce-intel.c | 5 + ras-mce-handler.c | 14 +- ras-mce-handler.h | 5 + 5 files changed, 533 insertions(+), 2 deletions(-) create mode 100644 mce-intel-i10nm.cMakefile.am +1
-1@@ -37,7 +37,7 @@ if WITH_MCE mce-intel-sb.c mce-intel-ivb.c mce-intel-haswell.c \ mce-intel-knl.c mce-intel-broadwell-de.c \ mce-intel-broadwell-epex.c mce-intel-skylake-xeon.c \ - mce-amd-k8.c mce-amd-smca.c + mce-amd-k8.c mce-amd-smca.c mce-intel-i10nm.c endif if WITH_EXTLOG rasdaemon_SOURCES += ras-extlog-handler.cmce-intel-i10nm.c new file +509
-0@@ -0,0 +1,509 @@ +/* +* The code below came from Tony Luck's mcelog code, +* released under GNU Public General License, v.2 +* +* Copyright (C) 2019 Intel Corporation +* Decode Intel 10nm specific machine check errors. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <inttypes.h> +#include <stdio.h> +#include <string.h> + +#include "ras-mce-handler.h" +#include "bitfield.h" + +static char *pcu_1[] = { + [0x0D ] ="MCA_LLC_BIST_ACTIVE_TIMEOUT" , + [0x0E ] ="MCA_DMI_TRAINING_TIMEOUT" , + [0x0F ] ="MCA_DMI_STRAP_SET_ARRIVAL_TIMEOUT" , + [0x10 ] ="MCA_DMI_CPU_RESET_ACK_TIMEOUT" , + [0x11 ] ="MCA_MORE_THAN_ONE_LT_AGENT" , + [0x14 ] ="MCA_INCOMPATIBLE_PCH_TYPE" , + [0x1E ] ="MCA_BIOS_RST_CPL_INVALID_SEQ" , + [0x1F ] ="MCA_BIOS_INVALID_PKG_STATE_CONFIG" , + [0x2D ] ="MCA_PCU_PMAX_CALIB_ERROR" , + [0x2E ] ="MCA_TSC100_SYNC_TIMEOUT" , + [0x3A ] ="MCA_GPSB_TIMEOUT" , + [0x3B ] ="MCA_PMSB_TIMEOUT" , + [0x3E ] ="MCA_IOSFSB_PMREQ_CMP_TIMEOUT" , + [0x40 ] ="MCA_SVID_VCCIN_VR_ICC_MAX_FAILURE" , + [0x42 ] ="MCA_SVID_VCCIN_VR_VOUT_FAILURE" , + [0x43 ] ="MCA_SVID_CPU_VR_CAPABILITY_ERROR" , + [0x44 ] ="MCA_SVID_CRITICAL_VR_FAILED" , + [0x45 ] ="MCA_SVID_SA_ITD_ERROR" , + [0x46 ] ="MCA_SVID_READ_REG_FAILED" , + [0x47 ] ="MCA_SVID_WRITE_REG_FAILED" , + [0x4A ] ="MCA_SVID_PKGC_REQUEST_FAILED" , + [0x4B ] ="MCA_SVID_IMON_REQUEST_FAILED" , + [0x4C ] ="MCA_SVID_ALERT_REQUEST_FAILED" , + [0x4D ] ="MCA_SVID_MCP_VR_RAMP_ERROR" , + [0x56 ] ="MCA_FIVR_PD_HARDERR" , + [0x58 ] ="MCA_WATCHDOG_TIMEOUT_PKGC_SLAVE" , + [0x59 ] ="MCA_WATCHDOG_TIMEOUT_PKGC_MASTER" , + [0x5A ] ="MCA_WATCHDOG_TIMEOUT_PKGS_MASTER" , + [0x5B ] ="MCA_WATCHDOG_TIMEOUT_MSG_CH_FSM" , + [0x5C ] ="MCA_WATCHDOG_TIMEOUT_BULK_CR_FSM" , + [0x5D ] ="MCA_WATCHDOG_TIMEOUT_IOSFSB_FSM" , + [0x60 ] ="MCA_PKGS_SAFE_WP_TIMEOUT" , + [0x61 ] ="MCA_PKGS_CPD_UNCPD_TIMEOUT" , + [0x62 ] ="MCA_PKGS_INVALID_REQ_PCH" , + [0x63 ] ="MCA_PKGS_INVALID_REQ_INTERNAL" , + [0x64 ] ="MCA_PKGS_INVALID_RSP_INTERNAL" , + [0x65 ...0x7A ] ="MCA_PKGS_RESET_PREP_TIMEOUT" , + [0x7B ] ="MCA_PKGS_SMBUS_VPP_PAUSE_TIMEOUT" , + [0x7C ] ="MCA_PKGS_SMBUS_MCP_PAUSE_TIMEOUT" , + [0x7D ] ="MCA_PKGS_SMBUS_SPD_PAUSE_TIMEOUT" , + [0x80 ] ="MCA_PKGC_DISP_BUSY_TIMEOUT" , + [0x81 ] ="MCA_PKGC_INVALID_RSP_PCH" , + [0x83 ] ="MCA_PKGC_WATCHDOG_HANG_CBZ_DOWN" , + [0x84 ] ="MCA_PKGC_WATCHDOG_HANG_CBZ_UP" , + [0x87 ] ="MCA_PKGC_WATCHDOG_HANG_C2_BLKMASTER" , + [0x88 ] ="MCA_PKGC_WATCHDOG_HANG_C2_PSLIMIT" , + [0x89 ] ="MCA_PKGC_WATCHDOG_HANG_SETDISP" , + [0x8B ] ="MCA_PKGC_ALLOW_L1_ERROR" , + [0x90 ] ="MCA_RECOVERABLE_DIE_THERMAL_TOO_HOT" , + [0xA0 ] ="MCA_ADR_SIGNAL_TIMEOUT" , + [0xA1 ] ="MCA_BCLK_FREQ_OC_ABOVE_THRESHOLD" , + [0xB0 ] ="MCA_DISPATCHER_RUN_BUSY_TIMEOUT" , +}; + +static char *pcu_2[] = { + [0x04 ] ="Clock/power IP response timeout" , + [0x05 ] ="SMBus controller raised SMI" , + [0x09 ] ="PM controller received invalid transaction" , +}; + +static char *pcu_3[] = { + [0x01 ] ="Instruction address out of valid space" , + [0x02 ] ="Double bit RAM error on Instruction Fetch" , + [0x03 ] ="Invalid OpCode seen" , + [0x04 ] ="Stack Underflow" , + [0x05 ] ="Stack Overflow" , + [0x06 ] ="Data address out of valid space" , + [0x07 ] ="Double bit RAM error on Data Fetch" , +}; + +static struct field pcu1[] = { +FIELD (0 , pcu_1), + {} +}; + +static struct field pcu2[] = { +FIELD (0 , pcu_2), + {} +}; + +static struct field pcu3[] = { +FIELD (0 , pcu_3), + {} +}; + +static struct field upi1[] = { +SBITFIELD (22 ,"Phy Control Error" ), +SBITFIELD (23 ,"Unexpected Retry.Ack flit" ), +SBITFIELD (24 ,"Unexpected Retry.Req flit" ), +SBITFIELD (25 ,"RF parity error" ), +SBITFIELD (26 ,"Routeback Table error" ), +SBITFIELD (27 ,"Unexpected Tx Protocol flit (EOP, Header or Data)" ), +SBITFIELD (28 ,"Rx Header-or-Credit BGF credit overflow/underflow" ), +SBITFIELD (29 ,"Link Layer Reset still in progress when Phy enters L0" ), +SBITFIELD (30 ,"Link Layer reset initiated while protocol traffic not idle" ), +SBITFIELD (31 ,"Link Layer Tx Parity Error" ), + {} +}; + +static char *upi_2[] = { + [0x00 ] ="Phy Initialization Failure (NumInit)" , + [0x01 ] ="Phy Detected Drift Buffer Alarm" , + [0x02 ] ="Phy Detected Latency Buffer Rollover" , + [0x10 ] ="LL Rx detected CRC error: unsuccessful LLR (entered Abort state)" , + [0x11 ] ="LL Rx Unsupported/Undefined packet" , + [0x12 ] ="LL or Phy Control Error" , + [0x13 ] ="LL Rx Parameter Exception" , + [0x1F ] ="LL Detected Control Error" , + [0x20 ] ="Phy Initialization Abort" , + [0x21 ] ="Phy Inband Reset" , + [0x22 ] ="Phy Lane failure, recovery in x8 width" , + [0x23 ] ="Phy L0c error corrected without Phy reset" , + [0x24 ] ="Phy L0c error triggering Phy reset" , + [0x25 ] ="Phy L0p exit error corrected with reset" , + [0x30 ] ="LL Rx detected CRC error: successful LLR without Phy Reinit" , + [0x31 ] ="LL Rx detected CRC error: successful LLR with Phy Reinit" , + [0x32 ] ="Tx received LLR" , +}; + +static struct field upi2[] = { +FIELD (0 , upi_2), + {} +}; + +static struct field m2m[] = { +SBITFIELD (16 ,"MC read data error" ), +SBITFIELD (17 ,"Reserved" ), +SBITFIELD (18 ,"MC partial write data error" ), +SBITFIELD (19 ,"Full write data error" ), +SBITFIELD (20 ,"M2M clock-domain-crossing buffer (BGF) error" ), +SBITFIELD (21 ,"M2M time out" ), +SBITFIELD (22 ,"M2M tracker parity error" ), +SBITFIELD (23 ,"fatal Bucket1 error" ), + {} +}; + +static char *imc_0[] = { + [0x01 ] ="Address parity error" , + [0x02 ] ="Data parity error" , + [0x03 ] ="Data ECC error" , + [0x04 ] ="Data byte enable parity error" , + [0x07 ] ="Transaction ID parity error" , + [0x08 ] ="Corrected patrol scrub error" , + [0x10 ] ="Uncorrected patrol scrub error" , + [0x20 ] ="Corrected spare error" , + [0x40 ] ="Uncorrected spare error" , + [0x80 ] ="Corrected read error" , + [0xA0 ] ="Uncorrected read error" , + [0xC0 ] ="Uncorrected metadata" , +}; + +static char *imc_1[] = { + [0x00 ] ="WDB read parity error" , + [0x03 ] ="RPA parity error" , + [0x06 ] ="DDR_T_DPPP data BE error" , + [0x07 ] ="DDR_T_DPPP data error" , + [0x08 ] ="DDR link failure" , + [0x11 ] ="PCLS CAM error" , + [0x12 ] ="PCLS data error" , +}; + +static char *imc_2[] = { + [0x00 ] ="DDR4 command / address parity error" , + [0x20 ] ="HBM command / address parity error" , + [0x21 ] ="HBM data parity error" , +}; + +static char *imc_4[] = { + [0x00 ] ="RPQ parity (primary) error" , +}; + +static char *imc_8[] = { + [0x00 ] ="DDR-T bad request" , + [0x01 ] ="DDR Data response to an invalid entry" , + [0x02 ] ="DDR data response to an entry not expecting data" , + [0x03 ] ="DDR4 completion to an invalid entry" , + [0x04 ] ="DDR-T completion to an invalid entry" , + [0x05 ] ="DDR data/completion FIFO overflow" , + [0x06 ] ="DDR-T ERID correctable parity error" , + [0x07 ] ="DDR-T ERID uncorrectable error" , + [0x08 ] ="DDR-T interrupt received while outstanding interrupt was not ACKed" , + [0x09 ] ="ERID FI FO overflow" , + [0x0A ] ="DDR-T error on FNV write credits" , + [0x0B ] ="DDR-T error on FNV read credits" , + [0x0C ] ="DDR-T scheduler error" , + [0x0D ] ="DDR-T FNV error event" , + [0x0E ] ="DDR-T FNV thermal event" , + [0x0F ] ="CMI packet while idle" , + [0x10 ] ="DDR_T_RPQ_REQ_PARITY_ERR" , + [0x11 ] ="DDR_T_WPQ_REQ_PARITY_ERR" , + [0x12 ] ="2LM_NMFILLWR_CAM_ERR" , + [0x13 ] ="CMI_CREDIT_OVERSUB_ERR" , + [0x14 ] ="CMI_CREDIT_TOTAL_ERR" , + [0x15 ] ="CMI_CREDIT_RSVD_POOL_ERR" , + [0x16 ] ="DDR_T_RD_ERROR" , + [0x17 ] ="WDB_FIFO_ERR" , + [0x18 ] ="CMI_REQ_FIFO_OVERFLOW" , + [0x19 ] ="CMI_REQ_FIFO_UNDERFLOW" , + [0x1A ] ="CMI_RSP_FIFO_OVERFLOW" , + [0x1B ] ="CMI_RSP_FIFO_UNDERFLOW" , + [0x1C ] ="CMI _MISC_MC_CRDT_ERRORS" , + [0x1D ] ="CMI_MISC_MC_ARB_ERRORS" , + [0x1E ] ="DDR_T_WR_CMPL_FI FO_OVERFLOW" , + [0x1F ] ="DDR_T_WR_CMPL_FI FO_UNDERFLOW" , + [0x20 ] ="CMI_RD_CPL_FIFO_OVERFLOW" , + [0x21 ] ="CMI_RD_CPL_FIFO_UNDERFLOW" , + [0x22 ] ="TME_KEY_PAR_ERR" , + [0x23 ] ="TME_CMI_MISC_ERR" , + [0x24 ] ="TME_CMI_OVFL_ERR" , + [0x25 ] ="TME_CMI_UFL_ERR" , + [0x26 ] ="TME_TEM_SECURE_ERR" , + [0x27 ] ="TME_UFILL_PAR_ERR" , + [0x29 ] ="INTERNAL_ERR" , + [0x2A ] ="TME_INTEGRITY_ERR" , + [0x2B ] ="TME_TDX_ERR" , + [0x2C ] ="TME_UFILL_TEM_SECURE_ERR" , + [0x2D ] ="TME_KEY_POISON_ERR" , + [0x2E ] ="TME_SECURITY_ENGINE_ERR" , +}; + +static char *imc_10[] = { + [0x08 ] ="CORR_PATSCRUB_MIRR2ND_ERR" , + [0x10 ] ="UC_PATSCRUB_MIRR2ND_ERR" , + [0x20 ] ="COR_SPARE_MIRR2ND_ERR" , + [0x40 ] ="UC_SPARE_MIRR2ND_ERR" , + [0x80 ] ="HA_RD_MIRR2ND_ERR" , + [0xA0 ] ="HA_UNCORR_RD_MIRR2ND_ERR" , +}; + +static struct field imc0[] = { +FIELD (0 , imc_0), + {} +}; + +static struct field imc1[] = { +FIELD (0 , imc_1), + {} +}; + +static struct field imc2[] = { +FIELD (0 , imc_2), + {} +}; + +static struct field imc4[] = { +FIELD (0 , imc_4), + {} +}; + +static struct field imc8[] = { +FIELD (0 , imc_8), + {} +}; + +static struct field imc10[] = { +FIELD (0 , imc_10), + {} +}; + +static void i10nm_imc_misc (struct mce_event *e) +{ +uint32_t column =EXTRACT (e->misc,9 ,18 ) <<2 ; +uint32_t row =EXTRACT (e->misc,19 ,39 ); +uint32_t bank =EXTRACT (e->misc,42 ,43 ); +uint32_t bankgroup =EXTRACT (e->misc,40 ,41 ) | (EXTRACT (e->misc,44 ,44 ) <<2 ); +uint32_t fdevice =EXTRACT (e->misc,46 ,51 ); +uint32_t subrank =EXTRACT (e->misc,52 ,55 ); +uint32_t rank =EXTRACT (e->misc,56 ,58 ); +uint32_t eccmode =EXTRACT (e->misc,59 ,62 ); +uint32_t transient =EXTRACT (e->misc,63 ,63 ); + +mce_snprintf (e->error_msg,"bank: 0x%x bankgroup: 0x%x row: 0x%x column: 0x%x" , bank, bankgroup, row, column); +if (!transient && !EXTRACT (e->status,61 ,61 )) +mce_snprintf (e->error_msg,"failed device: 0x%x" , fdevice); +mce_snprintf (e->error_msg,"rank: 0x%x subrank: 0x%x" , rank, subrank); +mce_snprintf (e->error_msg,"ecc mode: " ); +switch (eccmode) { +case 0 :mce_snprintf (e->error_msg,"SDDC memory mode" );break ; +case 1 :mce_snprintf (e->error_msg,"SDDC" );break ; +case 4 :mce_snprintf (e->error_msg,"ADDDC memory mode" );break ; +case 5 :mce_snprintf (e->error_msg,"ADDDC" );break ; +case 8 :mce_snprintf (e->error_msg,"DDRT read" );break ; +default :mce_snprintf (e->error_msg,"unknown" );break ; + } +if (transient) +mce_snprintf (e->error_msg,"transient" ); +} + +enum banktype { +BT_UNKNOWN , +BT_PCU , +BT_UPI , +BT_M2M , +BT_IMC , +}; + +static enum banktype icelake[32 ] = { + [4 ] =BT_PCU , + [5 ] =BT_UPI , + [7 ...8 ] =BT_UPI , + [12 ] =BT_M2M , + [16 ] =BT_M2M , + [20 ] =BT_M2M , + [24 ] =BT_M2M , + [13 ...15 ] =BT_IMC , + [17 ...19 ] =BT_IMC , + [21 ...23 ] =BT_IMC , + [25 ...27 ] =BT_IMC , +}; + +static enum banktype icelake_de[32 ] = { + [4 ] =BT_PCU , + [12 ] =BT_M2M , + [16 ] =BT_M2M , + [13 ...15 ] =BT_IMC , + [17 ...19 ] =BT_IMC , +}; + +static enum banktype tremont[32 ] = { + [4 ] =BT_PCU , + [12 ] =BT_M2M , + [13 ...15 ] =BT_IMC , +}; + +static enum banktype sapphire[32 ] = { + [4 ] =BT_PCU , + [5 ] =BT_UPI , + [12 ] =BT_M2M , + [13 ...20 ] =BT_IMC , +}; + +void i10nm_memerr_misc (struct mce_event *e,int *channel); + +void i10nm_decode_model (enum cputype cputype,struct ras_events *ras, +struct mce_event *e) +{ +enum banktype banktype; +uint64_t f, status = e->status; +uint32_t mca = status &0xffff ; +int channel =-1 ; + +switch (cputype) { +case CPU_ICELAKE_XEON : + banktype = icelake[e->bank]; +break ; +case CPU_ICELAKE_DE : + banktype = icelake_de[e->bank]; +break ; +case CPU_TREMONT_D : + banktype = tremont[e->bank]; +break ; +case CPU_SAPPHIRERAPIDS : + banktype = sapphire[e->bank]; +break ; +default : +return ; + } + +switch (banktype) { +case BT_UNKNOWN : +break ; + +case BT_PCU : +mce_snprintf (e->error_msg,"PCU: " ); + f =EXTRACT (status,24 ,31 ); +if (f) +decode_bitfield (e, f, pcu1); + f =EXTRACT (status,20 ,23 ); +if (f) +decode_bitfield (e, f, pcu2); + f =EXTRACT (status,16 ,19 ); +if (f) +decode_bitfield (e, f, pcu3); +break ; + +case BT_UPI : +mce_snprintf (e->error_msg,"UPI: " ); + f =EXTRACT (status,22 ,31 ); +if (f) +decode_bitfield (e, status, upi1); + f =EXTRACT (status,16 ,21 ); +decode_bitfield (e, f, upi2); +break ; + +case BT_M2M : +mce_snprintf (e->error_msg,"M2M: " ); + f =EXTRACT (status,24 ,25 ); +mce_snprintf (e->error_msg,"MscodDDRType=0x%" PRIx64, f); + f =EXTRACT (status,26 ,31 ); +mce_snprintf (e->error_msg,"MscodMiscErrs=0x%" PRIx64, f); +decode_bitfield (e, status, m2m); +break ; + +case BT_IMC : +mce_snprintf (e->error_msg,"MemCtrl: " ); + f =EXTRACT (status,16 ,23 ); +switch (EXTRACT (status,24 ,31 )) { +case 0 :decode_bitfield (e, f, imc0);break ; +case 1 :decode_bitfield (e, f, imc1);break ; +case 2 :decode_bitfield (e, f, imc2);break ; +case 4 :decode_bitfield (e, f, imc4);break ; +case 8 :decode_bitfield (e, f, imc8);break ; +case 0x10 :decode_bitfield (e, f, imc10);break ; + } +i10nm_imc_misc (e); +break ; + } + +/* +* Memory error specific code. Returns if the error is not a MC one +*/ + +/* Check if the error is at the memory controller */ +if ((mca >>7 ) !=1 ) +return ; + +/* Ignore unless this is an corrected extended error from an iMC bank */ +if (banktype !=BT_IMC || (status &MCI_STATUS_UC )) +return ; + +/* +* Parse the reported channel +*/ + +i10nm_memerr_misc (e, &channel); +if (channel ==-1 ) +return ; +mce_snprintf (e->mc_location,"memory_channel=%d" , channel); +} + +/* +* There isn't enough information to identify the DIMM. But +* we can derive the channel from the bank number. +* There can be four memory controllers with two channels each. +*/ +void i10nm_memerr_misc (struct mce_event *e,int *channel) +{ +uint64_t status = e->status; +unsigned int chan, imc; + +/* Check this is a memory error */ +if (!test_prefix (7 , status &0xefff )) +return ; + + chan =EXTRACT (status,0 ,3 ); +if (chan ==0xf ) +return ; + +switch (e->bank) { +case 12 :/* M2M 0 */ +case 13 :/* IMC 0, Channel 0 */ +case 14 :/* IMC 0, Channel 1 */ +case 15 :/* IMC 0, Channel 2 */ + imc =0 ; +break ; +case 16 :/* M2M 1 */ +case 17 :/* IMC 1, Channel 0 */ +case 18 :/* IMC 1, Channel 1 */ +case 19 :/* IMC 1, Channel 2 */ + imc =1 ; +break ; +case 20 :/* M2M 2 */ +case 21 :/* IMC 2, Channel 0 */ +case 22 :/* IMC 2, Channel 1 */ +case 23 :/* IMC 2, Channel 2 */ + imc =2 ; +break ; +case 24 :/* M2M 3 */ +case 25 :/* IMC 3, Channel 0 */ +case 26 :/* IMC 3, Channel 1 */ +case 27 :/* IMC 3, Channel 2 */ + imc =3 ; +break ; +default : +return ; + } + + channel[0 ] = imc *3 + chan; +}mce-intel.c +5
-0@@ -411,6 +411,11 @@ int parse_intel_event(struct ras_events *ras, struct mce_event *e)case CPU_SKYLAKE_XEON :skylake_s_decode_model (ras, e);break ; +case CPU_ICELAKE_XEON : +case CPU_ICELAKE_DE : +case CPU_TREMONT_D : +case CPU_SAPPHIRERAPIDS : +i10nm_decode_model (mce->cputype, ras, e);default :break ; }ras-mce-handler.c +13
-1@@ -56,7 +56,11 @@ static char *cputype_name[] = { [CPU_KNIGHTS_MILL] = "Knights Mill", [CPU_SKYLAKE_XEON] = "Skylake server", [CPU_AMD_SMCA] = "AMD Scalable MCA", - [CPU_DHYANA] = "Hygon Family 18h Moksha" + [CPU_DHYANA] = "Hygon Family 18h Moksha", + [CPU_ICELAKE_XEON] = "Icelake server", + [CPU_ICELAKE_DE] = "Icelake server D Family", + [CPU_TREMONT_D] = "Tremont microserver", + [CPU_SAPPHIRERAPIDS] = "Sapphirerapids server", };static enum cputype select_intel_cputype (struct ras_events *ras)@@ -108,6 +112,14 @@ static enum cputype select_intel_cputype(struct ras_events *ras)return CPU_KNIGHTS_MILL ; else if (mce->model == 0x55) return CPU_SKYLAKE_XEON; + else if (mce->model == 0x6a) + return CPU_ICELAKE_XEON; + else if (mce->model == 0x6c) + return CPU_ICELAKE_DE; + else if (mce->model == 0x86) + return CPU_TREMONT_D; + else if (mce->model == 0x8f) + return CPU_SAPPHIRERAPIDS;if (mce->model >0x1a ) { log(ALL, LOG_INFO,ras-mce-handler.h +4
-0@@ -49,6 +49,10 @@ enum cputype {CPU_SKYLAKE_XEON ,CPU_AMD_SMCA ,CPU_DHYANA , +CPU_ICELAKE_XEON , +CPU_ICELAKE_DE , +CPU_TREMONT_D , + CPU_SAPPHIRERAPIDS, }; struct mce_event {
ras-mce-handler.h void tulsa_decode_model(struct mce_event *e); · line 139
Quoted 7 lines
ras-mce-handler.h +1
-0@@ -129,6 +133,7 @@ void tulsa_decode_model(struct mce_event *e);void broadwell_de_decode_model (struct ras_events *ras,struct mce_event *e);void broadwell_epex_decode_model (struct ras_events *ras,struct mce_event *e);void skylake_s_decode_model (struct ras_events *ras,struct mce_event *e); +void i10nm_decode_model (enum cputype cputype,struct ras_events *ras,struct mce_event *e);/* AMD error code decode function */ void decode_amd_errcode (struct mce_event *e);
Thanks,
Mauro