From: "Michael J. Ruhl" <michael.j.ruhl@intel.com>
To: intel-xe@lists.freedesktop.org, matthew.brost@intel.com,
rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com,
airlied@gmail.com, simona@ffwll.ch, david.e.box@linux.intel.com,
anoop.c.vijay@intel.com, badal.nilawar@intel.com,
matthew.d.roper@intel.com, james.ausmus@intel.com
Subject: [PATCH v16 17/17] drm/xe/vsec: Support survivability mode for CRI
Date: Mon, 16 Nov 2026 07:07:06 -0800 [thread overview]
Message-ID: <20261116150649.368686-36-michael.j.ruhl@intel.com> (raw)
In-Reply-To: <20261116150649.368686-19-michael.j.ruhl@intel.com>
For survivability mode, CRI can only support access to the
PUNIT CRASHLOG PMT function.
Create a special config to support survivability mode.
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
---
drivers/gpu/drm/xe/xe_device_types.h | 2 ++
drivers/gpu/drm/xe/xe_vsec.c | 34 +++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h
index be6feaff4baa..ae5426717eb4 100644
--- a/drivers/gpu/drm/xe/xe_device_types.h
+++ b/drivers/gpu/drm/xe/xe_device_types.h
@@ -494,6 +494,8 @@ struct xe_device {
u32 retry_count;
/** @pmt.punit_guid_cache: cache of the PUNIT GUID */
u32 punit_guid_cache;
+ /** @pmt.survivability_mode: cache of survivability mode state */
+ bool survivability_mode;
} pmt;
/** @soc_remapper: SoC remapper object */
diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c
index 7695bd6b6bc8..8327b6a6b3df 100644
--- a/drivers/gpu/drm/xe/xe_vsec.c
+++ b/drivers/gpu/drm/xe/xe_vsec.c
@@ -19,6 +19,7 @@
#include "xe_mmio.h"
#include "xe_platform_types.h"
#include "xe_pm.h"
+#include "xe_survivability_mode.h"
#include "xe_sysctrl.h"
#include "xe_vsec.h"
@@ -101,10 +102,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 +133,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,
+ },
{ }
};
@@ -319,7 +340,7 @@ static bool wait_for_fw(struct xe_device *xe)
{
int retries = VSEC_LATE_BIND_RETRY; /* wait up to 20 secs */
- if (xe->info.platform != XE_CRESCENTISLAND)
+ if (xe->info.platform != XE_CRESCENTISLAND || xe->pmt.survivability_mode)
return true;
while (retries--) {
@@ -546,6 +567,10 @@ static enum xe_vsec get_platform_info(struct xe_device *xe)
xe->info.platform == XE_CRESCENTISLAND))
return XE_VSEC_UNKNOWN;
+ if (xe_survivability_mode_is_boot_enabled(xe) &&
+ xe->info.platform == XE_CRESCENTISLAND)
+ return XE_VSEC_CRI_SURVIVABILITY;
+
return vsec_platforms[xe->info.platform];
}
@@ -668,6 +693,13 @@ void 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;
+ xe->pmt.survivability_mode = true;
+ 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;
--
2.43.0
next prev parent reply other threads:[~2026-11-16 15:07 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 15:06 [PATCH v16 00/17] Crescent Island PMT support Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 01/17] drm/xe/vsec: VSEC requires soc-remapper Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 02/17] drm/xe/vsec: Do not register BMG PMT for VF Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 03/17] drm/xe/vsec: Correct locking order Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 04/17] drm/xe/vsec: Use correct pm state get Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 05/17] drm/xe/vsec: Add DOC text for VSEC Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 06/17] drm/xe/vsec: Support possible hotplug exit Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 07/17] drm/xe/vsec: Refactor BattleMage PMT defines Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 08/17] drm/xe/vsec: Update VSEC probe order Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 09/17] drm/xe/vsec: Add base_offset to allow for more flexibilty Michael J. Ruhl
2026-11-16 15:06 ` [PATCH v16 10/17] drm/xe/vsec: Support Crescent Island PMT Michael J. Ruhl
2026-11-16 15:07 ` [PATCH v16 11/17] drm/xe/vsec: Crescent Island PMT decode Michael J. Ruhl
2026-11-16 15:07 ` [PATCH v16 12/17] drm/xe/vsec: Crescent Island PMT callbacks Michael J. Ruhl
2026-11-16 15:07 ` [PATCH v16 13/17] drm/xe/vsec: Support late bind fw information Michael J. Ruhl
2026-11-16 15:39 ` sashiko-bot
2026-11-16 16:35 ` Ruhl, Michael J
2026-11-16 15:07 ` [PATCH v16 14/17] drm/xe/vsec: Add PMT GUID internal access Michael J. Ruhl
2026-11-16 15:31 ` sashiko-bot
2026-11-16 16:39 ` Ruhl, Michael J
2026-11-16 15:07 ` [PATCH v16 15/17] drm/xe/vsec: Update PMT " Michael J. Ruhl
2026-11-16 15:07 ` [PATCH v16 16/17] drm/xe/vsec: Refactor platform check Michael J. Ruhl
2026-11-16 15:07 ` Michael J. Ruhl [this message]
2026-11-16 18:36 ` ✗ CI.checkpatch: warning for Crescent Island PMT support (rev18) Patchwork
2026-11-16 18:38 ` ✓ CI.KUnit: success " Patchwork
2026-11-16 19:10 ` ✓ Xe.CI.BAT: " Patchwork
2026-11-17 5:52 ` ✗ Xe.CI.FULL: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116150649.368686-36-michael.j.ruhl@intel.com \
--to=michael.j.ruhl@intel.com \
--cc=airlied@gmail.com \
--cc=anoop.c.vijay@intel.com \
--cc=badal.nilawar@intel.com \
--cc=david.e.box@linux.intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=james.ausmus@intel.com \
--cc=matthew.brost@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=simona@ffwll.ch \
--cc=thomas.hellstrom@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.