Re: [PATCH v8 15/20] drm/xe/vsec: Crescent Island PMT decode

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

On Fri, Sep 11, 2026 at 01:12:03PM -0700, Michael J. Ruhl wrote:
> Crescent Island (CRI) has different index and offset values for
> accessing the PMT data area.
> 
> Update the decode path to support the CRI device.
> 
> Update the data read callback so to support the CRI usage.
> 
> Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_vsec.c | 100 +++++++++++++++++++++++++++++++----
>  1 file changed, 90 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
> index 4a7c24a30b3f..9f00ae58b921 100644
> --- a/drivers/gpu/drm/xe/xe_vsec.c
> +++ b/drivers/gpu/drm/xe/xe_vsec.c
> @@ -120,19 +120,25 @@ static struct intel_vsec_platform_info xe_vsec_info[] = {
>  /*
>   * The GUID will have the following bits to decode:
>   *   [0:3]   - {Telemetry space iteration number (0,1,..)}
> - *   [4:7]   - Segment (SEGMENT_INDEPENDENT-0, Client-1, Server-2)
> + *   [4:7]   - BMG Segment (SEGMENT_INDEPENDENT-0, Client-1, Server-2)
> + *   [4:5]   - CRI Segment (SEGMENT_INDEPENDENT-0, Client-1, Server-2)
> + *   [6:7]   - CRI Instance
>   *   [8:11]  - SOC_SKU
>   *   [12:27] – Device ID – changes for each down bin SKU’s
>   *   [28:29] - Capability Type (Crashlog-0, Telemetry Aggregator-1, Watcher-2)
>   *   [30:31] - Record-ID (0-PUNIT, 1-OOBMSM_0, 2-OOBMSM_1)
>   */
>  #define GUID_TELEM_ITERATION	GENMASK(3, 0)
> -#define GUID_SEGMENT		GENMASK(7, 4)
>  #define GUID_SOC_SKU		GENMASK(11, 8)
>  #define GUID_DEVICE_ID		GENMASK(27, 12)
>  #define GUID_CAP_TYPE		GENMASK(29, 28)
>  #define GUID_RECORD_ID		GENMASK(31, 30)
>  
> +#define BMG_GUID_SEGMENT	GENMASK(7, 4)
> +
> +#define CRI_GUID_SEGMENT	GENMASK(5, 4)
> +#define CRI_GUID_INSTANCE	GENMASK(7, 6)
> +
>  #define BMG_IDX_TELEM_PUNIT		0x00
>  #define BMG_IDX_TELEM_OOBMSM		0x01
>  #define BMG_IDX_CRASHLOG_PUNIT		0x02
> @@ -143,6 +149,18 @@ static struct intel_vsec_platform_info xe_vsec_info[] = {
>  #define BMG_OOBMSM_0_WATCHER_OFFSET	0x18D8
>  #define BMG_OOBMSM_1_TELEMETRY_OFFSET	0x1000
>  
> +#define CRI_IDX_TELEM_DISCOVERY		0x00
> +#define CRI_IDX_TELEM_PUNIT		0x01
> +#define CRI_IDX_TELEM_OOBMSM		0x02
> +#define CRI_IDX_CRASHLOG_PUNIT		0x03
> +#define CRI_IDX_WATCHER_OOBMSM		0x03  /* PUNIT and OOBMSM share this index */
> +#define CRI_IDX_CRASHLOG_OOBMSM		0x04
> +
> +#define CRI_PUNIT_WATCHER_OFFSET		0x08A0
> +#define CRI_OOBMSM_WATCHER_OFFSET		0x0CF8
> +#define CRI_OOBMSM_GFSP_TELEMETRY_OFFSET	0x1600
> +#define CRI_PUNIT_CRASHLOG_OFFSET		0x0E60
> +
>  enum record_id {
>  	PUNIT,
>  	OOBMSM_0,
> @@ -155,17 +173,10 @@ enum capability {
>  	WATCHER,
>  };
>  
> -static int xe_guid_decode(u32 guid, int *index, u32 *offset)
> +static int bmg_guid_decode(u32 guid, int *index, u32 *offset)
>  {
>  	u32 record_id = FIELD_GET(GUID_RECORD_ID, guid);
>  	u32 cap_type  = FIELD_GET(GUID_CAP_TYPE, guid);
> -	u32 device_id = FIELD_GET(GUID_DEVICE_ID, guid);
> -
> -	if (device_id != BMG_DEVICE_ID)
> -		return -ENODEV;
> -
> -	if (cap_type > WATCHER)
> -		return -EINVAL;
>  
>  	*offset = 0;
>  
> @@ -201,6 +212,75 @@ static int xe_guid_decode(u32 guid, int *index, u32 *offset)
>  	return 0;
>  }
>  
> +static int cri_guid_decode(u32 guid, int *index, u32 *offset)
> +{
> +	u32 record_id = FIELD_GET(GUID_RECORD_ID, guid);
> +	u32 cap_type  = FIELD_GET(GUID_CAP_TYPE, guid);
> +	u32 instance  = FIELD_GET(CRI_GUID_INSTANCE, guid);
> +
> +	*offset = 0;
> +
> +	if (cap_type == CRASHLOG) {
> +		if (record_id == PUNIT) {
> +			*index = CRI_IDX_CRASHLOG_PUNIT;
> +			*offset = CRI_PUNIT_CRASHLOG_OFFSET;
> +		} else {
> +			*index = CRI_IDX_CRASHLOG_OOBMSM;
> +		}
> +		return 0;
> +	}
> +
> +	switch (record_id) {
> +	case PUNIT:
> +		*index = CRI_IDX_TELEM_PUNIT;
> +		if (cap_type == WATCHER)
> +			*offset = CRI_PUNIT_WATCHER_OFFSET;
> +		break;
> +
> +	case OOBMSM_0:
> +		*index = CRI_IDX_TELEM_OOBMSM;
> +		switch (instance) {
> +		case 0:
> +			if (cap_type == WATCHER) {
> +				*index = CRI_IDX_WATCHER_OOBMSM;
> +				*offset = CRI_OOBMSM_WATCHER_OFFSET;
> +			}
> +			break;
> +
> +		case 1:
> +			if (cap_type == TELEMETRY)
> +				*offset = CRI_OOBMSM_GFSP_TELEMETRY_OFFSET;
> +			break;
> +
> +		default:
> +			return -EINVAL;
> +		}
> +		break;
> +
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	return 0;
> +}
> +
> +static int xe_guid_decode(u32 guid, int *index, u32 *offset)
> +{
> +	u32 cap_type  = FIELD_GET(GUID_CAP_TYPE, guid);
> +	u32 device_id = FIELD_GET(GUID_DEVICE_ID, guid);
> +
> +	if (cap_type > WATCHER)
> +		return -EINVAL;
> +
> +	if (device_id == BMG_DEVICE_ID)
> +		return bmg_guid_decode(guid, index, offset);
> +
> +	if (device_id == CRI_DEVICE_ID)
> +		return cri_guid_decode(guid, index, offset);
> +
> +	return -ENODEV;
> +}
> +
>  /**
>   * xe_pmt_telem_read - Given a device and a PMT GUID, read data into a buffer
>   * @dev: valid Xe device
> -- 
> 2.43.0
>