From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 B53982638B1; Mon, 24 Feb 2025 11:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740395871; cv=none; b=fHik1+LeL3c0DL185xLkyr9I4m2dk8PC8UlgZKMYQlsfktk/oqy2rdE4Gp9Id2fKzbIDckQAdAwkf/KI/pu9ywT5q4tlHIOyPJ3O1BoIp/wIakpwi6xdyA7AD9SahSC+jmHgwnfNIFmXXp/uIcvM9V1F8TWJZrLkHbzyTvdG3OM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740395871; c=relaxed/simple; bh=TeyWQj9qkghOfMJ64W/gHI66DjJV8RFUgYrm7AH8ts4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=U6PUrJaQ158Zb7MdbjO/AX6rkCt5Gm6K/1ld8wStjjfTXXM89lbNX4KZ7V3aZA1+NI/uJOuQ1S9PUjDw31X2Oth4hnzZ+NLy40j1C2u/gpapntqwaeHw8EvgQHZWfiOQQYFw3hJk/WCTSV7S1xGd5I53nBF5azZvNcIQ8+CORXU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=givNZBbg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="givNZBbg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0E9D3C4CEE6; Mon, 24 Feb 2025 11:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740395871; bh=TeyWQj9qkghOfMJ64W/gHI66DjJV8RFUgYrm7AH8ts4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=givNZBbgt6o8H3gOcRCAfBdG16tweQmnw0jeMuS/BMxLAvaW61puGGTmFjGmgVaTA 1gt5ilNYcYMShtYS+cI+t9tOngbgSpbiTjvZL8JICGu8LX5aLVhcJR8Yh7AUkqEASs 7Z6k6Xj2DWfrcmvtPmb2SCurgy2bMY5R9WFaWgMKX8/F63+B2GCrq/r3eNzfZwaV6n 8OrTa47/ssMGfEVX3QD35IUp3vTUkA8UKLJSUqIe7GGkNU5v5WYXe5UT0CH7goVgu5 rBsAzvafwk8+jGZkSfr/17fU6b4TEwPVp2z/t4391M3SlYIBuwm7b2vPIPHVqj+uxl Xs/5zHhNXq8cg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= , John Harrison , Lucas De Marchi , Rodrigo Vivi , Sasha Levin , thomas.hellstrom@linux.intel.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.13 27/32] drm/xe: Make GUC binaries dump consistent with other binaries in devcoredump Date: Mon, 24 Feb 2025 06:16:33 -0500 Message-Id: <20250224111638.2212832-27-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224111638.2212832-1-sashal@kernel.org> References: <20250224111638.2212832-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13.4 Content-Transfer-Encoding: 8bit From: José Roberto de Souza [ Upstream commit 643f209ba3fdd4099416aaf9efa8266f7366d6fb ] All other(hwsp, hwctx and vmas) binaries follow this format: [name].length: 0x1000 [name].data: xxxxxxx [name].error: errno The error one is just in case by some reason it was not able to capture the binary. So this GuC binaries should follow the same patern. v2: - renamed GUC binary to LOG Cc: John Harrison Cc: Lucas De Marchi Reviewed-by: Lucas De Marchi Signed-off-by: José Roberto de Souza Link: https://patchwork.freedesktop.org/patch/msgid/20250123202307.95103-3-jose.souza@intel.com Signed-off-by: Lucas De Marchi (cherry picked from commit cb1f868ca13756c0c18ba54d1591332476760d07) Signed-off-by: Rodrigo Vivi Signed-off-by: Sasha Levin --- drivers/gpu/drm/xe/xe_guc_ct.c | 6 ++++-- drivers/gpu/drm/xe/xe_guc_log.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c b/drivers/gpu/drm/xe/xe_guc_ct.c index 6eabf7a9d3b07..b527f34b979be 100644 --- a/drivers/gpu/drm/xe/xe_guc_ct.c +++ b/drivers/gpu/drm/xe/xe_guc_ct.c @@ -1699,9 +1699,11 @@ void xe_guc_ct_snapshot_print(struct xe_guc_ct_snapshot *snapshot, drm_printf(p, "\tg2h outstanding: %d\n", snapshot->g2h_outstanding); - if (snapshot->ctb) - xe_print_blob_ascii85(p, "CTB data", '\n', + if (snapshot->ctb) { + drm_printf(p, "[CTB].length: 0x%lx\n", snapshot->ctb_size); + xe_print_blob_ascii85(p, "[CTB].data", '\n', snapshot->ctb, 0, snapshot->ctb_size); + } } else { drm_puts(p, "CT disabled\n"); } diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c index 2baa4d95571fb..2457572ed86ad 100644 --- a/drivers/gpu/drm/xe/xe_guc_log.c +++ b/drivers/gpu/drm/xe/xe_guc_log.c @@ -208,10 +208,11 @@ void xe_guc_log_snapshot_print(struct xe_guc_log_snapshot *snapshot, struct drm_ drm_printf(p, "GuC timestamp: 0x%08llX [%llu]\n", snapshot->stamp, snapshot->stamp); drm_printf(p, "Log level: %u\n", snapshot->level); + drm_printf(p, "[LOG].length: 0x%lx\n", snapshot->size); remain = snapshot->size; for (i = 0; i < snapshot->num_chunks; i++) { size_t size = min(GUC_LOG_CHUNK_SIZE, remain); - const char *prefix = i ? NULL : "Log data"; + const char *prefix = i ? NULL : "[LOG].data"; char suffix = i == snapshot->num_chunks - 1 ? '\n' : 0; xe_print_blob_ascii85(p, prefix, suffix, snapshot->copy[i], 0, size); -- 2.39.5