[PATCH v2 23/43] drm/xe/gsc: Convert register access to use xe_mmio

[Rodrigo Vivi]

On Fri, Sep 06, 2024 at 05:08:12PM -0700, Matt Roper wrote:
> Stop using GT pointers for register access.
> 
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_gsc.c       | 23 ++++++++++++-----------
>  drivers/gpu/drm/xe/xe_gsc_proxy.c |  4 ++--
>  2 files changed, 14 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c
> index 6fbea70d3d36..9cb326af5931 100644
> --- a/drivers/gpu/drm/xe/xe_gsc.c
> +++ b/drivers/gpu/drm/xe/xe_gsc.c
> @@ -179,7 +179,7 @@ static int query_compatibility_version(struct xe_gsc *gsc)
>  
>  static int gsc_fw_is_loaded(struct xe_gt *gt)
>  {
> -	return xe_mmio_read32(gt, HECI_FWSTS1(MTL_GSC_HECI1_BASE)) &
> +	return xe_mmio_read32(&gt->mmio, HECI_FWSTS1(MTL_GSC_HECI1_BASE)) &
>  			      HECI1_FWSTS1_INIT_COMPLETE;
>  }
>  
> @@ -190,7 +190,7 @@ static int gsc_fw_wait(struct xe_gt *gt)
>  	 * executed by the GSCCS. To account for possible submission delays or
>  	 * other issues, we use a 500ms timeout in the wait here.
>  	 */
> -	return xe_mmio_wait32(gt, HECI_FWSTS1(MTL_GSC_HECI1_BASE),
> +	return xe_mmio_wait32(&gt->mmio, HECI_FWSTS1(MTL_GSC_HECI1_BASE),
>  			      HECI1_FWSTS1_INIT_COMPLETE,
>  			      HECI1_FWSTS1_INIT_COMPLETE,
>  			      500 * USEC_PER_MSEC, NULL, false);
> @@ -330,7 +330,7 @@ static int gsc_er_complete(struct xe_gt *gt)
>  	 * so in that scenario we're always guaranteed to find the correct
>  	 * value.
>  	 */
> -	er_status = xe_mmio_read32(gt, GSCI_TIMER_STATUS) & GSCI_TIMER_STATUS_VALUE;
> +	er_status = xe_mmio_read32(&gt->mmio, GSCI_TIMER_STATUS) & GSCI_TIMER_STATUS_VALUE;
>  
>  	if (er_status == GSCI_TIMER_STATUS_TIMER_EXPIRED) {
>  		/*
> @@ -581,11 +581,11 @@ void xe_gsc_wa_14015076503(struct xe_gt *gt, bool prep)
>  	if (!XE_WA(gt, 14015076503) || !gsc_fw_is_loaded(gt))
>  		return;
>  
> -	xe_mmio_rmw32(gt, HECI_H_GS1(MTL_GSC_HECI2_BASE), gs1_clr, gs1_set);
> +	xe_mmio_rmw32(&gt->mmio, HECI_H_GS1(MTL_GSC_HECI2_BASE), gs1_clr, gs1_set);
>  
>  	if (prep) {
>  		/* make sure the reset bit is clear when writing the CSR reg */
> -		xe_mmio_rmw32(gt, HECI_H_CSR(MTL_GSC_HECI2_BASE),
> +		xe_mmio_rmw32(&gt->mmio, HECI_H_CSR(MTL_GSC_HECI2_BASE),
>  			      HECI_H_CSR_RST, HECI_H_CSR_IG);
>  		msleep(200);
>  	}
> @@ -599,6 +599,7 @@ void xe_gsc_wa_14015076503(struct xe_gt *gt, bool prep)
>  void xe_gsc_print_info(struct xe_gsc *gsc, struct drm_printer *p)
>  {
>  	struct xe_gt *gt = gsc_to_gt(gsc);
> +	struct xe_mmio *mmio = &gt->mmio;
>  	int err;
>  
>  	xe_uc_fw_print(&gsc->fw, p);
> @@ -613,12 +614,12 @@ void xe_gsc_print_info(struct xe_gsc *gsc, struct drm_printer *p)
>  		return;
>  
>  	drm_printf(p, "\nHECI1 FWSTS: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n",
> -			xe_mmio_read32(gt, HECI_FWSTS1(MTL_GSC_HECI1_BASE)),
> -			xe_mmio_read32(gt, HECI_FWSTS2(MTL_GSC_HECI1_BASE)),
> -			xe_mmio_read32(gt, HECI_FWSTS3(MTL_GSC_HECI1_BASE)),
> -			xe_mmio_read32(gt, HECI_FWSTS4(MTL_GSC_HECI1_BASE)),
> -			xe_mmio_read32(gt, HECI_FWSTS5(MTL_GSC_HECI1_BASE)),
> -			xe_mmio_read32(gt, HECI_FWSTS6(MTL_GSC_HECI1_BASE)));
> +			xe_mmio_read32(mmio, HECI_FWSTS1(MTL_GSC_HECI1_BASE)),
> +			xe_mmio_read32(mmio, HECI_FWSTS2(MTL_GSC_HECI1_BASE)),
> +			xe_mmio_read32(mmio, HECI_FWSTS3(MTL_GSC_HECI1_BASE)),
> +			xe_mmio_read32(mmio, HECI_FWSTS4(MTL_GSC_HECI1_BASE)),
> +			xe_mmio_read32(mmio, HECI_FWSTS5(MTL_GSC_HECI1_BASE)),
> +			xe_mmio_read32(mmio, HECI_FWSTS6(MTL_GSC_HECI1_BASE)));
>  
>  	xe_force_wake_put(gt_to_fw(gt), XE_FW_GSC);
>  }
> diff --git a/drivers/gpu/drm/xe/xe_gsc_proxy.c b/drivers/gpu/drm/xe/xe_gsc_proxy.c
> index 2d6ea8c01445..6d89c22ae811 100644
> --- a/drivers/gpu/drm/xe/xe_gsc_proxy.c
> +++ b/drivers/gpu/drm/xe/xe_gsc_proxy.c
> @@ -65,7 +65,7 @@ gsc_to_gt(struct xe_gsc *gsc)
>  bool xe_gsc_proxy_init_done(struct xe_gsc *gsc)
>  {
>  	struct xe_gt *gt = gsc_to_gt(gsc);
> -	u32 fwsts1 = xe_mmio_read32(gt, HECI_FWSTS1(MTL_GSC_HECI1_BASE));
> +	u32 fwsts1 = xe_mmio_read32(&gt->mmio, HECI_FWSTS1(MTL_GSC_HECI1_BASE));
>  
>  	return REG_FIELD_GET(HECI1_FWSTS1_CURRENT_STATE, fwsts1) ==
>  	       HECI1_FWSTS1_PROXY_STATE_NORMAL;
> @@ -78,7 +78,7 @@ static void __gsc_proxy_irq_rmw(struct xe_gsc *gsc, u32 clr, u32 set)
>  	/* make sure we never accidentally write the RST bit */
>  	clr |= HECI_H_CSR_RST;
>  
> -	xe_mmio_rmw32(gt, HECI_H_CSR(MTL_GSC_HECI2_BASE), clr, set);
> +	xe_mmio_rmw32(&gt->mmio, HECI_H_CSR(MTL_GSC_HECI2_BASE), clr, set);
>  }
>  
>  static void gsc_proxy_irq_clear(struct xe_gsc *gsc)
> -- 
> 2.45.2
>