From: Tejas Upadhyay <tejas.upadhyay@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: Roper@freedesktop.org, Wajdeczko@freedesktop.org,
Matthew D <matthew.d.roper@intel.com>
Subject: [Intel-xe] [PATCH V2 1/2] drm/xe: Indroduce low level driver error counting APIs
Date: Mon, 25 Sep 2023 19:54:08 +0530 [thread overview]
Message-ID: <20230925142409.189969-2-tejas.upadhyay@intel.com> (raw)
In-Reply-To: <20230925142409.189969-1-tejas.upadhyay@intel.com>
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 occurrance. Lets introduce APIs
to define and increment each error type counter.
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@intel.com>
---
drivers/gpu/drm/xe/xe_device.h | 2 ++
drivers/gpu/drm/xe/xe_device_types.h | 9 +++++++++
drivers/gpu/drm/xe/xe_gt.c | 18 ++++++++++++++++++
drivers/gpu/drm/xe/xe_gt.h | 3 +++
drivers/gpu/drm/xe/xe_gt_types.h | 10 ++++++++++
drivers/gpu/drm/xe/xe_tile.c | 18 ++++++++++++++++++
6 files changed, 60 insertions(+)
diff --git a/drivers/gpu/drm/xe/xe_device.h b/drivers/gpu/drm/xe/xe_device.h
index c4232de40ae0..b44c91d1cec9 100644
--- a/drivers/gpu/drm/xe/xe_device.h
+++ b/drivers/gpu/drm/xe/xe_device.h
@@ -159,5 +159,7 @@ static inline bool xe_device_has_flat_ccs(struct xe_device *xe)
}
u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size);
+void xe_tile_report_driver_error(struct xe_tile *tile,
+ const enum xe_tile_drv_err_type err);
#endif
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index 32ab0fea04ee..da8c2c2ed9bd 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -57,6 +57,12 @@ struct xe_ggtt;
const struct xe_tile * : (const struct xe_device *)((tile__)->xe), \
struct xe_tile * : (tile__)->xe)
+#define XE_TILE_DRV_ERR_MAX 3
+enum xe_tile_drv_err_type {
+ XE_TILE_DRV_ERR_GGTT,
+ XE_TILE_DRV_ERR_INTR
+};
+
/**
* struct xe_mem_region - memory region structure
* This is used to describe a memory region in xe
@@ -173,6 +179,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 1aa44d4f9ac1..a1a0eb59ecc5 100644
--- a/drivers/gpu/drm/xe/xe_gt.c
+++ b/drivers/gpu/drm/xe/xe_gt.c
@@ -47,6 +47,24 @@
#include "xe_wa.h"
#include "xe_wopcm.h"
+/**
+ * xe_gt_report_driver_error - Count driver err 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 >= ARRAY_SIZE(gt->drv_err_cnt));
+ 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 d4310be3e1e7..4645ea9b7893 100644
--- a/drivers/gpu/drm/xe/xe_gt_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_types.h
@@ -24,6 +24,13 @@ enum xe_gt_type {
XE_GT_TYPE_MEDIA,
};
+#define XE_GT_DRV_ERR_MAX 3
+enum xe_gt_drv_err_type {
+ XE_GT_DRV_ERR_GUC_COMM,
+ XE_GT_DRV_ERR_ENGINE,
+ XE_GT_DRV_ERR_OTHERS
+};
+
#define XE_MAX_DSS_FUSE_REGS 3
#define XE_MAX_EU_FUSE_REGS 1
@@ -347,6 +354,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..4090798aff4c 100644
--- a/drivers/gpu/drm/xe/xe_tile.c
+++ b/drivers/gpu/drm/xe/xe_tile.c
@@ -71,6 +71,24 @@
* - MOCS and PAT programming
*/
+/**
+ * xe_tile_report_driver_error - Count driver err 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 >= ARRAY_SIZE(tile->drv_err_cnt));
+ 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
--
2.25.1
next prev parent reply other threads:[~2023-09-25 14:16 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 14:24 [Intel-xe] [PATCH V2 0/2] drm/xe: Count and report low level driver errors Tejas Upadhyay
2023-09-25 14:18 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Count and report low level driver errors (rev2) Patchwork
2023-09-25 14:18 ` [Intel-xe] ✓ CI.checkpatch: " Patchwork
2023-09-25 14:19 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-09-25 14:24 ` Tejas Upadhyay [this message]
2023-09-25 14:24 ` [Intel-xe] [PATCH V2 2/2] drm/xe: Update counter for low level driver errors Tejas Upadhyay
2023-09-25 14:26 ` [Intel-xe] ✓ CI.Build: success for drm/xe: Count and report low level driver errors (rev2) Patchwork
2023-09-25 14:27 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-09-25 14:28 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-09-25 15:00 ` [Intel-xe] ✗ CI.BAT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-09-25 14:25 [Intel-xe] [PATCH V2 0/2] drm/xe: Count and report low level driver errors Tejas Upadhyay
2023-09-25 14:25 ` [Intel-xe] [PATCH V2 1/2] drm/xe: Indroduce low level driver error counting APIs Tejas Upadhyay
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230925142409.189969-2-tejas.upadhyay@intel.com \
--to=tejas.upadhyay@intel.com \
--cc=Roper@freedesktop.org \
--cc=Wajdeczko@freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=matthew.d.roper@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox