Add a new field to the xe_pagefault struct, address_type, that tracks
the type of fault the pagefault incurred.

Signed-off-by: Jonathan Cavitt <jonathan.cav...@intel.com>
---
 drivers/gpu/drm/xe/xe_gt_pagefault.c | 3 +++
 drivers/gpu/drm/xe/xe_gt_pagefault.h | 1 +
 2 files changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c 
b/drivers/gpu/drm/xe/xe_gt_pagefault.c
index 964ca1efb698..fa8bf743d4d7 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.c
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c
@@ -206,11 +206,13 @@ static int handle_pagefault(struct xe_gt *gt, struct 
xe_pagefault *pf)
 
        vma = lookup_vma(vm, pf->page_addr);
        if (!vma) {
+               pf->address_type = DRM_XE_FAULT_ADDRESS_TYPE_NONE_EXT;
                err = -EINVAL;
                goto unlock_vm;
        }
 
        if (xe_vma_read_only(vma) && pf->access_type != 
XE_PAGEFAULT_ACCESS_TYPE_READ) {
+               pf->address_type = DRM_XE_FAULT_ADDRESS_TYPE_WRITE_INVALID_EXT;
                err = -EPERM;
                goto unlock_vm;
        }
@@ -284,6 +286,7 @@ static bool get_pagefault(struct pf_queue *pf_queue, struct 
xe_pagefault *pf)
                pf->asid = FIELD_GET(PFD_ASID, desc->dw1);
                pf->vfid = FIELD_GET(PFD_VFID, desc->dw2);
                pf->access_type = FIELD_GET(PFD_ACCESS_TYPE, desc->dw2);
+               pf->address_type = 0;
                pf->fault_type = FIELD_GET(PFD_FAULT_TYPE, desc->dw2);
                pf->page_addr = (u64)(FIELD_GET(PFD_VIRTUAL_ADDR_HI, 
desc->dw3)) <<
                        PFD_VIRTUAL_ADDR_HI_SHIFT;
diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.h 
b/drivers/gpu/drm/xe/xe_gt_pagefault.h
index 33616043d17a..969f7b458d3f 100644
--- a/drivers/gpu/drm/xe/xe_gt_pagefault.h
+++ b/drivers/gpu/drm/xe/xe_gt_pagefault.h
@@ -17,6 +17,7 @@ struct xe_pagefault {
        u16 pdata;
        u8 vfid;
        u8 access_type;
+       u8 address_type;
        u8 fault_type;
        u8 fault_level;
        u8 engine_class;
-- 
2.43.0

Reply via email to