[PATCH v4 1/2] drm/xe: Make read_perf_limit_reasons globally accessible

Thu Apr 4 18:30:09 UTC 2024

On Tue, Feb 27, 2024 at 05:09:55PM -0800, John.C.Harrison at Intel.com wrote:
>From: John Harrison <John.C.Harrison at Intel.com>
>
>Other driver code beyond the sysfs interface wants to know about
>throttling. So make the query function globally accessible.
>
>v2: Revert include order change (review feedback from Lucas)
>v3: Remove '_sysfs' from throttle file names and keep limit query in
>the same file rather than moving elsewhere (review feedback from
>Rodrigo).
>
>Signed-off-by: John Harrison <John.C.Harrison at Intel.com>
>---
> drivers/gpu/drm/xe/Makefile                   |  2 +-
> drivers/gpu/drm/xe/xe_gt_freq.c               |  4 +--
> ...e_gt_throttle_sysfs.c => xe_gt_throttle.c} | 26 +++++++++----------
> drivers/gpu/drm/xe/xe_gt_throttle.h           | 17 ++++++++++++
> drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h     | 16 ------------
> 5 files changed, 33 insertions(+), 32 deletions(-)
> rename drivers/gpu/drm/xe/{xe_gt_throttle_sysfs.c => xe_gt_throttle.c} (86%)
> create mode 100644 drivers/gpu/drm/xe/xe_gt_throttle.h
> delete mode 100644 drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h
>
>diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
>index c531210695db..82b6a3a6a987 100644
>--- a/drivers/gpu/drm/xe/Makefile
>+++ b/drivers/gpu/drm/xe/Makefile
>@@ -87,7 +87,7 @@ xe-y += xe_bb.o \
> 	xe_gt_mcr.o \
> 	xe_gt_pagefault.o \
> 	xe_gt_sysfs.o \
>-	xe_gt_throttle_sysfs.o \
>+	xe_gt_throttle.o \
> 	xe_gt_tlb_invalidation.o \
> 	xe_gt_topology.o \
> 	xe_guc.o \
>diff --git a/drivers/gpu/drm/xe/xe_gt_freq.c b/drivers/gpu/drm/xe/xe_gt_freq.c
>index 32b9a743629c..d2e035671820 100644
>--- a/drivers/gpu/drm/xe/xe_gt_freq.c
>+++ b/drivers/gpu/drm/xe/xe_gt_freq.c
>@@ -13,7 +13,7 @@
>
> #include "xe_device_types.h"
> #include "xe_gt_sysfs.h"
>-#include "xe_gt_throttle_sysfs.h"
>+#include "xe_gt_throttle.h"
> #include "xe_guc_pc.h"
> #include "xe_pm.h"
>
>@@ -250,5 +250,5 @@ void xe_gt_freq_init(struct xe_gt *gt)
> 		drm_warn(&xe->drm,  "failed to add freq attrs to %s, err: %d\n",
> 			 kobject_name(gt->freq), err);
>
>-	xe_gt_throttle_sysfs_init(gt);
>+	xe_gt_throttle_init(gt);
> }
>diff --git a/drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c b/drivers/gpu/drm/xe/xe_gt_throttle.c
>similarity index 86%
>rename from drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c
>rename to drivers/gpu/drm/xe/xe_gt_throttle.c
>index 9c33045ff1ef..e5113cca41f2 100644
>--- a/drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c
>+++ b/drivers/gpu/drm/xe/xe_gt_throttle.c
>@@ -9,14 +9,14 @@
> #include "xe_device.h"
> #include "xe_gt.h"
> #include "xe_gt_sysfs.h"
>-#include "xe_gt_throttle_sysfs.h"
>+#include "xe_gt_throttle.h"
> #include "xe_mmio.h"
> #include "xe_pm.h"
>
> /**
>  * DOC: Xe GT Throttle
>  *
>- * Provides sysfs entries for frequency throttle reasons in GT
>+ * Provides sysfs entries and other helpers for frequency throttle reasons in GT
>  *
>  * device/gt#/freq0/throttle/status - Overall status
>  * device/gt#/freq0/throttle/reason_pl1 - Frequency throttle due to PL1
>@@ -35,7 +35,7 @@ dev_to_gt(struct device *dev)
> 	return kobj_to_gt(dev->kobj.parent);
> }
>
>-static u32 read_perf_limit_reasons(struct xe_gt *gt)
>+u32 xe_gt_throttle_get_limit_reasons(struct xe_gt *gt)
> {
> 	u32 reg;
>
>@@ -51,63 +51,63 @@ static u32 read_perf_limit_reasons(struct xe_gt *gt)
>
> static u32 read_status(struct xe_gt *gt)
> {
>-	u32 status = read_perf_limit_reasons(gt) & GT0_PERF_LIMIT_REASONS_MASK;
>+	u32 status = xe_gt_throttle_get_limit_reasons(gt) & GT0_PERF_LIMIT_REASONS_MASK;
>
> 	return status;
> }
>
> static u32 read_reason_pl1(struct xe_gt *gt)
> {
>-	u32 pl1 = read_perf_limit_reasons(gt) & POWER_LIMIT_1_MASK;
>+	u32 pl1 = xe_gt_throttle_get_limit_reasons(gt) & POWER_LIMIT_1_MASK;
>
> 	return pl1;
> }
>
> static u32 read_reason_pl2(struct xe_gt *gt)
> {
>-	u32 pl2 = read_perf_limit_reasons(gt) & POWER_LIMIT_2_MASK;
>+	u32 pl2 = xe_gt_throttle_get_limit_reasons(gt) & POWER_LIMIT_2_MASK;
>
> 	return pl2;
> }
>
> static u32 read_reason_pl4(struct xe_gt *gt)
> {
>-	u32 pl4 = read_perf_limit_reasons(gt) & POWER_LIMIT_4_MASK;
>+	u32 pl4 = xe_gt_throttle_get_limit_reasons(gt) & POWER_LIMIT_4_MASK;
>
> 	return pl4;
> }
>
> static u32 read_reason_thermal(struct xe_gt *gt)
> {
>-	u32 thermal = read_perf_limit_reasons(gt) & THERMAL_LIMIT_MASK;
>+	u32 thermal = xe_gt_throttle_get_limit_reasons(gt) & THERMAL_LIMIT_MASK;
>
> 	return thermal;
> }
>
> static u32 read_reason_prochot(struct xe_gt *gt)
> {
>-	u32 prochot = read_perf_limit_reasons(gt) & PROCHOT_MASK;
>+	u32 prochot = xe_gt_throttle_get_limit_reasons(gt) & PROCHOT_MASK;
>
> 	return prochot;
> }
>
> static u32 read_reason_ratl(struct xe_gt *gt)
> {
>-	u32 ratl = read_perf_limit_reasons(gt) & RATL_MASK;
>+	u32 ratl = xe_gt_throttle_get_limit_reasons(gt) & RATL_MASK;
>
> 	return ratl;
> }
>
> static u32 read_reason_vr_thermalert(struct xe_gt *gt)
> {
>-	u32 thermalert = read_perf_limit_reasons(gt) & VR_THERMALERT_MASK;
>+	u32 thermalert = xe_gt_throttle_get_limit_reasons(gt) & VR_THERMALERT_MASK;
>
> 	return thermalert;
> }
>
> static u32 read_reason_vr_tdc(struct xe_gt *gt)
> {
>-	u32 tdc = read_perf_limit_reasons(gt) & VR_TDC_MASK;
>+	u32 tdc = xe_gt_throttle_get_limit_reasons(gt) & VR_TDC_MASK;
>
> 	return tdc;
> }
>@@ -236,7 +236,7 @@ static void gt_throttle_sysfs_fini(struct drm_device *drm, void *arg)
> 	sysfs_remove_group(gt->freq, &throttle_group_attrs);
> }
>
>-void xe_gt_throttle_sysfs_init(struct xe_gt *gt)
>+void xe_gt_throttle_init(struct xe_gt *gt)
> {
> 	struct xe_device *xe = gt_to_xe(gt);
> 	int err;
>diff --git a/drivers/gpu/drm/xe/xe_gt_throttle.h b/drivers/gpu/drm/xe/xe_gt_throttle.h
>new file mode 100644
>index 000000000000..03c20c837e67
>--- /dev/null
>+++ b/drivers/gpu/drm/xe/xe_gt_throttle.h
>@@ -0,0 +1,17 @@
>+/* SPDX-License-Identifier: MIT */
>+/*
>+ * Copyright © 2023 Intel Corporation
>+ */
>+
>+#ifndef _XE_GT_THROTTLE_H_
>+#define _XE_GT_THROTTLE_H_
>+
>+#include <drm/drm_managed.h>

we could remove this include either on this patch or as a follow up
as we don't need it.

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

Lucas De Marchi

>+
>+struct xe_gt;
>+
>+void xe_gt_throttle_init(struct xe_gt *gt);
>+
>+u32 xe_gt_throttle_get_limit_reasons(struct xe_gt *gt);
>+
>+#endif /* _XE_GT_THROTTLE_H_ */
>diff --git a/drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h b/drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h
>deleted file mode 100644
>index 3ecfd4beffe1..000000000000
>--- a/drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h
>+++ /dev/null
>@@ -1,16 +0,0 @@
>-/* SPDX-License-Identifier: MIT */
>-/*
>- * Copyright © 2023 Intel Corporation
>- */
>-
>-#ifndef _XE_GT_THROTTLE_SYSFS_H_
>-#define _XE_GT_THROTTLE_SYSFS_H_
>-
>-#include <drm/drm_managed.h>
>-
>-struct xe_gt;
>-
>-void xe_gt_throttle_sysfs_init(struct xe_gt *gt);
>-
>-#endif /* _XE_GT_THROTTLE_SYSFS_H_ */
>-
>-- 
>2.43.0
>