HuC Loading Patches
Subsystems (2)
v7 cover HuC Loading Patches
This patch series enables the HuC loading. These patches are a port of the patches that were created by Yu Dai (Alex) and have been ported to work with the new GuC patches.
The series include a patch to enable the HuC on BXT. This is a separate patch as the state of the BXT HuC firmware is still in flux, so the patch can be dropped without delaying the series.
v2: rebased onto drm-intel-nightly.
Also, patch 1 has been recreated as the upstream version of the function had change significantly making the old patch obsolete. Also, due to a code move i915_dma.c -> i915_drv.c some code was being applied to a deleted file.
Also HuC file versions and formats changed.
v3: rebased onto drm-intel-nightly.
review changed.
v4: rebased on drm-intel-nightly.
changes for wait_for_atomic.
error message changes.
move a function back.
v5: rebased on drm-intel-nightly.
comment and white-space fixes.
v6: rebased on drm-intel-nightly.
v7: rebased on drm-intel-nightly.
Feedback from D.Gordon, C.Wilson and R.Vivi (Thanks).
Peter Antoine (6):
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 HuC fw loading support drm/i915/huc: Add debugfs for HuC loading status check drm/i915/huc: Support HuC authentication drm/i915/huc: Add BXT HuC Loading Support
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 43 ++++- drivers/gpu/drm/i915/i915_drv.c | 3 + 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 | 69 +++++++- drivers/gpu/drm/i915/intel_guc.h | 46 ++--- drivers/gpu/drm/i915/intel_guc_fwif.h | 17 +- drivers/gpu/drm/i915/intel_guc_loader.c | 197 +++++++++++---------- drivers/gpu/drm/i915/intel_huc.h | 44 +++++ drivers/gpu/drm/i915/intel_huc_loader.c | 275 +++++++++++++++++++++++++++++ 11 files changed, 581 insertions(+), 120 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
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 1/6 drm/i915/guc: Make the GuC fw loading helper functions general
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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 12 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 4 +- drivers/gpu/drm/i915/intel_guc.h | 39 ++++---- drivers/gpu/drm/i915/intel_guc_loader.c | 156 ++++++++++++++--------------- 4 files changed, 106 insertions(+), 105 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -2416,7 +2416,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))
@@ -2424,15 +2424,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
@@ -1057,7 +1057,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 ; ctx = dev_priv->kernel_context;
@@ -1083,7 +1083,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 ; ctx = dev_priv->kernel_context;
drivers/gpu/drm/i915/intel_guc.h +20 -19
@@ -89,29 +89,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 { -struct drm_device * guc_dev; -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;
@@ -122,7 +122,7 @@ struct intel_guc_fw { };struct intel_guc { -struct intel_guc_fw guc_fw; +struct intel_uc_fw guc_fw;uint32_t log_flags;struct i915_vma *log_vma;
@@ -150,9 +150,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 -78
342 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 2/6 drm/i915/huc: Unified css_header struct for GuC and HuC
In reply to Peter AntoineHuC 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.
--- drivers/gpu/drm/i915/intel_guc.h | 4 ++++ drivers/gpu/drm/i915/intel_guc_fwif.h | 16 ++++++++++--- drivers/gpu/drm/i915/intel_guc_loader.c | 41 ++++++++++++++++++++++----------- 3 files changed, 45 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_guc.h +4 -0
@@ -96,6 +96,9 @@ enum intel_uc_fw_status { UC_FIRMWARE_SUCCESS }; +#define UC_FW_TYPE_GUC 0 +#define UC_FW_TYPE_HUC 1 +/* * This structure encapsulates all the data needed during the process * of fetching, caching, and loading the firmware image into the GuC.
@@ -113,6 +116,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 +13 -3
@@ -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,7 +221,10 @@ struct guc_css_header {char username[8 ];char buildnumber[12 ]; -uint32_t device_id; +union { +uint32_t device_id; +uint32_t huc_sw_version; + };uint32_t guc_sw_version;uint32_t prod_preprod_fw;uint32_t reserved[12 ];
drivers/gpu/drm/i915/intel_guc_loader.c +28 -13
75 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 3/6 drm/i915/huc: Add HuC fw loading support
In reply to Peter AntoineThe 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.
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 3 + 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 | 44 ++++++ drivers/gpu/drm/i915/intel_huc_loader.c | 268 ++++++++++++++++++++++++++++++++ 8 files changed, 327 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
@@ -52,6 +52,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.c +3 -0
@@ -637,6 +637,7 @@ static int i915_load_modeset_init(struct drm_device *dev)* working irqs for e.g. gmbus and dp aux transfers. */ intel_modeset_init (dev); +intel_huc_init (dev);intel_guc_init (dev); ret =i915_gem_init (dev);
@@ -662,6 +663,7 @@ static int i915_load_modeset_init(struct drm_device *dev) cleanup_gem:i915_gem_fini (dev); cleanup_irq: +intel_huc_fini (dev);intel_guc_fini (dev);drm_irq_uninstall (dev);intel_teardown_gmbus (dev);
@@ -1332,6 +1334,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);intel_fbc_cleanup_cfb (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -55,6 +55,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"
@@ -1738,6 +1739,7 @@ struct drm_i915_private {struct intel_gvt gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;
@@ -2798,6 +2800,7 @@ struct drm_i915_cmd_table {#define HAS_GUC (dev) (IS_GEN9(dev))#define HAS_GUC_UCODE (dev) (HAS_GUC(dev))#define HAS_GUC_SCHED (dev) (HAS_GUC(dev)) +#define HAS_HUC_UCODE (dev) (HAS_GUC(dev))#define HAS_RESOURCE_STREAMER (dev) (IS_HASWELL(dev) || \ INTEL_INFO(dev)->gen >= 8)
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
@@ -158,6 +158,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
@@ -283,7 +283,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.
@@ -308,7 +309,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 ;
@@ -490,6 +491,7 @@ int intel_guc_setup(struct drm_device *dev) goto fail; } +intel_huc_load (dev); err =guc_ucode_xfer (dev_priv);if (!err)break ;
drivers/gpu/drm/i915/intel_huc.h new file +44 -0
44 lines not on this page · raw message
drivers/gpu/drm/i915/intel_huc_loader.c new file +268 -0
268 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
kbuild test robot
build botRe: [PATCH v7 3/6] drm/i915/huc: Add HuC fw loading support
url: https://github.com/0day-ci/linux/commits/Peter-Antoine/HuC-Loading-Patches/20160902-161205 config: i386-randconfig-s1-201635 (attached as .config) compiler: gcc-6 (Debian 6.1.1-9) 6.1.1…
Hi Peter,
[auto build test WARNING on next-20160825]
[cannot apply to drm-intel/for-linux-next v4.8-rc4 v4.8-rc3 v4.8-rc2 v4.8-rc4]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
[Suggest to use git(>=2.9.0) format-patch --base=<commit> (or --base=auto for convenience) to record what (public, well-known) commit your patch series was built on] [Check https://git-scm.com/docs/git-format-patch for more information]
url: https://github.com/0day-ci/linux/commits/Peter-Antoine/HuC-Loading-Patches/20160902-161205
config: i386-randconfig-s1-201635 (attached as .config)
compiler: gcc-6 (Debian 6.1.1-9) 6.1.1 20160705 reproduce:
# save the attached .config to linux build tree
make ARCH=i386 All warnings (new ones prefixed by >>):
drivers/gpu/drm/i915/intel_huc_loader.c: In function 'intel_huc_fini':
>> drivers/gpu/drm/i915/intel_huc_loader.c:263:3: warning: 'drm_gem_object_unreference' is deprecated [-Wdeprecated-declarations]
drm_gem_object_unreference(&huc_fw->uc_fw_obj->base);
^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from drivers/gpu/drm/i915/intel_huc_loader.c:25:0:
drivers/gpu/drm/i915/i915_drv.h:2307:13: note: declared here
extern void drm_gem_object_unreference(struct drm_gem_object *);
^~~~~~~~~~~~~~~~~~~~~~~~~~vim +/drm_gem_object_unreference +263 drivers/gpu/drm/i915/intel_huc_loader.c
247 return err;
248 }
249
250 /**
251 * intel_huc_fini() - clean up resources allocated for HuC
252 * @dev: the drm device
253 *
254 * Cleans up by releasing the huc firmware GEM obj.
255 */
256 void intel_huc_fini(struct drm_device *dev)
257 {
258 struct drm_i915_private *dev_priv = to_i915(dev);
259 struct intel_uc_fw *huc_fw = &dev_priv->huc.huc_fw;
260
261 mutex_lock(&dev->struct_mutex);
262 if (huc_fw->uc_fw_obj)
> 263 drm_gem_object_unreference(&huc_fw->uc_fw_obj->base);
264 huc_fw->uc_fw_obj = NULL;
265 mutex_unlock(&dev->struct_mutex);
266
267 huc_fw->fetch_status = UC_FIRMWARE_NONE;
268 }
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 4/6 drm/i915/huc: Add debugfs for HuC loading status check
In reply to Peter AntoineAdd debugfs entry for HuC loading status check.
v2: rebase on-top of drm-intel-nightly.
v3: rebased again.
v7: rebased.
--- drivers/gpu/drm/i915/i915_debugfs.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +31 -0
@@ -2413,6 +2413,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);
@@ -5273,6 +5303,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
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 5/6 drm/i915/huc: Support HuC authentication
In reply to Peter AntoineThe 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.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 65 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_fwif.h | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 2 + 3 files changed, 68 insertions(+)
drivers/gpu/drm/i915/i915_guc_submission.c +65 -0
@@ -25,6 +25,7 @@#include <linux/circ_buf.h> #include "i915_drv.h" #include "intel_guc.h" +#include "intel_huc.h" /** * DOC: GuC-based command submission
@@ -1095,3 +1096,67 @@ int intel_guc_resume(struct drm_device *dev)return host2guc_action (guc, data,ARRAY_SIZE (data)); } + +/** +* intel_huc_auth() - authenticate ucode +* @dev: the drm device +* +* Triggers a HuC fw authentication request to the GuC via host-2-guc +* interface. +*/ +void intel_huc_auth (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. It's stored +* at the beginning of the gem object, before the fw bits +*/ + 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_fwif.h +1 -0
@@ -438,6 +438,7 @@ enum host2guc_action {HOST2GUC_ACTION_ENTER_S_STATE =0x501 ,HOST2GUC_ACTION_EXIT_S_STATE =0x502 ,HOST2GUC_ACTION_SLPC_REQUEST =0x3003 , +HOST2GUC_ACTION_AUTHENTICATE_HUC =0x4000 , HOST2GUC_ACTION_LIMIT };
drivers/gpu/drm/i915/intel_guc_loader.c +2 -0
@@ -509,6 +509,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_huc_auth (dev); +if (i915.enable_guc_submission) { err =i915_guc_submission_enable (dev_priv);if (err)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 6/6 drm/i915/huc: Add BXT HuC Loading Support
In reply to Peter AntoineThis patch adds the HuC Loading for the BXT.
Version 1.7 of the HuC firmware.
v2: rebased.
v3: rebased.
changed file name to match the install package format.
v7: rebased.
--- drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_huc_loader.c +7 -0
@@ -50,6 +50,9 @@#define I915_SKL_HUC_UCODE "i915/skl_huc_ver01_07_1398.bin"MODULE_FIRMWARE (I915_SKL_HUC_UCODE ); +#define I915_BXT_HUC_UCODE "i915/bxt_huc_ver01_07_1398.bin" +MODULE_FIRMWARE (I915_BXT_HUC_UCODE ); +/** * intel_huc_load_ucode() - DMA's the firmware * @dev: the drm device
@@ -158,6 +161,10 @@ void intel_huc_init(struct drm_device *dev) fw_path =I915_SKL_HUC_UCODE ; huc_fw->major_ver_wanted =1 ; huc_fw->minor_ver_wanted =7 ; + }else if (IS_BROXTON (dev_priv)) { + fw_path =I915_BXT_HUC_UCODE ; + huc_fw->major_ver_wanted =1 ; + huc_fw->minor_ver_wanted =7 ; }if (fw_path ==NULL )
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx