Commit b46afdac authored by Ilia Levi's avatar Ilia Levi Committed by Michal Wajdeczko
Browse files

drm/xe: Introduce dedicated config for memirq debug 



Separate config for debugging memory based interrupts (memirq)
infrastructure.

Signed-off-by: default avatarIlia Levi <ilia.levi@intel.com>
Reviewed-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240918053942.1331811-2-illevi@habana.ai
parent 58548b91

drivers/gpu/drm/xe/Kconfig.debug

+12 −0
Original line number Diff line number Diff line
@@ -40,9 +40,21 @@ config DRM_XE_DEBUG_VM 


	  If in doubt, say "N".



config DRM_XE_DEBUG_MEMIRQ

	bool "Enable extra memirq debugging"

	default n

	help

	  Choose this option to enable additional debugging info for

	  memory based interrupts.



	  Recommended for driver developers only.



	  If in doubt, say "N".



config DRM_XE_DEBUG_SRIOV

	bool "Enable extra SR-IOV debugging"

	default n

	select DRM_XE_DEBUG_MEMIRQ

	help

	  Enable extra SR-IOV debugging info.

drivers/gpu/drm/xe/xe_memirq.c

+19 −10
Original line number Diff line number Diff line
@@ -20,10 +20,21 @@ 
#include "xe_map.h"

#include "xe_memirq.h"

#include "xe_sriov.h"

#include "xe_sriov_printk.h"



#define memirq_assert(m, condition)	xe_tile_assert(memirq_to_tile(m), condition)

#define memirq_debug(m, msg...)		xe_sriov_dbg_verbose(memirq_to_xe(m), "MEMIRQ: " msg)

#define memirq_printk(m, _level, _fmt, ...)			\

	drm_##_level(&memirq_to_xe(m)->drm, "MEMIRQ%u: " _fmt,	\

		     memirq_to_tile(m)->id, ##__VA_ARGS__)



#ifdef CONFIG_DRM_XE_DEBUG_MEMIRQ

#define memirq_debug(m, _fmt, ...)	memirq_printk(m, dbg, _fmt, ##__VA_ARGS__)

#else

#define memirq_debug(...)

#endif



#define memirq_err(m, _fmt, ...)	memirq_printk(m, err, _fmt, ##__VA_ARGS__)

#define memirq_err_ratelimited(m, _fmt, ...)	\

	memirq_printk(m, err_ratelimited, _fmt, ##__VA_ARGS__)



static struct xe_tile *memirq_to_tile(struct xe_memirq *memirq)

{
@@ -157,8 +168,7 @@ static int memirq_alloc_pages(struct xe_memirq *memirq) 
	return drmm_add_action_or_reset(&xe->drm, __release_xe_bo, memirq->bo);



out:

	xe_sriov_err(memirq_to_xe(memirq),

		     "Failed to allocate memirq page (%pe)\n", ERR_PTR(err));

	memirq_err(memirq, "Failed to allocate memirq page (%pe)\n", ERR_PTR(err));

	return err;

}
@@ -299,8 +309,7 @@ int xe_memirq_init_guc(struct xe_memirq *memirq, struct xe_guc *guc) 
	return 0;



failed:

	xe_sriov_err(memirq_to_xe(memirq),

		     "Failed to setup report pages in %s (%pe)\n",

	memirq_err(memirq, "Failed to setup report pages in %s (%pe)\n",

		   guc_name(guc), ERR_PTR(err));

	return err;

}
@@ -349,7 +358,7 @@ static bool memirq_received(struct xe_memirq *memirq, struct iosys_map *vector, 
	value = iosys_map_rd(vector, offset, u8);

	if (value) {

		if (value != 0xff)

			xe_sriov_err_ratelimited(memirq_to_xe(memirq),

			memirq_err_ratelimited(memirq,

					       "Unexpected memirq value %#x from %s at %u\n",

					       value, name, offset);

		iosys_map_wr(vector, offset, u8, 0x00);