drm/i915/guc: Make the GuC fw loading helper functions general
Subsystems (2)
PATCH v3 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.
--- 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 | 146 ++++++++++++++--------------- 4 files changed, 101 insertions(+), 100 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +6 -6
@@ -2498,7 +2498,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) {struct drm_info_node *node = m->private;struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); -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))
@@ -2506,15 +2506,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
@@ -1038,7 +1038,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;
@@ -1064,7 +1064,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
@@ -90,29 +90,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;
@@ -123,7 +123,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 drm_i915_gem_object *log_obj;
@@ -152,9 +152,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 +73 -73
343 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 v3 2/6 drm/i915/huc: Unified css_header struct for GuC and HuC
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).
--- 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 | 40 ++++++++++++++++++++++----------- 3 files changed, 44 insertions(+), 16 deletions(-)
drivers/gpu/drm/i915/intel_guc.h +4 -0
@@ -97,6 +97,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.
@@ -114,6 +117,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 | * +-------------------------------+ * | uCode |
@@ -180,9 +180,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. */
@@ -213,7 +220,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 +27 -13
@@ -553,7 +553,7 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) {struct drm_i915_gem_object *obj;const struct firmware *fw; -struct guc_css_header *css; +struct uc_css_header *css;size_t size;int err;
@@ -570,19 +570,19 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) uc_fw->uc_fw_path, fw);/* Check the size of the blob before examining buffer contents */ -if (fw->size <sizeof (struct guc_css_header )) { +if (fw->size <sizeof (struct uc_css_header )) {DRM_ERROR ("Firmware header is missing\n" ); goto fail; } - css = (struct guc_css_header *)fw->data; + css = (struct uc_css_header *)fw->data;/* Firmware bits always start from header */ uc_fw->header_offset =0 ; uc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - css->key_size_dw - css->exponent_size_dw) *sizeof (u32); -if (uc_fw->header_size !=sizeof (struct guc_css_header )) { +if (uc_fw->header_size !=sizeof (struct uc_css_header )) {DRM_ERROR ("CSS header definition mismatch\n" ); goto fail; }
@@ -606,21 +606,35 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) goto fail; } -/* Header and uCode will be loaded to WOPCM. Size of the two. */ - size = uc_fw->header_size + uc_fw->ucode_size; -if (size >guc_wopcm_size (to_i915 (dev))) { -DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); - goto fail; - } -/* * The GuC firmware image has the version number embedded at a well-known * offset within the firmware blob; note that major / minor version are * TWO bytes each (i.e. u16), although all pointers and offsets are defined * in terms of bytes (u8). */ - uc_fw->major_ver_found = css->guc_sw_version >>16 ; - uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; +switch (uc_fw->fw_type) { +case UC_FW_TYPE_GUC : +/* Header and uCode will be loaded to WOPCM. Size of the two. */ + size = uc_fw->header_size + uc_fw->ucode_size; + +/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */ +if (size >guc_wopcm_size (to_i915 (dev))) { +DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); + goto fail; + } + + uc_fw->major_ver_found = css->guc_sw_version >>16 ; + uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; +break ; +case UC_FW_TYPE_HUC : + uc_fw->major_ver_found = css->huc_sw_version >>16 ; + uc_fw->minor_ver_found = css->huc_sw_version &0xFFFF ; +break ; +default : +DRM_ERROR ("Unknown firmware type %d\n" , uc_fw->fw_type); + err = -ENOEXEC ; + goto fail; + }if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Vivi, Rodrigo
maintainerRe: [PATCH v3 2/6] drm/i915/huc: Unified css_header struct for GuC and HuC
Quoted 26 lines · Peter Antoine
HuC firmware css header has almost exactly same definition as GuC firmware except for the
sw_version. Also, add a new memberfw_typeintointel_uc_fwto indicate what kind of fw it is. So, the loader will pull rightsw_versionfrom header.v2: rebased on-top of drm-intel-nightly
v3: rebased on-top of drm-intel-nightly (again).Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>---
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| 40 ++++++++++++++++++++++-
----------3 files changed, 44 insertions(+), 16 deletions(-)drivers/gpu/drm/i915/intel_guc.h +0
-0@@ -97,6 +97,9 @@ enum intel_uc_fw_status {
UC_FIRMWARE_SUCCESS
};
drivers/gpu/drm/i915/intel_guc.h enum intel_uc_fw_status { · line 102
Quoted 3 lines
drivers/gpu/drm/i915/intel_guc.h +3
-0+#define UC_FW_TYPE_GUC 0 +#define UC_FW_TYPE_HUC 1 +
couldn't this be an enum?
Quoted 159 lines
/*
* This structure encapsulates all the data needed during the process
* of fetching, caching, and loading the firmware image into the GuC.drivers/gpu/drm/i915/intel_guc.h +0
-0@@ -114,6 +117,7 @@ struct intel_uc_fw { uint16_t major_ver_found; uint16_t minor_ver_found;drivers/gpu/drm/i915/intel_guc.h +1
-0+uint32_t fw_type;
uint32_theader_size;
uint32_theader_offset;
uint32_trsa_size;drivers/gpu/drm/i915/intel_guc_fwif.h +1
-1@@ -154,7 +154,7 @@ * The GuC firmware layout looks like this: * * +-------------------------------+ - * | guc_css_header | + * | uc_css_header | * | contains major/minor version | * +-------------------------------+ * | uCode |@@ -180,9 +180,16 @@ * 3. Length info of each component can be found in header, indwords.
* 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. Theuc_css_headeris 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.
*/drivers/gpu/drm/i915/intel_guc_fwif.h +1
-1-struct guc_css_header { +struct uc_css_header {
uint32_tmodule_type;
/*header_sizeincludes all non-uCode bits, includingcss_header, rsa
* key, modulus key and exponent data. */drivers/gpu/drm/i915/intel_guc_fwif.h +0
-0@@ -213,7 +220,10 @@ struct guc_css_header {
char username[8];
char buildnumber[12];drivers/gpu/drm/i915/intel_guc_fwif.h +4
-1-uint32_t device_id; +union { +uint32_t device_id; +uint32_t huc_sw_version; + };
uint32_tguc_sw_version;
uint32_tprod_preprod_fw;
uint32_treserved[12];drivers/gpu/drm/i915/intel_guc_loader.c +1
-1@@ -553,7 +553,7 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) { struct drm_i915_gem_object *obj; const struct firmware *fw; -struct guc_css_header *css; +struct uc_css_header *css; size_t size; int err;drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -570,19 +570,19 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) uc_fw->uc_fw_path, fw);
/* Check the size of the blob before examining buffer contents */drivers/gpu/drm/i915/intel_guc_loader.c +1
-1-if (fw->size <sizeof (struct guc_css_header )) { +if (fw->size <sizeof (struct uc_css_header )) {
DRM_ERROR("Firmware header is missing\n"); goto fail;
}drivers/gpu/drm/i915/intel_guc_loader.c +1
-1- css = (struct guc_css_header *)fw->data; + css = (struct uc_css_header *)fw->data;
/* Firmware bits always start from header */uc_fw->header_offset= 0;uc_fw->header_size= (css->header_size_dw- css-Quoted 1 line
modulus_size_dw-
css->key_size_dw-css->exponent_size_dw) * sizeof(u32);drivers/gpu/drm/i915/intel_guc_loader.c +1
-1-if (uc_fw->header_size !=sizeof (struct guc_css_header )) { +if (uc_fw->header_size !=sizeof (struct uc_css_header )) {
DRM_ERROR("CSS header definition mismatch\n"); goto fail;
}drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -606,21 +606,35 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) goto fail; }drivers/gpu/drm/i915/intel_guc_loader.c +0
-1-/* Header and uCode will be loaded to WOPCM. Size of the two. */
drivers/gpu/drm/i915/intel_guc_loader.c +0
-3- size = uc_fw->header_size + uc_fw->ucode_size; -if (size >guc_wopcm_size (to_i915 (dev))) { - DRM_ERROR("Firmware is too large to fit inWOPCM\n");
drivers/gpu/drm/i915/intel_guc_loader.c +0
-3- goto fail; - } -/*
* The GuC firmware image has the version number embedded at a well-known
* offset within the firmware blob; note that major / minor version are
* TWO bytes each (i.e. u16), although all pointers and offsets are defined
* in terms of bytes (u8).
*/drivers/gpu/drm/i915/intel_guc_loader.c +3
-2- uc_fw->major_ver_found = css->guc_sw_version >>16 ; - uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; +switch (uc_fw->fw_type) { +case UC_FW_TYPE_GUC : +/* Header and uCode will be loaded to WOPCM. Size of the two. */
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+ size = uc_fw->header_size + uc_fw->ucode_size; + +/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0+if (size >guc_wopcm_size (to_i915 (dev))) { + DRM_ERROR("Firmware is too large to fit inWOPCM\n");
drivers/gpu/drm/i915/intel_guc_loader.c +5
-0+ goto fail; + } + + uc_fw->major_ver_found = css->guc_sw_version >>16 ; + uc_fw->minor_ver_found = css->guc_sw_version &
0xFFFF;drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+break ; +case UC_FW_TYPE_HUC : + uc_fw->major_ver_found = css->huc_sw_version >>16 ; + uc_fw->minor_ver_found = css->huc_sw_version &
0xFFFF;drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+break ; +default : + DRM_ERROR("Unknown firmware type %d\n", uc_fw-Quoted 1 line
fw_type);drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+ err = -ENOEXEC ; + goto fail; + }
Quoted 3 lines
if (uc_fw->major_ver_found!=uc_fw->major_ver_wanted||uc_fw->minor_ver_found<uc_fw->minor_ver_wanted) {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 2/6] drm/i915/huc: Unified css_header struct for GuC and HuC
Quoted 18 lines · Rodrigo
Quoted 17 lines · Peter Antoine
HuC firmware css header has almost exactly same definition as GuC firmware except for the
sw_version. Also, add a new memberfw_typeintointel_uc_fwto indicate what kind of fw it is. So, the loader will pull rightsw_versionfrom header.v2: rebased on-top of drm-intel-nightly
v3: rebased on-top of drm-intel-nightly (again).Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>---
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| 40 ++++++++++++++++++++++-
----------3 files changed, 44 insertions(+), 16 deletions(-)
Quoted 12 lines
drivers/gpu/drm/i915/intel_guc.h enum intel_uc_fw_status { · line 102
Quoted 12 lines
drivers/gpu/drm/i915/intel_guc.h +0
-0@@ -97,6 +97,9 @@ enum intel_uc_fw_status {
UC_FIRMWARE_SUCCESS
};drivers/gpu/drm/i915/intel_guc.h +3
-0+#define UC_FW_TYPE_GUC 0 +#define UC_FW_TYPE_HUC 1 +
Yes.
I'll change it.
Peter.
Quoted 158 lines
couldn't this be an enum?
Quoted 155 lines
/*
* This structure encapsulates all the data needed during the process
* of fetching, caching, and loading the firmware image into the GuC.drivers/gpu/drm/i915/intel_guc.h +0
-0@@ -114,6 +117,7 @@ struct intel_uc_fw { uint16_t major_ver_found; uint16_t minor_ver_found;drivers/gpu/drm/i915/intel_guc.h +1
-0+uint32_t fw_type;
uint32_theader_size;
uint32_theader_offset;
uint32_trsa_size;drivers/gpu/drm/i915/intel_guc_fwif.h +1
-1@@ -154,7 +154,7 @@ * The GuC firmware layout looks like this: * * +-------------------------------+ - * | guc_css_header | + * | uc_css_header | * | contains major/minor version | * +-------------------------------+ * | uCode |@@ -180,9 +180,16 @@ * 3. Length info of each component can be found in header, indwords.
* 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. Theuc_css_headeris 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.
*/drivers/gpu/drm/i915/intel_guc_fwif.h +1
-1-struct guc_css_header { +struct uc_css_header {
uint32_tmodule_type;
/*header_sizeincludes all non-uCode bits, includingcss_header, rsa
* key, modulus key and exponent data. */drivers/gpu/drm/i915/intel_guc_fwif.h +0
-0@@ -213,7 +220,10 @@ struct guc_css_header {
char username[8];
char buildnumber[12];drivers/gpu/drm/i915/intel_guc_fwif.h +4
-1-uint32_t device_id; +union { +uint32_t device_id; +uint32_t huc_sw_version; + };
uint32_tguc_sw_version;
uint32_tprod_preprod_fw;
uint32_treserved[12];drivers/gpu/drm/i915/intel_guc_loader.c +1
-1@@ -553,7 +553,7 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) { struct drm_i915_gem_object *obj; const struct firmware *fw; -struct guc_css_header *css; +struct uc_css_header *css; size_t size; int err;drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -570,19 +570,19 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) uc_fw->uc_fw_path, fw);
/* Check the size of the blob before examining buffer contents */drivers/gpu/drm/i915/intel_guc_loader.c +1
-1-if (fw->size <sizeof (struct guc_css_header )) { +if (fw->size <sizeof (struct uc_css_header )) {
DRM_ERROR("Firmware header is missing\n"); goto fail;
}drivers/gpu/drm/i915/intel_guc_loader.c +1
-1- css = (struct guc_css_header *)fw->data; + css = (struct uc_css_header *)fw->data;
/* Firmware bits always start from header */uc_fw->header_offset= 0;uc_fw->header_size= (css->header_size_dw- css-Quoted 1 line
modulus_size_dw-
css->key_size_dw-css->exponent_size_dw) * sizeof(u32);drivers/gpu/drm/i915/intel_guc_loader.c +1
-1-if (uc_fw->header_size !=sizeof (struct guc_css_header )) { +if (uc_fw->header_size !=sizeof (struct uc_css_header )) {
DRM_ERROR("CSS header definition mismatch\n"); goto fail;
}drivers/gpu/drm/i915/intel_guc_loader.c +0
-0@@ -606,21 +606,35 @@ void intel_uc_fw_fetch(struct drm_device *dev, struct intel_uc_fw *uc_fw) goto fail; }drivers/gpu/drm/i915/intel_guc_loader.c +0
-1-/* Header and uCode will be loaded to WOPCM. Size of the two. */
drivers/gpu/drm/i915/intel_guc_loader.c +0
-3- size = uc_fw->header_size + uc_fw->ucode_size; -if (size >guc_wopcm_size (to_i915 (dev))) { - DRM_ERROR("Firmware is too large to fit inWOPCM\n");
drivers/gpu/drm/i915/intel_guc_loader.c +0
-3- goto fail; - } -/*
* The GuC firmware image has the version number embedded at a well-known
* offset within the firmware blob; note that major / minor version are
* TWO bytes each (i.e. u16), although all pointers and offsets are defined
* in terms of bytes (u8).
*/drivers/gpu/drm/i915/intel_guc_loader.c +3
-2- uc_fw->major_ver_found = css->guc_sw_version >>16 ; - uc_fw->minor_ver_found = css->guc_sw_version &0xFFFF ; +switch (uc_fw->fw_type) { +case UC_FW_TYPE_GUC : +/* Header and uCode will be loaded to WOPCM. Size of the two. */
drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+ size = uc_fw->header_size + uc_fw->ucode_size; + +/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0+if (size >guc_wopcm_size (to_i915 (dev))) { + DRM_ERROR("Firmware is too large to fit inWOPCM\n");
drivers/gpu/drm/i915/intel_guc_loader.c +5
-0+ goto fail; + } + + uc_fw->major_ver_found = css->guc_sw_version >>16 ; + uc_fw->minor_ver_found = css->guc_sw_version &
0xFFFF;drivers/gpu/drm/i915/intel_guc_loader.c +4
-0+break ; +case UC_FW_TYPE_HUC : + uc_fw->major_ver_found = css->huc_sw_version >>16 ; + uc_fw->minor_ver_found = css->huc_sw_version &
0xFFFF;drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+break ; +default : + DRM_ERROR("Unknown firmware type %d\n", uc_fw-
Quoted 7 lines
Quoted 7 lines
Quoted 1 line
fw_type);drivers/gpu/drm/i915/intel_guc_loader.c +3
-0+ err = -ENOEXEC ; + goto fail; + }
if (uc_fw->major_ver_found!=uc_fw->major_ver_wanted||uc_fw->minor_ver_found<uc_fw->minor_ver_wanted) {
--
Peter Antoine (Android Graphics Driver Software Engineer)
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ VAT No: 860 2173 47
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 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_provate to to_i915()
--- 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 | 26 ++-- drivers/gpu/drm/i915/intel_huc.h | 44 ++++++ drivers/gpu/drm/i915/intel_huc_loader.c | 267 ++++++++++++++++++++++++++++++++ 8 files changed, 336 insertions(+), 12 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
@@ -47,6 +47,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
@@ -645,6 +645,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);
@@ -670,6 +671,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);
@@ -1341,6 +1343,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ flush_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"
@@ -1739,6 +1740,7 @@ struct drm_i915_private {struct intel_gvt gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;
@@ -2865,6 +2867,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
@@ -160,6 +160,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 +14 -12
@@ -85,6 +85,17 @@ const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) } }; +u32 guc_wopcm_size (struct drm_i915_private *dev_priv) +{ +u32 wopcm_size =GUC_WOPCM_TOP ; + +/* On BXT, the top of WOPCM is reserved for RC6 context */ +if (IS_BROXTON (dev_priv)) + wopcm_size -=BXT_GUC_WOPCM_RC6_RESERVED ; + +return wopcm_size; +} +static void direct_interrupts_to_host (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;
@@ -272,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.
@@ -297,17 +309,6 @@ 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 wopcm_size =GUC_WOPCM_TOP ; - -/* On BXT, the top of WOPCM is reserved for RC6 context */ -if (IS_BROXTON (dev_priv)) - wopcm_size -=BXT_GUC_WOPCM_RC6_RESERVED ; - -return wopcm_size; -} -/* * Load the GuC firmware blob into the MinuteIA. */
@@ -476,6 +477,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 +267 -0
267 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
Re: [PATCH v3 3/6] drm/i915/huc: Add HuC fw loading support
Quoted 133 lines · Peter Antoine
The HuC loading process is similar to GuC. The
intel_uc_fw_fetch()is used for both cases.HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) updatehuc_versionnumber of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changeddev->dev_provatetoto_i915()Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 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 | 26 ++-- drivers/gpu/drm/i915/intel_huc.h | 44 ++++++ drivers/gpu/drm/i915/intel_huc_loader.c | 267 ++++++++++++++++++++++++++++++++ 8 files changed, 336 insertions(+), 12 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc.h create mode 100644 drivers/gpu/drm/i915/intel_huc_loader.cdrivers/gpu/drm/i915/Makefile +1
-0@@ -47,6 +47,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 statedrivers/gpu/drm/i915/i915_drv.c +3
-0@@ -645,6 +645,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);@@ -670,6 +671,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);@@ -1341,6 +1343,7 @@ void i915_driver_unload(struct drm_device *dev)/* Flush any outstanding unpin_work. */ flush_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" @@ -1739,6 +1740,7 @@ struct drm_i915_private {struct intel_gvt gvt; +struct intel_huc huc;struct intel_guc guc;struct intel_csr csr;@@ -2865,6 +2867,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@@ -160,6 +160,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 +0
-0@@ -85,6 +85,17 @@ const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) } };
drivers/gpu/drm/i915/intel_guc_loader.c const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) · line 97
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +10
-0+u32 guc_wopcm_size (struct drm_i915_private *dev_priv) +{ +u32 wopcm_size =GUC_WOPCM_TOP ; + +/* On BXT, the top of WOPCM is reserved for RC6 context */ +if (IS_BROXTON (dev_priv)) + wopcm_size -=BXT_GUC_WOPCM_RC6_RESERVED ; + +return wopcm_size; +}
I know this function is being made visible externally, but I don't think that requires it to be moved to the top of the file.
Quoted 17 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-1static void direct_interrupts_to_host (struct drm_i915_private *dev_priv) {struct intel_engine_cs *engine;@@ -272,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. @@ -297,17 +309,6 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv)return ret; }
drivers/gpu/drm/i915/intel_guc_loader.c static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv) · line 309
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +0
-10-static u32 guc_wopcm_size (struct drm_i915_private *dev_priv) -{ -u32 wopcm_size =GUC_WOPCM_TOP ; - -/* On BXT, the top of WOPCM is reserved for RC6 context */ -if (IS_BROXTON (dev_priv)) - wopcm_size -=BXT_GUC_WOPCM_RC6_RESERVED ; - -return wopcm_size; -}
This function was perfectly OK where it was.
Otherwise generally OK.
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 3/6] drm/i915/huc: Add HuC fw loading support
In reply to Peter AntoineQuoted 15 lines · Peter Antoine
The HuC loading process is similar to GuC. The
intel_uc_fw_fetch()is used for both cases.HuC loading needs to be before GuC loading. The WOPCM setting must be done early before loading any of them.
v2: rebased on-top of drm-intel-nightly.
removed if(HAS_GUC()) before the guc call. (D.Gordon) updatehuc_versionnumber of format.
v3: rebased to drm-intel-nightly, changed the file name format to
match the one in the huc package.
Changeddev->dev_provatetoto_i915()Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>
Quoted 12 lines
--- 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 | 26 ++-- drivers/gpu/drm/i915/intel_huc.h | 44 ++++++ drivers/gpu/drm/i915/intel_huc_loader.c | 267 ++++++++++++++++++++++++++++++++ 8 files changed, 336 insertions(+), 12 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_huc.h create mode 100644 drivers/gpu/drm/i915/intel_huc_loader.c
I found another problem, which at root is because this was *copied* from the GuC loading code some time ago, rather than being implemented in a single generic function. The GuC code has been changed since it was cloned, but of course the corresponding updates are missing from the HuC version.
[snip]
drivers/gpu/drm/i915/intel_huc_loader.c line 113
Quoted 6 lines
drivers/gpu/drm/i915/intel_huc_loader.c new file +6
-0+ +/* Start the DMA */ +I915_WRITE (DMA_CTRL ,_MASKED_BIT_ENABLE (HUC_UKERNEL |START_DMA )); + +/* Wait for DMA to finish */ + ret =wait_for_atomic ((I915_READ (DMA_CTRL ) &START_DMA ) ==0 ,50 );
Can't use wait_for_atomic() here. The GuC version now reads:
/*
* Wait for the DMA to complete & the GuC to start up.
* NB: Docs recommend not using the interrupt for completion.
* Measurements indicate this should take no more than 20ms,
* so a timeout here indicates that the GuC has is unusable.
* (Higher levels of the driver will attempt to fall back to
* execlist mode if this happens.)
*/
ret = wait_for(guc_ucode_response(dev_priv, &status), 100);
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 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.
--- drivers/gpu/drm/i915/i915_debugfs.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +33 -0
@@ -2494,6 +2494,38 @@ 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_info_node *node = m->private; +struct drm_device *dev = node->minor->dev; +struct drm_i915_private *dev_priv =to_i915 (dev); +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_info_node *node = m->private;
@@ -5407,6 +5439,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 v3 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.
--- 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
@@ -1076,3 +1077,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; +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 ; + } + + ret =i915_gem_obj_ggtt_pin (huc->huc_fw.uc_fw_obj,0 ,0 ); +if (ret) { +DRM_ERROR ("HuC: Pin failed" ); +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_gem_obj_ggtt_offset (huc->huc_fw.uc_fw_obj) + + 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_atomic ( + (I915_READ (HUC_STATUS2 ) &HUC_FW_VERIFIED ) >0 ,50 ); +if (ret) { +DRM_ERROR ("HuC: Authentication failed\n" ); + goto out; + } + +out: +i915_gem_object_ggtt_unpin (huc->huc_fw.uc_fw_obj); +}
drivers/gpu/drm/i915/intel_guc_fwif.h +1 -0
@@ -437,6 +437,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
@@ -495,6 +495,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
Re: [PATCH v3 5/6] drm/i915/huc: Support HuC authentication
Quoted 7 lines · Peter Antoine
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.
Quoted 7 lines
Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- 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(+)
No obvious problems here.
Quoted 98 lines
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 @@ -1076,3 +1077,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; +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 ; + } + + ret =i915_gem_obj_ggtt_pin (huc->huc_fw.uc_fw_obj,0 ,0 ); +if (ret) { +DRM_ERROR ("HuC: Pin failed" ); +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_gem_obj_ggtt_offset (huc->huc_fw.uc_fw_obj) + + 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_atomic ( + (I915_READ (HUC_STATUS2 ) &HUC_FW_VERIFIED ) >0 ,50 ); +if (ret) { +DRM_ERROR ("HuC: Authentication failed\n" ); + goto out; + } + +out: +i915_gem_object_ggtt_unpin (huc->huc_fw.uc_fw_obj); +}drivers/gpu/drm/i915/intel_guc_fwif.h +1
-0@@ -437,6 +437,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 +0
-0
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_setup(struct drm_device *dev) · line 502
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-0@@ -495,6 +495,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)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 5/6] drm/i915/huc: Support HuC authentication
Quoted 17 lines · Dave Gordon
Quoted 7 lines · Peter Antoine
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.Quoted 8 lines
Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>--- 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(+)
Quoted 1 line
No obvious problems here.
On second thoughts ...
Quoted 5 lines
Quoted 5 lines
drivers/gpu/drm/i915/i915_guc_submission.c +5
-0+ ret =host2guc_action (guc, data,ARRAY_SIZE (data)); +if (ret) { +DRM_ERROR ("HuC: GuC did not ack Auth request\n" ); + goto out; + }
Quoted 8 lines
drivers/gpu/drm/i915/i915_guc_submission.c int intel_guc_resume(struct drm_device *dev) · line 1139
Quoted 8 lines
drivers/gpu/drm/i915/i915_guc_submission.c +8
-0+ +/* Check authentication status, it should be done by now */ + ret =wait_for_atomic ( + (I915_READ (HUC_STATUS2 ) &HUC_FW_VERIFIED ) >0 ,50 ); +if (ret) { +DRM_ERROR ("HuC: Authentication failed\n" ); + goto out; + }
... there's another wait_for_atomic() here :(
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 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.
--- drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/i915/intel_huc_loader.c +7 -0
@@ -49,6 +49,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
@@ -157,6 +160,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
Vivi, Rodrigo
maintainerRe: [PATCH v3 6/6] drm/i915/huc: Add BXT HuC Loading Support
vaapi-intel-driver, the userspace component here is only using HuC for SKL for now, so I believe this one will be on hold for now, right?
Quoted 36 lines · Peter Antoine
This 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.Signed-off-by Peter Antoine <[email protected]>---
drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_huc_loader.c +0
-0@@ -49,6 +49,9 @@ #define I915_SKL_HUC_UCODE "i915/skl_huc_ver01_07_1398.bin" MODULE_FIRMWARE(I915_SKL_HUC_UCODE);drivers/gpu/drm/i915/intel_huc_loader.c +3
-0+#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 devicedrivers/gpu/drm/i915/intel_huc_loader.c +4
-0@@ -157,6 +160,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 ; }
Quoted 2 lines
if (fw_path== NULL)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 6/6] drm/i915/huc: Add BXT HuC Loading Support
Hi Rodrigo,
We will use HuC on BXT.
Thanks
Haihao
Quoted 41 lines
vaapi-intel-driver, the userspace component here is only using HuC for
SKL for now, so I believe this one will be on hold for now, right?Quoted 34 lines · Peter Antoine
This 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.Signed-off-by Peter Antoine <[email protected]>---
drivers/gpu/drm/i915/intel_huc_loader.c | 7 +++++++1 file changed, 7 insertions(+)drivers/gpu/drm/i915/intel_huc_loader.c +0
-0@@ -49,6 +49,9 @@ #define I915_SKL_HUC_UCODE "i915/skl_huc_ver01_07_1398.bin" MODULE_FIRMWARE(I915_SKL_HUC_UCODE);drivers/gpu/drm/i915/intel_huc_loader.c +3
-0+#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 devicedrivers/gpu/drm/i915/intel_huc_loader.c +3
-0@@ -157,6 +160,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 ;
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_huc_loader.c +1
-0+ huc_fw->minor_ver_wanted =7 ; }
if (fw_path== NULL)_______________________________________________
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✗ Ro.CI.BAT: warning for series starting with [v3,1/6] drm/i915/guc: Make the GuC fw loading helper functions general
In reply to Peter Antoine== Series Details ==
== Series Details ==
Series: series starting with [v3,1/6] drm/i915/guc: Make the GuC fw loading helper functions general
URL : https://patchwork.freedesktop.org/series/9564/
State : warning
== Summary ==
Series 9564v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/9564/revisions/1/mbox
Test drv_hangman:
Subgroup error-state-basic:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Test drv_module_reload_basic:
skip -> PASS (ro-snb-i7-2620M)
pass -> DMESG-WARN (fi-skl-i5-6260u)
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Test gem_ringfill:
Subgroup basic-default-hang:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Subgroup hang-read-crc-pipe-b:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Subgroup hang-read-crc-pipe-c:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> SKIP (ro-bdw-i7-5557U)
pass -> DMESG-WARN (fi-skl-i5-6260u)
Subgroup suspend-read-crc-pipe-b:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Subgroup suspend-read-crc-pipe-c:
pass -> DMESG-WARN (fi-skl-i5-6260u)
Test prime_busy:
Subgroup basic-after-default:
fail -> DMESG-FAIL (fi-skl-i5-6260u)
Subgroup basic-before-default:
fail -> DMESG-FAIL (fi-skl-i5-6260u)fi-kbl-qkkr total:235 pass:164 dwarn:29 dfail:0 fail:2 skip:40 fi-skl-i5-6260u total:235 pass:197 dwarn:10 dfail:2 fail:0 skip:26 fi-snb-i7-2600 total:235 pass:179 dwarn:0 dfail:0 fail:2 skip:54 ro-bdw-i5-5250u total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23 ro-bdw-i7-5557U total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23 ro-bdw-i7-5600u total:229 pass:190 dwarn:0 dfail:1 fail:0 skip:38 ro-bsw-n3050 total:229 pass:177 dwarn:0 dfail:1 fail:2 skip:49 ro-byt-n2820 total:229 pass:180 dwarn:0 dfail:1 fail:3 skip:45 ro-hsw-i3-4010u total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-hsw-i7-4770r total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-ilk-i7-620lm total:229 pass:157 dwarn:0 dfail:1 fail:1 skip:70 ro-ilk1-i5-650 total:224 pass:157 dwarn:0 dfail:1 fail:1 skip:65 ro-ivb-i7-3770 total:229 pass:188 dwarn:0 dfail:1 fail:0 skip:40 ro-skl3-i5-6260u total:229 pass:208 dwarn:1 dfail:1 fail:0 skip:19 ro-snb-i7-2620M total:229 pass:179 dwarn:0 dfail:1 fail:1 skip:48
Results at /archive/results/CI_IGT_test/RO_Patchwork_1437/
39b147d drm-intel-nightly: 2016y-07m-06d-12h-15m-56s UTC integration manifest b989dea drm/i915/huc: Add BXT HuC Loading Support
6db0136 drm/i915/huc: Support HuC authentication
41abdd6 drm/i915/huc: Add debugfs for HuC loading status check 1570368 drm/i915/huc: Add HuC fw loading support
6e311bd drm/i915/huc: Unified css_header struct for GuC and HuC e5ca66a drm/i915/guc: Make the GuC fw loading helper functions general
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Peter Antoine
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Reviewed-by Dave Gordon <[email protected]>
Quoted 6 lines
--- 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 | 146 ++++++++++++++--------------- 4 files changed, 101 insertions(+), 100 deletions(-)
As of yesterday, the odd-numbered patches 1 & 3 no longer apply cleanly and will need rebasing (again).
Also (as of last week's Tech Forum) any series containing more than a single patch should preferably have a cover letter that at least gives a summary of the patchset as a whole.
However the main problem with this patch it not what it changes, as what it fails to change. As I previously suggested (and provided code for) you need to change all the messages so they don't say "GuC" when we're actually dealing with the HuC. Updated fixup-patch attached ...
.Dave.
Quoted 1 line
From
8a2e98098ff48ed1a9abec3159e630b3a8c18f64Mon Sep 17 00:00:00 2001
From: Dave Gordon <[email protected]>
Date: Tue, 28 Jun 2016 13:09:54 +0100
Subject: [PATCH v3] Tweaks to GuC/HuC loader code
Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ
1. Add uc_name to intel_uc_fw structure, so we can use the appropriate name ("GuC" or "HuC") everywhere (obviously, it should match the fw_type field).
2. Change all messages in intel_uc_fw_fetch() to use the uc_name.
3. Validate fw_type at the beginning to intel_uc_fw_fetch() rather than midway. Is there a firmware type in the CSS header -- if so we should use that and the relevant definitions.
4. Refactor printing the firmware fetch/load status into a macro.
--- drivers/gpu/drm/i915/intel_guc.h | 3 +- drivers/gpu/drm/i915/intel_guc_loader.c | 84 +++++++++++++++++++++------------ drivers/gpu/drm/i915/intel_huc_loader.c | 3 +- 3 files changed, 57 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/intel_guc.h +2 -1
@@ -106,9 +106,10 @@ enum intel_uc_fw_status {*/ struct intel_uc_fw {struct drm_device *uc_dev; +const char *uc_name;const char *uc_fw_path; -size_t uc_fw_size;struct drm_i915_gem_object *uc_fw_obj; +size_t uc_fw_size;enum intel_uc_fw_status fetch_status;enum intel_uc_fw_status load_status;
drivers/gpu/drm/i915/intel_guc_loader.c +53 -31
194 lines not on this page · raw message
drivers/gpu/drm/i915/intel_huc_loader.c +2 -1
@@ -148,10 +148,11 @@ void intel_huc_init(struct drm_device *dev)const char *fw_path =NULL ; huc_fw->uc_dev = dev; + huc_fw->uc_name ="HuC" ; + huc_fw->fw_type =UC_FW_TYPE_HUC ; huc_fw->uc_fw_path =NULL ; huc_fw->fetch_status =UC_FIRMWARE_NONE ; huc_fw->load_status =UC_FIRMWARE_NONE ; - huc_fw->fw_type =UC_FW_TYPE_HUC ;if (!HAS_HUC_UCODE (dev_priv))return ;
Signature · 1 line
1.9.1
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
This patch has nothing to do with HuC. It is changing the GuC code to allow for generic usage. But, I will change the "GuC" in the messages for "uC".
I'll let you add the patch yourself as you seem to have other renames/refactors on the mailing list.
Peter.
-----Original Message-----
From: Gordon, David S
Sent: Friday, July 29, 2016 12:19 PM
To: Antoine, Peter <[email protected]>; [email protected]
Subject: Re: [PATCH v3 1/6] drm/i915/guc: Make the GuC fw loading helper functions general
Quoted 16 lines · Peter Antoine
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Reviewed-by Dave Gordon <[email protected]>
Quoted 6 lines
--- 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 | 146 ++++++++++++++--------------- 4 files changed, 101 insertions(+), 100 deletions(-)
As of yesterday, the odd-numbered patches 1 & 3 no longer apply cleanly and will need rebasing (again).
Also (as of last week's Tech Forum) any series containing more than a single patch should preferably have a cover letter that at least gives a summary of the patchset as a whole.
However the main problem with this patch it not what it changes, as what it fails to change. As I previously suggested (and provided code for) you need to change all the messages so they don't say "GuC" when we're actually dealing with the HuC. Updated fixup-patch attached ...
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for series starting with [v3,1/6] drm/i915/guc: Make the GuC fw loading helper functions general (rev2)
In reply to Peter Antoine== Series Details ==
== Series Details ==
Series: series starting with [v3,1/6] drm/i915/guc: Make the GuC fw loading helper functions general (rev2)
URL : https://patchwork.freedesktop.org/series/9564/
State : failure
== Summary ==
Applying: drm/i915/guc: Make the GuC fw loading helper functions general
fatal: sha1 information is lacking or useless (drivers/gpu/drm/i915/intel_guc_loader.c).
error: could not build fake ancestor
Patch failed at 0001 drm/i915/guc: Make the GuC fw loading helper functions general The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Peter Antoine
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.
Quoted 7 lines
v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Reviewed-by Dave Gordon <[email protected]>
R-b can carry over again, but this will need (ANOTHER!) rebase as Chris has nuked one of the functions called below.
Quoted 180 lines
--- 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 | 146 ++++++++++++++--------------- 4 files changed, 101 insertions(+), 100 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +6
-6@@ -2498,7 +2498,7 @@ static int i915_guc_load_status_info(struct seq_file *m, void *data) {struct drm_info_node *node = m->private;struct drm_i915_private *dev_priv =to_i915 (node->minor->dev); -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))@@ -2506,15 +2506,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@@ -1038,7 +1038,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;@@ -1064,7 +1064,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@@ -90,29 +90,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;@@ -123,7 +123,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 drm_i915_gem_object *log_obj;@@ -152,9 +152,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 +8
-8@@ -69,16 +69,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!" ;@@ -240,8 +240,8 @@ 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 intel_guc_fw *guc_fw = &dev_priv->guc.guc_fw; -struct drm_i915_gem_object *fw_obj = guc_fw->guc_fw_obj; +struct intel_uc_fw *guc_fw = &dev_priv->guc.guc_fw; +struct drm_i915_gem_object *fw_obj = guc_fw->uc_fw_obj;unsigned long offset;struct sg_table *sg = fw_obj->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ];@@ -313,17 +313,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 drm_device *dev = &dev_priv->drm;int ret;
drivers/gpu/drm/i915/intel_guc_loader.c static u32 guc_wopcm_size(struct drm_i915_private *dev_priv) · line 326
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-2- 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; } - ret =i915_gem_obj_ggtt_pin (guc_fw->guc_fw_obj,0 ,0 ); + ret =i915_gem_obj_ggtt_pin (guc_fw->uc_fw_obj,0 ,0 );
This now has to be:
ret = i915_gem_object_ggtt_pin(guc_fw->uc_fw_obj, NULL, 0, 0, 0);
Otherwise OK :)
.Dave.
Quoted 300 lines
drivers/gpu/drm/i915/intel_guc_loader.c +59
-60if (ret) {DRM_DEBUG_DRIVER ("pin failed %d\n" , ret);return ret;@@ -375,7 +375,7 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)* We keep the object pages for reuse during resume. But we can unpin it * now that DMA has completed, so it doesn't continue to take up space. */ -i915_gem_object_ggtt_unpin (guc_fw->guc_fw_obj); +i915_gem_object_ggtt_unpin (guc_fw->uc_fw_obj);return ret; }@@ -414,14 +414,14 @@ static int i915_reset_guc(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) {@@ -439,21 +439,21 @@ 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; }direct_interrupts_to_host (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)@@ -487,11 +487,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) { err =i915_guc_submission_enable (dev_priv);@@ -503,8 +503,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 ;direct_interrupts_to_host (dev_priv);i915_guc_submission_disable (dev_priv);@@ -549,7 +549,7 @@ fail: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 drm_i915_gem_object *obj;const struct firmware *fw;@@ -558,16 +558,16 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)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)); +intel_uc_fw_status_repr (uc_fw->fetch_status)); - err =request_firmware (&fw, guc_fw->guc_fw_path, &dev->pdev->dev); + err =request_firmware (&fw, uc_fw->uc_fw_path, &dev->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); + uc_fw->uc_fw_path, fw);/* Check the size of the blob before examining buffer contents */ if (fw->size <sizeof (struct guc_css_header )) {@@ -578,36 +578,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_ERROR ("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_ERROR ("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_ERROR ("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_ERROR ("Firmware is too large to fit in WOPCM\n" ); goto fail;@@ -619,21 +619,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 ; + uc_fw->major_ver_found = css->guc_sw_version >>16 ; + uc_fw->minor_ver_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) { +if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || + uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {DRM_ERROR ("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, 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);@@ -643,31 +643,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); + 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_DEBUG_DRIVER ("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n" , - err, fw, guc_fw->guc_fw_obj); + err, fw, uc_fw->uc_fw_obj);DRM_ERROR ("Failed to fetch GuC firmware from %s (error %d)\n" , - guc_fw->guc_fw_path, err); + uc_fw->uc_fw_path, err);mutex_lock (&dev->struct_mutex); - obj = guc_fw->guc_fw_obj; + obj = uc_fw->uc_fw_obj;if (obj)drm_gem_object_unreference (&obj->base); - 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 ; }/** @@ -682,7 +682,7 @@ fail: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;/* A negative value means "use platform default" */ @@ -695,24 +695,24 @@ void intel_guc_init(struct drm_device *dev) fw_path =NULL ; }else if (IS_SKYLAKE (dev)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =6 ; - guc_fw->guc_fw_minor_wanted =1 ; + guc_fw->major_ver_wanted =6 ; + guc_fw->minor_ver_wanted =1 ; }else if (IS_BROXTON (dev)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =8 ; - guc_fw->guc_fw_minor_wanted =7 ; + guc_fw->major_ver_wanted =8 ; + guc_fw->minor_ver_wanted =7 ; }else if (IS_KABYLAKE (dev)) { fw_path =I915_KBL_GUC_UCODE ; - guc_fw->guc_fw_major_wanted =9 ; - guc_fw->guc_fw_minor_wanted =14 ; + guc_fw->major_ver_wanted =9 ; + guc_fw->minor_ver_wanted =14 ; }else { fw_path ="" ;/* unknown device */ } - guc_fw->guc_dev = dev; - 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)@@ -722,9 +722,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 */ }@@ -735,17 +735,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);direct_interrupts_to_host (dev_priv);i915_guc_submission_disable (dev_priv);i915_guc_submission_fini (dev_priv); -if (guc_fw->guc_fw_obj)
drivers/gpu/drm/i915/intel_guc_loader.c void intel_guc_init(struct drm_device *dev) · line 751
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-3-drm_gem_object_unreference (&guc_fw->guc_fw_obj->base); - guc_fw->guc_fw_obj =NULL ; +if (guc_fw->uc_fw_obj) +drm_gem_object_unreference (&guc_fw->uc_fw_obj->base); + 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 ; }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Dave Gordon
Quoted 13 lines · Peter Antoine
Rename some of the GuC fw loading code to make them more general. We will utilise them for HuC loading as well.
s/intel_guc_fw/intel_uc_fw/g s/GUC_FIRMWARE/UC_FIRMWARE/gStruct
intel_guc_fwis renamed tointel_uc_fw. Prefix of tts members, such as 'guc' or 'guc_fw' either is renamed to 'uc' or removed for same purpose.v2: rebased on top of nightly.
reapplied the search/replace as upstream code as changed.
v3: rebased again on drm-nightly.
Quoted 14 lines
Quoted 3 lines
Signed-off-by Alex Dai <[email protected]>Signed-off-by Peter Antoine <[email protected]>Reviewed-by Dave Gordon <[email protected]>R-b can carry over again, but this will need (ANOTHER!) rebase as Chris has nuked one of the functions called below.
Quoted 7 lines
--- 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 | 146 ++++++++++++++--------------- 4 files changed, 101 insertions(+), 100 deletions(-)
Ignore previous message, replied to wrong version :(
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx