Re: [PATCH v4 2/2] tests/intel/xe_oa: Wa_14026633728

["Dixit, Ashutosh" <ashutosh.dixit@intel.com>]

On Mon, 04 May 2026 22:47:41 -0700, Shekhar Chauhan wrote:
>
> For MERTOA in CRI, oa buffer can be in device memory. Because of slower
> device mem access, OA exponent values lower than 8 can result in buffer
> overflows. Bump the OA exponent value.
>
> Signed-off-by: Shekhar Chauhan <shekhar.chauhan@intel.com>
> ---
>  tests/intel/xe_oa.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c
> index 988c46df6..c7e756426 100644
> --- a/tests/intel/xe_oa.c
> +++ b/tests/intel/xe_oa.c
> @@ -24,6 +24,7 @@
>  #include "igt_device.h"
>  #include "igt_syncobj.h"
>  #include "igt_sysfs.h"
> +#include "intel_wa.h"
>  #include "xe/xe_ioctl.h"
>  #include "xe/xe_query.h"
>  #include "xe/xe_oa.h"
> @@ -2643,8 +2644,15 @@ test_buffer_fill(const struct drm_xe_oa_unit *oau)
>  static void
>  test_non_zero_reason(const struct drm_xe_oa_unit *oau, size_t oa_buffer_size)
>  {
> -	/* ~20 micro second period */
> -	int oa_exponent = max_oa_exponent_for_period_lte(20000);
> +	/*
> +	 * Wa_14026633728: For MERTOA in CRI, oa buffer can be in device memory.
> +	 * Because of slower device mem access, OA exponent values lower than 8 can
> +	 * result in buffer overflows.
> +	 * By default, use ~20 micro second period.
> +	 */
> +	int oa_exponent = max(max_oa_exponent_for_period_lte(20000),
> +			      (oau->oa_unit_type == DRM_XE_OA_UNIT_TYPE_MERT &&
> +			       igt_has_intel_wa(drm_fd, "14026633728") > 0) ? 8 : 0);

0 check is not needed, just 'igt_has_intel_wa(drm_fd, "14026633728")' is
sufficient.

Also, can we change this code to the way it was in v2 (with an if
statement). Just replace with the has_wa check and move the code below the
variable declarations, it is a little bit cleaner and easier to read.

>	struct intel_xe_perf_metric_set *test_set = oa_unit_metric_set(oau);
>	uint64_t fmt = test_set->perf_oa_format;
>	size_t report_size = get_oa_format(fmt).size;
> --
> 2.53.0
>