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 6B034C98304 for ; Wed, 23 Sep 2026 18:11:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 24B9D10F0D5; Wed, 23 Sep 2026 18:11:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="kItXo+xz"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3384910E961 for ; Wed, 23 Sep 2026 18:11: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=1790187087; x=1821723087; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=hSYzUnb+WraD/wngPAdgq3GOqeM+Ns4mCvTlHxPnI/8=; b=kItXo+xzKpH/eQmGierOIQwcSBx+aUQ3Igk/aMruDoQA1I69JuhlXxN5 3HeU8X9q+w68EgDeAOKdQXj2cJpge6YsYFZ0K8NmiNyEehSYKc6Hf340v IjzUnU2k/8NV/CQTZUX8V37in1dhG018PncIOjj0CIGWPUkIMbROkgtWD ivFNS3kzyRCCWQqQvIXPTVMSf8lTT+oIFEWFt2RN7RTf8TsPDnMSoR6JQ ncMoYtwhQiC18YjMGZ9yn9cE+rJ/x5FQX1zbuzFdmLeQtZ5+/cG0rPTKE XGQM3Ecz1SFUUkSb83EX0w91soabTHfjUgJZ+M32Z+CQR3raqTlqPLvzI w==; X-CSE-ConnectionGUID: FOfjSJZXR5mIrbDn3kbs+g== X-CSE-MsgGUID: vAARDDHeTEa6WmSnCsaC+A== X-IronPort-AV: E=McAfee;i="6800,10657,11914"; a="93416039" X-IronPort-AV: E=Sophos;i="6.27,119,1787036400"; d="scan'208";a="93416039" Received: from fmviesa013.fm.intel.com ([10.60.135.153]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2026 11:11:25 -0700 X-CSE-ConnectionGUID: 1wdcmvetTsaaLc8iROgEtg== X-CSE-MsgGUID: 0KsDJUfIRUKWPB/8+kgcIQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,119,1787036400"; d="scan'208";a="4980715" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Sep 2026 11:11:26 -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 v11 13/20] drm/xe/vsec: Add base_offset to allow for more flexibilty Date: Wed, 23 Sep 2026 11:11:28 -0700 Message-ID: <20260923181115.2514193-35-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260923181115.2514193-22-michael.j.ruhl@intel.com> References: <20260923181115.2514193-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" Current pmt_telem_read() usage is a fixed (for BMG) offset. In order to support other devices this must be settable. Add a base offset for more flexibility. Add a check to verify that it has been set before allowing device access. 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 | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index bb4234f00453..e08348a95b28 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -486,6 +486,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 ebe56c85bc05..04aec1e5c15c 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -172,6 +172,7 @@ static int xe_guid_decode(u32 guid, int *index, u32 *offset) * * Return: * * -ENODEV device is not available (hotplug) + * * -EAGAIN base_offset has not been set, so init path has not yet been done. * * -ENODATA for incorrect power state * * -EINVAL for unsupported PMT feature * * count number of bytes read on success @@ -180,8 +181,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; @@ -192,6 +193,11 @@ int xe_pmt_telem_read(struct device *dev, u32 guid, u64 *data, loff_t user_offse if (!drm_dev_enter(&xe->drm, &idx)) return -ENODEV; + if (!xe->pmt.base_offset) { + ret = -EAGAIN; + goto dev_exit; + } + ret = xe_guid_decode(guid, &mem_region, &offset); if (ret) goto dev_exit; @@ -269,6 +275,7 @@ void xe_vsec_init(struct xe_device *xe) switch (platform) { case XE_VSEC_BMG: + xe->pmt.base_offset = BMG_TELEMETRY_OFFSET; info->priv_data = &xe_pmt_cb; break; default: -- 2.43.0