mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-04-18 10:23:08 +02:00
Lucas De Marchi
bdea9e692d
commita9ab6591b4upstream. Commit70fb86a85d("drm/xe: Revert some changes that break a mesa debug tool") partially reverted some changes to workaround breakage caused to mesa tools. However, in doing so it also broke fetching the GuC log via debugfs since xe_print_blob_ascii85() simply bails out. The fix is to avoid the extra newlines: the devcoredump interface is line-oriented and adding random newlines in the middle breaks it. If a tool is able to parse it by looking at the data and checking for chars that are out of the ascii85 space, it can still do so. A format change that breaks the line-oriented output on devcoredump however needs better coordination with existing tools. v2: Add suffix description comment v3: Reword explanation of xe_print_blob_ascii85() calling drm_puts() in a loop Reviewed-by: José Roberto de Souza <jose.souza@intel.com> Cc: John Harrison <John.C.Harrison@Intel.com> Cc: Julia Filipchuk <julia.filipchuk@intel.com> Cc: José Roberto de Souza <jose.souza@intel.com> Cc: stable@vger.kernel.org Fixes:70fb86a85d("drm/xe: Revert some changes that break a mesa debug tool") Fixes:ec1455ce7e("drm/xe/devcoredump: Add ASCII85 dump helper function") Link: https://patchwork.freedesktop.org/patch/msgid/20250123202307.95103-2-jose.souza@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> (cherry picked from commit2c95bbf500) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
105 lines
2.4 KiB
C
105 lines
2.4 KiB
C
// SPDX-License-Identifier: MIT
|
|
/*
|
|
* Copyright © 2022 Intel Corporation
|
|
*/
|
|
|
|
#include "xe_guc_log.h"
|
|
|
|
#include <drm/drm_managed.h>
|
|
#include <linux/vmalloc.h>
|
|
|
|
#include "xe_bo.h"
|
|
#include "xe_devcoredump.h"
|
|
#include "xe_gt.h"
|
|
#include "xe_gt_printk.h"
|
|
#include "xe_map.h"
|
|
#include "xe_module.h"
|
|
|
|
static struct xe_gt *
|
|
log_to_gt(struct xe_guc_log *log)
|
|
{
|
|
return container_of(log, struct xe_gt, uc.guc.log);
|
|
}
|
|
|
|
static struct xe_device *
|
|
log_to_xe(struct xe_guc_log *log)
|
|
{
|
|
return gt_to_xe(log_to_gt(log));
|
|
}
|
|
|
|
static size_t guc_log_size(void)
|
|
{
|
|
/*
|
|
* GuC Log buffer Layout
|
|
*
|
|
* +===============================+ 00B
|
|
* | Crash dump state header |
|
|
* +-------------------------------+ 32B
|
|
* | Debug state header |
|
|
* +-------------------------------+ 64B
|
|
* | Capture state header |
|
|
* +-------------------------------+ 96B
|
|
* | |
|
|
* +===============================+ PAGE_SIZE (4KB)
|
|
* | Crash Dump logs |
|
|
* +===============================+ + CRASH_SIZE
|
|
* | Debug logs |
|
|
* +===============================+ + DEBUG_SIZE
|
|
* | Capture logs |
|
|
* +===============================+ + CAPTURE_SIZE
|
|
*/
|
|
return PAGE_SIZE + CRASH_BUFFER_SIZE + DEBUG_BUFFER_SIZE +
|
|
CAPTURE_BUFFER_SIZE;
|
|
}
|
|
|
|
/**
|
|
* xe_guc_log_print - dump a copy of the GuC log to some useful location
|
|
* @log: GuC log structure
|
|
* @p: the printer object to output to
|
|
*/
|
|
void xe_guc_log_print(struct xe_guc_log *log, struct drm_printer *p)
|
|
{
|
|
struct xe_device *xe = log_to_xe(log);
|
|
size_t size;
|
|
void *copy;
|
|
|
|
if (!log->bo) {
|
|
drm_puts(p, "GuC log buffer not allocated");
|
|
return;
|
|
}
|
|
|
|
size = log->bo->size;
|
|
|
|
copy = vmalloc(size);
|
|
if (!copy) {
|
|
drm_printf(p, "Failed to allocate %zu", size);
|
|
return;
|
|
}
|
|
|
|
xe_map_memcpy_from(xe, copy, &log->bo->vmap, 0, size);
|
|
|
|
xe_print_blob_ascii85(p, "Log data", '\n', copy, 0, size);
|
|
|
|
vfree(copy);
|
|
}
|
|
|
|
int xe_guc_log_init(struct xe_guc_log *log)
|
|
{
|
|
struct xe_device *xe = log_to_xe(log);
|
|
struct xe_tile *tile = gt_to_tile(log_to_gt(log));
|
|
struct xe_bo *bo;
|
|
|
|
bo = xe_managed_bo_create_pin_map(xe, tile, guc_log_size(),
|
|
XE_BO_FLAG_SYSTEM |
|
|
XE_BO_FLAG_GGTT |
|
|
XE_BO_FLAG_GGTT_INVALIDATE);
|
|
if (IS_ERR(bo))
|
|
return PTR_ERR(bo);
|
|
|
|
xe_map_memset(xe, &bo->vmap, 0, 0, guc_log_size());
|
|
log->bo = bo;
|
|
log->level = xe_modparam.guc_log_level;
|
|
|
|
return 0;
|
|
}
|