[PATCH 0/6] HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK]

[PATCH 0/6] HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK]

[Anusha]

Adding PR -
The following changes since commit 1baa34868b2c0a004dc595b20678145e3fff83e7:

Merge branch 'nxp_mc' of https://github.com/NXP/linux-firmware (2018-10-26 08:13:19 -0400)

are available in the Git repository at:

git://anongit.freedesktop.org/drm/drm-firmware firmware_updates

for you to fetch changes up to 908244c9c196116069fc6ba43573192ad08ea3af:

  firmware/guc/GLK: Add GuC Support for GLK (2018-11-28 10:40:38 -0800)

Anusha Srivatsa (5):
  firmware/huc/BXT: Update the HuC version
  firmware/huc/SKL: Update HuC versiom for SKL
  firmware/huc/KBL: Update HuC for KBL
  firmware/huc/GLK: Load HuC for GLK
  HAX enable HuC for CI

John Spotswood (1):
  firmware/guc/glk: Load GuC v11.98 for Geminilake.

 drivers/gpu/drm/i915/i915_params.h  |  2 +-
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 drivers/gpu/drm/i915/intel_huc_fw.c | 26 +++++++++++++++++++-------
 3 files changed, 30 insertions(+), 8 deletions(-)

-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 1/6] firmware/huc/BXT: Update the HuC version

[Anusha]

From: Anusha Srivatsa <anusha.srivatsa@intel.com>

We have an update for HuC for BXT.
Load the latest version.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
index f93d2384d482..9612227b3c44 100644
--- a/drivers/gpu/drm/i915/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/intel_huc_fw.c
@@ -23,8 +23,8 @@
  */
 
 #define BXT_HUC_FW_MAJOR 01
-#define BXT_HUC_FW_MINOR 07
-#define BXT_BLD_NUM 1398
+#define BXT_HUC_FW_MINOR 8
+#define BXT_BLD_NUM 2893
 
 #define SKL_HUC_FW_MAJOR 01
 #define SKL_HUC_FW_MINOR 07
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 2/6] firmware/huc/SKL: Update HuC versiom for SKL

[Anusha]

From: Anusha Srivatsa <anusha.srivatsa@intel.com>

We have an update of huC for SKL.
Load the latest verion.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
index 9612227b3c44..4c4f21731d36 100644
--- a/drivers/gpu/drm/i915/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/intel_huc_fw.c
@@ -27,8 +27,8 @@
 #define BXT_BLD_NUM 2893
 
 #define SKL_HUC_FW_MAJOR 01
-#define SKL_HUC_FW_MINOR 07
-#define SKL_BLD_NUM 1398
+#define SKL_HUC_FW_MINOR 8
+#define SKL_BLD_NUM 2893
 
 #define KBL_HUC_FW_MAJOR 02
 #define KBL_HUC_FW_MINOR 00
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 3/6] firmware/huc/KBL: Update HuC for KBL

[Anusha]

From: Anusha Srivatsa <anusha.srivatsa@intel.com>

We have an update of HuC for KBL.
Load the latest version.

cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
index 4c4f21731d36..1fa10e327a2d 100644
--- a/drivers/gpu/drm/i915/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/intel_huc_fw.c
@@ -30,9 +30,9 @@
 #define SKL_HUC_FW_MINOR 8
 #define SKL_BLD_NUM 2893
 
-#define KBL_HUC_FW_MAJOR 02
-#define KBL_HUC_FW_MINOR 00
-#define KBL_BLD_NUM 1810
+#define KBL_HUC_FW_MAJOR 03
+#define KBL_HUC_FW_MINOR 01
+#define KBL_BLD_NUM 2893
 
 #define HUC_FW_PATH(platform, major, minor, bld_num) \
 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 4/6] firmware/huc/GLK: Load HuC for GLK

[Anusha]

From: Anusha Srivatsa <anusha.srivatsa@intel.com>

Load Huc for GLK.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
index 1fa10e327a2d..634bafb77d79 100644
--- a/drivers/gpu/drm/i915/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/intel_huc_fw.c
@@ -34,6 +34,10 @@
 #define KBL_HUC_FW_MINOR 01
 #define KBL_BLD_NUM 2893
 
+#define GLK_HUC_FW_MAJOR 03
+#define GLK_HUC_FW_MINOR 01
+#define GLK_BLD_NUM 2893
+
 #define HUC_FW_PATH(platform, major, minor, bld_num) \
 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
 	__stringify(minor) "_" __stringify(bld_num) ".bin"
@@ -50,6 +54,10 @@ MODULE_FIRMWARE(I915_BXT_HUC_UCODE);
 	KBL_HUC_FW_MINOR, KBL_BLD_NUM)
 MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
 
+#define I915_GLK_HUC_UCODE HUC_FW_PATH(glk, GLK_HUC_FW_MAJOR, \
+	GLK_HUC_FW_MINOR, GLK_BLD_NUM)
+MODULE_FIRMWARE(I915_GLK_HUC_UCODE);
+
 static void huc_fw_select(struct intel_uc_fw *huc_fw)
 {
 	struct intel_huc *huc = container_of(huc_fw, struct intel_huc, fw);
@@ -76,6 +84,10 @@ static void huc_fw_select(struct intel_uc_fw *huc_fw)
 		huc_fw->path = I915_KBL_HUC_UCODE;
 		huc_fw->major_ver_wanted = KBL_HUC_FW_MAJOR;
 		huc_fw->minor_ver_wanted = KBL_HUC_FW_MINOR;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		huc_fw->path = I915_GLK_HUC_UCODE;
+		huc_fw->major_ver_wanted = GLK_HUC_FW_MAJOR;
+		huc_fw->minor_ver_wanted = GLK_HUC_FW_MINOR;
 	} else {
 		DRM_WARN("%s: No firmware known for this platform!\n",
 			 intel_uc_fw_type_repr(huc_fw->type));
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 5/6] firmware/guc/glk: Load GuC v11.98 for Geminilake.

[Anusha]

From: John Spotswood <john.a.spotswood@intel.com>

load the v11.98 guC on geminilake.

v2: rebased.

v3: Change subject prefix. (Anusha)

Cc: Tomi Sarvela <tomi.p.sarvela@intel.com>
Cc: Jani Saarinen <jani.saarinen@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: John Spotswood <john.a.spotswood@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_fw.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_fw.c b/drivers/gpu/drm/i915/intel_guc_fw.c
index a67144ee5ceb..55900937882a 100644
--- a/drivers/gpu/drm/i915/intel_guc_fw.c
+++ b/drivers/gpu/drm/i915/intel_guc_fw.c
@@ -39,6 +39,9 @@
 #define KBL_FW_MAJOR 9
 #define KBL_FW_MINOR 39
 
+#define GLK_FW_MAJOR 11
+#define GLK_FW_MINOR 98
+
 #define GUC_FW_PATH(platform, major, minor) \
        "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"
 
@@ -51,6 +54,9 @@ MODULE_FIRMWARE(I915_BXT_GUC_UCODE);
 #define I915_KBL_GUC_UCODE GUC_FW_PATH(kbl, KBL_FW_MAJOR, KBL_FW_MINOR)
 MODULE_FIRMWARE(I915_KBL_GUC_UCODE);
 
+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)
+MODULE_FIRMWARE(I915_GLK_GUC_UCODE);
+
 static void guc_fw_select(struct intel_uc_fw *guc_fw)
 {
 	struct intel_guc *guc = container_of(guc_fw, struct intel_guc, fw);
@@ -77,6 +83,10 @@ static void guc_fw_select(struct intel_uc_fw *guc_fw)
 		guc_fw->path = I915_KBL_GUC_UCODE;
 		guc_fw->major_ver_wanted = KBL_FW_MAJOR;
 		guc_fw->minor_ver_wanted = KBL_FW_MINOR;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		guc_fw->path = I915_GLK_GUC_UCODE;
+		guc_fw->major_ver_wanted = GLK_FW_MAJOR;
+		guc_fw->minor_ver_wanted = GLK_FW_MINOR;
 	} else {
 		dev_info(dev_priv->drm.dev,
 			 "%s: No firmware known for this platform!\n",
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 6/6] HAX enable HuC for CI

[Anusha]

From: Anusha Srivatsa <anusha.srivatsa@intel.com>

Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/i915_params.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
index 7e56c516c815..fa65edeb0202 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
@@ -45,7 +45,7 @@ struct drm_printer;
 	param(int, disable_power_well, -1) \
 	param(int, enable_ips, 1) \
 	param(int, invert_brightness, 0) \
-	param(int, enable_guc, 0) \
+	param(int, enable_guc, 2) \
 	param(int, guc_log_level, -1) \
 	param(char *, guc_firmware_path, NULL) \
 	param(char *, huc_firmware_path, NULL) \
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.CHECKPATCH: warning for HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK] (rev2)

[Patchwork]

== Series Details ==

Series: HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK] (rev2)
URL   : https://patchwork.freedesktop.org/series/53191/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
2f174cb3de1c firmware/huc/BXT: Update the HuC version
495993ba9aed firmware/huc/SKL: Update HuC versiom for SKL
a6b97b520d1d firmware/huc/KBL: Update HuC for KBL
afc0b5259f0b firmware/huc/GLK: Load HuC for GLK
4fdcb5ba00ae firmware/guc/glk: Load GuC v11.98 for Geminilake.
1a987393fb1b HAX enable HuC for CI
-:7: WARNING:COMMIT_MESSAGE: Missing commit description - Add an appropriate one

total: 0 errors, 1 warnings, 0 checks, 8 lines checked

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK] (rev2)

[Patchwork]

== Series Details ==

Series: HuC Updates [BXT,SKL,KBL,GLK] GuC [GLK] (rev2)
URL   : https://patchwork.freedesktop.org/series/53191/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_5217 -> Patchwork_10940
====================================================

Summary
-------

  **FAILURE**

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

  External URL: https://patchwork.freedesktop.org/api/1.0/series/53191/revisions/2/mbox/

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

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

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live_guc:
    - fi-bdw-gvtdvm:      PASS -> FAIL +15

  
#### Warnings ####

  * igt@kms_addfb_basic@addfb25-bad-modifier:
    - fi-bdw-gvtdvm:      PASS -> SKIP +229

  


Participating hosts (49 -> 23)
------------------------------

  Missing    (26): fi-kbl-soraka fi-cnl-u fi-icl-u2 fi-snb-2520m fi-icl-u3 fi-blb-e6850 fi-byt-n2820 fi-hsw-4770r fi-bdw-5557u fi-bsw-n3050 fi-byt-j1900 fi-bwr-2160 fi-ilk-650 fi-ctg-p8600 fi-hsw-4770 fi-gdg-551 fi-ivb-3770 fi-elk-e7500 fi-ivb-3520m fi-ilk-m540 fi-hsw-4200u fi-hsw-peppy fi-byt-squawks fi-bsw-cyan fi-bsw-kefka fi-byt-clapper 


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

    * Linux: CI_DRM_5217 -> Patchwork_10940

  CI_DRM_5217: 3b8acd938b1edc326fb69d377cbceca8791df177 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_4735: b05c028ccdb6ac8e8d8499a041bb14dfe358ee26 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_10940: 1a987393fb1ba3fb72a8d3202f57a3776c067a68 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

1a987393fb1b HAX enable HuC for CI
4fdcb5ba00ae firmware/guc/glk: Load GuC v11.98 for Geminilake.
afc0b5259f0b firmware/huc/GLK: Load HuC for GLK
a6b97b520d1d firmware/huc/KBL: Update HuC for KBL
495993ba9aed firmware/huc/SKL: Update HuC versiom for SKL
2f174cb3de1c firmware/huc/BXT: Update the HuC version

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10940/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH 3/6] firmware/huc/KBL: Update HuC for KBL

[Anusha]

From: Anusha Srivatsa <anusha.srivatsa@intel.com>

We have an update of HuC for KBL.
Load the latest version.

cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc_fw.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c b/drivers/gpu/drm/i915/intel_huc_fw.c
index 4c4f21731d36..1fa10e327a2d 100644
--- a/drivers/gpu/drm/i915/intel_huc_fw.c
+++ b/drivers/gpu/drm/i915/intel_huc_fw.c
@@ -30,9 +30,9 @@
 #define SKL_HUC_FW_MINOR 8
 #define SKL_BLD_NUM 2893
 
-#define KBL_HUC_FW_MAJOR 02
-#define KBL_HUC_FW_MINOR 00
-#define KBL_BLD_NUM 1810
+#define KBL_HUC_FW_MAJOR 03
+#define KBL_HUC_FW_MINOR 01
+#define KBL_BLD_NUM 2893
 
 #define HUC_FW_PATH(platform, major, minor, bld_num) \
 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx