Add decodings for FAULT_REG v2: fix fault encodings and ignore addr type for gen8+ (Michel) fix engine mask Signed-off-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> --- tools/intel_error_decode.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tools/intel_error_decode.c b/tools/intel_error_decode.c index fb4a2a4..5fccefa 100644 --- a/tools/intel_error_decode.c +++ b/tools/intel_error_decode.c @@ -380,6 +380,44 @@ print_fence(unsigned int devid, uint64_t fence) } } +static void +print_fault_reg(unsigned devid, uint32_t reg) +{ + const char *gen7_types[] = { "Page", + "Invalid PD", + "Unloaded PD", + "Invalid and Unloaded PD" }; + + const char *gen8_types[] = { "PTE", + "PDE", + "PDPE", + "PML4E" }; + + const char *engine[] = { "GFX", "MFX0", "MFX1", "VEBX", + "BLT", "Unknown", "Unknown", "Unknown" }; + + if (intel_gen(devid) < 7) + return; + + if (reg & (1 << 0)) + printf(" Valid\n"); + else + return; + + if (intel_gen(devid) < 8) + printf(" %s Fault (%s)\n", gen7_types[reg >> 1 & 0x3], + reg & (1 << 11) ? "GGTT" : "PPGTT"); + else + printf(" Invalid %s Fault\n", gen8_types[reg >> 1 & 0x3]); + + if (intel_gen(devid) < 8) + printf(" Address 0x%08x\n", reg & ~((1 << 12)-1)); + else + printf(" Engine %s\n", engine[reg >> 12 & 0x7]); + + printf(" Source ID %d\n", reg >> 3 & 0xff); +} + #define MAX_RINGS 10 /* I really hope this never... */ uint32_t head[MAX_RINGS]; int head_ndx = 0; @@ -520,6 +558,10 @@ read_data_file(FILE *file) if (matched == 2) print_fence(devid, fence); + matched = sscanf(line, " FAULT_REG: 0x%08x\n", ®); + if (matched == 1 && reg) + print_fault_reg(devid, reg); + continue; } -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx