Re: [PATCH v12 21/21] drm/xe/vsec: Support survivability mode for CRI

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

On Tue, Oct 13, 2026 at 02:47:14PM -0700, Michael J. Ruhl wrote:
> For survivability mode, CRI can only support access to the
> PUNIT CRASHLOG PMT function.
> 
> Create a special config to support survivability mode.
> 


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

but let's refrain for further submissions and wait the base pmt patches
to be merged to Linus tree and propagated to drm-next and drm-xe-next,
then we rebase and resubmit.

Thanks,
Rodrigo.

> Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_survivability_mode.c |  2 ++
>  drivers/gpu/drm/xe/xe_vsec.c               | 34 +++++++++++++++++++++-
>  2 files changed, 35 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_survivability_mode.c b/drivers/gpu/drm/xe/xe_survivability_mode.c
> index 45d44ebe288b..f08e76d02054 100644
> --- a/drivers/gpu/drm/xe/xe_survivability_mode.c
> +++ b/drivers/gpu/drm/xe/xe_survivability_mode.c
> @@ -19,6 +19,7 @@
>  #include "xe_nvm.h"
>  #include "xe_pcode_api.h"
>  #include "xe_printk.h"
> +#include "xe_soc_remapper.h"
>  #include "xe_vsec.h"
>  
>  /**
> @@ -351,6 +352,7 @@ static int enable_boot_survivability_mode(struct pci_dev *pdev)
>  
>  	xe_heci_gsc_init(xe);
>  
> +	xe_soc_remapper_init(xe);
>  	xe_vsec_init(xe);
>  
>  	if (survivability->fdo_mode) {
> diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
> index 1ed904ec1496..6d4ef9cb9f60 100644
> --- a/drivers/gpu/drm/xe/xe_vsec.c
> +++ b/drivers/gpu/drm/xe/xe_vsec.c
> @@ -101,10 +101,26 @@ static struct intel_vsec_header *cri_capabilities[] = {
>  	NULL
>  };
>  
> +static struct intel_vsec_header cri_survivability_crashlog = {
> +	.rev = 1,
> +	.length = SZ_16,
> +	.id = VSEC_ID_CRASHLOG,
> +	.num_entries = 1,
> +	.entry_size = 6,
> +	.tbir = 0,
> +	.offset = CRI_PMT_OFFSET + CRI_CRASHLOG_PUNIT_DISC_OFFSET,
> +};
> +
> +static struct intel_vsec_header *cri_survivability_capabilities[] = {
> +	&cri_survivability_crashlog,
> +	NULL
> +};
> +
>  enum xe_vsec {
>  	XE_VSEC_UNKNOWN = 0,
>  	XE_VSEC_BMG,
>  	XE_VSEC_CRI,
> +	XE_VSEC_CRI_SURVIVABILITY,
>  };
>  
>  static struct intel_vsec_platform_info xe_vsec_info[] = {
> @@ -116,6 +132,10 @@ static struct intel_vsec_platform_info xe_vsec_info[] = {
>  		.caps = VSEC_CAP_TELEMETRY | VSEC_CAP_CRASHLOG,
>  		.headers = cri_capabilities,
>  	},
> +	[XE_VSEC_CRI_SURVIVABILITY] = {
> +		.caps = VSEC_CAP_CRASHLOG,
> +		.headers = cri_survivability_capabilities,
> +	},
>  	{ }
>  };
>  
> @@ -316,9 +336,10 @@ static void cri_late_bind_probe_work(struct work_struct *work)
>  
>  static bool wait_for_fw(struct xe_device *xe)
>  {
> +	struct xe_survivability *survivability = &xe->survivability;
>  	int retries = VSEC_LATE_BIND_RETRY;  /* wait up to 20 secs */
>  
> -	if (xe->info.platform != XE_CRESCENTISLAND)
> +	if (xe->info.platform != XE_CRESCENTISLAND || survivability->mode)
>  		return true;
>  
>  	while (retries--) {
> @@ -534,6 +555,8 @@ static const int vsec_platforms[] = {
>  
>  static enum xe_vsec get_platform_info(struct xe_device *xe)
>  {
> +	struct xe_survivability *survivability = &xe->survivability;
> +
>  	if (xe->info.platform > XE_CRESCENTISLAND)
>  		return XE_VSEC_UNKNOWN;
>  
> @@ -542,6 +565,9 @@ static enum xe_vsec get_platform_info(struct xe_device *xe)
>  	     xe->info.platform == XE_CRESCENTISLAND))
>  		return XE_VSEC_UNKNOWN;
>  
> +	if (survivability->mode && xe->info.platform == XE_CRESCENTISLAND)
> +		return XE_VSEC_CRI_SURVIVABILITY;
> +
>  	return vsec_platforms[xe->info.platform];
>  }
>  
> @@ -668,6 +694,12 @@ int xe_vsec_init(struct xe_device *xe)
>  		xe->soc_remapper.set_telem_region(xe, CRI_IDX_TELEM_DISCOVERY);
>  		break;
>  
> +	case XE_VSEC_CRI_SURVIVABILITY:
> +		xe->pmt.base_offset = CRI_PMT_OFFSET;
> +		info->priv_data = &xe_cri_pmt_cb;
> +		xe->soc_remapper.set_telem_region(xe, CRI_IDX_TELEM_DISCOVERY);
> +		break;
> +
>  	default:
>  		drm_err(&xe->drm, "Unsupported platform: %u\n", platform);
>  		return 0;
> -- 
> 2.43.0
>