Re: [Intel-gfx] [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

2018-05-23 Thread Saarinen, Jani
HI. 

> -Original Message-
> From: Sarvela, Tomi P
> Sent: keskiviikko 23. toukokuuta 2018 10.53
> To: Srivatsa, Anusha ; intel-
> g...@lists.freedesktop.org
> Cc: Spotswood, John A ; Saarinen, Jani
> 
> Subject: Re: [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.
> 
> On 05/23/2018 09:15 AM, Anusha Srivatsa wrote:
> > load the v03.00.2555 huC on geminilake.
> >
> > v2:
> > - rebased.
> > - Load the correct the version. (John Spotswood)
> >
> > Cc: John Spotswood 
> > Cc: Tomi Sarvela 
> > Cc: Jani Saarinen 
> > Signed-off-by: Anusha Srivatsa 
> > ---
> >   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 f93d238..ae293f9 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 00
> >   #define KBL_BLD_NUM 1810
> >
> > +#define GLK_HUC_FW_MAJOR 03
> > +#define GLK_HUC_FW_MINOR 00
> > +#define GLK_BLD_NUM 2555
> 
> Can you check if this should be
> 
> #define GLK_BLD_NUM 2225
In patch 0/3 you have 

WHENCE |   7 +++
 i915/glk_guc_ver11_98.bin  | Bin 0 -> 154240 bytes
 i915/glk_huc_ver03_00_2225.bin | Bin 0 -> 220032 bytes
 3 files changed, 7 insertions(+)
 create mode 100644 i915/glk_guc_ver11_98.bin  create mode 100644 
i915/glk_huc_ver03_00_2225.bin

So most probably typo  like Tomi says.

> 
> This is the newest GLK HuC firmware version I have seen.
> 
> Best regards,
> 
> Tomi Sarvela
> 
> > +
> >   #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));
> >
> 
> --


Jani Saarinen
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo


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


Re: [Intel-gfx] [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

2018-05-23 Thread Tomi Sarvela

On 05/23/2018 09:15 AM, Anusha Srivatsa wrote:

load the v03.00.2555 huC on geminilake.

v2:
- rebased.
- Load the correct the version. (John Spotswood)

Cc: John Spotswood 
Cc: Tomi Sarvela 
Cc: Jani Saarinen 
Signed-off-by: Anusha Srivatsa 
---
  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 f93d238..ae293f9 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 00
  #define KBL_BLD_NUM 1810
  
+#define GLK_HUC_FW_MAJOR 03

+#define GLK_HUC_FW_MINOR 00
+#define GLK_BLD_NUM 2555


Can you check if this should be

#define GLK_BLD_NUM 2225

This is the newest GLK HuC firmware version I have seen.

Best regards,

Tomi Sarvela


+
  #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));



--
Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

2018-05-23 Thread Anusha Srivatsa
load the v03.00.2555 huC on geminilake.

v2:
- rebased.
- Load the correct the version. (John Spotswood)

Cc: John Spotswood 
Cc: Tomi Sarvela 
Cc: Jani Saarinen 
Signed-off-by: Anusha Srivatsa 
---
 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 f93d238..ae293f9 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 00
 #define KBL_BLD_NUM 1810
 
+#define GLK_HUC_FW_MAJOR 03
+#define GLK_HUC_FW_MINOR 00
+#define GLK_BLD_NUM 2555
+
 #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.7.4

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


Re: [Intel-gfx] [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

2018-05-17 Thread John Spotswood
On Fri, 2018-04-27 at 16:33 -0700, Anusha Srivatsa wrote:
> load the v03.00.2555 huC on geminilake.
> 
> Cc: Tomi Sarvela 
> Cc: Jani Saarinen 
> Signed-off-by: Anusha Srivatsa 
> ---
>  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 f93d238..5e96690 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 00
>  #define KBL_BLD_NUM 1810
>  
> +#define GLK_HUC_FW_MAJOR 02
> +#define GLK_HUC_FW_MINOR 00
> +#define GLK_BLD_NUM 1810

Is this version number a cut-n-paste error?  It seems to be the
version number as KBL directly above it.

> +
>  #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));
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx


[Intel-gfx] [PATCH 2/3] drm/i915/huc: Load HuC v03.00.2555 for Geminilake.

2018-04-27 Thread Anusha Srivatsa
load the v03.00.2555 huC on geminilake.

Cc: Tomi Sarvela 
Cc: Jani Saarinen 
Signed-off-by: Anusha Srivatsa 
---
 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 f93d238..5e96690 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 00
 #define KBL_BLD_NUM 1810
 
+#define GLK_HUC_FW_MAJOR 02
+#define GLK_HUC_FW_MINOR 00
+#define GLK_BLD_NUM 1810
+
 #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.7.4

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