GuC Scrub vol. 1
Subsystems (2)
v6 cover GuC Scrub vol. 1
General GuC/HuC cleanup simplifying logic, and moving chunks around as the area got pretty rusty.
A lot of logic were extracted from intel_guc_load() to other functions - it did not only handle the actual loading but had WA implementations and the code that enabled submission baked into it.
This is the first part of effort to clean it up.
v2: rebase after HuC merge + feedback
v3: even more renaming that aims to make things more semantic
v4: some naming improvements, some bikeshedding
v5: coding style, some cleanup
module params for huc and guc firmware path, separate fw select step from actual prepare
v6: feedback + pushed a couple of patches with r-b down the stack
Arkadiusz Hiler (10):
drm/i915/uc: Rename intel_?uc_{setup,load}() to _init_hw() drm/i915/uc: Drop superfluous externs in intel_uc.h drm/i915/huc: Add huc_to_i915
drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c drm/i915/uc: Introduce intel_uc_init_fw() drm/i915/guc: Extract param logic form guc_init_fw() drm/i915/guc: Simplify intel_guc_init_hw() drm/i915/uc: Simplify firmware path handling drm/i915/uc: Separate firmware selection and preparation drm/i915/uc: Add params for specifying firmware
drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 10 + drivers/gpu/drm/i915/i915_params.h | 2 + drivers/gpu/drm/i915/intel_guc_loader.c | 367 ++++---------------------------- drivers/gpu/drm/i915/intel_huc.c | 69 +++--- drivers/gpu/drm/i915/intel_uc.c | 291 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 25 ++- 9 files changed, 395 insertions(+), 381 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 1/10 drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw()
GuC historically has two "startup" functions called _init() and _setup()
Then HuC came with it's _init() and _load().
This commit renames intel_guc_setup() and intel_huc_load() to *uc_init_hw() as they called from the i915_gem_init_hw().
The aim is to be consistent in that entry points called during particular driver init phases (e.g. init_hw) are all suffixed by that phase. When reading the leaf functions, it should be clear at what stage during the driver load it is called and therefore what operations are legal at that point.
v2: commit message update (Chris Wilson)
--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 14 +++++++------- drivers/gpu/drm/i915/intel_huc.c | 6 +++--- drivers/gpu/drm/i915/intel_uc.h | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -4454,7 +4454,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)intel_mocs_init_l3cc_table (dev_priv);/* We can't enable contexts until all firmware is loaded */ - ret =intel_guc_setup (dev_priv); + ret =intel_guc_init_hw (dev_priv);if (ret) goto out;
drivers/gpu/drm/i915/intel_guc_loader.c +7 -7
@@ -428,19 +428,19 @@ static int guc_hw_reset(struct drm_i915_private *dev_priv) }/** -* intel_guc_setup() - finish preparing the GuC for activity +* intel_guc_init_hw() - finish preparing the GuC for activity * @dev_priv: i915 device private * -* Called from gem_init_hw() during driver loading and also after a GPU reset. +* Called during driver loading and also after a GPU reset. * * The main action required here it to load the GuC uCode into the device. * The firmware image should have already been fetched into memory by the -* earlier call to intel_guc_init(), so here we need only check that worked, -* and then transfer the image to the h/w. +* earlier call to intel_guc_init(), so here we need only check that +* worked, and then transfer the image to the h/w. * * Return: non-zero code on error */ -int intel_guc_setup (struct drm_i915_private *dev_priv) +int intel_guc_init_hw (struct drm_i915_private *dev_priv) {struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;const char *fw_path = guc_fw->path;
@@ -506,7 +506,7 @@ int intel_guc_setup(struct drm_i915_private *dev_priv)if (err) goto fail; -intel_huc_load (dev_priv); +intel_huc_init_hw (dev_priv); err =guc_ucode_xfer (dev_priv);if (!err)break ;
@@ -729,7 +729,7 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv,* Called early during driver load, but after GEM is initialised. * * The firmware will be transferred to the GuC's memory later, -* when intel_guc_setup() is called. +* when intel_guc_init_hw() is called. */ void intel_guc_init (struct drm_i915_private *dev_priv) {
drivers/gpu/drm/i915/intel_huc.c +3 -3
@@ -150,7 +150,7 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)* is not capable or driver yet support it. And there will be no error message * for INTEL_UC_FIRMWARE_NONE cases. * -* The DMA-copying to HW is done later when intel_huc_load() is called. +* The DMA-copying to HW is done later when intel_huc_init_hw() is called. */ void intel_huc_init (struct drm_i915_private *dev_priv) {
@@ -191,7 +191,7 @@ void intel_huc_init(struct drm_i915_private *dev_priv) }/** -* intel_huc_load() - load HuC uCode to device +* intel_huc_init_hw() - load HuC uCode to device * @dev_priv: the drm_i915_private device * * Called from guc_setup() during driver loading and also after a GPU reset.
@@ -203,7 +203,7 @@ void intel_huc_init(struct drm_i915_private *dev_priv)* * Return: non-zero code on error */ -int intel_huc_load (struct drm_i915_private *dev_priv) +int intel_huc_init_hw (struct drm_i915_private *dev_priv) {struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;int err;
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -190,7 +190,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc);/* intel_guc_loader.c */ extern void intel_guc_init (struct drm_i915_private *dev_priv); -extern int intel_guc_setup (struct drm_i915_private *dev_priv); +extern int intel_guc_init_hw (struct drm_i915_private *dev_priv);extern void intel_guc_fini (struct drm_i915_private *dev_priv);extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);extern int intel_guc_suspend (struct drm_i915_private *dev_priv);
@@ -225,7 +225,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)/* intel_huc.c */ void intel_huc_init (struct drm_i915_private *dev_priv);void intel_huc_fini (struct drm_i915_private *dev_priv); -int intel_huc_load (struct drm_i915_private *dev_priv); +int intel_huc_init_hw (struct drm_i915_private *dev_priv);void intel_guc_auth_huc (struct drm_i915_private *dev_priv);#endif
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 01/10] drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw()
Quoted 22 lines · Arkadiusz Hiler
GuC historically has two "startup" functions called
_init()and_setup()Then HuC came with it's
_init()and_load().This commit renames
intel_guc_setup()andintel_huc_load()to*uc_init_hw()as they called from thei915_gem_init_hw().The aim is to be consistent in that entry points called during particular driver init phases (e.g.
init_hw) are all suffixed by that phase. When reading the leaf functions, it should be clear at what stage during the driver load it is called and therefore what operations are legal at that point.v2: commit message update (Chris Wilson)
Cc Chris Wilson <[email protected]>Cc Michal Winiarski <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>Reviewed-by Joonas Lahtinen <[email protected]>Reviewed-by Michal Wajdeczko <[email protected]>---
<snip>
drivers/gpu/drm/i915/intel_uc.h int intel_guc_sample_forcewake(struct intel_guc *guc); · line 193
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.h +1
-1@@ -190,7 +190,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc);/* intel_guc_loader.c */ extern void intel_guc_init (struct drm_i915_private *dev_priv); -extern int intel_guc_setup (struct drm_i915_private *dev_priv); +extern int intel_guc_init_hw (struct drm_i915_private *dev_priv);
In later patch (5/10) you begin to use subject/verb/object pattern in
intel_guc_init_fw() intel_huc_init_fw() functions. Maybe you can do the same here: intel_guc_init_hw() intel_huc_init_hw()
-Michal
Quoted 15 lines
drivers/gpu/drm/i915/intel_uc.h +1
-1extern void intel_guc_fini (struct drm_i915_private *dev_priv);extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);extern int intel_guc_suspend (struct drm_i915_private *dev_priv);@@ -225,7 +225,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)/* intel_huc.c */ void intel_huc_init (struct drm_i915_private *dev_priv);void intel_huc_fini (struct drm_i915_private *dev_priv); -int intel_huc_load (struct drm_i915_private *dev_priv); +int intel_huc_init_hw (struct drm_i915_private *dev_priv);void intel_guc_auth_huc (struct drm_i915_private *dev_priv);#endif Signature · 1 line
2.9.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 2/10 drm/i915/uc: Drop superfluous externs in intel_uc.h
In reply to Arkadiusz HilerExterns are implicit and we generally try to avoid them.
--- drivers/gpu/drm/i915/intel_uc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_uc.h +6 -6
@@ -189,12 +189,12 @@ int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);/* intel_guc_loader.c */ -extern void intel_guc_init (struct drm_i915_private *dev_priv); -extern int intel_guc_init_hw (struct drm_i915_private *dev_priv); -extern void intel_guc_fini (struct drm_i915_private *dev_priv); -extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status); -extern int intel_guc_suspend (struct drm_i915_private *dev_priv); -extern int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_guc_init (struct drm_i915_private *dev_priv); +int intel_guc_init_hw (struct drm_i915_private *dev_priv); +void intel_guc_fini (struct drm_i915_private *dev_priv); +const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status); +int intel_guc_suspend (struct drm_i915_private *dev_priv); +int intel_guc_resume (struct drm_i915_private *dev_priv);void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 3/10 drm/i915/huc: Add huc_to_i915
In reply to Arkadiusz HilerUsed to obtain "dev_priv" from huc struct pointer. We already have similar thing for guc.
--- drivers/gpu/drm/i915/i915_drv.h | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -2534,6 +2534,11 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) return container_of(guc, struct drm_i915_private, guc); } +static inline struct drm_i915_private *huc_to_i915 (struct intel_huc *huc) +{ + return container_of(huc, struct drm_i915_private, huc); +} +/* Simple iterator over all initialised engines */ #define for_each_engine (engine__, dev_priv__, id__) \ for ((id__) = 0; \
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 4/10 drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
In reply to Arkadiusz HilerThe file fits better.
Additionally rename it to intel_uc_prepare_fw(), as the function does more than simple fetch.
v2: remove second declaration, reorder (M. Wajdeczko)
--- drivers/gpu/drm/i915/intel_guc_loader.c | 137 +------------------------------- drivers/gpu/drm/i915/intel_huc.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 135 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 4 +- 4 files changed, 139 insertions(+), 139 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -136
@@ -26,7 +26,6 @@* Dave Gordon <[email protected]> * Alex Dai <[email protected]> */ -#include <linux/firmware.h> #include "i915_drv.h" #include "intel_uc.h"
@@ -587,140 +586,6 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv)return ret; } -void intel_uc_fw_fetch (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; - -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->fw) { -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->fw); - 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) { -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); - -mutex_lock (&dev_priv->drm.struct_mutex); - obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size); -mutex_unlock (&dev_priv->drm.struct_mutex); -if (IS_ERR_OR_NULL (obj)) { - err = obj ?PTR_ERR (obj) : -ENOMEM ; - 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); - - obj =fetch_and_zero (&uc_fw->obj); -if (obj) -i915_gem_object_put (obj); - -release_firmware (fw);/* OK even if fw is NULL */ - uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; -}/** * intel_guc_init() - define parameters and fetch firmware
@@ -779,7 +644,7 @@ void intel_guc_init(struct drm_i915_private *dev_priv) guc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -intel_uc_fw_fetch (dev_priv, guc_fw); +intel_uc_prepare_fw (dev_priv, guc_fw);/* status must now be FAIL or SUCCESS */ }
drivers/gpu/drm/i915/intel_huc.c +1 -1
@@ -187,7 +187,7 @@ void intel_huc_init(struct drm_i915_private *dev_priv)WARN (huc_fw->path ==NULL ,"HuC present but no fw path\n" ); -intel_uc_fw_fetch (dev_priv, huc_fw); +intel_uc_prepare_fw (dev_priv, huc_fw); }/**
drivers/gpu/drm/i915/intel_uc.c +135 -0
144 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -185,6 +185,8 @@ struct intel_huc {/* intel_uc.c */ void intel_uc_init_early (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_send (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);
@@ -195,8 +197,6 @@ void intel_guc_fini(struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv); -void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, -struct intel_uc_fw *uc_fw);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/10] drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
Quoted 37 lines · Arkadiusz Hiler
The file fits better.
Additionally rename it to
intel_uc_prepare_fw(), as the function does more than simple fetch.v2: remove second declaration, reorder (M. Wajdeczko)
Cc Michal Wajdeczko <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 137 +------------------------------- drivers/gpu/drm/i915/intel_huc.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 135 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 4 +- 4 files changed, 139 insertions(+), 139 deletions(-)drivers/gpu/drm/i915/intel_guc_loader.c +9
-1@@ -26,7 +26,6 @@* Dave Gordon <[email protected]> * Alex Dai <[email protected]> */ -#include <linux/firmware.h> #include "i915_drv.h" #include "intel_uc.h" +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;
...
Quoted 18 lines
drivers/gpu/drm/i915/intel_guc_loader.c +18
-0+ +mutex_lock (&dev_priv->drm.struct_mutex); + obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size); +mutex_unlock (&dev_priv->drm.struct_mutex); +if (IS_ERR_OR_NULL (obj)) { + err = obj ?PTR_ERR (obj) : -ENOMEM ; + 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 ;
drivers/gpu/drm/i915/intel_guc_loader.c
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +10
-0+ +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); + + obj =fetch_and_zero (&uc_fw->obj); +if (obj) +i915_gem_object_put (obj);
I missed whether you fixed this in later patches, but uc_fw->obj can never be set at this point.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 04/10] drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
Quoted 64 lines · Chris Wilson
Quoted 37 lines · Arkadiusz Hiler
The file fits better.
Additionally rename it to
intel_uc_prepare_fw(), as the function does more than simple fetch.v2: remove second declaration, reorder (M. Wajdeczko)
Cc Michal Wajdeczko <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>--- drivers/gpu/drm/i915/intel_guc_loader.c | 137 +------------------------------- drivers/gpu/drm/i915/intel_huc.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 135 +++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 4 +- 4 files changed, 139 insertions(+), 139 deletions(-)drivers/gpu/drm/i915/intel_guc_loader.c +9
-1@@ -26,7 +26,6 @@* Dave Gordon <[email protected]> * Alex Dai <[email protected]> */ -#include <linux/firmware.h> #include "i915_drv.h" #include "intel_uc.h" +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;...
Quoted 23 lines
drivers/gpu/drm/i915/intel_guc_loader.c +23
-0+ +mutex_lock (&dev_priv->drm.struct_mutex); + obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size); +mutex_unlock (&dev_priv->drm.struct_mutex); +if (IS_ERR_OR_NULL (obj)) { + err = obj ?PTR_ERR (obj) : -ENOMEM ; + 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",
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +5
-0+ err, fw, uc_fw->obj); + + obj =fetch_and_zero (&uc_fw->obj); +if (obj) +i915_gem_object_put (obj);I missed whether you fixed this in later patches, but
uc_fw->objcan never be set at this point.
Sorry, it had eluded me. Onto it, thanks.
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/1 drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
In reply to Chris WilsonThe file fits better.
Additionally rename it to intel_uc_prepare_fw(), as the function does more than simple fetch.
obj cleanup in the function is also fixed (i.e. removed). In the fail scenario it was always 'put' but there's no possible flow that initializes the obj properly and then goes to the fail label.
v2: remove second declaration, reorder (M. Wajdeczko)
v3: non-trivial rebase
v4: remove obj cleanup in the fail scenario (C. Wilson)
--- drivers/gpu/drm/i915/intel_guc_loader.c | 137 +------------------------------- drivers/gpu/drm/i915/intel_huc.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 131 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 4 +- 4 files changed, 135 insertions(+), 139 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -136
@@ -26,7 +26,6 @@* Dave Gordon <[email protected]> * Alex Dai <[email protected]> */ -#include <linux/firmware.h> #include "i915_drv.h" #include "intel_uc.h"
@@ -587,140 +586,6 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv)return ret; } -void intel_uc_fw_fetch (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; - -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->fw) { -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->fw); - 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) { -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); - -mutex_lock (&dev_priv->drm.struct_mutex); - obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size); -mutex_unlock (&dev_priv->drm.struct_mutex); -if (IS_ERR_OR_NULL (obj)) { - err = obj ?PTR_ERR (obj) : -ENOMEM ; - 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); - - obj =fetch_and_zero (&uc_fw->obj); -if (obj) -i915_gem_object_put (obj); - -release_firmware (fw);/* OK even if fw is NULL */ - uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; -}/** * intel_guc_init() - define parameters and fetch firmware
@@ -779,7 +644,7 @@ void intel_guc_init(struct drm_i915_private *dev_priv) guc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -intel_uc_fw_fetch (dev_priv, guc_fw); +intel_uc_prepare_fw (dev_priv, guc_fw);/* status must now be FAIL or SUCCESS */ }
drivers/gpu/drm/i915/intel_huc.c +1 -1
@@ -189,7 +189,7 @@ void intel_huc_init(struct drm_i915_private *dev_priv)DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); -intel_uc_fw_fetch (dev_priv, huc_fw); +intel_uc_prepare_fw (dev_priv, huc_fw); }/**
drivers/gpu/drm/i915/intel_uc.c +131 -0
140 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -185,6 +185,8 @@ struct intel_huc {/* intel_uc.c */ void intel_uc_init_early (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_send (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);
@@ -195,8 +197,6 @@ void intel_guc_fini(struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv); -void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, -struct intel_uc_fw *uc_fw);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH] drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
Quoted 9 lines · Arkadiusz Hiler
The file fits better.
Additionally rename it to
intel_uc_prepare_fw(), as the function does more than simple fetch.
objcleanup in the function is also fixed (i.e. removed). In the fail scenario it was always 'put' but there's no possible flow that initializes the obj properly and then goes to the fail label.
Quoted 8 lines
v2: remove second declaration, reorder (M. Wajdeczko)
v3: non-trivial rebase
v4: remove obj cleanup in the fail scenario (C. Wilson)Cc Chris Wilson <[email protected]>Cc Michal Wajdeczko <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>---
but also added some more comments how to improve of existing messages.
-Michal
<snip>
Quoted 12 lines
drivers/gpu/drm/i915/intel_uc.c +8
-0@@ -114,3 +115,133 @@ int intel_guc_sample_forcewake(struct intel_guc *guc)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;
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 135
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+int err; + +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;
I'm not sure that we need this extra check for null fw.
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 142
Quoted 7 lines
drivers/gpu/drm/i915/intel_uc.c +7
-0+ +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" );
Btw, this message is little inaccurate. What about
DRM_ERROR("uC firmare is too small"
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 154
Quoted 12 lines
drivers/gpu/drm/i915/intel_uc.c +12
-0+ 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" );
Btw, this message is inaccurate too. What about
DRM_ERROR("uC firmware header is invalid"
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 164
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+ 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" );
Btw, this message can be improved too. What about
DRM_ERROR("uC firmware signature is corrupted"
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 173
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc.c +9
-0+ 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" );
Btw, this message can be improved too. What about
"uC firmware blob is truncated"
Quoted 6 lines
drivers/gpu/drm/i915/intel_uc.c +6
-0+ goto fail; + } + +/* +* The GuC firmware image has the version number embedded at a +* well-known offset within the firmware blob; note that major / minor
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 189
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+* version are TWO bytes each (i.e. u16), although all pointers and +* offsets are defined in terms of bytes (u8). +*/ +switch (uc_fw->fw) { +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)) {
Hmm, is it right place to perform such check ?
Maybe we can move it to guc_ucode_xfer() ?
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 190
Quoted 1 line
drivers/gpu/drm/i915/intel_uc.c +1
-0+DRM_ERROR ("Firmware is too large to fit in WOPCM\n" );
Btw, this message can be improved too. s/Firmware/uC firmware/
Quoted 12 lines
drivers/gpu/drm/i915/intel_uc.c +12
-0+ 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 :
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 212
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+DRM_ERROR ("Unknown firmware type %d\n" , uc_fw->fw); + 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) { +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);
s/DRM_NOTE/DRM_ERROR ?
Quoted 21 lines
drivers/gpu/drm/i915/intel_uc.c +21
-0+ 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); + +mutex_lock (&dev_priv->drm.struct_mutex); + obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size); +mutex_unlock (&dev_priv->drm.struct_mutex); +if (IS_ERR_OR_NULL (obj)) { + err = obj ?PTR_ERR (obj) : -ENOMEM ; + 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);
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 243
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+ +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);
Please drop "obj" from the message (as it will be always invalid at this point) Also drop "err" as it is already in DRM_WARN.
Then reconsider if we still need to log "fw" pointer.
drivers/gpu/drm/i915/intel_uc.c int intel_guc_sample_forcewake(struct intel_guc *guc) · line 247
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +4
-0+ +release_firmware (fw);/* OK even if fw is NULL */ + uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; +}
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 5/10 drm/i915/uc: Introduce intel_uc_init_fw()
In reply to Arkadiusz HilerInstead of calling intel_guc_init() and intel_huc_init() one by one this patch introduces intel_uc_init_fw() function that calls them both.
Called functions are renamed accordingly.
Trying to have subject_verb_object ordering and more descriptive names, the intel_huc_init() and intel_guc_init() functions are renamed.
For guc_init():
* intel_guc is the subject, so those functions now take intel_guc structure, instead of the dev_priv
* init is the verb
* fw is the object which better describes the function's role
huc_init() change follows the same reasoning.
v2: settle on intel_uc_fetch_fw name (M. Wajdeczko)
v3: yet another rename - intel_uc_init_fw (J. Lahtinen)
--- drivers/gpu/drm/i915/i915_drv.c | 3 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 30 +++++++++++++------------- drivers/gpu/drm/i915/intel_huc.c | 37 ++++++++++++++++----------------- drivers/gpu/drm/i915/intel_uc.c | 6 ++++++ drivers/gpu/drm/i915/intel_uc.h | 5 +++-- 5 files changed, 43 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -2
@@ -607,8 +607,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; -intel_huc_init (dev_priv); -intel_guc_init (dev_priv); +intel_uc_init_fw (dev_priv); ret =i915_gem_init (dev_priv);if (ret)
drivers/gpu/drm/i915/intel_guc_loader.c +15 -15
@@ -588,17 +588,17 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv)/** -* intel_guc_init() - define parameters and fetch firmware -* @dev_priv: i915 device private +* intel_guc_init_fw() - select and prepare firmware for loading +* @guc: intel_guc struct * * Called early during driver load, but after GEM is initialised. * * The firmware will be transferred to the GuC's memory later, * when intel_guc_init_hw() is called. */ -void intel_guc_init (struct drm_i915_private *dev_priv) +void intel_guc_init_fw (struct intel_guc *guc) { -struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; +struct drm_i915_private *dev_priv =guc_to_i915 (guc);const char *fw_path;if (!HAS_GUC (dev_priv)) {
@@ -616,23 +616,23 @@ void intel_guc_init(struct drm_i915_private *dev_priv) fw_path =NULL ; }else if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->major_ver_wanted =SKL_FW_MAJOR ; - guc_fw->minor_ver_wanted =SKL_FW_MINOR ; + guc->fw.major_ver_wanted =SKL_FW_MAJOR ; + guc->fw.minor_ver_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->major_ver_wanted =BXT_FW_MAJOR ; - guc_fw->minor_ver_wanted =BXT_FW_MINOR ; + guc->fw.major_ver_wanted =BXT_FW_MAJOR ; + guc->fw.minor_ver_wanted =BXT_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { fw_path =I915_KBL_GUC_UCODE ; - guc_fw->major_ver_wanted =KBL_FW_MAJOR ; - guc_fw->minor_ver_wanted =KBL_FW_MINOR ; + guc->fw.major_ver_wanted =KBL_FW_MAJOR ; + guc->fw.minor_ver_wanted =KBL_FW_MINOR ; }else { fw_path ="" ;/* unknown device */ } - guc_fw->path = fw_path; - guc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; - guc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.path = fw_path; + guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ;/* Early (and silent) return if GuC loading is disabled */ if (!i915.enable_guc_loading)
@@ -642,9 +642,9 @@ void intel_guc_init(struct drm_i915_private *dev_priv)if (*fw_path =='\0' )return ; - guc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + guc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -intel_uc_prepare_fw (dev_priv, guc_fw); +intel_uc_prepare_fw (dev_priv, &guc->fw);/* status must now be FAIL or SUCCESS */ }
drivers/gpu/drm/i915/intel_huc.c +18 -19
@@ -141,8 +141,8 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv) }/** -* intel_huc_init() - initiate HuC firmware loading request -* @dev_priv: the drm_i915_private device +* intel_huc_init_fw() - select and prepare firmware for loading +* @huc: intel_huc struct * * Called early during driver load, but after GEM is initialised. The loading * will continue only when driver explicitly specify firmware name and version.
@@ -152,42 +152,41 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)* * The DMA-copying to HW is done later when intel_huc_init_hw() is called. */ -void intel_huc_init (struct drm_i915_private *dev_priv) +void intel_huc_init_fw (struct intel_huc *huc) { -struct intel_huc *huc = &dev_priv->huc; -struct intel_uc_fw *huc_fw = &huc->fw; +struct drm_i915_private *dev_priv =huc_to_i915 (huc);const char *fw_path =NULL ; - huc_fw->path =NULL ; - huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; - huc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; - huc_fw->fw =INTEL_UC_FW_TYPE_HUC ; + huc->fw.path =NULL ; + huc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; + huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; + huc->fw.fw =INTEL_UC_FW_TYPE_HUC ;if (!HAS_HUC_UCODE (dev_priv))return ;if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_HUC_UCODE ; - huc_fw->major_ver_wanted =SKL_HUC_FW_MAJOR ; - huc_fw->minor_ver_wanted =SKL_HUC_FW_MINOR ; + huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =SKL_HUC_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { fw_path =I915_BXT_HUC_UCODE ; - huc_fw->major_ver_wanted =BXT_HUC_FW_MAJOR ; - huc_fw->minor_ver_wanted =BXT_HUC_FW_MINOR ; + huc->fw.major_ver_wanted =BXT_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =BXT_HUC_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { fw_path =I915_KBL_HUC_UCODE ; - huc_fw->major_ver_wanted =KBL_HUC_FW_MAJOR ; - huc_fw->minor_ver_wanted =KBL_HUC_FW_MINOR ; + huc->fw.major_ver_wanted =KBL_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =KBL_HUC_FW_MINOR ; } - huc_fw->path = fw_path; - huc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + huc->fw.path = fw_path; + huc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); -WARN (huc_fw->path ==NULL ,"HuC present but no fw path\n" ); +WARN (huc->fw.path ==NULL ,"HuC present but no fw path\n" ); -intel_uc_prepare_fw (dev_priv, huc_fw); +intel_uc_prepare_fw (dev_priv, &huc->fw); }/**
drivers/gpu/drm/i915/intel_uc.c +6 -0
@@ -31,6 +31,12 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)mutex_init (&dev_priv->guc.send_mutex); } +void intel_uc_init_fw (struct drm_i915_private *dev_priv) +{ +intel_huc_init_fw (&dev_priv->huc); +intel_guc_init_fw (&dev_priv->guc); +} +/* * Read GuC command/status register (SOFT_SCRATCH_0) * Return true if it contains a response rather than a command
drivers/gpu/drm/i915/intel_uc.h +3 -2
@@ -185,13 +185,14 @@ struct intel_huc {/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv); +void intel_uc_init_fw (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_send (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);/* intel_guc_loader.c */ -void intel_guc_init (struct drm_i915_private *dev_priv); +void intel_guc_init_fw (struct intel_guc *guc);int intel_guc_init_hw (struct drm_i915_private *dev_priv);void intel_guc_fini (struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);
@@ -223,7 +224,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) }/* intel_huc.c */ -void intel_huc_init (struct drm_i915_private *dev_priv); +void intel_huc_init_fw (struct intel_huc *huc);void intel_huc_fini (struct drm_i915_private *dev_priv);int intel_huc_init_hw (struct drm_i915_private *dev_priv);void intel_guc_auth_huc (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 6/10 drm/i915/guc: Extract param logic form guc_init_fw()
In reply to Arkadiusz HilerLet intel_guc_init_fw() focus on determining and fetching the correct firmware.
This patch introduces intel_uc_sanitize_options() that is called from intel_sanitize_options().
Then, if we have GuC, we can call intel_guc_init_fw() conditionally and we do not have to do the internal checks.
v2: fix comment, notify when nuking GuC explicitly enabled (M. Wajdeczko)
v3: fix comment again, change the nuke message (M. Wajdeczko)
v4: update title to reflect new function name + rebase
v5: text && remove 2 uneccessary checks (M. Wajdeczko)
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_guc_loader.c | 18 +----------------- drivers/gpu/drm/i915/intel_huc.c | 3 --- drivers/gpu/drm/i915/intel_uc.c | 28 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc.h | 1 + 5 files changed, 31 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -991,6 +991,8 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) i915.semaphores =intel_sanitize_semaphores (dev_priv, i915.semaphores);DRM_DEBUG_DRIVER ("use GPU semaphores? %s\n" ,yesno (i915.semaphores)); + +intel_uc_sanitize_options (dev_priv); }/**
drivers/gpu/drm/i915/intel_guc_loader.c +1 -17
@@ -601,20 +601,7 @@ void intel_guc_init_fw(struct intel_guc *guc)struct drm_i915_private *dev_priv =guc_to_i915 (guc);const char *fw_path; -if (!HAS_GUC (dev_priv)) { - i915.enable_guc_loading =0 ; - i915.enable_guc_submission =0 ; - }else { -/* A negative value means "use platform default" */ -if (i915.enable_guc_loading <0 ) - i915.enable_guc_loading =HAS_GUC_UCODE (dev_priv); -if (i915.enable_guc_submission <0 ) - i915.enable_guc_submission =HAS_GUC_SCHED (dev_priv); - } - -if (!HAS_GUC_UCODE (dev_priv)) { - fw_path =NULL ; - }else if (IS_SKYLAKE (dev_priv)) { +if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_GUC_UCODE ; guc->fw.major_ver_wanted =SKL_FW_MAJOR ; guc->fw.minor_ver_wanted =SKL_FW_MINOR ;
@@ -634,9 +621,6 @@ void intel_guc_init_fw(struct intel_guc *guc) guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; -/* Early (and silent) return if GuC loading is disabled */ -if (!i915.enable_guc_loading) -return ;if (fw_path ==NULL )return ;if (*fw_path =='\0' )
drivers/gpu/drm/i915/intel_huc.c +0 -3
@@ -162,9 +162,6 @@ void intel_huc_init_fw(struct intel_huc *huc) huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; huc->fw.fw =INTEL_UC_FW_TYPE_HUC ; -if (!HAS_HUC_UCODE (dev_priv)) -return ; -if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_HUC_UCODE ; huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ;
drivers/gpu/drm/i915/intel_uc.c +27 -1
@@ -26,6 +26,27 @@#include "intel_uc.h" #include <linux/firmware.h> +void intel_uc_sanitize_options (struct drm_i915_private *dev_priv) +{ +if (!HAS_GUC (dev_priv)) { +if (i915.enable_guc_loading >0 ) +DRM_INFO ("Ignoring GuC options, no hardware" ); + + i915.enable_guc_loading =0 ; + i915.enable_guc_submission =0 ; + }else { +/* A negative value means "use platform default" */ +if (i915.enable_guc_loading <0 ) + i915.enable_guc_loading =HAS_GUC_UCODE (dev_priv); +if (i915.enable_guc_submission <0 ) + i915.enable_guc_submission =HAS_GUC_SCHED (dev_priv); + +/* Can't enable guc submission without guc loaded */ +if (!i915.enable_guc_loading) + i915.enable_guc_submission =0 ; + } +} +void intel_uc_init_early (struct drm_i915_private *dev_priv) {mutex_init (&dev_priv->guc.send_mutex);
@@ -33,7 +54,12 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)void intel_uc_init_fw (struct drm_i915_private *dev_priv) { -intel_huc_init_fw (&dev_priv->huc); +if (!i915.enable_guc_loading) +return ; + +if (HAS_HUC_UCODE (dev_priv)) +intel_huc_init_fw (&dev_priv->huc); +intel_guc_init_fw (&dev_priv->guc); }
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -184,6 +184,7 @@ struct intel_huc { };/* intel_uc.c */ +void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_early (struct drm_i915_private *dev_priv);void intel_uc_init_fw (struct drm_i915_private *dev_priv); void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 7/10 drm/i915/guc: Simplify intel_guc_init_hw()
In reply to Arkadiusz HilerCurrent version of intel_guc_init_hw() does a lot:
- cares about submission
- loads huc
- implement WA
This change offloads some of the logic to intel_uc_init_hw(), which now cares about the above.
v2: rename guc_hw_reset and fix typo in define name (M. Wajdeczko)
v3: rename once again
v4: remove spurious comments and add some style (J. Lahtinen)
v5: flow changes, got rid of dead checks (M. Wajdeczko)
--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 147 +++----------------------------- drivers/gpu/drm/i915/intel_uc.c | 114 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 3 + 4 files changed, 130 insertions(+), 136 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -4454,7 +4454,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)intel_mocs_init_l3cc_table (dev_priv);/* We can't enable contexts until all firmware is loaded */ - ret =intel_guc_init_hw (dev_priv); + ret =intel_uc_init_hw (dev_priv);if (ret) goto out;
drivers/gpu/drm/i915/intel_guc_loader.c +12 -135
203 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +114 -0
126 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +3 -0
@@ -187,6 +187,7 @@ struct intel_huc {void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_early (struct drm_i915_private *dev_priv);void intel_uc_init_fw (struct drm_i915_private *dev_priv); +int intel_uc_init_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_send (struct intel_guc *guc,const u32 *action,u32 len);
@@ -199,6 +200,8 @@ void intel_guc_fini(struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_guc_release_interrupts (struct drm_i915_private *dev_priv); +void intel_guc_capture_interrupts (struct drm_i915_private *dev_priv);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 8/10 drm/i915/uc: Simplify firmware path handling
In reply to Arkadiusz HilerCurrently fw->path values can represent one of three possible states:
1) NULL - device without the uC
2) '\0' - device with the uC but have no firmware
3) else - device with the uC and we have firmware
Second case is used only to WARN at a later stage.
We can WARN right away and merge cases 1 and 2.
Code can be even further simplified and common (HuC/GuC logic) happening right before the fetch can be offloaded to the common function.
v2: fewer temporary variables, more straightforward flow (M. Wajdeczko)
v3: DRM_ERROR instead of WARN (M. Wajdeczko)
v4: coding standard (J. Lahtinen)
--- drivers/gpu/drm/i915/intel_guc_loader.c | 35 +++++++++++---------------------- drivers/gpu/drm/i915/intel_huc.c | 17 ++++++---------- drivers/gpu/drm/i915/intel_uc.c | 4 +++- 3 files changed, 21 insertions(+), 35 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +12 -23
@@ -432,12 +432,8 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv)intel_uc_fw_status_repr (guc_fw->fetch_status), intel_uc_fw_status_repr(guc_fw->load_status)); -if (!fw_path) { +if (!fw_path)return -ENXIO ; - }else if (*fw_path =='\0' ) { -WARN (1 ,"No GuC firmware known for this platform!\n" ); -return -ENODEV ; - }if (guc_fw->fetch_status !=INTEL_UC_FIRMWARE_SUCCESS )return -EIO ;
@@ -463,7 +459,6 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv)return 0 ; } -/** * intel_guc_init_fw() - select and prepare firmware for loading * @guc: intel_guc struct
@@ -476,37 +471,31 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv)void intel_guc_init_fw (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -const char *fw_path; + + guc->fw.path =NULL ; + guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.fw =INTEL_UC_FW_TYPE_GUC ;if (IS_SKYLAKE (dev_priv)) { - fw_path =I915_SKL_GUC_UCODE ; + 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)) { - fw_path =I915_BXT_GUC_UCODE ; + 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)) { - fw_path =I915_KBL_GUC_UCODE ; + guc->fw.path =I915_KBL_GUC_UCODE ; guc->fw.major_ver_wanted =KBL_FW_MAJOR ; guc->fw.minor_ver_wanted =KBL_FW_MINOR ; }else { - fw_path ="" ;/* unknown device */ +DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); + i915.enable_guc_loading =0 ; +return ; } - guc->fw.path = fw_path; - guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; - guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; - -if (fw_path ==NULL ) -return ; -if (*fw_path =='\0' ) -return ; - - guc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ; -DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path);intel_uc_prepare_fw (dev_priv, &guc->fw); -/* status must now be FAIL or SUCCESS */ }/**
drivers/gpu/drm/i915/intel_huc.c +6 -11
@@ -155,7 +155,6 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)void intel_huc_init_fw (struct intel_huc *huc) {struct drm_i915_private *dev_priv =huc_to_i915 (huc); -const char *fw_path =NULL ; huc->fw.path =NULL ; huc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ;
@@ -163,26 +162,22 @@ void intel_huc_init_fw(struct intel_huc *huc) huc->fw.fw =INTEL_UC_FW_TYPE_HUC ;if (IS_SKYLAKE (dev_priv)) { - fw_path =I915_SKL_HUC_UCODE ; + 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)) { - fw_path =I915_BXT_HUC_UCODE ; + 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)) { - fw_path =I915_KBL_HUC_UCODE ; + 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 { +DRM_ERROR ("No HuC firmware known for platform with HuC!\n" ); +return ; } - huc->fw.path = fw_path; - huc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ; - -DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); - -WARN (huc->fw.path ==NULL ,"HuC present but no fw path\n" ); -intel_uc_prepare_fw (dev_priv, &huc->fw); }
drivers/gpu/drm/i915/intel_uc.c +3 -1
@@ -271,8 +271,10 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,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)); +intel_uc_fw_status_repr (uc_fw->fetch_status)); err =request_firmware (&fw, uc_fw->path, &pdev->dev);if (err)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 9/10 drm/i915/uc: Separate firmware selection and preparation
In reply to Arkadiusz Hilerintel_{h,g}uc_init_fw selects correct firmware and then triggers it's preparation (fetch + initial parsing).
This change separates out select steps, so those can be called by the sanitize_options().
Then, during the init_fw() we prepare the firmware if the firmware was selected.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 14 +++++--------- drivers/gpu/drm/i915/intel_huc.c | 14 ++------------ drivers/gpu/drm/i915/intel_uc.c | 18 ++++++++++++------ drivers/gpu/drm/i915/intel_uc.h | 4 ++-- 4 files changed, 21 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +5 -9
@@ -460,15 +460,12 @@ int intel_guc_init_hw(struct drm_i915_private *dev_priv) }/** -* intel_guc_init_fw() - select and prepare firmware for loading +* intel_guc_select_fw() - selects GuC firmware for loading * @guc: intel_guc struct * -* Called early during driver load, but after GEM is initialised. -* -* The firmware will be transferred to the GuC's memory later, -* when intel_guc_init_hw() is called. +* Return: zero when we know firmware, non-zero in other case */ -void intel_guc_init_fw (struct intel_guc *guc) +int intel_guc_select_fw (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);
@@ -491,11 +488,10 @@ void intel_guc_init_fw(struct intel_guc *guc) guc->fw.minor_ver_wanted =KBL_FW_MINOR ; }else {DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); - i915.enable_guc_loading =0 ; -return ; +return -ENOENT ; } -intel_uc_prepare_fw (dev_priv, &guc->fw); +return 0 ; }/**
drivers/gpu/drm/i915/intel_huc.c +2 -12
@@ -141,18 +141,10 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv) }/** -* intel_huc_init_fw() - select and prepare firmware for loading +* intel_huc_select_fw() - selects HuC firmware for loading * @huc: intel_huc struct -* -* Called early during driver load, but after GEM is initialised. The loading -* will continue only when driver explicitly specify firmware name and version. -* All other cases are considered as INTEL_UC_FIRMWARE_NONE either because HW -* is not capable or driver yet support it. And there will be no error message -* for INTEL_UC_FIRMWARE_NONE cases. -* -* The DMA-copying to HW is done later when intel_huc_init_hw() is called. */ -void intel_huc_init_fw (struct intel_huc *huc) +void intel_huc_select_fw (struct intel_huc *huc) {struct drm_i915_private *dev_priv =huc_to_i915 (huc);
@@ -177,8 +169,6 @@ void intel_huc_init_fw(struct intel_huc *huc)DRM_ERROR ("No HuC firmware known for platform with HuC!\n" );return ; } - -intel_uc_prepare_fw (dev_priv, &huc->fw); }/**
drivers/gpu/drm/i915/intel_uc.c +12 -6
@@ -66,6 +66,14 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)if (!i915.enable_guc_loading) i915.enable_guc_submission =0 ; } + +if (i915.enable_guc_loading) { +if (HAS_HUC_UCODE (dev_priv)) +intel_huc_select_fw (&dev_priv->huc); + +if (intel_guc_select_fw (&dev_priv->guc)) + i915.enable_guc_loading =0 ; + } }void intel_uc_init_early (struct drm_i915_private *dev_priv)
@@ -75,13 +83,11 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)void intel_uc_init_fw (struct drm_i915_private *dev_priv) { -if (!i915.enable_guc_loading) -return ; +if (dev_priv->huc.fw.path) +intel_uc_prepare_fw (dev_priv, &dev_priv->huc.fw); -if (HAS_HUC_UCODE (dev_priv)) -intel_huc_init_fw (&dev_priv->huc); - -intel_guc_init_fw (&dev_priv->guc); +if (dev_priv->guc.fw.path) +intel_uc_prepare_fw (dev_priv, &dev_priv->guc.fw); }int intel_uc_init_hw (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -194,7 +194,7 @@ int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);/* intel_guc_loader.c */ -void intel_guc_init_fw (struct intel_guc *guc); +int intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct drm_i915_private *dev_priv);void intel_guc_fini (struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);
@@ -228,7 +228,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) }/* intel_huc.c */ -void intel_huc_init_fw (struct intel_huc *huc); +void intel_huc_select_fw (struct intel_huc *huc);void intel_huc_fini (struct drm_i915_private *dev_priv);int intel_huc_init_hw (struct drm_i915_private *dev_priv);void intel_guc_auth_huc (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 10/10 drm/i915/uc: Add params for specifying firmware
In reply to Arkadiusz Hilerguc_firmware_path and huc_firmware_path module parameters are added.
Using the parameter disabled version checks and loads desired firmware instead of the default one.
v2: make params unsafe && notice about disabled fw check (J. Lahtinen)
--- drivers/gpu/drm/i915/i915_params.c | 10 ++++++++++ drivers/gpu/drm/i915/i915_params.h | 2 ++ drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++- drivers/gpu/drm/i915/intel_huc.c | 6 +++++- drivers/gpu/drm/i915/intel_uc.c | 6 ++++-- 5 files changed, 26 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_params.c +10 -0
@@ -59,6 +59,8 @@ struct i915_params i915 __read_mostly = { .enable_guc_loading = 0, .enable_guc_submission = 0, .guc_log_level = -1, + .guc_firmware_path = NULL, + .huc_firmware_path = NULL, .enable_dp_mst = true, .inject_load_failure = 0, .enable_dpcd_backlight = false,
@@ -230,6 +232,14 @@ module_param_named(guc_log_level, i915.guc_log_level, int, 0400);MODULE_PARM_DESC (guc_log_level,"GuC firmware logging level (-1:disabled (default), 0-3:enabled)" ); +module_param_named_unsafe (guc_firmware_path, i915.guc_firmware_path, charp,0400 ); +MODULE_PARM_DESC (guc_firmware_path, +"GuC firmware path to use instead of the default one" ); + +module_param_named_unsafe (huc_firmware_path, i915.huc_firmware_path, charp,0400 ); +MODULE_PARM_DESC (huc_firmware_path, +"HuC firmware path to use instead of the default one" ); +module_param_named_unsafe (enable_dp_mst, i915.enable_dp_mst, bool,0600 );MODULE_PARM_DESC (enable_dp_mst,"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)" );
drivers/gpu/drm/i915/i915_params.h +2 -0
@@ -46,6 +46,8 @@func (int, enable_guc_loading); \func (int, enable_guc_submission); \func (int, guc_log_level); \ + func(char *, guc_firmware_path); \ + func(char *, huc_firmware_path); \func (int, use_mmio_flip); \func (int, mmio_debug); \func (int, edp_vswing); \
drivers/gpu/drm/i915/intel_guc_loader.c +5 -1
@@ -474,7 +474,11 @@ int intel_guc_select_fw(struct intel_guc *guc) guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; guc->fw.fw =INTEL_UC_FW_TYPE_GUC ; -if (IS_SKYLAKE (dev_priv)) { +if (i915.guc_firmware_path) { + guc->fw.path = i915.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 ;
drivers/gpu/drm/i915/intel_huc.c +5 -1
@@ -153,7 +153,11 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; huc->fw.fw =INTEL_UC_FW_TYPE_HUC ; -if (IS_SKYLAKE (dev_priv)) { +if (i915.huc_firmware_path) { + huc->fw.path = i915.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 ;
drivers/gpu/drm/i915/intel_uc.c +4 -2
@@ -359,8 +359,10 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, goto fail; } -if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || - uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { +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);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for GuC Scrub vol. 1 (rev8)
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: GuC Scrub vol. 1 (rev8)
URL : https://patchwork.freedesktop.org/series/16856/
State : failure
== Summary ==
CC [M] drivers/gpu/drm/i915/gvt/execlist.o LD drivers/misc/built-in.o LD drivers/pinctrl/built-in.o CC [M] drivers/gpu/drm/i915/gvt/scheduler.o CC [M] drivers/gpu/drm/i915/gvt/sched_policy.o EXPORTS lib/lib-ksyms.o CC [M] drivers/gpu/drm/i915/gvt/render.o CC [M] drivers/gpu/drm/i915/gvt/cmd_parser.o CC [M] drivers/gpu/drm/i915/intel_lpe_audio.o LD lib/built-in.o LD sound/built-in.o LD drivers/tty/serial/8250/8250.o LD kernel/sched/built-in.o LD drivers/usb/storage/usb-storage.o LD drivers/usb/storage/built-in.o LD [M] drivers/gpu/drm/vgem/vgem.o LD kernel/built-in.o LD net/ipv6/ipv6.o LD drivers/video/fbdev/core/fb.o LD drivers/video/fbdev/core/built-in.o LD [M] drivers/ssb/ssb.o LD net/ipv6/built-in.o LD drivers/pci/pcie/aer/aerdriver.o LD drivers/pci/pcie/aer/built-in.o LD drivers/pci/pcie/built-in.o LD drivers/thermal/thermal_sys.o LD [M] drivers/mmc/core/mmc_block.o LD drivers/thermal/built-in.o LD drivers/mmc/built-in.o LD drivers/video/fbdev/built-in.o LD [M] drivers/usb/serial/usbserial.o LD drivers/scsi/scsi_mod.o LD drivers/iommu/built-in.o
drivers/gpu/drm/i915/intel_huc.c: In function ‘intel_huc_init’:drivers/gpu/drm/i915/intel_huc.c:192:1: error: expected expression before ‘<<’ token
<<<<<<< 7371625ae066535a7eb443210ebfcffcb4791835
^drivers/gpu/drm/i915/intel_huc.c:192:9: error: invalid suffix "ae066535a7eb443210ebfcffcb4791835" on integer constant
<<<<<<< 7371625ae066535a7eb443210ebfcffcb4791835
^
drivers/gpu/drm/i915/intel_huc.c:194:1: error: expected expression before ‘==’ token
=======
^drivers/gpu/drm/i915/intel_huc.c:198:1: error: expected expression before ‘>>’ token
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm/i915/uc: Move
intel_uc_fw_fetch()tointel_uc.c
^scripts/Makefile.build:294: recipe for target 'drivers/gpu/drm/i915/intel_huc.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_huc.o] Error 1
make[4]: *** Waiting for unfinished jobs....
LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o LD [M] drivers/net/ethernet/broadcom/genet/genet.o LD drivers/pci/built-in.o LD drivers/tty/serial/8250/8250_base.o LD drivers/tty/serial/8250/built-in.o LD drivers/tty/serial/built-in.o LD drivers/video/console/built-in.o LD drivers/spi/built-in.o LD drivers/video/built-in.o LD drivers/usb/gadget/libcomposite.o LD drivers/usb/gadget/udc/udc-core.o LD drivers/scsi/sd_mod.o LD fs/btrfs/btrfs.o LD drivers/usb/gadget/udc/built-in.o LD drivers/scsi/built-in.o LD drivers/usb/gadget/built-in.o LD [M] drivers/net/ethernet/intel/e1000/e1000.o LD fs/btrfs/built-in.o LD drivers/gpu/drm/drm.o LD drivers/tty/vt/built-in.o LD drivers/tty/built-in.o LD drivers/usb/core/usbcore.o LD drivers/usb/core/built-in.o CC arch/x86/kernel/cpu/capflags.o LD arch/x86/kernel/cpu/built-in.o LD arch/x86/kernel/built-in.o LD arch/x86/built-in.o LD drivers/usb/host/xhci-hcd.o LD [M] drivers/net/ethernet/intel/igb/igb.o LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o LD drivers/md/md-mod.o LD drivers/md/built-in.o LD net/ipv4/built-in.o LD net/core/built-in.o LD drivers/usb/host/built-in.o LD fs/ext4/ext4.o LD drivers/usb/built-in.o LD net/built-in.o LD fs/ext4/built-in.o LD fs/built-in.o
scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:553: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
make[1]: *** Waiting for unfinished jobs....
LD drivers/net/ethernet/built-in.o
LD drivers/net/built-in.o
Makefile:990: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.BAT: failure for GuC Scrub vol. 1 (rev8)
Quoted 47 lines · Patchwork
== Series Details ==
Series: GuC Scrub vol. 1 (rev8)
URL : https://patchwork.freedesktop.org/series/16856/
State : failure== Summary ==
CC [M] drivers/gpu/drm/i915/gvt/execlist.o LD drivers/misc/built-in.o LD drivers/pinctrl/built-in.o CC [M] drivers/gpu/drm/i915/gvt/scheduler.o CC [M] drivers/gpu/drm/i915/gvt/sched_policy.o EXPORTS lib/lib-ksyms.o CC [M] drivers/gpu/drm/i915/gvt/render.o CC [M] drivers/gpu/drm/i915/gvt/cmd_parser.o CC [M] drivers/gpu/drm/i915/intel_lpe_audio.o LD lib/built-in.o LD sound/built-in.o LD drivers/tty/serial/8250/8250.o LD kernel/sched/built-in.o LD drivers/usb/storage/usb-storage.o LD drivers/usb/storage/built-in.o LD [M] drivers/gpu/drm/vgem/vgem.o LD kernel/built-in.o LD net/ipv6/ipv6.o LD drivers/video/fbdev/core/fb.o LD drivers/video/fbdev/core/built-in.o LD [M] drivers/ssb/ssb.o LD net/ipv6/built-in.o LD drivers/pci/pcie/aer/aerdriver.o LD drivers/pci/pcie/aer/built-in.o LD drivers/pci/pcie/built-in.o LD drivers/thermal/thermal_sys.o LD [M] drivers/mmc/core/mmc_block.o LD drivers/thermal/built-in.o LD drivers/mmc/built-in.o LD drivers/video/fbdev/built-in.o LD [M] drivers/usb/serial/usbserial.o LD drivers/scsi/scsi_mod.o LD drivers/iommu/built-in.o
drivers/gpu/drm/i915/intel_huc.c: In function ‘intel_huc_init’:drivers/gpu/drm/i915/intel_huc.c:192:1: error: expected expression before ‘<<’ token
<<<<<<<7371625ae066535a7eb443210ebfcffcb4791835
^drivers/gpu/drm/i915/intel_huc.c:192:9: error: invalid suffix "ae066535a7eb443210ebfcffcb4791835" on integer constant
<<<<<<<7371625ae066535a7eb443210ebfcffcb4791835
Quoted 6 lines
^
drivers/gpu/drm/i915/intel_huc.c:194:1: error: expected expression before ‘==’ token
=======
^drivers/gpu/drm/i915/intel_huc.c:198:1: error: expected expression before ‘>>’ tokenQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm/i915/uc: Move
intel_uc_fw_fetch()tointel_uc.c
Mid-day a patch was commited that makes this series unappliable :(
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for GuC Scrub vol. 1 (rev9)
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: GuC Scrub vol. 1 (rev9)
URL : https://patchwork.freedesktop.org/series/16856/
State : failure
== Summary ==
CC [M] drivers/gpu/drm/i915/i915_vgpu.o CC [M] drivers/gpu/drm/i915/gvt/gvt.o CC [M] drivers/gpu/drm/i915/gvt/aperture_gm.o CC [M] drivers/gpu/drm/i915/gvt/handlers.o CC [M] drivers/gpu/drm/i915/gvt/vgpu.o CC [M] drivers/gpu/drm/i915/gvt/trace_points.o CC [M] drivers/gpu/drm/i915/gvt/firmware.o CC [M] drivers/gpu/drm/i915/gvt/interrupt.o CC [M] drivers/gpu/drm/i915/gvt/gtt.o CC [M] drivers/gpu/drm/i915/gvt/cfg_space.o CC [M] drivers/gpu/drm/i915/gvt/opregion.o CC [M] drivers/gpu/drm/i915/gvt/mmio.o CC [M] drivers/gpu/drm/i915/gvt/display.o CC [M] drivers/gpu/drm/i915/gvt/edid.o CC [M] drivers/gpu/drm/i915/gvt/sched_policy.o CC [M] drivers/gpu/drm/i915/gvt/execlist.o CC [M] drivers/gpu/drm/i915/gvt/scheduler.o CC [M] drivers/gpu/drm/i915/gvt/render.o CC [M] drivers/gpu/drm/i915/gvt/cmd_parser.o CC [M] drivers/gpu/drm/i915/intel_lpe_audio.o LD kernel/sched/built-in.o LD net/key/built-in.o LD kernel/built-in.o LD lib/raid6/raid6_pq.o LD lib/raid6/built-in.o LD drivers/scsi/scsi_mod.o LD drivers/acpi/acpica/acpi.o LD [M] drivers/net/ethernet/intel/e1000/e1000.o LD [M] drivers/net/ethernet/intel/igbvf/igbvf.o LD net/unix/unix.o LD net/netlink/built-in.o LD drivers/acpi/acpica/built-in.o LD net/unix/built-in.o LD drivers/acpi/built-in.o
drivers/gpu/drm/i915/intel_huc.c: In function ‘intel_huc_init_fw’:drivers/gpu/drm/i915/intel_huc.c:182:1: error: expected expression before ‘<<’ token
<<<<<<< 5b17a7a8eaa9ff4ff10e5128b9eefc8407b6251f
^drivers/gpu/drm/i915/intel_huc.c:182:9: error: invalid suffix "b17a7a8eaa9ff4ff10e5128b9eefc8407b6251f" on integer constant
<<<<<<< 5b17a7a8eaa9ff4ff10e5128b9eefc8407b6251f
^
drivers/gpu/drm/i915/intel_huc.c:185:6: error: ‘huc_fw’ undeclared (first use in this function)
if (huc_fw->path == NULL)
^drivers/gpu/drm/i915/intel_huc.c:185:6: note: each undeclared identifier is reported only once for each function it appears in drivers/gpu/drm/i915/intel_huc.c:193:1: error: expected expression before ‘==’ token
=======
^drivers/gpu/drm/i915/intel_huc.c:202:1: error: expected expression before ‘>>’ token
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
drm/i915/uc: Introduce
intel_uc_init_fw()
^scripts/Makefile.build:294: recipe for target 'drivers/gpu/drm/i915/intel_huc.o' failed make[4]: *** [drivers/gpu/drm/i915/intel_huc.o] Error 1
make[4]: *** Waiting for unfinished jobs....
LD drivers/usb/core/usbcore.o LD drivers/usb/core/built-in.o LD drivers/scsi/sd_mod.o LD net/xfrm/built-in.o LD drivers/scsi/built-in.o LD drivers/md/md-mod.o LD drivers/md/built-in.o LD [M] sound/pci/hda/snd-hda-codec-generic.o LD sound/pci/built-in.o LD lib/lz4/built-in.o LD sound/built-in.o LD net/packet/built-in.o LD drivers/usb/host/xhci-hcd.o LD fs/btrfs/btrfs.o AR lib/lib.a LD net/ipv6/ipv6.o EXPORTS lib/lib-ksyms.o LD lib/built-in.o LD drivers/usb/host/built-in.o LD drivers/usb/built-in.o LD fs/btrfs/built-in.o LD net/ipv6/built-in.o LD drivers/tty/vt/built-in.o LD drivers/tty/built-in.o CC arch/x86/kernel/cpu/capflags.o LD arch/x86/kernel/cpu/built-in.o LD arch/x86/kernel/built-in.o LD arch/x86/built-in.o LD [M] drivers/net/ethernet/intel/igb/igb.o LD net/ipv4/built-in.o LD fs/ext4/ext4.o LD fs/ext4/built-in.o LD fs/built-in.o LD [M] drivers/net/ethernet/intel/e1000e/e1000e.o LD net/core/built-in.o LD net/built-in.o LD drivers/net/ethernet/built-in.o LD drivers/net/built-in.o
scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm/i915' failed make[3]: *** [drivers/gpu/drm/i915] Error 2 scripts/Makefile.build:553: recipe for target 'drivers/gpu/drm' failed make[2]: *** [drivers/gpu/drm] Error 2 scripts/Makefile.build:553: recipe for target 'drivers/gpu' failed make[1]: *** [drivers/gpu] Error 2
Makefile:990: recipe for target 'drivers' failed
make: *** [drivers] Error 2
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx