[v2,4/8] drm/i915/uc: Move xfer rsa logic to common function
diff mbox series

Message ID 20190724022153.8927-5-daniele.ceraolospurio@intel.com
State New
Headers show
Series
  • uC fw path unification + misc clean-up
Related show

Commit Message

Daniele Ceraolo Spurio July 24, 2019, 2:21 a.m. UTC
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.

v2: return the number of copied bytes and check it (Chris)

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c |  7 +++----
 drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 10 +++++-----
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c  | 18 ++++++++++++++++++
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h  |  1 +
 4 files changed, 27 insertions(+), 9 deletions(-)

Comments

Michal Wajdeczko July 24, 2019, 12:46 p.m. UTC | #1
On Wed, 24 Jul 2019 04:21:49 +0200, Daniele Ceraolo Spurio  
<daniele.ceraolospurio@intel.com> wrote:

> 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.
>
> v2: return the number of copied bytes and check it (Chris)
>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> #v1

Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
with small nit below

> ---
>  drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c |  7 +++----
>  drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 10 +++++-----
>  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c  | 18 ++++++++++++++++++
>  drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h  |  1 +
>  4 files changed, 27 insertions(+), 9 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 085e7842ef8a..09b0ff2bd256 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
> @@ -77,13 +77,12 @@ 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];
> +	size_t copied;
>  	int i;
> -	sg_pcopy_to_buffer(pages->sgl, pages->nents,
> -			   rsa, sizeof(rsa), fw->rsa_offset);
> +	copied = intel_uc_fw_copy_rsa(&guc->fw, rsa, sizeof(rsa));
> +	GEM_BUG_ON(copied < 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 fa2151fa3a13..8f119ff291fa 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
> @@ -38,17 +38,17 @@ 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;
> +	size_t copied;
> 	/*
>  	 * 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);
> +	copied = intel_uc_fw_copy_rsa(&huc->fw, huc->rsa_data_vaddr,
> +				      huc->rsa_data->size);
> +	GEM_BUG_ON(copied < huc->fw.rsa_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 9fc72c2e50d1..909a8196f9d4 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -462,6 +462,24 @@ void intel_uc_fw_cleanup_fetch(struct intel_uc_fw  
> *uc_fw)
>  	uc_fw->status = INTEL_UC_FIRMWARE_SELECTION_DONE;
>  }
> +/**
> + * intel_uc_fw_copy_rsa - copy fw RSA to buffer
> + *
> + * @uc_fw: uC firmware
> + * @dst: dst buffer
> + * @max_len: max number of bytes to copy
> + *
> + * Return: number of copied bytes.
> + */
> +size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32  
> max_len)

did you check if maybe inline would generate better code?

> +{
> +	struct sg_table *pages = uc_fw->obj->mm.pages;
> +	u32 size = min_t(u32, uc_fw->rsa_size, max_len);
> +

nit:
	GEM_BUG_ON(!uc_fw_is_available(uc_fw));

> +	return sg_pcopy_to_buffer(pages->sgl, pages->nents,
> +				  dst, size, uc_fw->rsa_offset);
> +}
> +
>  /**
>   * intel_uc_fw_dump - dump information about uC firmware
>   * @uc_fw: uC firmware
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h  
> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> index ecdec4320260..572b7873fe19 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
> @@ -177,6 +177,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
>  int intel_uc_fw_init(struct intel_uc_fw *uc_fw);
>  void intel_uc_fw_fini(struct intel_uc_fw *uc_fw);
>  u32 intel_uc_fw_ggtt_offset(struct intel_uc_fw *uc_fw);
> +size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32  
> max_len);
>  void intel_uc_fw_dump(const struct intel_uc_fw *uc_fw, struct  
> drm_printer *p);
> #endif

Patch
diff mbox series

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 085e7842ef8a..09b0ff2bd256 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
@@ -77,13 +77,12 @@  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];
+	size_t copied;
 	int i;
 
-	sg_pcopy_to_buffer(pages->sgl, pages->nents,
-			   rsa, sizeof(rsa), fw->rsa_offset);
+	copied = intel_uc_fw_copy_rsa(&guc->fw, rsa, sizeof(rsa));
+	GEM_BUG_ON(copied < 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 fa2151fa3a13..8f119ff291fa 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c
@@ -38,17 +38,17 @@  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;
+	size_t copied;
 
 	/*
 	 * 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);
+	copied = intel_uc_fw_copy_rsa(&huc->fw, huc->rsa_data_vaddr,
+				      huc->rsa_data->size);
+	GEM_BUG_ON(copied < huc->fw.rsa_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 9fc72c2e50d1..909a8196f9d4 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -462,6 +462,24 @@  void intel_uc_fw_cleanup_fetch(struct intel_uc_fw *uc_fw)
 	uc_fw->status = INTEL_UC_FIRMWARE_SELECTION_DONE;
 }
 
+/**
+ * intel_uc_fw_copy_rsa - copy fw RSA to buffer
+ *
+ * @uc_fw: uC firmware
+ * @dst: dst buffer
+ * @max_len: max number of bytes to copy
+ *
+ * Return: number of copied bytes.
+ */
+size_t 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);
+
+	return sg_pcopy_to_buffer(pages->sgl, pages->nents,
+				  dst, size, uc_fw->rsa_offset);
+}
+
 /**
  * intel_uc_fw_dump - dump information about uC firmware
  * @uc_fw: uC firmware
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
index ecdec4320260..572b7873fe19 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h
@@ -177,6 +177,7 @@  int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
 int intel_uc_fw_init(struct intel_uc_fw *uc_fw);
 void intel_uc_fw_fini(struct intel_uc_fw *uc_fw);
 u32 intel_uc_fw_ggtt_offset(struct intel_uc_fw *uc_fw);
+size_t intel_uc_fw_copy_rsa(struct intel_uc_fw *uc_fw, void *dst, u32 max_len);
 void intel_uc_fw_dump(const struct intel_uc_fw *uc_fw, struct drm_printer *p);
 
 #endif