From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DBD21606A882 for ; Mon, 16 Nov 2026 15:07:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=IqtNyNBb Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D95310EA4B; Mon, 16 Nov 2026 15:07:38 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 364AC10E2FB for ; Mon, 16 Nov 2026 15:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1794841647; x=1826377647; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=N7v4EhW8YaYSAuj1oKTkIBHQy47wqaA2zw1whl7lrec=; b=IqtNyNBbC1aeaLxskaF5UJfbKZoZ+xGR7+ZNRJlOeH1yKj7+NiausvAx cosoL56J+KNqTllhCcSx1J/JWeL2WQ/dIsgy6V98CNPPuqxmue2vAQjtZ ae3VqzopcGLYMhl/qEfLtbhKQbTHkl/8We0PxDI7OiyHDC4FWXO1RNh2v MxwUkevmnXTqK57Cd8AfJ9cjU8qewl3zRnuU9TJ1cAHHHHFxEgkdEBIrr RUu3oP5gpQhLSxpX5LdcemvDSZVToLj6fXzK4Rd699Tl+beW0I8AsEmuD bm3MNewqh6ic36PoMq6LwHzUpgk3C/vXwuwta4b6xgUNE26Kobp0Jpj37 w==; X-CSE-ConnectionGUID: 1xnI4KmOSAG+6o9Gk7EzyQ== X-CSE-MsgGUID: j0MzMY9kTeWUde4WO3Jcng== X-IronPort-AV: E=McAfee;i="6800,10657,11968"; a="3611859" X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="3611859" Received: from fmviesa011.fm.intel.com ([10.60.135.151]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2026 07:07:02 -0800 X-CSE-ConnectionGUID: z8+V6pduRq2nQEW9yoDymQ== X-CSE-MsgGUID: 0B/Ag7VNTUCk2HxNfpAaiA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,216,1787036400"; d="scan'208";a="11359451" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Nov 2026 07:07:02 -0800 From: "Michael J. Ruhl" 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 Message-ID: <20261116150649.368686-36-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261116150649.368686-19-michael.j.ruhl@intel.com> References: <20261116150649.368686-19-michael.j.ruhl@intel.com> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Intel-xe" X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 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 --- 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