Re: [PATCH v6 13/13] drm/xe/hwmon: Update PCIE temperature sensor offset for CRI

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Fri, Sep 25, 2026 at 02:24:29AM +0530, Karthik Poosa wrote:
> On Crescent Island, the PCIe temperature sensor is reported in
> READ_THERMAL_DATA group 5, byte 0. Add support for reading the sensor
> from this mailbox location.
> 
> Signed-off-by: Karthik Poosa <karthik.poosa@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_hwmon.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_hwmon.c b/drivers/gpu/drm/xe/xe_hwmon.c
> index 79240d4aadd3..fcb1d2f14f5a 100644
> --- a/drivers/gpu/drm/xe/xe_hwmon.c
> +++ b/drivers/gpu/drm/xe/xe_hwmon.c
> @@ -113,6 +113,9 @@ enum sensor_attr_power {
>  #define CRI_TEMP_INDEX_MCTRL	16
>  #define CRI_TEMP_MCTRL_COUNT	4
>  
> +/* On CRI the PCIe temperature is READ_THERMAL_DATA byte 20 (group 5, low byte). */
> +#define CRI_PCIE_SENSOR_GROUP_ID	5
> +
>  /* Mailbox sentinel reported for an unavailable temperature sensor */
>  #define TEMP_MBX_INVALID	0xFF
>  
> @@ -1011,16 +1014,21 @@ static int get_mc_temp(struct xe_hwmon *hwmon, long *val)
>  static int get_pcie_temp(struct xe_hwmon *hwmon, long *val)
>  {
>  	struct xe_tile *root_tile = xe_device_get_root_tile(hwmon->xe);
> +	u32 group = PCIE_SENSOR_GROUP_ID;
>  	u32 data = 0;
>  	int ret;
>  
> +	/* CRI relocated the PCIe temperature to a different data group. */
> +	if (hwmon->xe->info.platform == XE_CRESCENTISLAND)
> +		group = CRI_PCIE_SENSOR_GROUP_ID;
> +
>  	ret = xe_pcode_read(root_tile, PCODE_MBOX(PCODE_THERMAL_INFO, READ_THERMAL_DATA,
> -						  PCIE_SENSOR_GROUP_ID), &data, NULL);
> +						  group), &data, NULL);
>  	if (ret)
>  		return ret;
>  
> -	/* Sensor offset is different for G21 */
> -	if (hwmon->xe->info.subplatform != XE_SUBPLATFORM_BATTLEMAGE_G21)
> +	if (hwmon->xe->info.subplatform != XE_SUBPLATFORM_BATTLEMAGE_G21 &&
> +	    hwmon->xe->info.platform != XE_CRESCENTISLAND)

this is deserving a info flag no?!

>  		data = REG_FIELD_GET(PCIE_SENSOR_MASK, data);
>  
>  	data = REG_FIELD_GET(TEMP_MASK, data);
> -- 
> 2.25.1
>