[Intel-xe] [PATCH V8 1/2] drm/xe: Introduce low level driver error counting APIs
Tejas Upadhyay
tejas.upadhyay at intel.com
Wed Oct 18 10:36:02 UTC 2023
Low level driver error that might have power or performance
impact on the system, we are adding a new error counter to GT
and tile and increment on each occurrence. Lets introduce APIs
to define and increment each error type counter.
v6:
- dont redefine err max - Michal
- Fix assert conditions - Michal
V5:
- Fix MAX enum issue
- Use kernel doc for enum - Niranjana
V4:
- Move API declaration under tile.h - Jani
- Typos
V3:
- correct #define max value
V2:
- Move some code to its related patch - Michal
- Renaming if API and enum - Michal
- GUC errors are moved per GT - Michal
- Some nits - Michal
Signed-off-by: Tejas Upadhyay <tejas.upadhyay at intel.com>
---
drivers/gpu/drm/xe/xe_device_types.h | 15 +++++++++++++++
drivers/gpu/drm/xe/xe_gt.c | 19 +++++++++++++++++++
drivers/gpu/drm/xe/xe_gt.h | 3 +++
drivers/gpu/drm/xe/xe_gt_types.h | 17 +++++++++++++++++
drivers/gpu/drm/xe/xe_tile.c | 19 +++++++++++++++++++
drivers/gpu/drm/xe/xe_tile.h | 2 ++
6 files changed, 75 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 44d622d4cc3a..da88e69beeaf 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -61,6 +61,18 @@ struct xe_pat_ops;
const struct xe_tile * : (const struct xe_device *)((tile__)->xe), \
struct xe_tile * : (tile__)->xe)
+/** @enum xe_tile_drv_err_type
+ * enum for different types of tile level errors in driver
+ */
+enum xe_tile_drv_err_type {
+ /* Error type for all PPGTT and GTT errors */
+ XE_TILE_DRV_ERR_GTT,
+ /* Interrupt errors */
+ XE_TILE_DRV_ERR_INTR,
+ /* Max defined error types, keep this last */
+ __XE_TILE_DRV_ERR_MAX
+};
+
/**
* struct xe_mem_region - memory region structure
* This is used to describe a memory region in xe
@@ -190,6 +202,9 @@ struct xe_tile {
/** @sysfs: sysfs' kobj used by xe_tile_sysfs */
struct kobject *sysfs;
+
+ /** @drv_err_cnt: driver error counter for this tile */
+ u32 drv_err_cnt[__XE_TILE_DRV_ERR_MAX];
};
/**
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c
index 74e1f47bd401..3c13f41ec21a 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -48,6 +48,25 @@
#include "xe_wa.h"
#include "xe_wopcm.h"
+/**
+ * xe_gt_report_driver_error - Count driver error for gt
+ * @gt: GT to count error for
+ * @err: enum error type
+ *
+ * Increment the driver error counter in respective error
+ * category for this GT.
+ *
+ * Returns void.
+ */
+void xe_gt_report_driver_error(struct xe_gt *gt,
+ const enum xe_gt_drv_err_type err)
+{
+ xe_gt_assert(gt, err >= 0);
+ xe_gt_assert(gt, err < __XE_GT_DRV_ERR_MAX);
+ WRITE_ONCE(gt->drv_err_cnt[err],
+ READ_ONCE(gt->drv_err_cnt[err]) + 1);
+}
+
struct xe_gt *xe_gt_alloc(struct xe_tile *tile)
{
struct xe_gt *gt;
diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h
index caded203a8a0..9442d615042f 100644
--- a/drivers/gpu/drm/xe/xe_gt.h
+++ b/drivers/gpu/drm/xe/xe_gt.h
@@ -67,4 +67,7 @@ static inline bool xe_gt_is_usm_hwe(struct xe_gt *gt, struct xe_hw_engine *hwe)
hwe->instance == gt->usm.reserved_bcs_instance;
}
+void xe_gt_report_driver_error(struct xe_gt *gt,
+ const enum xe_gt_drv_err_type err);
+
#endif
diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
index d3f2793684e2..6a6609162b3d 100644
--- a/drivers/gpu/drm/xe/xe_gt_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_types.h
@@ -24,6 +24,20 @@ enum xe_gt_type {
XE_GT_TYPE_MEDIA,
};
+/** @enum xe_gt_drv_err_type
+ * enum for different types of gt level errors in driver
+ */
+enum xe_gt_drv_err_type {
+ /* Driver guc communication errors */
+ XE_GT_DRV_ERR_GUC_COMM,
+ /* Engine execution errors */
+ XE_GT_DRV_ERR_ENGINE,
+ /* Other errors like error during save/restore registers */
+ XE_GT_DRV_ERR_OTHERS,
+ /* Max defined error types, keep this last */
+ __XE_GT_DRV_ERR_MAX
+};
+
#define XE_MAX_DSS_FUSE_REGS 3
#define XE_MAX_EU_FUSE_REGS 1
@@ -347,6 +361,9 @@ struct xe_gt {
/** @oob: bitmap with active OOB workaroudns */
unsigned long *oob;
} wa_active;
+
+ /** @drv_err_cnt: driver error counter for this GT */
+ u32 drv_err_cnt[__XE_GT_DRV_ERR_MAX];
};
#endif
diff --git a/drivers/gpu/drm/xe/xe_tile.c b/drivers/gpu/drm/xe/xe_tile.c
index 131752a57f65..b31dc63ea7c2 100644
--- a/drivers/gpu/drm/xe/xe_tile.c
+++ b/drivers/gpu/drm/xe/xe_tile.c
@@ -71,6 +71,25 @@
* - MOCS and PAT programming
*/
+/**
+ * xe_tile_report_driver_error - Count driver error for tile
+ * @tile: Tile to count error for
+ * @err: enum error type
+ *
+ * Increment the driver error counter in respective error
+ * category for this tile.
+ *
+ * Returns void.
+ */
+void xe_tile_report_driver_error(struct xe_tile *tile,
+ const enum xe_tile_drv_err_type err)
+{
+ xe_assert(tile_to_xe(tile), err >= 0);
+ xe_assert(tile_to_xe(tile), err < __XE_TILE_DRV_ERR_MAX);
+ WRITE_ONCE(tile->drv_err_cnt[err],
+ READ_ONCE(tile->drv_err_cnt[err]) + 1);
+}
+
/**
* xe_tile_alloc - Perform per-tile memory allocation
* @tile: Tile to perform allocations for
diff --git a/drivers/gpu/drm/xe/xe_tile.h b/drivers/gpu/drm/xe/xe_tile.h
index 782c47f8bd45..092a6b17a97e 100644
--- a/drivers/gpu/drm/xe/xe_tile.h
+++ b/drivers/gpu/drm/xe/xe_tile.h
@@ -14,5 +14,7 @@ int xe_tile_alloc(struct xe_tile *tile);
int xe_tile_init_noalloc(struct xe_tile *tile);
void xe_tile_migrate_wait(struct xe_tile *tile);
+void xe_tile_report_driver_error(struct xe_tile *tile,
+ const enum xe_tile_drv_err_type err);
#endif
--
2.25.1
More information about the Intel-xe
mailing list