Reclassify messages from GuC loader/submission
Subsystems (3)
v4 cover Reclassify messages from GuC loader/submission
Various downgrading, upgrading, or general reorganisation of the messages emitted by the GuC code. As general principles:
* "can't happen" cases (inconsistencies/misconfiguration) are ERRORs
* recoverable (ignored) errors are downgraded to WARNINGs
* important auxiliary messages about failure or mode change are NOTICEs
* anything else (messages for developer rather than sysadmin) is DEBUG
v4:
Resend with added cover letter
Dave Gordon (4):
drm: extra printk() wrapper macros
drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN() drm/i915/guc: revisit GuC loader message levels drm/i915/guc: next version of GuC firmware is 8.11
drivers/gpu/drm/i915/i915_guc_submission.c | 18 ++++++-------- drivers/gpu/drm/i915/i915_params.c | 4 ++-- drivers/gpu/drm/i915/intel_guc_loader.c | 38 +++++++++++++++--------------- include/drm/drmP.h | 26 +++++++++++++++----- 4 files changed, 48 insertions(+), 38 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/4 drm: extra printk() wrapper macros
We had only DRM_INFO() and DRM_ERROR(), whereas the underlying printk() provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing both regular and once-only macros for each of the levels INFO, NOTICE, and WARNING, using a common underlying macro that does all the token-pasting.
DRM_ERROR is unchanged, as it's not just a printk wrapper.
v2:
Fix whitespace, missing ## (Eric Engestrom)
--- include/drm/drmP.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
include/drm/drmP.h +20 -6
@@ -163,6 +163,26 @@ void drm_err(const char *format, ...);/** \name Macros to make printk easier */ /*@{*/ +#define _DRM_PRINTK (once, level, fmt, ...) \ + do { \ + printk##once(KERN_##level "[" DRM_NAME "] " fmt, \ + ##__VA_ARGS__); \ + } while (0) + +#define DRM_INFO (fmt, ...) \ + _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE (fmt, ...) \ + _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN (fmt, ...) \ + _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__) + +#define DRM_INFO_ONCE (fmt, ...) \ + _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE_ONCE (fmt, ...) \ + _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN_ONCE (fmt, ...) \ + _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__) +/** * Error output. *
@@ -188,12 +208,6 @@ void drm_err(const char *format, ...); drm_err(fmt, ##__VA_ARGS__); \ }) -#define DRM_INFO (fmt, ...) \ - printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) - -#define DRM_INFO_ONCE (fmt, ...) \ - printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) -/** * Debug output. *
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 1/4] drm: extra printk() wrapper macros
Hi Dave, Daniel,
We had this i915 series with a single DRM core patch (reviewed) ready for a while - just waiting for an ack to merge it via i915 trees.
Can we proceed with merging it?
Regards,
Tvrtko
Quoted 53 lines · Dave Gordon
We had only
DRM_INFO()andDRM_ERROR(), whereas the underlyingprintk()provides several other useful intermediate levels such as NOTICE and WARNING. So this patch fills out the set by providing both regular and once-only macros for each of the levels INFO, NOTICE, and WARNING, using a common underlying macro that does all the token-pasting.
DRM_ERRORis unchanged, as it's not just a printk wrapper.v2:
Fix whitespace, missing ## (Eric Engestrom)Signed-off-by Dave Gordon <[email protected]>Reviewed-by Eric Engestrom <[email protected]>--- include/drm/drmP.h | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)include/drm/drmP.h +20
-0@@ -163,6 +163,26 @@ void drm_err(const char *format, ...);/** \name Macros to make printk easier */ /*@{*/ +#define _DRM_PRINTK (once, level, fmt, ...) \ + do { \ + printk##once(KERN_##level "[" DRM_NAME "] " fmt, \ + ##__VA_ARGS__); \ + } while (0) + +#define DRM_INFO (fmt, ...) \ + _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE (fmt, ...) \ + _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN (fmt, ...) \ + _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__) + +#define DRM_INFO_ONCE (fmt, ...) \ + _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__) +#define DRM_NOTE_ONCE (fmt, ...) \ + _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__) +#define DRM_WARN_ONCE (fmt, ...) \ + _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__) +/** * Error output. * @@ -188,12 +208,6 @@ void drm_err(const char *format, ...); drm_err(fmt, ##__VA_ARGS__); \ })
include/drm/drmP.h void drm_err(const char *format, ...); · line 213
Quoted 10 lines
include/drm/drmP.h +0
-6-#define DRM_INFO (fmt, ...) \ - printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) - -#define DRM_INFO_ONCE (fmt, ...) \ - printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__) -/** * Debug output. *
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 1/4] drm: extra printk() wrapper macros
Quoted 2 lines
Can we proceed with merging it?
I'm pretty sure I acked this on irc a week or so agao,
Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/4 drm/i915/guc: downgrade some DRM_ERROR() messages to DRM_WARN()
In reply to Dave GordonWhere we're going to continue regardless of the problem, rather than fail, then the message should be a WARNing rather than an ERROR.
--- drivers/gpu/drm/i915/i915_guc_submission.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +7 -11
@@ -114,10 +114,8 @@ static int host2guc_action(struct intel_guc *guc, u32 *data, u32 len)if (ret != -ETIMEDOUT ) ret = -EIO ; -DRM_ERROR ("GUC: host2guc action 0x%X failed. ret=%d " -"status=0x%08X response=0x%08X\n" , - data[0 ], ret, status, -I915_READ (SOFT_SCRATCH (15 ))); +DRM_WARN ("Action 0x%X failed; ret=%d status=0x%08X response=0x%08X\n" , + data[0 ], ret, status,I915_READ (SOFT_SCRATCH (15 ))); dev_priv->guc.action_fail +=1 ; dev_priv->guc.action_err = ret;
@@ -551,8 +549,8 @@ static int guc_ring_doorbell(struct i915_guc_client *gc)if (db_ret.db_status ==GUC_DOORBELL_DISABLED )break ; -DRM_ERROR ("Cookie mismatch. Expected %d, returned %d\n" , - db_cmp.cookie, db_ret.cookie); +DRM_WARN ("Cookie mismatch. Expected %d, found %d\n" , + db_cmp.cookie, db_ret.cookie);/* update the cookie to newly read cookie from GuC */ db_cmp.cookie = db_ret.cookie;
@@ -733,8 +731,8 @@ static void guc_init_doorbell_hw(struct intel_guc *guc)/* Restore to original value */ err =guc_update_doorbell_id (guc, client, db_id);if (err) -DRM_ERROR ("Failed to restore doorbell to %d, err %d\n" , - db_id, err); +DRM_WARN ("Failed to restore doorbell to %d, err %d\n" , + db_id, err);/* Read back & verify all doorbell registers */ for (i =0 ; i <GUC_MAX_DOORBELLS ; ++i)
@@ -823,8 +821,6 @@ static void guc_init_doorbell_hw(struct intel_guc *guc)return client; err: -DRM_ERROR ("FAILED to create priority %u GuC client!\n" , priority); -guc_client_free (dev_priv, client);return NULL ; }
@@ -1004,7 +1000,7 @@ int i915_guc_submission_enable(struct drm_i915_private *dev_priv)GUC_CTX_PRIORITY_KMD_NORMAL , dev_priv->kernel_context);if (!client) { -DRM_ERROR ("Failed to create execbuf guc_client\n" ); +DRM_ERROR ("Failed to create normal GuC client!\n" );return -ENOMEM ; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 3/4 drm/i915/guc: revisit GuC loader message levels
In reply to Dave GordonSome downgraded from DRM_ERROR() to DRM_WARN() or DRM_NOTE(), a few upgraded from DRM_INFO() to DRM_NOTE() or DRM_WARN(), and one eliminated completely.
v2: different permutation of levels :)
v3: convert a couple of "this shouldn't happen" messages to WARN()
--- drivers/gpu/drm/i915/intel_guc_loader.c | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +17 -17
@@ -152,12 +152,14 @@ static u32 get_gttype(struct drm_i915_private *dev_priv)static u32 get_core_family (struct drm_i915_private *dev_priv) { -switch (INTEL_INFO (dev_priv)->gen) { +u32 gen =INTEL_GEN (dev_priv); + +switch (gen) {case 9 :return GFXCORE_FAMILY_GEN9 ;default : -DRM_ERROR ("GUC: unsupported core family\n" ); +WARN (1 ,"GEN%d does not support GuC operation!\n" , gen);return GFXCORE_FAMILY_UNKNOWN ; } }
@@ -447,7 +449,7 @@ int intel_guc_setup(struct drm_device *dev) goto fail; }else if (*fw_path =='\0' ) {/* Device has a GuC but we don't know what f/w to load? */ -DRM_INFO ("No GuC firmware known for this platform\n" ); +WARN (1 ,"No GuC firmware known for this platform!\n" ); err = -ENODEV ; goto fail; }
@@ -485,10 +487,8 @@ int intel_guc_setup(struct drm_device *dev)* that the state and timing are fairly predictable */ err =i915_reset_guc (dev_priv); -if (err) { -DRM_ERROR ("GuC reset failed: %d\n" , err); +if (err) goto fail; - } err =guc_ucode_xfer (dev_priv);if (!err)
@@ -546,15 +546,15 @@ int intel_guc_setup(struct drm_device *dev)else if (err ==0 )DRM_INFO ("GuC firmware load skipped\n" );else if (ret != -EIO ) -DRM_INFO ("GuC firmware load failed: %d\n" , err); +DRM_NOTE ("GuC firmware load failed: %d\n" , err);else -DRM_ERROR ("GuC firmware load failed: %d\n" , err); +DRM_WARN ("GuC firmware load failed: %d\n" , err);if (i915.enable_guc_submission) {if (fw_path ==NULL )DRM_INFO ("GuC submission without firmware not supported\n" );if (ret ==0 ) -DRM_INFO ("Falling back from GuC submission to execlist mode\n" ); +DRM_NOTE ("Falling back from GuC submission to execlist mode\n" );else DRM_ERROR ("GuC init failed: %d\n" , ret); }
@@ -585,7 +585,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/* Check the size of the blob before examining buffer contents */ if (fw->size <sizeof (struct guc_css_header )) { -DRM_ERROR ("Firmware header is missing\n" ); +DRM_NOTE ("Firmware header is missing\n" ); goto fail; }
@@ -597,7 +597,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw) css->key_size_dw - css->exponent_size_dw) * sizeof(u32);if (guc_fw->header_size !=sizeof (struct guc_css_header )) { -DRM_ERROR ("CSS header definition mismatch\n" ); +DRM_NOTE ("CSS header definition mismatch\n" ); goto fail; }
@@ -607,7 +607,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/* now RSA */ if (css->key_size_dw !=UOS_RSA_SCRATCH_MAX_COUNT ) { -DRM_ERROR ("RSA key size is bad\n" ); +DRM_NOTE ("RSA key size is bad\n" ); goto fail; } guc_fw->rsa_offset = guc_fw->ucode_offset + guc_fw->ucode_size;
@@ -616,14 +616,14 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)/* At least, it should have header, uCode and RSA. Size of all three. */ size = guc_fw->header_size + guc_fw->ucode_size + guc_fw->rsa_size;if (fw->size < size) { -DRM_ERROR ("Missing firmware components\n" ); +DRM_NOTE ("Missing firmware components\n" ); goto fail; }/* Header and uCode will be loaded to WOPCM. Size of the two. */ size = guc_fw->header_size + guc_fw->ucode_size;if (size >guc_wopcm_size (to_i915 (dev))) { -DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); +DRM_NOTE ("Firmware is too large to fit in WOPCM\n" ); goto fail; }
@@ -638,7 +638,7 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)if (guc_fw->guc_fw_major_found != guc_fw->guc_fw_major_wanted || guc_fw->guc_fw_minor_found < guc_fw->guc_fw_minor_wanted) { -DRM_ERROR ("GuC firmware version %d.%d, required %d.%d\n" , +DRM_NOTE ("GuC firmware version %d.%d, required %d.%d\n" , guc_fw->guc_fw_major_found, guc_fw->guc_fw_minor_found, guc_fw->guc_fw_major_wanted, guc_fw->guc_fw_minor_wanted); err = -ENOEXEC ;
@@ -668,10 +668,10 @@ static void guc_fw_fetch(struct drm_device *dev, struct intel_guc_fw *guc_fw)return ; fail: +DRM_WARN ("Failed to fetch valid GuC firmware from %s (error %d)\n" , + guc_fw->guc_fw_path, err);DRM_DEBUG_DRIVER ("GuC fw fetch status FAIL; err %d, fw %p, obj %p\n" , err, fw, guc_fw->guc_fw_obj); -DRM_ERROR ("Failed to fetch GuC firmware from %s (error %d)\n" , - guc_fw->guc_fw_path, err);mutex_lock (&dev->struct_mutex); obj = guc_fw->guc_fw_obj;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/4 NOMERGE: next version of GuC firmware is 8.11
In reply to Dave GordonUpdate GuC firmware version to 8.11, and re-enable GuC loading and submission by default on suitable platforms, since it's Intel's Plan of Record that GuC submission shall be used where available.
--- drivers/gpu/drm/i915/i915_params.c | 4 ++-- drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -2
@@ -55,8 +55,8 @@ struct i915_params i915 __read_mostly = { .verbose_state_checks = 1, .nuclear_pageflip = 0, .edp_vswing = 0, - .enable_guc_loading = 0, - .enable_guc_submission = 0, + .enable_guc_loading = -1, + .enable_guc_submission = -1, .guc_log_level = -1, .enable_dp_mst = true, .inject_load_failure = 0,
drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
@@ -59,8 +59,8 @@* */ -#define SKL_FW_MAJOR 6 -#define SKL_FW_MINOR 1 +#define SKL_FW_MAJOR 8 +#define SKL_FW_MINOR 11#define BXT_FW_MAJOR 8#define BXT_FW_MINOR 7
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for Reclassify messages from GuC loader/submission (rev4)
In reply to Dave Gordon== Series Details ==
== Series Details ==
Series: Reclassify messages from GuC loader/submission (rev4)
URL : https://patchwork.freedesktop.org/series/10918/
State : failure
== Summary ==
Applying: drm: extra printk() wrapper macros
Using index info to reconstruct a base tree...
M include/drm/drmP.h
Falling back to patching base and 3-way merge... Auto-merging include/drm/drmP.h
CONFLICT (content): Merge conflict in include/drm/drmP.h
error: Failed to merge in the changes.
Patch failed at 0001 drm: extra printk() wrapper macros
The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx