Firmware code reorg
Subsystems (2)
v4 cover Firmware code reorg
v1: was sent with wrong prefix "P v4"
v2: apply review comments from Chris/Daniele
v3: restore DRM_WARN, add firmware url
v4: update DMC messages, drop CI HAX
Michal Wajdeczko (14):
drm/i915: Move intel_guc_wopcm_size to intel_guc.c drm/i915/guc: Move GuC boot param initialization out of xfer drm/i915/guc: Small fixups post code move drm/i915/guc: Move doc near related definitions drm/i915/guc: Rename intel_guc_loader.c to intel_guc_fw.c drm/i915/guc: Reorder functions in intel_guc_fw.c drm/i915/guc: Move firmware size check out of generic code drm/i915/guc: Pick better place for Guc final status message drm/i915/uc: Improve debug messages in firmware fetch drm/i915/uc: Add message with firmware url drm/i915: Update DMC firmware load error messages drm/i915/uc: Unify firmware loading
drm/i915/guc: Update Guc messages on load failure drm/i915/huc: Move fw select function
drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/intel_csr.c | 31 +-- drivers/gpu/drm/i915/intel_guc.c | 104 ++++++++ drivers/gpu/drm/i915/intel_guc.h | 16 +- drivers/gpu/drm/i915/intel_guc_fw.c | 256 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_fw.h | 33 +++ drivers/gpu/drm/i915/intel_guc_fwif.h | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 417 -------------------------------- drivers/gpu/drm/i915/intel_huc.c | 125 ++++------ drivers/gpu/drm/i915/intel_uc.c | 20 +- drivers/gpu/drm/i915/intel_uc_fw.c | 164 ++++++++++--- drivers/gpu/drm/i915/intel_uc_fw.h | 12 + 12 files changed, 619 insertions(+), 565 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_fw.c create mode 100644 drivers/gpu/drm/i915/intel_guc_fw.h delete mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/14 drm/i915: Move intel_guc_wopcm_size to intel_guc.c
Function intel_guc_wopcm_size didn't fit well in the old place. With this move upcoming cleanup will be simpler.
--- drivers/gpu/drm/i915/intel_guc.c | 11 +++++++++++ drivers/gpu/drm/i915/intel_guc_loader.c | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +11 -0
@@ -263,3 +263,14 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)i915_gem_object_put (obj);return vma; } + +u32 intel_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_GEN9_LP (dev_priv)) + wopcm_size -=BXT_GUC_WOPCM_RC6_RESERVED ; + +return wopcm_size; +}
drivers/gpu/drm/i915/intel_guc_loader.c +0 -11
@@ -250,17 +250,6 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,return ret; } -u32 intel_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_GEN9_LP (dev_priv)) - wopcm_size -=BXT_GUC_WOPCM_RC6_RESERVED ; - -return wopcm_size; -} -/* * Load the GuC firmware blob into the MinuteIA. */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/14 drm/i915/guc: Move GuC boot param initialization out of xfer
In reply to Michal WajdeczkoWe want to keep ucode xfer functions separate from other initialization. Once separated, add explicit forcewake.
v2: use BLITTER domain only and add comment (Daniele)
--- drivers/gpu/drm/i915/intel_guc.c | 92 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_guc_loader.c | 85 ------------------------------ drivers/gpu/drm/i915/intel_uc.c | 1 + 4 files changed, 94 insertions(+), 85 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +92 -0
@@ -67,6 +67,98 @@ void intel_guc_init_early(struct intel_guc *guc) guc->notify = gen8_guc_raise_irq; } +static u32 get_gttype (struct drm_i915_private *dev_priv) +{ +/* XXX: GT type based on PCI device ID? field seems unused by fw */ +return 0 ; +} + +static u32 get_core_family (struct drm_i915_private *dev_priv) +{ +u32 gen =INTEL_GEN (dev_priv); + +switch (gen) { +case 9 : +return GUC_CORE_FAMILY_GEN9 ; + +default : +MISSING_CASE (gen); +return GUC_CORE_FAMILY_UNKNOWN ; + } +} + +/* +* Initialise the GuC parameter block before starting the firmware +* transfer. These parameters are read by the firmware on startup +* and cannot be changed thereafter. +*/ +void intel_guc_init_params (struct intel_guc *guc) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); +u32 params[GUC_CTL_MAX_DWORDS ]; +int i; + +memset (¶ms,0 ,sizeof (params)); + + params[GUC_CTL_DEVICE_INFO ] |= + (get_gttype (dev_priv) <<GUC_CTL_GTTYPE_SHIFT ) | + (get_core_family (dev_priv) <<GUC_CTL_COREFAMILY_SHIFT ); + +/* +* GuC ARAT increment is 10 ns. GuC default scheduler quantum is one +* second. This ARAR is calculated by: +* Scheduler-Quantum-in-ns / ARAT-increment-in-ns = 1000000000 / 10 +*/ + params[GUC_CTL_ARAT_HIGH ] =0 ; + params[GUC_CTL_ARAT_LOW ] =100000000 ; + + params[GUC_CTL_WA ] |=GUC_CTL_WA_UK_BY_DRIVER ; + + params[GUC_CTL_FEATURE ] |=GUC_CTL_DISABLE_SCHEDULER | +GUC_CTL_VCS2_ENABLED ; + + params[GUC_CTL_LOG_PARAMS ] = guc->log.flags; + +if (i915_modparams.guc_log_level >=0 ) { + params[GUC_CTL_DEBUG ] = + i915_modparams.guc_log_level <<GUC_LOG_VERBOSITY_SHIFT ; + }else + params[GUC_CTL_DEBUG ] =GUC_LOG_DISABLED ; + +/* If GuC submission is enabled, set up additional parameters here */ +if (i915_modparams.enable_guc_submission) { +u32 ads =guc_ggtt_offset (guc->ads_vma) >>PAGE_SHIFT ; +u32 pgs =guc_ggtt_offset (dev_priv->guc.stage_desc_pool); +u32 ctx_in_16 =GUC_MAX_STAGE_DESCRIPTORS /16 ; + + params[GUC_CTL_DEBUG ] |= ads <<GUC_ADS_ADDR_SHIFT ; + params[GUC_CTL_DEBUG ] |=GUC_ADS_ENABLED ; + + pgs >>=PAGE_SHIFT ; + params[GUC_CTL_CTXINFO ] = (pgs <<GUC_CTL_BASE_ADDR_SHIFT ) | + (ctx_in_16 <<GUC_CTL_CTXNUM_IN16_SHIFT ); + + params[GUC_CTL_FEATURE ] |=GUC_CTL_KERNEL_SUBMISSIONS ; + +/* Unmask this bit to enable the GuC's internal scheduler */ + params[GUC_CTL_FEATURE ] &= ~GUC_CTL_DISABLE_SCHEDULER ; + } + +/* +* All SOFT_SCRATCH registers are in FORCEWAKE_BLITTER domain and +* they are power context saved so it's ok to release forcewake +* when we are done here and take it again at xfer time. +*/ +intel_uncore_forcewake_get (dev_priv,FORCEWAKE_BLITTER ); + +I915_WRITE (SOFT_SCRATCH (0 ),0 ); + +for (i =0 ; i <GUC_CTL_MAX_DWORDS ; i++) +I915_WRITE (SOFT_SCRATCH (1 + i), params[i]); + +intel_uncore_forcewake_put (dev_priv,FORCEWAKE_BLITTER ); +} +int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len) {WARN (1 ,"Unexpected send: action=%#x\n" , *action);
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -95,6 +95,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)void intel_guc_init_early (struct intel_guc *guc);void intel_guc_init_send_regs (struct intel_guc *guc); +void intel_guc_init_params (struct intel_guc *guc);int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);
drivers/gpu/drm/i915/intel_guc_loader.c +0 -85
97 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +1 -0
@@ -195,6 +195,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_submission;intel_huc_init_hw (&dev_priv->huc); +intel_guc_init_params (guc); ret =intel_guc_init_hw (&dev_priv->guc);if (ret ==0 || ret != -EAGAIN )break ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/14 drm/i915/guc: Small fixups post code move
In reply to Michal WajdeczkoExisting code needs some style fixes. To avoid polluting pure move patch, do it now as separate step.
--- drivers/gpu/drm/i915/intel_guc.c | 11 ++++++----- drivers/gpu/drm/i915/intel_guc_fwif.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/intel_guc.c +6 -5
@@ -67,7 +67,7 @@ void intel_guc_init_early(struct intel_guc *guc) guc->notify = gen8_guc_raise_irq; } -static u32 get_gttype (struct drm_i915_private *dev_priv) +static u32 get_gt_type (struct drm_i915_private *dev_priv) {/* XXX: GT type based on PCI device ID? field seems unused by fw */ return 0 ;
@@ -98,11 +98,11 @@ void intel_guc_init_params(struct intel_guc *guc)u32 params[GUC_CTL_MAX_DWORDS ];int i; -memset (¶ms,0 ,sizeof (params)); +memset (params,0 ,sizeof (params)); params[GUC_CTL_DEVICE_INFO ] |= - (get_gttype (dev_priv) <<GUC_CTL_GTTYPE_SHIFT ) | - (get_core_family (dev_priv) <<GUC_CTL_COREFAMILY_SHIFT ); + (get_gt_type (dev_priv) <<GUC_CTL_GT_TYPE_SHIFT ) | + (get_core_family (dev_priv) <<GUC_CTL_CORE_FAMILY_SHIFT );/* * GuC ARAT increment is 10 ns. GuC default scheduler quantum is one
@@ -122,8 +122,9 @@ void intel_guc_init_params(struct intel_guc *guc)if (i915_modparams.guc_log_level >=0 ) { params[GUC_CTL_DEBUG ] = i915_modparams.guc_log_level <<GUC_LOG_VERBOSITY_SHIFT ; - }else + }else { params[GUC_CTL_DEBUG ] =GUC_LOG_DISABLED ; + }/* If GuC submission is enabled, set up additional parameters here */ if (i915_modparams.enable_guc_submission) {
drivers/gpu/drm/i915/intel_guc_fwif.h +2 -2
@@ -82,8 +82,8 @@#define GUC_CTL_ARAT_LOW 2#define GUC_CTL_DEVICE_INFO 3 -#define GUC_CTL_GTTYPE_SHIFT 0 -#define GUC_CTL_COREFAMILY_SHIFT 7 +#define GUC_CTL_GT_TYPE_SHIFT 0 +#define GUC_CTL_CORE_FAMILY_SHIFT 7#define GUC_CTL_LOG_PARAMS 4#define GUC_LOG_VALID (1 << 0)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/14 drm/i915/guc: Move doc near related definitions
In reply to Michal WajdeczkoAfter GuC code reorg some documentation was left in wrong place. Move it closer to corresponding definitions.
v2: use consistent name for the GuC (Sagar)
--- drivers/gpu/drm/i915/intel_guc.h | 11 +++++++++++ drivers/gpu/drm/i915/intel_guc_loader.c | 23 ----------------------- drivers/gpu/drm/i915/intel_uc_fw.h | 5 +++++ 3 files changed, 16 insertions(+), 23 deletions(-)
drivers/gpu/drm/i915/intel_guc.h +11 -0
@@ -33,6 +33,11 @@#include "i915_guc_reg.h" #include "i915_vma.h" +/* +* Top level structure of GuC. It handles firmware loading and manages client +* pool and doorbells. intel_guc owns a i915_guc_client to replace the legacy +* ExecList submission. +*/ struct intel_guc {struct intel_uc_fw fw;struct intel_guc_log log;
@@ -83,6 +88,12 @@ static inline void intel_guc_notify(struct intel_guc *guc) guc->notify (guc); } +/* +* GuC does not allow any gfx GGTT address that falls into range [0, WOPCM_TOP), +* which is reserved for Boot ROM, SRAM and WOPCM. Currently this top address is +* 512K. In order to exclude 0-512K address space from GGTT, all gfx objects +* used by GuC is pinned with PIN_OFFSET_BIAS along with size of WOPCM. +*/ static inline u32 guc_ggtt_offset (struct i915_vma *vma) {u32 offset =i915_ggtt_offset (vma);
drivers/gpu/drm/i915/intel_guc_loader.c +0 -23
@@ -29,29 +29,6 @@#include "i915_drv.h" #include "intel_uc.h" -/** -* DOC: GuC-specific firmware loader -* -* intel_guc: -* Top level structure of guc. It handles firmware loading and manages client -* pool and doorbells. intel_guc owns a i915_guc_client to replace the legacy -* ExecList submission. -* -* Firmware versioning: -* The firmware build process will generate a version header file with major and -* minor version defined. The versions are built into CSS header of firmware. -* i915 kernel driver set the minimal firmware version required per platform. -* The firmware installation package will install (symbolic link) proper version -* of firmware. -* -* GuC address space: -* GuC does not allow any gfx GGTT address that falls into range [0, WOPCM_TOP), -* which is reserved for Boot ROM, SRAM and WOPCM. Currently this top address is -* 512K. In order to exclude 0-512K address space from GGTT, all gfx objects -* used by GuC is pinned with PIN_OFFSET_BIAS along with size of WOPCM. -* -*/ -#define SKL_FW_MAJOR 6#define SKL_FW_MINOR 1
drivers/gpu/drm/i915/intel_uc_fw.h +5 -0
@@ -50,6 +50,11 @@ struct intel_uc_fw {enum intel_uc_fw_status fetch_status;enum intel_uc_fw_status load_status; +/* +* The firmware build process will generate a version header file with major and +* minor version defined. The versions are built into CSS header of firmware. +* i915 kernel driver set the minimal firmware version required per platform. +*/ u16 major_ver_wanted;u16 minor_ver_wanted;u16 major_ver_found;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 5/14 drm/i915/guc: Rename intel_guc_loader.c to intel_guc_fw.c
In reply to Michal WajdeczkoRemaining functions in intel_guc_loader.c were focused around GuC firmware. Rename them to match object-verb pattern and rename file itself.
--- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/intel_guc.h | 4 +- drivers/gpu/drm/i915/intel_guc_fw.c | 298 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_fw.h | 33 ++++ drivers/gpu/drm/i915/intel_guc_loader.c | 298 -------------------------------- drivers/gpu/drm/i915/intel_uc.c | 4 +- 6 files changed, 335 insertions(+), 304 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc_fw.c create mode 100644 drivers/gpu/drm/i915/intel_guc_fw.h delete mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c
drivers/gpu/drm/i915/Makefile +1 -1
@@ -64,7 +64,7 @@ i915-y += intel_uc.o \ intel_guc.o \ intel_guc_ct.o \ intel_guc_log.o \ - intel_guc_loader.o \ + intel_guc_fw.o \ intel_huc.o \ i915_guc_submission.o
drivers/gpu/drm/i915/intel_guc.h +1 -3
@@ -26,6 +26,7 @@#define _INTEL_GUC_H_#include "intel_uncore.h" +#include "intel_guc_fw.h" #include "intel_guc_fwif.h" #include "intel_guc_ct.h" #include "intel_guc_log.h"
@@ -114,9 +115,6 @@ int intel_guc_auth_huc(struct intel_guc *guc, u32 rsa_offset);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size); - -int intel_guc_select_fw (struct intel_guc *guc); -int intel_guc_init_hw (struct intel_guc *guc);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);#endif
drivers/gpu/drm/i915/intel_guc_fw.c new file +298 -0
298 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc_fw.h new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Copyright © 2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ + +#ifndef _INTEL_GUC_FW_H_ +#define _INTEL_GUC_FW_H_ + +struct intel_guc ; + +int intel_guc_fw_select (struct intel_guc *guc); +int intel_guc_fw_upload (struct intel_guc *guc); + +#endif
drivers/gpu/drm/i915/intel_guc_loader.c deleted +0 -298
298 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +2 -2
@@ -68,7 +68,7 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)if (HAS_HUC_UCODE (dev_priv))intel_huc_select_fw (&dev_priv->huc); -if (intel_guc_select_fw (&dev_priv->guc)) +if (intel_guc_fw_select (&dev_priv->guc)) i915_modparams.enable_guc_loading =0 ; }
@@ -196,7 +196,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)intel_huc_init_hw (&dev_priv->huc);intel_guc_init_params (guc); - ret =intel_guc_init_hw (&dev_priv->guc); + ret =intel_guc_fw_upload (guc);if (ret ==0 || ret != -EAGAIN )break ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 6/14 drm/i915/guc: Reorder functions in intel_guc_fw.c
In reply to Michal WajdeczkoFunctions should be defined in their use order.
--- drivers/gpu/drm/i915/intel_guc_fw.c | 81 +++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +41 -40
@@ -56,6 +56,47 @@ MODULE_FIRMWARE(I915_KBL_GUC_UCODE);#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR) +/** +* intel_guc_fw_select() - selects GuC firmware for uploading +* +* @guc: intel_guc struct +* +* Return: zero when we know firmware, non-zero in other case +*/ +int intel_guc_fw_select (struct intel_guc *guc) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); + +intel_uc_fw_init (&guc->fw,INTEL_UC_FW_TYPE_GUC ); + +if (i915_modparams.guc_firmware_path) { + guc->fw.path = i915_modparams.guc_firmware_path; + guc->fw.major_ver_wanted =0 ; + guc->fw.minor_ver_wanted =0 ; + }else if (IS_SKYLAKE (dev_priv)) { + guc->fw.path =I915_SKL_GUC_UCODE ; + guc->fw.major_ver_wanted =SKL_FW_MAJOR ; + guc->fw.minor_ver_wanted =SKL_FW_MINOR ; + }else if (IS_BROXTON (dev_priv)) { + guc->fw.path =I915_BXT_GUC_UCODE ; + guc->fw.major_ver_wanted =BXT_FW_MAJOR ; + guc->fw.minor_ver_wanted =BXT_FW_MINOR ; + }else if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) { + guc->fw.path =I915_KBL_GUC_UCODE ; + guc->fw.major_ver_wanted =KBL_FW_MAJOR ; + guc->fw.minor_ver_wanted =KBL_FW_MINOR ; + }else if (IS_GEMINILAKE (dev_priv)) { + guc->fw.path =I915_GLK_GUC_UCODE ; + guc->fw.major_ver_wanted =GLK_FW_MAJOR ; + guc->fw.minor_ver_wanted =GLK_FW_MINOR ; + }else { +DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); +return -ENOENT ; + } + +return 0 ; +} +/* * Read the GuC status register (GUC_STATUS) and store it in the * specified location; then return a boolean indicating whether
@@ -256,43 +297,3 @@ int intel_guc_fw_upload(struct intel_guc *guc)return 0 ; } - -/** -* intel_guc_fw_select() - selects GuC firmware for loading -* @guc: intel_guc struct -* -* Return: zero when we know firmware, non-zero in other case -*/ -int intel_guc_fw_select (struct intel_guc *guc) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); - -intel_uc_fw_init (&guc->fw,INTEL_UC_FW_TYPE_GUC ); - -if (i915_modparams.guc_firmware_path) { - guc->fw.path = i915_modparams.guc_firmware_path; - guc->fw.major_ver_wanted =0 ; - guc->fw.minor_ver_wanted =0 ; - }else if (IS_SKYLAKE (dev_priv)) { - guc->fw.path =I915_SKL_GUC_UCODE ; - guc->fw.major_ver_wanted =SKL_FW_MAJOR ; - guc->fw.minor_ver_wanted =SKL_FW_MINOR ; - }else if (IS_BROXTON (dev_priv)) { - guc->fw.path =I915_BXT_GUC_UCODE ; - guc->fw.major_ver_wanted =BXT_FW_MAJOR ; - guc->fw.minor_ver_wanted =BXT_FW_MINOR ; - }else if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) { - guc->fw.path =I915_KBL_GUC_UCODE ; - guc->fw.major_ver_wanted =KBL_FW_MAJOR ; - guc->fw.minor_ver_wanted =KBL_FW_MINOR ; - }else if (IS_GEMINILAKE (dev_priv)) { - guc->fw.path =I915_GLK_GUC_UCODE ; - guc->fw.major_ver_wanted =GLK_FW_MAJOR ; - guc->fw.minor_ver_wanted =GLK_FW_MINOR ; - }else { -DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); -return -ENOENT ; - } - -return 0 ; -}
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 7/14 drm/i915/guc: Move firmware size check out of generic code
In reply to Michal WajdeczkoChecking GuC firmware size can be done in GuC specific code right before DMA copy as it is unlikely to fail anyway.
v2: rebased
--- drivers/gpu/drm/i915/intel_guc_fw.c | 7 ++++++- drivers/gpu/drm/i915/intel_uc_fw.c | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +6 -1
@@ -133,6 +133,7 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,unsigned long offset;struct sg_table *sg = vma->pages;u32 status, rsa[UOS_RSA_SCRATCH_MAX_COUNT ]; +u32 size = guc_fw->header_size + guc_fw->ucode_size;int i, ret =0 ;/* where RSA signature starts */
@@ -145,7 +146,11 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* The header plus uCode will be copied to WOPCM via DMA, excluding any * other components */ -I915_WRITE (DMA_COPY_SIZE , guc_fw->header_size + guc_fw->ucode_size); +if (size >intel_guc_wopcm_size (dev_priv)) { +DRM_ERROR ("GuC: Firmware is too large to fit in WOPCM\n" ); +return -EFBIG ; + } +I915_WRITE (DMA_COPY_SIZE , size);/* Set the source address for the new blob */ offset =guc_ggtt_offset (vma) + guc_fw->header_offset;
drivers/gpu/drm/i915/intel_uc_fw.c +0 -8
@@ -108,14 +108,6 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,*/ 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 ;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v4 07/14] drm/i915/guc: Move firmware size check out of generic code
Quoted 9 lines · Michal Wajdeczko
Checking GuC firmware size can be done in GuC specific code right before DMA copy as it is unlikely to fail anyway.
v2: rebased
Signed-off-by Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Joonas Lahtinen <[email protected]>Reviewed-by Sagar Arun Kamble <[email protected]> #1
<SNIP>
So, lets move this code under the "uc_fw->ucode_size = (css->size_dw - css->header_size_dw) * sizeof(u32);" line and consider any firmware with conflicting information a corrupt file.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 8/14 drm/i915/guc: Pick better place for Guc final status message
In reply to Michal WajdeczkoGuC status message printed right after firmware upload may be too optimistic, as we may fail on subsequent steps. Move that message to the end of intel_uc_init_hw where we know the status for sure.
v2: use dev_info (Chris)
--- drivers/gpu/drm/i915/intel_guc_fw.c | 6 ------ drivers/gpu/drm/i915/intel_uc.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +0 -6
@@ -294,11 +294,5 @@ int intel_guc_fw_upload(struct intel_guc *guc) guc->fw.load_status =INTEL_UC_FIRMWARE_SUCCESS ; -DRM_INFO ("GuC %s (firmware %s [version %u.%u])\n" , - i915_modparams.enable_guc_submission ?"submission enabled" : -"loaded" , - guc->fw.path, - guc->fw.major_ver_found, guc->fw.minor_ver_found); -return 0 ; }
drivers/gpu/drm/i915/intel_uc.c +6 -0
@@ -222,6 +222,12 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) goto err_interrupts; } +dev_info (dev_priv->drm.dev,"GuC %s (firmware %s [version %u.%u])\n" , + i915_modparams.enable_guc_submission ?"submission enabled" : +"loaded" , + guc->fw.path, + guc->fw.major_ver_found, guc->fw.minor_ver_found); +return 0 ;/*
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 9/14 drm/i915/uc: Improve debug messages in firmware fetch
In reply to Michal WajdeczkoTime to remove less important info and make messages clear and consistent.
v2: change some message levels (Chris)
v3: restore DRM_WARN (Chris)
--- drivers/gpu/drm/i915/intel_uc_fw.c | 75 +++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/intel_uc_fw.c +46 -29
@@ -45,26 +45,33 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,size_t size;int err; +DRM_DEBUG_DRIVER ("%s fw fetch %s\n" , +intel_uc_fw_type_repr (uc_fw->type), uc_fw->path); +if (!uc_fw->path)return ; uc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; - -DRM_DEBUG_DRIVER ("before requesting firmware: uC fw fetch status %s\n" , +DRM_DEBUG_DRIVER ("%s fw fetch %s\n" , +intel_uc_fw_type_repr (uc_fw->type),intel_uc_fw_status_repr (uc_fw->fetch_status)); err =request_firmware (&fw, uc_fw->path, &pdev->dev); -if (err) - goto fail; -if (!fw) +if (err) { +DRM_DEBUG_DRIVER ("%s fw request_firmware err=%d\n" , +intel_uc_fw_type_repr (uc_fw->type), err); goto fail; + } -DRM_DEBUG_DRIVER ("fetch uC fw from %s succeeded, fw %p\n" , - uc_fw->path, fw); +DRM_DEBUG_DRIVER ("%s fw size %zu ptr %p\n" , +intel_uc_fw_type_repr (uc_fw->type), fw->size, 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" ); +DRM_WARN ("%s: Unexpected firmware size (%zu, min %zu)\n" , +intel_uc_fw_type_repr (uc_fw->type), + fw->size,sizeof (struct uc_css_header )); + err = -ENODATA ; goto fail; }
@@ -77,7 +84,9 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,sizeof (u32);if (uc_fw->header_size !=sizeof (struct uc_css_header )) { -DRM_NOTE ("CSS header definition mismatch\n" ); +DRM_WARN ("%s: Mismatched firmware header definition\n" , +intel_uc_fw_type_repr (uc_fw->type)); + err = -ENOEXEC ; goto fail; }
@@ -87,7 +96,9 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,/* now RSA */ if (css->key_size_dw !=UOS_RSA_SCRATCH_MAX_COUNT ) { -DRM_NOTE ("RSA key size is bad\n" ); +DRM_WARN ("%s: Mismatched firmware RSA key size (%u)\n" , +intel_uc_fw_type_repr (uc_fw->type), css->key_size_dw); + err = -ENOEXEC ; goto fail; } uc_fw->rsa_offset = uc_fw->ucode_offset + uc_fw->ucode_size;
@@ -96,7 +107,9 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,/* 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" ); +DRM_WARN ("%s: Truncated firmware (%zu, expected %zu)\n" , +intel_uc_fw_type_repr (uc_fw->type), fw->size, size); + err = -ENOEXEC ; goto fail; }
@@ -118,17 +131,21 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,break ;default : -DRM_ERROR ("Unknown firmware type %d\n" , uc_fw->type); - err = -ENOEXEC ; - goto fail; +MISSING_CASE (uc_fw->type); +break ; } +DRM_DEBUG_DRIVER ("%s fw version %u.%u (wanted %u.%u)\n" , +intel_uc_fw_type_repr (uc_fw->type), + uc_fw->major_ver_found, uc_fw->minor_ver_found, + uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); +if (uc_fw->major_ver_wanted ==0 && uc_fw->minor_ver_wanted ==0 ) { -DRM_NOTE ("Skipping %s firmware version check\n" , +DRM_NOTE ("%s: Skipping firmware version check\n" ,intel_uc_fw_type_repr (uc_fw->type)); }else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { -DRM_NOTE ("%s firmware version %d.%d, required %d.%d\n" , +DRM_NOTE ("%s: Wrong firmware version (%u.%u, required %u.%u)\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->major_ver_found, uc_fw->minor_ver_found, uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
@@ -136,34 +153,34 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, 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); +DRM_DEBUG_DRIVER ("%s fw object_create err=%d\n" , +intel_uc_fw_type_repr (uc_fw->type), err); 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); + uc_fw->fetch_status =INTEL_UC_FIRMWARE_SUCCESS ; +DRM_DEBUG_DRIVER ("%s fw fetch %s\n" , +intel_uc_fw_type_repr (uc_fw->type), +intel_uc_fw_status_repr (uc_fw->fetch_status));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); + uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; +DRM_DEBUG_DRIVER ("%s fw fetch %s\n" , +intel_uc_fw_type_repr (uc_fw->type), +intel_uc_fw_status_repr (uc_fw->fetch_status)); + +DRM_WARN ("%s: Failed to fetch firmware %s (error %d)\n" , +intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, err);release_firmware (fw);/* OK even if fw is NULL */ - uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; }/**
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 10/14 drm/i915/uc: Add message with firmware url
In reply to Michal WajdeczkoIn case of firmware fetch failure we should help user find latest firmware.
--- drivers/gpu/drm/i915/intel_uc_fw.c | 2 ++ drivers/gpu/drm/i915/intel_uc_fw.h | 2 ++ 2 files changed, 4 insertions(+)
drivers/gpu/drm/i915/intel_uc_fw.c +2 -0
@@ -179,6 +179,8 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,DRM_WARN ("%s: Failed to fetch firmware %s (error %d)\n" ,intel_uc_fw_type_repr (uc_fw->type), uc_fw->path, err); +DRM_INFO ("%s: Firmware can be downloaded from %s\n" , +intel_uc_fw_type_repr (uc_fw->type),INTEL_UC_FIRMWARE_URL );release_firmware (fw);/* OK even if fw is NULL */ }
drivers/gpu/drm/i915/intel_uc_fw.h +2 -0
@@ -27,6 +27,8 @@struct drm_i915_private ; +#define INTEL_UC_FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware" +enum intel_uc_fw_status {INTEL_UC_FIRMWARE_FAIL =-1 ,INTEL_UC_FIRMWARE_NONE =0 ,
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 10/14] drm/i915/uc: Add message with firmware url
Quoting Michal Wajdeczko (2017-10-13 12:11:33)
drivers/gpu/drm/i915/intel_uc_fw.h line 30
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc_fw.h +1
-0@@ -27,6 +27,8 @@struct drm_i915_private ; +#define INTEL_UC_FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware"
We already have this define in intel_csr.c, so let's reuse it. -Chris
_______________________________________________
Intel-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Reviewed-byRe: [PATCH v4 10/14] drm/i915/uc: Add message with firmware url
Quoting Chris Wilson (2017-10-13 12:50:53)
Quoted 7 lines
Quoting Michal Wajdeczko (2017-10-13 12:11:33)
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc_fw.h +0
-0@@ -27,6 +27,8 @@
Quoted 5 lines
drivers/gpu/drm/i915/intel_uc_fw.h line 30
Quoted 3 lines
drivers/gpu/drm/i915/intel_uc_fw.h +1
-0struct drm_i915_private ; +#define INTEL_UC_FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware"We already have this define in
intel_csr.c, so let's reuse it.
Or make it clear in the commit log the duplication is fixed in the next patch.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 11/14 drm/i915: Update DMC firmware load error messages
In reply to Michal WajdeczkoSome of the error messages from DMC load were too generic and may be confusing for the user. Lets explicitly add DMC words there. Also as homepage of DMC firmware is same as for the GuC and Huc, lets reuse URL definition.
--- drivers/gpu/drm/i915/intel_csr.c | 31 ++++++++++++++++--------------- drivers/gpu/drm/i915/intel_uc_fw.h | 1 + 2 files changed, 17 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/intel_csr.c +16 -15
@@ -52,10 +52,6 @@ MODULE_FIRMWARE(I915_CSR_SKL);MODULE_FIRMWARE (I915_CSR_BXT );#define BXT_CSR_VERSION_REQUIRED CSR_VERSION(1, 7) -#define FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware" - - -#define CSR_MAX_FW_SIZE 0x2FFF#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF
@@ -291,7 +287,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, css_header = (struct intel_css_header *)fw->data;if (sizeof (struct intel_css_header ) != (css_header->header_len *4 )) { -DRM_ERROR ("Firmware has wrong CSS header length %u bytes\n" , +DRM_ERROR ("DMC firmware has wrong CSS header length " +"(%u bytes)\n" , (css_header->header_len *4 ));return NULL ; }
@@ -315,7 +312,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,if (csr->version != required_version) { DRM_INFO("Refusing to load DMC firmware v%u.%u," - " please use v%u.%u [" FIRMWARE_URL "].\n", + " please use v%u.%u\n", CSR_VERSION_MAJOR(csr->version), CSR_VERSION_MINOR(csr->version), CSR_VERSION_MAJOR(required_version),
@@ -330,7 +327,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, &fw->data[readcount];if (sizeof (struct intel_package_header ) != (package_header->header_len *4 )) { -DRM_ERROR ("Firmware has wrong package header length %u bytes\n" , +DRM_ERROR ("DMC firmware has wrong package header length " +"(%u bytes)\n" , (package_header->header_len *4 ));return NULL ; }
@@ -351,7 +349,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv, dmc_offset = package_header->fw_info[i].offset; }if (dmc_offset ==CSR_DEFAULT_FW_OFFSET ) { -DRM_ERROR ("Firmware not supported for %c stepping\n" , +DRM_ERROR ("DMC firmware not supported for %c stepping\n" , si->stepping);return NULL ; }
@@ -360,7 +358,8 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,/* Extract dmc_header information. */ dmc_header = (struct intel_dmc_header *)&fw->data[readcount];if (sizeof (struct intel_dmc_header ) != (dmc_header->header_len)) { -DRM_ERROR ("Firmware has wrong dmc header length %u bytes\n" , +DRM_ERROR ("DMC firmware has wrong dmc header length " +"(%u bytes)\n" , (dmc_header->header_len));return NULL ; }
@@ -368,7 +367,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,/* Cache the dmc header info. */ if (dmc_header->mmio_count >ARRAY_SIZE (csr->mmioaddr)) { -DRM_ERROR ("Firmware has wrong mmio count %u\n" , +DRM_ERROR ("DMC firmware has wrong mmio count %u\n" , dmc_header->mmio_count);return NULL ; }
@@ -376,7 +375,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,for (i =0 ; i < dmc_header->mmio_count; i++) {if (dmc_header->mmioaddr[i] <CSR_MMIO_START_RANGE || dmc_header->mmioaddr[i] >CSR_MMIO_END_RANGE ) { -DRM_ERROR (" Firmware has wrong mmio address 0x%x\n" , +DRM_ERROR ("DMC firmware has wrong mmio address 0x%x\n" , dmc_header->mmioaddr[i]);return NULL ; }
@@ -387,7 +386,7 @@ static uint32_t *parse_csr_fw(struct drm_i915_private *dev_priv,/* fw_size is in dwords, so multiplied by 4 to convert into bytes. */ nbytes = dmc_header->fw_size *4 ;if (nbytes >CSR_MAX_FW_SIZE ) { -DRM_ERROR ("CSR firmware too big (%u) bytes\n" , nbytes); +DRM_ERROR ("DMC firmware too big (%u bytes)\n" , nbytes);return NULL ; } csr->dmc_fw_size = dmc_header->fw_size;
@@ -425,9 +424,11 @@ static void csr_load_work_fn(struct work_struct *work) CSR_VERSION_MINOR(csr->version)); }else {dev_notice (dev_priv->drm.dev, -"Failed to load DMC firmware" -" [" FIRMWARE_URL "]," -" disabling runtime power management.\n" ); +"Failed to load DMC firmware %s." +" Disabling runtime power management.\n" , + csr->fw_path); +dev_notice (dev_priv->drm.dev,"DMC firmware homepage: %s" , +INTEL_UC_FIRMWARE_URL ); }release_firmware (fw);
drivers/gpu/drm/i915/intel_uc_fw.h +1 -0
@@ -27,6 +27,7 @@struct drm_i915_private ; +/* Home of GuC, HuC and DMC firmwares */ #define INTEL_UC_FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware"enum intel_uc_fw_status {
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 11/14] drm/i915: Update DMC firmware load error messages
Quoting Michal Wajdeczko (2017-10-13 12:11:34)
Quoted 9 lines
Some of the error messages from DMC load were too generic and may be confusing for the user. Lets explicitly add DMC words there. Also as homepage of DMC firmware is same as for the GuC and Huc, lets reuse URL definition.
Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>Cc Imre Deak <[email protected]>Cc Mika Kuoppala <[email protected]>
I also agree that those DRM_ERROR should be DRM_WARN as you did you for the other fw loading. They aren't fatal to the driver, but something is wrong in the external fw.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 12/14 drm/i915/uc: Unify firmware loading
In reply to Michal WajdeczkoFirmware loading for GuC and HuC are similar. Move common code into generic function for maximum reuse.
v2: change message levels (Chris)
--- drivers/gpu/drm/i915/intel_guc_fw.c | 52 +++--------------------- drivers/gpu/drm/i915/intel_huc.c | 53 +++---------------------- drivers/gpu/drm/i915/intel_uc_fw.c | 79 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc_fw.h | 4 ++ 4 files changed, 93 insertions(+), 95 deletions(-)
drivers/gpu/drm/i915/intel_guc_fw.c +5 -47
@@ -193,24 +193,13 @@ static int guc_ucode_xfer_dma(struct drm_i915_private *dev_priv,/* * Load the GuC firmware blob into the MinuteIA. */ -static int guc_ucode_xfer (struct drm_i915_private *dev_priv) +static int guc_ucode_xfer (struct intel_uc_fw *guc_fw,struct i915_vma *vma) { -struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; -struct i915_vma *vma; + struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw); +struct drm_i915_private *dev_priv =guc_to_i915 (guc);int ret; - ret =i915_gem_object_set_to_gtt_domain (guc_fw->obj, false); -if (ret) { -DRM_DEBUG_DRIVER ("set-domain failed %d\n" , ret); -return ret; - } - - vma =i915_gem_object_ggtt_pin (guc_fw->obj,NULL ,0 ,0 , -PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); -if (IS_ERR (vma)) { -DRM_DEBUG_DRIVER ("pin failed %d\n" , (int )PTR_ERR (vma)); -return PTR_ERR (vma); - } +GEM_BUG_ON (guc_fw->type !=INTEL_UC_FW_TYPE_GUC );intel_uncore_forcewake_get (dev_priv,FORCEWAKE_ALL );
@@ -245,12 +234,6 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)intel_uncore_forcewake_put (dev_priv,FORCEWAKE_ALL ); -/* -* We keep the object pages for reuse during resume. But we can unpin it -* now that DMA has completed, so it doesn't continue to take up space. -*/ -i915_vma_unpin (vma); -return ret; }
@@ -269,30 +252,5 @@ static int guc_ucode_xfer(struct drm_i915_private *dev_priv)*/ int intel_guc_fw_upload (struct intel_guc *guc) { -struct drm_i915_private *dev_priv =guc_to_i915 (guc); -const char *fw_path = guc->fw.path; -int ret; - -DRM_DEBUG_DRIVER ("GuC fw status: path %s, fetch %s, load %s\n" , - fw_path, -intel_uc_fw_status_repr (guc->fw.fetch_status), -intel_uc_fw_status_repr (guc->fw.load_status)); - -if (guc->fw.fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) -return -EIO ; - - guc->fw.load_status =INTEL_UC_FIRMWARE_PENDING ; - -DRM_DEBUG_DRIVER ("GuC fw status: fetch %s, load %s\n" , -intel_uc_fw_status_repr (guc->fw.fetch_status), -intel_uc_fw_status_repr (guc->fw.load_status)); - - ret =guc_ucode_xfer (dev_priv); - -if (ret) -return -EAGAIN ; - - guc->fw.load_status =INTEL_UC_FIRMWARE_SUCCESS ; - -return 0 ; +return intel_uc_fw_upload (&guc->fw, guc_ucode_xfer); }
drivers/gpu/drm/i915/intel_huc.c +5 -48
76 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc_fw.c +79 -0
85 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc_fw.h +4 -0
@@ -26,6 +26,7 @@#define _INTEL_UC_FW_H_struct drm_i915_private ; +struct i915_vma ;/* Home of GuC, HuC and DMC firmwares */ #define INTEL_UC_FIRMWARE_URL "https://01.org/linuxgraphics/downloads/firmware"
@@ -110,6 +111,9 @@ void intel_uc_fw_init(struct intel_uc_fw *uc_fw, enum intel_uc_fw_type type)void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw); +int intel_uc_fw_upload (struct intel_uc_fw *uc_fw, +int (*xfer)(struct intel_uc_fw *uc_fw, +struct i915_vma *vma));void intel_uc_fw_fini (struct intel_uc_fw *uc_fw);#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 13/14 drm/i915/guc: Update Guc messages on load failure
In reply to Michal WajdeczkoIn case of GuC firmware loading failure we were reporting DRM_ERROR also for case when GuC loading was not strictly required.
--- drivers/gpu/drm/i915/intel_uc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_uc.c +5 -4
@@ -250,12 +250,14 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) err_guc:i915_ggtt_disable_guc (dev_priv); -DRM_ERROR ("GuC init failed\n" );if (i915_modparams.enable_guc_loading >1 || - i915_modparams.enable_guc_submission >1 ) + i915_modparams.enable_guc_submission >1 ) { +DRM_ERROR ("GuC init failed. Firmware loading disabled.\n" ); ret = -EIO ; -else + }else { +DRM_NOTE ("GuC init failed. Firmware loading disabled.\n" ); ret =0 ; + }if (i915_modparams.enable_guc_submission) { i915_modparams.enable_guc_submission =0 ;
@@ -263,7 +265,6 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv) } i915_modparams.enable_guc_loading =0 ; -DRM_NOTE ("GuC firmware loading disabled\n" );return ret; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 14/14 drm/i915/huc: Move fw select function
In reply to Michal WajdeczkoNo functional change. Just place the function closer to related definitions.
--- drivers/gpu/drm/i915/intel_huc.c | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/intel_huc.c +36 -36
@@ -78,6 +78,42 @@ MODULE_FIRMWARE(I915_KBL_HUC_UCODE); GLK_HUC_FW_MINOR, GLK_BLD_NUM)/** +* intel_huc_select_fw() - selects HuC firmware for loading +* @huc: intel_huc struct +*/ +void intel_huc_select_fw (struct intel_huc *huc) +{ +struct drm_i915_private *dev_priv =huc_to_i915 (huc); + +intel_uc_fw_init (&huc->fw,INTEL_UC_FW_TYPE_HUC ); + +if (i915_modparams.huc_firmware_path) { + huc->fw.path = i915_modparams.huc_firmware_path; + huc->fw.major_ver_wanted =0 ; + huc->fw.minor_ver_wanted =0 ; + }else if (IS_SKYLAKE (dev_priv)) { + huc->fw.path =I915_SKL_HUC_UCODE ; + huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =SKL_HUC_FW_MINOR ; + }else if (IS_BROXTON (dev_priv)) { + huc->fw.path =I915_BXT_HUC_UCODE ; + huc->fw.major_ver_wanted =BXT_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =BXT_HUC_FW_MINOR ; + }else if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) { + huc->fw.path =I915_KBL_HUC_UCODE ; + huc->fw.major_ver_wanted =KBL_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =KBL_HUC_FW_MINOR ; + }else if (IS_GEMINILAKE (dev_priv)) { + huc->fw.path =I915_GLK_HUC_UCODE ; + huc->fw.major_ver_wanted =GLK_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =GLK_HUC_FW_MINOR ; + }else { +DRM_ERROR ("No HuC firmware known for platform with HuC!\n" ); +return ; + } +} + +/** * huc_ucode_xfer() - DMA's the firmware * @dev_priv: the drm_i915_private device *
@@ -128,42 +164,6 @@ static int huc_ucode_xfer(struct intel_uc_fw *huc_fw, struct i915_vma *vma) }/** -* intel_huc_select_fw() - selects HuC firmware for loading -* @huc: intel_huc struct -*/ -void intel_huc_select_fw (struct intel_huc *huc) -{ -struct drm_i915_private *dev_priv =huc_to_i915 (huc); - -intel_uc_fw_init (&huc->fw,INTEL_UC_FW_TYPE_HUC ); - -if (i915_modparams.huc_firmware_path) { - huc->fw.path = i915_modparams.huc_firmware_path; - huc->fw.major_ver_wanted =0 ; - huc->fw.minor_ver_wanted =0 ; - }else if (IS_SKYLAKE (dev_priv)) { - huc->fw.path =I915_SKL_HUC_UCODE ; - huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ; - huc->fw.minor_ver_wanted =SKL_HUC_FW_MINOR ; - }else if (IS_BROXTON (dev_priv)) { - huc->fw.path =I915_BXT_HUC_UCODE ; - huc->fw.major_ver_wanted =BXT_HUC_FW_MAJOR ; - huc->fw.minor_ver_wanted =BXT_HUC_FW_MINOR ; - }else if (IS_KABYLAKE (dev_priv) ||IS_COFFEELAKE (dev_priv)) { - huc->fw.path =I915_KBL_HUC_UCODE ; - huc->fw.major_ver_wanted =KBL_HUC_FW_MAJOR ; - huc->fw.minor_ver_wanted =KBL_HUC_FW_MINOR ; - }else if (IS_GEMINILAKE (dev_priv)) { - huc->fw.path =I915_GLK_HUC_UCODE ; - huc->fw.major_ver_wanted =GLK_HUC_FW_MAJOR ; - huc->fw.minor_ver_wanted =GLK_HUC_FW_MINOR ; - }else { -DRM_ERROR ("No HuC firmware known for platform with HuC!\n" ); -return ; - } -} - -/** * intel_huc_init_hw() - load HuC uCode to device * @huc: intel_huc structure *
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for Firmware code reorg (rev3)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: Firmware code reorg (rev3)
URL : https://patchwork.freedesktop.org/series/31846/
State : success
== Summary ==
Series 31846v3 Firmware code reorg
https://patchwork.freedesktop.org/api/1.0/series/31846/revisions/3/mbox/
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:457s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:480s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:392s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:580s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:287s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:528s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:522s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:546s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:526s fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:584s fi-cnl-y total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:645s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:437s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:272s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:606s fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:443s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:462s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:507s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:476s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:506s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:598s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:660s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:473s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:665s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:537s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:521s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:471s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:592s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:433s
b2c76c5c6dce7fa45b1aff5a7effb3cee5b5f707 drm-tip: 2017y-10m-13d-09h-16m-12s UTC integration manifest 86f1c261fa10 drm/i915/huc: Move fw select function565d2a13af79 drm/i915/guc: Update Guc messages on load failurebb3ad2cccb7f drm/i915/uc: Unify firmware loadingcff4521ac7b3 drm/i915: Update DMC firmware load error messagesdaa54b874afc drm/i915/uc: Add message with firmware urlb73aaaf9f1e7 drm/i915/uc: Improve debug messages in firmware fetchd41db8709f63 drm/i915/guc: Pick better place for Guc final status message fc0917c6bfe8 drm/i915/guc: Move firmware size check out of generic code4765d0020133 drm/i915/guc: Reorder functions in intel_guc_fw.c79c13e84ccfd drm/i915/guc: Rename intel_guc_loader.c to intel_guc_fw.cd0bb2405e51d drm/i915/guc: Move doc near related definitions0a5429946321 drm/i915/guc: Small fixups post code move44d8863544e3 drm/i915/guc: Move GuC boot param initialization out of xfer 956ea6983578 drm/i915: Move intel_guc_wopcm_size to intel_guc.c
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6021/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for Firmware code reorg (rev3)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: Firmware code reorg (rev3)
URL : https://patchwork.freedesktop.org/series/31846/
State : success
== Summary ==
Test kms_atomic_transition:
Subgroup plane-toggle-modeset-transition:
dmesg-warn -> PASS (shard-hsw) fdo#102614
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2553 pass:1441 dwarn:1 dfail:0 fail:8 skip:1103 time:9673s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6021/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx