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 ABCDFC88E42 for ; Wed, 9 Sep 2026 15:48:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6577610F1E4; Wed, 9 Sep 2026 15:48:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YU4DvJca"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id DEF3910F1E0 for ; Wed, 9 Sep 2026 15:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1788968879; x=1820504879; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=hK10ala/CIbTCQRu+zYC4dqX517GLIuekh7Mdpmw/QE=; b=YU4DvJca2qg0VAAVYCjW7T26vD8WH+IXP6dna75hAKGw0FNKqf/S/WiY JYvdOam6uJm86q4CxV3DYx7Vtwh5+D+b9Nh03gt0/NQ8A0enk1G+lFE/y msNiOjHqnE3D5tqgKX4jDURfOBTRiNgmBAV1IBffO6Vl2dpZO0piUlMKu 5bX+JPKPhM9fNtqK1/WqtJj6EpRJ3TrsvP0axeoP1XBOw1+Eji5qK72KW lvn/Rd9rSBgYBZOmeiEUhEYSbquy/5D9zF81wsyfJOhNtjiiYaDk+zA+C XJEdx2lFV/mhpiHwOWBmLrixwUZseiRMSt81VC2JEBdnBrWdislye3ylX w==; X-CSE-ConnectionGUID: tpYEbWQVRfqboyt9nqoOKA== X-CSE-MsgGUID: nvV8OqBbRzS0r9HGYiWOew== X-IronPort-AV: E=McAfee;i="6800,10657,11900"; a="93091841" X-IronPort-AV: E=Sophos;i="6.25,270,1779174000"; d="scan'208";a="93091841" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2026 08:47:58 -0700 X-CSE-ConnectionGUID: B6E/fVe8Rte/+cyYPMPypw== X-CSE-MsgGUID: kt7LQqMATlGcuJdio5aiJw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,270,1779174000"; d="scan'208";a="268102524" Received: from mjruhl-vm.amr.corp.intel.com ([10.11.186.166]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Sep 2026 08:47:57 -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 v7 11/20] drm/xe/vsec: Refactor BattleMage PMT defines Date: Wed, 9 Sep 2026 08:47:50 -0700 Message-ID: <20260909154739.1515514-33-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260909154739.1515514-22-michael.j.ruhl@intel.com> References: <20260909154739.1515514-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" Rename generic defines to be BMG specific. Define several magic numbers. Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/xe_vsec.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c index 3bea89f2a5c5..ca8414441a69 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -90,10 +90,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, @@ -122,29 +127,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; -- 2.43.0