From: Rodrigo Vivi <rodrigo.vivi@intel.com>
To: "Michael J. Ruhl" <michael.j.ruhl@intel.com>
Cc: <platform-driver-x86@vger.kernel.org>,
<intel-xe@lists.freedesktop.org>, <hansg@kernel.org>,
<ilpo.jarvinen@linux.intel.com>, <matthew.brost@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: Re: [PATCH v20 19/19] drm/xe/vsec: Support survivability mode for CRI
Date: Fri, 20 Nov 2026 14:27:04 -0500 [thread overview]
Message-ID: <awCfCMVnFKAgmlhh@intel.com> (raw)
In-Reply-To: <20261120021929.473553-40-michael.j.ruhl@intel.com>
On Thu, Nov 19, 2026 at 06:19:49PM -0800, 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.
>
> Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@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 dacd9d271a6b..a8715057ab2f 100644
> --- a/drivers/gpu/drm/xe/xe_vsec.c
> +++ b/drivers/gpu/drm/xe/xe_vsec.c
> @@ -20,6 +20,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"
>
> @@ -102,10 +103,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[] = {
> @@ -117,6 +134,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,
> + },
> { }
> };
>
> @@ -320,7 +341,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--) {
> @@ -612,6 +633,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];
> }
>
> @@ -733,6 +758,13 @@ void xe_vsec_init(struct xe_device *xe)
> }
> 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-20 19:27 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 2:19 [PATCH v20 00/19] Crescent Island PMT support Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 01/19] platform/x86/intel/pmt: Introduce a callback for discovery data Michael J. Ruhl
2026-11-20 18:46 ` David Box
2026-11-20 2:19 ` [PATCH v20 02/19] platform/x86/intel/pmt: Use the pre-populated header info for crashlog Michael J. Ruhl
2026-11-20 18:48 ` David Box
2026-11-20 2:19 ` [PATCH v20 03/19] drm/xe/vsec: VSEC requires soc-remapper Michael J. Ruhl
2026-11-20 19:26 ` Rodrigo Vivi
2026-11-20 2:19 ` [PATCH v20 04/19] drm/xe/vsec: Do not register BMG PMT for VF Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 05/19] drm/xe/vsec: Correct locking order Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 06/19] drm/xe/vsec: Use correct pm state get Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 07/19] drm/xe/vsec: Add DOC text for VSEC Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 08/19] drm/xe/vsec: Support possible hotplug exit Michael J. Ruhl
2026-11-20 2:30 ` sashiko-bot
2026-11-20 2:19 ` [PATCH v20 09/19] drm/xe/vsec: Refactor BattleMage PMT defines Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 10/19] drm/xe/vsec: Update VSEC probe order Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 11/19] drm/xe/vsec: Add base_offset to allow for more flexibilty Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 12/19] drm/xe/vsec: Support Crescent Island PMT Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 13/19] drm/xe/vsec: Crescent Island PMT decode Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 14/19] drm/xe/vsec: Crescent Island PMT callbacks Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 15/19] drm/xe/vsec: Support late bind fw information Michael J. Ruhl
2026-11-20 2:44 ` sashiko-bot
2026-11-20 2:19 ` [PATCH v20 16/19] drm/xe/vsec: Add PMT GUID internal access Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 17/19] drm/xe/vsec: Update PMT " Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 18/19] drm/xe/vsec: Refactor platform check Michael J. Ruhl
2026-11-20 2:19 ` [PATCH v20 19/19] drm/xe/vsec: Support survivability mode for CRI Michael J. Ruhl
2026-11-20 19:27 ` Rodrigo Vivi [this message]
2026-11-20 5:31 ` ✗ CI.checkpatch: warning for Crescent Island PMT support (rev21) Patchwork
2026-11-20 5:33 ` ✓ CI.KUnit: success " Patchwork
2026-11-20 6:09 ` ✓ Xe.CI.BAT: " 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=awCfCMVnFKAgmlhh@intel.com \
--to=rodrigo.vivi@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=hansg@kernel.org \
--cc=ilpo.jarvinen@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=michael.j.ruhl@intel.com \
--cc=platform-driver-x86@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox