mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
drm/i915/uc: Make intel_uc_prepare_fw() static
There is no need to expose this function as it is called from one function only. Also move it up to avoid forward declaration. v2: drop intel_ prefix (Oscar) and rename to fetch_uc_fw (Michal) Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com> Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170327094510.167400-1-michal.wajdeczko@intel.com Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
parent
6f9b850bec
commit
9d98af0bbe
2 changed files with 135 additions and 137 deletions
|
@ -89,13 +89,146 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)
|
||||||
guc->send = intel_guc_send_mmio;
|
guc->send = intel_guc_send_mmio;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void fetch_uc_fw(struct drm_i915_private *dev_priv,
|
||||||
|
struct intel_uc_fw *uc_fw)
|
||||||
|
{
|
||||||
|
struct pci_dev *pdev = dev_priv->drm.pdev;
|
||||||
|
struct drm_i915_gem_object *obj;
|
||||||
|
const struct firmware *fw = NULL;
|
||||||
|
struct uc_css_header *css;
|
||||||
|
size_t size;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
uc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;
|
||||||
|
|
||||||
|
DRM_DEBUG_DRIVER("before requesting firmware: uC fw fetch status %s\n",
|
||||||
|
intel_uc_fw_status_repr(uc_fw->fetch_status));
|
||||||
|
|
||||||
|
err = request_firmware(&fw, uc_fw->path, &pdev->dev);
|
||||||
|
if (err)
|
||||||
|
goto fail;
|
||||||
|
if (!fw)
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
DRM_DEBUG_DRIVER("fetch uC fw from %s succeeded, fw %p\n",
|
||||||
|
uc_fw->path, fw);
|
||||||
|
|
||||||
|
/* Check the size of the blob before examining buffer contents */
|
||||||
|
if (fw->size < sizeof(struct uc_css_header)) {
|
||||||
|
DRM_NOTE("Firmware header is missing\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
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 uc_css_header)) {
|
||||||
|
DRM_NOTE("CSS header definition mismatch\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* then, uCode */
|
||||||
|
uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size;
|
||||||
|
uc_fw->ucode_size = (css->size_dw - css->header_size_dw) * sizeof(u32);
|
||||||
|
|
||||||
|
/* now RSA */
|
||||||
|
if (css->key_size_dw != UOS_RSA_SCRATCH_MAX_COUNT) {
|
||||||
|
DRM_NOTE("RSA key size is bad\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
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 = uc_fw->header_size + uc_fw->ucode_size + uc_fw->rsa_size;
|
||||||
|
if (fw->size < size) {
|
||||||
|
DRM_NOTE("Missing firmware components\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).
|
||||||
|
*/
|
||||||
|
switch (uc_fw->type) {
|
||||||
|
case INTEL_UC_FW_TYPE_GUC:
|
||||||
|
/* Header and uCode will be loaded to WOPCM. Size of the two. */
|
||||||
|
size = uc_fw->header_size + uc_fw->ucode_size;
|
||||||
|
|
||||||
|
/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
|
||||||
|
if (size > intel_guc_wopcm_size(dev_priv)) {
|
||||||
|
DRM_ERROR("Firmware is too large to fit in WOPCM\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
uc_fw->major_ver_found = css->guc.sw_version >> 16;
|
||||||
|
uc_fw->minor_ver_found = css->guc.sw_version & 0xFFFF;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case INTEL_UC_FW_TYPE_HUC:
|
||||||
|
uc_fw->major_ver_found = css->huc.sw_version >> 16;
|
||||||
|
uc_fw->minor_ver_found = css->huc.sw_version & 0xFFFF;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
DRM_ERROR("Unknown firmware type %d\n", uc_fw->type);
|
||||||
|
err = -ENOEXEC;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (uc_fw->major_ver_wanted == 0 && uc_fw->minor_ver_wanted == 0) {
|
||||||
|
DRM_NOTE("Skipping uC firmware version check\n");
|
||||||
|
} else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted ||
|
||||||
|
uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {
|
||||||
|
DRM_NOTE("uC firmware version %d.%d, required %d.%d\n",
|
||||||
|
uc_fw->major_ver_found, uc_fw->minor_ver_found,
|
||||||
|
uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
|
||||||
|
err = -ENOEXEC;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
DRM_DEBUG_DRIVER("firmware version %d.%d OK (minimum %d.%d)\n",
|
||||||
|
uc_fw->major_ver_found, uc_fw->minor_ver_found,
|
||||||
|
uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
|
||||||
|
|
||||||
|
obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size);
|
||||||
|
if (IS_ERR(obj)) {
|
||||||
|
err = PTR_ERR(obj);
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
uc_fw->obj = obj;
|
||||||
|
uc_fw->size = fw->size;
|
||||||
|
|
||||||
|
DRM_DEBUG_DRIVER("uC fw fetch status SUCCESS, obj %p\n",
|
||||||
|
uc_fw->obj);
|
||||||
|
|
||||||
|
release_firmware(fw);
|
||||||
|
uc_fw->fetch_status = INTEL_UC_FIRMWARE_SUCCESS;
|
||||||
|
return;
|
||||||
|
|
||||||
|
fail:
|
||||||
|
DRM_WARN("Failed to fetch valid uC firmware from %s (error %d)\n",
|
||||||
|
uc_fw->path, err);
|
||||||
|
DRM_DEBUG_DRIVER("uC fw fetch status FAIL; err %d, fw %p, obj %p\n",
|
||||||
|
err, fw, uc_fw->obj);
|
||||||
|
|
||||||
|
release_firmware(fw); /* OK even if fw is NULL */
|
||||||
|
uc_fw->fetch_status = INTEL_UC_FIRMWARE_FAIL;
|
||||||
|
}
|
||||||
|
|
||||||
void intel_uc_init_fw(struct drm_i915_private *dev_priv)
|
void intel_uc_init_fw(struct drm_i915_private *dev_priv)
|
||||||
{
|
{
|
||||||
if (dev_priv->huc.fw.path)
|
if (dev_priv->huc.fw.path)
|
||||||
intel_uc_prepare_fw(dev_priv, &dev_priv->huc.fw);
|
fetch_uc_fw(dev_priv, &dev_priv->huc.fw);
|
||||||
|
|
||||||
if (dev_priv->guc.fw.path)
|
if (dev_priv->guc.fw.path)
|
||||||
intel_uc_prepare_fw(dev_priv, &dev_priv->guc.fw);
|
fetch_uc_fw(dev_priv, &dev_priv->guc.fw);
|
||||||
}
|
}
|
||||||
|
|
||||||
void intel_uc_fini_fw(struct drm_i915_private *dev_priv)
|
void intel_uc_fini_fw(struct drm_i915_private *dev_priv)
|
||||||
|
@ -304,136 +437,3 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)
|
||||||
|
|
||||||
return intel_guc_send(guc, action, ARRAY_SIZE(action));
|
return intel_guc_send(guc, action, ARRAY_SIZE(action));
|
||||||
}
|
}
|
||||||
|
|
||||||
void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
|
|
||||||
struct intel_uc_fw *uc_fw)
|
|
||||||
{
|
|
||||||
struct pci_dev *pdev = dev_priv->drm.pdev;
|
|
||||||
struct drm_i915_gem_object *obj;
|
|
||||||
const struct firmware *fw = NULL;
|
|
||||||
struct uc_css_header *css;
|
|
||||||
size_t size;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
uc_fw->fetch_status = INTEL_UC_FIRMWARE_PENDING;
|
|
||||||
|
|
||||||
DRM_DEBUG_DRIVER("before requesting firmware: uC fw fetch status %s\n",
|
|
||||||
intel_uc_fw_status_repr(uc_fw->fetch_status));
|
|
||||||
|
|
||||||
err = request_firmware(&fw, uc_fw->path, &pdev->dev);
|
|
||||||
if (err)
|
|
||||||
goto fail;
|
|
||||||
if (!fw)
|
|
||||||
goto fail;
|
|
||||||
|
|
||||||
DRM_DEBUG_DRIVER("fetch uC fw from %s succeeded, fw %p\n",
|
|
||||||
uc_fw->path, fw);
|
|
||||||
|
|
||||||
/* Check the size of the blob before examining buffer contents */
|
|
||||||
if (fw->size < sizeof(struct uc_css_header)) {
|
|
||||||
DRM_NOTE("Firmware header is missing\n");
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
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 uc_css_header)) {
|
|
||||||
DRM_NOTE("CSS header definition mismatch\n");
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* then, uCode */
|
|
||||||
uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size;
|
|
||||||
uc_fw->ucode_size = (css->size_dw - css->header_size_dw) * sizeof(u32);
|
|
||||||
|
|
||||||
/* now RSA */
|
|
||||||
if (css->key_size_dw != UOS_RSA_SCRATCH_MAX_COUNT) {
|
|
||||||
DRM_NOTE("RSA key size is bad\n");
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
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 = uc_fw->header_size + uc_fw->ucode_size + uc_fw->rsa_size;
|
|
||||||
if (fw->size < size) {
|
|
||||||
DRM_NOTE("Missing firmware components\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).
|
|
||||||
*/
|
|
||||||
switch (uc_fw->type) {
|
|
||||||
case INTEL_UC_FW_TYPE_GUC:
|
|
||||||
/* Header and uCode will be loaded to WOPCM. Size of the two. */
|
|
||||||
size = uc_fw->header_size + uc_fw->ucode_size;
|
|
||||||
|
|
||||||
/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */
|
|
||||||
if (size > intel_guc_wopcm_size(dev_priv)) {
|
|
||||||
DRM_ERROR("Firmware is too large to fit in WOPCM\n");
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
uc_fw->major_ver_found = css->guc.sw_version >> 16;
|
|
||||||
uc_fw->minor_ver_found = css->guc.sw_version & 0xFFFF;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case INTEL_UC_FW_TYPE_HUC:
|
|
||||||
uc_fw->major_ver_found = css->huc.sw_version >> 16;
|
|
||||||
uc_fw->minor_ver_found = css->huc.sw_version & 0xFFFF;
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
DRM_ERROR("Unknown firmware type %d\n", uc_fw->type);
|
|
||||||
err = -ENOEXEC;
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (uc_fw->major_ver_wanted == 0 && uc_fw->minor_ver_wanted == 0) {
|
|
||||||
DRM_NOTE("Skipping uC firmware version check\n");
|
|
||||||
} else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted ||
|
|
||||||
uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {
|
|
||||||
DRM_NOTE("uC firmware version %d.%d, required %d.%d\n",
|
|
||||||
uc_fw->major_ver_found, uc_fw->minor_ver_found,
|
|
||||||
uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
|
|
||||||
err = -ENOEXEC;
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
DRM_DEBUG_DRIVER("firmware version %d.%d OK (minimum %d.%d)\n",
|
|
||||||
uc_fw->major_ver_found, uc_fw->minor_ver_found,
|
|
||||||
uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
|
|
||||||
|
|
||||||
obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size);
|
|
||||||
if (IS_ERR(obj)) {
|
|
||||||
err = PTR_ERR(obj);
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
uc_fw->obj = obj;
|
|
||||||
uc_fw->size = fw->size;
|
|
||||||
|
|
||||||
DRM_DEBUG_DRIVER("uC fw fetch status SUCCESS, obj %p\n",
|
|
||||||
uc_fw->obj);
|
|
||||||
|
|
||||||
release_firmware(fw);
|
|
||||||
uc_fw->fetch_status = INTEL_UC_FIRMWARE_SUCCESS;
|
|
||||||
return;
|
|
||||||
|
|
||||||
fail:
|
|
||||||
DRM_WARN("Failed to fetch valid uC firmware from %s (error %d)\n",
|
|
||||||
uc_fw->path, err);
|
|
||||||
DRM_DEBUG_DRIVER("uC fw fetch status FAIL; err %d, fw %p, obj %p\n",
|
|
||||||
err, fw, uc_fw->obj);
|
|
||||||
|
|
||||||
release_firmware(fw); /* OK even if fw is NULL */
|
|
||||||
uc_fw->fetch_status = INTEL_UC_FIRMWARE_FAIL;
|
|
||||||
}
|
|
||||||
|
|
|
@ -197,8 +197,6 @@ void intel_uc_init_fw(struct drm_i915_private *dev_priv);
|
||||||
void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
|
void intel_uc_fini_fw(struct drm_i915_private *dev_priv);
|
||||||
int intel_uc_init_hw(struct drm_i915_private *dev_priv);
|
int intel_uc_init_hw(struct drm_i915_private *dev_priv);
|
||||||
void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
|
void intel_uc_fini_hw(struct drm_i915_private *dev_priv);
|
||||||
void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
|
|
||||||
struct intel_uc_fw *uc_fw);
|
|
||||||
int intel_guc_sample_forcewake(struct intel_guc *guc);
|
int intel_guc_sample_forcewake(struct intel_guc *guc);
|
||||||
int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
|
int intel_guc_send_mmio(struct intel_guc *guc, const u32 *action, u32 len);
|
||||||
static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
|
static inline int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len)
|
||||||
|
|
Loading…
Reference in a new issue