HuC Loading Patches
Subsystems (3)
cover HuC Loading Patches
These patches add HuC loading support. The driver builds a frame level workload which is stored in the graphics memory. This workload is presented to HuC for processing. The driver, therefore should first determine if the HuC is enabled and also read the huC athentication status bit to determine if HuC was successfully loaded. The GuC is required to authenticate the HuC. The userspace patches that check for a fully loaded HuC firmware and use it can be found at:
https://lists.freedesktop.org/archives/libva/2016-September/004554.html
https://lists.freedesktop.org/archives/libva/2016-September/004555.html
More information regarding the HuC, batch commands that configure the HuC etc can be found at-
https://01.org/sites/default/files/documentation/intel-gfx-prm-osrc-skl-vol02a-commandreference-instructions-huc.pdf
https://www.x.org/docs/intel/CHV/intel-gfx-prm-osrc-chv-bsw-vol10-hevc.pdf
v2: rebased.
v3: rebased. Changed the code following the review comments.
v4: Added action_lock initialization fix provided by Arek (Hiler Arkadiusz) to the first patch in the series- Make the GuC fw loading helper functions general.
v5: rebased on top of drm-tip. The patch series is now in sync with GuC code reorganization efforts by Arek-
https://patchwork.freedesktop.org/series/15896/
v6:rebased. Organize code. Move contents of intel_huc.h to intel_uc.h. Update function intel_huc_load(),intel_huc_init() and intel_uc_fw_fetch() to accept dev_priv instead of dev.
v7: rebased. Remove intel_is_huc_valid() since it is called onoly once. Refactor the code to reduce redundency. Remove fiels like uc_dev which are no longer used.
v8: rebased. Beautify the code- remove comments that no longer hold good, add newlines etc.
Anusha Srivatsa (3):
drm/i915/huc: Add HuC fw loading support
drm/i915/huc: Add BXT HuC Loading Support
drm/i915/HuC: Add KBL huC loading Support
Peter Antoine (5):
drm/i915/guc: Make the GuC fw loading helper functions general drm/i915/huc: Unified css_header struct for GuC and HuC drm/i915/huc: Add debugfs for HuC loading status check drm/i915/huc: Support HuC authentication drm/i915/get_params: Add HuC status to getparams
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 43 ++++- drivers/gpu/drm/i915/i915_drv.c | 11 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_guc_fwif.h | 24 ++- drivers/gpu/drm/i915/intel_guc_loader.c | 200 +++++++++++--------- drivers/gpu/drm/i915/intel_huc_loader.c | 286 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.c | 62 +++++++ drivers/gpu/drm/i915/intel_uc.h | 63 +++++-- include/uapi/drm/i915_drm.h | 1 + 12 files changed, 577 insertions(+), 124 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc_loader.c
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/8 drm/i915/guc: Make the GuC fw loading helper functions general
From: Peter Antoine <[email protected]>
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/g
Struct intel_guc_fw is renamed to intel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.
v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.
v4: removed G from messages in shared fw fetch function.
v5: rebased.
v7: rebased.
v8: rebased.
v9: rebased.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip
v13: rebased.Updated dev to dev_priv in intel_guc_setup(), guc_fw_getch() and intel_guc_init().
v14: rebased. Remove uint32_t fw_type to patch 2. Add INTEL_ prefix for fields in enum intel_uc_fw_status. Remove uc_dev field since its never used.Rename uc_fw to just fw and guc_fw to fw to avoid redundency.
v15: rebased. Remove sections of code that were commented and no longer required.
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 156 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_uc.h | 36 +++---- 4 files changed, 104 insertions(+), 104 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -2328,7 +2328,7 @@ static int i915_llc(struct seq_file *m, void *data)static int i915_guc_load_status_info (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv))
@@ -2336,15 +2336,15 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)seq_printf (m,"GuC firmware status:\n" );seq_printf (m,"\tpath: %s\n" , - guc_fw->guc_fw_path); + guc_fw->uc_fw_path);seq_printf (m,"\tfetch: %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status));seq_printf (m,"\tload: %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->load_status));seq_printf (m,"\tversion wanted: %d.%d\n" , - guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted); + guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found); + guc_fw->major_ver_found, guc_fw->minor_ver_found);seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n",
drivers/gpu/drm/i915/i915_guc_submission.c +2 -2
@@ -1484,7 +1484,7 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ;gen9_disable_guc_interrupts (dev_priv);
@@ -1511,7 +1511,7 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ;if (i915.guc_log_level >=0 )
drivers/gpu/drm/i915/intel_guc_loader.c +78 -78
341 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +18 -18
@@ -91,28 +91,28 @@ struct i915_guc_client {uint64_t submissions[I915_NUM_ENGINES ]; }; -enum intel_guc_fw_status { -GUC_FIRMWARE_FAIL =-1 , -GUC_FIRMWARE_NONE =0 , -GUC_FIRMWARE_PENDING , -GUC_FIRMWARE_SUCCESS +enum intel_uc_fw_status { +INTEL_UC_FIRMWARE_FAIL =-1 , +INTEL_UC_FIRMWARE_NONE =0 , +INTEL_UC_FIRMWARE_PENDING , +INTEL_UC_FIRMWARE_SUCCESS };/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC. */ -struct intel_guc_fw { -const char * guc_fw_path; -size_t guc_fw_size; -struct drm_i915_gem_object * guc_fw_obj; -enum intel_guc_fw_status guc_fw_fetch_status; -enum intel_guc_fw_status guc_fw_load_status; - -uint16_t guc_fw_major_wanted; -uint16_t guc_fw_minor_wanted; -uint16_t guc_fw_major_found; -uint16_t guc_fw_minor_found; +struct intel_uc_fw { +const char *uc_fw_path; +size_t size; +struct drm_i915_gem_object *uc_fw_obj; +enum intel_uc_fw_status fetch_status; +enum intel_uc_fw_status load_status; + +uint16_t major_ver_wanted; +uint16_t minor_ver_wanted; +uint16_t major_ver_found; +uint16_t minor_ver_found;uint32_t header_size;uint32_t header_offset;
@@ -139,7 +139,7 @@ struct intel_guc_log { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw fw;struct intel_guc_log log;/* intel_guc_recv interrupt related state */
@@ -181,7 +181,7 @@ int intel_guc_log_control(struct intel_guc *guc, u32 control_val);extern void intel_guc_init (struct drm_i915_private *dev_priv);extern int intel_guc_setup (struct drm_i915_private *dev_priv);extern void intel_guc_fini (struct drm_i915_private *dev_priv); -extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); +extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);extern int intel_guc_suspend (struct drm_i915_private *dev_priv);extern int intel_guc_resume (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions general
Quoted 30 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.
v4: removed G from messages in shared fw fetch function.
v5: rebased.
v7: rebased.
v8: rebased.
v9: rebased.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip
v13: rebased.Updated dev todev_privinintel_guc_setup(),guc_fw_getch()andintel_guc_init().
v14: rebased. Removeuint32_tfw_typeto patch 2. AddINTEL_prefix for fields in enumintel_uc_fw_status. Removeuc_devfield since its never used.Renameuc_fwto just fw andguc_fwto fw to avoid redundency.
v15: rebased. Remove sections of code that were commented and no longer required.
Quoted 3 lines
Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions general
In reply to Anusha SrivatsaQuoted 485 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.
v4: removed G from messages in shared fw fetch function.
v5: rebased.
v7: rebased.
v8: rebased.
v9: rebased.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip
v13: rebased.Updated dev todev_privinintel_guc_setup(),guc_fw_getch()andintel_guc_init().
v14: rebased. Removeuint32_tfw_typeto patch 2. AddINTEL_prefix for fields in enumintel_uc_fw_status. Removeuc_devfield since its never used.Renameuc_fwto just fw andguc_fwto fw to avoid redundency.
v15: rebased. Remove sections of code that were commented and no longer required.Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 156 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_uc.h | 36 +++---- 4 files changed, 104 insertions(+), 104 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-6@@ -2328,7 +2328,7 @@ static int i915_llc(struct seq_file *m, void *data)static int i915_guc_load_status_info (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv))@@ -2336,15 +2336,15 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)seq_printf (m,"GuC firmware status:\n" );seq_printf (m,"\tpath: %s\n" , - guc_fw->guc_fw_path); + guc_fw->uc_fw_path);seq_printf (m,"\tfetch: %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status));seq_printf (m,"\tload: %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->load_status));seq_printf (m,"\tversion wanted: %d.%d\n" , - guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted); + guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found); + guc_fw->major_ver_found, guc_fw->minor_ver_found);seq_printf (m,"\theader: offset is %d; size = %d\n" , guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n",drivers/gpu/drm/i915/i915_guc_submission.c +2
-2@@ -1484,7 +1484,7 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ;gen9_disable_guc_interrupts (dev_priv);@@ -1511,7 +1511,7 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ;if (i915.guc_log_level >=0 )drivers/gpu/drm/i915/intel_guc_loader.c +78
-78@@ -81,16 +81,16 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);MODULE_FIRMWARE (I915_KBL_GUC_UCODE );/* User-friendly representation of an enum */ -const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status) +const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status) {switch (status) { -case GUC_FIRMWARE_FAIL : +case INTEL_UC_FIRMWARE_FAIL :return "FAIL" ; -case GUC_FIRMWARE_NONE : +case INTEL_UC_FIRMWARE_NONE :return "NONE" ; -case GUC_FIRMWARE_PENDING : +case INTEL_UC_FIRMWARE_PENDING :return "PENDING" ; -case GUC_FIRMWARE_SUCCESS : +case INTEL_UC_FIRMWARE_SUCCESS :return "SUCCESS" ;default :return "UNKNOWN!" ;@@ -278,7 +278,7 @@ static inline bool guc_ucode_response(struct drm_i915_private *dev_priv,static int guc_ucode_xfer_dma (struct drm_i915_private *dev_priv,struct i915_vma *vma) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;unsigned long offset;struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];@@ -350,17 +350,17 @@ static u32 guc_wopcm_size(struct drm_i915_private *dev_priv)*/ static int guc_ucode_xfer (struct drm_i915_private *dev_priv) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;struct i915_vma *vma;int ret; - ret =i915_gem_object_set_to_gtt_domain (guc_fw->guc_fw_obj, false); + ret =i915_gem_object_set_to_gtt_domain (guc_fw->uc_fw_obj, false);if (ret) {DRM_DEBUG_DRIVER ("set-domain failed %d\n" , ret);return ret; } - vma =i915_gem_object_ggtt_pin (guc_fw->guc_fw_obj,NULL ,0 ,0 ,0 ); + vma =i915_gem_object_ggtt_pin (guc_fw->uc_fw_obj,NULL ,0 ,0 ,0 );if (IS_ERR (vma)) {DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma));return PTR_ERR (vma);@@ -450,14 +450,14 @@ static int guc_hw_reset(struct drm_i915_private *dev_priv)*/ int intel_guc_setup (struct drm_i915_private *dev_priv) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; -const char *fw_path = guc_fw->guc_fw_path; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; +const char *fw_path = guc_fw->uc_fw_path;int retries, ret, err;DRM_DEBUG_DRIVER ("GuC fw status: path %s, fetch %s, load %s\n" , fw_path, -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status), -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status), +intel_uc_fw_status_repr (guc_fw->load_status));/* Loading forbidden, or no firmware to load? */ if (!i915.enable_guc_loading) {@@ -475,10 +475,10 @@ int intel_guc_setup(struct drm_i915_private *dev_priv) }/* Fetch failed, or already fetched but failed to load? */ -if (guc_fw->guc_fw_fetch_status !=GUC_FIRMWARE_SUCCESS ) { +if (guc_fw->fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) { err = -EIO ; goto fail; - }else if (guc_fw->guc_fw_load_status ==GUC_FIRMWARE_FAIL ) { + }else if (guc_fw->load_status ==INTEL_UC_FIRMWARE_FAIL ) { err = -ENOEXEC ; goto fail; }@@ -486,11 +486,11 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)guc_interrupts_release (dev_priv);gen9_reset_guc_interrupts (dev_priv); - guc_fw->guc_fw_load_status =GUC_FIRMWARE_PENDING ; + guc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC fw status: fetch %s, load %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status), -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status), +intel_uc_fw_status_repr (guc_fw->load_status)); err =i915_guc_submission_init (dev_priv);if (err)@@ -522,11 +522,11 @@ int intel_guc_setup(struct drm_i915_private *dev_priv) "retry %d more time(s)\n", err, retries); } - guc_fw->guc_fw_load_status =GUC_FIRMWARE_SUCCESS ; + guc_fw->load_status =INTEL_UC_FIRMWARE_SUCCESS ;DRM_DEBUG_DRIVER ("GuC fw status: fetch %s, load %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status), -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status), +intel_uc_fw_status_repr (guc_fw->load_status));if (i915.enable_guc_submission) {if (i915.guc_log_level >=0 )@@ -541,8 +541,8 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)return 0 ; fail: -if (guc_fw->guc_fw_load_status ==GUC_FIRMWARE_PENDING ) - guc_fw->guc_fw_load_status =GUC_FIRMWARE_FAIL ; +if (guc_fw->load_status ==INTEL_UC_FIRMWARE_PENDING ) + guc_fw->load_status =INTEL_UC_FIRMWARE_FAIL ;guc_interrupts_release (dev_priv);i915_guc_submission_disable (dev_priv);@@ -587,8 +587,8 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)return ret; } -static void guc_fw_fetch (struct drm_i915_private *dev_priv, -struct intel_guc_fw *guc_fw) +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw) {struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_gem_object *obj;@@ -597,17 +597,17 @@ static void guc_fw_fetch(struct drm_i915_private *dev_priv,size_t size;int err; -DRM_DEBUG_DRIVER ("before requesting firmware: GuC fw fetch status %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status)); +DRM_DEBUG_DRIVER ("before requesting firmware: uC fw fetch status %s\n" , +intel_uc_fw_status_repr (uc_fw->fetch_status)); - err =request_firmware (&fw, guc_fw->guc_fw_path, &pdev->dev); + err =request_firmware (&fw, uc_fw->uc_fw_path, &pdev->dev);if (err) goto fail;if (!fw) goto fail; -DRM_DEBUG_DRIVER ("fetch GuC fw from %s succeeded, fw %p\n" , - guc_fw->guc_fw_path, fw); +DRM_DEBUG_DRIVER ("fetch uC fw from %s succeeded, fw %p\n" , + uc_fw->uc_fw_path, fw);/* Check the size of the blob before examining buffer contents */ if (fw->size <sizeof (struct guc_css_header )) {@@ -618,36 +618,36 @@ static void guc_fw_fetch(struct drm_i915_private *dev_priv, css = (struct guc_css_header *)fw->data;/* Firmware bits always start from header */ - guc_fw->header_offset =0 ; - guc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - + uc_fw->header_offset =0 ; + uc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - css->key_size_dw - css->exponent_size_dw) *sizeof (u32); -if (guc_fw->header_size !=sizeof (struct guc_css_header )) { +if (uc_fw->header_size !=sizeof (struct guc_css_header )) {DRM_NOTE ("CSS header definition mismatch\n" ); goto fail; }/* then, uCode */ - guc_fw->ucode_offset = guc_fw->header_offset + guc_fw->header_size; - guc_fw->ucode_size = (css->size_dw - css->header_size_dw) *sizeof (u32); + uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size; + uc_fw->ucode_size = (css->size_dw - css->header_size_dw) *sizeof (u32);/* now RSA */ if (css->key_size_dw !=UOS_RSA_SCRATCH_MAX_COUNT ) {DRM_NOTE ("RSA key size is bad\n" ); goto fail; } - guc_fw->rsa_offset = guc_fw->ucode_offset + guc_fw->ucode_size; - guc_fw->rsa_size = css->key_size_dw *sizeof (u32); + uc_fw->rsa_offset = uc_fw->ucode_offset + uc_fw->ucode_size; + uc_fw->rsa_size = css->key_size_dw *sizeof (u32);/* At least, it should have header, uCode and RSA. Size of all three. */ - size = guc_fw->header_size + guc_fw->ucode_size + guc_fw->rsa_size; + size = uc_fw->header_size + uc_fw->ucode_size + uc_fw->rsa_size;if (fw->size < size) {DRM_NOTE ("Missing firmware components\n" ); goto fail; }/* Header and uCode will be loaded to WOPCM. Size of the two. */ - size = guc_fw->header_size + guc_fw->ucode_size; + size = uc_fw->header_size + uc_fw->ucode_size;if (size >guc_wopcm_size (dev_priv)) {DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); goto fail;@@ -659,21 +659,21 @@ static void guc_fw_fetch(struct drm_i915_private *dev_priv,* TWO bytes each (i.e. u16), although all pointers and offsets are defined * in terms of bytes (u8). */ - guc_fw->guc_fw_major_found = css->guc_sw_version >>16 ; - guc_fw->guc_fw_minor_found = css->guc_sw_version &0xFFFF ; - -if (guc_fw->guc_fw_major_found != guc_fw->guc_fw_major_wanted || - guc_fw->guc_fw_minor_found < guc_fw->guc_fw_minor_wanted) { -DRM_NOTE ("GuC firmware version %d.%d, required %d.%d\n" , - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found, - guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted); + uc_fw->major_ver_found = css->guc_sw_version >>16 ; + uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; + +if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || + uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { +DRM_NOTE ("uC firmware version %d.%d, required %d.%d\n" , + uc_fw->major_ver_found, uc_fw->minor_ver_found, + uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); err = -ENOEXEC ; goto fail; }DRM_DEBUG_DRIVER ("firmware version %d.%d OK (minimum %d.%d)\n" , - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found, - guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted); + uc_fw->major_ver_found, uc_fw->minor_ver_found, + uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);mutex_lock (&dev_priv->drm.struct_mutex); obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size);@@ -683,31 +683,31 @@ static void guc_fw_fetch(struct drm_i915_private *dev_priv, goto fail; } - guc_fw->guc_fw_obj = obj; - guc_fw->guc_fw_size = fw->size; + uc_fw->uc_fw_obj = obj; + uc_fw->size = fw->size; -DRM_DEBUG_DRIVER ("GuC fw fetch status SUCCESS, obj %p\n" , - guc_fw->guc_fw_obj); +DRM_DEBUG_DRIVER ("uC fw fetch status SUCCESS, obj %p\n" , + uc_fw->uc_fw_obj);release_firmware (fw); - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_SUCCESS ; + uc_fw->fetch_status =INTEL_UC_FIRMWARE_SUCCESS ;return ; fail: -DRM_WARN ("Failed to fetch valid GuC firmware from %s (error %d)\n" , - guc_fw->guc_fw_path, err); -DRM_DEBUG_DRIVER ("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n" , - err, fw, guc_fw->guc_fw_obj); +DRM_WARN ("Failed to fetch valid uC firmware from %s (error %d)\n" , + uc_fw->uc_fw_path, err); +DRM_DEBUG_DRIVER ("uC fw fetch status FAIL; err %d, fw %p, obj %p\n" , + err, fw, uc_fw->uc_fw_obj);mutex_lock (&dev_priv->drm.struct_mutex); - obj = guc_fw->guc_fw_obj; + obj = uc_fw->uc_fw_obj;if (obj)i915_gem_object_put (obj); - guc_fw->guc_fw_obj =NULL ; + uc_fw->uc_fw_obj =NULL ;mutex_unlock (&dev_priv->drm.struct_mutex);release_firmware (fw);/* OK even if fw is NULL */ - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_FAIL ; + uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; }/** @@ -721,7 +721,7 @@ static void guc_fw_fetch(struct drm_i915_private *dev_priv,*/ void intel_guc_init (struct drm_i915_private *dev_priv) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;const char *fw_path;if (!HAS_GUC (dev_priv)) {@@ -739,23 +739,23 @@ void intel_guc_init(struct drm_i915_private *dev_priv) fw_path =NULL ; }else if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =SKL_FW_MAJOR ; - guc_fw->guc_fw_minor_wanted =SKL_FW_MINOR ; + guc_fw->major_ver_wanted =SKL_FW_MAJOR ; + guc_fw->minor_ver_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =BXT_FW_MAJOR ; - guc_fw->guc_fw_minor_wanted =BXT_FW_MINOR ; + guc_fw->major_ver_wanted =BXT_FW_MAJOR ; + guc_fw->minor_ver_wanted =BXT_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { fw_path =I915_KBL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =KBL_FW_MAJOR ; - guc_fw->guc_fw_minor_wanted =KBL_FW_MINOR ; + guc_fw->major_ver_wanted =KBL_FW_MAJOR ; + guc_fw->minor_ver_wanted =KBL_FW_MINOR ; }else { fw_path ="" ;/* unknown device */ } - guc_fw->guc_fw_path = fw_path; - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_NONE ; - guc_fw->guc_fw_load_status =GUC_FIRMWARE_NONE ; + guc_fw->uc_fw_path = fw_path; + guc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; + guc_fw->load_status =INTEL_UC_FIRMWARE_NONE ;/* Early (and silent) return if GuC loading is disabled */ if (!i915.enable_guc_loading)@@ -765,9 +765,9 @@ void intel_guc_init(struct drm_i915_private *dev_priv)if (*fw_path =='\0' )return ; - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_PENDING ; + guc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -guc_fw_fetch (dev_priv, guc_fw); +intel_uc_fw_fetch (dev_priv, guc_fw);/* status must now be FAIL or SUCCESS */ }@@ -777,17 +777,17 @@ void intel_guc_init(struct drm_i915_private *dev_priv)*/ void intel_guc_fini (struct drm_i915_private *dev_priv) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;mutex_lock (&dev_priv->drm.struct_mutex);guc_interrupts_release (dev_priv);i915_guc_submission_disable (dev_priv);i915_guc_submission_fini (dev_priv); -if (guc_fw->guc_fw_obj) -i915_gem_object_put (guc_fw->guc_fw_obj); - guc_fw->guc_fw_obj =NULL ; +if (guc_fw->uc_fw_obj) +i915_gem_object_put (guc_fw->uc_fw_obj); + guc_fw->uc_fw_obj =NULL ;mutex_unlock (&dev_priv->drm.struct_mutex); - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_NONE ; + guc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; }drivers/gpu/drm/i915/intel_uc.h +5
-8@@ -91,28 +91,28 @@ struct i915_guc_client {uint64_t submissions[I915_NUM_ENGINES ]; }; -enum intel_guc_fw_status { -GUC_FIRMWARE_FAIL =-1 , -GUC_FIRMWARE_NONE =0 , -GUC_FIRMWARE_PENDING , -GUC_FIRMWARE_SUCCESS +enum intel_uc_fw_status { +INTEL_UC_FIRMWARE_FAIL =-1 , +INTEL_UC_FIRMWARE_NONE =0 , +INTEL_UC_FIRMWARE_PENDING , +INTEL_UC_FIRMWARE_SUCCESS };/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC. */ -struct intel_guc_fw { -const char * guc_fw_path; -size_t guc_fw_size;
drivers/gpu/drm/i915/intel_uc.h struct i915_guc_client { · line 106
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.h +2
-8-struct drm_i915_gem_object * guc_fw_obj; -enum intel_guc_fw_status guc_fw_fetch_status; -enum intel_guc_fw_status guc_fw_load_status; - -uint16_t guc_fw_major_wanted; -uint16_t guc_fw_minor_wanted; -uint16_t guc_fw_major_found; -uint16_t guc_fw_minor_found; +struct intel_uc_fw { +const char *uc_fw_path;
Can we drop "uc_fw_" prefix also from path and obj members?
Michal
Quoted 37 lines
drivers/gpu/drm/i915/intel_uc.h +11
-2+size_t size; +struct drm_i915_gem_object *uc_fw_obj; +enum intel_uc_fw_status fetch_status; +enum intel_uc_fw_status load_status; + +uint16_t major_ver_wanted; +uint16_t minor_ver_wanted; +uint16_t major_ver_found; +uint16_t minor_ver_found;uint32_t header_size;uint32_t header_offset;@@ -139,7 +139,7 @@ struct intel_guc_log { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw fw;struct intel_guc_log log;/* intel_guc_recv interrupt related state */ @@ -181,7 +181,7 @@ int intel_guc_log_control(struct intel_guc *guc, u32 control_val);extern void intel_guc_init (struct drm_i915_private *dev_priv);extern int intel_guc_setup (struct drm_i915_private *dev_priv);extern void intel_guc_fini (struct drm_i915_private *dev_priv); -extern const char *intel_guc_fw_status_repr (enum intel_guc_fw_status status); +extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);extern int intel_guc_suspend (struct drm_i915_private *dev_priv);extern int intel_guc_resume (struct drm_i915_private *dev_priv);Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions general
Quoted 527 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Tuesday, December 27, 2016 9:28 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions generaldrivers/gpu/drm/i915/i915_guc_submission.c int intel_guc_suspend(struct drm_i915_private
Quoted 83 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.
v4: removed G from messages in shared fw fetch function.
v5: rebased.
v7: rebased.
v8: rebased.
v9: rebased.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip
v13: rebased.Updated dev todev_privinintel_guc_setup(),guc_fw_getch()andintel_guc_init().
v14: rebased. Removeuint32_tfw_typeto patch 2. AddINTEL_prefix for fields in enumintel_uc_fw_status. Removeuc_devfield since its never used.Renameuc_fwto just fw andguc_fwto fw to avoid redundency.
v15: rebased. Remove sections of code that were commented and no longer required.Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 156 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_uc.h | 36 +++---- 4 files changed, 104 insertions(+), 104 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-6@@ -2328,7 +2328,7 @@ static int i915_llc(struct seq_file *m, void *data) static int i915_guc_load_status_info(struct seq_file *m, void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private); -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv))@@ -2336,15 +2336,15 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data)seq_printf (m,"GuC firmware status:\n" );seq_printf (m,"\tpath: %s\n" , - guc_fw->guc_fw_path); + guc_fw->uc_fw_path);seq_printf (m,"\tfetch: %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status));seq_printf (m,"\tload: %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->load_status));seq_printf (m,"\tversion wanted: %d.%d\n" , - guc_fw->guc_fw_major_wanted, guc_fw- guc_fw_minor_wanted); + guc_fw->major_ver_wanted, guc_fw->minor_ver_wanted);seq_printf (m,"\tversion found: %d.%d\n" , - guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found); + guc_fw->major_ver_found, guc_fw->minor_ver_found); seq_printf(m, "\theader: offset is %d; size = %d\n",drivers/gpu/drm/i915/i915_debugfs.c +0
-0guc_fw->header_offset, guc_fw->header_size); seq_printf(m, "\tuCode: offset is %d; size = %d\n", diff --git
a/drivers/gpu/drm/i915/i915_guc_submission.cb/drivers/gpu/drm/i915/i915_guc_submission.c
index 3e20fe2..6e2d403 100644drivers/gpu/drm/i915/i915_guc_submission.c +0
-0@@ -1484,7 +1484,7 @@ int intel_guc_suspend(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/i915_guc_submission.c int intel_guc_resume(struct drm_i915_private
Quoted 9 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1
-1struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ;gen9_disable_guc_interrupts (dev_priv);@@ -1511,7 +1511,7 @@ int intel_guc_resume(struct drm_i915_private
*dev_priv)Quoted 36 lines
drivers/gpu/drm/i915/i915_guc_submission.c +1
-1struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ;if (i915.guc_log_level >=0 )drivers/gpu/drm/i915/intel_guc_loader.c +5
-4@@ -81,16 +81,16 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);MODULE_FIRMWARE (I915_KBL_GUC_UCODE ); /* User-friendly representation of an enum */ -const char *intel_guc_fw_status_repr(enum intel_guc_fw_status status) +const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) {switch (status) { -case GUC_FIRMWARE_FAIL : +case INTEL_UC_FIRMWARE_FAIL :return "FAIL" ; -case GUC_FIRMWARE_NONE : +case INTEL_UC_FIRMWARE_NONE :return "NONE" ; -case GUC_FIRMWARE_PENDING : +case INTEL_UC_FIRMWARE_PENDING :return "PENDING" ; -case GUC_FIRMWARE_SUCCESS : +case INTEL_UC_FIRMWARE_SUCCESS :return "SUCCESS" ;default :return "UNKNOWN!" ;@@ -278,7 +278,7 @@ static inline bool guc_ucode_response(structQuoted 1 line
drm_i915_private*dev_priv, static int guc_ucode_xfer_dma(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static inline bool guc_ucode_response(struct drm_i915_private *dev_priv,
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1struct i915_vma *vma) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;unsigned long offset;struct sg_table *sg = vma->pages; u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT]; @@ -350,17 +350,17@@
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_hw_reset(struct drm_i915_private
Quoted 21 lines
static u32
guc_wopcm_size(struct drm_i915_private *dev_priv)
*/
static intguc_ucode_xfer(struct drm_i915_private *dev_priv){drivers/gpu/drm/i915/intel_guc_loader.c +3
-3-struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;struct i915_vma *vma;int ret; - ret =i915_gem_object_set_to_gtt_domain (guc_fw->guc_fw_obj, false); + ret =i915_gem_object_set_to_gtt_domain (guc_fw->uc_fw_obj, false);if (ret) {DRM_DEBUG_DRIVER ("set-domain failed %d\n" , ret);return ret; } - vma =i915_gem_object_ggtt_pin (guc_fw->guc_fw_obj,NULL ,0 ,0 ,0 ); + vma =i915_gem_object_ggtt_pin (guc_fw->uc_fw_obj,NULL ,0 ,0 ,0 );if (IS_ERR (vma)) {DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma));return PTR_ERR (vma);@@ -450,14 +450,14 @@ static int guc_hw_reset(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_setup(struct drm_i915_private
Quoted 18 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-4*/ int intel_guc_setup (struct drm_i915_private *dev_priv) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; -const char *fw_path = guc_fw->guc_fw_path; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; +const char *fw_path = guc_fw->uc_fw_path;int retries, ret, err;DRM_DEBUG_DRIVER ("GuC fw status: path %s, fetch %s, load %s\n" , fw_path, -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status), -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status), +intel_uc_fw_status_repr (guc_fw->load_status));/* Loading forbidden, or no firmware to load? */ if (!i915.enable_guc_loading) {@@ -475,10 +475,10 @@ int intel_guc_setup(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_setup(struct drm_i915_private
Quoted 13 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-2}/* Fetch failed, or already fetched but failed to load? */ -if (guc_fw->guc_fw_fetch_status !=GUC_FIRMWARE_SUCCESS ) { +if (guc_fw->fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) { err = -EIO ; goto fail; - }else if (guc_fw->guc_fw_load_status ==GUC_FIRMWARE_FAIL ) { + }else if (guc_fw->load_status ==INTEL_UC_FIRMWARE_FAIL ) { err = -ENOEXEC ; goto fail; }@@ -486,11 +486,11 @@ int intel_guc_setup(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_setup(struct drm_i915_private
Quoted 15 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-3guc_interrupts_release (dev_priv);gen9_reset_guc_interrupts (dev_priv); - guc_fw->guc_fw_load_status =GUC_FIRMWARE_PENDING ; + guc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC fw status: fetch %s, load %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status), -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status), +intel_uc_fw_status_repr (guc_fw->load_status)); err =i915_guc_submission_init (dev_priv);if (err)@@ -522,11 +522,11 @@ int intel_guc_setup(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private
Quoted 37 lines
drivers/gpu/drm/i915/intel_guc_loader.c +7
-7"retry %d more time(s)\n", err, retries); } - guc_fw->guc_fw_load_status =GUC_FIRMWARE_SUCCESS ; + guc_fw->load_status =INTEL_UC_FIRMWARE_SUCCESS ;DRM_DEBUG_DRIVER ("GuC fw status: fetch %s, load %s\n" , -intel_guc_fw_status_repr (guc_fw->guc_fw_fetch_status), -intel_guc_fw_status_repr (guc_fw->guc_fw_load_status)); +intel_uc_fw_status_repr (guc_fw->fetch_status), +intel_uc_fw_status_repr (guc_fw->load_status));if (i915.enable_guc_submission) {if (i915.guc_log_level >=0 )@@ -541,8 +541,8 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)return 0 ; fail: -if (guc_fw->guc_fw_load_status ==GUC_FIRMWARE_PENDING ) - guc_fw->guc_fw_load_status =GUC_FIRMWARE_FAIL ; +if (guc_fw->load_status ==INTEL_UC_FIRMWARE_PENDING ) + guc_fw->load_status =INTEL_UC_FIRMWARE_FAIL ;guc_interrupts_release (dev_priv);i915_guc_submission_disable (dev_priv);@@ -587,8 +587,8 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)return ret; } -static void guc_fw_fetch (struct drm_i915_private *dev_priv, -struct intel_guc_fw *guc_fw) +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw) {struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_gem_object *obj;@@ -597,17 +597,17 @@ static void guc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-1size_t size;int err; - DRM_DEBUG_DRIVER("before requesting firmware: GuC fw fetch status%s\n",
drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private · line 600
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1- intel_guc_fw_status_repr(guc_fw->guc_fw_fetch_status)); + DRM_DEBUG_DRIVER("before requesting firmware: uC fw fetch status%s\n",
Quoted 25 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-3+ intel_uc_fw_status_repr(uc_fw->fetch_status)); - err =request_firmware (&fw, guc_fw->guc_fw_path, &pdev->dev); + err =request_firmware (&fw, uc_fw->uc_fw_path, &pdev->dev);if (err) goto fail;if (!fw) goto fail; -DRM_DEBUG_DRIVER ("fetch GuC fw from %s succeeded, fw %p\n" , - guc_fw->guc_fw_path, fw); +DRM_DEBUG_DRIVER ("fetch uC fw from %s succeeded, fw %p\n" , + uc_fw->uc_fw_path, fw);/* Check the size of the blob before examining buffer contents */ if (fw->size < sizeof(struct guc_css_header)) { @@ -618,36 +618,36@@ static void guc_fw_fetch(struct
drm_i915_private*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c +2
-2css = (struct guc_css_header *)fw->data;/* Firmware bits always start from header */ - guc_fw->header_offset =0 ; - guc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - + uc_fw->header_offset =0 ; + uc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - css->key_size_dw - css->exponent_size_dw) *sizeof (u32);drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-3-if (guc_fw->header_size !=sizeof (struct guc_css_header )) { +if (uc_fw->header_size !=sizeof (struct guc_css_header )) {DRM_NOTE ("CSS header definition mismatch\n" ); goto fail; }/* then, uCode */ - guc_fw->ucode_offset = guc_fw->header_offset + guc_fw->header_size; - guc_fw->ucode_size = (css->size_dw - css->header_size_dw) *sizeof(u32);
drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private
Quoted 29 lines
drivers/gpu/drm/i915/intel_guc_loader.c +7
-4+ uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size; + uc_fw->ucode_size = (css->size_dw - css->header_size_dw) * +sizeof (u32);/* now RSA */ if (css->key_size_dw !=UOS_RSA_SCRATCH_MAX_COUNT ) {DRM_NOTE ("RSA key size is bad\n" ); goto fail; } - guc_fw->rsa_offset = guc_fw->ucode_offset + guc_fw->ucode_size; - guc_fw->rsa_size = css->key_size_dw *sizeof (u32); + uc_fw->rsa_offset = uc_fw->ucode_offset + uc_fw->ucode_size; + uc_fw->rsa_size = css->key_size_dw *sizeof (u32);/* At least, it should have header, uCode and RSA. Size of all three. */ - size = guc_fw->header_size + guc_fw->ucode_size + guc_fw->rsa_size; + size = uc_fw->header_size + uc_fw->ucode_size + uc_fw->rsa_size;if (fw->size < size) {DRM_NOTE ("Missing firmware components\n" ); goto fail; }/* Header and uCode will be loaded to WOPCM. Size of the two. */ - size = guc_fw->header_size + guc_fw->ucode_size; + size = uc_fw->header_size + uc_fw->ucode_size;if (size >guc_wopcm_size (dev_priv)) {DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); goto fail;@@ -659,21 +659,21 @@ static void guc_fw_fetch(struct drm_i915_private
*dev_priv,Quoted 17 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-8* TWO bytes each (i.e. u16), although all pointers and offsets are defined * in terms of bytes (u8). */ - guc_fw->guc_fw_major_found = css->guc_sw_version >>16 ; - guc_fw->guc_fw_minor_found = css->guc_sw_version &0xFFFF ; - -if (guc_fw->guc_fw_major_found != guc_fw->guc_fw_major_wanted || - guc_fw->guc_fw_minor_found < guc_fw->guc_fw_minor_wanted) { -DRM_NOTE ("GuC firmware version %d.%d, required %d.%d\n" , - guc_fw->guc_fw_major_found, guc_fw- guc_fw_minor_found, - guc_fw->guc_fw_major_wanted, guc_fw- guc_fw_minor_wanted); + uc_fw->major_ver_found = css->guc_sw_version >>16 ; + uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; + + if (uc_fw->major_ver_found != uc_fw->major_ver_wanted ||drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+ uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { +DRM_NOTE ("uC firmware version %d.%d, required %d.%d\n" , + uc_fw->major_ver_found, uc_fw->minor_ver_found, + uc_fw->major_ver_wanted, uc_fw- minor_ver_wanted); err = -ENOEXEC ; goto fail; } DRM_DEBUG_DRIVER("firmware version %d.%d OK (minimum%d.%d)\n",
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-2- guc_fw->guc_fw_major_found, guc_fw- guc_fw_minor_found, - guc_fw->guc_fw_major_wanted, guc_fw-
guc_fw_minor_wanted);drivers/gpu/drm/i915/intel_guc_loader.c +2
-0+ uc_fw->major_ver_found, uc_fw->minor_ver_found, + uc_fw->major_ver_wanted, uc_fw-
minor_ver_wanted);drivers/gpu/drm/i915/intel_guc_loader.c +0
-0mutex_lock (&dev_priv->drm.struct_mutex); obj = i915_gem_object_create_from_data(dev_priv, fw->data,
fw->size); @@ -683,31 +683,31 @@ static void guc_fw_fetch(struct
drm_i915_private*dev_priv,Quoted 12 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-4goto fail; } - guc_fw->guc_fw_obj = obj; - guc_fw->guc_fw_size = fw->size; + uc_fw->uc_fw_obj = obj; + uc_fw->size = fw->size; -DRM_DEBUG_DRIVER ("GuC fw fetch status SUCCESS, obj %p\n" , - guc_fw->guc_fw_obj); +DRM_DEBUG_DRIVER ("uC fw fetch status SUCCESS, obj %p\n" , + uc_fw->uc_fw_obj);drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-4release_firmware (fw); - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_SUCCESS ; + uc_fw->fetch_status =INTEL_UC_FIRMWARE_SUCCESS ;return ; fail: -DRM_WARN ("Failed to fetch valid GuC firmware from %s (error %d)\n" , - guc_fw->guc_fw_path, err); - DRM_DEBUG_DRIVER("GuC fw fetch status FAIL; err %d, fw %p, obj%p\n",
drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-1- err, fw, guc_fw->guc_fw_obj); +DRM_WARN ("Failed to fetch valid uC firmware from %s (error %d)\n" , + uc_fw->uc_fw_path, err); + DRM_DEBUG_DRIVER("uC fw fetch status FAIL; err %d, fw %p, obj%p\n",
drivers/gpu/drm/i915/intel_guc_loader.c static void guc_fw_fetch(struct drm_i915_private
Quoted 18 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-3+ err, fw, uc_fw->uc_fw_obj);mutex_lock (&dev_priv->drm.struct_mutex); - obj = guc_fw->guc_fw_obj; + obj = uc_fw->uc_fw_obj;if (obj)i915_gem_object_put (obj); - guc_fw->guc_fw_obj =NULL ; + uc_fw->uc_fw_obj =NULL ;mutex_unlock (&dev_priv->drm.struct_mutex);release_firmware (fw);/* OK even if fw is NULL */ - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_FAIL ; + uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; }/** @@ -721,7 +721,7 @@ static void guc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c void intel_guc_init(struct drm_i915_private
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1*/ void intel_guc_init (struct drm_i915_private *dev_priv) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;const char *fw_path;if (!HAS_GUC (dev_priv)) {@@ -739,23 +739,23 @@ void intel_guc_init(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c void intel_guc_init(struct drm_i915_private
Quoted 44 lines
drivers/gpu/drm/i915/intel_guc_loader.c +11
-11fw_path =NULL ; }else if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =SKL_FW_MAJOR ; - guc_fw->guc_fw_minor_wanted =SKL_FW_MINOR ; + guc_fw->major_ver_wanted =SKL_FW_MAJOR ; + guc_fw->minor_ver_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =BXT_FW_MAJOR ; - guc_fw->guc_fw_minor_wanted =BXT_FW_MINOR ; + guc_fw->major_ver_wanted =BXT_FW_MAJOR ; + guc_fw->minor_ver_wanted =BXT_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { fw_path =I915_KBL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =KBL_FW_MAJOR ; - guc_fw->guc_fw_minor_wanted =KBL_FW_MINOR ; + guc_fw->major_ver_wanted =KBL_FW_MAJOR ; + guc_fw->minor_ver_wanted =KBL_FW_MINOR ; }else { fw_path ="" ;/* unknown device */ } - guc_fw->guc_fw_path = fw_path; - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_NONE ; - guc_fw->guc_fw_load_status =GUC_FIRMWARE_NONE ; + guc_fw->uc_fw_path = fw_path; + guc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; + guc_fw->load_status =INTEL_UC_FIRMWARE_NONE ;/* Early (and silent) return if GuC loading is disabled */ if (!i915.enable_guc_loading)@@ -765,9 +765,9 @@ void intel_guc_init(struct drm_i915_private *dev_priv)if (*fw_path =='\0' )return ; - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_PENDING ; + guc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -guc_fw_fetch (dev_priv, guc_fw); +intel_uc_fw_fetch (dev_priv, guc_fw);/* status must now be FAIL or SUCCESS */ }@@ -777,17 +777,17 @@ void intel_guc_init(struct drm_i915_private
*dev_priv)Quoted 51 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5
-5*/ void intel_guc_fini (struct drm_i915_private *dev_priv) { -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;mutex_lock (&dev_priv->drm.struct_mutex);guc_interrupts_release (dev_priv);i915_guc_submission_disable (dev_priv);i915_guc_submission_fini (dev_priv); -if (guc_fw->guc_fw_obj) -i915_gem_object_put (guc_fw->guc_fw_obj); - guc_fw->guc_fw_obj =NULL ; +if (guc_fw->uc_fw_obj) +i915_gem_object_put (guc_fw->uc_fw_obj); + guc_fw->uc_fw_obj =NULL ;mutex_unlock (&dev_priv->drm.struct_mutex); - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_NONE ; + guc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; }(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex 11f5608..893bcec 100644drivers/gpu/drm/i915/intel_uc.h +5
-12@@ -91,28 +91,28 @@ struct i915_guc_client {uint64_t submissions[I915_NUM_ENGINES ]; }; -enum intel_guc_fw_status { -GUC_FIRMWARE_FAIL =-1 , -GUC_FIRMWARE_NONE =0 , -GUC_FIRMWARE_PENDING , -GUC_FIRMWARE_SUCCESS +enum intel_uc_fw_status { +INTEL_UC_FIRMWARE_FAIL =-1 , +INTEL_UC_FIRMWARE_NONE =0 , +INTEL_UC_FIRMWARE_PENDING , +INTEL_UC_FIRMWARE_SUCCESS };/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC. */ -struct intel_guc_fw { -const char * guc_fw_path; -size_t guc_fw_size; -struct drm_i915_gem_object * guc_fw_obj; -enum intel_guc_fw_status guc_fw_fetch_status; -enum intel_guc_fw_status guc_fw_load_status; -
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h struct i915_guc_client { · line 106
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.h +2
-4-uint16_t guc_fw_major_wanted; -uint16_t guc_fw_minor_wanted; -uint16_t guc_fw_major_found; -uint16_t guc_fw_minor_found; +struct intel_uc_fw { +const char *uc_fw_path;Can we drop "
uc_fw_" prefix also from path and obj members?
Michal, you think we can do this change as a part of the guc refactor effort which will happen post this series gets merged? Or do you feel its makes more sense to that we have this change in this series....
Anusha
Quoted 32 lines
Michal
Quoted 30 lines
drivers/gpu/drm/i915/intel_uc.h +10
-1+size_t size; +struct drm_i915_gem_object *uc_fw_obj; +enum intel_uc_fw_status fetch_status; +enum intel_uc_fw_status load_status; + +uint16_t major_ver_wanted; +uint16_t minor_ver_wanted; +uint16_t major_ver_found; +uint16_t minor_ver_found;uint32_t header_size;uint32_t header_offset;@@ -139,7 +139,7 @@ struct intel_guc_log { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw fw;struct intel_guc_log log; /* intel_guc_recv interrupt related state */ @@ -181,7 +181,7 @@ int
intel_guc_log_control(struct intel_guc *guc, u32 control_val); extern voidintel_guc_init(struct drm_i915_private *dev_priv); extern intintel_guc_setup(struct drm_i915_private *dev_priv); extern voidintel_guc_fini(struct drm_i915_private *dev_priv); -extern const char *intel_guc_fw_status_repr(enumintel_guc_fw_statusstatus);drivers/gpu/drm/i915/intel_uc.h +2
-0+extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status +status);extern int intel_guc_suspend (struct drm_i915_private *dev_priv);extern int
intel_guc_resume(struct drm_i915_private *dev_priv);
Quoted 7 lines
Quoted 7 lines
--
2.7.4_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions general
Quoted 52 lines · Anusha
Quoted 52 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Tuesday, December 27, 2016 9:28 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions generalQuoted 40 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.
v4: removed G from messages in shared fw fetch function.
v5: rebased.
v7: rebased.
v8: rebased.
v9: rebased.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip
v13: rebased.Updated dev todev_privinintel_guc_setup(),guc_fw_getch()andintel_guc_init().
v14: rebased. Removeuint32_tfw_typeto patch 2. AddINTEL_prefix for fields in enumintel_uc_fw_status. Removeuc_devfield since its never used.Renameuc_fwto just fw andguc_fwto fw to avoid redundency.
v15: rebased. Remove sections of code that were commented and no longer required.Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 156 ++++++++++++++--------------- drivers/gpu/drm/i915/intel_uc.h | 36 +++---- 4 files changed, 104 insertions(+), 104 deletions(-)
... CUT ...
Quoted 39 lines
Quoted 30 lines
Quoted 30 lines
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex 11f5608..893bcec 100644drivers/gpu/drm/i915/intel_uc.h +5
-12@@ -91,28 +91,28 @@ struct i915_guc_client {uint64_t submissions[I915_NUM_ENGINES ]; }; -enum intel_guc_fw_status { -GUC_FIRMWARE_FAIL =-1 , -GUC_FIRMWARE_NONE =0 , -GUC_FIRMWARE_PENDING , -GUC_FIRMWARE_SUCCESS +enum intel_uc_fw_status { +INTEL_UC_FIRMWARE_FAIL =-1 , +INTEL_UC_FIRMWARE_NONE =0 , +INTEL_UC_FIRMWARE_PENDING , +INTEL_UC_FIRMWARE_SUCCESS };/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC. */ -struct intel_guc_fw { -const char * guc_fw_path; -size_t guc_fw_size; -struct drm_i915_gem_object * guc_fw_obj; -enum intel_guc_fw_status guc_fw_fetch_status; -enum intel_guc_fw_status guc_fw_load_status; -Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h struct i915_guc_client { · line 106
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.h +2
-4-uint16_t guc_fw_major_wanted; -uint16_t guc_fw_minor_wanted; -uint16_t guc_fw_major_found; -uint16_t guc_fw_minor_found; +struct intel_uc_fw { +const char *uc_fw_path;Can we drop "
uc_fw_" prefix also from path and obj members?
Quoted 2 lines
Michal, you think we can do this change as a part of the guc refactor effort which will happen post this series gets merged? Or do you feel its makes more sense to that we have this change in this series....
IMHO we should avoid introducing changes that we already know they are bad and easy to fix.
Number of changes in names shall be minimized to avoid confusion and merge conflicts.
Also relaying on the future refactor effort (that has no known ETA) is not good option, as one can forget to fix it ;)
Thanks,
Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions general
Quoted 112 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Tuesday, January 3, 2017 6:15 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]
Subject: Re: [Intel-gfx] [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions generalQuoted 23 lines · Anusha
Quoted 23 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Tuesday, December 27, 2016 9:28 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 1/8] drm/i915/guc: Make the GuC fw loading helper functions generalQuoted 11 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.Quoted 16 lines
Quoted 8 lines
Quoted 8 lines
v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.
v4: removed G from messages in shared fw fetch function.
v5: rebased.
v7: rebased.
v8: rebased.
v9: rebased.Quoted 8 lines
Quoted 8 lines
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip
v13: rebased.Updated dev todev_privinintel_guc_setup(),guc_fw_getch()andintel_guc_init().
v14: rebased. Removeuint32_tfw_typeto patch 2. AddINTEL_prefix for fields in enumintel_uc_fw_status. Removeuc_devfield since its never used.Renameuc_fwto just fw andguc_fwto fw to avoidredundency.
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
v15: rebased. Remove sections of code that were commented and no longer required.
Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 156 ++++++++++++++---------------
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h | 36 +++---- 4 files changed, 104 insertions(+), 104 deletions(-)... CUT ...
Quoted 39 lines
Quoted 30 lines
Quoted 30 lines
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex 11f5608..893bcec 100644drivers/gpu/drm/i915/intel_uc.h +5
-12@@ -91,28 +91,28 @@ struct i915_guc_client {uint64_t submissions[I915_NUM_ENGINES ]; }; -enum intel_guc_fw_status { -GUC_FIRMWARE_FAIL =-1 , -GUC_FIRMWARE_NONE =0 , -GUC_FIRMWARE_PENDING , -GUC_FIRMWARE_SUCCESS +enum intel_uc_fw_status { +INTEL_UC_FIRMWARE_FAIL =-1 , +INTEL_UC_FIRMWARE_NONE =0 , +INTEL_UC_FIRMWARE_PENDING , +INTEL_UC_FIRMWARE_SUCCESS };/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC. */ -struct intel_guc_fw { -const char * guc_fw_path; -size_t guc_fw_size; -struct drm_i915_gem_object * guc_fw_obj; -enum intel_guc_fw_status guc_fw_fetch_status; -enum intel_guc_fw_status guc_fw_load_status; -Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.h struct i915_guc_client { · line 106
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.h +2
-4-uint16_t guc_fw_major_wanted; -uint16_t guc_fw_minor_wanted; -uint16_t guc_fw_major_found; -uint16_t guc_fw_minor_found; +struct intel_uc_fw { +const char *uc_fw_path;Can we drop "
uc_fw_" prefix also from path and obj members?Quoted 1 line
Michal, you think we can do this change as a part of the guc refactor effort
which will happen post this series gets merged? Or do you feel its makes more sense to that we have this change in this series....
Quoted 1 line
Quoted 6 lines
IMHO we should avoid introducing changes that we already know they are bad and easy to fix.
Number of changes in names shall be minimized to avoid confusion and merge conflicts.
Also relaying on the future refactor effort (that has no known ETA) is not good option, as one can forget to fix it ;)
Sure. :)
Anusha
Quoted 2 lines
Thanks,
Michal
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/8 drm/i915/huc: Unified css_header struct for GuC and HuC
In reply to Anusha SrivatsaFrom: Peter Antoine <[email protected]>
HuC firmware css header has almost exactly same definition as GuC firmware except for the sw_version. Also, add a new member fw_type into intel_uc_fw to indicate what kind of fw it is. So, the loader will pull right sw_version from header.
v2: rebased on-top of drm-intel-nightly
v3: rebased on-top of drm-intel-nightly (again).
v4: rebased + spaces.
v7: rebased.
v8: rebased.
v9: rebased. Rename device_id to guc_branch_client_version, make guc_sw_version a union. <Jeff Mcgee>. Put UC_FW_TYPE_GUC and UC_FW_TYPE_HUC into an enum.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip.
v13: rebased.Update dev to dev_priv in intel_uc_fw_fetch
v14: rebased. Add INTEL_ prefix to an enum. Add fw_type declaration from patch 1.Combine two different unions for huc and guc version, reserved etc into one union with two structs.
v15: rebased.
--- drivers/gpu/drm/i915/intel_guc_fwif.h | 23 ++++++++++++++---- drivers/gpu/drm/i915/intel_guc_loader.c | 41 ++++++++++++++++++++++----------- drivers/gpu/drm/i915/intel_uc.h | 6 +++++ 3 files changed, 53 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_guc_fwif.h +19 -4
@@ -145,7 +145,7 @@* The GuC firmware layout looks like this: * * +-------------------------------+ -* | guc_css_header | +* | uc_css_header | * | | * | contains major/minor version | * +-------------------------------+
@@ -172,9 +172,16 @@* 3. Length info of each component can be found in header, in dwords. * 4. Modulus and exponent key are not required by driver. They may not appear * in fw. So driver will load a truncated firmware in this case. +* +* HuC firmware layout is same as GuC firmware. +* +* HuC firmware css header is different. However, the only difference is where +* the version information is saved. The uc_css_header is unified to support +* both. Driver should get HuC version from uc_css_header.huc_sw_version, while +* uc_css_header.guc_sw_version for GuC. */ -struct guc_css_header { +struct uc_css_header {uint32_t module_type;/* header_size includes all non-uCode bits, including css_header, rsa * key, modulus key and exponent data. */
@@ -205,8 +212,16 @@ struct guc_css_header {char username[8 ];char buildnumber[12 ]; -uint32_t device_id; -uint32_t guc_sw_version; +union { +struct { +uint32_t branch_client_version; +uint32_t sw_version; + } guc; +struct { +uint32_t sw_version; +uint32_t reserved; + } huc; + };uint32_t prod_preprod_fw;uint32_t reserved[12 ];uint32_t header_info;
drivers/gpu/drm/i915/intel_guc_loader.c +28 -13
75 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +6 -0
@@ -98,6 +98,11 @@ enum intel_uc_fw_status { INTEL_UC_FIRMWARE_SUCCESS }; +enum { +INTEL_UC_FW_TYPE_GUC , +INTEL_UC_FW_TYPE_HUC +}; +/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC.
@@ -114,6 +119,7 @@ struct intel_uc_fw {uint16_t major_ver_found;uint16_t minor_ver_found; +uint32_t fw_type;uint32_t header_size;uint32_t header_offset;uint32_t rsa_size;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/8] drm/i915/huc: Unified css_header struct for GuC and HuC
Quoted 183 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
HuC firmware css header has almost exactly same definition as GuC firmware except for the
sw_version. Also, add a new memberfw_typeintointel_uc_fwto indicate what kind of fw it is. So, the loader will pull rightsw_versionfrom header.v2: rebased on-top of drm-intel-nightly
v3: rebased on-top of drm-intel-nightly (again).
v4: rebased + spaces.
v7: rebased.
v8: rebased.
v9: rebased. Renamedevice_idtoguc_branch_client_version, makeguc_sw_versiona union. <Jeff Mcgee>. PutUC_FW_TYPE_GUCandUC_FW_TYPE_HUCinto an enum.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip.
v13: rebased.Update dev todev_privinintel_uc_fw_fetch
v14: rebased. AddINTEL_prefix to an enum. Addfw_typedeclaration from patch 1.Combine two different unions for huc and guc version, reserved etc into one union with two structs.
v15: rebased.Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/intel_guc_fwif.h | 23 ++++++++++++++---- drivers/gpu/drm/i915/intel_guc_loader.c | 41 ++++++++++++++++++++++----------- drivers/gpu/drm/i915/intel_uc.h | 6 +++++ 3 files changed, 53 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_guc_fwif.h +19
-4@@ -145,7 +145,7 @@* The GuC firmware layout looks like this: * * +-------------------------------+ -* | guc_css_header | +* | uc_css_header | * | | * | contains major/minor version | * +-------------------------------+ @@ -172,9 +172,16 @@* 3. Length info of each component can be found in header, in dwords. * 4. Modulus and exponent key are not required by driver. They may not appear * in fw. So driver will load a truncated firmware in this case. +* +* HuC firmware layout is same as GuC firmware. +* +* HuC firmware css header is different. However, the only difference is where +* the version information is saved. The uc_css_header is unified to support +* both. Driver should get HuC version from uc_css_header.huc_sw_version, while +* uc_css_header.guc_sw_version for GuC. */ -struct guc_css_header { +struct uc_css_header {uint32_t module_type;/* header_size includes all non-uCode bits, including css_header, rsa * key, modulus key and exponent data. */ @@ -205,8 +212,16 @@ struct guc_css_header {char username[8 ];char buildnumber[12 ]; -uint32_t device_id; -uint32_t guc_sw_version; +union { +struct { +uint32_t branch_client_version; +uint32_t sw_version; + } guc; +struct { +uint32_t sw_version; +uint32_t reserved; + } huc; + };uint32_t prod_preprod_fw;uint32_t reserved[12 ];uint32_t header_info;drivers/gpu/drm/i915/intel_guc_loader.c +28
-13@@ -593,7 +593,7 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_gem_object *obj;const struct firmware *fw =NULL ; -struct guc_css_header *css; +struct uc_css_header *css;size_t size;int err;@@ -610,19 +610,19 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, uc_fw->uc_fw_path, fw);/* Check the size of the blob before examining buffer contents */ -if (fw->size <sizeof (struct guc_css_header )) { +if (fw->size <sizeof (struct uc_css_header )) {DRM_NOTE ("Firmware header is missing\n" ); goto fail; } - css = (struct guc_css_header *)fw->data; + css = (struct uc_css_header *)fw->data;/* Firmware bits always start from header */ uc_fw->header_offset =0 ; uc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - css->key_size_dw - css->exponent_size_dw) *sizeof (u32); -if (uc_fw->header_size !=sizeof (struct guc_css_header )) { +if (uc_fw->header_size !=sizeof (struct uc_css_header )) {DRM_NOTE ("CSS header definition mismatch\n" ); goto fail; }@@ -646,21 +646,36 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, goto fail; } -/* Header and uCode will be loaded to WOPCM. Size of the two. */ - size = uc_fw->header_size + uc_fw->ucode_size; -if (size >guc_wopcm_size (dev_priv)) { -DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); - goto fail; - } -/* * The GuC firmware image has the version number embedded at a well-known * offset within the firmware blob; note that major / minor version are * TWO bytes each (i.e. u16), although all pointers and offsets are defined * in terms of bytes (u8). */ - uc_fw->major_ver_found = css->guc_sw_version >>16 ; - uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; +switch (uc_fw->fw_type) { +case INTEL_UC_FW_TYPE_GUC : +/* Header and uCode will be loaded to WOPCM. Size of the two. */ + size = uc_fw->header_size + uc_fw->ucode_size; + +/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */ +if (size >guc_wopcm_size (dev_priv)) { +DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); + goto fail; + } + uc_fw->major_ver_found = css->guc.sw_version >>16 ; + uc_fw->minor_ver_found = css->guc.sw_version &0xFFFF ; +break ; + +case INTEL_UC_FW_TYPE_HUC : + uc_fw->major_ver_found = css->huc.sw_version >>16 ; + uc_fw->minor_ver_found = css->huc.sw_version &0xFFFF ; +break ; + +default : +DRM_ERROR ("Unknown firmware type %d\n" , uc_fw->fw_type); + err = -ENOEXEC ; + goto fail; + }if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {drivers/gpu/drm/i915/intel_uc.h +5
-0@@ -98,6 +98,11 @@ enum intel_uc_fw_status { INTEL_UC_FIRMWARE_SUCCESS }; +enum { +INTEL_UC_FW_TYPE_GUC , +INTEL_UC_FW_TYPE_HUC +}; +/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC.
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 122
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.h +1
-0@@ -114,6 +119,7 @@ struct intel_uc_fw {uint16_t major_ver_found;uint16_t minor_ver_found; +uint32_t fw_type;
Any reason why we use uint32_t instead of a named enum type here?
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.h +0
-0uint32_t header_size;uint32_t header_offset;uint32_t rsa_size;Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/8] drm/i915/huc: Unified css_header struct for GuC and HuC
Quoted 212 lines
-----Original Message-----
From: Hiler, Arkadiusz
Sent: Friday, December 23, 2016 6:22 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 2/8] drm/i915/huc: Unifiedcss_headerstruct for GuC and HuCQuoted 24 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
HuC firmware css header has almost exactly same definition as GuC firmware except for the
sw_version. Also, add a new memberfw_typeintointel_uc_fwto indicate what kind of fw it is. So, the loader will pull rightsw_versionfrom header.v2: rebased on-top of drm-intel-nightly
v3: rebased on-top of drm-intel-nightly (again).
v4: rebased + spaces.
v7: rebased.
v8: rebased.
v9: rebased. Renamedevice_idtoguc_branch_client_version, makeguc_sw_versiona union. <Jeff Mcgee>. PutUC_FW_TYPE_GUCandUC_FW_TYPE_HUCinto an enum.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip.
v13: rebased.Update dev todev_privinintel_uc_fw_fetch
v14: rebased. AddINTEL_prefix to an enum. Addfw_typedeclaration from patch 1.Combine two different unions for huc and guc version, reserved etc into one union with two structs.
v15: rebased.Quoted 7 lines
Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/intel_guc_fwif.h | 23 ++++++++++++++---- drivers/gpu/drm/i915/intel_guc_loader.c | 41 ++++++++++++++++++++++-----------
Quoted 18 lines
drivers/gpu/drm/i915/intel_uc.h | 6 +++++ 3 files changed, 53 insertions(+), 17 deletions(-)drivers/gpu/drm/i915/intel_guc_fwif.h +1
-1@@ -145,7 +145,7 @@* The GuC firmware layout looks like this: * * +-------------------------------+ -* | guc_css_header | +* | uc_css_header | * | | * | contains major/minor version | * +-------------------------------+ drivers/gpu/drm/i915/intel_guc_fwif.h line 173
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_fwif.h +0
-0@@ -172,9 +172,16 @@* 3. Length info of each component can be found in header, in dwords. * 4. Modulus and exponent key are not required by driver. They may not appear
drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private
Quoted 43 lines
drivers/gpu/drm/i915/intel_guc_fwif.h +11
-1* in fw. So driver will load a truncated firmware in this case. +* +* HuC firmware layout is same as GuC firmware. +* +* HuC firmware css header is different. However, the only difference +is where +* the version information is saved. The uc_css_header is unified to +support +* both. Driver should get HuC version from +uc_css_header.huc_sw_version, while +* uc_css_header.guc_sw_version for GuC. */ -struct guc_css_header { +struct uc_css_header {uint32_t module_type;/* header_size includes all non-uCode bits, including css_header, rsa * key, modulus key and exponent data. */ @@ -205,8 +212,16 @@struct
guc_css_header{drivers/gpu/drm/i915/intel_guc_fwif.h +10
-2char username[8 ];char buildnumber[12 ]; -uint32_t device_id; -uint32_t guc_sw_version; +union { +struct { +uint32_t branch_client_version; +uint32_t sw_version; + } guc; +struct { +uint32_t sw_version; +uint32_t reserved; + } huc; + };uint32_t prod_preprod_fw;uint32_t reserved[12 ];uint32_t header_info;drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -593,7 +593,7 @@ void intel_uc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1struct pci_dev *pdev = dev_priv->drm.pdev;struct drm_i915_gem_object *obj;const struct firmware *fw =NULL ; -struct guc_css_header *css; +struct uc_css_header *css;size_t size;int err;@@ -610,19 +610,19 @@ void intel_uc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private
Quoted 23 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-3uc_fw->uc_fw_path, fw);/* Check the size of the blob before examining buffer contents */ -if (fw->size <sizeof (struct guc_css_header )) { +if (fw->size <sizeof (struct uc_css_header )) {DRM_NOTE ("Firmware header is missing\n" ); goto fail; } - css = (struct guc_css_header *)fw->data; + css = (struct uc_css_header *)fw->data;/* Firmware bits always start from header */ uc_fw->header_offset =0 ; uc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - css->key_size_dw - css->exponent_size_dw) *sizeof (u32); -if (uc_fw->header_size !=sizeof (struct guc_css_header )) { +if (uc_fw->header_size !=sizeof (struct uc_css_header )) {DRM_NOTE ("CSS header definition mismatch\n" ); goto fail; }@@ -646,21 +646,36 @@ void intel_uc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 12 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-7goto fail; } -/* Header and uCode will be loaded to WOPCM. Size of the two. */ - size = uc_fw->header_size + uc_fw->ucode_size; -if (size >guc_wopcm_size (dev_priv)) { -DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); - goto fail; - } -/* * The GuC firmware image has the version number embedded at a well- known
drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-2* offset within the firmware blob; note that major / minor version are * TWO bytes each (i.e. u16), although all pointers and offsets are defined * in terms of bytes (u8). */ - uc_fw->major_ver_found = css->guc_sw_version >>16 ; - uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; +switch (uc_fw->fw_type) { +case INTEL_UC_FW_TYPE_GUC : +/* Header and uCode will be loaded to WOPCM. Size of the two. */
drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+ size = uc_fw->header_size + uc_fw->ucode_size; + +/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private · line 662
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0+if (size >guc_wopcm_size (dev_priv)) { + DRM_ERROR("Firmware is too large to fit inWOPCM\n");
Quoted 39 lines
drivers/gpu/drm/i915/intel_guc_loader.c +16
-0+ goto fail; + } + uc_fw->major_ver_found = css->guc.sw_version >>16 ; + uc_fw->minor_ver_found = css->guc.sw_version &0xFFFF ; +break ; + +case INTEL_UC_FW_TYPE_HUC : + uc_fw->major_ver_found = css->huc.sw_version >>16 ; + uc_fw->minor_ver_found = css->huc.sw_version &0xFFFF ; +break ; + +default : +DRM_ERROR ("Unknown firmware type %d\n" , uc_fw->fw_type); + err = -ENOEXEC ; + goto fail; + }if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { diff --git
a/drivers/gpu/drm/i915/intel_uc.hb/drivers/gpu/drm/i915/intel_uc.hindex 893bcec..ad140e2 100644drivers/gpu/drm/i915/intel_uc.h +5
-0@@ -98,6 +98,11 @@ enum intel_uc_fw_status { INTEL_UC_FIRMWARE_SUCCESS }; +enum { +INTEL_UC_FW_TYPE_GUC , +INTEL_UC_FW_TYPE_HUC +}; +/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC. @@ -114,6 +119,7 @@ struct intel_uc_fw {uint16_t major_ver_found;uint16_t minor_ver_found;
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc.h struct intel_uc_fw { · line 122
Quoted 1 line
drivers/gpu/drm/i915/intel_uc.h +1
-0+uint32_t fw_type;Any reason why we use
uint32_tinstead of a named enum type here?
Maintains the uniformity of the struct intel_uc_fw...... every field is either uint32_t or uint16_t.
Anusha
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.h +0
-1uint32_t header_size;uint32_t header_offset;uint32_t rsa_size; --2.7.4
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx--
Cheers,
Arek
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/8 drm/i915/huc: Add HuC fw loading support
In reply to Anusha SrivatsaThe HuC loading process is similar to GuC. The intel_uc_fw_fetch() is used for both cases.
HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) update huc_version number of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changed dev->dev_private to to_i915()
v4: moved function back to where it was.
change wait_for_atomic to wait_for.
v5: rebased + comment changes.
v7: rebased.
v8: rebased.
v9: rebased. Changed the year in the copyright message to reflect the right year.Correct the comments,remove the unwanted WARN message, replace drm_gem_object_unreference() with i915_gem_object_put().Make the prototypes in intel_huc.h non-extern.
v10: rebased. Update the file construction done by HuC. It is similar to GuC.Adopted the approach used in-
https://patchwork.freedesktop.org/patch/104355/ <Tvrtko Ursulin>
v11: Fix warnings remove old declaration
v12: Change dev to dev_priv in macro definition.
Corrected comments.
v13: rebased.
v14: rebased on top of drm-tip
v15: rebased. Updated functions intel_huc_load(),intel_huc_init() and intel_uc_fw_fetch() to accept dev_priv instead of dev. Moved contents of intel_huc.h to intel_uc.h
v16: change SKL_FW_ to SKL_HUC_FW_. Add intel_ prefix to guc_wopcm_size(). Remove unwanted checks in intel_uc.h. Rename huc_fw in struct intel_huc to simply fw to avoid redundency.
v17: rebased.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/intel_guc_loader.c | 11 +- drivers/gpu/drm/i915/intel_huc_loader.c | 263 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 18 +++ 7 files changed, 296 insertions(+), 7 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc_loader.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -57,6 +57,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ intel_guc_loader.o \ + intel_huc_loader.o \ i915_guc_submission.o # autogenerated null render state
drivers/gpu/drm/i915/i915_drv.c +3 -1
@@ -600,6 +600,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; +intel_huc_init (dev_priv);intel_guc_init (dev_priv); ret =i915_gem_init (dev_priv);
@@ -627,6 +628,7 @@ static int i915_load_modeset_init(struct drm_device *dev)DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); cleanup_irq: +intel_huc_fini (dev);intel_guc_fini (dev_priv);drm_irq_uninstall (dev);intel_teardown_gmbus (dev_priv);
@@ -1313,7 +1315,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ drain_workqueue (dev_priv->wq); - +intel_huc_fini (dev);intel_guc_fini (dev_priv);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +2 -1
@@ -2147,6 +2147,7 @@ struct drm_i915_private {struct intel_gvt *gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;
@@ -2921,7 +2922,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_GUC (dev_priv) ((dev_priv)->info.has_guc)#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) - +#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)#define HAS_POOLED_EU (dev_priv) ((dev_priv)->info.has_pooled_eu)
drivers/gpu/drm/i915/i915_guc_reg.h +3 -0
@@ -61,9 +61,12 @@#define DMA_ADDRESS_SPACE_GTT (8 << 16)#define DMA_COPY_SIZE _MMIO(0xc310)#define DMA_CTRL _MMIO(0xc314) +#define HUC_UKERNEL (1<<9)#define UOS_MOVE (1<<4)#define START_DMA (1<<0)#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340) +#define HUC_LOADING_AGENT_VCR (0<<1) +#define HUC_LOADING_AGENT_GUC (1<<1)#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)
drivers/gpu/drm/i915/intel_guc_loader.c +6 -5
@@ -309,8 +309,8 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM );/* Finally start the DMA */ -I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA )); - +I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA ) | +_MASKED_BIT_DISABLE (HUC_UKERNEL ));/* * Wait for the DMA to complete & the GuC to start up. * NB: Docs recommend not using the interrupt for completion.
@@ -334,7 +334,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,return ret; } -static u32 guc_wopcm_size (struct drm_i915_private *dev_priv) +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv) {u32 wopcm_size =GUC_WOPCM_TOP ;
@@ -372,7 +372,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,guc_wopcm_size (dev_priv)); +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv));I915_WRITE (DMA_GUC_WOPCM_OFFSET ,GUC_WOPCM_OFFSET_VALUE );/* Enable MIA caching. GuC clock gating is disabled. */
@@ -511,6 +511,7 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)if (err) goto fail; +intel_huc_load (dev_priv); err =guc_ucode_xfer (dev_priv);if (!err)break ;
@@ -658,7 +659,7 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, size = uc_fw->header_size + uc_fw->ucode_size;/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */ -if (size >guc_wopcm_size (dev_priv)) { +if (size >intel_guc_wopcm_size (dev_priv)) {DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); goto fail; }
drivers/gpu/drm/i915/intel_huc_loader.c new file +263 -0
263 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +18 -0
@@ -24,6 +24,9 @@#ifndef _INTEL_UC_H_#define _INTEL_UC_H_ +#define HUC_STATUS2 _MMIO(0xD3B0) +#define HUC_FW_VERIFIED (1<<7) +#include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_ringbuffer.h"
@@ -174,6 +177,13 @@ struct intel_guc {struct mutex send_mutex; }; +struct intel_huc { +/* Generic uC firmware management */ +struct intel_uc_fw fw; + +/* HuC-specific additions */ +}; +/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv);bool intel_guc_recv (struct drm_i915_private *dev_priv,u32 *status);
@@ -190,6 +200,9 @@ extern void intel_guc_fini(struct drm_i915_private *dev_priv);extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);extern int intel_guc_suspend (struct drm_i915_private *dev_priv);extern int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw); +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);
@@ -204,4 +217,9 @@ void i915_guc_register(struct drm_i915_private *dev_priv);void i915_guc_unregister (struct drm_i915_private *dev_priv);int i915_guc_log_control (struct drm_i915_private *dev_priv,u64 control_val); +/* intel_huc_loader.c */ +void intel_huc_init (struct drm_i915_private *dev_priv); +void intel_huc_fini (struct drm_device *dev); +int intel_huc_load (struct drm_i915_private *dev_priv); +#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915/huc: Add HuC fw loading support
Quoted 37 lines · Anusha Srivatsa
The HuC loading process is similar to GuC. The
intel_uc_fw_fetch()is used for both cases.HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) updatehuc_versionnumber of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changeddev->dev_privatetoto_i915()
v4: moved function back to where it was.
changewait_for_atomictowait_for.
v5: rebased + comment changes.
v7: rebased.
v8: rebased.
v9: rebased. Changed the year in the copyright message to reflect the right year.Correct the comments,remove the unwanted WARN message, replacedrm_gem_object_unreference()with i915_gem_object_put().Make the prototypes inintel_huc.hnon-extern.
v10: rebased. Update the file construction done by HuC. It is similar to GuC.Adopted the approach used in-
https://patchwork.freedesktop.org/patch/104355/ <Tvrtko Ursulin>
v11: Fix warnings remove old declaration
v12: Change dev todev_privin macro definition.
Corrected comments.
v13: rebased.
v14: rebased on top of drm-tip
v15: rebased. Updated functions intel_huc_load(),intel_huc_init() andintel_uc_fw_fetch()to acceptdev_privinstead of dev. Moved contents ofintel_huc.htointel_uc.h
v16: changeSKL_FW_toSKL_HUC_FW_. Addintel_prefix toguc_wopcm_size(). Remove unwanted checks inintel_uc.h. Renamehuc_fwin structintel_hucto simply fw to avoid redundency.
v17: rebased.
Quoted 5 lines
Cc Tvrtko Ursulin <[email protected]>Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915/huc: Add HuC fw loading support
In reply to Anusha SrivatsaQuoted 237 lines · Anusha Srivatsa
The HuC loading process is similar to GuC. The
intel_uc_fw_fetch()is used for both cases.HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) updatehuc_versionnumber of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changeddev->dev_privatetoto_i915()
v4: moved function back to where it was.
changewait_for_atomictowait_for.
v5: rebased + comment changes.
v7: rebased.
v8: rebased.
v9: rebased. Changed the year in the copyright message to reflect the right year.Correct the comments,remove the unwanted WARN message, replacedrm_gem_object_unreference()with i915_gem_object_put().Make the prototypes inintel_huc.hnon-extern.
v10: rebased. Update the file construction done by HuC. It is similar to GuC.Adopted the approach used in-
https://patchwork.freedesktop.org/patch/104355/ <Tvrtko Ursulin>
v11: Fix warnings remove old declaration
v12: Change dev todev_privin macro definition.
Corrected comments.
v13: rebased.
v14: rebased on top of drm-tip
v15: rebased. Updated functions intel_huc_load(),intel_huc_init() andintel_uc_fw_fetch()to acceptdev_privinstead of dev. Moved contents ofintel_huc.htointel_uc.h
v16: changeSKL_FW_toSKL_HUC_FW_. Addintel_prefix toguc_wopcm_size(). Remove unwanted checks inintel_uc.h. Renamehuc_fwin structintel_hucto simply fw to avoid redundency.
v17: rebased.Cc Tvrtko Ursulin <[email protected]>Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/intel_guc_loader.c | 11 +- drivers/gpu/drm/i915/intel_huc_loader.c | 263 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 18 +++ 7 files changed, 296 insertions(+), 7 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc_loader.cdrivers/gpu/drm/i915/Makefile +1
-0@@ -57,6 +57,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ intel_guc_loader.o \ + intel_huc_loader.o \ i915_guc_submission.o # autogenerated null render statedrivers/gpu/drm/i915/i915_drv.c +3
-1@@ -600,6 +600,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; +intel_huc_init (dev_priv);intel_guc_init (dev_priv); ret =i915_gem_init (dev_priv);@@ -627,6 +628,7 @@ static int i915_load_modeset_init(struct drm_device *dev)DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); cleanup_irq: +intel_huc_fini (dev);intel_guc_fini (dev_priv);drm_irq_uninstall (dev);intel_teardown_gmbus (dev_priv);@@ -1313,7 +1315,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ drain_workqueue (dev_priv->wq); - +intel_huc_fini (dev);intel_guc_fini (dev_priv);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2147,6 +2147,7 @@ struct drm_i915_private {struct intel_gvt *gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;@@ -2921,7 +2922,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_GUC (dev_priv) ((dev_priv)->info.has_guc)#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) - +#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)#define HAS_POOLED_EU (dev_priv) ((dev_priv)->info.has_pooled_eu)drivers/gpu/drm/i915/i915_guc_reg.h +3
-0@@ -61,9 +61,12 @@#define DMA_ADDRESS_SPACE_GTT (8 << 16)#define DMA_COPY_SIZE _MMIO(0xc310)#define DMA_CTRL _MMIO(0xc314) +#define HUC_UKERNEL (1<<9)#define UOS_MOVE (1<<4)#define START_DMA (1<<0)#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340) +#define HUC_LOADING_AGENT_VCR (0<<1) +#define HUC_LOADING_AGENT_GUC (1<<1)#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)drivers/gpu/drm/i915/intel_guc_loader.c +6
-5@@ -309,8 +309,8 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM );/* Finally start the DMA */ -I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA )); - +I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (UOS_MOVE |START_DMA ) | +_MASKED_BIT_DISABLE (HUC_UKERNEL ));/* * Wait for the DMA to complete & the GuC to start up. * NB: Docs recommend not using the interrupt for completion. @@ -334,7 +334,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,return ret; } -static u32 guc_wopcm_size (struct drm_i915_private *dev_priv) +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv) {u32 wopcm_size =GUC_WOPCM_TOP ;@@ -372,7 +372,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,guc_wopcm_size (dev_priv)); +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv));I915_WRITE (DMA_GUC_WOPCM_OFFSET ,GUC_WOPCM_OFFSET_VALUE );/* Enable MIA caching. GuC clock gating is disabled. */ @@ -511,6 +511,7 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)if (err) goto fail; +intel_huc_load (dev_priv); err =guc_ucode_xfer (dev_priv);if (!err)break ;@@ -658,7 +659,7 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, size = uc_fw->header_size + uc_fw->ucode_size;/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */ -if (size >guc_wopcm_size (dev_priv)) { +if (size >intel_guc_wopcm_size (dev_priv)) {DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); goto fail; }drivers/gpu/drm/i915/intel_huc_loader.c new file +49
-0@@ -0,0 +1,263 @@ +/* +* Copyright © 2016 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#include <linux/firmware.h> +#include "i915_drv.h" +#include "intel_uc.h" + +/** +* DOC: HuC Firmware +* +* Motivation: +* GEN9 introduces a new dedicated firmware for usage in media HEVC (High +* Efficiency Video Coding) operations. Userspace can use the firmware +* capabilities by adding HuC specific commands to batch buffers. +* +* Implementation: +* The same firmware loader is used as the GuC. However, the actual +* loading to HW is deferred until GEM initialization is done. +* +* Note that HuC firmware loading must be done before GuC loading. +*/ + +#define SKL_HUC_FW_MAJOR 01 +#define SKL_HUC_FW_MINOR 07 +#define SKL_BLD_NUM 1398 + +#define HUC_FW_PATH (platform, major, minor, bld_num) \ + "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ + __stringify(minor) "_" __stringify(bld_num) ".bin"
drivers/gpu/drm/i915/intel_huc_loader.c line 59
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ +#define I915_SKL_HUC_UCODE HUC_FW_PATH(skl, SKL_HUC_FW_MAJOR, \ + SKL_HUC_FW_MINOR, SKL_BLD_NUM) +MODULE_FIRMWARE (I915_SKL_HUC_UCODE ); + +/** +* huc_ucode_xfer() - DMA's the firmware +* @dev_priv: the drm device +* +* This function takes the gem object containing the firmware, sets up the DMA
Hmm, this function takes just dev_priv...
Quoted 162 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +162
-0+* engine MMIO, triggers the DMA operation and waits for it to finish. +* +* Transfer the firmware image to RAM for execution by the microcontroller. +* +* Return: 0 on success, non-zero on failure +*/ +static int huc_ucode_xfer (struct drm_i915_private *dev_priv) +{ +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +struct i915_vma *vma; +unsigned long offset =0 ; +u32 size; +int ret; + + ret =i915_gem_object_set_to_gtt_domain (huc_fw->uc_fw_obj, false); +if (ret) { +DRM_DEBUG_DRIVER ("set-domain failed %d\n" , ret); +return ret; + } + + vma =i915_gem_object_ggtt_pin (huc_fw->uc_fw_obj,NULL ,0 ,0 ,0 ); +if (IS_ERR (vma)) { +DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma)); +return PTR_ERR (vma); + } + +/* Invalidate GuC TLB to let GuC take the latest updates to GTT. */ +I915_WRITE (GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* init WOPCM */ +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); +I915_WRITE (DMA_GUC_WOPCM_OFFSET ,GUC_WOPCM_OFFSET_VALUE | +HUC_LOADING_AGENT_GUC ); + +/* Set the source address for the uCode */ + offset =i915_ggtt_offset (vma) + huc_fw->header_offset; +I915_WRITE (DMA_ADDR_0_LOW ,lower_32_bits (offset)); +I915_WRITE (DMA_ADDR_0_HIGH ,upper_32_bits (offset) &0xFFFF ); + +/* Hardware doesn't look at destination address for HuC. Set it to 0, +* but still program the correct address space. +*/ +I915_WRITE (DMA_ADDR_1_LOW ,0 ); +I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM ); + + size = huc_fw->header_size + huc_fw->ucode_size; +I915_WRITE (DMA_COPY_SIZE , size); + +/* Start the DMA */ +I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (HUC_UKERNEL |START_DMA )); + +/* Wait for DMA to finish */ + ret =wait_for ((I915_READ (DMA_CTRL ) &START_DMA ) ==0 ,100 ); + +DRM_DEBUG_DRIVER ("HuC DMA transfer wait over with ret %d\n" , ret); + +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); + +/* +* We keep the object pages for reuse during resume. But we can unpin it +* now that DMA has completed, so it doesn't continue to take up space. +*/ +i915_vma_unpin (vma); + +return ret; +} + +/** +* intel_huc_init() - initiate HuC firmware loading request +* @dev_priv: the drm_i915_private device +* +* Called early during driver load, but after GEM is initialised. The loading +* will continue only when driver explicitly specify firmware name and version. +* All other cases are considered as INTEL_UC_FIRMWARE_NONE either because HW +* is not capable or driver yet support it. And there will be no error message +* for INTEL_UC_FIRMWARE_NONE cases. +* +* The DMA-copying to HW is done later when intel_huc_load() is called. +*/ +void intel_huc_init (struct drm_i915_private *dev_priv) +{ +struct intel_huc *huc = &dev_priv->huc; +struct intel_uc_fw *huc_fw = &huc->fw; +const char *fw_path =NULL ; + + huc_fw->uc_fw_path =NULL ; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->fw_type =INTEL_UC_FW_TYPE_HUC ; + +if (!HAS_HUC_UCODE (dev_priv)) +return ; + +if (IS_SKYLAKE (dev_priv)) { + fw_path =I915_SKL_HUC_UCODE ; + huc_fw->major_ver_wanted =SKL_HUC_FW_MAJOR ; + huc_fw->minor_ver_wanted =SKL_HUC_FW_MINOR ; + } + + huc_fw->uc_fw_path = fw_path; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + +DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); + +intel_uc_fw_fetch (dev_priv, huc_fw); +} + +/** +* intel_huc_load() - load HuC uCode to device +* @dev_priv: the drm_i915_private device +* +* Called from gem_init_hw() during driver loading and also after a GPU reset. +* Be note that HuC loading must be done before GuC loading. +* +* The firmware image should have already been fetched into memory by the +* earlier call to intel_huc_init(), so here we need only check that +* is succeeded, and then transfer the image to the h/w. +* +* Return: non-zero code on error +*/ +int intel_huc_load (struct drm_i915_private *dev_priv) +{ +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +int err; + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_NONE ) +return 0 ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status)); + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_SUCCESS && + huc_fw->load_status ==INTEL_UC_FIRMWARE_FAIL ) +return -ENOEXEC ; + + huc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; + +switch (huc_fw->fetch_status) { +case INTEL_UC_FIRMWARE_FAIL : +/* something went wrong :( */ + err = -EIO ; + goto fail; + +case INTEL_UC_FIRMWARE_NONE : +case INTEL_UC_FIRMWARE_PENDING : +default : +/* "can't happen" */ +WARN_ONCE (1 ,"HuC fw %s invalid fetch_status %s [%d]\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), + huc_fw->fetch_status); + err = -ENXIO ; + goto fail; + +case INTEL_UC_FIRMWARE_SUCCESS : +break ; + } +
drivers/gpu/drm/i915/intel_huc_loader.c line 231
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ err =huc_ucode_xfer (dev_priv); +if (err) + goto fail; + + huc_fw->load_status =INTEL_UC_FIRMWARE_SUCCESS ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status));
Hmm, this message will always display "fetch SUCCESS load SUCCESS" as all other cases all handled as fail below... is it expected ?
Quoted 9 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +9
-0+ +return 0 ; + +fail: +if (huc_fw->load_status ==INTEL_UC_FIRMWARE_PENDING ) + huc_fw->load_status =INTEL_UC_FIRMWARE_FAIL ; + +DRM_ERROR ("Failed to complete HuC uCode load with ret %d\n" , err); +
drivers/gpu/drm/i915/intel_huc_loader.c line 250
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+return err; +} + +/** +* intel_huc_fini() - clean up resources allocated for HuC +* @dev: the drm device +* +* Cleans up by releasing the huc firmware GEM obj. +*/ +void intel_huc_fini (struct drm_device *dev)
Why this function takes dev? All other functions take dev_priv.
Michal
Quoted 68 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +13
-0+{ +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; + +mutex_lock (&dev->struct_mutex); +if (huc_fw->uc_fw_obj) +i915_gem_object_put (huc_fw->uc_fw_obj); + huc_fw->uc_fw_obj =NULL ; +mutex_unlock (&dev->struct_mutex); + + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; +} +drivers/gpu/drm/i915/intel_uc.h +18
-0@@ -24,6 +24,9 @@#ifndef _INTEL_UC_H_#define _INTEL_UC_H_ +#define HUC_STATUS2 _MMIO(0xD3B0) +#define HUC_FW_VERIFIED (1<<7) +#include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_ringbuffer.h" @@ -174,6 +177,13 @@ struct intel_guc {struct mutex send_mutex; }; +struct intel_huc { +/* Generic uC firmware management */ +struct intel_uc_fw fw; + +/* HuC-specific additions */ +}; +/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv);bool intel_guc_recv (struct drm_i915_private *dev_priv,u32 *status);@@ -190,6 +200,9 @@ extern void intel_guc_fini(struct drm_i915_private *dev_priv);extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);extern int intel_guc_suspend (struct drm_i915_private *dev_priv);extern int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw); +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);@@ -204,4 +217,9 @@ void i915_guc_register(struct drm_i915_private *dev_priv);void i915_guc_unregister (struct drm_i915_private *dev_priv);int i915_guc_log_control (struct drm_i915_private *dev_priv,u64 control_val); +/* intel_huc_loader.c */ +void intel_huc_init (struct drm_i915_private *dev_priv); +void intel_huc_fini (struct drm_device *dev); +int intel_huc_load (struct drm_i915_private *dev_priv); +#endif Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915/huc: Add HuC fw loading support
Quoted 286 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Tuesday, December 27, 2016 9:51 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 3/8] drm/i915/huc: Add HuC fw loading supportQuoted 25 lines · Anusha Srivatsa
The HuC loading process is similar to GuC. The
intel_uc_fw_fetch()is used for both cases.HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) updatehuc_versionnumber of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changeddev->dev_privatetoto_i915()
v4: moved function back to where it was.
changewait_for_atomictowait_for.
v5: rebased + comment changes.
v7: rebased.
v8: rebased.
v9: rebased. Changed the year in the copyright message to reflect the right year.Correct the comments,remove the unwanted WARN message, replacedrm_gem_object_unreference()with i915_gem_object_put().Make the prototypes inintel_huc.hnon-extern.
v10: rebased. Update the file construction done by HuC. It is similar to GuC.Adopted the approach used in-
https://patchwork.freedesktop.org/patch/104355/ <Tvrtko Ursulin>
v11: Fix warnings remove old declarationQuoted 8 lines
v12: Change dev to
dev_privin macro definition.
Corrected comments.
v13: rebased.
v14: rebased on top of drm-tip
v15: rebased. Updated functions intel_huc_load(),intel_huc_init() andintel_uc_fw_fetch()to acceptdev_privinstead of dev. Moved contents ofintel_huc.htointel_uc.h
v16: changeSKL_FW_toSKL_HUC_FW_. Addintel_prefix to
guc_wopcm_size().Quoted 9 lines
Remove unwanted checks in
intel_uc.h. Renamehuc_fwin structintel_hucto simply fw to avoid redundency.
v17: rebased.Cc Tvrtko Ursulin <[email protected]>Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Quoted 7 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/intel_guc_loader.c | 11 +-
drivers/gpu/drm/i915/intel_huc_loader.c| 263++++++++++++++++++++++++++++++++
drivers/gpu/drm/i915/i915_drv.c static int i915_load_modeset_init(struct drm_device
Quoted 20 lines
drivers/gpu/drm/i915/intel_uc.h | 18 +++ 7 files changed, 296 insertions(+), 7 deletions(-) create mode100644
drivers/gpu/drm/i915/intel_huc_loader.c(quoted diff) +0
-0b/drivers/gpu/drm/i915/Makefile index 5196509..45ae124 100644
drivers/gpu/drm/i915/Makefile +1
-0@@ -57,6 +57,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ intel_guc_loader.o \ + intel_huc_loader.o \ i915_guc_submission.o # autogenerated null render state(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex 6428588..85a47c2 100644drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -600,6 +600,7 @@ static int i915_load_modeset_init(struct drm_device*dev)
drivers/gpu/drm/i915/i915_drv.c static int i915_load_modeset_init(struct drm_device
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0if (ret) goto cleanup_irq; +intel_huc_init (dev_priv);intel_guc_init (dev_priv); ret =i915_gem_init (dev_priv);@@ -627,6 +628,7 @@ static int i915_load_modeset_init(struct drm_device*dev)
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private
Quoted 62 lines
drivers/gpu/drm/i915/i915_drv.c +2
-1DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); cleanup_irq: +intel_huc_fini (dev);intel_guc_fini (dev_priv);drm_irq_uninstall (dev);intel_teardown_gmbus (dev_priv);@@ -1313,7 +1315,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ drain_workqueue (dev_priv->wq); - +intel_huc_fini (dev);intel_guc_fini (dev_priv);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 1a91409..7ac7730 100644drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2147,6 +2147,7 @@ struct drm_i915_private {struct intel_gvt *gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;@@ -2921,7 +2922,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_GUC (dev_priv) ((dev_priv)->info.has_guc)#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) - +#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)#define
HAS_POOLED_EU(dev_priv)((dev_priv)->info.has_pooled_eu)drivers/gpu/drm/i915/i915_guc_reg.h +3
-0@@ -61,9 +61,12 @@#define DMA_ADDRESS_SPACE_GTT (8 << 16)#define DMA_COPY_SIZE _MMIO(0xc310)#define DMA_CTRL _MMIO(0xc314) +#define HUC_UKERNEL (1<<9)#define UOS_MOVE (1<<4)#define START_DMA (1<<0)#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340) +#define HUC_LOADING_AGENT_VCR (0<<1) +#define HUC_LOADING_AGENT_GUC (1<<1)#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -309,8 +309,8 @@ static int guc_ucode_xfer_dma(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-1I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM );/* Finally start the DMA */ - I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA));drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private · line 312
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1- + I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA) |drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0+ _MASKED_BIT_DISABLE(HUC_UKERNEL));/* * Wait for the DMA to complete & the GuC to start up. * NB: Docs recommend not using the interrupt for completion. @@ -334,7 +334,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1return ret; } -static u32 guc_wopcm_size (struct drm_i915_private *dev_priv) +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv) {u32 wopcm_size =GUC_WOPCM_TOP ;@@ -372,7 +372,7 @@ static int guc_ucode_xfer(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,guc_wopcm_size (dev_priv)); +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); I915_WRITE(DMA_GUC_WOPCM_OFFSET,
GUC_WOPCM_OFFSET_VALUE);drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0/* Enable MIA caching. GuC clock gating is disabled. */ @@ -511,6 +511,7 @@ int intel_guc_setup(struct drm_i915_private *dev_priv) if (err) goto fail; +intel_huc_load (dev_priv); err =guc_ucode_xfer (dev_priv);if (!err)break ;@@ -658,7 +659,7 @@ void intel_uc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0size = uc_fw->header_size + uc_fw->ucode_size;/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1-if (size >guc_wopcm_size (dev_priv)) { +if (size >intel_guc_wopcm_size (dev_priv)) { DRM_ERROR("Firmware is too large to fit inWOPCM\n");
Quoted 25 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0goto fail; }drivers/gpu/drm/i915/intel_huc_loader.c new file +16
-0@@ -0,0 +1,263 @@ +/* +* Copyright (c) 2016 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom +the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including drivers/gpu/drm/i915/intel_huc_loader.c line 26
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+the next + * paragraph) shall be included in all copies or substantial portions +of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY , + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NOEVENT
drivers/gpu/drm/i915/intel_huc_loader.c line 28
Quoted 2 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +2
-0+SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,DAMAGES
Quoted 41 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +41
-0+OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#include <linux/firmware.h> +#include "i915_drv.h" +#include "intel_uc.h" + +/** +* DOC: HuC Firmware +* +* Motivation: +* GEN9 introduces a new dedicated firmware for usage in media HEVC +(High +* Efficiency Video Coding) operations. Userspace can use the +firmware +* capabilities by adding HuC specific commands to batch buffers. +* +* Implementation: +* The same firmware loader is used as the GuC. However, the actual +* loading to HW is deferred until GEM initialization is done. +* +* Note that HuC firmware loading must be done before GuC loading. +*/ + +#define SKL_HUC_FW_MAJOR 01 +#define SKL_HUC_FW_MINOR 07 +#define SKL_BLD_NUM 1398 + +#define HUC_FW_PATH (platform, major, minor, bld_num) \ + "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ + __stringify(minor) "_" __stringify(bld_num) ".bin" + +#define I915_SKL_HUC_UCODE HUC_FW_PATH(skl, SKL_HUC_FW_MAJOR, \ + SKL_HUC_FW_MINOR, SKL_BLD_NUM) +MODULE_FIRMWARE (I915_SKL_HUC_UCODE ); +
Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 6 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +6
-0+/** +* huc_ucode_xfer() - DMA's the firmware +* @dev_priv: the drm device +* +* This function takes the gem object containing the firmware, sets +up the DMA Hmm, this function takes just
dev_priv...
Oops.... will change the comment.
Anusha
Quoted 267 lines
Quoted 23 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +22
-0+* engine MMIO, triggers the DMA operation and waits for it to finish. +* +* Transfer the firmware image to RAM for execution by the microcontroller. +* +* Return: 0 on success, non-zero on failure */ static int +huc_ucode_xfer (struct drm_i915_private *dev_priv) { +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +struct i915_vma *vma; +unsigned long offset =0 ; +u32 size; +int ret; + + ret =i915_gem_object_set_to_gtt_domain (huc_fw->uc_fw_obj, false); +if (ret) { +DRM_DEBUG_DRIVER ("set-domain failed %d\n" , ret); +return ret; + } + + vma =i915_gem_object_ggtt_pin (huc_fw->uc_fw_obj,NULL ,0 ,0 ,0 ); +if (IS_ERR (vma)) { +DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma)); +return PTR_ERR (vma);drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ } + +/* Invalidate GuC TLB to let GuC take the latest updates to GTT. */ +I915_WRITE (GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* init WOPCM */ +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); + I915_WRITE(DMA_GUC_WOPCM_OFFSET,
GUC_WOPCM_OFFSET_VALUE|Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +8
-0+ HUC_LOADING_AGENT_GUC); + +/* Set the source address for the uCode */ + offset =i915_ggtt_offset (vma) + huc_fw->header_offset; +I915_WRITE (DMA_ADDR_0_LOW ,lower_32_bits (offset)); +I915_WRITE (DMA_ADDR_0_HIGH ,upper_32_bits (offset) &0xFFFF ); + +/* Hardware doesn't look at destination address for HuC. Set it to 0, drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+* but still program the correct address space. +*/ +I915_WRITE (DMA_ADDR_1_LOW ,0 ); +I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM ); + + size = huc_fw->header_size + huc_fw->ucode_size; +I915_WRITE (DMA_COPY_SIZE , size); + +/* Start the DMA */ + I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(HUC_UKERNEL |
START_DMA));Quoted 111 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +111
-0+ +/* Wait for DMA to finish */ + ret =wait_for ((I915_READ (DMA_CTRL ) &START_DMA ) ==0 ,100 ); + +DRM_DEBUG_DRIVER ("HuC DMA transfer wait over with ret %d\n" , ret); + +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); + +/* +* We keep the object pages for reuse during resume. But we can unpin it +* now that DMA has completed, so it doesn't continue to take up space. +*/ +i915_vma_unpin (vma); + +return ret; +} + +/** +* intel_huc_init() - initiate HuC firmware loading request +* @dev_priv: the drm_i915_private device +* +* Called early during driver load, but after GEM is initialised. The +loading +* will continue only when driver explicitly specify firmware name and version. +* All other cases are considered as INTEL_UC_FIRMWARE_NONE either +because HW +* is not capable or driver yet support it. And there will be no +error message +* for INTEL_UC_FIRMWARE_NONE cases. +* +* The DMA-copying to HW is done later when intel_huc_load() is called. +*/ +void intel_huc_init (struct drm_i915_private *dev_priv) { +struct intel_huc *huc = &dev_priv->huc; +struct intel_uc_fw *huc_fw = &huc->fw; +const char *fw_path =NULL ; + + huc_fw->uc_fw_path =NULL ; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->fw_type =INTEL_UC_FW_TYPE_HUC ; + +if (!HAS_HUC_UCODE (dev_priv)) +return ; + +if (IS_SKYLAKE (dev_priv)) { + fw_path =I915_SKL_HUC_UCODE ; + huc_fw->major_ver_wanted =SKL_HUC_FW_MAJOR ; + huc_fw->minor_ver_wanted =SKL_HUC_FW_MINOR ; + } + + huc_fw->uc_fw_path = fw_path; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + +DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); + +intel_uc_fw_fetch (dev_priv, huc_fw); } + +/** +* intel_huc_load() - load HuC uCode to device +* @dev_priv: the drm_i915_private device +* +* Called from gem_init_hw() during driver loading and also after a GPU reset. +* Be note that HuC loading must be done before GuC loading. +* +* The firmware image should have already been fetched into memory by +the +* earlier call to intel_huc_init(), so here we need only check that +* is succeeded, and then transfer the image to the h/w. +* +* Return: non-zero code on error +*/ +int intel_huc_load (struct drm_i915_private *dev_priv) { +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +int err; + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_NONE ) +return 0 ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status)); + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_SUCCESS && + huc_fw->load_status ==INTEL_UC_FIRMWARE_FAIL ) +return -ENOEXEC ; + + huc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; + +switch (huc_fw->fetch_status) { +case INTEL_UC_FIRMWARE_FAIL : +/* something went wrong :( */ + err = -EIO ; + goto fail; + +case INTEL_UC_FIRMWARE_NONE : +case INTEL_UC_FIRMWARE_PENDING : +default : +/* "can't happen" */ +WARN_ONCE (1 ,"HuC fw %s invalid fetch_status %s [%d]\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), + huc_fw->fetch_status); + err = -ENXIO ; + goto fail; + +case INTEL_UC_FIRMWARE_SUCCESS : +break ; + } +drivers/gpu/drm/i915/intel_huc_loader.c line 231
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ err =huc_ucode_xfer (dev_priv); +if (err) + goto fail; + + huc_fw->load_status =INTEL_UC_FIRMWARE_SUCCESS ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status));Hmm, this message will always display "fetch SUCCESS load SUCCESS" as all other cases all handled as fail below... is it expected ?
Quoted 9 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +9
-0+ +return 0 ; + +fail: +if (huc_fw->load_status ==INTEL_UC_FIRMWARE_PENDING ) + huc_fw->load_status =INTEL_UC_FIRMWARE_FAIL ; + +DRM_ERROR ("Failed to complete HuC uCode load with ret %d\n" , err); +drivers/gpu/drm/i915/intel_huc_loader.c line 250
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+return err; +} + +/** +* intel_huc_fini() - clean up resources allocated for HuC +* @dev: the drm device +* +* Cleans up by releasing the huc firmware GEM obj. +*/ +void intel_huc_fini (struct drm_device *dev)Why this function takes dev? All other functions take
dev_priv.Michal
Quoted 65 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +12
-0+{ +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; + +mutex_lock (&dev->struct_mutex); +if (huc_fw->uc_fw_obj) +i915_gem_object_put (huc_fw->uc_fw_obj); + huc_fw->uc_fw_obj =NULL ; +mutex_unlock (&dev->struct_mutex); + + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; } +(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex ad140e2..57aef56 100644drivers/gpu/drm/i915/intel_uc.h +10
-0@@ -24,6 +24,9 @@#ifndef _INTEL_UC_H_#define _INTEL_UC_H_ +#define HUC_STATUS2 _MMIO(0xD3B0) +#define HUC_FW_VERIFIED (1<<7) +#include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_ringbuffer.h" @@ -174,6 +177,13 @@ struct intel_guc {struct mutex send_mutex; }; +struct intel_huc { +/* Generic uC firmware management */ +struct intel_uc_fw fw; + +/* HuC-specific additions */ +}; +/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv);bool
intel_guc_recv(struct drm_i915_private *dev_priv, u32 *status); @@ -190,6 +200,9 @@ extern voidintel_guc_fini(struct drm_i915_private *dev_priv); extern const char *intel_uc_fw_status_repr(enumintel_uc_fw_statusstatus); extern intintel_guc_suspend(struct drm_i915_private *dev_priv); extern intintel_guc_resume(struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_uc.h +3
-1+void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw); +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ int i915_guc_submission_init(struct drm_i915_private *dev_priv); @@ -204,4 +217,9 @@ void i915_guc_register(struct drm_i915_private
*dev_priv); voidi915_guc_unregister(struct drm_i915_private *dev_priv); inti915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val);drivers/gpu/drm/i915/intel_uc.h +5
-1+/* intel_huc_loader.c */ +void intel_huc_init (struct drm_i915_private *dev_priv);void +intel_huc_fini (struct drm_device *dev);int intel_huc_load (struct +drm_i915_private *dev_priv); +#endif --2.7.4
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915/huc: Add HuC fw loading support
Quoted 384 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Srivatsa, Anusha
Sent: Monday, January 2, 2017 4:09 PM
To: Wajdeczko, Michal <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 3/8] drm/i915/huc: Add HuC fw loading supportQuoted 289 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Tuesday, December 27, 2016 9:51 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 3/8] drm/i915/huc: Add HuC fw loading supportQuoted 25 lines · Anusha Srivatsa
The HuC loading process is similar to GuC. The
intel_uc_fw_fetch()is used for both cases.HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) updatehuc_versionnumber of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changeddev->dev_privatetoto_i915()
v4: moved function back to where it was.
changewait_for_atomictowait_for.
v5: rebased + comment changes.
v7: rebased.
v8: rebased.
v9: rebased. Changed the year in the copyright message to reflect the right year.Correct the comments,remove the unwanted WARN message, replacedrm_gem_object_unreference()with i915_gem_object_put().Make the prototypes inintel_huc.hnon-extern.
v10: rebased. Update the file construction done by HuC. It is similar to GuC.Adopted the approach used in-
https://patchwork.freedesktop.org/patch/104355/ <Tvrtko Ursulin>
v11: Fix warnings remove old declarationQuoted 8 lines
v12: Change dev to
dev_privin macro definition.
Corrected comments.
v13: rebased.
v14: rebased on top of drm-tip
v15: rebased. Updated functions intel_huc_load(),intel_huc_init() andintel_uc_fw_fetch()to acceptdev_privinstead of dev. Moved contents ofintel_huc.htointel_uc.h
v16: changeSKL_FW_toSKL_HUC_FW_. Addintel_prefix to
guc_wopcm_size().Quoted 9 lines
Remove unwanted checks in
intel_uc.h. Renamehuc_fwin structintel_hucto simply fw to avoid redundency.
v17: rebased.Cc Tvrtko Ursulin <[email protected]>Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Quoted 7 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/intel_guc_loader.c | 11 +-
drivers/gpu/drm/i915/intel_huc_loader.c| 263++++++++++++++++++++++++++++++++
Quoted 20 lines
drivers/gpu/drm/i915/intel_uc.h | 18 +++ 7 files changed, 296 insertions(+), 7 deletions(-) create mode100644
drivers/gpu/drm/i915/intel_huc_loader.c(quoted diff) +0
-0b/drivers/gpu/drm/i915/Makefile index 5196509..45ae124 100644
drivers/gpu/drm/i915/Makefile +1
-0@@ -57,6 +57,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ intel_guc_loader.o \ + intel_huc_loader.o \ i915_guc_submission.o # autogenerated null render state(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex 6428588..85a47c2 100644drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -600,6 +600,7 @@ static int i915_load_modeset_init(structQuoted 1 line
drm_device*dev)
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0if (ret) goto cleanup_irq; +intel_huc_init (dev_priv);intel_guc_init (dev_priv); ret =i915_gem_init (dev_priv);@@ -627,6 +628,7 @@ static int i915_load_modeset_init(struct
drm_device*dev)
Quoted 62 lines
drivers/gpu/drm/i915/i915_drv.c +2
-1DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); cleanup_irq: +intel_huc_fini (dev);intel_guc_fini (dev_priv);drm_irq_uninstall (dev);intel_teardown_gmbus (dev_priv);@@ -1313,7 +1315,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ drain_workqueue (dev_priv->wq); - +intel_huc_fini (dev);intel_guc_fini (dev_priv);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 1a91409..7ac7730 100644drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2147,6 +2147,7 @@ struct drm_i915_private {struct intel_gvt *gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;@@ -2921,7 +2922,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_GUC (dev_priv) ((dev_priv)->info.has_guc)#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) - +#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)#define
HAS_POOLED_EU(dev_priv)((dev_priv)->info.has_pooled_eu)drivers/gpu/drm/i915/i915_guc_reg.h +3
-0@@ -61,9 +61,12 @@#define DMA_ADDRESS_SPACE_GTT (8 << 16)#define DMA_COPY_SIZE _MMIO(0xc310)#define DMA_CTRL _MMIO(0xc314) +#define HUC_UKERNEL (1<<9)#define UOS_MOVE (1<<4)#define START_DMA (1<<0)#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340) +#define HUC_LOADING_AGENT_VCR (0<<1) +#define HUC_LOADING_AGENT_GUC (1<<1)#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -309,8 +309,8 @@ static int guc_ucode_xfer_dma(structQuoted 1 line
drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-1I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM );/* Finally start the DMA */ - I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA));drivers/gpu/drm/i915/intel_guc_loader.c
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1- + I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA) |Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0+ _MASKED_BIT_DISABLE(HUC_UKERNEL));/* * Wait for the DMA to complete & the GuC to start up. * NB: Docs recommend not using the interrupt for completion. @@ -334,7 +334,7 @@ static int guc_ucode_xfer_dma(struct
drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1return ret; } -static u32 guc_wopcm_size (struct drm_i915_private *dev_priv) +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv) {u32 wopcm_size =GUC_WOPCM_TOP ;@@ -372,7 +372,7 @@ static int guc_ucode_xfer(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,guc_wopcm_size (dev_priv)); +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); I915_WRITE(DMA_GUC_WOPCM_OFFSET,
GUC_WOPCM_OFFSET_VALUE);drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0/* Enable MIA caching. GuC clock gating is disabled. */ @@ -511,6 +511,7 @@ int intel_guc_setup(struct drm_i915_private *dev_priv) if (err) goto fail; +intel_huc_load (dev_priv); err =guc_ucode_xfer (dev_priv);if (!err)break ;@@ -658,7 +659,7 @@ void intel_uc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0size = uc_fw->header_size + uc_fw->ucode_size;/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1-if (size >guc_wopcm_size (dev_priv)) { +if (size >intel_guc_wopcm_size (dev_priv)) { DRM_ERROR("Firmware is too large to fit inWOPCM\n");
Quoted 25 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0goto fail; }drivers/gpu/drm/i915/intel_huc_loader.c new file +16
-0@@ -0,0 +1,263 @@ +/* +* Copyright (c) 2016 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom +the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including drivers/gpu/drm/i915/intel_huc_loader.c line 26
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+the next + * paragraph) shall be included in all copies or substantial +portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY , + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NOEVENT
drivers/gpu/drm/i915/intel_huc_loader.c line 28
Quoted 2 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +2
-0+SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,DAMAGES
Quoted 41 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +41
-0+OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#include <linux/firmware.h> +#include "i915_drv.h" +#include "intel_uc.h" + +/** +* DOC: HuC Firmware +* +* Motivation: +* GEN9 introduces a new dedicated firmware for usage in media HEVC +(High +* Efficiency Video Coding) operations. Userspace can use the +firmware +* capabilities by adding HuC specific commands to batch buffers. +* +* Implementation: +* The same firmware loader is used as the GuC. However, the actual +* loading to HW is deferred until GEM initialization is done. +* +* Note that HuC firmware loading must be done before GuC loading. +*/ + +#define SKL_HUC_FW_MAJOR 01 +#define SKL_HUC_FW_MINOR 07 +#define SKL_BLD_NUM 1398 + +#define HUC_FW_PATH (platform, major, minor, bld_num) \ + "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ + __stringify(minor) "_" __stringify(bld_num) ".bin" + +#define I915_SKL_HUC_UCODE HUC_FW_PATH(skl, SKL_HUC_FW_MAJOR, \ + SKL_HUC_FW_MINOR, SKL_BLD_NUM) +MODULE_FIRMWARE (I915_SKL_HUC_UCODE ); +Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 6 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +6
-0+/** +* huc_ucode_xfer() - DMA's the firmware +* @dev_priv: the drm device +* +* This function takes the gem object containing the firmware, sets +up the DMA Hmm, this function takes just
dev_priv...Oops.... will change the comment.
Anusha
Quoted 70 lines
Quoted 23 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +22
-0+* engine MMIO, triggers the DMA operation and waits for it to finish. +* +* Transfer the firmware image to RAM for execution by the microcontroller. +* +* Return: 0 on success, non-zero on failure */ static int +huc_ucode_xfer (struct drm_i915_private *dev_priv) { +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +struct i915_vma *vma; +unsigned long offset =0 ; +u32 size; +int ret; + + ret =i915_gem_object_set_to_gtt_domain (huc_fw->uc_fw_obj, false); +if (ret) { +DRM_DEBUG_DRIVER ("set-domain failed %d\n" , ret); +return ret; + } + + vma =i915_gem_object_ggtt_pin (huc_fw->uc_fw_obj,NULL ,0 ,0 ,0 ); +if (IS_ERR (vma)) { +DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma)); +return PTR_ERR (vma);drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ } + +/* Invalidate GuC TLB to let GuC take the latest updates to GTT. */ +I915_WRITE (GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* init WOPCM */ +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); + I915_WRITE(DMA_GUC_WOPCM_OFFSET,
GUC_WOPCM_OFFSET_VALUE|Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +8
-0+ HUC_LOADING_AGENT_GUC); + +/* Set the source address for the uCode */ + offset =i915_ggtt_offset (vma) + huc_fw->header_offset; +I915_WRITE (DMA_ADDR_0_LOW ,lower_32_bits (offset)); +I915_WRITE (DMA_ADDR_0_HIGH ,upper_32_bits (offset) &0xFFFF ); + +/* Hardware doesn't look at destination address for HuC. Set it to 0, drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+* but still program the correct address space. +*/ +I915_WRITE (DMA_ADDR_1_LOW ,0 ); +I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM ); + + size = huc_fw->header_size + huc_fw->ucode_size; +I915_WRITE (DMA_COPY_SIZE , size); + +/* Start the DMA */ + I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(HUC_UKERNEL |
START_DMA));Quoted 17 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +17
-0+ +/* Wait for DMA to finish */ + ret =wait_for ((I915_READ (DMA_CTRL ) &START_DMA ) ==0 ,100 ); + +DRM_DEBUG_DRIVER ("HuC DMA transfer wait over with ret %d\n" , ret); + +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); + +/* +* We keep the object pages for reuse during resume. But we can unpin it +* now that DMA has completed, so it doesn't continue to take up space. +*/ +i915_vma_unpin (vma); + +return ret; +} +
Quoted 108 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 7 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +7
-0+/** +* intel_huc_init() - initiate HuC firmware loading request +* @dev_priv: the drm_i915_private device +* +* Called early during driver load, but after GEM is initialised. +The loading +* will continue only when driver explicitly specify firmware name and version.
Quoted 100 lines
Quoted 87 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +87
-0+* All other cases are considered as INTEL_UC_FIRMWARE_NONE either +because HW +* is not capable or driver yet support it. And there will be no +error message +* for INTEL_UC_FIRMWARE_NONE cases. +* +* The DMA-copying to HW is done later when intel_huc_load() is called. +*/ +void intel_huc_init (struct drm_i915_private *dev_priv) { +struct intel_huc *huc = &dev_priv->huc; +struct intel_uc_fw *huc_fw = &huc->fw; +const char *fw_path =NULL ; + + huc_fw->uc_fw_path =NULL ; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->fw_type =INTEL_UC_FW_TYPE_HUC ; + +if (!HAS_HUC_UCODE (dev_priv)) +return ; + +if (IS_SKYLAKE (dev_priv)) { + fw_path =I915_SKL_HUC_UCODE ; + huc_fw->major_ver_wanted =SKL_HUC_FW_MAJOR ; + huc_fw->minor_ver_wanted =SKL_HUC_FW_MINOR ; + } + + huc_fw->uc_fw_path = fw_path; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + +DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); + +intel_uc_fw_fetch (dev_priv, huc_fw); } + +/** +* intel_huc_load() - load HuC uCode to device +* @dev_priv: the drm_i915_private device +* +* Called from gem_init_hw() during driver loading and also after a GPU reset. +* Be note that HuC loading must be done before GuC loading. +* +* The firmware image should have already been fetched into memory +by the +* earlier call to intel_huc_init(), so here we need only check that +* is succeeded, and then transfer the image to the h/w. +* +* Return: non-zero code on error +*/ +int intel_huc_load (struct drm_i915_private *dev_priv) { +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +int err; + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_NONE ) +return 0 ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status)); + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_SUCCESS && + huc_fw->load_status ==INTEL_UC_FIRMWARE_FAIL ) +return -ENOEXEC ; + + huc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; + +switch (huc_fw->fetch_status) { +case INTEL_UC_FIRMWARE_FAIL : +/* something went wrong :( */ + err = -EIO ; + goto fail; + +case INTEL_UC_FIRMWARE_NONE : +case INTEL_UC_FIRMWARE_PENDING : +default : +/* "can't happen" */ +WARN_ONCE (1 ,"HuC fw %s invalid fetch_status %s [%d]\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), + huc_fw->fetch_status); + err = -ENXIO ; + goto fail; + +case INTEL_UC_FIRMWARE_SUCCESS : +break ; + } +drivers/gpu/drm/i915/intel_huc_loader.c line 231
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ err =huc_ucode_xfer (dev_priv); +if (err) + goto fail; + + huc_fw->load_status =INTEL_UC_FIRMWARE_SUCCESS ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status));Hmm, this message will always display "fetch SUCCESS load SUCCESS" as all other cases all handled as fail below... is it expected ?
Yes. I think we need a message for the case when there is no failure.
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +13
-0+ +return 0 ; + +fail: +if (huc_fw->load_status ==INTEL_UC_FIRMWARE_PENDING ) + huc_fw->load_status =INTEL_UC_FIRMWARE_FAIL ; + +DRM_ERROR ("Failed to complete HuC uCode load with ret %d\n" , err); + +return err; +} + +/**
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c line 250
Quoted 6 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +6
-0+* intel_huc_fini() - clean up resources allocated for HuC +* @dev: the drm device +* +* Cleans up by releasing the huc firmware GEM obj. +*/ +void intel_huc_fini (struct drm_device *dev)Why this function takes dev? All other functions take
dev_priv.
Last I heard this was the only function that took dev and there some WIP before we make it take dev_priv. Arek, can we change this now?
Quoted 67 lines
Quoted 67 lines
Michal
Quoted 65 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +12
-0+{ +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; + +mutex_lock (&dev->struct_mutex); +if (huc_fw->uc_fw_obj) +i915_gem_object_put (huc_fw->uc_fw_obj); + huc_fw->uc_fw_obj =NULL ; +mutex_unlock (&dev->struct_mutex); + + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; } +(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex ad140e2..57aef56 100644drivers/gpu/drm/i915/intel_uc.h +10
-0@@ -24,6 +24,9 @@#ifndef _INTEL_UC_H_#define _INTEL_UC_H_ +#define HUC_STATUS2 _MMIO(0xD3B0) +#define HUC_FW_VERIFIED (1<<7) +#include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_ringbuffer.h" @@ -174,6 +177,13 @@ struct intel_guc {struct mutex send_mutex; }; +struct intel_huc { +/* Generic uC firmware management */ +struct intel_uc_fw fw; + +/* HuC-specific additions */ +}; +/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv);bool
intel_guc_recv(struct drm_i915_private *dev_priv, u32 *status); @@ -190,6 +200,9 @@ extern voidintel_guc_fini(struct drm_i915_private *dev_priv); extern const char *intel_uc_fw_status_repr(enumintel_uc_fw_statusstatus); extern intintel_guc_suspend(struct drm_i915_private *dev_priv); extern intintel_guc_resume(struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_uc.h +3
-1+void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw); +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ int i915_guc_submission_init(struct drm_i915_private *dev_priv); @@ -204,4 +217,9 @@ void i915_guc_register(struct drm_i915_private
*dev_priv); voidi915_guc_unregister(struct drm_i915_private *dev_priv); inti915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val);drivers/gpu/drm/i915/intel_uc.h +5
-1+/* intel_huc_loader.c */ +void intel_huc_init (struct drm_i915_private *dev_priv);void +intel_huc_fini (struct drm_device *dev);int intel_huc_load (struct +drm_i915_private *dev_priv); +#endif --2.7.4
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 3/8] drm/i915/huc: Add HuC fw loading support
Quoted 517 lines · Anusha
Quoted 384 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Srivatsa, Anusha
Sent: Monday, January 2, 2017 4:09 PM
To: Wajdeczko, Michal <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 3/8] drm/i915/huc: Add HuC fw loading supportQuoted 289 lines
-----Original Message-----
From: Wajdeczko, Michal
Sent: Tuesday, December 27, 2016 9:51 AM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 3/8] drm/i915/huc: Add HuC fw loading supportQuoted 25 lines · Anusha Srivatsa
The HuC loading process is similar to GuC. The
intel_uc_fw_fetch()is used for both cases.HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) updatehuc_versionnumber of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changeddev->dev_privatetoto_i915()
v4: moved function back to where it was.
changewait_for_atomictowait_for.
v5: rebased + comment changes.
v7: rebased.
v8: rebased.
v9: rebased. Changed the year in the copyright message to reflect the right year.Correct the comments,remove the unwanted WARN message, replacedrm_gem_object_unreference()with i915_gem_object_put().Make the prototypes inintel_huc.hnon-extern.
v10: rebased. Update the file construction done by HuC. It is similar to GuC.Adopted the approach used in-
https://patchwork.freedesktop.org/patch/104355/ <Tvrtko Ursulin>
v11: Fix warnings remove old declarationQuoted 8 lines
v12: Change dev to
dev_privin macro definition.
Corrected comments.
v13: rebased.
v14: rebased on top of drm-tip
v15: rebased. Updated functions intel_huc_load(),intel_huc_init() andintel_uc_fw_fetch()to acceptdev_privinstead of dev. Moved contents ofintel_huc.htointel_uc.h
v16: changeSKL_FW_toSKL_HUC_FW_. Addintel_prefix to
guc_wopcm_size().Quoted 9 lines
Remove unwanted checks in
intel_uc.h. Renamehuc_fwin structintel_hucto simply fw to avoid redundency.
v17: rebased.Cc Tvrtko Ursulin <[email protected]>Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Quoted 7 lines
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 4 +- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/intel_guc_loader.c | 11 +-
drivers/gpu/drm/i915/intel_huc_loader.c| 263++++++++++++++++++++++++++++++++
Quoted 20 lines
drivers/gpu/drm/i915/intel_uc.h | 18 +++ 7 files changed, 296 insertions(+), 7 deletions(-) create mode100644
drivers/gpu/drm/i915/intel_huc_loader.c(quoted diff) +0
-0b/drivers/gpu/drm/i915/Makefile index 5196509..45ae124 100644
drivers/gpu/drm/i915/Makefile +1
-0@@ -57,6 +57,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ intel_guc_loader.o \ + intel_huc_loader.o \ i915_guc_submission.o # autogenerated null render state(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.cindex 6428588..85a47c2 100644drivers/gpu/drm/i915/i915_drv.c +0
-0@@ -600,6 +600,7 @@ static int i915_load_modeset_init(structQuoted 1 line
drm_device*dev)
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0if (ret) goto cleanup_irq; +intel_huc_init (dev_priv);intel_guc_init (dev_priv); ret =i915_gem_init (dev_priv);@@ -627,6 +628,7 @@ static int i915_load_modeset_init(struct
drm_device*dev)
Quoted 62 lines
drivers/gpu/drm/i915/i915_drv.c +2
-1DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); cleanup_irq: +intel_huc_fini (dev);intel_guc_fini (dev_priv);drm_irq_uninstall (dev);intel_teardown_gmbus (dev_priv);@@ -1313,7 +1315,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ drain_workqueue (dev_priv->wq); - +intel_huc_fini (dev);intel_guc_fini (dev_priv);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_drv.hindex 1a91409..7ac7730 100644drivers/gpu/drm/i915/i915_drv.h +2
-1@@ -2147,6 +2147,7 @@ struct drm_i915_private {struct intel_gvt *gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;@@ -2921,7 +2922,7 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_GUC (dev_priv) ((dev_priv)->info.has_guc)#define HAS_GUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_GUC_SCHED (dev_priv) (HAS_GUC(dev_priv)) - +#define HAS_HUC_UCODE (dev_priv) (HAS_GUC(dev_priv))#define HAS_RESOURCE_STREAMER (dev_priv) ((dev_priv)->info.has_resource_streamer)#define
HAS_POOLED_EU(dev_priv)((dev_priv)->info.has_pooled_eu)drivers/gpu/drm/i915/i915_guc_reg.h +3
-0@@ -61,9 +61,12 @@#define DMA_ADDRESS_SPACE_GTT (8 << 16)#define DMA_COPY_SIZE _MMIO(0xc310)#define DMA_CTRL _MMIO(0xc314) +#define HUC_UKERNEL (1<<9)#define UOS_MOVE (1<<4)#define START_DMA (1<<0)#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340) +#define HUC_LOADING_AGENT_VCR (0<<1) +#define HUC_LOADING_AGENT_GUC (1<<1)#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -309,8 +309,8 @@ static int guc_ucode_xfer_dma(structQuoted 1 line
drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,
Quoted 4 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-1I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM );/* Finally start the DMA */ - I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA));drivers/gpu/drm/i915/intel_guc_loader.c
Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1- + I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(UOS_MOVE |
START_DMA) |Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-0+ _MASKED_BIT_DISABLE(HUC_UKERNEL));/* * Wait for the DMA to complete & the GuC to start up. * NB: Docs recommend not using the interrupt for completion. @@ -334,7 +334,7 @@ static int guc_ucode_xfer_dma(struct
drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private
Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1return ret; } -static u32 guc_wopcm_size (struct drm_i915_private *dev_priv) +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv) {u32 wopcm_size =GUC_WOPCM_TOP ;@@ -372,7 +372,7 @@ static int guc_ucode_xfer(struct drm_i915_private
*dev_priv)drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer(struct drm_i915_private *dev_priv)
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );/* init WOPCM */ -I915_WRITE (GUC_WOPCM_SIZE ,guc_wopcm_size (dev_priv)); +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); I915_WRITE(DMA_GUC_WOPCM_OFFSET,
GUC_WOPCM_OFFSET_VALUE);drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private
Quoted 11 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0/* Enable MIA caching. GuC clock gating is disabled. */ @@ -511,6 +511,7 @@ int intel_guc_setup(struct drm_i915_private *dev_priv) if (err) goto fail; +intel_huc_load (dev_priv); err =guc_ucode_xfer (dev_priv);if (!err)break ;@@ -658,7 +659,7 @@ void intel_uc_fw_fetch(struct drm_i915_private
*dev_priv,drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0size = uc_fw->header_size + uc_fw->ucode_size;/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
drivers/gpu/drm/i915/intel_guc_loader.c void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1
-1-if (size >guc_wopcm_size (dev_priv)) { +if (size >intel_guc_wopcm_size (dev_priv)) { DRM_ERROR("Firmware is too large to fit inWOPCM\n");
Quoted 25 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-0goto fail; }drivers/gpu/drm/i915/intel_huc_loader.c new file +16
-0@@ -0,0 +1,263 @@ +/* +* Copyright (c) 2016 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom +the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including drivers/gpu/drm/i915/intel_huc_loader.c line 26
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+the next + * paragraph) shall be included in all copies or substantial +portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY , + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NOEVENT
drivers/gpu/drm/i915/intel_huc_loader.c line 28
Quoted 2 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +2
-0+SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,DAMAGES
Quoted 41 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +41
-0+OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#include <linux/firmware.h> +#include "i915_drv.h" +#include "intel_uc.h" + +/** +* DOC: HuC Firmware +* +* Motivation: +* GEN9 introduces a new dedicated firmware for usage in media HEVC +(High +* Efficiency Video Coding) operations. Userspace can use the +firmware +* capabilities by adding HuC specific commands to batch buffers. +* +* Implementation: +* The same firmware loader is used as the GuC. However, the actual +* loading to HW is deferred until GEM initialization is done. +* +* Note that HuC firmware loading must be done before GuC loading. +*/ + +#define SKL_HUC_FW_MAJOR 01 +#define SKL_HUC_FW_MINOR 07 +#define SKL_BLD_NUM 1398 + +#define HUC_FW_PATH (platform, major, minor, bld_num) \ + "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ + __stringify(minor) "_" __stringify(bld_num) ".bin" + +#define I915_SKL_HUC_UCODE HUC_FW_PATH(skl, SKL_HUC_FW_MAJOR, \ + SKL_HUC_FW_MINOR, SKL_BLD_NUM) +MODULE_FIRMWARE (I915_SKL_HUC_UCODE ); +Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 6 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +6
-0+/** +* huc_ucode_xfer() - DMA's the firmware +* @dev_priv: the drm device +* +* This function takes the gem object containing the firmware, sets +up the DMA Hmm, this function takes just
dev_priv...Oops.... will change the comment.
Anusha
Quoted 70 lines
Quoted 23 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +22
-0+* engine MMIO, triggers the DMA operation and waits for it to finish. +* +* Transfer the firmware image to RAM for execution by the microcontroller. +* +* Return: 0 on success, non-zero on failure */ static int +huc_ucode_xfer (struct drm_i915_private *dev_priv) { +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +struct i915_vma *vma; +unsigned long offset =0 ; +u32 size; +int ret; + + ret =i915_gem_object_set_to_gtt_domain (huc_fw->uc_fw_obj, false); +if (ret) { +DRM_DEBUG_DRIVER ("set-domain failed %d\n" , ret); +return ret; + } + + vma =i915_gem_object_ggtt_pin (huc_fw->uc_fw_obj,NULL ,0 ,0 ,0 ); +if (IS_ERR (vma)) { +DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma)); +return PTR_ERR (vma);drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ } + +/* Invalidate GuC TLB to let GuC take the latest updates to GTT. */ +I915_WRITE (GEN8_GTCR ,GEN8_GTCR_INVALIDATE ); + +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL ); + +/* init WOPCM */ +I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv)); + I915_WRITE(DMA_GUC_WOPCM_OFFSET,
GUC_WOPCM_OFFSET_VALUE|Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +8
-0+ HUC_LOADING_AGENT_GUC); + +/* Set the source address for the uCode */ + offset =i915_ggtt_offset (vma) + huc_fw->header_offset; +I915_WRITE (DMA_ADDR_0_LOW ,lower_32_bits (offset)); +I915_WRITE (DMA_ADDR_0_HIGH ,upper_32_bits (offset) &0xFFFF ); + +/* Hardware doesn't look at destination address for HuC. Set it to 0, drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+* but still program the correct address space. +*/ +I915_WRITE (DMA_ADDR_1_LOW ,0 ); +I915_WRITE (DMA_ADDR_1_HIGH ,DMA_ADDRESS_SPACE_WOPCM ); + + size = huc_fw->header_size + huc_fw->ucode_size; +I915_WRITE (DMA_COPY_SIZE , size); + +/* Start the DMA */ + I915_WRITE(DMA_CTRL, _MASKED_BIT_ENABLE(HUC_UKERNEL |
START_DMA));Quoted 17 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +17
-0+ +/* Wait for DMA to finish */ + ret =wait_for ((I915_READ (DMA_CTRL ) &START_DMA ) ==0 ,100 ); + +DRM_DEBUG_DRIVER ("HuC DMA transfer wait over with ret %d\n" , ret); + +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); + +/* +* We keep the object pages for reuse during resume. But we can unpin it +* now that DMA has completed, so it doesn't continue to take up space. +*/ +i915_vma_unpin (vma); + +return ret; +} +Quoted 108 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_huc_loader.c
Quoted 7 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +7
-0+/** +* intel_huc_init() - initiate HuC firmware loading request +* @dev_priv: the drm_i915_private device +* +* Called early during driver load, but after GEM is initialised. +The loading +* will continue only when driver explicitly specify firmware name and version.
Quoted 100 lines
Quoted 87 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +87
-0+* All other cases are considered as INTEL_UC_FIRMWARE_NONE either +because HW +* is not capable or driver yet support it. And there will be no +error message +* for INTEL_UC_FIRMWARE_NONE cases. +* +* The DMA-copying to HW is done later when intel_huc_load() is called. +*/ +void intel_huc_init (struct drm_i915_private *dev_priv) { +struct intel_huc *huc = &dev_priv->huc; +struct intel_uc_fw *huc_fw = &huc->fw; +const char *fw_path =NULL ; + + huc_fw->uc_fw_path =NULL ; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; + huc_fw->fw_type =INTEL_UC_FW_TYPE_HUC ; + +if (!HAS_HUC_UCODE (dev_priv)) +return ; + +if (IS_SKYLAKE (dev_priv)) { + fw_path =I915_SKL_HUC_UCODE ; + huc_fw->major_ver_wanted =SKL_HUC_FW_MAJOR ; + huc_fw->minor_ver_wanted =SKL_HUC_FW_MINOR ; + } + + huc_fw->uc_fw_path = fw_path; + huc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + +DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); + +intel_uc_fw_fetch (dev_priv, huc_fw); } + +/** +* intel_huc_load() - load HuC uCode to device +* @dev_priv: the drm_i915_private device +* +* Called from gem_init_hw() during driver loading and also after a GPU reset. +* Be note that HuC loading must be done before GuC loading. +* +* The firmware image should have already been fetched into memory +by the +* earlier call to intel_huc_init(), so here we need only check that +* is succeeded, and then transfer the image to the h/w. +* +* Return: non-zero code on error +*/ +int intel_huc_load (struct drm_i915_private *dev_priv) { +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +int err; + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_NONE ) +return 0 ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status)); + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_SUCCESS && + huc_fw->load_status ==INTEL_UC_FIRMWARE_FAIL ) +return -ENOEXEC ; + + huc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; + +switch (huc_fw->fetch_status) { +case INTEL_UC_FIRMWARE_FAIL : +/* something went wrong :( */ + err = -EIO ; + goto fail; + +case INTEL_UC_FIRMWARE_NONE : +case INTEL_UC_FIRMWARE_PENDING : +default : +/* "can't happen" */ +WARN_ONCE (1 ,"HuC fw %s invalid fetch_status %s [%d]\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), + huc_fw->fetch_status); + err = -ENXIO ; + goto fail; + +case INTEL_UC_FIRMWARE_SUCCESS : +break ; + } +drivers/gpu/drm/i915/intel_huc_loader.c line 231
Quoted 10 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +10
-0+ err =huc_ucode_xfer (dev_priv); +if (err) + goto fail; + + huc_fw->load_status =INTEL_UC_FIRMWARE_SUCCESS ; + +DRM_DEBUG_DRIVER ("%s fw status: fetch %s, load %s\n" , + huc_fw->uc_fw_path, +intel_uc_fw_status_repr (huc_fw->fetch_status), +intel_uc_fw_status_repr (huc_fw->load_status));Hmm, this message will always display "fetch SUCCESS load SUCCESS" as all other cases all handled as fail below... is it expected ?
Yes. I think we need a message for the case when there is no failure.
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +13
-0+ +return 0 ; + +fail: +if (huc_fw->load_status ==INTEL_UC_FIRMWARE_PENDING ) + huc_fw->load_status =INTEL_UC_FIRMWARE_FAIL ; + +DRM_ERROR ("Failed to complete HuC uCode load with ret %d\n" , err); + +return err; +} + +/** Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/i915/intel_huc_loader.c line 250
Quoted 6 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +6
-0+* intel_huc_fini() - clean up resources allocated for HuC +* @dev: the drm device +* +* Cleans up by releasing the huc firmware GEM obj. +*/ +void intel_huc_fini (struct drm_device *dev)Why this function takes dev? All other functions take
dev_priv.
Quoted 2 lines
Last I heard this was the only function that took dev and there some WIP before we make it take
dev_priv. Arek, can we change this now?
IIRC the refactoring that happened changed dev to dev_priv everywhere where the latter was used exclusively. This patchset was changed accordingly and this function was left with dev, as it uses it for lock access.
But I see your point with being consistent.
Quoted 79 lines
Quoted 67 lines
Quoted 67 lines
Michal
Quoted 65 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +12
-0+{ +struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; + +mutex_lock (&dev->struct_mutex); +if (huc_fw->uc_fw_obj) +i915_gem_object_put (huc_fw->uc_fw_obj); + huc_fw->uc_fw_obj =NULL ; +mutex_unlock (&dev->struct_mutex); + + huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; } +(quoted diff) +0
-0
b/drivers/gpu/drm/i915/intel_uc.hindex ad140e2..57aef56 100644drivers/gpu/drm/i915/intel_uc.h +10
-0@@ -24,6 +24,9 @@#ifndef _INTEL_UC_H_#define _INTEL_UC_H_ +#define HUC_STATUS2 _MMIO(0xD3B0) +#define HUC_FW_VERIFIED (1<<7) +#include "intel_guc_fwif.h" #include "i915_guc_reg.h" #include "intel_ringbuffer.h" @@ -174,6 +177,13 @@ struct intel_guc {struct mutex send_mutex; }; +struct intel_huc { +/* Generic uC firmware management */ +struct intel_uc_fw fw; + +/* HuC-specific additions */ +}; +/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv);bool
intel_guc_recv(struct drm_i915_private *dev_priv, u32 *status); @@ -190,6 +200,9 @@ extern voidintel_guc_fini(struct drm_i915_private *dev_priv); extern const char *intel_uc_fw_status_repr(enumintel_uc_fw_statusstatus); extern intintel_guc_suspend(struct drm_i915_private *dev_priv); extern intintel_guc_resume(struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_uc.h +3
-1+void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw); +u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ int i915_guc_submission_init(struct drm_i915_private *dev_priv); @@ -204,4 +217,9 @@ void i915_guc_register(struct drm_i915_private
*dev_priv); voidi915_guc_unregister(struct drm_i915_private *dev_priv); inti915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val);drivers/gpu/drm/i915/intel_uc.h +5
-1+/* intel_huc_loader.c */ +void intel_huc_init (struct drm_i915_private *dev_priv);void +intel_huc_fini (struct drm_device *dev);int intel_huc_load (struct +drm_i915_private *dev_priv); +#endif --2.7.4
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/8 drm/i915/huc: Add BXT HuC Loading Support
In reply to Anusha SrivatsaThis patch adds the HuC Loading for the BXT by using the updated file construction.
Version 1.7 of the HuC firmware.
v2: rebased.
v3: rebased on top of drm-tip
v4: rebased.
v5: rebased. Rename BXT_FW_MAJOR to BXT_HUC_FW_
v6: rebased.
--- drivers/gpu/drm/i915/intel_huc_loader.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/i915/intel_huc_loader.c +11 -0
@@ -40,6 +40,10 @@* Note that HuC firmware loading must be done before GuC loading. */ +#define BXT_HUC_FW_MAJOR 01 +#define BXT_HUC_FW_MINOR 07 +#define BXT_BLD_NUM 1398 +#define SKL_HUC_FW_MAJOR 01#define SKL_HUC_FW_MINOR 07#define SKL_BLD_NUM 1398
@@ -52,6 +56,9 @@ SKL_HUC_FW_MINOR, SKL_BLD_NUM)MODULE_FIRMWARE (I915_SKL_HUC_UCODE ); +#define I915_BXT_HUC_UCODE HUC_FW_PATH(bxt, BXT_HUC_FW_MAJOR, \ + BXT_HUC_FW_MINOR, BXT_BLD_NUM) +MODULE_FIRMWARE (I915_BXT_HUC_UCODE );/** * huc_ucode_xfer() - DMA's the firmware * @dev_priv: the drm device
@@ -156,6 +163,10 @@ void intel_huc_init(struct drm_i915_private *dev_priv) fw_path =I915_SKL_HUC_UCODE ; huc_fw->major_ver_wanted =SKL_HUC_FW_MAJOR ; huc_fw->minor_ver_wanted =SKL_HUC_FW_MINOR ; + }else if (IS_BROXTON (dev_priv)) { + fw_path =I915_BXT_HUC_UCODE ; + huc_fw->major_ver_wanted =BXT_HUC_FW_MAJOR ; + huc_fw->minor_ver_wanted =BXT_HUC_FW_MINOR ; } huc_fw->uc_fw_path = fw_path;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 4/8] drm/i915/huc: Add BXT HuC Loading Support
Quoted 5 lines · Anusha Srivatsa
This patch adds the HuC Loading for the BXT by using the updated file construction.
Version 1.7 of the HuC firmware.
Quoted 8 lines
v2: rebased.
v3: rebased on top of drm-tip
v4: rebased.
v5: rebased. RenameBXT_FW_MAJORtoBXT_HUC_FW_
v6: rebased.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/8 drm/i915/HuC: Add KBL huC loading Support
In reply to Anusha SrivatsaThis patch adds the support to load HuC on KBL
Version 2.0
v2: rebased.
v3: rebased on top of drm-tip
v4: rebased.
v5: rebased. Rename KBL_FW_ to KBL_HUC_FW_
v6: rebased. Remove old checks.
--- drivers/gpu/drm/i915/intel_huc_loader.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
drivers/gpu/drm/i915/intel_huc_loader.c +13 -0
@@ -48,6 +48,10 @@#define SKL_HUC_FW_MINOR 07#define SKL_BLD_NUM 1398 +#define KBL_HUC_FW_MAJOR 02 +#define KBL_HUC_FW_MINOR 00 +#define KBL_BLD_NUM 1810 +#define HUC_FW_PATH (platform, major, minor, bld_num) \ "i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \ __stringify(minor) "_" __stringify(bld_num) ".bin"
@@ -59,6 +63,11 @@ MODULE_FIRMWARE(I915_SKL_HUC_UCODE);#define I915_BXT_HUC_UCODE HUC_FW_PATH(bxt, BXT_HUC_FW_MAJOR, \ BXT_HUC_FW_MINOR, BXT_BLD_NUM)MODULE_FIRMWARE (I915_BXT_HUC_UCODE ); + +#define I915_KBL_HUC_UCODE HUC_FW_PATH(kbl, KBL_HUC_FW_MAJOR, \ + KBL_HUC_FW_MINOR, KBL_BLD_NUM) +MODULE_FIRMWARE (I915_KBL_HUC_UCODE ); +/** * huc_ucode_xfer() - DMA's the firmware * @dev_priv: the drm device
@@ -167,6 +176,10 @@ void intel_huc_init(struct drm_i915_private *dev_priv) fw_path =I915_BXT_HUC_UCODE ; huc_fw->major_ver_wanted =BXT_HUC_FW_MAJOR ; huc_fw->minor_ver_wanted =BXT_HUC_FW_MINOR ; + }else if (IS_KABYLAKE (dev_priv)) { + fw_path =I915_KBL_HUC_UCODE ; + huc_fw->major_ver_wanted =KBL_HUC_FW_MAJOR ; + huc_fw->minor_ver_wanted =KBL_HUC_FW_MINOR ; } huc_fw->uc_fw_path = fw_path;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/8] drm/i915/HuC: Add KBL huC loading Support
Quoted 11 lines · Anusha Srivatsa
This patch adds the support to load HuC on KBL
Version 2.0v2: rebased.
v3: rebased on top of drm-tip
v4: rebased.
v5: rebased. RenameKBL_FW_toKBL_HUC_FW_
v6: rebased. Remove old checks.Cc Tvrtko Ursulin <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/8 drm/i915/huc: Add debugfs for HuC loading status check
In reply to Anusha SrivatsaFrom: Peter Antoine <[email protected]>
Add debugfs entry for HuC loading status check.
v2: rebase on-top of drm-intel-nightly.
v3: rebased again.
v7: rebased.
v8: rebased.
v9: rebased.
v10: rebased.
v11: rebased on top of drm-tip
v12: rebased.
v13: rebased.
--- drivers/gpu/drm/i915/i915_debugfs.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +31 -0
@@ -2325,6 +2325,36 @@ static int i915_llc(struct seq_file *m, void *data)return 0 ; } +static int i915_huc_load_status_info (struct seq_file *m,void *data) +{ +struct drm_i915_private *dev_priv =node_to_i915 (m->private); +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; + +if (!HAS_HUC_UCODE (dev_priv)) +return 0 ; + +seq_puts (m,"HuC firmware status:\n" ); +seq_printf (m,"\tpath: %s\n" , huc_fw->uc_fw_path); +seq_printf (m,"\tfetch: %s\n" , +intel_uc_fw_status_repr (huc_fw->fetch_status)); +seq_printf (m,"\tload: %s\n" , +intel_uc_fw_status_repr (huc_fw->load_status)); +seq_printf (m,"\tversion wanted: %d.%d\n" , + huc_fw->major_ver_wanted, huc_fw->minor_ver_wanted); +seq_printf (m,"\tversion found: %d.%d\n" , + huc_fw->major_ver_found, huc_fw->minor_ver_found); +seq_printf (m,"\theader: offset is %d; size = %d\n" , + huc_fw->header_offset, huc_fw->header_size); +seq_printf (m,"\tuCode: offset is %d; size = %d\n" , + huc_fw->ucode_offset, huc_fw->ucode_size); +seq_printf (m,"\tRSA: offset is %d; size = %d\n" , + huc_fw->rsa_offset, huc_fw->rsa_size); + +seq_printf (m,"\nHuC status 0x%08x:\n" ,I915_READ (HUC_STATUS2 )); + +return 0 ; +} +static int i915_guc_load_status_info (struct seq_file *m,void *data) {struct drm_i915_private *dev_priv =node_to_i915 (m->private);
@@ -4553,6 +4583,7 @@ static const struct drm_info_list i915_debugfs_list[] = { {"i915_guc_info", i915_guc_info, 0}, {"i915_guc_load_status", i915_guc_load_status_info, 0}, {"i915_guc_log_dump", i915_guc_log_dump, 0}, + {"i915_huc_load_status", i915_huc_load_status_info, 0}, {"i915_frequency_info", i915_frequency_info, 0}, {"i915_hangcheck_info", i915_hangcheck_info, 0}, {"i915_drpc_info", i915_drpc_info, 0},
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/8 drm/i915/huc: Support HuC authentication
In reply to Anusha SrivatsaFrom: Peter Antoine <[email protected]>
The HuC authentication is done by host2guc call. The HuC RSA keys are sent to GuC for authentication.
v2: rebased on top of drm-intel-nightly.
changed name format and upped version 1.7.
v3: rebased on top of drm-intel-nightly.
v4: changed wait_for_automic to wait_for
v5: rebased.
v7: rebased.
v8: rebased.
v9: rebased. Rename intel_huc_auh() to intel_guc_auth_huc() and place the prototype in intel_guc.h,correct the comments.
v10: rebased.
v11: rebased.
v12: rebased on top of drm-tip
v13: rebased. Moved intel_guc_auth_huc from i915_guc_submission.c to intel_uc.c.Update dev to dev_priv in intel_guc_auth_huc(). Renamed HOST2GUC_ACTION_AUTHENTICATE_HUC TO INTEL_GUC_ACTION_ AUTHENTICATE_HUC
v14: rebased.
v15: rebased. Add newline on DRM_ERRORs that already dont have one.
--- drivers/gpu/drm/i915/intel_guc_fwif.h | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 2 ++ drivers/gpu/drm/i915/intel_uc.c | 62 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + 4 files changed, 66 insertions(+)
drivers/gpu/drm/i915/intel_guc_fwif.h +1 -0
@@ -506,6 +506,7 @@ enum intel_guc_action {INTEL_GUC_ACTION_EXIT_S_STATE =0x502 ,INTEL_GUC_ACTION_SLPC_REQUEST =0x3003 ,INTEL_GUC_ACTION_UK_LOG_ENABLE_LOGGING =0x0E000 , +INTEL_GUC_ACTION_AUTHENTICATE_HUC =0x4000 , INTEL_GUC_ACTION_LIMIT };
drivers/gpu/drm/i915/intel_guc_loader.c +2 -0
@@ -529,6 +529,8 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)intel_uc_fw_status_repr (guc_fw->fetch_status), intel_uc_fw_status_repr(guc_fw->load_status)); +intel_guc_auth_huc (dev_priv); +if (i915.enable_guc_submission) {if (i915.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);
drivers/gpu/drm/i915/intel_uc.c +62 -0
65 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -192,6 +192,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc);int intel_guc_log_flush_complete (struct intel_guc *guc);int intel_guc_log_flush (struct intel_guc *guc);int intel_guc_log_control (struct intel_guc *guc,u32 control_val); +void intel_guc_auth_huc (struct drm_i915_private *dev_priv);/* intel_guc_loader.c */ extern void intel_guc_init (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/8] drm/i915/huc: Support HuC authentication
Quoted 22 lines · Anusha Srivatsa
drivers/gpu/drm/i915/intel_uc.c +22
-0+void intel_guc_auth_huc (struct drm_i915_private *dev_priv) +{ +struct intel_guc *guc = &dev_priv->guc; +struct intel_huc *huc = &dev_priv->huc; +struct i915_vma *vma; +int ret; +u32 data[2 ]; + +/* Bypass the case where there is no HuC firmware */ +if (huc->fw.fetch_status ==INTEL_UC_FIRMWARE_NONE || + huc->fw.load_status ==INTEL_UC_FIRMWARE_NONE ) +return ; + +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) { +DRM_ERROR ("HuC: GuC fw wasn't loaded. Can't authenticate\n" ); +return ; + } + +if (huc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) { +DRM_ERROR ("HuC: fw wasn't loaded. Nothing to authenticate\n" ); +return ; + }
drivers/gpu/drm/i915/intel_uc.c int intel_guc_log_control(struct intel_guc *guc, u32 control_val) · line 181
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+ + vma =i915_gem_object_ggtt_pin (huc->fw.uc_fw_obj,NULL ,0 ,0 ,0 ); +if (IS_ERR (vma)) { +DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma)); +return ; + } + + +/* Invalidate GuC TLB to let GuC take the latest updates to GTT. */ +I915_WRITE (GEN8_GTCR ,GEN8_GTCR_INVALIDATE );
Still working on stopping this from frequently popping up in code outside of the GTT routines.
drivers/gpu/drm/i915/intel_uc.c int intel_guc_log_control(struct intel_guc *guc, u32 control_val) · line 194
Quoted 12 lines
drivers/gpu/drm/i915/intel_uc.c +12
-0+/* Specify auth action and where public signature is. */ + data[0 ] =INTEL_GUC_ACTION_AUTHENTICATE_HUC ; + data[1 ] =i915_ggtt_offset (vma) + huc->fw.rsa_offset; + + ret =intel_guc_send (guc, data,ARRAY_SIZE (data)); +if (ret) { +DRM_ERROR ("HuC: GuC did not ack Auth request\n" ); + goto out; + } + +/* Check authentication status, it should be done by now */ + ret =wait_for ((I915_READ (HUC_STATUS2 ) &HUC_FW_VERIFIED ) >0 ,50 );
ret = intel_wait_for_register(dev_priv,
HUC_STATUS2, HUC_FW_VERIFIED, HUC_FW_VERIFIED, 50);
wait_for() is a rather large macro, and intel_wait_for_register() employs the spin then sleep optimisation for quick responses. -Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 7/8] drm/i915/huc: Support HuC authentication
Quoted 32 lines
-----Original Message-----
From: Chris Wilson [mailto:[email protected]]
Sent: Thursday, December 22, 2016 3:30 PM
To: Srivatsa, Anusha <[email protected]>
Cc: [email protected]; Alex Dai <[email protected]>; Peter Antoine <[email protected]>
Subject: Re: [Intel-gfx] [PATCH 7/8] drm/i915/huc: Support HuC authenticationQuoted 4 lines · Anusha Srivatsa
drivers/gpu/drm/i915/intel_uc.c +4
-0+void intel_guc_auth_huc (struct drm_i915_private *dev_priv) { +struct intel_guc *guc = &dev_priv->guc; +struct intel_huc *huc = &dev_priv->huc; +struct i915_vma *vma;drivers/gpu/drm/i915/intel_uc.c int intel_guc_log_control(struct intel_guc *guc, u32 control_val)
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+int ret; +u32 data[2 ]; + +/* Bypass the case where there is no HuC firmware */ +if (huc->fw.fetch_status ==INTEL_UC_FIRMWARE_NONE || + huc->fw.load_status ==INTEL_UC_FIRMWARE_NONE ) +return ; + +if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) { + DRM_ERROR("HuC: GuC fw wasn't loaded. Can'tauthenticate\n");
drivers/gpu/drm/i915/intel_uc.c int intel_guc_log_control(struct intel_guc *guc, u32 control_val)
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc.c +5
-0+return ; + } + +if (huc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS ) { + DRM_ERROR("HuC: fw wasn't loaded. Nothing toauthenticate\n");
Quoted 15 lines
drivers/gpu/drm/i915/intel_uc.c int intel_guc_log_control(struct intel_guc *guc, u32 control_val) · line 181
Quoted 12 lines
drivers/gpu/drm/i915/intel_uc.c +12
-0+return ; + } + + vma =i915_gem_object_ggtt_pin (huc->fw.uc_fw_obj,NULL ,0 ,0 ,0 ); +if (IS_ERR (vma)) { +DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma)); +return ; + } + + +/* Invalidate GuC TLB to let GuC take the latest updates to GTT. */ +I915_WRITE (GEN8_GTCR ,GEN8_GTCR_INVALIDATE );Still working on stopping this from frequently popping up in code outside of the GTT routines.
So, basically beautify the code such that the GTT routines do not pop out in non GTT parts of code. Correct?
Quoted 15 lines
drivers/gpu/drm/i915/intel_uc.c int intel_guc_log_control(struct intel_guc *guc, u32 control_val)
Quoted 13 lines
drivers/gpu/drm/i915/intel_uc.c +12
-0+/* Specify auth action and where public signature is. */ + data[0 ] =INTEL_GUC_ACTION_AUTHENTICATE_HUC ; + data[1 ] =i915_ggtt_offset (vma) + huc->fw.rsa_offset; + + ret =intel_guc_send (guc, data,ARRAY_SIZE (data)); +if (ret) { +DRM_ERROR ("HuC: GuC did not ack Auth request\n" ); + goto out; + } + +/* Check authentication status, it should be done by now */ + ret = wait_for((I915_READ(HUC_STATUS2) & HUC_FW_VERIFIED) > 0,50);
Quoted 8 lines
ret = intel_wait_for_register(dev_priv,
HUC_STATUS2, HUC_FW_VERIFIED, HUC_FW_VERIFIED, 50);
wait_for()is a rather large macro, andintel_wait_for_register()employs the spin then sleep optimisation for quick responses.
Thankyou for bringing this to my notice.
Anusha
Quoted 4 lines
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/8 drm/i915/get_params: Add HuC status to getparams
In reply to Anusha SrivatsaFrom: Peter Antoine <[email protected]>
This patch will allow for getparams to return the status of the HuC. As the HuC has to be validated by the GuC this patch uses the validated status to show when the HuC is loaded and ready for use. You cannot use the loaded status as with the GuC as the HuC is verified after it is loaded and is not usable until it is verified.
v2: removed the forewakes as the registers are already force-woken.
(T.Ursulin)
v4: rebased.
v5: rebased on top of drm-tip.
v6: rebased. Removed any reference to intel_huc.h
v7: rebased. Rename I915_PARAM_HAS_HUC to I915_PARAM_HUC_STATUS. Remove intel_is_huc_valid() since it is used only in one place. Put the case of I915_PARAM_HAS_HUC() in the right place.
v8: rebased. Add a comment to specify that I915_READ(reg) does not read garbage value. The register HUC_STATUS2 is force woken and no rpm is needed.
--- drivers/gpu/drm/i915/i915_drv.c | 7 +++++++ drivers/gpu/drm/i915/intel_huc_loader.c | 1 - include/uapi/drm/i915_drm.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.c +7 -0
@@ -49,6 +49,7 @@#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_drv.h" +#include "intel_uc.h" static struct drm_driver driver;
@@ -315,6 +316,12 @@ static int i915_getparam(struct drm_device *dev, void *data,case I915_PARAM_MIN_EU_IN_POOL : value =INTEL_INFO (dev_priv)->sseu.min_eu_in_pool;break ; +case I915_PARAM_HUC_STATUS : +/* The register is already force-woken. We dont need +* any rpm here +*/ + value =I915_READ (HUC_STATUS2 ) &HUC_FW_VERIFIED ; +break ;case I915_PARAM_MMAP_GTT_VERSION :/* Though we've started our numbering from 1, and so class all * earlier versions as 0, in effect their value is undefined as
drivers/gpu/drm/i915/intel_huc_loader.c +0 -1
@@ -284,4 +284,3 @@ void intel_huc_fini(struct drm_device *dev) huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; } -
include/uapi/drm/i915_drm.h +1 -0
@@ -395,6 +395,7 @@ typedef struct drm_i915_irq_wait {* priorities and the driver will attempt to execute batches in priority order. */ #define I915_PARAM_HAS_SCHEDULER 41 +#define I915_PARAM_HUC_STATUS 42 typedef struct drm_i915_getparam { __s32 param;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 8/8] drm/i915/get_params: Add HuC status to getparams
Quoted 20 lines · Anusha Srivatsa
From: Peter Antoine <[email protected]>
This patch will allow for getparams to return the status of the HuC. As the HuC has to be validated by the GuC this patch uses the validated status to show when the HuC is loaded and ready for use. You cannot use the loaded status as with the GuC as the HuC is verified after it is loaded and is not usable until it is verified.
v2: removed the forewakes as the registers are already force-woken.
(T.Ursulin)v4: rebased.
v5: rebased on top of drm-tip.
v6: rebased. Removed any reference tointel_huc.h
v7: rebased. RenameI915_PARAM_HAS_HUCtoI915_PARAM_HUC_STATUS. Removeintel_is_huc_valid()since it is used only in one place. Put the case ofI915_PARAM_HAS_HUC()in the right place.
v8: rebased. Add a comment to specify thatI915_READ(reg)does not read garbage value. The registerHUC_STATUS2is force woken and no rpm is needed.
Quoted 1 line
Signed-off-by Peter Antoine <[email protected]>
Where is your s-o-b?
other than that:
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for HuC Loading Patches
In reply to Anusha Srivatsa== Series Details ==
== Series Details ==
Series: HuC Loading Patches
URL : https://patchwork.freedesktop.org/series/17150/
State : success
== Summary ==
Series 17150v1 HuC Loading Patches
https://patchwork.freedesktop.org/api/1.0/series/17150/revisions/1/mbox/
fi-bdw-5557u total:246 pass:232 dwarn:0 dfail:0 fail:0 skip:14 fi-bsw-n3050 total:246 pass:207 dwarn:0 dfail:0 fail:0 skip:39 fi-bxt-j4205 total:246 pass:224 dwarn:0 dfail:0 fail:0 skip:22 fi-bxt-t5700 total:82 pass:69 dwarn:0 dfail:0 fail:0 skip:12 fi-byt-j1900 total:246 pass:219 dwarn:0 dfail:0 fail:0 skip:27 fi-byt-n2820 total:246 pass:215 dwarn:0 dfail:0 fail:0 skip:31 fi-hsw-4770 total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-hsw-4770r total:246 pass:227 dwarn:0 dfail:0 fail:0 skip:19 fi-ivb-3520m total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-ivb-3770 total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-kbl-7500u total:246 pass:225 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6260u total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-skl-6700hq total:246 pass:226 dwarn:0 dfail:0 fail:0 skip:20 fi-skl-6700k total:246 pass:222 dwarn:3 dfail:0 fail:0 skip:21 fi-skl-6770hq total:246 pass:233 dwarn:0 dfail:0 fail:0 skip:13 fi-snb-2600 total:246 pass:214 dwarn:0 dfail:0 fail:0 skip:32
7165fdc7f0b0b536557fcd0a222d083a901be57c drm-tip: 2016y-12m-22d-19h-42m-25s UTC integration manifest e8b433c drm/i915/get_params: Add HuC status to getparams
6ffbe20 drm/i915/huc: Support HuC authentication
8cb202b drm/i915/huc: Add debugfs for HuC loading status check
b1bbca7 drm/i915/HuC: Add KBL huC loading Support
6a3c405 drm/i915/huc: Add BXT HuC Loading Support
97fad48 drm/i915/huc: Add HuC fw loading support
b2a545d drm/i915/huc: Unified css_header struct for GuC and HuC
170ce27 drm/i915/guc: Make the GuC fw loading helper functions general
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3381/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx