[PATCH v2 2/2] drm/xe/lnl: Enable GuC Wa_14019882105
John Harrison
john.c.harrison at intel.com
Wed Mar 20 20:43:29 UTC 2024
On 3/19/2024 09:08, Badal Nilawar wrote:
> Enable GuC Wa_14019882105 to block interrupts during C6 flow
> when the memory path has been blocked
>
> v2: Make helper function generic and name it as
> guc_waklv_enable_simple (John Harrison)
>
> Cc: John Harrison <john.harrison at intel.com>
> Signed-off-by: Badal Nilawar <badal.nilawar at intel.com>
> ---
> drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 7 +++++
> drivers/gpu/drm/xe/xe_guc_ads.c | 40 +++++++++++++++++++++------
> drivers/gpu/drm/xe/xe_wa_oob.rules | 1 +
> 3 files changed, 39 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> index 0400bc0fccdc..5dd45e06f0b6 100644
> --- a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> +++ b/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
> @@ -319,4 +319,11 @@ enum {
> #define GUC_KLV_VF_CFG_BEGIN_CONTEXT_ID_KEY 0x8a0b
> #define GUC_KLV_VF_CFG_BEGIN_CONTEXT_ID_LEN 1u
>
> +/*
> + * Workaround keys:
> + */
> +enum xe_guc_klv_ids {
> + GUC_WORKAROUND_KLV_BLOCK_INTERRUPTS_WHEN_MGSR_BLOCKED = 0x9002,
> +};
> +
> #endif
> diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c
> index 506f0be35763..c71228bc8d57 100644
> --- a/drivers/gpu/drm/xe/xe_guc_ads.c
> +++ b/drivers/gpu/drm/xe/xe_guc_ads.c
> @@ -7,6 +7,8 @@
>
> #include <drm/drm_managed.h>
>
> +#include <generated/xe_wa_oob.h>
> +
> #include "regs/xe_engine_regs.h"
> #include "regs/xe_gt_regs.h"
> #include "regs/xe_guc_regs.h"
> @@ -19,6 +21,7 @@
> #include "xe_map.h"
> #include "xe_mmio.h"
> #include "xe_platform_types.h"
> +#include "xe_wa.h"
>
> /* Slack of a few additional entries per engine */
> #define ADS_REGSET_EXTRA_MAX 8
> @@ -279,22 +282,41 @@ static size_t calculate_golden_lrc_size(struct xe_guc_ads *ads)
> return total_size;
> }
>
> +static void guc_waklv_enable_simple(struct xe_guc_ads *ads,
> + enum xe_guc_klv_ids klv_id, u32 *offset, u32 *remain)
> +{
> + u32 size;
> + u32 klv_entry[] = {
> + /* 16:16 key/length */
> + FIELD_PREP(GUC_KLV_0_KEY, klv_id) |
> + FIELD_PREP(GUC_KLV_0_LEN, 0),
> + /* 0 dwords data */
> + };
> +
> + size = sizeof(klv_entry);
> +
> + if (*remain < size) {
> + drm_warn(&ads_to_xe(ads)->drm, "Cannot apply guc wa klv_id %d\n", klv_id);
Hmm, missed this before but the warning could be more descriptive. Like
"w/a klv buffer too small to add id %d". Saying "cannot apply" makes it
sound like the w/a failed to work rather than a pre-defined buffer
allocation is insufficient.
John.
> + } else {
> + xe_map_memcpy_to(ads_to_xe(ads), ads_to_map(ads), *offset,
> + klv_entry, size);
> + *offset += size;
> + *remain -= size;
> + }
> +}
> +
> static void guc_waklv_init(struct xe_guc_ads *ads)
> {
> + struct xe_gt *gt = ads_to_gt(ads);
> u32 addr_ggtt, offset, remain, size;
>
> offset = guc_ads_waklv_offset(ads);
> remain = guc_ads_waklv_size(ads);
>
> - /*
> - * Add workarounds here:
> - *
> - * if (want_wa_<name>) {
> - * size = guc_waklv_<name>(guc, offset, remain);
> - * offset += size;
> - * remain -= size;
> - * }
> - */
> + if (XE_WA(gt, 14019882105))
> + guc_waklv_enable_simple(ads,
> + GUC_WORKAROUND_KLV_BLOCK_INTERRUPTS_WHEN_MGSR_BLOCKED,
> + &offset, &remain);
>
> size = guc_ads_waklv_size(ads) - remain;
> if (!size)
> diff --git a/drivers/gpu/drm/xe/xe_wa_oob.rules b/drivers/gpu/drm/xe/xe_wa_oob.rules
> index 48cdba1cbf95..a8d15f004b6c 100644
> --- a/drivers/gpu/drm/xe/xe_wa_oob.rules
> +++ b/drivers/gpu/drm/xe/xe_wa_oob.rules
> @@ -19,3 +19,4 @@
> GRAPHICS_VERSION_RANGE(1270, 1274)
> MEDIA_VERSION(1300)
> PLATFORM(DG2)
> +14019882105 GRAPHICS_VERSION(2004), GRAPHICS_STEP(A0, B0)
More information about the Intel-xe
mailing list