mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
drm/xe: Add infrastructure for Device OOB workarounds
Some workarounds need to be able to be applied ahead of any GT initialization for example 15015404425. This patch creates XE_DEVICE_WA macro, in the same vein as XE_WA. This macro can be used ahead of GT initialization, and can be tracked in sysfs. This should alleviate some of the complexities that exist in i915. v2: name change SoC to Device, address style issues v5: split into separate patch from RTP changes, put oob within a struct, move the initiation of oob workarounds into xe_device_probe_early(), clean up the comments around XE_WA. Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by: Matt Atwood <matthew.s.atwood@intel.com> Link: https://lore.kernel.org/r/20250709221605.172516-5-matthew.s.atwood@intel.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
This commit is contained in:
committed by
Lucas De Marchi
parent
e7201d98ca
commit
661a6950e0
@@ -21,6 +21,7 @@
|
||||
#include "xe_pxp_debugfs.h"
|
||||
#include "xe_sriov.h"
|
||||
#include "xe_step.h"
|
||||
#include "xe_wa.h"
|
||||
|
||||
#ifdef CONFIG_DRM_XE_DEBUG
|
||||
#include "xe_bo_evict.h"
|
||||
@@ -82,9 +83,28 @@ static int sriov_info(struct seq_file *m, void *data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int workarounds(struct xe_device *xe, struct drm_printer *p)
|
||||
{
|
||||
xe_pm_runtime_get(xe);
|
||||
xe_wa_device_dump(xe, p);
|
||||
xe_pm_runtime_put(xe);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int workaround_info(struct seq_file *m, void *data)
|
||||
{
|
||||
struct xe_device *xe = node_to_xe(m->private);
|
||||
struct drm_printer p = drm_seq_file_printer(m);
|
||||
|
||||
workarounds(xe, &p);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct drm_info_list debugfs_list[] = {
|
||||
{"info", info, 0},
|
||||
{ .name = "sriov_info", .show = sriov_info, },
|
||||
{ .name = "workarounds", .show = workaround_info, },
|
||||
};
|
||||
|
||||
static int forcewake_open(struct inode *inode, struct file *file)
|
||||
|
||||
@@ -700,6 +700,9 @@ int xe_device_probe_early(struct xe_device *xe)
|
||||
{
|
||||
int err;
|
||||
|
||||
xe_wa_device_init(xe);
|
||||
xe_wa_process_device_oob(xe);
|
||||
|
||||
err = xe_mmio_probe_early(xe);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
@@ -363,6 +363,18 @@ struct xe_device {
|
||||
u8 skip_pcode:1;
|
||||
} info;
|
||||
|
||||
struct {
|
||||
/** @wa_active.oob: bitmap with active OOB workarounds */
|
||||
unsigned long *oob;
|
||||
|
||||
/**
|
||||
* @wa_active.oob_initialized: Mark oob as initialized to help detecting misuse
|
||||
* of XE_DEVICE_WA() - it can only be called on initialization after
|
||||
* Device OOB WAs have been processed.
|
||||
*/
|
||||
bool oob_initialized;
|
||||
} wa_active;
|
||||
|
||||
/** @survivability: survivability information for device */
|
||||
struct xe_survivability survivability;
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <linux/compiler_types.h>
|
||||
#include <linux/fault-inject.h>
|
||||
|
||||
#include <generated/xe_device_wa_oob.h>
|
||||
#include <generated/xe_wa_oob.h>
|
||||
|
||||
#include "regs/xe_engine_regs.h"
|
||||
@@ -876,8 +877,33 @@ static __maybe_unused const struct xe_rtp_entry oob_was[] = {
|
||||
|
||||
static_assert(ARRAY_SIZE(oob_was) - 1 == _XE_WA_OOB_COUNT);
|
||||
|
||||
static __maybe_unused const struct xe_rtp_entry device_oob_was[] = {
|
||||
#include <generated/xe_device_wa_oob.c>
|
||||
{}
|
||||
};
|
||||
|
||||
static_assert(ARRAY_SIZE(device_oob_was) - 1 == _XE_DEVICE_WA_OOB_COUNT);
|
||||
|
||||
__diag_pop();
|
||||
|
||||
/**
|
||||
* xe_wa_process_device_oob - process OOB workaround table
|
||||
* @xe: device instance to process workarounds for
|
||||
*
|
||||
* process OOB workaround table for this device, marking in @xe the
|
||||
* workarounds that are active.
|
||||
*/
|
||||
|
||||
void xe_wa_process_device_oob(struct xe_device *xe)
|
||||
{
|
||||
struct xe_rtp_process_ctx ctx = XE_RTP_PROCESS_CTX_INITIALIZER(xe);
|
||||
|
||||
xe_rtp_process_ctx_enable_active_tracking(&ctx, xe->wa_active.oob, ARRAY_SIZE(device_oob_was));
|
||||
|
||||
xe->wa_active.oob_initialized = true;
|
||||
xe_rtp_process(&ctx, device_oob_was);
|
||||
}
|
||||
|
||||
/**
|
||||
* xe_wa_process_oob - process OOB workaround table
|
||||
* @gt: GT instance to process workarounds for
|
||||
@@ -946,6 +972,28 @@ void xe_wa_process_lrc(struct xe_hw_engine *hwe)
|
||||
xe_rtp_process_to_sr(&ctx, lrc_was, ARRAY_SIZE(lrc_was), &hwe->reg_lrc);
|
||||
}
|
||||
|
||||
/**
|
||||
* xe_wa_device_init - initialize device with workaround oob bookkeeping
|
||||
* @xe: Xe device instance to initialize
|
||||
*
|
||||
* Returns 0 for success, negative with error code otherwise
|
||||
*/
|
||||
int xe_wa_device_init(struct xe_device *xe)
|
||||
{
|
||||
unsigned long *p;
|
||||
|
||||
p = drmm_kzalloc(&xe->drm,
|
||||
sizeof(*p) * BITS_TO_LONGS(ARRAY_SIZE(device_oob_was)),
|
||||
GFP_KERNEL);
|
||||
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
|
||||
xe->wa_active.oob = p;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* xe_wa_init - initialize gt with workaround bookkeeping
|
||||
* @gt: GT instance to initialize
|
||||
@@ -980,6 +1028,16 @@ int xe_wa_init(struct xe_gt *gt)
|
||||
}
|
||||
ALLOW_ERROR_INJECTION(xe_wa_init, ERRNO); /* See xe_pci_probe() */
|
||||
|
||||
void xe_wa_device_dump(struct xe_device *xe, struct drm_printer *p)
|
||||
{
|
||||
size_t idx;
|
||||
|
||||
drm_printf(p, "Device OOB Workarounds\n");
|
||||
for_each_set_bit(idx, xe->wa_active.oob, ARRAY_SIZE(device_oob_was))
|
||||
if (device_oob_was[idx].name)
|
||||
drm_printf_indent(p, 1, "%s\n", device_oob_was[idx].name);
|
||||
}
|
||||
|
||||
void xe_wa_dump(struct xe_gt *gt, struct drm_printer *p)
|
||||
{
|
||||
size_t idx;
|
||||
|
||||
@@ -13,17 +13,19 @@ struct xe_gt;
|
||||
struct xe_hw_engine;
|
||||
struct xe_tile;
|
||||
|
||||
int xe_wa_device_init(struct xe_device *xe);
|
||||
int xe_wa_init(struct xe_gt *gt);
|
||||
void xe_wa_process_device_oob(struct xe_device *xe);
|
||||
void xe_wa_process_oob(struct xe_gt *gt);
|
||||
void xe_wa_process_gt(struct xe_gt *gt);
|
||||
void xe_wa_process_engine(struct xe_hw_engine *hwe);
|
||||
void xe_wa_process_lrc(struct xe_hw_engine *hwe);
|
||||
void xe_wa_apply_tile_workarounds(struct xe_tile *tile);
|
||||
void xe_wa_device_dump(struct xe_device *xe, struct drm_printer *p);
|
||||
void xe_wa_dump(struct xe_gt *gt, struct drm_printer *p);
|
||||
|
||||
/**
|
||||
* XE_WA - Out-of-band workarounds, that don't fit the lifecycle any
|
||||
* other more specific type
|
||||
* XE_WA - Out-of-band workarounds, to be queried and called as needed.
|
||||
* @gt__: gt instance
|
||||
* @id__: XE_OOB_<id__>, as generated by build system in generated/xe_wa_oob.h
|
||||
*/
|
||||
@@ -32,4 +34,15 @@ void xe_wa_dump(struct xe_gt *gt, struct drm_printer *p);
|
||||
test_bit(XE_WA_OOB_ ## id__, (gt__)->wa_active.oob); \
|
||||
})
|
||||
|
||||
/**
|
||||
* XE_DEVICE_WA - Out-of-band Device workarounds, to be queried and called
|
||||
* as needed.
|
||||
* @xe__: xe_device
|
||||
* @id__: XE_DEVICE_WA_OOB_<id__>, as generated by build system in generated/xe_device_wa_oob.h
|
||||
*/
|
||||
#define XE_DEVICE_WA(xe__, id__) ({ \
|
||||
xe_assert(xe__, (xe__)->wa_active.oob_initialized); \
|
||||
test_bit(XE_DEVICE_WA_OOB_ ## id__, (xe__)->wa_active.oob); \
|
||||
})
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user