Commit fb1b7060 authored by Badal Nilawar's avatar Badal Nilawar Committed by Rodrigo Vivi
Browse files

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarRiana Tauro <riana.tauro@intel.com>
Signed-off-by: default avatarBadal Nilawar <badal.nilawar@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://lore.kernel.org/r/20230925081842.3566834-2-badal.nilawar@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 9a674bef

Documentation/ABI/testing/sysfs-driver-intel-xe-hwmon

0 → 100644
+22 −0
Original line number Diff line number Diff line 
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.

drivers/gpu/drm/xe/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -122,6 +122,9 @@ xe-y += xe_bb.o \ 
	xe_wa.o \

	xe_wopcm.o



# graphics hardware monitoring (HWMON) support

xe-$(CONFIG_HWMON) += xe_hwmon.o



obj-$(CONFIG_DRM_XE) += xe.o

obj-$(CONFIG_DRM_XE_KUNIT_TEST) += tests/

drivers/gpu/drm/xe/regs/xe_gt_regs.h

+4 −0
Original line number Diff line number Diff line
@@ -411,4 +411,8 @@ 
#define XEHPC_BCS5_BCS6_INTR_MASK		XE_REG(0x190118)

#define XEHPC_BCS7_BCS8_INTR_MASK		XE_REG(0x19011c)



#define PVC_GT0_PACKAGE_RAPL_LIMIT		XE_REG(0x281008)

#define PVC_GT0_PACKAGE_POWER_SKU_UNIT		XE_REG(0x281068)

#define PVC_GT0_PACKAGE_POWER_SKU		XE_REG(0x281080)



#endif

drivers/gpu/drm/xe/regs/xe_mchbar_regs.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/* 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_ */

drivers/gpu/drm/xe/xe_device.c

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "xe_vm.h"

#include "xe_vm_madvise.h"

#include "xe_wait_user_fence.h"

#include "xe_hwmon.h"



#ifdef CONFIG_LOCKDEP

struct lockdep_map xe_device_mem_access_lockdep_map = {
@@ -328,6 +329,8 @@ int xe_device_probe(struct xe_device *xe) 


	xe_pmu_register(&xe->pmu);



	xe_hwmon_register(xe);



	err = drmm_add_action_or_reset(&xe->drm, xe_device_sanitize, xe);

	if (err)

		return err;