intel-gfx.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
@ 2017-03-21 21:10 Anusha Srivatsa
  0 siblings, 0 replies; 12+ messages in thread
From: Anusha Srivatsa @ 2017-03-21 21:10 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

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 <jeff.mcgee@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 2f270d0..a6899df 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -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"
 
@@ -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)
+
 /* User-friendly representation of an enum */
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
 {
@@ -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");
 		return -ENOENT;
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
       [not found] <1490130577-3679-1-git-send-email-anusha.srivatsa@intel.com>
@ 2017-03-28 21:35 ` John Spotswood
  2017-03-28 22:11   ` Srivatsa, Anusha
  0 siblings, 1 reply; 12+ messages in thread
From: John Spotswood @ 2017-03-28 21:35 UTC (permalink / raw)
  To: Anusha Srivatsa, intel-gfx; +Cc: Rodrigo Vivi

On Tue, 2017-03-21 at 14:09 -0700, Anusha Srivatsa wrote:
> 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 <jeff.mcgee@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 2f270d0..a6899df 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -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"
>  
> @@ -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);

> +
>  /* User-friendly representation of an enum */
>  const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
>  {
> @@ -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");
>  		return -ENOENT;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
  2017-03-28 21:35 ` John Spotswood
@ 2017-03-28 22:11   ` Srivatsa, Anusha
  2017-03-29  0:01     ` Vivi, Rodrigo
  0 siblings, 1 reply; 12+ messages in thread
From: Srivatsa, Anusha @ 2017-03-28 22:11 UTC (permalink / raw)
  To: Spotswood, John A, intel-gfx@lists.freedesktop.org; +Cc: Vivi, Rodrigo



>-----Original Message-----
>From: Spotswood, John A
>Sent: Tuesday, March 28, 2017 2:35 PM
>To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
>gfx@lists.freedesktop.org
>Cc: Mcgee, Jeff <jeff.mcgee@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>
>Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
>
>On Tue, 2017-03-21 at 14:09 -0700, Anusha Srivatsa wrote:
>> 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 <jeff.mcgee@intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: John Spotswood <john.a.spotswood@intel.com>
>> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
>> ---
>>  drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
>> b/drivers/gpu/drm/i915/intel_guc_loader.c
>> index 2f270d0..a6899df 100644
>> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
>> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
>> @@ -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"
>>
>> @@ -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);
 

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 
>> +
>>  /* User-friendly representation of an enum */
>>  const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
>>  {
>> @@ -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");
>>  		return -ENOENT;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
  2017-03-28 22:11   ` Srivatsa, Anusha
@ 2017-03-29  0:01     ` Vivi, Rodrigo
  2017-03-29  0:32       ` John Spotswood
  2017-03-30 13:52       ` Joonas Lahtinen
  0 siblings, 2 replies; 12+ messages in thread
From: Vivi, Rodrigo @ 2017-03-29  0:01 UTC (permalink / raw)
  To: Srivatsa, Anusha; +Cc: intel-gfx@lists.freedesktop.org

On Tue, 2017-03-28 at 22:11 +0000, Srivatsa, Anusha wrote:
> 
> >-----Original Message-----
> >From: Spotswood, John A
> >Sent: Tuesday, March 28, 2017 2:35 PM
> >To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> >gfx@lists.freedesktop.org
> >Cc: Mcgee, Jeff <jeff.mcgee@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com>
> >Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
> >
> >On Tue, 2017-03-21 at 14:09 -0700, Anusha Srivatsa wrote:
> >> 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 <jeff.mcgee@intel.com>
> >> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> >> Cc: John Spotswood <john.a.spotswood@intel.com>
> >> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
> >> ---
> >>  drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
> >>  1 file changed, 9 insertions(+)
> >>
> >> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> >> b/drivers/gpu/drm/i915/intel_guc_loader.c
> >> index 2f270d0..a6899df 100644
> >> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> >> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> >> @@ -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"
> >>
> >> @@ -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);
>  
> 
> 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.

> 
> 
> Anusha 
> >> +
> >>  /* User-friendly representation of an enum */
> >>  const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
> >>  {
> >> @@ -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");
> >>  		return -ENOENT;

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

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
  2017-03-29  0:01     ` Vivi, Rodrigo
@ 2017-03-29  0:32       ` John Spotswood
  2017-03-30 13:52       ` Joonas Lahtinen
  1 sibling, 0 replies; 12+ messages in thread
From: John Spotswood @ 2017-03-29  0:32 UTC (permalink / raw)
  To: Vivi, Rodrigo, Srivatsa, Anusha; +Cc: intel-gfx@lists.freedesktop.org

On Tue, 2017-03-28 at 17:01 -0700, Vivi, Rodrigo wrote:
> On Tue, 2017-03-28 at 22:11 +0000, Srivatsa, Anusha wrote:
> > 
> > 
> > > 
> > > -----Original Message-----
> > > From: Spotswood, John A
> > > Sent: Tuesday, March 28, 2017 2:35 PM
> > > To: Srivatsa, Anusha <anusha.srivatsa@intel.com>; intel-
> > > gfx@lists.freedesktop.org
> > > Cc: Mcgee, Jeff <jeff.mcgee@intel.com>; Vivi, Rodrigo <rodrigo.vi
> > > vi@intel.com>
> > > Subject: Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
> > > 
> > > 
> > > > @@ -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);
> >  
> > 
> > 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
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
  2017-03-29  0:01     ` Vivi, Rodrigo
  2017-03-29  0:32       ` John Spotswood
@ 2017-03-30 13:52       ` Joonas Lahtinen
  1 sibling, 0 replies; 12+ messages in thread
From: Joonas Lahtinen @ 2017-03-30 13:52 UTC (permalink / raw)
  To: Vivi, Rodrigo, Srivatsa, Anusha; +Cc: intel-gfx@lists.freedesktop.org

On ke, 2017-03-29 at 00:01 +0000, Vivi, Rodrigo wrote:
> On Tue, 2017-03-28 at 22:11 +0000, Srivatsa, Anusha wrote:
> > > > +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> > > > @@ -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"
> > > > 
> > > > @@ -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);
> > 
> > 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
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
@ 2017-03-30 20:24 Anusha Srivatsa
  2017-03-30 20:24 ` [PATCH 2/2] drm/i915/GLK/HuC: Load HuC " Anusha Srivatsa
                   ` (2 more replies)
  0 siblings, 3 replies; 12+ messages in thread
From: Anusha Srivatsa @ 2017-03-30 20:24 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

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

v2: rebased.

Cc: Jeff mcgee <jeff.mcgee@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c b/drivers/gpu/drm/i915/intel_guc_loader.c
index 7d92321..1f8edf0 100644
--- a/drivers/gpu/drm/i915/intel_guc_loader.c
+++ b/drivers/gpu/drm/i915/intel_guc_loader.c
@@ -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"
 
@@ -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)
+
 /* User-friendly representation of an enum */
 const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
 {
@@ -421,6 +426,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");
 		return -ENOENT;
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 2/2] drm/i915/GLK/HuC: Load HuC on GLK
  2017-03-30 20:24 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa
@ 2017-03-30 20:24 ` Anusha Srivatsa
  2017-03-30 23:31   ` John Spotswood
  2017-03-30 20:43 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork
  2017-03-30 23:31 ` [PATCH 1/2] " John Spotswood
  2 siblings, 1 reply; 12+ messages in thread
From: Anusha Srivatsa @ 2017-03-30 20:24 UTC (permalink / raw)
  To: intel-gfx; +Cc: Rodrigo Vivi

Load HuC version 1.07.1748 on GLK.

v2: rebased.
v3: Use name of the right platform(John Spotswood)
v4: rebased.

Cc: Jeff Mcgee <jeff.mcgee@intel.com>
Cc: John Spotswood <john.a.spotswood@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
---
 drivers/gpu/drm/i915/intel_huc.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_huc.c b/drivers/gpu/drm/i915/intel_huc.c
index 7af900b..ea2b325 100644
--- a/drivers/gpu/drm/i915/intel_huc.c
+++ b/drivers/gpu/drm/i915/intel_huc.c
@@ -52,6 +52,10 @@
 #define KBL_HUC_FW_MINOR 00
 #define KBL_BLD_NUM 1810
 
+#define GLK_HUC_FW_MAJOR 01
+#define GLK_HUC_FW_MINOR 07
+#define GLK_BLD_NUM 1748
+
 #define HUC_FW_PATH(platform, major, minor, bld_num) \
 	"i915/" __stringify(platform) "_huc_ver" __stringify(major) "_" \
 	__stringify(minor) "_" __stringify(bld_num) ".bin"
@@ -68,6 +72,9 @@ 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)
+
 /**
  * huc_ucode_xfer() - DMA's the firmware
  * @dev_priv: the drm_i915_private device
@@ -169,6 +176,10 @@ void intel_huc_select_fw(struct intel_huc *huc)
 		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_ERROR("No HuC firmware known for platform with HuC!\n");
 		return;
-- 
2.7.4

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

^ permalink raw reply related	[flat|nested] 12+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
  2017-03-30 20:24 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa
  2017-03-30 20:24 ` [PATCH 2/2] drm/i915/GLK/HuC: Load HuC " Anusha Srivatsa
@ 2017-03-30 20:43 ` Patchwork
  2017-04-07  7:34   ` Ander Conselvan De Oliveira
  2017-03-30 23:31 ` [PATCH 1/2] " John Spotswood
  2 siblings, 1 reply; 12+ messages in thread
From: Patchwork @ 2017-03-30 20:43 UTC (permalink / raw)
  To: Anusha Srivatsa; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
URL   : https://patchwork.freedesktop.org/series/22237/
State : success

== Summary ==

Series 22237v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/22237/revisions/1/mbox/

Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-kbl-7560u) fdo#100125

fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time: 427s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time: 425s
fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39  time: 568s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time: 507s
fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time: 547s
fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27  time: 487s
fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31  time: 490s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 409s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 404s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time: 422s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 482s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 469s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 451s
fi-kbl-7560u     total:278  pass:267  dwarn:1   dfail:0   fail:0   skip:10  time: 570s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 455s
fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time: 578s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time: 457s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 488s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time: 434s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time: 530s
fi-snb-2600      total:278  pass:248  dwarn:0   dfail:0   fail:1   skip:29  time: 408s

d217cd61ada383a577dc686dd74f77856695ec84 drm-tip: 2017y-03m-30d-18h-24m-46s UTC integration manifest
3362b59 drm/i915/GLK/HuC: Load HuC on GLK
1657e54 drm/i915/GuC/GLK: Load GuC on GLK

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4368/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK
  2017-03-30 20:24 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa
  2017-03-30 20:24 ` [PATCH 2/2] drm/i915/GLK/HuC: Load HuC " Anusha Srivatsa
  2017-03-30 20:43 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork
@ 2017-03-30 23:31 ` John Spotswood
  2 siblings, 0 replies; 12+ messages in thread
From: John Spotswood @ 2017-03-30 23:31 UTC (permalink / raw)
  To: Anusha Srivatsa, intel-gfx; +Cc: Rodrigo Vivi

On Thu, 2017-03-30 at 13:24 -0700, Anusha Srivatsa wrote:
> 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
> 
> v2: rebased.
> 
> Cc: Jeff mcgee <jeff.mcgee@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

Reviewed-by: John Spotswood <john.a.spotswood@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_guc_loader.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_guc_loader.c
> b/drivers/gpu/drm/i915/intel_guc_loader.c
> index 7d92321..1f8edf0 100644
> --- a/drivers/gpu/drm/i915/intel_guc_loader.c
> +++ b/drivers/gpu/drm/i915/intel_guc_loader.c
> @@ -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"
>  
> @@ -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)
> +
>  /* User-friendly representation of an enum */
>  const char *intel_uc_fw_status_repr(enum intel_uc_fw_status status)
>  {
> @@ -421,6 +426,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");
>  		return -ENOENT;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] drm/i915/GLK/HuC: Load HuC on GLK
  2017-03-30 20:24 ` [PATCH 2/2] drm/i915/GLK/HuC: Load HuC " Anusha Srivatsa
@ 2017-03-30 23:31   ` John Spotswood
  0 siblings, 0 replies; 12+ messages in thread
From: John Spotswood @ 2017-03-30 23:31 UTC (permalink / raw)
  To: Anusha Srivatsa, intel-gfx; +Cc: Rodrigo Vivi

On Thu, 2017-03-30 at 13:24 -0700, Anusha Srivatsa wrote:
> Load HuC version 1.07.1748 on GLK.
> 
> v2: rebased.
> v3: Use name of the right platform(John Spotswood)
> v4: rebased.
> 
> Cc: Jeff Mcgee <jeff.mcgee@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>

Reviewed-by: John Spotswood <john.a.spotswood@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_huc.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_huc.c
> b/drivers/gpu/drm/i915/intel_huc.c
> index 7af900b..ea2b325 100644
> --- a/drivers/gpu/drm/i915/intel_huc.c
> +++ b/drivers/gpu/drm/i915/intel_huc.c
> @@ -52,6 +52,10 @@
>  #define KBL_HUC_FW_MINOR 00
>  #define KBL_BLD_NUM 1810
>  
> +#define GLK_HUC_FW_MAJOR 01
> +#define GLK_HUC_FW_MINOR 07
> +#define GLK_BLD_NUM 1748
> +
>  #define HUC_FW_PATH(platform, major, minor, bld_num) \
>  	"i915/" __stringify(platform) "_huc_ver" __stringify(major)
> "_" \
>  	__stringify(minor) "_" __stringify(bld_num) ".bin"
> @@ -68,6 +72,9 @@ 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)
> +
>  /**
>   * huc_ucode_xfer() - DMA's the firmware
>   * @dev_priv: the drm_i915_private device
> @@ -169,6 +176,10 @@ void intel_huc_select_fw(struct intel_huc *huc)
>  		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_ERROR("No HuC firmware known for platform with
> HuC!\n");
>  		return;
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
  2017-03-30 20:43 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork
@ 2017-04-07  7:34   ` Ander Conselvan De Oliveira
  0 siblings, 0 replies; 12+ messages in thread
From: Ander Conselvan De Oliveira @ 2017-04-07  7:34 UTC (permalink / raw)
  To: intel-gfx, Anusha Srivatsa

On Thu, 2017-03-30 at 20:43 +0000, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK
> URL   : https://patchwork.freedesktop.org/series/22237/
> State : success

Pushed to dinq. Thanks for the patches and reviews!

Ander

> 
> == Summary ==
> 
> Series 22237v1 Series without cover letter
> https://patchwork.freedesktop.org/api/1.0/series/22237/revisions/1/mbox/
> 
> Test gem_exec_suspend:
>         Subgroup basic-s4-devices:
>                 pass       -> DMESG-WARN (fi-kbl-7560u) fdo#100125
> 
> fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
> 
> fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time: 427s
> fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time: 425s
> fi-bsw-n3050     total:278  pass:239  dwarn:0   dfail:0   fail:0   skip:39  time: 568s
> fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time: 507s
> fi-bxt-t5700     total:278  pass:258  dwarn:0   dfail:0   fail:0   skip:20  time: 547s
> fi-byt-j1900     total:278  pass:251  dwarn:0   dfail:0   fail:0   skip:27  time: 487s
> fi-byt-n2820     total:278  pass:247  dwarn:0   dfail:0   fail:0   skip:31  time: 490s
> fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 409s
> fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time: 404s
> fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time: 422s
> fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 482s
> fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 469s
> fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time: 451s
> fi-kbl-7560u     total:278  pass:267  dwarn:1   dfail:0   fail:0   skip:10  time: 570s
> fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 455s
> fi-skl-6700hq    total:278  pass:261  dwarn:0   dfail:0   fail:0   skip:17  time: 578s
> fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time: 457s
> fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time: 488s
> fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time: 434s
> fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time: 530s
> fi-snb-2600      total:278  pass:248  dwarn:0   dfail:0   fail:1   skip:29  time: 408s
> 
> d217cd61ada383a577dc686dd74f77856695ec84 drm-tip: 2017y-03m-30d-18h-24m-46s UTC integration manifest
> 3362b59 drm/i915/GLK/HuC: Load HuC on GLK
> 1657e54 drm/i915/GuC/GLK: Load GuC on GLK
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4368/
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-04-07  7:34 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-30 20:24 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa
2017-03-30 20:24 ` [PATCH 2/2] drm/i915/GLK/HuC: Load HuC " Anusha Srivatsa
2017-03-30 23:31   ` John Spotswood
2017-03-30 20:43 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork
2017-04-07  7:34   ` Ander Conselvan De Oliveira
2017-03-30 23:31 ` [PATCH 1/2] " John Spotswood
     [not found] <1490130577-3679-1-git-send-email-anusha.srivatsa@intel.com>
2017-03-28 21:35 ` John Spotswood
2017-03-28 22:11   ` Srivatsa, Anusha
2017-03-29  0:01     ` Vivi, Rodrigo
2017-03-29  0:32       ` John Spotswood
2017-03-30 13:52       ` Joonas Lahtinen
  -- strict thread matches above, loose matches on Subject: below --
2017-03-21 21:10 Anusha Srivatsa

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).