Re: [PATCH v4 17/18] drm/xe/vsec: Update PMT internal access

["Poosa, Karthik" <karthik.poosa@intel.com>]

On 02-09-2026 00:57, Michael J. Ruhl wrote:
> Current PMT internal access assumes BMG devices.
>
> Use the new PMT GUID API to read the device specific guid.
>
> Minor cleanup for a newly unused parameter (mmio).
>
> Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
> ---
>   drivers/gpu/drm/xe/xe_debugfs.c | 27 ++++++++++++++-------------
>   drivers/gpu/drm/xe/xe_hwmon.c   | 10 ++++++++--
>   drivers/gpu/drm/xe/xe_pcode.c   | 10 ++++++++--
>   3 files changed, 30 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_debugfs.c b/drivers/gpu/drm/xe/xe_debugfs.c
> index b01f1e649b51..f17b993755f3 100644
> --- a/drivers/gpu/drm/xe/xe_debugfs.c
> +++ b/drivers/gpu/drm/xe/xe_debugfs.c
> @@ -5,6 +5,7 @@
>   
>   #include "xe_debugfs.h"
>   
> +#include <linux/array_size.h>
>   #include <linux/bits.h>
>   #include <linux/debugfs.h>
>   #include <linux/fault-inject.h>
> @@ -21,7 +22,6 @@
>   #include "xe_gt_printk.h"
>   #include "xe_guc_ads.h"
>   #include "xe_hw_engine.h"
> -#include "xe_mmio.h"
>   #include "xe_pagefault.h"
>   #include "xe_pcode.h"
>   #include "xe_pm.h"
> @@ -97,16 +97,20 @@ static void xe_fault_inject_debugfs_register(struct xe_device *xe,
>   	}
>   }
>   
> -static void read_residency_counter(struct xe_device *xe, struct xe_mmio *mmio,
> -				   u32 offset, const char *name, struct drm_printer *p)
> +static void read_residency_counter(struct xe_device *xe, u32 offset, const char *name,
> +				   struct drm_printer *p)
>   {
>   	u64 residency = 0;
> -
> +	u32 guid;
>   	int ret;
>   
> -	ret = xe_pmt_telem_read(xe->drm.dev,
> -				xe_mmio_read32(mmio, BMG_PUNIT_TELEMETRY_GUID),
> -				&residency, offset, sizeof(residency));
> +	ret = xe_vsec_get_guid(xe, &guid);
> +	if (ret) {
> +		drm_warn(&xe->drm, "PMT device is not available: %d\n", ret);
> +		return;
> +	}
> +
> +	ret = xe_pmt_telem_read(xe->drm.dev, guid, &residency, offset, sizeof(residency));
>   	if (ret != sizeof(residency)) {
>   		drm_warn(&xe->drm, "%s counter failed to read, ret %d\n", name, ret);
>   		return;
> @@ -245,13 +249,12 @@ static int pcode_info(struct seq_file *m, void *data)
>   static int dgfx_pkg_residencies_show(struct seq_file *m, void *data)
>   {
>   	struct xe_device *xe;
> -	struct xe_mmio *mmio;
>   	struct drm_printer p;
>   
>   	xe = node_to_xe(m->private);
>   	p = drm_seq_file_printer(m);
>   	guard(xe_pm_runtime)(xe);
> -	mmio = xe_root_tile_mmio(xe);
> +
>   	static const struct {
>   		u32 offset;
>   		const char *name;
> @@ -265,7 +268,7 @@ static int dgfx_pkg_residencies_show(struct seq_file *m, void *data)
>   	};
>   
>   	for (int i = 0; i < ARRAY_SIZE(residencies); i++)
> -		read_residency_counter(xe, mmio, residencies[i].offset, residencies[i].name, &p);
> +		read_residency_counter(xe, residencies[i].offset, residencies[i].name, &p);
>   
>   	return 0;
>   }
> @@ -273,13 +276,11 @@ static int dgfx_pkg_residencies_show(struct seq_file *m, void *data)
>   static int dgfx_pcie_link_residencies_show(struct seq_file *m, void *data)
>   {
>   	struct xe_device *xe;
> -	struct xe_mmio *mmio;
>   	struct drm_printer p;
>   
>   	xe = node_to_xe(m->private);
>   	p = drm_seq_file_printer(m);
>   	guard(xe_pm_runtime)(xe);
> -	mmio = xe_root_tile_mmio(xe);
>   
>   	static const struct {
>   		u32 offset;
> @@ -291,7 +292,7 @@ static int dgfx_pcie_link_residencies_show(struct seq_file *m, void *data)
>   	};
>   
>   	for (int i = 0; i < ARRAY_SIZE(residencies); i++)
> -		read_residency_counter(xe, mmio, residencies[i].offset, residencies[i].name, &p);
> +		read_residency_counter(xe, residencies[i].offset, residencies[i].name, &p);
>   
>   	return 0;
>   }
> diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c
> index b9740224e07f..c44a7d24816d 100644
> --- a/drivers/gpu/drm/xe/xe_hwmon.c
> +++ b/drivers/gpu/drm/xe/xe_hwmon.c
> @@ -517,9 +517,15 @@ xe_hwmon_energy_get(struct xe_hwmon *hwmon, int channel, long *energy)
>   
>   	if (hwmon->xe->info.platform == XE_BATTLEMAGE) {
>   		u64 pmt_val;
> +		u32 guid;
>   
> -		ret = xe_pmt_telem_read(hwmon->xe->drm.dev,
> -					xe_mmio_read32(mmio, BMG_PUNIT_TELEMETRY_GUID),
> +		ret = xe_vsec_get_guid(hwmon->xe, &guid);
> +		if (ret) {
> +			drm_warn(&hwmon->xe->drm, "PMT device is not available: %d\n", ret);
> +			*energy = 0;
> +			return;
> +		}
> +		ret = xe_pmt_telem_read(hwmon->xe->drm.dev, guid,
>   					&pmt_val, BMG_ENERGY_STATUS_PMT_OFFSET,	sizeof(pmt_val));
>   		if (ret != sizeof(pmt_val)) {
>   			drm_warn(&hwmon->xe->drm, "energy read from pmt failed, ret %d\n", ret);
> diff --git a/drivers/gpu/drm/xe/xe_pcode.c b/drivers/gpu/drm/xe/xe_pcode.c
> index 844d8c6face6..039c23086990 100644
> --- a/drivers/gpu/drm/xe/xe_pcode.c
> +++ b/drivers/gpu/drm/xe/xe_pcode.c
> @@ -365,11 +365,17 @@ ALLOW_ERROR_INJECTION(xe_pcode_probe_early, ERRNO); /* See xe_pci_probe */
>   int xe_get_pcode_version(struct xe_device *xe, struct xe_pcode_version *version)
>   {
>   	int ret = 0;
> +	u32 guid;
>   
>   	guard(xe_pm_runtime)(xe);
>   
> -	ret = xe_pmt_telem_read(xe->drm.dev,
> -				xe_mmio_read32(xe_root_tile_mmio(xe), BMG_PUNIT_TELEMETRY_GUID),
> +	ret = xe_vsec_get_guid(xe, &guid);
> +	if (ret) {
> +		xe_warn(xe, "PMT device is not availalbe: %d\n", ret);
Except this typo, other things looks good.

LGTM

Reviewed-by: Karthik Poosa <karthik.poosa@intel.com>


> +		return ret;
> +	}
> +
> +	ret = xe_pmt_telem_read(xe->drm.dev, guid,
>   				(u64 *)version, PUNIT_VERSION_OFFSET, sizeof(*version));
>   	if (ret != sizeof(*version)) {
>   		xe_warn(xe, "pcode version read from PMT failed, ret %pe\n", ERR_PTR(ret));