-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
drm/xe/hwmon: Expose power attributes
Expose Card reactive sustained (pl1) power limit as power_max and card default power limit (tdp) as power_rated_max. v2: - Fix review comments (Riana) v3: - Use drmm_mutex_init (Matt Brost) - Print error value (Matt Brost) - Convert enums to uppercase (Matt Brost) - Avoid extra reg read in hwmon_is_visible function (Riana) - Use xe_device_assert_mem_access when applicable (Matt Brost) - Add intel-xe@lists.freedesktop.org in Documentation (Matt Brost) v4: - Use prefix xe_hwmon prefix for all functions (Matt Brost/Andi) - %s/hwmon_reg/xe_hwmon_reg (Andi) - Fix review comments (Guenter/Andi) v5: - Fix review comments (Riana) v6: - Use drm_warn in default case (Rodrigo) - s/ENODEV/EOPNOTSUPP (Andi) Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by: Riana Tauro <riana.tauro@intel.com> Signed-off-by: Badal Nilawar <badal.nilawar@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://lore.kernel.org/r/20230925081842.3566834-2-badal.nilawar@intel.com Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
- Loading branch information
Badal Nilawar
authored and
Rodrigo Vivi
committed
Dec 21, 2023
1 parent
9a674be
commit fb1b706
Showing
8 changed files
with
445 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
What: /sys/devices/.../hwmon/hwmon<i>/power1_max | ||
Date: September 2023 | ||
KernelVersion: 6.5 | ||
Contact: intel-xe@lists.freedesktop.org | ||
Description: RW. Card reactive sustained (PL1) power limit in microwatts. | ||
|
||
The power controller will throttle the operating frequency | ||
if the power averaged over a window (typically seconds) | ||
exceeds this limit. A read value of 0 means that the PL1 | ||
power limit is disabled, writing 0 disables the | ||
limit. Writing values > 0 and <= TDP will enable the power limit. | ||
|
||
Only supported for particular Intel xe graphics platforms. | ||
|
||
What: /sys/devices/.../hwmon/hwmon<i>/power1_rated_max | ||
Date: September 2023 | ||
KernelVersion: 6.5 | ||
Contact: intel-xe@lists.freedesktop.org | ||
Description: RO. Card default power limit (default TDP setting). | ||
|
||
Only supported for particular Intel xe graphics platforms. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/* SPDX-License-Identifier: MIT */ | ||
/* | ||
* Copyright © 2023 Intel Corporation | ||
*/ | ||
|
||
#ifndef _XE_MCHBAR_REGS_H_ | ||
#define _XE_MCHBAR_REGS_H_ | ||
|
||
#include "regs/xe_reg_defs.h" | ||
|
||
/* | ||
* MCHBAR mirror. | ||
* | ||
* This mirrors the MCHBAR MMIO space whose location is determined by | ||
* device 0 function 0's pci config register 0x44 or 0x48 and matches it in | ||
* every way. | ||
*/ | ||
|
||
#define MCHBAR_MIRROR_BASE_SNB 0x140000 | ||
|
||
#define PCU_CR_PACKAGE_POWER_SKU XE_REG(MCHBAR_MIRROR_BASE_SNB + 0x5930) | ||
#define PKG_TDP GENMASK_ULL(14, 0) | ||
#define PKG_MIN_PWR GENMASK_ULL(30, 16) | ||
#define PKG_MAX_PWR GENMASK_ULL(46, 32) | ||
|
||
#define PCU_CR_PACKAGE_POWER_SKU_UNIT XE_REG(MCHBAR_MIRROR_BASE_SNB + 0x5938) | ||
#define PKG_PWR_UNIT REG_GENMASK(3, 0) | ||
|
||
#define PCU_CR_PACKAGE_RAPL_LIMIT XE_REG(MCHBAR_MIRROR_BASE_SNB + 0x59a0) | ||
#define PKG_PWR_LIM_1 REG_GENMASK(14, 0) | ||
#define PKG_PWR_LIM_1_EN REG_BIT(15) | ||
|
||
#endif /* _XE_MCHBAR_REGS_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,358 @@ | ||
// SPDX-License-Identifier: MIT | ||
/* | ||
* Copyright © 2023 Intel Corporation | ||
*/ | ||
|
||
#include <linux/hwmon.h> | ||
|
||
#include <drm/drm_managed.h> | ||
#include "regs/xe_gt_regs.h" | ||
#include "regs/xe_mchbar_regs.h" | ||
#include "xe_device.h" | ||
#include "xe_gt.h" | ||
#include "xe_hwmon.h" | ||
#include "xe_mmio.h" | ||
|
||
enum xe_hwmon_reg { | ||
REG_PKG_RAPL_LIMIT, | ||
REG_PKG_POWER_SKU, | ||
REG_PKG_POWER_SKU_UNIT, | ||
}; | ||
|
||
enum xe_hwmon_reg_operation { | ||
REG_READ, | ||
REG_WRITE, | ||
REG_RMW, | ||
}; | ||
|
||
/* | ||
* SF_* - scale factors for particular quantities according to hwmon spec. | ||
*/ | ||
#define SF_POWER 1000000 /* microwatts */ | ||
|
||
struct xe_hwmon { | ||
struct device *hwmon_dev; | ||
struct xe_gt *gt; | ||
struct mutex hwmon_lock; /* rmw operations*/ | ||
int scl_shift_power; | ||
}; | ||
|
||
static u32 xe_hwmon_get_reg(struct xe_hwmon *hwmon, enum xe_hwmon_reg hwmon_reg) | ||
{ | ||
struct xe_device *xe = gt_to_xe(hwmon->gt); | ||
struct xe_reg reg = XE_REG(0); | ||
|
||
switch (hwmon_reg) { | ||
case REG_PKG_RAPL_LIMIT: | ||
if (xe->info.platform == XE_DG2) | ||
reg = PCU_CR_PACKAGE_RAPL_LIMIT; | ||
else if (xe->info.platform == XE_PVC) | ||
reg = PVC_GT0_PACKAGE_RAPL_LIMIT; | ||
break; | ||
case REG_PKG_POWER_SKU: | ||
if (xe->info.platform == XE_DG2) | ||
reg = PCU_CR_PACKAGE_POWER_SKU; | ||
else if (xe->info.platform == XE_PVC) | ||
reg = PVC_GT0_PACKAGE_POWER_SKU; | ||
break; | ||
case REG_PKG_POWER_SKU_UNIT: | ||
if (xe->info.platform == XE_DG2) | ||
reg = PCU_CR_PACKAGE_POWER_SKU_UNIT; | ||
else if (xe->info.platform == XE_PVC) | ||
reg = PVC_GT0_PACKAGE_POWER_SKU_UNIT; | ||
break; | ||
default: | ||
drm_warn(&xe->drm, "Unknown xe hwmon reg id: %d\n", hwmon_reg); | ||
break; | ||
} | ||
|
||
return reg.raw; | ||
} | ||
|
||
static int xe_hwmon_process_reg(struct xe_hwmon *hwmon, enum xe_hwmon_reg hwmon_reg, | ||
enum xe_hwmon_reg_operation operation, u32 *value, | ||
u32 clr, u32 set) | ||
{ | ||
struct xe_reg reg; | ||
|
||
reg.raw = xe_hwmon_get_reg(hwmon, hwmon_reg); | ||
|
||
if (!reg.raw) | ||
return -EOPNOTSUPP; | ||
|
||
switch (operation) { | ||
case REG_READ: | ||
*value = xe_mmio_read32(hwmon->gt, reg); | ||
return 0; | ||
case REG_WRITE: | ||
xe_mmio_write32(hwmon->gt, reg, *value); | ||
return 0; | ||
case REG_RMW: | ||
*value = xe_mmio_rmw32(hwmon->gt, reg, clr, set); | ||
return 0; | ||
default: | ||
drm_warn(>_to_xe(hwmon->gt)->drm, "Invalid xe hwmon reg operation: %d\n", | ||
operation); | ||
return -EOPNOTSUPP; | ||
} | ||
} | ||
|
||
static int xe_hwmon_process_reg_read64(struct xe_hwmon *hwmon, | ||
enum xe_hwmon_reg hwmon_reg, u64 *value) | ||
{ | ||
struct xe_reg reg; | ||
|
||
reg.raw = xe_hwmon_get_reg(hwmon, hwmon_reg); | ||
|
||
if (!reg.raw) | ||
return -EOPNOTSUPP; | ||
|
||
*value = xe_mmio_read64_2x32(hwmon->gt, reg); | ||
|
||
return 0; | ||
} | ||
|
||
#define PL1_DISABLE 0 | ||
|
||
/* | ||
* HW allows arbitrary PL1 limits to be set but silently clamps these values to | ||
* "typical but not guaranteed" min/max values in REG_PKG_POWER_SKU. Follow the | ||
* same pattern for sysfs, allow arbitrary PL1 limits to be set but display | ||
* clamped values when read. | ||
*/ | ||
static int xe_hwmon_power_max_read(struct xe_hwmon *hwmon, long *value) | ||
{ | ||
u32 reg_val; | ||
u64 reg_val64, min, max; | ||
|
||
xe_hwmon_process_reg(hwmon, REG_PKG_RAPL_LIMIT, REG_READ, ®_val, 0, 0); | ||
/* Check if PL1 limit is disabled */ | ||
if (!(reg_val & PKG_PWR_LIM_1_EN)) { | ||
*value = PL1_DISABLE; | ||
return 0; | ||
} | ||
|
||
reg_val = REG_FIELD_GET(PKG_PWR_LIM_1, reg_val); | ||
*value = mul_u64_u32_shr(reg_val, SF_POWER, hwmon->scl_shift_power); | ||
|
||
xe_hwmon_process_reg_read64(hwmon, REG_PKG_POWER_SKU, ®_val64); | ||
min = REG_FIELD_GET(PKG_MIN_PWR, reg_val64); | ||
min = mul_u64_u32_shr(min, SF_POWER, hwmon->scl_shift_power); | ||
max = REG_FIELD_GET(PKG_MAX_PWR, reg_val64); | ||
max = mul_u64_u32_shr(max, SF_POWER, hwmon->scl_shift_power); | ||
|
||
if (min && max) | ||
*value = clamp_t(u64, *value, min, max); | ||
|
||
return 0; | ||
} | ||
|
||
static int xe_hwmon_power_max_write(struct xe_hwmon *hwmon, long value) | ||
{ | ||
u32 reg_val; | ||
|
||
/* Disable PL1 limit and verify, as limit cannot be disabled on all platforms */ | ||
if (value == PL1_DISABLE) { | ||
xe_hwmon_process_reg(hwmon, REG_PKG_RAPL_LIMIT, REG_RMW, ®_val, | ||
PKG_PWR_LIM_1_EN, 0); | ||
xe_hwmon_process_reg(hwmon, REG_PKG_RAPL_LIMIT, REG_READ, ®_val, | ||
PKG_PWR_LIM_1_EN, 0); | ||
|
||
if (reg_val & PKG_PWR_LIM_1_EN) | ||
return -EOPNOTSUPP; | ||
} | ||
|
||
/* Computation in 64-bits to avoid overflow. Round to nearest. */ | ||
reg_val = DIV_ROUND_CLOSEST_ULL((u64)value << hwmon->scl_shift_power, SF_POWER); | ||
reg_val = PKG_PWR_LIM_1_EN | REG_FIELD_PREP(PKG_PWR_LIM_1, reg_val); | ||
|
||
xe_hwmon_process_reg(hwmon, REG_PKG_RAPL_LIMIT, REG_RMW, ®_val, | ||
PKG_PWR_LIM_1_EN | PKG_PWR_LIM_1, reg_val); | ||
|
||
return 0; | ||
} | ||
|
||
static int xe_hwmon_power_rated_max_read(struct xe_hwmon *hwmon, long *value) | ||
{ | ||
u32 reg_val; | ||
|
||
xe_hwmon_process_reg(hwmon, REG_PKG_POWER_SKU, REG_READ, ®_val, 0, 0); | ||
reg_val = REG_FIELD_GET(PKG_TDP, reg_val); | ||
*value = mul_u64_u32_shr(reg_val, SF_POWER, hwmon->scl_shift_power); | ||
|
||
return 0; | ||
} | ||
|
||
static const struct hwmon_channel_info *hwmon_info[] = { | ||
HWMON_CHANNEL_INFO(power, HWMON_P_MAX | HWMON_P_RATED_MAX), | ||
NULL | ||
}; | ||
|
||
static umode_t | ||
xe_hwmon_power_is_visible(struct xe_hwmon *hwmon, u32 attr, int chan) | ||
{ | ||
switch (attr) { | ||
case hwmon_power_max: | ||
return xe_hwmon_get_reg(hwmon, REG_PKG_RAPL_LIMIT) ? 0664 : 0; | ||
case hwmon_power_rated_max: | ||
return xe_hwmon_get_reg(hwmon, REG_PKG_POWER_SKU) ? 0444 : 0; | ||
default: | ||
return 0; | ||
} | ||
} | ||
|
||
static int | ||
xe_hwmon_power_read(struct xe_hwmon *hwmon, u32 attr, int chan, long *val) | ||
{ | ||
switch (attr) { | ||
case hwmon_power_max: | ||
return xe_hwmon_power_max_read(hwmon, val); | ||
case hwmon_power_rated_max: | ||
return xe_hwmon_power_rated_max_read(hwmon, val); | ||
default: | ||
return -EOPNOTSUPP; | ||
} | ||
} | ||
|
||
static int | ||
xe_hwmon_power_write(struct xe_hwmon *hwmon, u32 attr, int chan, long val) | ||
{ | ||
switch (attr) { | ||
case hwmon_power_max: | ||
return xe_hwmon_power_max_write(hwmon, val); | ||
default: | ||
return -EOPNOTSUPP; | ||
} | ||
} | ||
|
||
static umode_t | ||
xe_hwmon_is_visible(const void *drvdata, enum hwmon_sensor_types type, | ||
u32 attr, int channel) | ||
{ | ||
struct xe_hwmon *hwmon = (struct xe_hwmon *)drvdata; | ||
int ret; | ||
|
||
xe_device_mem_access_get(gt_to_xe(hwmon->gt)); | ||
|
||
switch (type) { | ||
case hwmon_power: | ||
ret = xe_hwmon_power_is_visible(hwmon, attr, channel); | ||
break; | ||
default: | ||
ret = 0; | ||
break; | ||
} | ||
|
||
xe_device_mem_access_put(gt_to_xe(hwmon->gt)); | ||
|
||
return ret; | ||
} | ||
|
||
static int | ||
xe_hwmon_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, | ||
int channel, long *val) | ||
{ | ||
struct xe_hwmon *hwmon = dev_get_drvdata(dev); | ||
int ret; | ||
|
||
xe_device_mem_access_get(gt_to_xe(hwmon->gt)); | ||
|
||
switch (type) { | ||
case hwmon_power: | ||
ret = xe_hwmon_power_read(hwmon, attr, channel, val); | ||
break; | ||
default: | ||
ret = -EOPNOTSUPP; | ||
break; | ||
} | ||
|
||
xe_device_mem_access_put(gt_to_xe(hwmon->gt)); | ||
|
||
return ret; | ||
} | ||
|
||
static int | ||
xe_hwmon_write(struct device *dev, enum hwmon_sensor_types type, u32 attr, | ||
int channel, long val) | ||
{ | ||
struct xe_hwmon *hwmon = dev_get_drvdata(dev); | ||
int ret; | ||
|
||
xe_device_mem_access_get(gt_to_xe(hwmon->gt)); | ||
|
||
switch (type) { | ||
case hwmon_power: | ||
ret = xe_hwmon_power_write(hwmon, attr, channel, val); | ||
break; | ||
default: | ||
ret = -EOPNOTSUPP; | ||
break; | ||
} | ||
|
||
xe_device_mem_access_put(gt_to_xe(hwmon->gt)); | ||
|
||
return ret; | ||
} | ||
|
||
static const struct hwmon_ops hwmon_ops = { | ||
.is_visible = xe_hwmon_is_visible, | ||
.read = xe_hwmon_read, | ||
.write = xe_hwmon_write, | ||
}; | ||
|
||
static const struct hwmon_chip_info hwmon_chip_info = { | ||
.ops = &hwmon_ops, | ||
.info = hwmon_info, | ||
}; | ||
|
||
static void | ||
xe_hwmon_get_preregistration_info(struct xe_device *xe) | ||
{ | ||
struct xe_hwmon *hwmon = xe->hwmon; | ||
u32 val_sku_unit = 0; | ||
int ret; | ||
|
||
ret = xe_hwmon_process_reg(hwmon, REG_PKG_POWER_SKU_UNIT, REG_READ, &val_sku_unit, 0, 0); | ||
/* | ||
* The contents of register PKG_POWER_SKU_UNIT do not change, | ||
* so read it once and store the shift values. | ||
*/ | ||
if (!ret) | ||
hwmon->scl_shift_power = REG_FIELD_GET(PKG_PWR_UNIT, val_sku_unit); | ||
} | ||
|
||
void xe_hwmon_register(struct xe_device *xe) | ||
{ | ||
struct device *dev = xe->drm.dev; | ||
struct xe_hwmon *hwmon; | ||
|
||
/* hwmon is available only for dGfx */ | ||
if (!IS_DGFX(xe)) | ||
return; | ||
|
||
hwmon = devm_kzalloc(dev, sizeof(*hwmon), GFP_KERNEL); | ||
if (!hwmon) | ||
return; | ||
|
||
xe->hwmon = hwmon; | ||
|
||
drmm_mutex_init(&xe->drm, &hwmon->hwmon_lock); | ||
|
||
/* primary GT to access device level properties */ | ||
hwmon->gt = xe->tiles[0].primary_gt; | ||
|
||
xe_hwmon_get_preregistration_info(xe); | ||
|
||
drm_dbg(&xe->drm, "Register xe hwmon interface\n"); | ||
|
||
/* hwmon_dev points to device hwmon<i> */ | ||
hwmon->hwmon_dev = devm_hwmon_device_register_with_info(dev, "xe", hwmon, | ||
&hwmon_chip_info, | ||
NULL); | ||
if (IS_ERR(hwmon->hwmon_dev)) { | ||
drm_warn(&xe->drm, "Failed to register xe hwmon (%pe)\n", hwmon->hwmon_dev); | ||
xe->hwmon = NULL; | ||
return; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
/* SPDX-License-Identifier: MIT */ | ||
/* | ||
* Copyright © 2023 Intel Corporation | ||
*/ | ||
|
||
#ifndef _XE_HWMON_H_ | ||
#define _XE_HWMON_H_ | ||
|
||
#include <linux/types.h> | ||
|
||
struct xe_device; | ||
|
||
#if IS_REACHABLE(CONFIG_HWMON) | ||
void xe_hwmon_register(struct xe_device *xe); | ||
#else | ||
static inline void xe_hwmon_register(struct xe_device *xe) { }; | ||
#endif | ||
|
||
#endif /* _XE_HWMON_H_ */ |