All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] Update MTL GuC firmware
@ 2023-05-04 20:22 ` John.C.Harrison
  0 siblings, 0 replies; 12+ messages in thread
From: John.C.Harrison @ 2023-05-04 20:22 UTC (permalink / raw)
  To: Intel-GFX; +Cc: John Harrison, DRI-Devel

From: John Harrison <John.C.Harrison@Intel.com>

Update MTL to the latest GuC release and switch to using reduced
version file names. Also, pull in a patch from an earlier series that
is waiting to merge to prevent merge conflicts later.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>


John Harrison (2):
  drm/i915/uc: Track patch level versions on reduced version firmware
    files
  drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6

 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 32 +++++++++++++++---------
 1 file changed, 20 insertions(+), 12 deletions(-)

-- 
2.39.1


^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH 0/2] Update MTL GuC firmware
@ 2023-05-04 20:22 ` John.C.Harrison
  0 siblings, 0 replies; 12+ messages in thread
From: John.C.Harrison @ 2023-05-04 20:22 UTC (permalink / raw)
  To: Intel-GFX; +Cc: DRI-Devel

From: John Harrison <John.C.Harrison@Intel.com>

Update MTL to the latest GuC release and switch to using reduced
version file names. Also, pull in a patch from an earlier series that
is waiting to merge to prevent merge conflicts later.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>


John Harrison (2):
  drm/i915/uc: Track patch level versions on reduced version firmware
    files
  drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6

 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 32 +++++++++++++++---------
 1 file changed, 20 insertions(+), 12 deletions(-)

-- 
2.39.1


^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH 1/2] drm/i915/uc: Track patch level versions on reduced version firmware files
  2023-05-04 20:22 ` [Intel-gfx] " John.C.Harrison
@ 2023-05-04 20:22   ` John.C.Harrison
  -1 siblings, 0 replies; 12+ messages in thread
From: John.C.Harrison @ 2023-05-04 20:22 UTC (permalink / raw)
  To: Intel-GFX; +Cc: Daniele Ceraolo Spurio, John Harrison, DRI-Devel

From: John Harrison <John.C.Harrison@Intel.com>

When reduced version firmware files were added (matching major
component being the only strict requirement), the minor version was
still tracked and a notification reported if it was older. However,
the patch version should really be tracked as well for the same
reasons. The KMD can work without the change but if the effort has
been taken to release a new firmware with the change then there must
be a valid reason for doing so - important bug fix, security fix, etc.
And in that case it would be good to alert the user if they are
missing out on that new fix.

v2: Use correct patch version number and drop redunant debug print
(review by Daniele / CI results).

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 30 +++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 6b71b9febd74c..55e50bd08d7ff 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -80,14 +80,14 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
 	fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
-	fw_def(DG2,          0, guc_maj(dg2,  70, 5)) \
-	fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5)) \
+	fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
+	fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 69, 0, 3)) \
-	fw_def(ALDERLAKE_S,  0, guc_maj(tgl,  70, 5)) \
+	fw_def(ALDERLAKE_S,  0, guc_maj(tgl,  70, 5, 1)) \
 	fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  70, 1, 1)) \
 	fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  69, 0, 3)) \
-	fw_def(DG1,          0, guc_maj(dg1,  70, 5)) \
+	fw_def(DG1,          0, guc_maj(dg1,  70, 5, 1)) \
 	fw_def(ROCKETLAKE,   0, guc_mmp(tgl,  70, 1, 1)) \
 	fw_def(TIGERLAKE,    0, guc_mmp(tgl,  70, 1, 1)) \
 	fw_def(JASPERLAKE,   0, guc_mmp(ehl,  70, 1, 1)) \
@@ -141,7 +141,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
 	__stringify(patch_) ".bin"
 
 /* Minor for internal driver use, not part of file name */
-#define MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_) \
+#define MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_, patch_) \
 	__MAKE_UC_FW_PATH_MAJOR(prefix_, "guc", major_)
 
 #define MAKE_GUC_FW_PATH_MMP(prefix_, major_, minor_, patch_) \
@@ -197,9 +197,9 @@ struct __packed uc_fw_blob {
 	{ UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
 	  .legacy = true }
 
-#define GUC_FW_BLOB(prefix_, major_, minor_) \
-	UC_FW_BLOB_NEW(major_, minor_, 0, false, \
-		       MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_))
+#define GUC_FW_BLOB(prefix_, major_, minor_, patch_) \
+	UC_FW_BLOB_NEW(major_, minor_, patch_, false, \
+		       MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_, patch_))
 
 #define GUC_FW_BLOB_MMP(prefix_, major_, minor_, patch_) \
 	UC_FW_BLOB_OLD(major_, minor_, patch_, \
@@ -296,6 +296,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
 		uc_fw->file_wanted.path = blob->path;
 		uc_fw->file_wanted.ver.major = blob->major;
 		uc_fw->file_wanted.ver.minor = blob->minor;
+		uc_fw->file_wanted.ver.patch = blob->patch;
 		uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
 		found = true;
 		break;
@@ -794,6 +795,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)
 		} else {
 			if (uc_fw->file_selected.ver.minor < uc_fw->file_wanted.ver.minor)
 				old_ver = true;
+			else if ((uc_fw->file_selected.ver.minor == uc_fw->file_wanted.ver.minor) &&
+				 (uc_fw->file_selected.ver.patch < uc_fw->file_wanted.ver.patch))
+				old_ver = true;
 		}
 	}
 
@@ -801,12 +805,16 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)
 		/* Preserve the version that was really wanted */
 		memcpy(&uc_fw->file_wanted, &file_ideal, sizeof(uc_fw->file_wanted));
 
-		gt_notice(gt, "%s firmware %s (%d.%d) is recommended, but only %s (%d.%d) was found\n",
+		gt_notice(gt, "%s firmware %s (%d.%d.%d) is recommended, but only %s (%d.%d.%d) was found\n",
 			  intel_uc_fw_type_repr(uc_fw->type),
 			  uc_fw->file_wanted.path,
-			  uc_fw->file_wanted.ver.major, uc_fw->file_wanted.ver.minor,
+			  uc_fw->file_wanted.ver.major,
+			  uc_fw->file_wanted.ver.minor,
+			  uc_fw->file_wanted.ver.patch,
 			  uc_fw->file_selected.path,
-			  uc_fw->file_selected.ver.major, uc_fw->file_selected.ver.minor);
+			  uc_fw->file_selected.ver.major,
+			  uc_fw->file_selected.ver.minor,
+			  uc_fw->file_selected.ver.patch);
 		gt_info(gt, "Consider updating your linux-firmware pkg or downloading from %s\n",
 			INTEL_UC_FIRMWARE_URL);
 	}
-- 
2.39.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH 1/2] drm/i915/uc: Track patch level versions on reduced version firmware files
@ 2023-05-04 20:22   ` John.C.Harrison
  0 siblings, 0 replies; 12+ messages in thread
From: John.C.Harrison @ 2023-05-04 20:22 UTC (permalink / raw)
  To: Intel-GFX; +Cc: DRI-Devel

From: John Harrison <John.C.Harrison@Intel.com>

When reduced version firmware files were added (matching major
component being the only strict requirement), the minor version was
still tracked and a notification reported if it was older. However,
the patch version should really be tracked as well for the same
reasons. The KMD can work without the change but if the effort has
been taken to release a new firmware with the change then there must
be a valid reason for doing so - important bug fix, security fix, etc.
And in that case it would be good to alert the user if they are
missing out on that new fix.

v2: Use correct patch version number and drop redunant debug print
(review by Daniele / CI results).

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 30 +++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 6b71b9febd74c..55e50bd08d7ff 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -80,14 +80,14 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
 	fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
-	fw_def(DG2,          0, guc_maj(dg2,  70, 5)) \
-	fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5)) \
+	fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
+	fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 69, 0, 3)) \
-	fw_def(ALDERLAKE_S,  0, guc_maj(tgl,  70, 5)) \
+	fw_def(ALDERLAKE_S,  0, guc_maj(tgl,  70, 5, 1)) \
 	fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  70, 1, 1)) \
 	fw_def(ALDERLAKE_S,  0, guc_mmp(tgl,  69, 0, 3)) \
-	fw_def(DG1,          0, guc_maj(dg1,  70, 5)) \
+	fw_def(DG1,          0, guc_maj(dg1,  70, 5, 1)) \
 	fw_def(ROCKETLAKE,   0, guc_mmp(tgl,  70, 1, 1)) \
 	fw_def(TIGERLAKE,    0, guc_mmp(tgl,  70, 1, 1)) \
 	fw_def(JASPERLAKE,   0, guc_mmp(ehl,  70, 1, 1)) \
@@ -141,7 +141,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
 	__stringify(patch_) ".bin"
 
 /* Minor for internal driver use, not part of file name */
-#define MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_) \
+#define MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_, patch_) \
 	__MAKE_UC_FW_PATH_MAJOR(prefix_, "guc", major_)
 
 #define MAKE_GUC_FW_PATH_MMP(prefix_, major_, minor_, patch_) \
@@ -197,9 +197,9 @@ struct __packed uc_fw_blob {
 	{ UC_FW_BLOB_BASE(major_, minor_, patch_, path_) \
 	  .legacy = true }
 
-#define GUC_FW_BLOB(prefix_, major_, minor_) \
-	UC_FW_BLOB_NEW(major_, minor_, 0, false, \
-		       MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_))
+#define GUC_FW_BLOB(prefix_, major_, minor_, patch_) \
+	UC_FW_BLOB_NEW(major_, minor_, patch_, false, \
+		       MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_, patch_))
 
 #define GUC_FW_BLOB_MMP(prefix_, major_, minor_, patch_) \
 	UC_FW_BLOB_OLD(major_, minor_, patch_, \
@@ -296,6 +296,7 @@ __uc_fw_auto_select(struct drm_i915_private *i915, struct intel_uc_fw *uc_fw)
 		uc_fw->file_wanted.path = blob->path;
 		uc_fw->file_wanted.ver.major = blob->major;
 		uc_fw->file_wanted.ver.minor = blob->minor;
+		uc_fw->file_wanted.ver.patch = blob->patch;
 		uc_fw->loaded_via_gsc = blob->loaded_via_gsc;
 		found = true;
 		break;
@@ -794,6 +795,9 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)
 		} else {
 			if (uc_fw->file_selected.ver.minor < uc_fw->file_wanted.ver.minor)
 				old_ver = true;
+			else if ((uc_fw->file_selected.ver.minor == uc_fw->file_wanted.ver.minor) &&
+				 (uc_fw->file_selected.ver.patch < uc_fw->file_wanted.ver.patch))
+				old_ver = true;
 		}
 	}
 
@@ -801,12 +805,16 @@ int intel_uc_fw_fetch(struct intel_uc_fw *uc_fw)
 		/* Preserve the version that was really wanted */
 		memcpy(&uc_fw->file_wanted, &file_ideal, sizeof(uc_fw->file_wanted));
 
-		gt_notice(gt, "%s firmware %s (%d.%d) is recommended, but only %s (%d.%d) was found\n",
+		gt_notice(gt, "%s firmware %s (%d.%d.%d) is recommended, but only %s (%d.%d.%d) was found\n",
 			  intel_uc_fw_type_repr(uc_fw->type),
 			  uc_fw->file_wanted.path,
-			  uc_fw->file_wanted.ver.major, uc_fw->file_wanted.ver.minor,
+			  uc_fw->file_wanted.ver.major,
+			  uc_fw->file_wanted.ver.minor,
+			  uc_fw->file_wanted.ver.patch,
 			  uc_fw->file_selected.path,
-			  uc_fw->file_selected.ver.major, uc_fw->file_selected.ver.minor);
+			  uc_fw->file_selected.ver.major,
+			  uc_fw->file_selected.ver.minor,
+			  uc_fw->file_selected.ver.patch);
 		gt_info(gt, "Consider updating your linux-firmware pkg or downloading from %s\n",
 			INTEL_UC_FIRMWARE_URL);
 	}
-- 
2.39.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 2/2] drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6
  2023-05-04 20:22 ` [Intel-gfx] " John.C.Harrison
@ 2023-05-04 20:22   ` John.C.Harrison
  -1 siblings, 0 replies; 12+ messages in thread
From: John.C.Harrison @ 2023-05-04 20:22 UTC (permalink / raw)
  To: Intel-GFX; +Cc: John Harrison, DRI-Devel

From: John Harrison <John.C.Harrison@Intel.com>

Also switch to using reduced version file naming as it is no longer
such a work-in-progress and likely to change.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 55e50bd08d7ff..10e48cbcf494a 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -79,7 +79,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * security fixes, etc. to be enabled.
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
-	fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
+	fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 6, 6)) \
 	fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
-- 
2.39.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6
@ 2023-05-04 20:22   ` John.C.Harrison
  0 siblings, 0 replies; 12+ messages in thread
From: John.C.Harrison @ 2023-05-04 20:22 UTC (permalink / raw)
  To: Intel-GFX; +Cc: DRI-Devel

From: John Harrison <John.C.Harrison@Intel.com>

Also switch to using reduced version file naming as it is no longer
such a work-in-progress and likely to change.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 55e50bd08d7ff..10e48cbcf494a 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -79,7 +79,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * security fixes, etc. to be enabled.
  */
 #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
-	fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
+	fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 6, 6)) \
 	fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
 	fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
-- 
2.39.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6
  2023-05-04 20:22   ` [Intel-gfx] " John.C.Harrison
  (?)
@ 2023-05-04 20:29   ` Lucas De Marchi
  2023-05-04 20:45     ` John Harrison
  -1 siblings, 1 reply; 12+ messages in thread
From: Lucas De Marchi @ 2023-05-04 20:29 UTC (permalink / raw)
  To: John.C.Harrison; +Cc: Intel-GFX, DRI-Devel

On Thu, May 04, 2023 at 01:22:52PM -0700, John.C.Harrison@Intel.com wrote:
>From: John Harrison <John.C.Harrison@Intel.com>
>
>Also switch to using reduced version file naming as it is no longer
>such a work-in-progress and likely to change.
>
>Signed-off-by: John Harrison <John.C.Harrison@Intel.com>


commit message here will be bogus as it will be the first time MTL will
actually have the define.

Better to do it like this:

	git revert 5c71b8b8ac87
	then this patch, with a better commit message

or I can change the commit message of this commit while applying to:

	drm/i915/mtl: Define GuC firmware version for MTL

	First release of GuC for Meteorlake.

	Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
	Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>

Lucas De Marchi

>---
> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>index 55e50bd08d7ff..10e48cbcf494a 100644
>--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>@@ -79,7 +79,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
>  * security fixes, etc. to be enabled.
>  */
> #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
>-	fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
>+	fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 6, 6)) \
> 	fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
> 	fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
> 	fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
>-- 
>2.39.1
>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6
  2023-05-04 20:29   ` Lucas De Marchi
@ 2023-05-04 20:45     ` John Harrison
  2023-05-05 18:10         ` Lucas De Marchi
  0 siblings, 1 reply; 12+ messages in thread
From: John Harrison @ 2023-05-04 20:45 UTC (permalink / raw)
  To: Lucas De Marchi; +Cc: Intel-GFX, DRI-Devel

On 5/4/2023 13:29, Lucas De Marchi wrote:
> On Thu, May 04, 2023 at 01:22:52PM -0700, John.C.Harrison@Intel.com 
> wrote:
>> From: John Harrison <John.C.Harrison@Intel.com>
>>
>> Also switch to using reduced version file naming as it is no longer
>> such a work-in-progress and likely to change.
>>
>> Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>
>
> commit message here will be bogus as it will be the first time MTL will
> actually have the define.
Oh. Because the current line is coming from the for-CI branch and is not 
actually upstream already. Yeah, forgot that!

>
> Better to do it like this:
>
>     git revert 5c71b8b8ac87
>     then this patch, with a better commit message
>
> or I can change the commit message of this commit while applying to:
>
>     drm/i915/mtl: Define GuC firmware version for MTL
>
>     First release of GuC for Meteorlake.
>
>     Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>     Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>
> Lucas De Marchi
That works for me :).

>
>> ---
>> drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> index 55e50bd08d7ff..10e48cbcf494a 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> @@ -79,7 +79,7 @@ void intel_uc_fw_change_status(struct intel_uc_fw 
>> *uc_fw,
>>  * security fixes, etc. to be enabled.
>>  */
>> #define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
>> -    fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
>> +    fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 6, 6)) \
>>     fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
>>     fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
>>     fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
>> -- 
>> 2.39.1
>>


^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Update MTL GuC firmware
  2023-05-04 20:22 ` [Intel-gfx] " John.C.Harrison
                   ` (2 preceding siblings ...)
  (?)
@ 2023-05-04 23:03 ` Patchwork
  -1 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2023-05-04 23:03 UTC (permalink / raw)
  To: John Harrison; +Cc: intel-gfx

== Series Details ==

Series: Update MTL GuC firmware
URL   : https://patchwork.freedesktop.org/series/117346/
State : warning

== Summary ==

Error: dim checkpatch failed
ef083bce246a drm/i915/uc: Track patch level versions on reduced version firmware files
-:62: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'major_' - possible side-effects?
#62: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:200:
+#define GUC_FW_BLOB(prefix_, major_, minor_, patch_) \
+	UC_FW_BLOB_NEW(major_, minor_, patch_, false, \
+		       MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_, patch_))

-:62: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'minor_' - possible side-effects?
#62: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:200:
+#define GUC_FW_BLOB(prefix_, major_, minor_, patch_) \
+	UC_FW_BLOB_NEW(major_, minor_, patch_, false, \
+		       MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_, patch_))

-:62: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'patch_' - possible side-effects?
#62: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c:200:
+#define GUC_FW_BLOB(prefix_, major_, minor_, patch_) \
+	UC_FW_BLOB_NEW(major_, minor_, patch_, false, \
+		       MAKE_GUC_FW_PATH_MAJOR(prefix_, major_, minor_, patch_))

total: 0 errors, 0 warnings, 3 checks, 73 lines checked
cd35ce61f9f5 drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6



^ permalink raw reply	[flat|nested] 12+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for Update MTL GuC firmware
  2023-05-04 20:22 ` [Intel-gfx] " John.C.Harrison
                   ` (3 preceding siblings ...)
  (?)
@ 2023-05-04 23:19 ` Patchwork
  -1 siblings, 0 replies; 12+ messages in thread
From: Patchwork @ 2023-05-04 23:19 UTC (permalink / raw)
  To: John Harrison; +Cc: intel-gfx

[-- Attachment #1: Type: text/plain, Size: 6969 bytes --]

== Series Details ==

Series: Update MTL GuC firmware
URL   : https://patchwork.freedesktop.org/series/117346/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_13109 -> Patchwork_117346v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_117346v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_117346v1, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/index.html

Participating hosts (41 -> 39)
------------------------------

  Missing    (2): fi-kbl-soraka fi-snb-2520m 

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in Patchwork_117346v1:

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live@gt_mocs:
    - bat-adlm-1:         [PASS][1] -> [INCOMPLETE][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-adlm-1/igt@i915_selftest@live@gt_mocs.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-adlm-1/igt@i915_selftest@live@gt_mocs.html

  
Known issues
------------

  Here are the changes found in Patchwork_117346v1 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_exec_suspend@basic-s3@smem:
    - bat-rpls-1:         NOTRUN -> [ABORT][3] ([i915#6687] / [i915#7978] / [i915#8407])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-rpls-1/igt@gem_exec_suspend@basic-s3@smem.html

  * igt@i915_selftest@live@hangcheck:
    - bat-adlp-6:         [PASS][4] -> [ABORT][5] ([i915#7677] / [i915#7913])
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-adlp-6/igt@i915_selftest@live@hangcheck.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-adlp-6/igt@i915_selftest@live@hangcheck.html

  * igt@i915_selftest@live@slpc:
    - bat-rpls-1:         NOTRUN -> [DMESG-WARN][6] ([i915#6367])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-rpls-1/igt@i915_selftest@live@slpc.html

  * igt@kms_chamelium_hpd@common-hpd-after-suspend:
    - bat-dg1-7:          NOTRUN -> [SKIP][7] ([i915#7828])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-dg1-7/igt@kms_chamelium_hpd@common-hpd-after-suspend.html

  * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1:
    - bat-dg2-8:          [PASS][8] -> [FAIL][9] ([i915#7932])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence@pipe-d-dp-1.html

  * igt@kms_pipe_crc_basic@suspend-read-crc:
    - bat-dg1-7:          NOTRUN -> [SKIP][10] ([i915#1845] / [i915#4078])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-dg1-7/igt@kms_pipe_crc_basic@suspend-read-crc.html

  * igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-hdmi-a-3:
    - bat-dg2-11:         [PASS][11] -> [INCOMPLETE][12] ([i915#7908])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-dg2-11/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-hdmi-a-3.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-dg2-11/igt@kms_pipe_crc_basic@suspend-read-crc@pipe-b-hdmi-a-3.html

  
#### Possible fixes ####

  * igt@i915_selftest@live@requests:
    - bat-rpls-1:         [ABORT][13] ([i915#4983] / [i915#7911] / [i915#7920]) -> [PASS][14]
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-rpls-1/igt@i915_selftest@live@requests.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-rpls-1/igt@i915_selftest@live@requests.html
    - {bat-mtlp-6}:       [ABORT][15] ([i915#4983] / [i915#7920]) -> [PASS][16]
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-mtlp-6/igt@i915_selftest@live@requests.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-mtlp-6/igt@i915_selftest@live@requests.html

  * igt@i915_selftest@live@workarounds:
    - bat-dg1-7:          [ABORT][17] ([i915#4983]) -> [PASS][18]
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-dg1-7/igt@i915_selftest@live@workarounds.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-dg1-7/igt@i915_selftest@live@workarounds.html

  * igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1:
    - bat-dg2-8:          [FAIL][19] ([i915#7932]) -> [PASS][20]
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13109/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/bat-dg2-8/igt@kms_pipe_crc_basic@nonblocking-crc@pipe-d-dp-1.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
  [i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
  [i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
  [i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
  [i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
  [i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
  [i915#7677]: https://gitlab.freedesktop.org/drm/intel/issues/7677
  [i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
  [i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
  [i915#7908]: https://gitlab.freedesktop.org/drm/intel/issues/7908
  [i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
  [i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
  [i915#7920]: https://gitlab.freedesktop.org/drm/intel/issues/7920
  [i915#7932]: https://gitlab.freedesktop.org/drm/intel/issues/7932
  [i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
  [i915#8407]: https://gitlab.freedesktop.org/drm/intel/issues/8407


Build changes
-------------

  * Linux: CI_DRM_13109 -> Patchwork_117346v1

  CI-20190529: 20190529
  CI_DRM_13109: 1c3b807eabfd457e98ccbec6c22cc39b45befed5 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_7277: 1cb3507f3ff28d11bd5cfabcde576fe78ddab571 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_117346v1: 1c3b807eabfd457e98ccbec6c22cc39b45befed5 @ git://anongit.freedesktop.org/gfx-ci/linux


### Linux commits

03eabbae1acb drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6
5b829628dba9 drm/i915/uc: Track patch level versions on reduced version firmware files

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_117346v1/index.html

[-- Attachment #2: Type: text/html, Size: 8009 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6
  2023-05-04 20:45     ` John Harrison
@ 2023-05-05 18:10         ` Lucas De Marchi
  0 siblings, 0 replies; 12+ messages in thread
From: Lucas De Marchi @ 2023-05-05 18:10 UTC (permalink / raw)
  To: John Harrison; +Cc: Tvrtko Ursulin, Intel-GFX, DRI-Devel, Rodrigo Vivi

On Thu, May 04, 2023 at 01:45:24PM -0700, John Harrison wrote:
>On 5/4/2023 13:29, Lucas De Marchi wrote:
>>On Thu, May 04, 2023 at 01:22:52PM -0700, John.C.Harrison@Intel.com 
>>wrote:
>>>From: John Harrison <John.C.Harrison@Intel.com>
>>>
>>>Also switch to using reduced version file naming as it is no longer
>>>such a work-in-progress and likely to change.
>>>
>>>Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>>
>>
>>commit message here will be bogus as it will be the first time MTL will
>>actually have the define.
>Oh. Because the current line is coming from the for-CI branch and is 
>not actually upstream already. Yeah, forgot that!
>
>>
>>Better to do it like this:
>>
>>    git revert 5c71b8b8ac87
>>    then this patch, with a better commit message
>>
>>or I can change the commit message of this commit while applying to:
>>
>>    drm/i915/mtl: Define GuC firmware version for MTL
>>
>>    First release of GuC for Meteorlake.
>>
>>    Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>>    Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>
>>Lucas De Marchi
>That works for me :).

applied both commits to drm-intel-gt-next branch and removed the other
one from topic/core-for-CI.

Closing https://gitlab.freedesktop.org/drm/intel/-/issues/8343

Thanks
Lucas De Marchi

>
>>
>>>---
>>>drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
>>>1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>>diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 
>>>b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>index 55e50bd08d7ff..10e48cbcf494a 100644
>>>--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>@@ -79,7 +79,7 @@ void intel_uc_fw_change_status(struct 
>>>intel_uc_fw *uc_fw,
>>> * security fixes, etc. to be enabled.
>>> */
>>>#define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
>>>-    fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
>>>+    fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 6, 6)) \
>>>    fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
>>>    fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
>>>    fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
>>>-- 
>>>2.39.1
>>>
>

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6
@ 2023-05-05 18:10         ` Lucas De Marchi
  0 siblings, 0 replies; 12+ messages in thread
From: Lucas De Marchi @ 2023-05-05 18:10 UTC (permalink / raw)
  To: John Harrison; +Cc: Intel-GFX, DRI-Devel, Rodrigo Vivi

On Thu, May 04, 2023 at 01:45:24PM -0700, John Harrison wrote:
>On 5/4/2023 13:29, Lucas De Marchi wrote:
>>On Thu, May 04, 2023 at 01:22:52PM -0700, John.C.Harrison@Intel.com 
>>wrote:
>>>From: John Harrison <John.C.Harrison@Intel.com>
>>>
>>>Also switch to using reduced version file naming as it is no longer
>>>such a work-in-progress and likely to change.
>>>
>>>Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>>
>>
>>commit message here will be bogus as it will be the first time MTL will
>>actually have the define.
>Oh. Because the current line is coming from the for-CI branch and is 
>not actually upstream already. Yeah, forgot that!
>
>>
>>Better to do it like this:
>>
>>    git revert 5c71b8b8ac87
>>    then this patch, with a better commit message
>>
>>or I can change the commit message of this commit while applying to:
>>
>>    drm/i915/mtl: Define GuC firmware version for MTL
>>
>>    First release of GuC for Meteorlake.
>>
>>    Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
>>    Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
>>
>>Lucas De Marchi
>That works for me :).

applied both commits to drm-intel-gt-next branch and removed the other
one from topic/core-for-CI.

Closing https://gitlab.freedesktop.org/drm/intel/-/issues/8343

Thanks
Lucas De Marchi

>
>>
>>>---
>>>drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +-
>>>1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>>diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 
>>>b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>index 55e50bd08d7ff..10e48cbcf494a 100644
>>>--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>>@@ -79,7 +79,7 @@ void intel_uc_fw_change_status(struct 
>>>intel_uc_fw *uc_fw,
>>> * security fixes, etc. to be enabled.
>>> */
>>>#define INTEL_GUC_FIRMWARE_DEFS(fw_def, guc_maj, guc_mmp) \
>>>-    fw_def(METEORLAKE,   0, guc_mmp(mtl,  70, 6, 5)) \
>>>+    fw_def(METEORLAKE,   0, guc_maj(mtl,  70, 6, 6)) \
>>>    fw_def(DG2,          0, guc_maj(dg2,  70, 5, 1)) \
>>>    fw_def(ALDERLAKE_P,  0, guc_maj(adlp, 70, 5, 1)) \
>>>    fw_def(ALDERLAKE_P,  0, guc_mmp(adlp, 70, 1, 1)) \
>>>-- 
>>>2.39.1
>>>
>

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-05-05 18:10 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-04 20:22 [PATCH 0/2] Update MTL GuC firmware John.C.Harrison
2023-05-04 20:22 ` [Intel-gfx] " John.C.Harrison
2023-05-04 20:22 ` [PATCH 1/2] drm/i915/uc: Track patch level versions on reduced version firmware files John.C.Harrison
2023-05-04 20:22   ` [Intel-gfx] " John.C.Harrison
2023-05-04 20:22 ` [PATCH 2/2] drm/i915/mtl: Update GuC firmware version for MTL to 70.6.6 John.C.Harrison
2023-05-04 20:22   ` [Intel-gfx] " John.C.Harrison
2023-05-04 20:29   ` Lucas De Marchi
2023-05-04 20:45     ` John Harrison
2023-05-05 18:10       ` Lucas De Marchi
2023-05-05 18:10         ` Lucas De Marchi
2023-05-04 23:03 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Update MTL GuC firmware Patchwork
2023-05-04 23:19 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.