HuC Loading Patches
Subsystems (3)
cover HuC Loading Patches
These patches add HuC loading support. 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
v2: rebased.
v3: rebased. Changed the code following the review comments.
v4: Added action_lock initialization fix provided by Arick (Hiler Arkadiusz) to the first patch in the series- Make the GuC fw loading helper functions general.
Anusha Srivatsa (2):
drm/i915/huc: Add BXT HuC Loading Support
drm/i915/HuC: Add KBL huC loading Support
Peter Antoine (6):
drm/i915/guc: Make the GuC fw loading helper functions general. Always
initialize action_lock
drm/i915/huc: Unified css_header struct for GuC and HuC drm/i915/huc: Add HuC fw loading support
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 | 8 + 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 | 70 ++++++- drivers/gpu/drm/i915/intel_guc.h | 49 +++-- drivers/gpu/drm/i915/intel_guc_fwif.h | 22 ++- drivers/gpu/drm/i915/intel_guc_loader.c | 196 +++++++++--------- drivers/gpu/drm/i915/intel_huc.h | 43 ++++ drivers/gpu/drm/i915/intel_huc_loader.c | 306 +++++++++++++++++++++++++++++ include/uapi/drm/i915_drm.h | 1 + 12 files changed, 624 insertions(+), 121 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc.h 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. Always initialize action_lock
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.
Action lock is not being initialized if the GuC submission is disabled (i.e. i915.guc_submission=0).
host2guc_action(), which uses the action_lock can be used for non-submission purposes, e.g. triggering HuC authentication.
Moving action_lock initialization before enablement check will allow us to use the host2guc_action no matter whether submission is enabled or not.
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. Added the action_lock initialization fix provided by Arick <[email protected]>
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 7 +- drivers/gpu/drm/i915/intel_guc.h | 38 +++---- drivers/gpu/drm/i915/intel_guc_loader.c | 155 +++++++++++++++-------------- 4 files changed, 108 insertions(+), 104 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -2358,7 +2358,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.guc_fw;u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv))
@@ -2366,15 +2366,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 +4 -3
@@ -1484,6 +1484,8 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)struct intel_guc *guc = &dev_priv->guc;struct i915_vma *vma; +mutex_init (&guc->action_lock); +/* Wipe bitmap & delete client in case of reinitialisation */ bitmap_clear (guc->doorbell_bitmap,0 ,GUC_MAX_DOORBELLS );i915_guc_submission_disable (dev_priv);
@@ -1500,7 +1502,6 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv) guc->ctx_pool_vma = vma;ida_init (&guc->ctx_ids); -mutex_init (&guc->action_lock);guc_log_create (guc);guc_addon_create (guc);
@@ -1583,7 +1584,7 @@ int intel_guc_suspend(struct drm_device *dev)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->guc_fw.load_status !=UC_FIRMWARE_SUCCESS )return 0 ;gen9_disable_guc_interrupts (dev_priv);
@@ -1611,7 +1612,7 @@ int intel_guc_resume(struct drm_device *dev)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->guc_fw.load_status !=UC_FIRMWARE_SUCCESS )return 0 ;if (i915.guc_log_level >=0 )
drivers/gpu/drm/i915/intel_guc.h +20 -18
@@ -91,28 +91,29 @@ 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 { +UC_FIRMWARE_FAIL =-1 , +UC_FIRMWARE_NONE =0 , +UC_FIRMWARE_PENDING , +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 { +struct drm_device *uc_dev; +const char *uc_fw_path; +size_t uc_fw_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 +140,7 @@ struct intel_guc_log { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw guc_fw;struct intel_guc_log log;/* GuC2Host interrupt related state */
@@ -172,9 +173,10 @@ struct intel_guc {extern void intel_guc_init (struct drm_device *dev);extern int intel_guc_setup (struct drm_device *dev);extern void intel_guc_fini (struct drm_device *dev); -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_device *dev);extern int intel_guc_resume (struct drm_device *dev); +void intel_uc_fw_fetch (struct drm_device *dev,struct intel_uc_fw *uc_fw);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_guc_loader.c +78 -77
340 lines not on this page · raw message
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. Always initialize action_lock
Quoted 21 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.Action lock is not being initialized if the GuC submission is disabled (i.e. i915.guc_submission=0).
host2guc_action(), which uses theaction_lockcan be used for non-submission purposes, e.g. triggering HuC authentication.Moving
action_lockinitialization before enablement check will allow us to use thehost2guc_actionno matter whether submission is enabled or not.
Quoted 11 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.
v10: rebased.
v11: rebased. Added theaction_lockinitialization fix provided by Arick <[email protected]>
It's Arek.
Quoted 55 lines
Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Reviewed-by Dave Gordon <[email protected]>Reviewed-by Jeff McGee <[email protected]>Reviewed-by Carlos Santa <[email protected]>Tested-by Carlos Santa <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 7 +- drivers/gpu/drm/i915/intel_guc.h | 38 +++---- drivers/gpu/drm/i915/intel_guc_loader.c | 155 +++++++++++++++-------------- 4 files changed, 108 insertions(+), 104 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-6@@ -2358,7 +2358,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.guc_fw;u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv))@@ -2366,15 +2366,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 +0
-0
drivers/gpu/drm/i915/i915_guc_submission.c int i915_guc_submission_init(struct drm_i915_private *dev_priv) · line 1488
Quoted 5 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2
-0@@ -1484,6 +1484,8 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)struct intel_guc *guc = &dev_priv->guc;struct i915_vma *vma; +mutex_init (&guc->action_lock); +
That's pretty much a separate change.
Why you have merged it into this commit?
Also it makes commit title unbearably long.
Quoted 463 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2
-3/* Wipe bitmap & delete client in case of reinitialisation */ bitmap_clear (guc->doorbell_bitmap,0 ,GUC_MAX_DOORBELLS );i915_guc_submission_disable (dev_priv);@@ -1500,7 +1502,6 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv) guc->ctx_pool_vma = vma;ida_init (&guc->ctx_ids); -mutex_init (&guc->action_lock);guc_log_create (guc);guc_addon_create (guc);@@ -1583,7 +1584,7 @@ int intel_guc_suspend(struct drm_device *dev)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->guc_fw.load_status !=UC_FIRMWARE_SUCCESS )return 0 ;gen9_disable_guc_interrupts (dev_priv);@@ -1611,7 +1612,7 @@ int intel_guc_resume(struct drm_device *dev)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->guc_fw.load_status !=UC_FIRMWARE_SUCCESS )return 0 ;if (i915.guc_log_level >=0 )drivers/gpu/drm/i915/intel_guc.h +20
-18@@ -91,28 +91,29 @@ 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 { +UC_FIRMWARE_FAIL =-1 , +UC_FIRMWARE_NONE =0 , +UC_FIRMWARE_PENDING , +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 { +struct drm_device *uc_dev; +const char *uc_fw_path; +size_t uc_fw_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 +140,7 @@ struct intel_guc_log { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw guc_fw;struct intel_guc_log log;/* GuC2Host interrupt related state */ @@ -172,9 +173,10 @@ struct intel_guc {extern void intel_guc_init (struct drm_device *dev);extern int intel_guc_setup (struct drm_device *dev);extern void intel_guc_fini (struct drm_device *dev); -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_device *dev);extern int intel_guc_resume (struct drm_device *dev); +void intel_uc_fw_fetch (struct drm_device *dev,struct intel_uc_fw *uc_fw);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_guc_loader.c +78
-77@@ -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 UC_FIRMWARE_FAIL :return "FAIL" ; -case GUC_FIRMWARE_NONE : +case UC_FIRMWARE_NONE :return "NONE" ; -case GUC_FIRMWARE_PENDING : +case UC_FIRMWARE_PENDING :return "PENDING" ; -case GUC_FIRMWARE_SUCCESS : +case 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.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.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);@@ -451,14 +451,14 @@ static int guc_hw_reset(struct drm_i915_private *dev_priv)int intel_guc_setup (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -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.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) {@@ -476,10 +476,10 @@ int intel_guc_setup(struct drm_device *dev) }/* Fetch failed, or already fetched but failed to load? */ -if (guc_fw->guc_fw_fetch_status !=GUC_FIRMWARE_SUCCESS ) { +if (guc_fw->fetch_status !=UC_FIRMWARE_SUCCESS ) { err = -EIO ; goto fail; - }else if (guc_fw->guc_fw_load_status ==GUC_FIRMWARE_FAIL ) { + }else if (guc_fw->load_status ==UC_FIRMWARE_FAIL ) { err = -ENOEXEC ; goto fail; }@@ -487,11 +487,11 @@ int intel_guc_setup(struct drm_device *dev)guc_interrupts_release (dev_priv);gen9_reset_guc_interrupts (dev_priv); - guc_fw->guc_fw_load_status =GUC_FIRMWARE_PENDING ; + guc_fw->load_status =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)@@ -523,11 +523,11 @@ int intel_guc_setup(struct drm_device *dev) "retry %d more time(s)\n", err, retries); } - guc_fw->guc_fw_load_status =GUC_FIRMWARE_SUCCESS ; + guc_fw->load_status =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 )@@ -542,8 +542,8 @@ int intel_guc_setup(struct drm_device *dev)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 ==UC_FIRMWARE_PENDING ) + guc_fw->load_status =UC_FIRMWARE_FAIL ;guc_interrupts_release (dev_priv);i915_guc_submission_disable (dev_priv);@@ -588,7 +588,7 @@ int intel_guc_setup(struct drm_device *dev)return ret; } -static void guc_fw_fetch (struct drm_device *dev,struct intel_guc_fw *guc_fw) +void intel_uc_fw_fetch (struct drm_device *dev,struct intel_uc_fw *uc_fw) {struct pci_dev *pdev = dev->pdev;struct drm_i915_gem_object *obj;@@ -597,17 +597,17 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)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_device *dev, struct intel_guc_fw *guc_fw) 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 (to_i915 (dev))) {DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); goto fail;@@ -659,21 +659,21 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)* 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->struct_mutex); obj =i915_gem_object_create_from_data (dev, fw->data, fw->size);@@ -683,31 +683,31 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) goto fail; } - guc_fw->guc_fw_obj = obj; - guc_fw->guc_fw_size = fw->size; + uc_fw->uc_fw_obj = obj; + uc_fw->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 =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->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->struct_mutex);release_firmware (fw);/* OK even if fw is NULL */ - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_FAIL ; + uc_fw->fetch_status =UC_FIRMWARE_FAIL ; }/** @@ -722,7 +722,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)void intel_guc_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;const char *fw_path;if (!HAS_GUC (dev_priv)) {@@ -740,23 +740,24 @@ void intel_guc_init(struct drm_device *dev) 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_dev = dev; + guc_fw->uc_fw_path = fw_path; + guc_fw->fetch_status =UC_FIRMWARE_NONE ; + guc_fw->load_status =UC_FIRMWARE_NONE ;/* Early (and silent) return if GuC loading is disabled */ if (!i915.enable_guc_loading)@@ -766,9 +767,9 @@ void intel_guc_init(struct drm_device *dev)if (*fw_path =='\0' )return ; - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_PENDING ; + guc_fw->fetch_status =UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -guc_fw_fetch (dev, guc_fw); +intel_uc_fw_fetch (dev, guc_fw);/* status must now be FAIL or SUCCESS */ }@@ -779,17 +780,17 @@ void intel_guc_init(struct drm_device *dev)void intel_guc_fini (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;mutex_lock (&dev->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->struct_mutex); - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_NONE ; + guc_fw->fetch_status =UC_FIRMWARE_NONE ; }Signature · 1 line
2.7.4
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. Always initialize action_lock
Quoted 34 lines · Arkadiusz Hiler
Quoted 21 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.Action lock is not being initialized if the GuC submission is disabled (i.e. i915.guc_submission=0).
host2guc_action(), which uses theaction_lockcan be used for non-submission purposes, e.g. triggering HuC authentication.Moving
action_lockinitialization before enablement check will allow us to use thehost2guc_actionno matter whether submission is enabled or not.Quoted 11 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.
v10: rebased.
v11: rebased. Added theaction_lockinitialization fix provided by Arick <[email protected]>
Quoted 11 lines
It's Arek.
Quoted 9 lines
Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Reviewed-by Dave Gordon <[email protected]>Reviewed-by Jeff McGee <[email protected]>Reviewed-by Carlos Santa <[email protected]>Tested-by Carlos Santa <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>
Also why did you carried over my sign off from a different patch?
Quoted 528 lines
Quoted 46 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 7 +- drivers/gpu/drm/i915/intel_guc.h | 38 +++---- drivers/gpu/drm/i915/intel_guc_loader.c | 155 +++++++++++++++-------------- 4 files changed, 108 insertions(+), 104 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-6@@ -2358,7 +2358,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.guc_fw;u32 tmp, i;if (!HAS_GUC_UCODE (dev_priv))@@ -2366,15 +2366,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 +0
-0drivers/gpu/drm/i915/i915_guc_submission.c int i915_guc_submission_init(struct drm_i915_private *dev_priv) · line 1488
Quoted 5 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2
-0@@ -1484,6 +1484,8 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv)struct intel_guc *guc = &dev_priv->guc;struct i915_vma *vma; +mutex_init (&guc->action_lock); +That's pretty much a separate change.
Why you have merged it into this commit?Also it makes commit title unbearably long.
Quoted 463 lines
drivers/gpu/drm/i915/i915_guc_submission.c +2
-3/* Wipe bitmap & delete client in case of reinitialisation */ bitmap_clear (guc->doorbell_bitmap,0 ,GUC_MAX_DOORBELLS );i915_guc_submission_disable (dev_priv);@@ -1500,7 +1502,6 @@ int i915_guc_submission_init(struct drm_i915_private *dev_priv) guc->ctx_pool_vma = vma;ida_init (&guc->ctx_ids); -mutex_init (&guc->action_lock);guc_log_create (guc);guc_addon_create (guc);@@ -1583,7 +1584,7 @@ int intel_guc_suspend(struct drm_device *dev)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->guc_fw.load_status !=UC_FIRMWARE_SUCCESS )return 0 ;gen9_disable_guc_interrupts (dev_priv);@@ -1611,7 +1612,7 @@ int intel_guc_resume(struct drm_device *dev)struct i915_gem_context *ctx;u32 data[3 ]; -if (guc->guc_fw.guc_fw_load_status !=GUC_FIRMWARE_SUCCESS ) +if (guc->guc_fw.load_status !=UC_FIRMWARE_SUCCESS )return 0 ;if (i915.guc_log_level >=0 )drivers/gpu/drm/i915/intel_guc.h +20
-18@@ -91,28 +91,29 @@ 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 { +UC_FIRMWARE_FAIL =-1 , +UC_FIRMWARE_NONE =0 , +UC_FIRMWARE_PENDING , +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 { +struct drm_device *uc_dev; +const char *uc_fw_path; +size_t uc_fw_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 +140,7 @@ struct intel_guc_log { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw guc_fw;struct intel_guc_log log;/* GuC2Host interrupt related state */ @@ -172,9 +173,10 @@ struct intel_guc {extern void intel_guc_init (struct drm_device *dev);extern int intel_guc_setup (struct drm_device *dev);extern void intel_guc_fini (struct drm_device *dev); -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_device *dev);extern int intel_guc_resume (struct drm_device *dev); +void intel_uc_fw_fetch (struct drm_device *dev,struct intel_uc_fw *uc_fw);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_guc_loader.c +78
-77@@ -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 UC_FIRMWARE_FAIL :return "FAIL" ; -case GUC_FIRMWARE_NONE : +case UC_FIRMWARE_NONE :return "NONE" ; -case GUC_FIRMWARE_PENDING : +case UC_FIRMWARE_PENDING :return "PENDING" ; -case GUC_FIRMWARE_SUCCESS : +case 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.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.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);@@ -451,14 +451,14 @@ static int guc_hw_reset(struct drm_i915_private *dev_priv)int intel_guc_setup (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -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.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) {@@ -476,10 +476,10 @@ int intel_guc_setup(struct drm_device *dev) }/* Fetch failed, or already fetched but failed to load? */ -if (guc_fw->guc_fw_fetch_status !=GUC_FIRMWARE_SUCCESS ) { +if (guc_fw->fetch_status !=UC_FIRMWARE_SUCCESS ) { err = -EIO ; goto fail; - }else if (guc_fw->guc_fw_load_status ==GUC_FIRMWARE_FAIL ) { + }else if (guc_fw->load_status ==UC_FIRMWARE_FAIL ) { err = -ENOEXEC ; goto fail; }@@ -487,11 +487,11 @@ int intel_guc_setup(struct drm_device *dev)guc_interrupts_release (dev_priv);gen9_reset_guc_interrupts (dev_priv); - guc_fw->guc_fw_load_status =GUC_FIRMWARE_PENDING ; + guc_fw->load_status =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)@@ -523,11 +523,11 @@ int intel_guc_setup(struct drm_device *dev) "retry %d more time(s)\n", err, retries); } - guc_fw->guc_fw_load_status =GUC_FIRMWARE_SUCCESS ; + guc_fw->load_status =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 )@@ -542,8 +542,8 @@ int intel_guc_setup(struct drm_device *dev)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 ==UC_FIRMWARE_PENDING ) + guc_fw->load_status =UC_FIRMWARE_FAIL ;guc_interrupts_release (dev_priv);i915_guc_submission_disable (dev_priv);@@ -588,7 +588,7 @@ int intel_guc_setup(struct drm_device *dev)return ret; } -static void guc_fw_fetch (struct drm_device *dev,struct intel_guc_fw *guc_fw) +void intel_uc_fw_fetch (struct drm_device *dev,struct intel_uc_fw *uc_fw) {struct pci_dev *pdev = dev->pdev;struct drm_i915_gem_object *obj;@@ -597,17 +597,17 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)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_device *dev, struct intel_guc_fw *guc_fw) 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 (to_i915 (dev))) {DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); goto fail;@@ -659,21 +659,21 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)* 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->struct_mutex); obj =i915_gem_object_create_from_data (dev, fw->data, fw->size);@@ -683,31 +683,31 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) goto fail; } - guc_fw->guc_fw_obj = obj; - guc_fw->guc_fw_size = fw->size; + uc_fw->uc_fw_obj = obj; + uc_fw->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 =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->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->struct_mutex);release_firmware (fw);/* OK even if fw is NULL */ - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_FAIL ; + uc_fw->fetch_status =UC_FIRMWARE_FAIL ; }/** @@ -722,7 +722,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)void intel_guc_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;const char *fw_path;if (!HAS_GUC (dev_priv)) {@@ -740,23 +740,24 @@ void intel_guc_init(struct drm_device *dev) 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_dev = dev; + guc_fw->uc_fw_path = fw_path; + guc_fw->fetch_status =UC_FIRMWARE_NONE ; + guc_fw->load_status =UC_FIRMWARE_NONE ;/* Early (and silent) return if GuC loading is disabled */ if (!i915.enable_guc_loading)@@ -766,9 +767,9 @@ void intel_guc_init(struct drm_device *dev)if (*fw_path =='\0' )return ; - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_PENDING ; + guc_fw->fetch_status =UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -guc_fw_fetch (dev, guc_fw); +intel_uc_fw_fetch (dev, guc_fw);/* status must now be FAIL or SUCCESS */ }@@ -779,17 +780,17 @@ void intel_guc_init(struct drm_device *dev)void intel_guc_fini (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); -struct intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw;mutex_lock (&dev->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->struct_mutex); - guc_fw->guc_fw_fetch_status =GUC_FIRMWARE_NONE ; + guc_fw->fetch_status =UC_FIRMWARE_NONE ; }Signature · 1 line
2.7.4Signature · 6 lines
Cheers, Arek _______________________________________________ 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 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.
--- drivers/gpu/drm/i915/intel_guc.h | 6 +++++ drivers/gpu/drm/i915/intel_guc_fwif.h | 21 +++++++++++++---- drivers/gpu/drm/i915/intel_guc_loader.c | 41 ++++++++++++++++++++++----------- 3 files changed, 51 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_guc.h +6 -0
@@ -98,6 +98,11 @@ enum intel_uc_fw_status { UC_FIRMWARE_SUCCESS }; +enum { +UC_FW_TYPE_GUC , +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.
@@ -115,6 +120,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;
drivers/gpu/drm/i915/intel_guc_fwif.h +17 -4
@@ -154,7 +154,7 @@* The GuC firmware layout looks like this: * * +-------------------------------+ -* | guc_css_header | +* | uc_css_header | * | | * | contains major/minor version | * +-------------------------------+
@@ -181,9 +181,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. */
@@ -214,8 +221,14 @@ struct guc_css_header {char username[8 ];char buildnumber[12 ]; -uint32_t device_id; -uint32_t guc_sw_version; +union { +uint32_t guc_branch_client_version; +uint32_t huc_sw_version; + }; +union { +uint32_t guc_sw_version; +uint32_t huc_reserved; + };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
Signature · 6 lines
2.7.4 _______________________________________________ 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 SrivatsaFrom: Peter Antoine <[email protected]>
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) 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.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_guc_reg.h | 3 + drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 6 +- drivers/gpu/drm/i915/intel_huc.h | 42 +++++ drivers/gpu/drm/i915/intel_huc_loader.c | 266 ++++++++++++++++++++++++++++++++ 7 files changed, 320 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc.h create mode 100644 drivers/gpu/drm/i915/intel_huc_loader.c
drivers/gpu/drm/i915/Makefile +1 -0
@@ -56,6 +56,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_guc_loader.o \ + intel_huc_loader.o \ i915_guc_submission.o # autogenerated null render state
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -56,6 +56,7 @@#include "intel_bios.h" #include "intel_dpll_mgr.h" #include "intel_guc.h" +#include "intel_huc.h" #include "intel_lrc.h" #include "intel_ringbuffer.h"
@@ -1915,6 +1916,7 @@ struct drm_i915_private {struct intel_gvt *gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;
@@ -2768,6 +2770,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)
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.h +1 -0
@@ -183,6 +183,7 @@ extern const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status);extern int intel_guc_suspend (struct drm_device *dev);extern int intel_guc_resume (struct drm_device *dev);void intel_uc_fw_fetch (struct drm_device *dev,struct intel_uc_fw *uc_fw); +u32 guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ int i915_guc_submission_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_guc_loader.c +4 -2
@@ -309,7 +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.
@@ -334,7 +335,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 guc_wopcm_size (struct drm_i915_private *dev_priv) {u32 wopcm_size =GUC_WOPCM_TOP ;
@@ -512,6 +513,7 @@ int intel_guc_setup(struct drm_device *dev)if (err) goto fail; +intel_huc_load (dev); err =guc_ucode_xfer (dev_priv);if (!err)break ;
drivers/gpu/drm/i915/intel_huc.h new file +42 -0
42 lines not on this page · raw message
drivers/gpu/drm/i915/intel_huc_loader.c new file +266 -0
266 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ 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.
--- drivers/gpu/drm/i915/intel_huc_loader.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/i915/intel_huc_loader.c +11 -0
@@ -44,6 +44,10 @@#define SKL_FW_MINOR 07#define SKL_BLD_NUM 1398 +#define BXT_FW_MAJOR 01 +#define BXT_FW_MINOR 07 +#define BXT_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"
@@ -52,6 +56,9 @@ SKL_FW_MINOR, SKL_BLD_NUM)MODULE_FIRMWARE (I915_SKL_HUC_UCODE ); +#define I915_BXT_HUC_UCODE HUC_FW_PATH(bxt, BXT_FW_MAJOR, \ + BXT_FW_MINOR, BXT_BLD_NUM) +MODULE_FIRMWARE (I915_BXT_HUC_UCODE );/** * huc_ucode_xfer() - DMA's the firmware * @dev_priv: the drm device
@@ -159,6 +166,10 @@ void intel_huc_init(struct drm_device *dev) fw_path =I915_SKL_HUC_UCODE ; huc_fw->major_ver_wanted =SKL_FW_MAJOR ; huc_fw->minor_ver_wanted =SKL_FW_MINOR ; + }else if (IS_BROXTON (dev_priv)) { + fw_path =I915_BXT_HUC_UCODE ; + huc_fw->major_ver_wanted =BXT_FW_MAJOR ; + huc_fw->minor_ver_wanted =BXT_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
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.
--- drivers/gpu/drm/i915/intel_huc_loader.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/i915/intel_huc_loader.c +16 -0
@@ -48,6 +48,10 @@#define BXT_FW_MINOR 07#define BXT_BLD_NUM 1398 +#define KBL_FW_MAJOR 02 +#define KBL_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_FW_MAJOR, \ BXT_FW_MINOR, BXT_BLD_NUM)MODULE_FIRMWARE (I915_BXT_HUC_UCODE ); + +#define I915_KBL_HUC_UCODE HUC_FW_PATH(kbl, KBL_FW_MAJOR, \ + KBL_FW_MINOR, KBL_BLD_NUM) +MODULE_FIRMWARE (I915_KBL_HUC_UCODE ); +/** * huc_ucode_xfer() - DMA's the firmware * @dev_priv: the drm device
@@ -170,8 +179,15 @@ void intel_huc_init(struct drm_device *dev) fw_path =I915_BXT_HUC_UCODE ; huc_fw->major_ver_wanted =BXT_FW_MAJOR ; huc_fw->minor_ver_wanted =BXT_FW_MINOR ; + }else if (IS_KABYLAKE (dev_priv)) { + fw_path =I915_KBL_HUC_UCODE ; + huc_fw->major_ver_wanted =KBL_FW_MAJOR ; + huc_fw->minor_ver_wanted =KBL_FW_MINOR ; } +if (fw_path ==NULL ) +return ; + huc_fw->uc_fw_path = fw_path; huc_fw->fetch_status =UC_FIRMWARE_PENDING ;
Signature · 6 lines
2.7.4 _______________________________________________ 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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +31 -0
@@ -2355,6 +2355,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.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);
@@ -5416,6 +5446,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.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 63 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 2 +- drivers/gpu/drm/i915/intel_guc_fwif.h | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 2 + 4 files changed, 67 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_guc_submission.c +63 -0
@@ -27,6 +27,7 @@#include <linux/relay.h> #include "i915_drv.h" #include "intel_guc.h" +#include "intel_huc.h" /** * DOC: GuC-based command submission
@@ -1728,3 +1729,65 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)return ret; } + +/** +* intel_guc_auth_huc() - authenticate ucode +* @dev: the drm device +* +* Triggers a HuC fw authentication request to the GuC via host-2-guc +* interface. +*/ +void intel_guc_auth_huc (struct drm_device *dev) +{ +struct drm_i915_private *dev_priv = dev->dev_private; +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->huc_fw.fetch_status ==UC_FIRMWARE_NONE || + huc->huc_fw.load_status ==UC_FIRMWARE_NONE ) +return ; + +if (guc->guc_fw.load_status !=UC_FIRMWARE_SUCCESS ) { +DRM_ERROR ("HuC: GuC fw wasn't loaded. Can't authenticate" ); +return ; + } + +if (huc->huc_fw.load_status !=UC_FIRMWARE_SUCCESS ) { +DRM_ERROR ("HuC: fw wasn't loaded. Nothing to authenticate" ); +return ; + } + + vma =i915_gem_object_ggtt_pin (huc->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 ); + +/* Specify auth action and where public signature is. */ + data[0 ] =HOST2GUC_ACTION_AUTHENTICATE_HUC ; + data[1 ] =i915_ggtt_offset (vma) + huc->huc_fw.rsa_offset; + + ret =host2guc_action (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 ); +if (ret) { +DRM_ERROR ("HuC: Authentication failed\n" ); + goto out; + } + +out: +i915_vma_unpin (vma); +}
drivers/gpu/drm/i915/intel_guc.h +1 -1
@@ -197,5 +197,5 @@ void i915_guc_flush_logs(struct drm_i915_private *dev_priv);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); - +void intel_guc_auth_huc (struct drm_device *dev);#endif
drivers/gpu/drm/i915/intel_guc_fwif.h +1 -0
@@ -513,6 +513,7 @@ enum host2guc_action {HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 ,HOST2GUC_ACTION_UK_LOG_ENABLE_LOGGING =0x0E000 , +HOST2GUC_ACTION_AUTHENTICATE_HUC =0x4000 , HOST2GUC_ACTION_LIMIT };
drivers/gpu/drm/i915/intel_guc_loader.c +2 -0
@@ -531,6 +531,8 @@ int intel_guc_setup(struct drm_device *dev)intel_uc_fw_status_repr (guc_fw->fetch_status), intel_uc_fw_status_repr(guc_fw->load_status)); +intel_guc_auth_huc (dev); +if (i915.enable_guc_submission) {if (i915.guc_log_level >=0 )gen9_enable_guc_interrupts (dev_priv);
Signature · 6 lines
2.7.4 _______________________________________________ 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.
v6: rebased.
v7: rebased.
v8: rebased.
--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++++++ drivers/gpu/drm/i915/intel_huc.h | 1 + drivers/gpu/drm/i915/intel_huc_loader.c | 13 +++++++++++++ include/uapi/drm/i915_drm.h | 1 + 4 files changed, 23 insertions(+)
drivers/gpu/drm/i915/i915_drv.c +8 -0
@@ -49,6 +49,8 @@#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_drv.h" +#include "intel_guc.h" +#include "intel_huc.h" static struct drm_driver driver;
@@ -350,6 +352,9 @@ static int i915_getparam(struct drm_device *dev, void *data,*/ value =1 ;break ; +case I915_PARAM_HAS_HUC : + value =intel_is_huc_valid (dev_priv); +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;
@@ -603,6 +608,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; +intel_huc_init (dev);intel_guc_init (dev); ret =i915_gem_init (dev);
@@ -630,6 +636,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);drm_irq_uninstall (dev);intel_teardown_gmbus (dev);
@@ -1325,6 +1332,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);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);
drivers/gpu/drm/i915/intel_huc.h +1 -0
@@ -39,4 +39,5 @@ struct intel_huc {void intel_huc_init (struct drm_device *dev);void intel_huc_fini (struct drm_device *dev);int intel_huc_load (struct drm_device *dev); +extern int intel_is_huc_valid (struct drm_i915_private *dev_priv);#endif
drivers/gpu/drm/i915/intel_huc_loader.c +13 -0
@@ -291,3 +291,16 @@ void intel_huc_fini(struct drm_device *dev) huc_fw->fetch_status =UC_FIRMWARE_NONE ; } + +/** +* intel_is_huc_valid() - Check to see if the HuC is fully loaded. +* @dev_priv: drm device to check. +* +* This function will return true if the guc has been loaded and +* has valid firmware. The simplest way of doing this is to check +* if the HuC has been validated, if so it must have been loaded. +*/ +int intel_is_huc_valid (struct drm_i915_private *dev_priv) +{ +return ((I915_READ (HUC_STATUS2 ) &HUC_FW_VERIFIED ) !=0 ); +}
include/uapi/drm/i915_drm.h +1 -0
@@ -390,6 +390,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_HAS_POOLED_EU 38#define I915_PARAM_MIN_EU_IN_POOL 39#define I915_PARAM_MMAP_GTT_VERSION 40 +#define I915_PARAM_HAS_HUC 42/* Query whether DRM_I915_GEM_EXECBUFFER2 supports user defined execution * priorities and the driver will attempt to execute batches in priority order.
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 52 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.
v6: rebased.
v7: rebased.
v8: rebased.Tested-by Xiang Haihao <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Peter Antoine <[email protected]>Reviewed-by Rodrigo Vivi <[email protected]>Reviewed-by Jeff McGee <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 8 ++++++++ drivers/gpu/drm/i915/intel_huc.h | 1 + drivers/gpu/drm/i915/intel_huc_loader.c | 13 +++++++++++++ include/uapi/drm/i915_drm.h | 1 + 4 files changed, 23 insertions(+)drivers/gpu/drm/i915/i915_drv.c +5
-0@@ -49,6 +49,8 @@#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_drv.h" +#include "intel_guc.h" +#include "intel_huc.h" static struct drm_driver driver;@@ -350,6 +352,9 @@ static int i915_getparam(struct drm_device *dev, void *data,*/ value =1 ;break ; +case I915_PARAM_HAS_HUC : + value =intel_is_huc_valid (dev_priv); +break ;default :DRM_DEBUG ("Unknown parameter %d\n" , param->param);return -EINVAL ;
drivers/gpu/drm/i915/i915_drv.c static int i915_load_modeset_init(struct drm_device *dev) · line 611
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0@@ -603,6 +608,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; +intel_huc_init (dev);
As we discussed, this needs to be in patch 3.
Quoted 69 lines
drivers/gpu/drm/i915/i915_drv.c +2
-0intel_guc_init (dev); ret =i915_gem_init (dev);@@ -630,6 +636,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);drm_irq_uninstall (dev);intel_teardown_gmbus (dev);@@ -1325,6 +1332,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);i915_gem_fini (dev_priv);intel_fbc_cleanup_cfb (dev_priv);drivers/gpu/drm/i915/intel_huc.h +1
-0@@ -39,4 +39,5 @@ struct intel_huc {void intel_huc_init (struct drm_device *dev);void intel_huc_fini (struct drm_device *dev);int intel_huc_load (struct drm_device *dev); +extern int intel_is_huc_valid (struct drm_i915_private *dev_priv);#endif drivers/gpu/drm/i915/intel_huc_loader.c +13
-0@@ -291,3 +291,16 @@ void intel_huc_fini(struct drm_device *dev) huc_fw->fetch_status =UC_FIRMWARE_NONE ; } + +/** +* intel_is_huc_valid() - Check to see if the HuC is fully loaded. +* @dev_priv: drm device to check. +* +* This function will return true if the guc has been loaded and +* has valid firmware. The simplest way of doing this is to check +* if the HuC has been validated, if so it must have been loaded. +*/ +int intel_is_huc_valid (struct drm_i915_private *dev_priv) +{ +return ((I915_READ (HUC_STATUS2 ) &HUC_FW_VERIFIED ) !=0 ); +}include/uapi/drm/i915_drm.h +1
-0@@ -390,6 +390,7 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_HAS_POOLED_EU 38#define I915_PARAM_MIN_EU_IN_POOL 39#define I915_PARAM_MMAP_GTT_VERSION 40 +#define I915_PARAM_HAS_HUC 42/* Query whether DRM_I915_GEM_EXECBUFFER2 supports user defined execution * priorities and the driver will attempt to execute batches in priority order. 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
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/15850/
State : success
== Summary ==
Series 15850v1 HuC Loading Patches
https://patchwork.freedesktop.org/api/1.0/series/15850/revisions/1/mbox/
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15 fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40 fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28 fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20 fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53 fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22 fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21 fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21 fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14 fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32 fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
a08f9fc55a649334a2788a804904d920f8b2fda2 drm-intel-nightly: 2016y-11m-23d-20h-25m-10s UTC integration manifest 6d7057a drm/i915/get_params: Add HuC status to getparams
ead9afa drm/i915/huc: Support HuC authentication
fb821c1 drm/i915/huc: Add debugfs for HuC loading status check
4ee1095 drm/i915/HuC: Add KBL huC loading Support
0a3eca4 drm/i915/huc: Add BXT HuC Loading Support
e72e459 drm/i915/huc: Add HuC fw loading support
6d1eaa2 drm/i915/huc: Unified css_header struct for GuC and HuC
784ebbc drm/i915/guc: Make the GuC fw loading helper functions general. Always initialize action_lock
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3097/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 18 lines · Anusha Srivatsa
These patches add HuC loading support. 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.htmlv2: rebased.
v3: rebased. Changed the code following the review comments.
v4: Addedaction_lockinitialization fix provided by Arick (Hiler Arkadiusz) to the first patch in the series- Make the GuC fw loading helper functions general.Signed-off-by Anusha Srivatsa <[email protected]>Anusha Srivatsa (2):
drm/i915/huc: Add BXT HuC Loading Support
drm/i915/HuC: Add KBL huC loading Support
Quoted 7 lines
Peter Antoine (6):
drm/i915/guc: Make the GuC fw loading helper functions general. Always
initializeaction_lock
drm/i915/huc: Unifiedcss_headerstruct for GuC and HuC drm/i915/huc: Add HuC fw loading support
drm/i915/huc: Add debugfs for HuC loading status check drm/i915/huc: Support HuC authentication
Bolting HuC authenticaiton to the guc_submission.c is not very elegant solution. Yes, it uses the same mechanism, but HuC can be set up having GuC submission turned off.
This approach already caused us issues with the 'action_lock'.
I do not think that is the place for the code anyway. Instead I have whole patch series (currently in review) that does some GuC codebase reorganization - it evolved from the mutex_init() moving patch you've seen.
New files, intel_uc.{c,h} are introduced - those are suitable for renamed intel_uc_* entities from:
" drm/i915/guc: Make the GuC fw loading helper functions general"
The series also exposes intel_guc_{send,recv}() functions which you can use for triggering the HuC authentication (rebranded host2guc_*).
Please take a look at "GuC code reorganization" series and share your thoughs.
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx