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

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

On Wed, 06 May 2026 22:34:59 -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 | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
>
> diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c
> index 988c46df6..c464d5a0d 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"
> @@ -2648,6 +2649,11 @@ test_non_zero_reason(const struct drm_xe_oa_unit *oau, size_t oa_buffer_size)
>	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;
> +	/*
> +	 * If modifying the indices or order of items inside properties[],
> +	 * ensure that a corresponding change is made for oa_exponent index
> +	 * in the workaround Wa_14026633728 below as well.
> +	 */

Delete this comment, this is not the only place where this is done in this
file and the function is small enough for someone to check this automatically.

>	uint64_t properties[] = {
>		DRM_XE_OA_PROPERTY_OA_UNIT_ID, oau->oa_unit_id,
>
> @@ -2671,6 +2677,18 @@ test_non_zero_reason(const struct drm_xe_oa_unit *oau, size_t oa_buffer_size)
>	int len, check_idx;
>	u32 oa_status;
>
> +	/*
> +	 * 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. Also, update the value of oa_exponent
> +	 * in properties[].
> +	 */
> +	if (oau->oa_unit_type == DRM_XE_OA_UNIT_TYPE_MERT &&
> +        igt_has_intel_wa(drm_fd, "14026633728")) {
> +        oa_exponent = max(oa_exponent, 8);
> +        properties[9] = oa_exponent;
> +    }

Hmm, code should use tabs, not spaces. Please fix your editor to do this.

> +
>	igt_assert(buf);
>
>	igt_debug("Ready to read about %u bytes\n", buf_size);
> --
> 2.53.0
>