Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) (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 F191F238C1F for ; Wed, 9 Jul 2025 18:45:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752086722; cv=none; b=svg0mWf3mmqjUEmaIl2AOAD49SOZgAsjasO4jQQnUZWmQtzdB9H9TvtbzyNG/VcpY8o19xljj6RmPGBdZD8DpSUzDNodUk+lZfo+evlWDxMSEEzVNu98guGjWMjS8UW3LUS6CveUIjFUGZuhTX5iLl+pw6PBwXqqFyKhG6bIL08= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752086722; c=relaxed/simple; bh=kD5mgGIPmPJ8qpg3mtyR0yk79hq+3D/LEi3YQATcGlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eM7XzZEsd4pXyIjfJS6VW2+JYvx9PRIZ+hLEj1lOjGM3nGEh70r4MUgot+tr9CNyIZMstLcpeJP2ZRUFKREhMD64bgr428RcNMhZuVwX1CtdW2Gyybom5ft4aMHs3yrtLQUuYidCWDg+sOPmVkNkvuHHtEoo9Odmq9pUTbIbRx0= 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=nAshQHdF; arc=none smtp.client-ip=192.198.163.14 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="nAshQHdF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1752086721; x=1783622721; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kD5mgGIPmPJ8qpg3mtyR0yk79hq+3D/LEi3YQATcGlA=; b=nAshQHdFrs/Ygn+nW9ZVDz2SZrdoaxb3Uc7Gyz/Ijq3EPNb9ljw7Wscv H6B8XvAcwD8FD+Fyz9xjDPD8PQBa0HJI6I9Zss3JTvbY/FITEwHpXtPT4 n3mgw5RGQCYn0aGOoekuQirJkTtrblCdcKb5WaEvwG7ecy42J7N6m5w1s x1vC9GH4aqd8FKgxs1/l/Am2p6Ce+azxV3PcRd0axzXe6AycJhWiWcQAK fR1Awo+d9DariXqyIXsizF6FMrp9hLGBWDs+QtLNfeGq1PNbcrjIxA9nM 4jEIR+9Y294eWxVaDAeIunh06iljGJk1wSb65spdKGp4/myzUc4aQLZta w==; X-CSE-ConnectionGUID: pYfvUQWOQY+W1TqbzdYjdQ== X-CSE-MsgGUID: agp2CSTCTgqzVkL1GzZjdA== X-IronPort-AV: E=McAfee;i="6800,10657,11489"; a="54451023" X-IronPort-AV: E=Sophos;i="6.16,298,1744095600"; d="scan'208";a="54451023" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2025 11:45:20 -0700 X-CSE-ConnectionGUID: ky+4Hy3rSyqubULRCMUOdA== X-CSE-MsgGUID: usJqDKLrRZGd575dGIOzfw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,298,1744095600"; d="scan'208";a="161404843" Received: from mjruhl-desk.amr.corp.intel.com (HELO mjruhl-desk.intel.com) ([10.124.221.121]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2025 11:45:19 -0700 From: "Michael J. Ruhl" To: platform-driver-x86@vger.kernel.org, intel-xe@lists.freedesktop.org, hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, lucas.demarchi@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 v7 02/12] drm/xe: Correct BMG VSEC header sizing Date: Wed, 9 Jul 2025 14:44:48 -0400 Message-ID: <20250709184458.298283-3-michael.j.ruhl@intel.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250709184458.298283-1-michael.j.ruhl@intel.com> References: <20250709184458.298283-1-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 The intel_vsec_header information for the crashlog feature is incorrect. Update the VSEC header with correct sizing and count. Since the crashlog entries are "merged" (num_entries = 2), the separate capabilities entries must be merged as well. Acked-by: Rodrigo Vivi Fixes: 0c45e76fcc62 ("drm/xe/vsec: Support BMG devices") Signed-off-by: Michael J. Ruhl --- drivers/gpu/drm/xe/xe_vsec.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vsec.c b/drivers/gpu/drm/xe/xe_vsec.c index 3e573b0b7ebd..67238fc57a4d 100644 --- a/drivers/gpu/drm/xe/xe_vsec.c +++ b/drivers/gpu/drm/xe/xe_vsec.c @@ -32,28 +32,18 @@ static struct intel_vsec_header bmg_telemetry = { .offset = BMG_DISCOVERY_OFFSET, }; -static struct intel_vsec_header bmg_punit_crashlog = { - .length = 0x10, +static struct intel_vsec_header bmg_crashlog = { + .length = 0x18, .id = VSEC_ID_CRASHLOG, - .num_entries = 1, - .entry_size = 4, + .num_entries = 2, + .entry_size = 6, .tbir = 0, .offset = BMG_DISCOVERY_OFFSET + 0x60, }; -static struct intel_vsec_header bmg_oobmsm_crashlog = { - .length = 0x10, - .id = VSEC_ID_CRASHLOG, - .num_entries = 1, - .entry_size = 4, - .tbir = 0, - .offset = BMG_DISCOVERY_OFFSET + 0x78, -}; - static struct intel_vsec_header *bmg_capabilities[] = { &bmg_telemetry, - &bmg_punit_crashlog, - &bmg_oobmsm_crashlog, + &bmg_crashlog, NULL }; -- 2.50.0