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 4B124E6BF13 for ; Fri, 30 Jan 2026 13:37:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1131610E0B7; Fri, 30 Jan 2026 13:37:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="jvVL6XGZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 318E310E9E5 for ; Fri, 30 Jan 2026 13:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1769780224; x=1801316224; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UM62ax1nBy6AaLM1JiRsgze1L6LTaypaUhTyT7hi0bE=; b=jvVL6XGZqI78LAUnTYHwH8OZrJDPXsbzYWz+gTsU9QnicKaCUldJTaTA wa9XAiXeLadsdcO/idSMDIlQDSSKcpi1GkwSibP00ZSG4BQl9kTmxdjfr DcFDuyG4qzRHI0SFxeRRreHaOiEpwh5hDCDrxRn3l/YKesYfIbZLAIaOo drjBVrG3VUk78m1QOYOSdI/O0wm8o18w5OowI/1G9y2W5yrZWqfkVArlk hggIhgaXPTOERZi3aOX6a+f+y9v4D/IekrPHZBJQ8+hI6ya46tfb1QHcQ vOJx/Leqerc6fM8ppuk9BEy6MB+EyVQeTjSjtiDDSUUaZKnsKivA10/eb Q==; X-CSE-ConnectionGUID: 6JihVQyESTyRQOqKBE7zaA== X-CSE-MsgGUID: kuPtwtPfTtuEvfrU2UJLzg== X-IronPort-AV: E=McAfee;i="6800,10657,11686"; a="71194405" X-IronPort-AV: E=Sophos;i="6.21,263,1763452800"; d="scan'208";a="71194405" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2026 05:37:03 -0800 X-CSE-ConnectionGUID: uuNqmfQ5T+uZNnys09v/rg== X-CSE-MsgGUID: 23LJwWmST26eJpa8ePX24g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,263,1763452800"; d="scan'208";a="207983252" Received: from mjruhl-desk.amr.corp.intel.com (HELO mjruhl-desk.intel.com) ([10.124.220.170]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jan 2026 05:37:02 -0800 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 Cc: "Michael J. Ruhl" Subject: [PATCH v2 4/5] drm/xe/vsec: Crescent Island PMT decode Date: Fri, 30 Jan 2026 08:36:44 -0500 Message-ID: <20260130133639.765378-11-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260130133639.765378-7-michael.j.ruhl@intel.com> References: <20260130133639.765378-7-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) has different index and offset values for accessing the PMT data area. Update the decode path to support the CRI device. Update the data read callback so to support the CRI usage. Define several magic numbers. Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/xe_vsec.c | 113 +++++++++++++++++++++++++++++------ 1 file changed, 95 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c index 254f7ebca6eb..c43b0d554ead 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -116,10 +116,27 @@ static struct intel_vsec_platform_info xe_vsec_info[] = { #define GUID_CAP_TYPE GENMASK(29, 28) #define GUID_RECORD_ID GENMASK(31, 30) -#define PUNIT_TELEMETRY_OFFSET 0x0200 -#define PUNIT_WATCHER_OFFSET 0x14A0 -#define OOBMSM_0_WATCHER_OFFSET 0x18D8 -#define OOBMSM_1_TELEMETRY_OFFSET 0x1000 +#define BMG_IDX_TELEM_PUNIT 0x00 +#define BMG_IDX_TELEM_OOBMSM 0x01 +#define BMG_IDX_CRASHLOG_PUNIT 0x02 +#define BMG_IDX_CRASHLOG_OOBMSM 0x04 + +#define BMG_PUNIT_TELEMETRY_OFFSET 0x0200 +#define BMG_PUNIT_WATCHER_OFFSET 0x14A0 +#define BMG_OOBMSM_0_WATCHER_OFFSET 0x18D8 +#define BMG_OOBMSM_1_TELEMETRY_OFFSET 0x1000 + +#define CRI_IDX_TELEM_DISCOVERY 0x00 +#define CRI_IDX_TELEM_PUNIT 0x01 +#define CRI_IDX_TELEM_OOBMSM 0x02 +#define CRI_IDX_CRASHLOG_PUNIT 0x03 +#define CRI_IDX_CRASHLOG_OOBMSM 0x04 + +#define CRI_PUNIT_TELEMETRY_OFFSET 0x0200 +#define CRI_PUNIT_WATCHER_OFFSET 0x00A0 +#define CRI_OOBMSM_0_WATCHER_OFFSET 0x04F8 +#define CRI_OOBMSM_1_TELEMETRY_OFFSET 0x1800 +#define CRI_PUNIT_CRASHLOG_OFFSET 0x0660 enum record_id { PUNIT, @@ -133,44 +150,81 @@ enum capability { WATCHER, }; -static int xe_guid_decode(u32 guid, int *index, u32 *offset) +static int bmg_guid_decode(u32 guid, int *index, u32 *offset) { u32 record_id = FIELD_GET(GUID_RECORD_ID, guid); u32 cap_type = FIELD_GET(GUID_CAP_TYPE, guid); - u32 device_id = FIELD_GET(GUID_DEVICE_ID, guid); - if (device_id != BMG_DEVICE_ID) - return -ENODEV; + *offset = 0; - if (cap_type > WATCHER) + if (cap_type == CRASHLOG) { + *index = record_id == PUNIT ? BMG_IDX_CRASHLOG_PUNIT : BMG_IDX_CRASHLOG_OOBMSM; + return 0; + } + + switch (record_id) { + case PUNIT: + *index = BMG_IDX_TELEM_PUNIT; + if (cap_type == TELEMETRY) + *offset = BMG_PUNIT_TELEMETRY_OFFSET; + else + *offset = BMG_PUNIT_WATCHER_OFFSET; + break; + + case OOBMSM_0: + *index = BMG_IDX_TELEM_OOBMSM; + if (cap_type == WATCHER) + *offset = BMG_OOBMSM_0_WATCHER_OFFSET; + break; + + case OOBMSM_1: + *index = BMG_IDX_TELEM_OOBMSM; + if (cap_type == TELEMETRY) + *offset = BMG_OOBMSM_1_TELEMETRY_OFFSET; + break; + default: return -EINVAL; + } + + return 0; +} + +static int cri_guid_decode(u32 guid, int *index, u32 *offset) +{ + u32 record_id = FIELD_GET(GUID_RECORD_ID, guid); + u32 cap_type = FIELD_GET(GUID_CAP_TYPE, guid); *offset = 0; if (cap_type == CRASHLOG) { - *index = record_id == PUNIT ? 2 : 4; + if (record_id == PUNIT) { + *index = CRI_IDX_CRASHLOG_PUNIT; + *offset = CRI_PUNIT_CRASHLOG_OFFSET; + } else { + *index = CRI_IDX_CRASHLOG_OOBMSM; + } return 0; } switch (record_id) { case PUNIT: - *index = 0; + *index = CRI_IDX_TELEM_PUNIT; if (cap_type == TELEMETRY) - *offset = PUNIT_TELEMETRY_OFFSET; + *offset = CRI_PUNIT_TELEMETRY_OFFSET; else - *offset = PUNIT_WATCHER_OFFSET; + *offset = CRI_PUNIT_WATCHER_OFFSET; break; case OOBMSM_0: - *index = 1; + *index = CRI_IDX_TELEM_OOBMSM; if (cap_type == WATCHER) - *offset = OOBMSM_0_WATCHER_OFFSET; + *offset = CRI_OOBMSM_0_WATCHER_OFFSET; break; case OOBMSM_1: - *index = 1; + *index = CRI_IDX_TELEM_OOBMSM; if (cap_type == TELEMETRY) - *offset = OOBMSM_1_TELEMETRY_OFFSET; + *offset = CRI_OOBMSM_1_TELEMETRY_OFFSET; break; default: return -EINVAL; @@ -179,12 +233,30 @@ static int xe_guid_decode(u32 guid, int *index, u32 *offset) return 0; } +static int xe_guid_decode(u32 guid, int *index, u32 *offset) +{ + u32 cap_type = FIELD_GET(GUID_CAP_TYPE, guid); + u32 device_id = FIELD_GET(GUID_DEVICE_ID, guid); + + if (cap_type > WATCHER) + return -EINVAL; + + if (device_id == BMG_DEVICE_ID) + return bmg_guid_decode(guid, index, offset); + + if (device_id == CRI_DEVICE_ID) + return cri_guid_decode(guid, index, offset); + + return -ENODEV; +} + int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_offset, u32 count) { struct xe_device *xe = pdev_to_xe_device(pdev); - void __iomem *telem_addr = xe->mmio.regs + BMG_TELEMETRY_OFFSET; u32 cap_type = FIELD_GET(GUID_CAP_TYPE, guid); + u32 device_id = FIELD_GET(GUID_DEVICE_ID, guid); + void __iomem *telem_addr = xe->mmio.regs; u32 mem_region; u32 offset; int ret; @@ -193,6 +265,11 @@ int xe_pmt_telem_read(struct pci_dev *pdev, u32 guid, u64 *data, loff_t user_off if (ret) return ret; + if (device_id == BMG_DEVICE_ID) + telem_addr += BMG_TELEMETRY_OFFSET; + else + telem_addr += CRI_TELEMETRY_OFFSET; + telem_addr += offset + user_offset; guard(mutex)(&xe->pmt.lock); -- 2.52.0