[Intel-gfx] [PATCH v11 02/13] drm/i915/guc: Add XE_LP static registers for GuC error capture.
Jani Nikula
jani.nikula at linux.intel.com
Mon Mar 21 12:59:45 UTC 2022
On Thu, 17 Mar 2022, Alan Previn <alan.previn.teres.alexis at intel.com> wrote:
> Add device specific tables and register lists to cover different engines
> class types for GuC error state capture for XE_LP products.
>
> Signed-off-by: Alan Previn <alan.previn.teres.alexis at intel.com>
> Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa at intel.com>
Some random drive-by comments inline.
> ---
> .../gpu/drm/i915/gt/uc/intel_guc_capture.c | 116 ++++++++++++++----
> drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 6 +-
> 2 files changed, 97 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
> index ebae0943f0a0..6152a23289e3 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
> @@ -19,43 +19,109 @@
>
> /*
> * Define all device tables of GuC error capture register lists
> - * NOTE: For engine-registers, GuC only needs the register offsets
> - * from the engine-mmio-base
> + * NOTE1: For engine-registers, GuC only needs the register offsets
> + * from the engine-mmio-base
NOTE1?
> */
> +#define COMMON_GEN12BASE_GLOBAL() \
Why are these function-like macros, they're not used like functions,
anywhere?
> + {GEN12_FAULT_TLB_DATA0, 0, 0, "GEN12_FAULT_TLB_DATA0"}, \
Please add spaces after { and before }.
> + {GEN12_FAULT_TLB_DATA1, 0, 0, "GEN12_FAULT_TLB_DATA1"}, \
> + {FORCEWAKE_MT, 0, 0, "FORCEWAKE"}, \
> + {GEN12_AUX_ERR_DBG, 0, 0, "AUX_ERR_DBG"}, \
> + {GEN12_GAM_DONE, 0, 0, "GAM_DONE"}, \
> + {GEN12_RING_FAULT_REG, 0, 0, "FAULT_REG"}
> +
> +#define COMMON_GEN12BASE_ENGINE_INSTANCE() \
> + {RING_PSMI_CTL(0), 0, 0, "RC PSMI"}, \
> + {RING_ESR(0), 0, 0, "ESR"}, \
> + {RING_DMA_FADD(0), 0, 0, "RING_DMA_FADD_LDW"}, \
> + {RING_DMA_FADD_UDW(0), 0, 0, "RING_DMA_FADD_UDW"}, \
> + {RING_IPEIR(0), 0, 0, "IPEIR"}, \
> + {RING_IPEHR(0), 0, 0, "IPEHR"}, \
> + {RING_INSTPS(0), 0, 0, "INSTPS"}, \
> + {RING_BBADDR(0), 0, 0, "RING_BBADDR_LOW32"}, \
> + {RING_BBADDR_UDW(0), 0, 0, "RING_BBADDR_UP32"}, \
> + {RING_BBSTATE(0), 0, 0, "BB_STATE"}, \
> + {CCID(0), 0, 0, "CCID"}, \
> + {RING_ACTHD(0), 0, 0, "ACTHD_LDW"}, \
> + {RING_ACTHD_UDW(0), 0, 0, "ACTHD_UDW"}, \
> + {RING_INSTPM(0), 0, 0, "INSTPM"}, \
> + {RING_INSTDONE(0), 0, 0, "INSTDONE"}, \
> + {RING_NOPID(0), 0, 0, "RING_NOPID"}, \
> + {RING_START(0), 0, 0, "START"}, \
> + {RING_HEAD(0), 0, 0, "HEAD"}, \
> + {RING_TAIL(0), 0, 0, "TAIL"}, \
> + {RING_CTL(0), 0, 0, "CTL"}, \
> + {RING_MI_MODE(0), 0, 0, "MODE"}, \
> + {RING_CONTEXT_CONTROL(0), 0, 0, "RING_CONTEXT_CONTROL"}, \
> + {RING_HWS_PGA(0), 0, 0, "HWS"}, \
> + {RING_MODE_GEN7(0), 0, 0, "GFX_MODE"}, \
> + {GEN8_RING_PDP_LDW(0, 0), 0, 0, "PDP0_LDW"}, \
> + {GEN8_RING_PDP_UDW(0, 0), 0, 0, "PDP0_UDW"}, \
> + {GEN8_RING_PDP_LDW(0, 1), 0, 0, "PDP1_LDW"}, \
> + {GEN8_RING_PDP_UDW(0, 1), 0, 0, "PDP1_UDW"}, \
> + {GEN8_RING_PDP_LDW(0, 2), 0, 0, "PDP2_LDW"}, \
> + {GEN8_RING_PDP_UDW(0, 2), 0, 0, "PDP2_UDW"}, \
> + {GEN8_RING_PDP_LDW(0, 3), 0, 0, "PDP3_LDW"}, \
> + {GEN8_RING_PDP_UDW(0, 3), 0, 0, "PDP3_UDW"}
> +
> +#define COMMON_GEN12BASE_HAS_EU() \
> + {EIR, 0, 0, "EIR"}
> +
> +#define COMMON_GEN12BASE_RENDER() \
> + {GEN7_SC_INSTDONE, 0, 0, "GEN7_SC_INSTDONE"}, \
> + {GEN12_SC_INSTDONE_EXTRA, 0, 0, "GEN12_SC_INSTDONE_EXTRA"}, \
> + {GEN12_SC_INSTDONE_EXTRA2, 0, 0, "GEN12_SC_INSTDONE_EXTRA2"}
> +
> +#define COMMON_GEN12BASE_VEC() \
> + {GEN12_SFC_DONE(0), 0, 0, "SFC_DONE[0]"}, \
> + {GEN12_SFC_DONE(1), 0, 0, "SFC_DONE[1]"}, \
> + {GEN12_SFC_DONE(2), 0, 0, "SFC_DONE[2]"}, \
> + {GEN12_SFC_DONE(3), 0, 0, "SFC_DONE[3]"}
> +
> /* XE_LPD - Global */
> static const struct __guc_mmio_reg_descr xe_lpd_global_regs[] = {
> - {GEN12_RING_FAULT_REG, 0, 0, "GEN12_RING_FAULT_REG"}
> + COMMON_GEN12BASE_GLOBAL(),
> };
>
> /* XE_LPD - Render / Compute Per-Class */
> static const struct __guc_mmio_reg_descr xe_lpd_rc_class_regs[] = {
> - {EIR, 0, 0, "EIR"}
> + COMMON_GEN12BASE_HAS_EU(),
> + COMMON_GEN12BASE_RENDER(),
> };
>
> /* XE_LPD - Render / Compute Per-Engine-Instance */
> static const struct __guc_mmio_reg_descr xe_lpd_rc_inst_regs[] = {
> - {RING_HEAD(0), 0, 0, "RING_HEAD"},
> - {RING_TAIL(0), 0, 0, "RING_TAIL"},
> + COMMON_GEN12BASE_ENGINE_INSTANCE(),
> };
>
> /* XE_LPD - Media Decode/Encode Per-Class */
> static const struct __guc_mmio_reg_descr xe_lpd_vd_class_regs[] = {
> + COMMON_GEN12BASE_ENGINE_INSTANCE(),
> };
>
> /* XE_LPD - Media Decode/Encode Per-Engine-Instance */
> static const struct __guc_mmio_reg_descr xe_lpd_vd_inst_regs[] = {
> - {RING_HEAD(0), 0, 0, "RING_HEAD"},
> - {RING_TAIL(0), 0, 0, "RING_TAIL"},
> + COMMON_GEN12BASE_ENGINE_INSTANCE(),
> };
>
> /* XE_LPD - Video Enhancement Per-Class */
> static const struct __guc_mmio_reg_descr xe_lpd_vec_class_regs[] = {
> + COMMON_GEN12BASE_VEC(),
> };
>
> /* XE_LPD - Video Enhancement Per-Engine-Instance */
> static const struct __guc_mmio_reg_descr xe_lpd_vec_inst_regs[] = {
> - {RING_HEAD(0), 0, 0, "RING_HEAD"},
> - {RING_TAIL(0), 0, 0, "RING_TAIL"},
> + COMMON_GEN12BASE_ENGINE_INSTANCE(),
> +};
> +
> +/* XE_LPD - Blitter Per-Engine-Instance */
> +static const struct __guc_mmio_reg_descr xe_lpd_blt_inst_regs[] = {
> + COMMON_GEN12BASE_ENGINE_INSTANCE(),
> +};
> +
> +/* XE_LPD - Blitter Per-Class */
> +/* XE_LPD - Media Decode/Encode Per-Class */
> +static const struct __guc_mmio_reg_descr empty_regs_list[] = {
> };
>
> #define TO_GCAP_DEF_OWNER(x) (GUC_CAPTURE_LIST_INDEX_##x)
> @@ -74,10 +140,12 @@ static const struct __guc_mmio_reg_descr_group xe_lpd_lists[] = {
> MAKE_REGLIST(xe_lpd_global_regs, PF, GLOBAL, 0),
> MAKE_REGLIST(xe_lpd_rc_class_regs, PF, ENGINE_CLASS, GUC_RENDER_CLASS),
> MAKE_REGLIST(xe_lpd_rc_inst_regs, PF, ENGINE_INSTANCE, GUC_RENDER_CLASS),
> - MAKE_REGLIST(xe_lpd_vd_class_regs, PF, ENGINE_CLASS, GUC_VIDEO_CLASS),
> + MAKE_REGLIST(empty_regs_list, PF, ENGINE_CLASS, GUC_VIDEO_CLASS),
> MAKE_REGLIST(xe_lpd_vd_inst_regs, PF, ENGINE_INSTANCE, GUC_VIDEO_CLASS),
> MAKE_REGLIST(xe_lpd_vec_class_regs, PF, ENGINE_CLASS, GUC_VIDEOENHANCE_CLASS),
> MAKE_REGLIST(xe_lpd_vec_inst_regs, PF, ENGINE_INSTANCE, GUC_VIDEOENHANCE_CLASS),
> + MAKE_REGLIST(empty_regs_list, PF, ENGINE_CLASS, GUC_BLITTER_CLASS),
> + MAKE_REGLIST(xe_lpd_blt_inst_regs, PF, ENGINE_INSTANCE, GUC_BLITTER_CLASS),
> {}
> };
>
> @@ -191,20 +259,24 @@ guc_capture_list_init(struct intel_guc *guc, u32 owner, u32 type, u32 classid,
> return -ENODEV;
>
> match = guc_capture_get_one_list(reglists, owner, type, classid);
> - if (match) {
> - for (i = 0; i < num_entries && i < match->num_regs; ++i) {
> - ptr[i].offset = match->list[i].reg.reg;
> - ptr[i].value = 0xDEADF00D;
> - ptr[i].flags = match->list[i].flags;
> - ptr[i].mask = match->list[i].mask;
> - }
> - return 0;
> + if (!match) {
> + guc_capture_warn_with_list_info(i915, "Missing register list init", owner, type,
> + classid);
> + return -ENODATA;
> + }
> +
> + for (i = 0; i < num_entries && i < match->num_regs; ++i) {
> + ptr[i].offset = match->list[i].reg.reg;
> + ptr[i].value = 0xDEADF00D;
> + ptr[i].flags = match->list[i].flags;
> + ptr[i].mask = match->list[i].mask;
> }
>
> - guc_capture_warn_with_list_info(i915, "Missing register list init", owner, type,
> - classid);
> + if (i < num_entries)
> + drm_dbg(&i915->drm, "GuC-capture: Init reglist short %d out %d.\n",
> + (int)i, (int)num_entries);
>
> - return -ENODATA;
> + return 0;
> }
>
> static int
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
> index d18037493953..f21b6de46a99 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
> @@ -285,13 +285,13 @@ struct guc_mmio_reg {
> u32 offset;
> u32 value;
> u32 flags;
> - u32 mask;
> #define GUC_REGSET_MASKED BIT(0)
> #define GUC_REGSET_NEEDS_STEERING BIT(1)
> #define GUC_REGSET_MASKED_WITH_VALUE BIT(2)
> #define GUC_REGSET_RESTORE_ONLY BIT(3)
> -#define GUC_REGSET_STEERING_GROUP GENMASK(15, 12)
> -#define GUC_REGSET_STEERING_INSTANCE GENMASK(23, 20)
> +#define GUC_REGSET_STEERING_GROUP GENMASK(15, 12)
> +#define GUC_REGSET_STEERING_INSTANCE GENMASK(23, 20)
> + u32 mask;
> } __packed;
>
> /* GuC register sets */
--
Jani Nikula, Intel Open Source Graphics Center
More information about the Intel-gfx
mailing list