The fault registers are multicast registers, replicated per-mslice
starting on Xe_HP.  When checking for faults, we should check each
mslice's instance of the register rather than just one of the instances.

Signed-off-by: Matt Roper <matthew.d.ro...@intel.com>
---
 drivers/gpu/drm/i915/gt/intel_gt.c      | 44 ++++++++++++++++++++++++-
 drivers/gpu/drm/i915/gt/intel_gt_regs.h |  3 ++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c 
b/drivers/gpu/drm/i915/gt/intel_gt.c
index 5001a6168d56..1992325c2895 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt.c
+++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -350,6 +350,46 @@ static void gen6_check_faults(struct intel_gt *gt)
        }
 }
 
+static void xehp_check_faults(struct intel_gt *gt)
+{
+       struct intel_uncore *uncore = gt->uncore;
+       u32 fault;
+       int mslice;
+
+       /* Check each mslice's fault register */
+       for (mslice = 0; mslice < 4; mslice++) {
+               fault = intel_uncore_read_with_mcr_steering(uncore,
+                                                           XEHP_RING_FAULT_REG,
+                                                           mslice, 0);
+               if (fault & RING_FAULT_VALID) {
+                       u32 fault_data0, fault_data1;
+                       u64 fault_addr;
+
+                       fault_data0 = 
intel_uncore_read_with_mcr_steering(uncore,
+                                                                         
XEHP_FAULT_TLB_DATA0,
+                                                                         
mslice, 0);
+                       fault_data1 = 
intel_uncore_read_with_mcr_steering(uncore,
+                                                                         
XEHP_FAULT_TLB_DATA1,
+                                                                         
mslice, 0);
+
+                       fault_addr = ((u64)(fault_data1 & FAULT_VA_HIGH_BITS) 
<< 44) |
+                                    ((u64)fault_data0 << 12);
+
+                       drm_dbg(&uncore->i915->drm, "Unexpected fault\n"
+                               "\tAddr: 0x%08x_%08x\n"
+                               "\tAddress space: %s\n"
+                               "\tEngine ID: %d\n"
+                               "\tSource ID: %d\n"
+                               "\tType: %d\n",
+                               upper_32_bits(fault_addr), 
lower_32_bits(fault_addr),
+                               fault_data1 & FAULT_GTT_SEL ? "GGTT" : "PPGTT",
+                               GEN8_RING_FAULT_ENGINE_ID(fault),
+                               RING_FAULT_SRCID(fault),
+                               RING_FAULT_FAULT_TYPE(fault));
+               }
+       }
+}
+
 static void gen8_check_faults(struct intel_gt *gt)
 {
        struct intel_uncore *uncore = gt->uncore;
@@ -396,7 +436,9 @@ void intel_gt_check_and_clear_faults(struct intel_gt *gt)
        struct drm_i915_private *i915 = gt->i915;
 
        /* From GEN8 onwards we only have one 'All Engine Fault Register' */
-       if (GRAPHICS_VER(i915) >= 8)
+       if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50))
+               xehp_check_faults(gt);
+       else if (GRAPHICS_VER(i915) >= 8)
                gen8_check_faults(gt);
        else if (GRAPHICS_VER(i915) >= 6)
                gen6_check_faults(gt);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h 
b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index 0f05bbda773e..a060de66126a 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -966,11 +966,14 @@
 #define GEN9_BLT_MOCS(i)                       _MMIO(__GEN9_BCS0_MOCS0 + (i) * 
4)
 
 #define GEN12_FAULT_TLB_DATA0                  _MMIO(0xceb8)
+#define XEHP_FAULT_TLB_DATA0                   _MMIO(0xceb8)
 #define GEN12_FAULT_TLB_DATA1                  _MMIO(0xcebc)
+#define XEHP_FAULT_TLB_DATA1                   _MMIO(0xcebc)
 #define   FAULT_VA_HIGH_BITS                   (0xf << 0)
 #define   FAULT_GTT_SEL                                (1 << 4)
 
 #define GEN12_RING_FAULT_REG                   _MMIO(0xcec4)
+#define XEHP_RING_FAULT_REG                    _MMIO(0xcec4)
 #define   GEN8_RING_FAULT_ENGINE_ID(x)         (((x) >> 12) & 0x7)
 #define   RING_FAULT_GTTSEL_MASK               (1 << 11)
 #define   RING_FAULT_SRCID(x)                  (((x) >> 3) & 0xff)
-- 
2.34.1

Reply via email to