Re: [PATCH v5 1/2] drm/xe/guc: Update GuC log buffer type value

[Michal Wajdeczko <michal.wajdeczko@intel.com>]

On 10/9/2025 11:57 PM, Zhanjun Dong wrote:
> Update GuC log buffer type value, to align with the GuC specification.
> Update buffer offset calulation.

typo

> 
> Signed-off-by: Zhanjun Dong <zhanjun.dong@intel.com>
> ---
>  drivers/gpu/drm/xe/abi/guc_log_abi.h |  2 +-
>  drivers/gpu/drm/xe/xe_guc_log.c      | 13 +++++++++----
>  2 files changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/abi/guc_log_abi.h b/drivers/gpu/drm/xe/abi/guc_log_abi.h
> index 554630b7ccd9..b1819679fa35 100644
> --- a/drivers/gpu/drm/xe/abi/guc_log_abi.h
> +++ b/drivers/gpu/drm/xe/abi/guc_log_abi.h
> @@ -10,8 +10,8 @@
>  
>  /* GuC logging buffer types */
>  enum guc_log_buffer_type {
> -	GUC_LOG_BUFFER_CRASH_DUMP,
>  	GUC_LOG_BUFFER_DEBUG,
> +	GUC_LOG_BUFFER_CRASH_DUMP,
>  	GUC_LOG_BUFFER_CAPTURE,
>  };
>  
> diff --git a/drivers/gpu/drm/xe/xe_guc_log.c b/drivers/gpu/drm/xe/xe_guc_log.c
> index c01ccb35dc75..b5d837efaf74 100644
> --- a/drivers/gpu/drm/xe/xe_guc_log.c
> +++ b/drivers/gpu/drm/xe/xe_guc_log.c
> @@ -330,10 +330,15 @@ u32 xe_guc_get_log_buffer_offset(struct xe_guc_log *log, enum guc_log_buffer_typ
>  	enum guc_log_buffer_type i;
>  	u32 offset = PAGE_SIZE;/* for the log_buffer_states */

btw, this should be fixed SZ_4K, not a config PAGE_SIZE

>  
> -	for (i = GUC_LOG_BUFFER_CRASH_DUMP; i < GUC_LOG_BUFFER_TYPE_MAX; ++i) {
> -		if (i == type)
> -			break;
> -		offset += xe_guc_get_log_buffer_size(log, i);
> +	switch (type) {
> +	case GUC_LOG_BUFFER_CAPTURE:
> +		offset += XE_GUC_LOG_CRASH_BUFFER_SIZE;

../drivers/gpu/drm/xe/xe_guc_log.c: In function ‘xe_guc_get_log_buffer_offset’:
../drivers/gpu/drm/xe/xe_guc_log.c:335:27: error: ‘XE_GUC_LOG_CRASH_BUFFER_SIZE’ undeclared (first use in this function)
  335 |                 offset += XE_GUC_LOG_CRASH_BUFFER_SIZE;
      |                           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~


> +		fallthrough;
> +	case GUC_LOG_BUFFER_CRASH_DUMP:
> +		offset += XE_GUC_LOG_EVENT_LOG_BUFFER_SIZE;
> +		fallthrough;
> +	case GUC_LOG_BUFFER_EVENT_LOG:
> +		break;
>  	}
>  
>  	return offset;