Skip to contentSkip to conversation

drm/i915/GuC/GLK: Load GuC on GLK

PATCH John Spotswood 4 participants 5 messages Mar 28, 2017 – Mar 30, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 33 lines · Anusha Srivatsa

Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing has not been done yet. This patch addresses the initial need to load the GuC firmware for HuC authentication

Cc Jeff mcgee <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc John Spotswood <[email protected]>

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++

 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
index 2f270d0..a6899df 100644
@@ -61,6 +61,9 @@
  #define KBL_FW_MAJOR 9
  #define KBL_FW_MINOR 14

drivers/gpu/drm/i915/intel_guc_loader.c +3 -0
+#define GLK_FW_MAJOR 10
+#define GLK_FW_MINOR 56
+

 #define GUC_FW_PATH(platform, major, minor) \
        "i915/" __stringify(platform) "_guc_ver" __stringify(major) "_" __stringify(minor) ".bin"

drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
@@ -73,6 +76,8 @@ 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);
Quoted 3 lines


+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR, GLK_FW_MINOR)

You need a line after this #define that says the following:
   MODULE_FIRMWARE(I915_GLK_GUC_UCODE);

Quoted 13 lines

+
 /* User-friendly representation of an enum */
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) {

drivers/gpu/drm/i915/intel_guc_loader.c +4 -0
@@ -423,6 +428,10 @@ int intel_guc_select_fw(struct intel_guc *guc)
  		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 {
Quoted 3 lines

  DRM_ERROR("No GuC firmware known for platform with GuC!\n");
  return -ENOENT;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 45 lines

-----Original Message-----
From: Spotswood, John A
Sent: Tuesday, March 28, 2017 2:35 PM
To: Srivatsa, Anusha <[email protected]>; intel- [email protected]
Cc: Mcgee, Jeff <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK

Quoted 34 lines · Anusha Srivatsa

Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing has not been done yet.
This patch addresses the initial need to load the GuC firmware for HuC authentication

Cc Jeff mcgee <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc John Spotswood <[email protected]>

---
 drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++

 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +3 -0
index 2f270d0..a6899df 100644
@@ -61,6 +61,9 @@
  #define KBL_FW_MAJOR 9
  #define KBL_FW_MINOR 14
 
+#define GLK_FW_MAJOR 10
+#define GLK_FW_MINOR 56
+
  #define GUC_FW_PATH(platform, major, minor) \
         "i915/" __stringify(platform) "_guc_ver" __stringify(major)

"_" __stringify(minor) ".bin"

drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
@@ -73,6 +76,8 @@ 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);
 
Quoted 5 lines

drivers/gpu/drm/i915/intel_guc_loader.c MODULE_FIRMWARE(I915_BXT_GUC_UCODE); · line 81

Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR,
 GLK_FW_MINOR)

You need a line after this #define that says the following:
   MODULE_FIRMWARE(I915_GLK_GUC_UCODE);

Hi John, we have decided to not use it in pre-production platforms. Using MODULE_FIRMWARE is going to shout that the firmware is not available in systems. Since we will not be releasing the firmware binary to the public yet, it is unnecessary noise.

Anusha

Quoted 7 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
+
  /* User-friendly representation of an enum */

 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) {

drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
@@ -423,6 +428,10 @@ int intel_guc_select_fw(struct intel_guc *guc)
  		guc->fw.path = I915_KBL_GUC_UCODE;
  		guc->fw.major_ver_wanted = KBL_FW_MAJOR;
Quoted 9 lines
Quoted 7 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4 -0
  		guc->fw.minor_ver_wanted = KBL_FW_MINOR;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		guc->fw.path = I915_GLK_GUC_UCODE;
+		guc->fw.major_ver_wanted = GLK_FW_MAJOR;
+		guc->fw.minor_ver_wanted = GLK_FW_MINOR;
  	} else {

  DRM_ERROR("No GuC firmware known for platform with

GuC!\n");

Quoted 1 line

  return -ENOENT;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw
Quoted 44 lines · Anusha
Quoted 44 lines

-----Original Message-----
From: Spotswood, John A
Sent: Tuesday, March 28, 2017 2:35 PM
To: Srivatsa, Anusha <[email protected]>; intel- [email protected]
Cc: Mcgee, Jeff <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK

Quoted 34 lines · Anusha Srivatsa

Load GuC 10.56 on GLK. Work on firmware is still in progress. Testing has not been done yet.
This patch addresses the initial need to load the GuC firmware for HuC authentication

Cc Jeff mcgee <[email protected]>
Cc Rodrigo Vivi <[email protected]>
Cc John Spotswood <[email protected]>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
 1 file changed, 9 insertions(+)
drivers/gpu/drm/i915/intel_guc_loader.c +3 -0
index 2f270d0..a6899df 100644
@@ -61,6 +61,9 @@
 #define KBL_FW_MAJOR 9
 #define KBL_FW_MINOR 14
 
+#define GLK_FW_MAJOR 10
+#define GLK_FW_MINOR 56
+
 #define GUC_FW_PATH(platform, major, minor) \
        "i915/" __stringify(platform) "_guc_ver" __stringify(major)

"_" __stringify(minor) ".bin"

drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
@@ -73,6 +76,8 @@ 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);
 
Quoted 8 lines
Quoted 5 lines

drivers/gpu/drm/i915/intel_guc_loader.c MODULE_FIRMWARE(I915_BXT_GUC_UCODE); · line 81

Quoted 2 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR,
 GLK_FW_MINOR)

You need a line after this #define that says the following:
MODULE_FIRMWARE(I915_GLK_GUC_UCODE);

Hi John, we have decided to not use it in pre-production platforms. Using MODULE_FIRMWARE is going to shout that the firmware is not available in systems. Since we will not be releasing the firmware binary to the public yet, it is unnecessary noise.

+MODULE_FIRMARE() should be in a separated patch and only get merged after the firmware got released at 01.org propagated and merged to linux-firmware.git.

Quoted 19 lines

Anusha

Quoted 16 lines
Quoted 5 lines
drivers/gpu/drm/i915/intel_guc_loader.c +1 -0
+
 /* User-friendly representation of an enum */

const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status) {

drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_select_fw(struct intel_guc *guc) · line 436

Quoted 9 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4 -0
@@ -423,6 +428,10 @@ int intel_guc_select_fw(struct intel_guc *guc)
 		guc->fw.path = I915_KBL_GUC_UCODE;
 		guc->fw.major_ver_wanted = KBL_FW_MAJOR;
 		guc->fw.minor_ver_wanted = KBL_FW_MINOR;
+	} else if (IS_GEMINILAKE(dev_priv)) {
+		guc->fw.path = I915_GLK_GUC_UCODE;
+		guc->fw.major_ver_wanted = GLK_FW_MAJOR;
+		guc->fw.minor_ver_wanted = GLK_FW_MINOR;
 	} else {
 		DRM_ERROR("No GuC firmware known for platform with

GuC!\n");

Quoted 1 line
drivers/gpu/drm/i915/intel_guc_loader.c +0 -0
 		return -ENOENT;

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw
Quoted 25 lines · Rodrigo
Quoted 24 lines · Anusha
Quoted 18 lines

-----Original Message-----
From: Spotswood, John A
Sent: Tuesday, March 28, 2017 2:35 PM
To: Srivatsa, Anusha <[email protected]>; intel- [email protected]
Cc: Mcgee, Jeff <[email protected]>; Vivi, Rodrigo <rodrigo.vi [email protected]>
Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK

Quoted 5 lines
(quoted diff) +0 -0
@@ -73,6 +76,8 @@ 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);
 
Quoted 4 lines

Review MODULE_FIRMWARE(I915_BXT_GUC_UCODE); · line 81

Quoted 2 lines
(quoted diff) +1 -0
+#define I915_GLK_GUC_UCODE GUC_FW_PATH(glk, GLK_FW_MAJOR,
 GLK_FW_MINOR)

You need a line after this #define that says the following:
  MODULE_FIRMWARE(I915_GLK_GUC_UCODE);

Quoted 8 lines
Quoted 4 lines

Hi John, we have decided to not use it in pre-production platforms. Using MODULE_FIRMWARE is going to shout that the firmware is not available in systems. Since we will not be releasing the firmware binary to the public yet,  it is unnecessary noise.

+MODULE_FIRMARE() should be in a separated patch and only get merged after the firmware got released at 01.org propagated and merged to linux-firmware.git.

Makes sense.  My mistake.

John

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#5 lore raw
In reply to Vivi, Rodrigo
Quoted 24 lines · Rodrigo
Quoted 23 lines · Anusha
Quoted 22 lines
Quoted 13 lines

+++ b/drivers/gpu/drm/i915/intel_guc_loader.c

(quoted diff) +3 -0
@@ -61,6 +61,9 @@
  #define KBL_FW_MAJOR 9
  #define KBL_FW_MINOR 14
 
+#define GLK_FW_MAJOR 10
+#define GLK_FW_MINOR 56
+
  #define GUC_FW_PATH(platform, major, minor) \
         "i915/" __stringify(platform) "_guc_ver" __stringify(major)

"_" __stringify(minor) ".bin"

Review MODULE_FIRMWARE(I915_BXT_GUC_UCODE); · line 81

Quoted 6 lines
(quoted diff) +1 -0
@@ -73,6 +76,8 @@ 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)

You need a line after this #define that says the following:
  MODULE_FIRMWARE(I915_GLK_GUC_UCODE);

Quoted 8 lines
Quoted 4 lines

Hi John, we have decided to not use it in pre-production platforms. Using MODULE_FIRMWARE is going to shout that the firmware is not available in systems. Since we will not be releasing the firmware binary to the public yet,  it is unnecessary noise.

+MODULE_FIRMARE() should be in a separated patch and only get merged after the firmware got released at 01.org propagated and merged to linux-firmware.git.

Would it make a sense to put a big comment in the code at this spot? Pretty much what you wrote down.

Regards, Joonas

Signature · 7 lines
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx