drm/xe: Make read_perf_limit_reasons globally accessible

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).
v4: Correct #include while renaming header file (review feedback
from Lucas).

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240518043700.3264362-2-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 71b5c35ee4c272014b4539a94858add93271d92a..ae07f3d6a0689590cb3c8c3a6a197aeac5e955fc 100644 (file)
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -89,7 +89,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 e0305942644c6e520b94ef540c8c2ee935e81d26..68a5778b4319fde12cb1b520c95b64f2a89c1792 100644 (file)
--- 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"
 
@@ -245,5 +245,5 @@ int xe_gt_freq_init(struct xe_gt *gt)
        if (err)
                return err;
 
-       return xe_gt_throttle_sysfs_init(gt);
+       return 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 85%
rename from drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c
rename to drivers/gpu/drm/xe/xe_gt_throttle.c
index c9e04151286d7cb3f1a1dec6c71274fc778a14b6..25963e33a3834e07d4503f382ea02cc11b198754 100644 (file)
--- 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(void *arg)
        sysfs_remove_group(gt->freq, &throttle_group_attrs);
 }
 
-int xe_gt_throttle_sysfs_init(struct xe_gt *gt)
+int 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 (file)
index 0000000..0227749
--- /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 <linux/types.h>
+
+struct xe_gt;
+
+int 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 (file)
index 335c402..0000000
--- a/drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2023 Intel Corporation
- */
-
-#ifndef _XE_GT_THROTTLE_SYSFS_H_
-#define _XE_GT_THROTTLE_SYSFS_H_
-
-struct xe_gt;
-
-int xe_gt_throttle_sysfs_init(struct xe_gt *gt);
-
-#endif