Commit 357d420e authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Tvrtko Ursulin
Browse files

drm/i915/guc: Update GuC messages in intel_guc_log.c 



Use new macros to have common prefix that also include GT#.

v2: drop redundant GuC strings, minor improvements
v3: more message improvements

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230128195907.1837-7-michal.wajdeczko@intel.com
parent d8ff1081

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c

+19 −19
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "i915_memcpy.h"

#include "i915_memcpy.h"

#include "intel_guc_capture.h"

#include "intel_guc_capture.h"

#include "intel_guc_log.h"

#include "intel_guc_log.h"

#include "intel_guc_print.h"





#if defined(CONFIG_DRM_I915_DEBUG_GUC)

#if defined(CONFIG_DRM_I915_DEBUG_GUC)

#define GUC_LOG_DEFAULT_CRASH_BUFFER_SIZE	SZ_2M

#define GUC_LOG_DEFAULT_CRASH_BUFFER_SIZE	SZ_2M
@@ -39,7 +40,6 @@ struct guc_log_section { 
static void _guc_log_init_sizes(struct intel_guc_log *log)

static void _guc_log_init_sizes(struct intel_guc_log *log)

{

{

	struct intel_guc *guc = log_to_guc(log);

	struct intel_guc *guc = log_to_guc(log);

	struct drm_i915_private *i915 = guc_to_gt(guc)->i915;

	static const struct guc_log_section sections[GUC_LOG_SECTIONS_LIMIT] = {

	static const struct guc_log_section sections[GUC_LOG_SECTIONS_LIMIT] = {

		{

		{

			GUC_LOG_CRASH_MASK >> GUC_LOG_CRASH_SHIFT,

			GUC_LOG_CRASH_MASK >> GUC_LOG_CRASH_SHIFT,
@@ -82,12 +82,12 @@ static void _guc_log_init_sizes(struct intel_guc_log *log) 
		}

		}





		if (!IS_ALIGNED(log->sizes[i].bytes, log->sizes[i].units))

		if (!IS_ALIGNED(log->sizes[i].bytes, log->sizes[i].units))

			drm_err(&i915->drm, "Mis-aligned GuC log %s size: 0x%X vs 0x%X!",

			guc_err(guc, "Mis-aligned log %s size: 0x%X vs 0x%X!\n",

				sections[i].name, log->sizes[i].bytes, log->sizes[i].units);

				sections[i].name, log->sizes[i].bytes, log->sizes[i].units);

		log->sizes[i].count = log->sizes[i].bytes / log->sizes[i].units;

		log->sizes[i].count = log->sizes[i].bytes / log->sizes[i].units;





		if (!log->sizes[i].count) {

		if (!log->sizes[i].count) {

			drm_err(&i915->drm, "Zero GuC log %s size!", sections[i].name);

			guc_err(guc, "Zero log %s size!\n", sections[i].name);

		} else {

		} else {

			/* Size is +1 unit */

			/* Size is +1 unit */

			log->sizes[i].count--;

			log->sizes[i].count--;
@@ -95,14 +95,14 @@ static void _guc_log_init_sizes(struct intel_guc_log *log) 




		/* Clip to field size */

		/* Clip to field size */

		if (log->sizes[i].count > sections[i].max) {

		if (log->sizes[i].count > sections[i].max) {

			drm_err(&i915->drm, "GuC log %s size too large: %d vs %d!",

			guc_err(guc, "log %s size too large: %d vs %d!\n",

				sections[i].name, log->sizes[i].count + 1, sections[i].max + 1);

				sections[i].name, log->sizes[i].count + 1, sections[i].max + 1);

			log->sizes[i].count = sections[i].max;

			log->sizes[i].count = sections[i].max;

		}

		}

	}

	}





	if (log->sizes[GUC_LOG_SECTIONS_CRASH].units != log->sizes[GUC_LOG_SECTIONS_DEBUG].units) {

	if (log->sizes[GUC_LOG_SECTIONS_CRASH].units != log->sizes[GUC_LOG_SECTIONS_DEBUG].units) {

		drm_err(&i915->drm, "Unit mis-match for GuC log crash and debug sections: %d vs %d!",

		guc_err(guc, "Unit mismatch for crash and debug sections: %d vs %d!\n",

			log->sizes[GUC_LOG_SECTIONS_CRASH].units,

			log->sizes[GUC_LOG_SECTIONS_CRASH].units,

			log->sizes[GUC_LOG_SECTIONS_DEBUG].units);

			log->sizes[GUC_LOG_SECTIONS_DEBUG].units);

		log->sizes[GUC_LOG_SECTIONS_CRASH].units = log->sizes[GUC_LOG_SECTIONS_DEBUG].units;

		log->sizes[GUC_LOG_SECTIONS_CRASH].units = log->sizes[GUC_LOG_SECTIONS_DEBUG].units;
@@ -374,6 +374,7 @@ size_t intel_guc_get_log_buffer_offset(struct intel_guc_log *log, 




static void _guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)

static void _guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log)

{

{

	struct intel_guc *guc = log_to_guc(log);

	unsigned int buffer_size, read_offset, write_offset, bytes_to_copy, full_cnt;

	unsigned int buffer_size, read_offset, write_offset, bytes_to_copy, full_cnt;

	struct guc_log_buffer_state *log_buf_state, *log_buf_snapshot_state;

	struct guc_log_buffer_state *log_buf_state, *log_buf_snapshot_state;

	struct guc_log_buffer_state log_buf_state_local;

	struct guc_log_buffer_state log_buf_state_local;
@@ -383,7 +384,7 @@ static void _guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) 




	mutex_lock(&log->relay.lock);

	mutex_lock(&log->relay.lock);





	if (WARN_ON(!intel_guc_log_relay_created(log)))

	if (guc_WARN_ON(guc, !intel_guc_log_relay_created(log)))

		goto out_unlock;

		goto out_unlock;





	/* Get the pointer to shared GuC log buffer */

	/* Get the pointer to shared GuC log buffer */
@@ -398,7 +399,7 @@ static void _guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) 
		 * Used rate limited to avoid deluge of messages, logs might be

		 * Used rate limited to avoid deluge of messages, logs might be

		 * getting consumed by User at a slow rate.

		 * getting consumed by User at a slow rate.

		 */

		 */

		DRM_ERROR_RATELIMITED("no sub-buffer to copy general logs\n");

		guc_err_ratelimited(guc, "no sub-buffer to copy general logs\n");

		log->relay.full_count++;

		log->relay.full_count++;





		goto out_unlock;

		goto out_unlock;
@@ -451,7 +452,7 @@ static void _guc_log_copy_debuglogs_for_relay(struct intel_guc_log *log) 
			write_offset = buffer_size;

			write_offset = buffer_size;

		} else if (unlikely((read_offset > buffer_size) ||

		} else if (unlikely((read_offset > buffer_size) ||

				    (write_offset > buffer_size))) {

				    (write_offset > buffer_size))) {

			DRM_ERROR("invalid log buffer state\n");

			guc_err(guc, "invalid log buffer state\n");

			/* copy whole buffer as offsets are unreliable */

			/* copy whole buffer as offsets are unreliable */

			read_offset = 0;

			read_offset = 0;

			write_offset = buffer_size;

			write_offset = buffer_size;
@@ -547,7 +548,7 @@ static int guc_log_relay_create(struct intel_guc_log *log) 
					subbuf_size, n_subbufs,

					subbuf_size, n_subbufs,

					&relay_callbacks, dev_priv);

					&relay_callbacks, dev_priv);

	if (!guc_log_relay_chan) {

	if (!guc_log_relay_chan) {

		DRM_ERROR("Couldn't create relay chan for GuC logging\n");

		guc_err(guc, "Couldn't create relay channel for logging\n");





		ret = -ENOMEM;

		ret = -ENOMEM;

		return ret;

		return ret;
@@ -596,9 +597,8 @@ static u32 __get_default_log_level(struct intel_guc_log *log) 
	}

	}





	if (i915->params.guc_log_level > GUC_LOG_LEVEL_MAX) {

	if (i915->params.guc_log_level > GUC_LOG_LEVEL_MAX) {

		DRM_WARN("Incompatible option detected: %s=%d, %s!\n",

		guc_warn(guc, "Log verbosity param out of range: %d > %d!\n",

			 "guc_log_level", i915->params.guc_log_level,

			 i915->params.guc_log_level, GUC_LOG_LEVEL_MAX);

			 "verbosity too high");

		return (IS_ENABLED(CONFIG_DRM_I915_DEBUG) ||

		return (IS_ENABLED(CONFIG_DRM_I915_DEBUG) ||

			IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)) ?

			IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)) ?

			GUC_LOG_LEVEL_MAX : GUC_LOG_LEVEL_DISABLED;

			GUC_LOG_LEVEL_MAX : GUC_LOG_LEVEL_DISABLED;
@@ -641,7 +641,7 @@ int intel_guc_log_create(struct intel_guc_log *log) 
	log->buf_addr = vaddr;

	log->buf_addr = vaddr;





	log->level = __get_default_log_level(log);

	log->level = __get_default_log_level(log);

	DRM_DEBUG_DRIVER("guc_log_level=%d (%s, verbose:%s, verbosity:%d)\n",

	guc_dbg(guc, "guc_log_level=%d (%s, verbose:%s, verbosity:%d)\n",

		log->level, str_enabled_disabled(log->level),

		log->level, str_enabled_disabled(log->level),

		str_yes_no(GUC_LOG_LEVEL_IS_VERBOSE(log->level)),

		str_yes_no(GUC_LOG_LEVEL_IS_VERBOSE(log->level)),

		GUC_LOG_LEVEL_TO_VERBOSITY(log->level));

		GUC_LOG_LEVEL_TO_VERBOSITY(log->level));
@@ -649,7 +649,7 @@ int intel_guc_log_create(struct intel_guc_log *log) 
	return 0;

	return 0;





err:

err:

	DRM_ERROR("Failed to allocate or map GuC log buffer. %d\n", ret);

	guc_err(guc, "Failed to allocate or map log buffer %pe\n", ERR_PTR(ret));

	return ret;

	return ret;

}

}
@@ -687,7 +687,7 @@ int intel_guc_log_set_level(struct intel_guc_log *log, u32 level) 
					     GUC_LOG_LEVEL_IS_ENABLED(level),

					     GUC_LOG_LEVEL_IS_ENABLED(level),

					     GUC_LOG_LEVEL_TO_VERBOSITY(level));

					     GUC_LOG_LEVEL_TO_VERBOSITY(level));

	if (ret) {

	if (ret) {

		DRM_DEBUG_DRIVER("guc_log_control action failed %d\n", ret);

		guc_dbg(guc, "guc_log_control action failed %pe\n", ERR_PTR(ret));

		goto out_unlock;

		goto out_unlock;

	}

	}
@@ -905,7 +905,7 @@ int intel_guc_log_dump(struct intel_guc_log *log, struct drm_printer *p, 




	map = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);

	map = i915_gem_object_pin_map_unlocked(obj, I915_MAP_WC);

	if (IS_ERR(map)) {

	if (IS_ERR(map)) {

		DRM_DEBUG("Failed to pin object\n");

		guc_dbg(guc, "Failed to pin log object: %pe\n", map);

		drm_puts(p, "(log data unaccessible)\n");

		drm_puts(p, "(log data unaccessible)\n");

		free_page((unsigned long)page);

		free_page((unsigned long)page);

		return PTR_ERR(map);

		return PTR_ERR(map);