From: Badal Nilawar <badal.nilawar@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: anshuman.gupta@intel.com, jon.ewins@intel.com,
ashutosh.dixit@intel.com, riana.tauro@intel.com,
linux-hwmon@vger.kernel.org
Subject: [PATCH 2/4] drm/i915/hwmon: Add HWMON current voltage support
Date: Tue, 21 Jun 2022 02:16:47 +0530 [thread overview]
Message-ID: <20220620204649.894703-3-badal.nilawar@intel.com> (raw)
In-Reply-To: <20220620204649.894703-1-badal.nilawar@intel.com>
From: Riana Tauro <riana.tauro@intel.com>
As part of the System Managemenent Interface (SMI), use the HWMON
subsystem to display current voltage
v2:
- Updated date and kernel version in feature description
- Fixed review comments (Ashutosh)
Cc: Anshuman Gupta <anshuman.gupta@intel.com>
Signed-off-by: Riana Tauro <riana.tauro@intel.com>
Signed-off-by: Badal Nilawar <badal.nilawar@intel.com>
---
.../ABI/testing/sysfs-driver-intel-i915-hwmon | 7 +++
drivers/gpu/drm/i915/gt/intel_gt_regs.h | 3 +
drivers/gpu/drm/i915/i915_hwmon.c | 63 +++++++++++++++++++
3 files changed, 73 insertions(+)
create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
diff --git a/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
new file mode 100644
index 000000000000..24c4b7477d51
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
@@ -0,0 +1,7 @@
+What: /sys/devices/.../hwmon/hwmon<i>/in0_input
+Date: June 2022
+KernelVersion: 5.19
+Contact: dri-devel@lists.freedesktop.org
+Description: RO. Current Voltage in millivolt.
+
+ Only supported for particular Intel i915 graphics platforms.
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index 07ef111947b8..63a39e1e00e2 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -1487,6 +1487,9 @@
#define VLV_RENDER_C0_COUNT _MMIO(0x138118)
#define VLV_MEDIA_C0_COUNT _MMIO(0x13811c)
+#define GEN12_RPSTAT1 _MMIO(0x1381b4)
+#define GEN12_VOLTAGE_MASK REG_GENMASK(10, 0)
+
#define GEN11_GT_INTR_DW(x) _MMIO(0x190018 + ((x) * 4))
#define GEN11_CSME (31)
#define GEN11_GUNIT (28)
diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
index 2ef40b0c1e70..fc06db790243 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.c
+++ b/drivers/gpu/drm/i915/i915_hwmon.c
@@ -14,9 +14,11 @@
#include "i915_hwmon.h"
#include "i915_drv.h"
#include "intel_mchbar_regs.h"
+#include "gt/intel_gt_regs.h"
struct i915_hwmon_reg {
+ i915_reg_t gt_perf_status;
};
struct i915_hwmon_drvdata {
@@ -53,15 +55,65 @@ static const struct attribute_group *hwmon_groups[] = {
};
+/*
+ * HWMON SENSOR TYPE = hwmon_in
+ * - Voltage Input value (in0_input)
+ */
+static const u32 i915_config_in[] = {
+ HWMON_I_INPUT,
+ 0
+};
+
+static const struct hwmon_channel_info i915_in = {
+ .type = hwmon_in,
+ .config = i915_config_in,
+};
+
static const struct hwmon_channel_info *i915_info[] = {
+ &i915_in,
NULL
};
+static umode_t
+i915_in_is_visible(const struct i915_hwmon_drvdata *ddat, u32 attr)
+{
+ struct drm_i915_private *i915 = ddat->uncore->i915;
+
+ switch (attr) {
+ case hwmon_in_input:
+ return (IS_DG1(i915) || IS_DG2(i915)) ? 0444 : 0;
+ default:
+ return 0;
+ }
+}
+
+static int
+i915_in_read(struct i915_hwmon_drvdata *ddat, u32 attr, long *val)
+{
+ struct i915_hwmon *hwmon = ddat->hwmon;
+ intel_wakeref_t wakeref;
+ u32 reg_value;
+
+ switch (attr) {
+ case hwmon_in_input:
+ with_intel_runtime_pm(ddat->uncore->rpm, wakeref)
+ reg_value = intel_uncore_read(ddat->uncore, hwmon->rg.gt_perf_status);
+ *val = DIV_ROUND_CLOSEST(REG_FIELD_GET(GEN12_VOLTAGE_MASK, reg_value) * 25, 10);
+ return 0;
+ default:
+ return -EOPNOTSUPP;
+ }
+}
+
static umode_t
i915_is_visible(const void *drvdata, enum hwmon_sensor_types type,
u32 attr, int channel)
{
+ struct i915_hwmon_drvdata *ddat = (struct i915_hwmon_drvdata *)drvdata;
+
switch (type) {
+ case hwmon_in:
+ return i915_in_is_visible(ddat, attr);
default:
return 0;
}
@@ -71,7 +123,11 @@ static int
i915_read(struct device *dev, enum hwmon_sensor_types type, u32 attr,
int channel, long *val)
{
+ struct i915_hwmon_drvdata *ddat = dev_get_drvdata(dev);
+
switch (type) {
+ case hwmon_in:
+ return i915_in_read(ddat, attr, val);
default:
return -EOPNOTSUPP;
}
@@ -101,6 +157,13 @@ static const struct hwmon_chip_info i915_chip_info = {
static void
i915_hwmon_get_preregistration_info(struct drm_i915_private *i915)
{
+ struct i915_hwmon *hwmon = i915->hwmon;
+
+ if (IS_DG1(i915) || IS_DG2(i915)) {
+ hwmon->rg.gt_perf_status = GEN12_RPSTAT1;
+ } else {
+ hwmon->rg.gt_perf_status = INVALID_MMIO_REG;
+ }
}
--
2.25.1
next prev parent reply other threads:[~2022-06-20 20:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 20:46 [PATCH 0/4] drm/i915: Add HWMON support Badal Nilawar
2022-06-20 20:46 ` [PATCH 1/4] drm/i915/hwmon: Add HWMON infrastructure patch Badal Nilawar
2022-06-20 20:46 ` Badal Nilawar [this message]
2022-06-20 21:06 ` [PATCH 2/4] drm/i915/hwmon: Add HWMON current voltage support Guenter Roeck
2022-06-20 20:46 ` [PATCH 3/4] drm/i915/hwmon: Add HWMON power sensor support Badal Nilawar
2022-06-20 20:58 ` Guenter Roeck
2022-06-21 6:41 ` Dixit, Ashutosh
2022-06-21 17:44 ` Guenter Roeck
2022-06-21 19:29 ` Dixit, Ashutosh
2022-06-21 21:26 ` Guenter Roeck
2022-06-20 20:46 ` [PATCH 4/4] drm/i915/hwmon: Add HWMON energy support Badal Nilawar
2022-06-20 21:04 ` Guenter Roeck
2022-06-21 6:41 ` Dixit, Ashutosh
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=20220620204649.894703-3-badal.nilawar@intel.com \
--to=badal.nilawar@intel.com \
--cc=anshuman.gupta@intel.com \
--cc=ashutosh.dixit@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jon.ewins@intel.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=riana.tauro@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