From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DB4B4A2053 for ; Tue, 1 Sep 2026 19:28:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788290882; cv=none; b=qxHyLzZWDR0kSzW32Ap7YfH5E09ZFyTpSsRPxCjbZrnK0daAcOITcx0zCwi7YL8F+I37veSGlHSEmRLEnHGiE4zblEmqRs0ySqHAQhFcBlEKLps9GbYqECEarZbocslwYIEVDq11kmfAyIWidc8kNT7qLhZ5DHY0WswXukDnVvU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788290882; c=relaxed/simple; bh=f4UFm8EZBL2+s1zDjD1YHVbHvuE0qbVANQPzH1lRQhs=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BYA2elefK6KhSnt06O3wnCey+L3xftnfPovNFfcOc4vtwmdtxT8KukRhALmF0vzJo4qSLv12F2w/PzNKbxZBzImwiedm/8KCH/ILt+jgiND1+bIMzUXvw2rbHyT0jQJ405k2FhMeclR+Cogt4qjjDOkA9RR2t2b0apJ/o8Fu8ls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=hAjd0AZH; arc=none smtp.client-ip=198.175.65.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="hAjd0AZH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1788290880; x=1819826880; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=f4UFm8EZBL2+s1zDjD1YHVbHvuE0qbVANQPzH1lRQhs=; b=hAjd0AZHoO+DDnuHluuRlN73eHyauwW6iyD2ABccneBq2Zcs/KcwiLMU 99gSeWgKUMc085YdfUw1djpFRKQDoOJ9HHmUqR817MoxcYShGXr9EzDRH SuYjLdUBD/0PZe9DdEaNYDYDch7X5GhQpuVNbbGdJjSsay+yACcax5H/Z EBWBIrCYRMuwy6uJYykCIsCjf9nKqXKBwm/06V2Yijjxz1ebusBBKnlTW WD4FFjErBIxg0uZd2w2OTgUbgBiAXspttyTseaELWL8Xons4UyaJz9Szs rs6jdm6PHSasmKutKhsdELb7p7TjDw0ywgURrdlzOuNg5TzLQSTvWyOMm A==; X-CSE-ConnectionGUID: 6h6h2NUqQvm3otCWOiJCVg== X-CSE-MsgGUID: 0HxrdssHSbikRAo+WriEEg== X-IronPort-AV: E=McAfee;i="6800,10657,11893"; a="88762522" X-IronPort-AV: E=Sophos;i="6.25,256,1779174000"; d="scan'208";a="88762522" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2026 12:28:00 -0700 X-CSE-ConnectionGUID: Kfc/ghiMSnyfV6vS4ZMscg== X-CSE-MsgGUID: mvVCXdMATkOgWjLmeGtDdQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,256,1779174000"; d="scan'208";a="269776764" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Sep 2026 12:28:00 -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 v4 11/18] drm/xe/vsec: Support Crescent Island PMT Date: Tue, 1 Sep 2026 12:27:46 -0700 Message-ID: <20260901192736.626777-31-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260901192736.626777-20-michael.j.ruhl@intel.com> References: <20260901192736.626777-20-michael.j.ruhl@intel.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Crescent Island (CRI) supports PMT telemetry and crashlog. Add Crescent Island (CRI) discovery structure (DVSEC) information to allow for Xe registration. 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 c6299629dc27..0604e65d10a0 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 @@ -21,12 +22,23 @@ #include "regs/xe_pmt.h" -/* 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, @@ -36,12 +48,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[] = { @@ -50,9 +62,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[] = { @@ -60,6 +99,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