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 63A14C79F81 for ; Thu, 3 Sep 2026 20:10:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B469210F771; Thu, 3 Sep 2026 20:10:43 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="nfu0osEd"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2182010E52E for ; Thu, 3 Sep 2026 20:10:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1788466238; x=1820002238; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Ii9MBAjAZlbdDpOLndhwcKP1xLT9fPr1My9QYqCYr/Y=; b=nfu0osEdNavM8Rmr4lC3DEluhYvORiyEfb71V+bdpG+R6U70Woe9nfqS qI/SE7M4l/R4EQsbqhgDtMsYlqy8nb9bhMxyH11b5Vh90uixupi9A2qmf gt8MNDeJXBJQzwCv3Bs684XBVMnFT2pmR9RydonNVsrq1pezEJPbRyn/Z echvvlRZ/bgHSGTybrSVYCDBl/g79Q2L7aETCBIvPBn1aaO5cLSXAefIh kyrq7/PVFCRwc7CKluAT1U/PuOJRvdSR1Qk7N6Pp0YJiA3S5buAmxd1Tu sUbm3yUdKa8wSnV9LQfZhSIAEnp/barU+fvaCIcD+LukDS65WXvhXkql4 Q==; X-CSE-ConnectionGUID: oa68sBjLRZaw+U6EOcJizg== X-CSE-MsgGUID: adbPq/1/TKieZgO8jvsSSA== X-IronPort-AV: E=McAfee;i="6800,10657,11895"; a="88994635" X-IronPort-AV: E=Sophos;i="6.25,260,1779174000"; d="scan'208";a="88994635" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2026 13:10:37 -0700 X-CSE-ConnectionGUID: LF2nv85tTr6GA+lS+SlzZw== X-CSE-MsgGUID: Ff1geu16TFOFBEnBD9WZhQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,260,1779174000"; d="scan'208";a="273348147" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2026 13:10:31 -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 v5 12/18] drm/xe/vsec: Refactor BattleMage PMT defines Date: Thu, 3 Sep 2026 13:10:14 -0700 Message-ID: <20260903201002.1064889-32-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260903201002.1064889-20-michael.j.ruhl@intel.com> References: <20260903201002.1064889-20-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" Rename generic defines to be BMG specific. Define several magic numbers. Add a base offset for more flexibility. Reviewed-by: Rodrigo Vivi Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/xe_device_types.h | 2 ++ drivers/gpu/drm/xe/xe_vsec.c | 32 +++++++++++++++++----------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 180d450a6deb..3f1a70813a99 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -466,6 +466,8 @@ struct xe_device { struct { /** @pmt.lock: protect access for telemetry data */ struct mutex lock; + /** @pmt.base_offset: device specific base offset */ + u64 base_offset; } 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 59140ac85e25..d856a38f4d89 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -133,10 +133,15 @@ 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 enum record_id { PUNIT, @@ -165,29 +170,29 @@ static int xe_guid_decode(u32 guid, int *index, u32 *offset) *offset = 0; if (cap_type == CRASHLOG) { - *index = record_id == PUNIT ? 2 : 4; + *index = record_id == PUNIT ? BMG_IDX_CRASHLOG_PUNIT : BMG_IDX_CRASHLOG_OOBMSM; return 0; } switch (record_id) { case PUNIT: - *index = 0; + *index = BMG_IDX_TELEM_PUNIT; if (cap_type == TELEMETRY) - *offset = PUNIT_TELEMETRY_OFFSET; + *offset = BMG_PUNIT_TELEMETRY_OFFSET; else - *offset = PUNIT_WATCHER_OFFSET; + *offset = BMG_PUNIT_WATCHER_OFFSET; break; case OOBMSM_0: - *index = 1; + *index = BMG_IDX_TELEM_OOBMSM; if (cap_type == WATCHER) - *offset = OOBMSM_0_WATCHER_OFFSET; + *offset = BMG_OOBMSM_0_WATCHER_OFFSET; break; case OOBMSM_1: - *index = 1; + *index = BMG_IDX_TELEM_OOBMSM; if (cap_type == TELEMETRY) - *offset = OOBMSM_1_TELEMETRY_OFFSET; + *offset = BMG_OOBMSM_1_TELEMETRY_OFFSET; break; default: return -EINVAL; @@ -216,8 +221,8 @@ int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offse u32 count) { struct xe_device *xe = kdev_to_xe_device(dev); - void __iomem *telem_addr = xe->mmio.regs + BMG_TELEMETRY_OFFSET; u32 cap_type = FIELD_GET(GUID_CAP_TYPE, guid); + void __iomem *telem_addr = xe->mmio.regs + xe->pmt.base_offset; u32 mem_region; u32 offset; int ret = 0; @@ -309,6 +314,7 @@ void xe_vsec_init(struct xe_device *xe) case XE_VSEC_BMG: if (IS_SRIOV_VF(xe)) return; + xe->pmt.base_offset = BMG_TELEMETRY_OFFSET; info->priv_data = &xe_pmt_cb; break; default: -- 2.43.0