From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07AD2C88E62 for ; Fri, 11 Sep 2026 20:12:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76E8C10F6FC; Fri, 11 Sep 2026 20:12:17 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="fj3tgM8L"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4FEF510E09F for ; Fri, 11 Sep 2026 20:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1789157521; x=1820693521; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=6xZI2nUZPwQ1n2c0MZhRQNAyy50kNhD54T6ccH7ON9A=; b=fj3tgM8LzPO2MUdrVf9PAm+mqhjGUKNYQkvpvBAfUxcCHSIbLOqtFIF7 /kOedGhPdRBP4dDvwWJcfKQonHVoqgV4WFvWblnAEtpAwpqddPmFEojPc b51o81EEdmAh5FKnNAlATAERxiQUZg6/YNghfcokAFSKoDNPAVABRypXi GJ4fIxldJgnNZfDSp9QGFYLGBz3gq2SzcWNMQSIthmeMyPj0QzW0ailXo hMELdAHplWdQHuTcXYkdVX+NKO/PRoRxmsnQLrU2FQKjWhf+i8JzlFign sh/Gt12uTlNB3TTKlgmmncOPnjiAdczlh7r0R6C15+/0yd9pVUIvsDqoj A==; X-CSE-ConnectionGUID: 3eVaprHYS7+pfoTex+4cpA== X-CSE-MsgGUID: oTs84lPJQMSGwhUPOVheAw== X-IronPort-AV: E=McAfee;i="6800,10657,11902"; a="115162421" X-IronPort-AV: E=Sophos;i="6.27,97,1787036400"; d="scan'208";a="115162421" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2026 13:11:59 -0700 X-CSE-ConnectionGUID: 8p4ffjTmT/SSNDGmLtqiWg== X-CSE-MsgGUID: djGQzLscS2eSg5DEjQdGaQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,97,1787036400"; d="scan'208";a="277272109" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by fmviesa005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Sep 2026 13:11:59 -0700 From: "Michael J. Ruhl" To: platform-driver-x86@vger.kernel.org, intel-xe@lists.freedesktop.org, hansg@kernel.org, ilpo.jarvinen@linux.intel.com, 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, karthik.poosa@intel.com Subject: [PATCH v8 14/20] drm/xe/vsec: Support Crescent Island PMT Date: Fri, 11 Sep 2026 13:12:02 -0700 Message-ID: <20260911201148.1610547-36-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260911201148.1610547-22-michael.j.ruhl@intel.com> References: <20260911201148.1610547-22-michael.j.ruhl@intel.com> 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-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Crescent Island (CRI) supports PMT telemetry and crashlog. Add Crescent Island (CRI) discovery structure (DVSEC) information to allow for Xe registration. Reviewed-by: Rodrigo Vivi Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/regs/xe_pmt.h | 8 +++-- drivers/gpu/drm/xe/xe_vsec.c | 51 +++++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/xe/regs/xe_pmt.h b/drivers/gpu/drm/xe/regs/xe_pmt.h index a62ab05c6b4c..2f6658395587 100644 --- a/drivers/gpu/drm/xe/regs/xe_pmt.h +++ b/drivers/gpu/drm/xe/regs/xe_pmt.h @@ -17,8 +17,12 @@ #define PUNIT_VERSION_OFFSET 0xA0 -#define BMG_TELEMETRY_BASE_OFFSET 0xE0000 -#define BMG_TELEMETRY_OFFSET (SOC_BASE + BMG_TELEMETRY_BASE_OFFSET) +#define XE_PMT_BASE_OFFSET 0xE0000 + +#define BMG_TELEMETRY_OFFSET (SOC_BASE + XE_PMT_BASE_OFFSET) + +/* for CRI discovery and telemetry are in an indexed window */ +#define CRI_PMT_OFFSET (SOC_BASE + XE_PMT_BASE_OFFSET) #define BMG_MODS_RESIDENCY_OFFSET (0x4D0) #define BMG_G2_RESIDENCY_OFFSET (0x530) diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c index 856973473fd7..4a7c24a30b3f 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include @@ -32,12 +33,23 @@ * PMT usage. */ -/* PMT GUID value for BMG devices. NOTE: this is NOT a PCI id */ +/* PMT GUID value for BMG and CRI devices. NOTE: this is NOT a PCI id */ #define BMG_DEVICE_ID 0xE2F8 +#define CRI_DEVICE_ID 0xE2FA + +/* + * sizeof(Crashlog Type1 Version2) = 0x18 (24) bytes + * For BMG and CRI PUNIT and OOBMSMS crashlogs are consecutive. + */ +#define BMG_CRASHLOG_PUNIT_DISC_OFFSET (0x60) +#define BMG_CRASHLOG_OOBMSM_DISC_OFFSET (BMG_CRASHLOG_PUNIT_DISC_OFFSET + 0x18) + +#define CRI_CRASHLOG_PUNIT_DISC_OFFSET (0x80) +#define CRI_CRASHLOG_OOBMSM_DISC_OFFSET (CRI_CRASHLOG_PUNIT_DISC_OFFSET + 0x18) static struct intel_vsec_header bmg_telemetry = { .rev = 1, - .length = 0x10, + .length = SZ_16, .id = VSEC_ID_TELEMETRY, .num_entries = 2, .entry_size = 4, @@ -47,12 +59,12 @@ static struct intel_vsec_header bmg_telemetry = { static struct intel_vsec_header bmg_crashlog = { .rev = 1, - .length = 0x10, + .length = SZ_16, .id = VSEC_ID_CRASHLOG, .num_entries = 2, .entry_size = 6, .tbir = 0, - .offset = BMG_DISCOVERY_OFFSET + 0x60, + .offset = BMG_DISCOVERY_OFFSET + BMG_CRASHLOG_PUNIT_DISC_OFFSET, }; static struct intel_vsec_header *bmg_capabilities[] = { @@ -61,9 +73,36 @@ static struct intel_vsec_header *bmg_capabilities[] = { NULL }; +static struct intel_vsec_header cri_telemetry = { + .rev = 1, + .length = SZ_16, + .id = VSEC_ID_TELEMETRY, + .num_entries = 3, + .entry_size = 4, + .tbir = 0, + .offset = CRI_PMT_OFFSET, +}; + +static struct intel_vsec_header cri_crashlog = { + .rev = 1, + .length = SZ_16, + .id = VSEC_ID_CRASHLOG, + .num_entries = 2, + .entry_size = 6, + .tbir = 0, + .offset = CRI_PMT_OFFSET + CRI_CRASHLOG_PUNIT_DISC_OFFSET, +}; + +static struct intel_vsec_header *cri_capabilities[] = { + &cri_telemetry, + &cri_crashlog, + NULL +}; + enum xe_vsec { XE_VSEC_UNKNOWN = 0, XE_VSEC_BMG, + XE_VSEC_CRI, }; static struct intel_vsec_platform_info xe_vsec_info[] = { @@ -71,6 +110,10 @@ static struct intel_vsec_platform_info xe_vsec_info[] = { .caps = VSEC_CAP_TELEMETRY | VSEC_CAP_CRASHLOG, .headers = bmg_capabilities, }, + [XE_VSEC_CRI] = { + .caps = VSEC_CAP_TELEMETRY | VSEC_CAP_CRASHLOG, + .headers = cri_capabilities, + }, { } }; -- 2.43.0