| Message ID | 20220330232858.3204283-16-matthew.d.roper@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i915: Explicit handling of multicast registers | expand |
On 31/03/2022 00:28, Matt Roper wrote: > Historically we've selected and programmed a single MCR group/instance > ID at driver startup that will steer register accesses for GSLICE/DSS > ranges to a non-terminated instance. Any reads of these register ranges > that don't need a specific unicast access won't bother explicitly > resteering because the control register should already be set to a > suitable value to receive a non-terminated response. Any accesses to > other types of MCR ranges (MSLICE, LNCF, etc.) that are also satisfied > by the default steering target will also skip explicit re-steering at > runtime. > > This approach has worked well for many years and many platforms, but our > hardware teams have recently advised us that they're not 100% > comfortable with our strategy going forward. They now suggest > explicitly steering reads of any multicast register at the time the > register access happens rather than relying on previously-programmed > steering values. In debug settings there could be external agents that > have adjusted the default steering without the driver's knowledge (e.g., > we could do this manually with IGT's intel_reg today, although the > hardware teams also have other tools they use for debug and analysis). > In theory it would also be possible for bad firmware and/or incorrect > handling of power management events to clobber/wipe the steering > value we had previously initialized because they assume we'll be > re-programming it anyway. That external agent of any kind can mess with registers behind drivers back is kind of a weak justification, no? Because steering is just one small part of what can go wrong in this case. Also, someone at some point has to know which are the affected registers. Be it a range table, or at actual point of submitting patches which add register definitions. At any of those points mistakes are possible. So I guess I am not immediately buying the need to refactor all this. Apart from churn, the main downside that I see is that all accesses need separate helpers. Question is why. Driver could choose to always steer before reading today, right? Regards, Tvrtko > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 40 +++++++++ > drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + > drivers/gpu/drm/i915/gt/intel_workarounds.c | 98 ++++----------------- > 3 files changed, 56 insertions(+), 83 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > index a9a9fa6881f2..787752367337 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > @@ -35,6 +35,7 @@ > */ > > static const char * const intel_steering_types[] = { > + "GSLICE/DSS", > "L3BANK", > "MSLICE", > "LNCF", > @@ -45,6 +46,35 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { > {}, > }; > > +static const struct intel_mmio_range xehpsdv_dss_steering_table[] = { > + { 0x005200, 0x0052FF }, > + { 0x005400, 0x007FFF }, > + { 0x008140, 0x00815F }, > + { 0x008D00, 0x008DFF }, > + { 0x0094D0, 0x00955F }, > + { 0x009680, 0x0096FF }, > + { 0x00DC00, 0x00DCFF }, > + { 0x00DE80, 0x00E8FF }, > + { 0x017000, 0x017FFF }, > + { 0x024A00, 0x024A7F }, > + {}, > +}; > + > +static const struct intel_mmio_range dg2_dss_steering_table[] = { > + { 0x005200, 0x0052FF }, > + { 0x005400, 0x007FFF }, > + { 0x008140, 0x00815F }, > + { 0x008D00, 0x008DFF }, > + { 0x0094D0, 0x00955F }, > + { 0x009680, 0x0096FF }, > + { 0x00D800, 0x00D87F }, > + { 0x00DC00, 0x00DCFF }, > + { 0x00DE80, 0x00E8FF }, > + { 0x017000, 0x017FFF }, > + { 0x024A00, 0x024A7F }, > + {}, > +}; > + > static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { > { 0x004000, 0x004AFF }, > { 0x00C800, 0x00CFFF }, > @@ -87,9 +117,11 @@ void intel_gt_mcr_init(struct intel_gt *gt) > GEN12_MEML3_EN_MASK); > > if (IS_DG2(i915)) { > + gt->steering_table[DSS] = dg2_dss_steering_table; > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > gt->steering_table[LNCF] = dg2_lncf_steering_table; > } else if (IS_XEHPSDV(i915)) { > + gt->steering_table[DSS] = xehpsdv_dss_steering_table; > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; > } else if (GRAPHICS_VER(i915) >= 11 && > @@ -317,7 +349,15 @@ static void get_valid_steering(struct intel_gt *gt, > enum intel_steering_type type, > u8 *group, u8 *instance) > { > + u32 dssmask = intel_sseu_get_subslices(>->info.sseu, 0); > + > switch (type) { > + case DSS: > + drm_WARN_ON(>->i915->drm, dssmask == 0); > + > + *group = __ffs(dssmask) / GEN_DSS_PER_GSLICE; > + *instance = __ffs(dssmask) % GEN_DSS_PER_GSLICE; > + break; > case L3BANK: > GEM_DEBUG_WARN_ON(!gt->info.l3bank_mask); /* should be impossible! */ > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h > index 937b2e1a305e..b77bbaac7622 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h > @@ -54,6 +54,7 @@ struct intel_mmio_range { > * are listed here. > */ > enum intel_steering_type { > + DSS, > L3BANK, > MSLICE, > LNCF, > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index 818ba71f4909..2486c6aa9d9d 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -1160,87 +1160,6 @@ icl_wa_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > __add_mcr_wa(gt, wal, slice, subslice); > } > > -static void > -xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > -{ > - const struct sseu_dev_info *sseu = >->info.sseu; > - unsigned long slice, subslice = 0, slice_mask = 0; > - u64 dss_mask = 0; > - u32 lncf_mask = 0; > - int i; > - > - /* > - * On Xe_HP the steering increases in complexity. There are now several > - * more units that require steering and we're not guaranteed to be able > - * to find a common setting for all of them. These are: > - * - GSLICE (fusable) > - * - DSS (sub-unit within gslice; fusable) > - * - L3 Bank (fusable) > - * - MSLICE (fusable) > - * - LNCF (sub-unit within mslice; always present if mslice is present) > - * > - * We'll do our default/implicit steering based on GSLICE (in the > - * sliceid field) and DSS (in the subsliceid field). If we can > - * find overlap between the valid MSLICE and/or LNCF values with > - * a suitable GSLICE, then we can just re-use the default value and > - * skip and explicit steering at runtime. > - * > - * We only need to look for overlap between GSLICE/MSLICE/LNCF to find > - * a valid sliceid value. DSS steering is the only type of steering > - * that utilizes the 'subsliceid' bits. > - * > - * Also note that, even though the steering domain is called "GSlice" > - * and it is encoded in the register using the gslice format, the spec > - * says that the combined (geometry | compute) fuse should be used to > - * select the steering. > - */ > - > - /* Find the potential gslice candidates */ > - dss_mask = intel_sseu_get_subslices(sseu, 0); > - slice_mask = intel_slicemask_from_dssmask(dss_mask, GEN_DSS_PER_GSLICE); > - > - /* > - * Find the potential LNCF candidates. Either LNCF within a valid > - * mslice is fine. > - */ > - for_each_set_bit(i, >->info.mslice_mask, GEN12_MAX_MSLICES) > - lncf_mask |= (0x3 << (i * 2)); > - > - /* > - * Are there any sliceid values that work for both GSLICE and LNCF > - * steering? > - */ > - if (slice_mask & lncf_mask) { > - slice_mask &= lncf_mask; > - gt->steering_table[LNCF] = NULL; > - } > - > - /* How about sliceid values that also work for MSLICE steering? */ > - if (slice_mask & gt->info.mslice_mask) { > - slice_mask &= gt->info.mslice_mask; > - gt->steering_table[MSLICE] = NULL; > - } > - > - slice = __ffs(slice_mask); > - subslice = __ffs(dss_mask >> (slice * GEN_DSS_PER_GSLICE)); > - WARN_ON(subslice > GEN_DSS_PER_GSLICE); > - WARN_ON(dss_mask >> (slice * GEN_DSS_PER_GSLICE) == 0); > - > - __add_mcr_wa(gt, wal, slice, subslice); > - > - /* > - * SQIDI ranges are special because they use different steering > - * registers than everything else we work with. On XeHP SDV and > - * DG2-G10, any value in the steering registers will work fine since > - * all instances are present, but DG2-G11 only has SQIDI instances at > - * ID's 2 and 3, so we need to steer to one of those. For simplicity > - * we'll just steer to a hardcoded "2" since that value will work > - * everywhere. > - */ > - __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > - __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > -} > - > static void > icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > { > @@ -1388,8 +1307,9 @@ static void > xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > { > struct drm_i915_private *i915 = gt->i915; > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > > - xehp_init_mcr(gt, wal); > + intel_gt_mcr_report_steering(&p, gt, false); > > /* Wa_1409757795:xehpsdv */ > wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); > @@ -1441,10 +1361,22 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > static void > dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > { > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > struct intel_engine_cs *engine; > int id; > > - xehp_init_mcr(gt, wal); > + intel_gt_mcr_report_steering(&p, gt, false); > + > + /* > + * SQIDI ranges are special because they use different steering > + * registers than everything else we work with. On DG2-G10, any value > + * in the steering registers will work fine since all instances are > + * present, but DG2-G11 only has SQIDI instances at ID's 2 and 3, so we > + * need to steer to one of those. For simplicity we'll just steer to a > + * hardcoded "2" since that value will work everywhere. > + */ > + __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > + __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > > /* Wa_14011060649:dg2 */ > wa_14011060649(gt, wal);
On 31/03/2022 00:28, Matt Roper wrote: > Historically we've selected and programmed a single MCR group/instance > ID at driver startup that will steer register accesses for GSLICE/DSS > ranges to a non-terminated instance. Any reads of these register ranges > that don't need a specific unicast access won't bother explicitly > resteering because the control register should already be set to a > suitable value to receive a non-terminated response. Any accesses to > other types of MCR ranges (MSLICE, LNCF, etc.) that are also satisfied > by the default steering target will also skip explicit re-steering at > runtime. > > This approach has worked well for many years and many platforms, but our > hardware teams have recently advised us that they're not 100% > comfortable with our strategy going forward. They now suggest > explicitly steering reads of any multicast register at the time the > register access happens rather than relying on previously-programmed > steering values. In debug settings there could be external agents that > have adjusted the default steering without the driver's knowledge (e.g., > we could do this manually with IGT's intel_reg today, although the > hardware teams also have other tools they use for debug and analysis). > In theory it would also be possible for bad firmware and/or incorrect > handling of power management events to clobber/wipe the steering > value we had previously initialized because they assume we'll be > re-programming it anyway. > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 40 +++++++++ > drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + > drivers/gpu/drm/i915/gt/intel_workarounds.c | 98 ++++----------------- > 3 files changed, 56 insertions(+), 83 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > index a9a9fa6881f2..787752367337 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > @@ -35,6 +35,7 @@ > */ > > static const char * const intel_steering_types[] = { > + "GSLICE/DSS", > "L3BANK", > "MSLICE", > "LNCF", > @@ -45,6 +46,35 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { > {}, > }; > > +static const struct intel_mmio_range xehpsdv_dss_steering_table[] = { > + { 0x005200, 0x0052FF }, > + { 0x005400, 0x007FFF }, > + { 0x008140, 0x00815F }, > + { 0x008D00, 0x008DFF }, > + { 0x0094D0, 0x00955F }, > + { 0x009680, 0x0096FF }, > + { 0x00DC00, 0x00DCFF }, > + { 0x00DE80, 0x00E8FF }, > + { 0x017000, 0x017FFF }, > + { 0x024A00, 0x024A7F }, > + {}, > +}; > + > +static const struct intel_mmio_range dg2_dss_steering_table[] = { > + { 0x005200, 0x0052FF }, > + { 0x005400, 0x007FFF }, > + { 0x008140, 0x00815F }, > + { 0x008D00, 0x008DFF }, > + { 0x0094D0, 0x00955F }, > + { 0x009680, 0x0096FF }, > + { 0x00D800, 0x00D87F }, > + { 0x00DC00, 0x00DCFF }, > + { 0x00DE80, 0x00E8FF }, > + { 0x017000, 0x017FFF }, > + { 0x024A00, 0x024A7F }, > + {}, > +}; > + > static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { > { 0x004000, 0x004AFF }, > { 0x00C800, 0x00CFFF }, > @@ -87,9 +117,11 @@ void intel_gt_mcr_init(struct intel_gt *gt) > GEN12_MEML3_EN_MASK); > > if (IS_DG2(i915)) { > + gt->steering_table[DSS] = dg2_dss_steering_table; > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > gt->steering_table[LNCF] = dg2_lncf_steering_table; > } else if (IS_XEHPSDV(i915)) { > + gt->steering_table[DSS] = xehpsdv_dss_steering_table; > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; > } else if (GRAPHICS_VER(i915) >= 11 && > @@ -317,7 +349,15 @@ static void get_valid_steering(struct intel_gt *gt, > enum intel_steering_type type, > u8 *group, u8 *instance) > { > + u32 dssmask = intel_sseu_get_subslices(>->info.sseu, 0); > + > switch (type) { > + case DSS: > + drm_WARN_ON(>->i915->drm, dssmask == 0); > + > + *group = __ffs(dssmask) / GEN_DSS_PER_GSLICE; > + *instance = __ffs(dssmask) % GEN_DSS_PER_GSLICE; > + break; > case L3BANK: > GEM_DEBUG_WARN_ON(!gt->info.l3bank_mask); /* should be impossible! */ > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h > index 937b2e1a305e..b77bbaac7622 100644 > --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h > @@ -54,6 +54,7 @@ struct intel_mmio_range { > * are listed here. > */ > enum intel_steering_type { > + DSS, > L3BANK, > MSLICE, > LNCF, > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > index 818ba71f4909..2486c6aa9d9d 100644 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > @@ -1160,87 +1160,6 @@ icl_wa_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > __add_mcr_wa(gt, wal, slice, subslice); > } > > -static void > -xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > -{ > - const struct sseu_dev_info *sseu = >->info.sseu; > - unsigned long slice, subslice = 0, slice_mask = 0; > - u64 dss_mask = 0; > - u32 lncf_mask = 0; > - int i; > - > - /* > - * On Xe_HP the steering increases in complexity. There are now several > - * more units that require steering and we're not guaranteed to be able > - * to find a common setting for all of them. These are: > - * - GSLICE (fusable) > - * - DSS (sub-unit within gslice; fusable) > - * - L3 Bank (fusable) > - * - MSLICE (fusable) > - * - LNCF (sub-unit within mslice; always present if mslice is present) > - * > - * We'll do our default/implicit steering based on GSLICE (in the > - * sliceid field) and DSS (in the subsliceid field). If we can > - * find overlap between the valid MSLICE and/or LNCF values with > - * a suitable GSLICE, then we can just re-use the default value and > - * skip and explicit steering at runtime. > - * > - * We only need to look for overlap between GSLICE/MSLICE/LNCF to find > - * a valid sliceid value. DSS steering is the only type of steering > - * that utilizes the 'subsliceid' bits. > - * > - * Also note that, even though the steering domain is called "GSlice" > - * and it is encoded in the register using the gslice format, the spec > - * says that the combined (geometry | compute) fuse should be used to > - * select the steering. > - */ > - > - /* Find the potential gslice candidates */ > - dss_mask = intel_sseu_get_subslices(sseu, 0); > - slice_mask = intel_slicemask_from_dssmask(dss_mask, GEN_DSS_PER_GSLICE); > - > - /* > - * Find the potential LNCF candidates. Either LNCF within a valid > - * mslice is fine. > - */ > - for_each_set_bit(i, >->info.mslice_mask, GEN12_MAX_MSLICES) > - lncf_mask |= (0x3 << (i * 2)); > - > - /* > - * Are there any sliceid values that work for both GSLICE and LNCF > - * steering? > - */ > - if (slice_mask & lncf_mask) { > - slice_mask &= lncf_mask; > - gt->steering_table[LNCF] = NULL; > - } > - > - /* How about sliceid values that also work for MSLICE steering? */ > - if (slice_mask & gt->info.mslice_mask) { > - slice_mask &= gt->info.mslice_mask; > - gt->steering_table[MSLICE] = NULL; > - } > - > - slice = __ffs(slice_mask); > - subslice = __ffs(dss_mask >> (slice * GEN_DSS_PER_GSLICE)); > - WARN_ON(subslice > GEN_DSS_PER_GSLICE); > - WARN_ON(dss_mask >> (slice * GEN_DSS_PER_GSLICE) == 0); > - > - __add_mcr_wa(gt, wal, slice, subslice); > - > - /* > - * SQIDI ranges are special because they use different steering > - * registers than everything else we work with. On XeHP SDV and > - * DG2-G10, any value in the steering registers will work fine since > - * all instances are present, but DG2-G11 only has SQIDI instances at > - * ID's 2 and 3, so we need to steer to one of those. For simplicity > - * we'll just steer to a hardcoded "2" since that value will work > - * everywhere. > - */ > - __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > - __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > -} > - > static void > icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > { > @@ -1388,8 +1307,9 @@ static void > xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > { > struct drm_i915_private *i915 = gt->i915; > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > > - xehp_init_mcr(gt, wal); > + intel_gt_mcr_report_steering(&p, gt, false); > > /* Wa_1409757795:xehpsdv */ > wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); > @@ -1441,10 +1361,22 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > static void > dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > { > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > struct intel_engine_cs *engine; > int id; > > - xehp_init_mcr(gt, wal); > + intel_gt_mcr_report_steering(&p, gt, false); Are these platforms immune to system hangs caused by incorrect/missing default MCR configuration such was fixed with c7d561cfcf86 ("drm/i915: Enable WaProgramMgsrForCorrectSliceSpecificMmioReads for Gen9") ? That was triggerable from userspace to be clear. Regards, Tvrtko > + > + /* > + * SQIDI ranges are special because they use different steering > + * registers than everything else we work with. On DG2-G10, any value > + * in the steering registers will work fine since all instances are > + * present, but DG2-G11 only has SQIDI instances at ID's 2 and 3, so we > + * need to steer to one of those. For simplicity we'll just steer to a > + * hardcoded "2" since that value will work everywhere. > + */ > + __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > + __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > > /* Wa_14011060649:dg2 */ > wa_14011060649(gt, wal);
On Thu, Mar 31, 2022 at 06:35:52PM +0100, Tvrtko Ursulin wrote: > > On 31/03/2022 00:28, Matt Roper wrote: > > Historically we've selected and programmed a single MCR group/instance > > ID at driver startup that will steer register accesses for GSLICE/DSS > > ranges to a non-terminated instance. Any reads of these register ranges > > that don't need a specific unicast access won't bother explicitly > > resteering because the control register should already be set to a > > suitable value to receive a non-terminated response. Any accesses to > > other types of MCR ranges (MSLICE, LNCF, etc.) that are also satisfied > > by the default steering target will also skip explicit re-steering at > > runtime. > > > > This approach has worked well for many years and many platforms, but our > > hardware teams have recently advised us that they're not 100% > > comfortable with our strategy going forward. They now suggest > > explicitly steering reads of any multicast register at the time the > > register access happens rather than relying on previously-programmed > > steering values. In debug settings there could be external agents that > > have adjusted the default steering without the driver's knowledge (e.g., > > we could do this manually with IGT's intel_reg today, although the > > hardware teams also have other tools they use for debug and analysis). > > In theory it would also be possible for bad firmware and/or incorrect > > handling of power management events to clobber/wipe the steering > > value we had previously initialized because they assume we'll be > > re-programming it anyway. > > That external agent of any kind can mess with registers behind drivers back > is kind of a weak justification, no? Because steering is just one small part > of what can go wrong in this case. Apparently the assumption when the hardware was designed was that software would explicitly steer every MCR access; they never really considered the design we've been using where we try to set it up once and try to minimize subsequent updates to the steering control. In a lot of cases different agents updating steering have their own steering control registers (i.e., the GuC, the command streamers, and a couple other internal hardware units have their own independent steering control registers to try to avoid racing with whatever the KMD/CPU is doing), but I think there may have been some cases that aren't 100% covered there. This is also partially motivated by the direction the general hardware teams want to move in the future --- they plan to reduce the number of different steering control registers for different agents and make more of them share a single register with the KMD/CPU. There will be a separate "semaphore" register used for coordinating access between various agents (of course that will bring new challenges such as increased latency and what to do if some hardware unit grabs the semaphore and somehow fails to release it). > > Also, someone at some point has to know which are the affected registers. Be > it a range table, or at actual point of submitting patches which add > register definitions. At any of those points mistakes are possible. True. But today there are a lot of registers used by the driver that are multicast and I don't think the code written around them was really thinking about the multicast semantics of the register, especially when the code was copy/pasted from earlier platforms where they weren't multicast (the TLB invalidation registers are an example --- should we be waiting for an ack to come back on every mslice rather than just on a single random mslice?). MCR registers seem to be an area that's pretty mysterious to a lot of people that haven't looked at them carefully, and sometimes doing a simple intel_uncore_{read,write} doesn't accomplish what you'd expect; forcing us to be a bit more deliberate about the type of behavior we expect to get seems like it will help reduce mistakes in the long run. > > So I guess I am not immediately buying the need to refactor all this. Apart > from churn, the main downside that I see is that all accesses need separate > helpers. Question is why. Driver could choose to always steer before reading > today, right? You mean like making intel_uncore_read always do a steering table lookup for all registers? We could, although I'm a bit hesitant to add even more GT-specific logic to the uncore functions that are used for non-GT purposes as well. And like I said before, it still hides the fact that there may be multiple register instances and you're just reading one semi-random instance. Matt > > Regards, > > Tvrtko > > > > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > > --- > > drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 40 +++++++++ > > drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + > > drivers/gpu/drm/i915/gt/intel_workarounds.c | 98 ++++----------------- > > 3 files changed, 56 insertions(+), 83 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > > index a9a9fa6881f2..787752367337 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > > +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > > @@ -35,6 +35,7 @@ > > */ > > static const char * const intel_steering_types[] = { > > + "GSLICE/DSS", > > "L3BANK", > > "MSLICE", > > "LNCF", > > @@ -45,6 +46,35 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { > > {}, > > }; > > +static const struct intel_mmio_range xehpsdv_dss_steering_table[] = { > > + { 0x005200, 0x0052FF }, > > + { 0x005400, 0x007FFF }, > > + { 0x008140, 0x00815F }, > > + { 0x008D00, 0x008DFF }, > > + { 0x0094D0, 0x00955F }, > > + { 0x009680, 0x0096FF }, > > + { 0x00DC00, 0x00DCFF }, > > + { 0x00DE80, 0x00E8FF }, > > + { 0x017000, 0x017FFF }, > > + { 0x024A00, 0x024A7F }, > > + {}, > > +}; > > + > > +static const struct intel_mmio_range dg2_dss_steering_table[] = { > > + { 0x005200, 0x0052FF }, > > + { 0x005400, 0x007FFF }, > > + { 0x008140, 0x00815F }, > > + { 0x008D00, 0x008DFF }, > > + { 0x0094D0, 0x00955F }, > > + { 0x009680, 0x0096FF }, > > + { 0x00D800, 0x00D87F }, > > + { 0x00DC00, 0x00DCFF }, > > + { 0x00DE80, 0x00E8FF }, > > + { 0x017000, 0x017FFF }, > > + { 0x024A00, 0x024A7F }, > > + {}, > > +}; > > + > > static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { > > { 0x004000, 0x004AFF }, > > { 0x00C800, 0x00CFFF }, > > @@ -87,9 +117,11 @@ void intel_gt_mcr_init(struct intel_gt *gt) > > GEN12_MEML3_EN_MASK); > > if (IS_DG2(i915)) { > > + gt->steering_table[DSS] = dg2_dss_steering_table; > > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > > gt->steering_table[LNCF] = dg2_lncf_steering_table; > > } else if (IS_XEHPSDV(i915)) { > > + gt->steering_table[DSS] = xehpsdv_dss_steering_table; > > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > > gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; > > } else if (GRAPHICS_VER(i915) >= 11 && > > @@ -317,7 +349,15 @@ static void get_valid_steering(struct intel_gt *gt, > > enum intel_steering_type type, > > u8 *group, u8 *instance) > > { > > + u32 dssmask = intel_sseu_get_subslices(>->info.sseu, 0); > > + > > switch (type) { > > + case DSS: > > + drm_WARN_ON(>->i915->drm, dssmask == 0); > > + > > + *group = __ffs(dssmask) / GEN_DSS_PER_GSLICE; > > + *instance = __ffs(dssmask) % GEN_DSS_PER_GSLICE; > > + break; > > case L3BANK: > > GEM_DEBUG_WARN_ON(!gt->info.l3bank_mask); /* should be impossible! */ > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h > > index 937b2e1a305e..b77bbaac7622 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h > > +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h > > @@ -54,6 +54,7 @@ struct intel_mmio_range { > > * are listed here. > > */ > > enum intel_steering_type { > > + DSS, > > L3BANK, > > MSLICE, > > LNCF, > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > > index 818ba71f4909..2486c6aa9d9d 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > > @@ -1160,87 +1160,6 @@ icl_wa_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > > __add_mcr_wa(gt, wal, slice, subslice); > > } > > -static void > > -xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > > -{ > > - const struct sseu_dev_info *sseu = >->info.sseu; > > - unsigned long slice, subslice = 0, slice_mask = 0; > > - u64 dss_mask = 0; > > - u32 lncf_mask = 0; > > - int i; > > - > > - /* > > - * On Xe_HP the steering increases in complexity. There are now several > > - * more units that require steering and we're not guaranteed to be able > > - * to find a common setting for all of them. These are: > > - * - GSLICE (fusable) > > - * - DSS (sub-unit within gslice; fusable) > > - * - L3 Bank (fusable) > > - * - MSLICE (fusable) > > - * - LNCF (sub-unit within mslice; always present if mslice is present) > > - * > > - * We'll do our default/implicit steering based on GSLICE (in the > > - * sliceid field) and DSS (in the subsliceid field). If we can > > - * find overlap between the valid MSLICE and/or LNCF values with > > - * a suitable GSLICE, then we can just re-use the default value and > > - * skip and explicit steering at runtime. > > - * > > - * We only need to look for overlap between GSLICE/MSLICE/LNCF to find > > - * a valid sliceid value. DSS steering is the only type of steering > > - * that utilizes the 'subsliceid' bits. > > - * > > - * Also note that, even though the steering domain is called "GSlice" > > - * and it is encoded in the register using the gslice format, the spec > > - * says that the combined (geometry | compute) fuse should be used to > > - * select the steering. > > - */ > > - > > - /* Find the potential gslice candidates */ > > - dss_mask = intel_sseu_get_subslices(sseu, 0); > > - slice_mask = intel_slicemask_from_dssmask(dss_mask, GEN_DSS_PER_GSLICE); > > - > > - /* > > - * Find the potential LNCF candidates. Either LNCF within a valid > > - * mslice is fine. > > - */ > > - for_each_set_bit(i, >->info.mslice_mask, GEN12_MAX_MSLICES) > > - lncf_mask |= (0x3 << (i * 2)); > > - > > - /* > > - * Are there any sliceid values that work for both GSLICE and LNCF > > - * steering? > > - */ > > - if (slice_mask & lncf_mask) { > > - slice_mask &= lncf_mask; > > - gt->steering_table[LNCF] = NULL; > > - } > > - > > - /* How about sliceid values that also work for MSLICE steering? */ > > - if (slice_mask & gt->info.mslice_mask) { > > - slice_mask &= gt->info.mslice_mask; > > - gt->steering_table[MSLICE] = NULL; > > - } > > - > > - slice = __ffs(slice_mask); > > - subslice = __ffs(dss_mask >> (slice * GEN_DSS_PER_GSLICE)); > > - WARN_ON(subslice > GEN_DSS_PER_GSLICE); > > - WARN_ON(dss_mask >> (slice * GEN_DSS_PER_GSLICE) == 0); > > - > > - __add_mcr_wa(gt, wal, slice, subslice); > > - > > - /* > > - * SQIDI ranges are special because they use different steering > > - * registers than everything else we work with. On XeHP SDV and > > - * DG2-G10, any value in the steering registers will work fine since > > - * all instances are present, but DG2-G11 only has SQIDI instances at > > - * ID's 2 and 3, so we need to steer to one of those. For simplicity > > - * we'll just steer to a hardcoded "2" since that value will work > > - * everywhere. > > - */ > > - __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > > - __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > > -} > > - > > static void > > icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > { > > @@ -1388,8 +1307,9 @@ static void > > xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > { > > struct drm_i915_private *i915 = gt->i915; > > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > > - xehp_init_mcr(gt, wal); > > + intel_gt_mcr_report_steering(&p, gt, false); > > /* Wa_1409757795:xehpsdv */ > > wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); > > @@ -1441,10 +1361,22 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > static void > > dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > { > > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > > struct intel_engine_cs *engine; > > int id; > > - xehp_init_mcr(gt, wal); > > + intel_gt_mcr_report_steering(&p, gt, false); > > + > > + /* > > + * SQIDI ranges are special because they use different steering > > + * registers than everything else we work with. On DG2-G10, any value > > + * in the steering registers will work fine since all instances are > > + * present, but DG2-G11 only has SQIDI instances at ID's 2 and 3, so we > > + * need to steer to one of those. For simplicity we'll just steer to a > > + * hardcoded "2" since that value will work everywhere. > > + */ > > + __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > > + __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > > /* Wa_14011060649:dg2 */ > > wa_14011060649(gt, wal);
On Fri, Apr 01, 2022 at 09:34:04AM +0100, Tvrtko Ursulin wrote: > > On 31/03/2022 00:28, Matt Roper wrote: > > Historically we've selected and programmed a single MCR group/instance > > ID at driver startup that will steer register accesses for GSLICE/DSS > > ranges to a non-terminated instance. Any reads of these register ranges > > that don't need a specific unicast access won't bother explicitly > > resteering because the control register should already be set to a > > suitable value to receive a non-terminated response. Any accesses to > > other types of MCR ranges (MSLICE, LNCF, etc.) that are also satisfied > > by the default steering target will also skip explicit re-steering at > > runtime. > > > > This approach has worked well for many years and many platforms, but our > > hardware teams have recently advised us that they're not 100% > > comfortable with our strategy going forward. They now suggest > > explicitly steering reads of any multicast register at the time the > > register access happens rather than relying on previously-programmed > > steering values. In debug settings there could be external agents that > > have adjusted the default steering without the driver's knowledge (e.g., > > we could do this manually with IGT's intel_reg today, although the > > hardware teams also have other tools they use for debug and analysis). > > In theory it would also be possible for bad firmware and/or incorrect > > handling of power management events to clobber/wipe the steering > > value we had previously initialized because they assume we'll be > > re-programming it anyway. > > > > Signed-off-by: Matt Roper <matthew.d.roper@intel.com> > > --- > > drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 40 +++++++++ > > drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + > > drivers/gpu/drm/i915/gt/intel_workarounds.c | 98 ++++----------------- > > 3 files changed, 56 insertions(+), 83 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > > index a9a9fa6881f2..787752367337 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > > +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c > > @@ -35,6 +35,7 @@ > > */ > > static const char * const intel_steering_types[] = { > > + "GSLICE/DSS", > > "L3BANK", > > "MSLICE", > > "LNCF", > > @@ -45,6 +46,35 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { > > {}, > > }; > > +static const struct intel_mmio_range xehpsdv_dss_steering_table[] = { > > + { 0x005200, 0x0052FF }, > > + { 0x005400, 0x007FFF }, > > + { 0x008140, 0x00815F }, > > + { 0x008D00, 0x008DFF }, > > + { 0x0094D0, 0x00955F }, > > + { 0x009680, 0x0096FF }, > > + { 0x00DC00, 0x00DCFF }, > > + { 0x00DE80, 0x00E8FF }, > > + { 0x017000, 0x017FFF }, > > + { 0x024A00, 0x024A7F }, > > + {}, > > +}; > > + > > +static const struct intel_mmio_range dg2_dss_steering_table[] = { > > + { 0x005200, 0x0052FF }, > > + { 0x005400, 0x007FFF }, > > + { 0x008140, 0x00815F }, > > + { 0x008D00, 0x008DFF }, > > + { 0x0094D0, 0x00955F }, > > + { 0x009680, 0x0096FF }, > > + { 0x00D800, 0x00D87F }, > > + { 0x00DC00, 0x00DCFF }, > > + { 0x00DE80, 0x00E8FF }, > > + { 0x017000, 0x017FFF }, > > + { 0x024A00, 0x024A7F }, > > + {}, > > +}; > > + > > static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { > > { 0x004000, 0x004AFF }, > > { 0x00C800, 0x00CFFF }, > > @@ -87,9 +117,11 @@ void intel_gt_mcr_init(struct intel_gt *gt) > > GEN12_MEML3_EN_MASK); > > if (IS_DG2(i915)) { > > + gt->steering_table[DSS] = dg2_dss_steering_table; > > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > > gt->steering_table[LNCF] = dg2_lncf_steering_table; > > } else if (IS_XEHPSDV(i915)) { > > + gt->steering_table[DSS] = xehpsdv_dss_steering_table; > > gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; > > gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; > > } else if (GRAPHICS_VER(i915) >= 11 && > > @@ -317,7 +349,15 @@ static void get_valid_steering(struct intel_gt *gt, > > enum intel_steering_type type, > > u8 *group, u8 *instance) > > { > > + u32 dssmask = intel_sseu_get_subslices(>->info.sseu, 0); > > + > > switch (type) { > > + case DSS: > > + drm_WARN_ON(>->i915->drm, dssmask == 0); > > + > > + *group = __ffs(dssmask) / GEN_DSS_PER_GSLICE; > > + *instance = __ffs(dssmask) % GEN_DSS_PER_GSLICE; > > + break; > > case L3BANK: > > GEM_DEBUG_WARN_ON(!gt->info.l3bank_mask); /* should be impossible! */ > > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h > > index 937b2e1a305e..b77bbaac7622 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h > > +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h > > @@ -54,6 +54,7 @@ struct intel_mmio_range { > > * are listed here. > > */ > > enum intel_steering_type { > > + DSS, > > L3BANK, > > MSLICE, > > LNCF, > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c > > index 818ba71f4909..2486c6aa9d9d 100644 > > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c > > +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c > > @@ -1160,87 +1160,6 @@ icl_wa_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > > __add_mcr_wa(gt, wal, slice, subslice); > > } > > -static void > > -xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) > > -{ > > - const struct sseu_dev_info *sseu = >->info.sseu; > > - unsigned long slice, subslice = 0, slice_mask = 0; > > - u64 dss_mask = 0; > > - u32 lncf_mask = 0; > > - int i; > > - > > - /* > > - * On Xe_HP the steering increases in complexity. There are now several > > - * more units that require steering and we're not guaranteed to be able > > - * to find a common setting for all of them. These are: > > - * - GSLICE (fusable) > > - * - DSS (sub-unit within gslice; fusable) > > - * - L3 Bank (fusable) > > - * - MSLICE (fusable) > > - * - LNCF (sub-unit within mslice; always present if mslice is present) > > - * > > - * We'll do our default/implicit steering based on GSLICE (in the > > - * sliceid field) and DSS (in the subsliceid field). If we can > > - * find overlap between the valid MSLICE and/or LNCF values with > > - * a suitable GSLICE, then we can just re-use the default value and > > - * skip and explicit steering at runtime. > > - * > > - * We only need to look for overlap between GSLICE/MSLICE/LNCF to find > > - * a valid sliceid value. DSS steering is the only type of steering > > - * that utilizes the 'subsliceid' bits. > > - * > > - * Also note that, even though the steering domain is called "GSlice" > > - * and it is encoded in the register using the gslice format, the spec > > - * says that the combined (geometry | compute) fuse should be used to > > - * select the steering. > > - */ > > - > > - /* Find the potential gslice candidates */ > > - dss_mask = intel_sseu_get_subslices(sseu, 0); > > - slice_mask = intel_slicemask_from_dssmask(dss_mask, GEN_DSS_PER_GSLICE); > > - > > - /* > > - * Find the potential LNCF candidates. Either LNCF within a valid > > - * mslice is fine. > > - */ > > - for_each_set_bit(i, >->info.mslice_mask, GEN12_MAX_MSLICES) > > - lncf_mask |= (0x3 << (i * 2)); > > - > > - /* > > - * Are there any sliceid values that work for both GSLICE and LNCF > > - * steering? > > - */ > > - if (slice_mask & lncf_mask) { > > - slice_mask &= lncf_mask; > > - gt->steering_table[LNCF] = NULL; > > - } > > - > > - /* How about sliceid values that also work for MSLICE steering? */ > > - if (slice_mask & gt->info.mslice_mask) { > > - slice_mask &= gt->info.mslice_mask; > > - gt->steering_table[MSLICE] = NULL; > > - } > > - > > - slice = __ffs(slice_mask); > > - subslice = __ffs(dss_mask >> (slice * GEN_DSS_PER_GSLICE)); > > - WARN_ON(subslice > GEN_DSS_PER_GSLICE); > > - WARN_ON(dss_mask >> (slice * GEN_DSS_PER_GSLICE) == 0); > > - > > - __add_mcr_wa(gt, wal, slice, subslice); > > - > > - /* > > - * SQIDI ranges are special because they use different steering > > - * registers than everything else we work with. On XeHP SDV and > > - * DG2-G10, any value in the steering registers will work fine since > > - * all instances are present, but DG2-G11 only has SQIDI instances at > > - * ID's 2 and 3, so we need to steer to one of those. For simplicity > > - * we'll just steer to a hardcoded "2" since that value will work > > - * everywhere. > > - */ > > - __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > > - __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > > -} > > - > > static void > > icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > { > > @@ -1388,8 +1307,9 @@ static void > > xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > { > > struct drm_i915_private *i915 = gt->i915; > > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > > - xehp_init_mcr(gt, wal); > > + intel_gt_mcr_report_steering(&p, gt, false); > > /* Wa_1409757795:xehpsdv */ > > wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); > > @@ -1441,10 +1361,22 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > static void > > dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) > > { > > + struct drm_printer p = drm_debug_printer("MCR Steering:"); > > struct intel_engine_cs *engine; > > int id; > > - xehp_init_mcr(gt, wal); > > + intel_gt_mcr_report_steering(&p, gt, false); > > Are these platforms immune to system hangs caused by incorrect/missing > default MCR configuration such was fixed with c7d561cfcf86 ("drm/i915: > Enable WaProgramMgsrForCorrectSliceSpecificMmioReads for Gen9") ? That was > triggerable from userspace to be clear. They're supposed to be. The mmio design guarantees specific termination behavior for any disabled (fused off, powerwed down) register endpoint: reads return a 0 dummy value and writes are dropped. I can't find the hardware description of WaProgramMgsrForCorrectSliceSpecificMmioReads now, but it sounds like the termination points were either not part of the design yet on old platforms like that, or were just not implemented properly by hardware. Matt > > Regards, > > Tvrtko > > > + > > + /* > > + * SQIDI ranges are special because they use different steering > > + * registers than everything else we work with. On DG2-G10, any value > > + * in the steering registers will work fine since all instances are > > + * present, but DG2-G11 only has SQIDI instances at ID's 2 and 3, so we > > + * need to steer to one of those. For simplicity we'll just steer to a > > + * hardcoded "2" since that value will work everywhere. > > + */ > > + __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); > > + __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); > > /* Wa_14011060649:dg2 */ > > wa_14011060649(gt, wal);
On 04/04/2022 22:35, Matt Roper wrote: > On Thu, Mar 31, 2022 at 06:35:52PM +0100, Tvrtko Ursulin wrote: >> >> On 31/03/2022 00:28, Matt Roper wrote: >>> Historically we've selected and programmed a single MCR group/instance >>> ID at driver startup that will steer register accesses for GSLICE/DSS >>> ranges to a non-terminated instance. Any reads of these register ranges >>> that don't need a specific unicast access won't bother explicitly >>> resteering because the control register should already be set to a >>> suitable value to receive a non-terminated response. Any accesses to >>> other types of MCR ranges (MSLICE, LNCF, etc.) that are also satisfied >>> by the default steering target will also skip explicit re-steering at >>> runtime. >>> >>> This approach has worked well for many years and many platforms, but our >>> hardware teams have recently advised us that they're not 100% >>> comfortable with our strategy going forward. They now suggest >>> explicitly steering reads of any multicast register at the time the >>> register access happens rather than relying on previously-programmed >>> steering values. In debug settings there could be external agents that >>> have adjusted the default steering without the driver's knowledge (e.g., >>> we could do this manually with IGT's intel_reg today, although the >>> hardware teams also have other tools they use for debug and analysis). >>> In theory it would also be possible for bad firmware and/or incorrect >>> handling of power management events to clobber/wipe the steering >>> value we had previously initialized because they assume we'll be >>> re-programming it anyway. >> >> That external agent of any kind can mess with registers behind drivers back >> is kind of a weak justification, no? Because steering is just one small part >> of what can go wrong in this case. > > Apparently the assumption when the hardware was designed was that > software would explicitly steer every MCR access; they never really > considered the design we've been using where we try to set it up once Are you referring to Xe_HP here or even older generations? Pretty sure the way we programmed the steering at driver load was the same as what Windows driver was doing. If we both got it wrong that would be funny. > and try to minimize subsequent updates to the steering control. In a > lot of cases different agents updating steering have their own steering > control registers (i.e., the GuC, the command streamers, and a couple > other internal hardware units have their own independent steering > control registers to try to avoid racing with whatever the KMD/CPU is > doing), but I think there may have been some cases that aren't 100% > covered there. The last point - it would be good to find out - do we have a current case (current platform) when something in the hardware can mess up the steering behind drivers back, and where. > This is also partially motivated by the direction the general hardware > teams want to move in the future --- they plan to reduce the number of > different steering control registers for different agents and make more > of them share a single register with the KMD/CPU. There will be a > separate "semaphore" register used for coordinating access between > various agents (of course that will bring new challenges such as > increased latency and what to do if some hardware unit grabs the > semaphore and somehow fails to release it). Understandable I guess, thanks for the info! If i915 is still not accessing those registers much problem will not be that big. Regards, Tvrtko > >> >> Also, someone at some point has to know which are the affected registers. Be >> it a range table, or at actual point of submitting patches which add >> register definitions. At any of those points mistakes are possible. > > True. But today there are a lot of registers used by the driver that > are multicast and I don't think the code written around them was really > thinking about the multicast semantics of the register, especially when > the code was copy/pasted from earlier platforms where they weren't > multicast (the TLB invalidation registers are an example --- should we > be waiting for an ack to come back on every mslice rather than just on a > single random mslice?). MCR registers seem to be an area that's pretty > mysterious to a lot of people that haven't looked at them carefully, and > sometimes doing a simple intel_uncore_{read,write} doesn't accomplish > what you'd expect; forcing us to be a bit more deliberate about the type > of behavior we expect to get seems like it will help reduce mistakes in > the long run. > >> >> So I guess I am not immediately buying the need to refactor all this. Apart >> from churn, the main downside that I see is that all accesses need separate >> helpers. Question is why. Driver could choose to always steer before reading >> today, right? > > You mean like making intel_uncore_read always do a steering table lookup > for all registers? We could, although I'm a bit hesitant to add even > more GT-specific logic to the uncore functions that are used for non-GT > purposes as well. And like I said before, it still hides the fact that > there may be multiple register instances and you're just reading one > semi-random instance. > > > Matt > >> >> Regards, >> >> Tvrtko >> >>> >>> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> >>> --- >>> drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 40 +++++++++ >>> drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + >>> drivers/gpu/drm/i915/gt/intel_workarounds.c | 98 ++++----------------- >>> 3 files changed, 56 insertions(+), 83 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c >>> index a9a9fa6881f2..787752367337 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c >>> +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c >>> @@ -35,6 +35,7 @@ >>> */ >>> static const char * const intel_steering_types[] = { >>> + "GSLICE/DSS", >>> "L3BANK", >>> "MSLICE", >>> "LNCF", >>> @@ -45,6 +46,35 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { >>> {}, >>> }; >>> +static const struct intel_mmio_range xehpsdv_dss_steering_table[] = { >>> + { 0x005200, 0x0052FF }, >>> + { 0x005400, 0x007FFF }, >>> + { 0x008140, 0x00815F }, >>> + { 0x008D00, 0x008DFF }, >>> + { 0x0094D0, 0x00955F }, >>> + { 0x009680, 0x0096FF }, >>> + { 0x00DC00, 0x00DCFF }, >>> + { 0x00DE80, 0x00E8FF }, >>> + { 0x017000, 0x017FFF }, >>> + { 0x024A00, 0x024A7F }, >>> + {}, >>> +}; >>> + >>> +static const struct intel_mmio_range dg2_dss_steering_table[] = { >>> + { 0x005200, 0x0052FF }, >>> + { 0x005400, 0x007FFF }, >>> + { 0x008140, 0x00815F }, >>> + { 0x008D00, 0x008DFF }, >>> + { 0x0094D0, 0x00955F }, >>> + { 0x009680, 0x0096FF }, >>> + { 0x00D800, 0x00D87F }, >>> + { 0x00DC00, 0x00DCFF }, >>> + { 0x00DE80, 0x00E8FF }, >>> + { 0x017000, 0x017FFF }, >>> + { 0x024A00, 0x024A7F }, >>> + {}, >>> +}; >>> + >>> static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { >>> { 0x004000, 0x004AFF }, >>> { 0x00C800, 0x00CFFF }, >>> @@ -87,9 +117,11 @@ void intel_gt_mcr_init(struct intel_gt *gt) >>> GEN12_MEML3_EN_MASK); >>> if (IS_DG2(i915)) { >>> + gt->steering_table[DSS] = dg2_dss_steering_table; >>> gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; >>> gt->steering_table[LNCF] = dg2_lncf_steering_table; >>> } else if (IS_XEHPSDV(i915)) { >>> + gt->steering_table[DSS] = xehpsdv_dss_steering_table; >>> gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; >>> gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; >>> } else if (GRAPHICS_VER(i915) >= 11 && >>> @@ -317,7 +349,15 @@ static void get_valid_steering(struct intel_gt *gt, >>> enum intel_steering_type type, >>> u8 *group, u8 *instance) >>> { >>> + u32 dssmask = intel_sseu_get_subslices(>->info.sseu, 0); >>> + >>> switch (type) { >>> + case DSS: >>> + drm_WARN_ON(>->i915->drm, dssmask == 0); >>> + >>> + *group = __ffs(dssmask) / GEN_DSS_PER_GSLICE; >>> + *instance = __ffs(dssmask) % GEN_DSS_PER_GSLICE; >>> + break; >>> case L3BANK: >>> GEM_DEBUG_WARN_ON(!gt->info.l3bank_mask); /* should be impossible! */ >>> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h >>> index 937b2e1a305e..b77bbaac7622 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h >>> +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h >>> @@ -54,6 +54,7 @@ struct intel_mmio_range { >>> * are listed here. >>> */ >>> enum intel_steering_type { >>> + DSS, >>> L3BANK, >>> MSLICE, >>> LNCF, >>> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c >>> index 818ba71f4909..2486c6aa9d9d 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c >>> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c >>> @@ -1160,87 +1160,6 @@ icl_wa_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) >>> __add_mcr_wa(gt, wal, slice, subslice); >>> } >>> -static void >>> -xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) >>> -{ >>> - const struct sseu_dev_info *sseu = >->info.sseu; >>> - unsigned long slice, subslice = 0, slice_mask = 0; >>> - u64 dss_mask = 0; >>> - u32 lncf_mask = 0; >>> - int i; >>> - >>> - /* >>> - * On Xe_HP the steering increases in complexity. There are now several >>> - * more units that require steering and we're not guaranteed to be able >>> - * to find a common setting for all of them. These are: >>> - * - GSLICE (fusable) >>> - * - DSS (sub-unit within gslice; fusable) >>> - * - L3 Bank (fusable) >>> - * - MSLICE (fusable) >>> - * - LNCF (sub-unit within mslice; always present if mslice is present) >>> - * >>> - * We'll do our default/implicit steering based on GSLICE (in the >>> - * sliceid field) and DSS (in the subsliceid field). If we can >>> - * find overlap between the valid MSLICE and/or LNCF values with >>> - * a suitable GSLICE, then we can just re-use the default value and >>> - * skip and explicit steering at runtime. >>> - * >>> - * We only need to look for overlap between GSLICE/MSLICE/LNCF to find >>> - * a valid sliceid value. DSS steering is the only type of steering >>> - * that utilizes the 'subsliceid' bits. >>> - * >>> - * Also note that, even though the steering domain is called "GSlice" >>> - * and it is encoded in the register using the gslice format, the spec >>> - * says that the combined (geometry | compute) fuse should be used to >>> - * select the steering. >>> - */ >>> - >>> - /* Find the potential gslice candidates */ >>> - dss_mask = intel_sseu_get_subslices(sseu, 0); >>> - slice_mask = intel_slicemask_from_dssmask(dss_mask, GEN_DSS_PER_GSLICE); >>> - >>> - /* >>> - * Find the potential LNCF candidates. Either LNCF within a valid >>> - * mslice is fine. >>> - */ >>> - for_each_set_bit(i, >->info.mslice_mask, GEN12_MAX_MSLICES) >>> - lncf_mask |= (0x3 << (i * 2)); >>> - >>> - /* >>> - * Are there any sliceid values that work for both GSLICE and LNCF >>> - * steering? >>> - */ >>> - if (slice_mask & lncf_mask) { >>> - slice_mask &= lncf_mask; >>> - gt->steering_table[LNCF] = NULL; >>> - } >>> - >>> - /* How about sliceid values that also work for MSLICE steering? */ >>> - if (slice_mask & gt->info.mslice_mask) { >>> - slice_mask &= gt->info.mslice_mask; >>> - gt->steering_table[MSLICE] = NULL; >>> - } >>> - >>> - slice = __ffs(slice_mask); >>> - subslice = __ffs(dss_mask >> (slice * GEN_DSS_PER_GSLICE)); >>> - WARN_ON(subslice > GEN_DSS_PER_GSLICE); >>> - WARN_ON(dss_mask >> (slice * GEN_DSS_PER_GSLICE) == 0); >>> - >>> - __add_mcr_wa(gt, wal, slice, subslice); >>> - >>> - /* >>> - * SQIDI ranges are special because they use different steering >>> - * registers than everything else we work with. On XeHP SDV and >>> - * DG2-G10, any value in the steering registers will work fine since >>> - * all instances are present, but DG2-G11 only has SQIDI instances at >>> - * ID's 2 and 3, so we need to steer to one of those. For simplicity >>> - * we'll just steer to a hardcoded "2" since that value will work >>> - * everywhere. >>> - */ >>> - __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); >>> - __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); >>> -} >>> - >>> static void >>> icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> { >>> @@ -1388,8 +1307,9 @@ static void >>> xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> { >>> struct drm_i915_private *i915 = gt->i915; >>> + struct drm_printer p = drm_debug_printer("MCR Steering:"); >>> - xehp_init_mcr(gt, wal); >>> + intel_gt_mcr_report_steering(&p, gt, false); >>> /* Wa_1409757795:xehpsdv */ >>> wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); >>> @@ -1441,10 +1361,22 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> static void >>> dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> { >>> + struct drm_printer p = drm_debug_printer("MCR Steering:"); >>> struct intel_engine_cs *engine; >>> int id; >>> - xehp_init_mcr(gt, wal); >>> + intel_gt_mcr_report_steering(&p, gt, false); >>> + >>> + /* >>> + * SQIDI ranges are special because they use different steering >>> + * registers than everything else we work with. On DG2-G10, any value >>> + * in the steering registers will work fine since all instances are >>> + * present, but DG2-G11 only has SQIDI instances at ID's 2 and 3, so we >>> + * need to steer to one of those. For simplicity we'll just steer to a >>> + * hardcoded "2" since that value will work everywhere. >>> + */ >>> + __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); >>> + __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); >>> /* Wa_14011060649:dg2 */ >>> wa_14011060649(gt, wal); >
On 04/04/2022 22:42, Matt Roper wrote: > On Fri, Apr 01, 2022 at 09:34:04AM +0100, Tvrtko Ursulin wrote: >> >> On 31/03/2022 00:28, Matt Roper wrote: >>> Historically we've selected and programmed a single MCR group/instance >>> ID at driver startup that will steer register accesses for GSLICE/DSS >>> ranges to a non-terminated instance. Any reads of these register ranges >>> that don't need a specific unicast access won't bother explicitly >>> resteering because the control register should already be set to a >>> suitable value to receive a non-terminated response. Any accesses to >>> other types of MCR ranges (MSLICE, LNCF, etc.) that are also satisfied >>> by the default steering target will also skip explicit re-steering at >>> runtime. >>> >>> This approach has worked well for many years and many platforms, but our >>> hardware teams have recently advised us that they're not 100% >>> comfortable with our strategy going forward. They now suggest >>> explicitly steering reads of any multicast register at the time the >>> register access happens rather than relying on previously-programmed >>> steering values. In debug settings there could be external agents that >>> have adjusted the default steering without the driver's knowledge (e.g., >>> we could do this manually with IGT's intel_reg today, although the >>> hardware teams also have other tools they use for debug and analysis). >>> In theory it would also be possible for bad firmware and/or incorrect >>> handling of power management events to clobber/wipe the steering >>> value we had previously initialized because they assume we'll be >>> re-programming it anyway. >>> >>> Signed-off-by: Matt Roper <matthew.d.roper@intel.com> >>> --- >>> drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 40 +++++++++ >>> drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + >>> drivers/gpu/drm/i915/gt/intel_workarounds.c | 98 ++++----------------- >>> 3 files changed, 56 insertions(+), 83 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c >>> index a9a9fa6881f2..787752367337 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c >>> +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c >>> @@ -35,6 +35,7 @@ >>> */ >>> static const char * const intel_steering_types[] = { >>> + "GSLICE/DSS", >>> "L3BANK", >>> "MSLICE", >>> "LNCF", >>> @@ -45,6 +46,35 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { >>> {}, >>> }; >>> +static const struct intel_mmio_range xehpsdv_dss_steering_table[] = { >>> + { 0x005200, 0x0052FF }, >>> + { 0x005400, 0x007FFF }, >>> + { 0x008140, 0x00815F }, >>> + { 0x008D00, 0x008DFF }, >>> + { 0x0094D0, 0x00955F }, >>> + { 0x009680, 0x0096FF }, >>> + { 0x00DC00, 0x00DCFF }, >>> + { 0x00DE80, 0x00E8FF }, >>> + { 0x017000, 0x017FFF }, >>> + { 0x024A00, 0x024A7F }, >>> + {}, >>> +}; >>> + >>> +static const struct intel_mmio_range dg2_dss_steering_table[] = { >>> + { 0x005200, 0x0052FF }, >>> + { 0x005400, 0x007FFF }, >>> + { 0x008140, 0x00815F }, >>> + { 0x008D00, 0x008DFF }, >>> + { 0x0094D0, 0x00955F }, >>> + { 0x009680, 0x0096FF }, >>> + { 0x00D800, 0x00D87F }, >>> + { 0x00DC00, 0x00DCFF }, >>> + { 0x00DE80, 0x00E8FF }, >>> + { 0x017000, 0x017FFF }, >>> + { 0x024A00, 0x024A7F }, >>> + {}, >>> +}; >>> + >>> static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { >>> { 0x004000, 0x004AFF }, >>> { 0x00C800, 0x00CFFF }, >>> @@ -87,9 +117,11 @@ void intel_gt_mcr_init(struct intel_gt *gt) >>> GEN12_MEML3_EN_MASK); >>> if (IS_DG2(i915)) { >>> + gt->steering_table[DSS] = dg2_dss_steering_table; >>> gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; >>> gt->steering_table[LNCF] = dg2_lncf_steering_table; >>> } else if (IS_XEHPSDV(i915)) { >>> + gt->steering_table[DSS] = xehpsdv_dss_steering_table; >>> gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; >>> gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; >>> } else if (GRAPHICS_VER(i915) >= 11 && >>> @@ -317,7 +349,15 @@ static void get_valid_steering(struct intel_gt *gt, >>> enum intel_steering_type type, >>> u8 *group, u8 *instance) >>> { >>> + u32 dssmask = intel_sseu_get_subslices(>->info.sseu, 0); >>> + >>> switch (type) { >>> + case DSS: >>> + drm_WARN_ON(>->i915->drm, dssmask == 0); >>> + >>> + *group = __ffs(dssmask) / GEN_DSS_PER_GSLICE; >>> + *instance = __ffs(dssmask) % GEN_DSS_PER_GSLICE; >>> + break; >>> case L3BANK: >>> GEM_DEBUG_WARN_ON(!gt->info.l3bank_mask); /* should be impossible! */ >>> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h >>> index 937b2e1a305e..b77bbaac7622 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h >>> +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h >>> @@ -54,6 +54,7 @@ struct intel_mmio_range { >>> * are listed here. >>> */ >>> enum intel_steering_type { >>> + DSS, >>> L3BANK, >>> MSLICE, >>> LNCF, >>> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c >>> index 818ba71f4909..2486c6aa9d9d 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c >>> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c >>> @@ -1160,87 +1160,6 @@ icl_wa_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) >>> __add_mcr_wa(gt, wal, slice, subslice); >>> } >>> -static void >>> -xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) >>> -{ >>> - const struct sseu_dev_info *sseu = >->info.sseu; >>> - unsigned long slice, subslice = 0, slice_mask = 0; >>> - u64 dss_mask = 0; >>> - u32 lncf_mask = 0; >>> - int i; >>> - >>> - /* >>> - * On Xe_HP the steering increases in complexity. There are now several >>> - * more units that require steering and we're not guaranteed to be able >>> - * to find a common setting for all of them. These are: >>> - * - GSLICE (fusable) >>> - * - DSS (sub-unit within gslice; fusable) >>> - * - L3 Bank (fusable) >>> - * - MSLICE (fusable) >>> - * - LNCF (sub-unit within mslice; always present if mslice is present) >>> - * >>> - * We'll do our default/implicit steering based on GSLICE (in the >>> - * sliceid field) and DSS (in the subsliceid field). If we can >>> - * find overlap between the valid MSLICE and/or LNCF values with >>> - * a suitable GSLICE, then we can just re-use the default value and >>> - * skip and explicit steering at runtime. >>> - * >>> - * We only need to look for overlap between GSLICE/MSLICE/LNCF to find >>> - * a valid sliceid value. DSS steering is the only type of steering >>> - * that utilizes the 'subsliceid' bits. >>> - * >>> - * Also note that, even though the steering domain is called "GSlice" >>> - * and it is encoded in the register using the gslice format, the spec >>> - * says that the combined (geometry | compute) fuse should be used to >>> - * select the steering. >>> - */ >>> - >>> - /* Find the potential gslice candidates */ >>> - dss_mask = intel_sseu_get_subslices(sseu, 0); >>> - slice_mask = intel_slicemask_from_dssmask(dss_mask, GEN_DSS_PER_GSLICE); >>> - >>> - /* >>> - * Find the potential LNCF candidates. Either LNCF within a valid >>> - * mslice is fine. >>> - */ >>> - for_each_set_bit(i, >->info.mslice_mask, GEN12_MAX_MSLICES) >>> - lncf_mask |= (0x3 << (i * 2)); >>> - >>> - /* >>> - * Are there any sliceid values that work for both GSLICE and LNCF >>> - * steering? >>> - */ >>> - if (slice_mask & lncf_mask) { >>> - slice_mask &= lncf_mask; >>> - gt->steering_table[LNCF] = NULL; >>> - } >>> - >>> - /* How about sliceid values that also work for MSLICE steering? */ >>> - if (slice_mask & gt->info.mslice_mask) { >>> - slice_mask &= gt->info.mslice_mask; >>> - gt->steering_table[MSLICE] = NULL; >>> - } >>> - >>> - slice = __ffs(slice_mask); >>> - subslice = __ffs(dss_mask >> (slice * GEN_DSS_PER_GSLICE)); >>> - WARN_ON(subslice > GEN_DSS_PER_GSLICE); >>> - WARN_ON(dss_mask >> (slice * GEN_DSS_PER_GSLICE) == 0); >>> - >>> - __add_mcr_wa(gt, wal, slice, subslice); >>> - >>> - /* >>> - * SQIDI ranges are special because they use different steering >>> - * registers than everything else we work with. On XeHP SDV and >>> - * DG2-G10, any value in the steering registers will work fine since >>> - * all instances are present, but DG2-G11 only has SQIDI instances at >>> - * ID's 2 and 3, so we need to steer to one of those. For simplicity >>> - * we'll just steer to a hardcoded "2" since that value will work >>> - * everywhere. >>> - */ >>> - __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); >>> - __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); >>> -} >>> - >>> static void >>> icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> { >>> @@ -1388,8 +1307,9 @@ static void >>> xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> { >>> struct drm_i915_private *i915 = gt->i915; >>> + struct drm_printer p = drm_debug_printer("MCR Steering:"); >>> - xehp_init_mcr(gt, wal); >>> + intel_gt_mcr_report_steering(&p, gt, false); >>> /* Wa_1409757795:xehpsdv */ >>> wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); >>> @@ -1441,10 +1361,22 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> static void >>> dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) >>> { >>> + struct drm_printer p = drm_debug_printer("MCR Steering:"); >>> struct intel_engine_cs *engine; >>> int id; >>> - xehp_init_mcr(gt, wal); >>> + intel_gt_mcr_report_steering(&p, gt, false); >> >> Are these platforms immune to system hangs caused by incorrect/missing >> default MCR configuration such was fixed with c7d561cfcf86 ("drm/i915: >> Enable WaProgramMgsrForCorrectSliceSpecificMmioReads for Gen9") ? That was >> triggerable from userspace to be clear. > > They're supposed to be. The mmio design guarantees specific termination > behavior for any disabled (fused off, powerwed down) register endpoint: > reads return a 0 dummy value and writes are dropped. I can't find the > hardware description of WaProgramMgsrForCorrectSliceSpecificMmioReads > now, but it sounds like the termination points were either not part of > the design yet on old platforms like that, or were just not implemented > properly by hardware. It would be good to get in touch with someone from Media UMD to gain understanding of the failure mode on Gen9 which was fixed by the quoted commit and get their statement on whether Xe_HP is immune. With that clarified I think the high level approach is good. To be clear I am not considering the debugging angle as valid, but I am counting on the justification that legitimate parts of hardware will start fiddling with a shared steering register in the near future. Regards, Tvrtko > > > Matt > >> >> Regards, >> >> Tvrtko >> >>> + >>> + /* >>> + * SQIDI ranges are special because they use different steering >>> + * registers than everything else we work with. On DG2-G10, any value >>> + * in the steering registers will work fine since all instances are >>> + * present, but DG2-G11 only has SQIDI instances at ID's 2 and 3, so we >>> + * need to steer to one of those. For simplicity we'll just steer to a >>> + * hardcoded "2" since that value will work everywhere. >>> + */ >>> + __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); >>> + __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); >>> /* Wa_14011060649:dg2 */ >>> wa_14011060649(gt, wal); >
diff --git a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c index a9a9fa6881f2..787752367337 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_mcr.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_mcr.c @@ -35,6 +35,7 @@ */ static const char * const intel_steering_types[] = { + "GSLICE/DSS", "L3BANK", "MSLICE", "LNCF", @@ -45,6 +46,35 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { {}, }; +static const struct intel_mmio_range xehpsdv_dss_steering_table[] = { + { 0x005200, 0x0052FF }, + { 0x005400, 0x007FFF }, + { 0x008140, 0x00815F }, + { 0x008D00, 0x008DFF }, + { 0x0094D0, 0x00955F }, + { 0x009680, 0x0096FF }, + { 0x00DC00, 0x00DCFF }, + { 0x00DE80, 0x00E8FF }, + { 0x017000, 0x017FFF }, + { 0x024A00, 0x024A7F }, + {}, +}; + +static const struct intel_mmio_range dg2_dss_steering_table[] = { + { 0x005200, 0x0052FF }, + { 0x005400, 0x007FFF }, + { 0x008140, 0x00815F }, + { 0x008D00, 0x008DFF }, + { 0x0094D0, 0x00955F }, + { 0x009680, 0x0096FF }, + { 0x00D800, 0x00D87F }, + { 0x00DC00, 0x00DCFF }, + { 0x00DE80, 0x00E8FF }, + { 0x017000, 0x017FFF }, + { 0x024A00, 0x024A7F }, + {}, +}; + static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { { 0x004000, 0x004AFF }, { 0x00C800, 0x00CFFF }, @@ -87,9 +117,11 @@ void intel_gt_mcr_init(struct intel_gt *gt) GEN12_MEML3_EN_MASK); if (IS_DG2(i915)) { + gt->steering_table[DSS] = dg2_dss_steering_table; gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; gt->steering_table[LNCF] = dg2_lncf_steering_table; } else if (IS_XEHPSDV(i915)) { + gt->steering_table[DSS] = xehpsdv_dss_steering_table; gt->steering_table[MSLICE] = xehpsdv_mslice_steering_table; gt->steering_table[LNCF] = xehpsdv_lncf_steering_table; } else if (GRAPHICS_VER(i915) >= 11 && @@ -317,7 +349,15 @@ static void get_valid_steering(struct intel_gt *gt, enum intel_steering_type type, u8 *group, u8 *instance) { + u32 dssmask = intel_sseu_get_subslices(>->info.sseu, 0); + switch (type) { + case DSS: + drm_WARN_ON(>->i915->drm, dssmask == 0); + + *group = __ffs(dssmask) / GEN_DSS_PER_GSLICE; + *instance = __ffs(dssmask) % GEN_DSS_PER_GSLICE; + break; case L3BANK: GEM_DEBUG_WARN_ON(!gt->info.l3bank_mask); /* should be impossible! */ diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h index 937b2e1a305e..b77bbaac7622 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h @@ -54,6 +54,7 @@ struct intel_mmio_range { * are listed here. */ enum intel_steering_type { + DSS, L3BANK, MSLICE, LNCF, diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 818ba71f4909..2486c6aa9d9d 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1160,87 +1160,6 @@ icl_wa_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) __add_mcr_wa(gt, wal, slice, subslice); } -static void -xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal) -{ - const struct sseu_dev_info *sseu = >->info.sseu; - unsigned long slice, subslice = 0, slice_mask = 0; - u64 dss_mask = 0; - u32 lncf_mask = 0; - int i; - - /* - * On Xe_HP the steering increases in complexity. There are now several - * more units that require steering and we're not guaranteed to be able - * to find a common setting for all of them. These are: - * - GSLICE (fusable) - * - DSS (sub-unit within gslice; fusable) - * - L3 Bank (fusable) - * - MSLICE (fusable) - * - LNCF (sub-unit within mslice; always present if mslice is present) - * - * We'll do our default/implicit steering based on GSLICE (in the - * sliceid field) and DSS (in the subsliceid field). If we can - * find overlap between the valid MSLICE and/or LNCF values with - * a suitable GSLICE, then we can just re-use the default value and - * skip and explicit steering at runtime. - * - * We only need to look for overlap between GSLICE/MSLICE/LNCF to find - * a valid sliceid value. DSS steering is the only type of steering - * that utilizes the 'subsliceid' bits. - * - * Also note that, even though the steering domain is called "GSlice" - * and it is encoded in the register using the gslice format, the spec - * says that the combined (geometry | compute) fuse should be used to - * select the steering. - */ - - /* Find the potential gslice candidates */ - dss_mask = intel_sseu_get_subslices(sseu, 0); - slice_mask = intel_slicemask_from_dssmask(dss_mask, GEN_DSS_PER_GSLICE); - - /* - * Find the potential LNCF candidates. Either LNCF within a valid - * mslice is fine. - */ - for_each_set_bit(i, >->info.mslice_mask, GEN12_MAX_MSLICES) - lncf_mask |= (0x3 << (i * 2)); - - /* - * Are there any sliceid values that work for both GSLICE and LNCF - * steering? - */ - if (slice_mask & lncf_mask) { - slice_mask &= lncf_mask; - gt->steering_table[LNCF] = NULL; - } - - /* How about sliceid values that also work for MSLICE steering? */ - if (slice_mask & gt->info.mslice_mask) { - slice_mask &= gt->info.mslice_mask; - gt->steering_table[MSLICE] = NULL; - } - - slice = __ffs(slice_mask); - subslice = __ffs(dss_mask >> (slice * GEN_DSS_PER_GSLICE)); - WARN_ON(subslice > GEN_DSS_PER_GSLICE); - WARN_ON(dss_mask >> (slice * GEN_DSS_PER_GSLICE) == 0); - - __add_mcr_wa(gt, wal, slice, subslice); - - /* - * SQIDI ranges are special because they use different steering - * registers than everything else we work with. On XeHP SDV and - * DG2-G10, any value in the steering registers will work fine since - * all instances are present, but DG2-G11 only has SQIDI instances at - * ID's 2 and 3, so we need to steer to one of those. For simplicity - * we'll just steer to a hardcoded "2" since that value will work - * everywhere. - */ - __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); - __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); -} - static void icl_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) { @@ -1388,8 +1307,9 @@ static void xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) { struct drm_i915_private *i915 = gt->i915; + struct drm_printer p = drm_debug_printer("MCR Steering:"); - xehp_init_mcr(gt, wal); + intel_gt_mcr_report_steering(&p, gt, false); /* Wa_1409757795:xehpsdv */ wa_mcr_write_or(wal, SCCGCTL94DC, CG3DDISURB); @@ -1441,10 +1361,22 @@ xehpsdv_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) static void dg2_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) { + struct drm_printer p = drm_debug_printer("MCR Steering:"); struct intel_engine_cs *engine; int id; - xehp_init_mcr(gt, wal); + intel_gt_mcr_report_steering(&p, gt, false); + + /* + * SQIDI ranges are special because they use different steering + * registers than everything else we work with. On DG2-G10, any value + * in the steering registers will work fine since all instances are + * present, but DG2-G11 only has SQIDI instances at ID's 2 and 3, so we + * need to steer to one of those. For simplicity we'll just steer to a + * hardcoded "2" since that value will work everywhere. + */ + __set_mcr_steering(wal, MCFG_MCR_SELECTOR, 0, 2); + __set_mcr_steering(wal, SF_MCR_SELECTOR, 0, 2); /* Wa_14011060649:dg2 */ wa_14011060649(gt, wal);
Historically we've selected and programmed a single MCR group/instance ID at driver startup that will steer register accesses for GSLICE/DSS ranges to a non-terminated instance. Any reads of these register ranges that don't need a specific unicast access won't bother explicitly resteering because the control register should already be set to a suitable value to receive a non-terminated response. Any accesses to other types of MCR ranges (MSLICE, LNCF, etc.) that are also satisfied by the default steering target will also skip explicit re-steering at runtime. This approach has worked well for many years and many platforms, but our hardware teams have recently advised us that they're not 100% comfortable with our strategy going forward. They now suggest explicitly steering reads of any multicast register at the time the register access happens rather than relying on previously-programmed steering values. In debug settings there could be external agents that have adjusted the default steering without the driver's knowledge (e.g., we could do this manually with IGT's intel_reg today, although the hardware teams also have other tools they use for debug and analysis). In theory it would also be possible for bad firmware and/or incorrect handling of power management events to clobber/wipe the steering value we had previously initialized because they assume we'll be re-programming it anyway. Signed-off-by: Matt Roper <matthew.d.roper@intel.com> --- drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 40 +++++++++ drivers/gpu/drm/i915/gt/intel_gt_types.h | 1 + drivers/gpu/drm/i915/gt/intel_workarounds.c | 98 ++++----------------- 3 files changed, 56 insertions(+), 83 deletions(-)