[Intel-gfx] [PATCH 6/9] drm/i915/uc: Move xfer rsa logic to common function

[Chris Wilson]

Quoting Daniele Ceraolo Spurio (2019-07-23 00:20:45)
> The way we copy the RSA is the same for GuC and HuC, so we can move the
> logic in a common function. this will also make any update needed for
> local memory easier.
> 
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>
> ---
>  drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 5 +----
>  drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 9 +++------
>  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c  | 9 +++++++++
>  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h  | 1 +
>  4 files changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
> index 86df5147fc0a..8439a1fcfaae 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
> @@ -106,13 +106,10 @@ static void guc_prepare_xfer(struct intel_guc *guc)
>  static void guc_xfer_rsa(struct intel_guc *guc)
>  {
>         struct intel_uncore *uncore = guc_to_gt(guc)->uncore;
> -       struct intel_uc_fw *fw = &guc->fw;
> -       struct sg_table *pages = fw->obj->mm.pages;
>         u32 rsa[UOS_RSA_SCRATCH_COUNT];
>         int i;
>  
> -       sg_pcopy_to_buffer(pages->sgl, pages->nents,
> -                          rsa, sizeof(rsa), fw->rsa_offset);
> +       intel_uc_fw_copy_rsa(&guc->fw, rsa, sizeof(rsa));

Return num_bytes copied?
GEM_BUG_ON(i < sizeof(rsa)) ?

>  
>         for (i = 0; i < UOS_RSA_SCRATCH_COUNT; i++)
>                 intel_uncore_write(uncore, UOS_RSA_SCRATCH(i), rsa[i]);
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> index 263977294ef0..f200f6d49e60 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -64,17 +64,14 @@ void intel_huc_fw_init_early(struct intel_huc *huc)
>  
>  static void huc_xfer_rsa(struct intel_huc *huc)
>  {
> -       struct intel_uc_fw *fw = &huc->fw;
> -       struct sg_table *pages = fw->obj->mm.pages;
> -
>         /*
>          * HuC firmware image is outside GuC accessible range.
>          * Copy the RSA signature out of the image into
>          * the perma-pinned region set aside for it
>          */
> -       sg_pcopy_to_buffer(pages->sgl, pages->nents,
> -                          huc->rsa_data_vaddr, fw->rsa_size,
> -                          fw->rsa_offset);
> +       GEM_BUG_ON(huc->fw.rsa_size > huc->rsa_data->size);
> +       intel_uc_fw_copy_rsa(&huc->fw, huc->rsa_data_vaddr,
> +                            huc->rsa_data->size);
>  }
>  
>  static int huc_xfer_ucode(struct intel_huc *huc)
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 91b1d9663481..3bf68285493b 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -365,6 +365,15 @@ void intel_uc_fw_cleanup_fetch(struct intel_uc_fw *uc_fw)
>         uc_fw->status = INTEL_UC_FIRMWARE_SELECTION_DONE;
>  }
>  
> +void intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len)
> +{
> +       struct sg_table *pages = uc_fw->obj->mm.pages;
> +       u32 size = min_t(u32, uc_fw->rsa_size, max_len);
> +
> +       sg_pcopy_to_buffer(pages->sgl, pages->nents,
> +                          dst, size, uc_fw->rsa_offset);

return sg_pcopy_to_buffer(pages->sgl, pages->nents,
			  dst, size, uc_fw->rsa_offset);

Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>
-Chris