File tree Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Expand file tree Collapse file tree 2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -302,17 +302,19 @@ static void gen6_check_faults(struct intel_gt *gt)
302
302
{
303
303
struct intel_engine_cs * engine ;
304
304
enum intel_engine_id id ;
305
- unsigned long fault ;
306
305
307
306
for_each_engine (engine , gt , id ) {
307
+ u32 fault ;
308
+
308
309
fault = GEN6_RING_FAULT_REG_READ (engine );
310
+
309
311
if (fault & RING_FAULT_VALID ) {
310
312
gt_dbg (gt , "Unexpected fault\n"
311
- "\tAddr: 0x%08lx \n"
313
+ "\tAddr: 0x%08x \n"
312
314
"\tAddress space: %s\n"
313
315
"\tSource ID: %d\n"
314
316
"\tType: %d\n" ,
315
- fault & PAGE_MASK ,
317
+ fault & RING_FAULT_VADDR_MASK ,
316
318
fault & RING_FAULT_GTTSEL_MASK ?
317
319
"GGTT" : "PPGTT" ,
318
320
REG_FIELD_GET (RING_FAULT_SRCID_MASK , fault ),
Original file line number Diff line number Diff line change 326
326
_RING_FAULT_REG_VCS, \
327
327
_RING_FAULT_REG_VECS, \
328
328
_RING_FAULT_REG_BCS))
329
+ #define RING_FAULT_VADDR_MASK REG_GENMASK(31, 12) /* pre-bdw */
329
330
#define RING_FAULT_ENGINE_ID_MASK REG_GENMASK(16, 12) /* bdw+ */
330
331
#define RING_FAULT_GTTSEL_MASK REG_BIT(11) /* pre-bdw */
331
332
#define RING_FAULT_SRCID_MASK REG_GENMASK(10, 3)
You can’t perform that action at this time.
0 commit comments