* [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK @ 2017-03-21 21:10 Anusha Srivatsa 2017-03-21 21:10 ` [PATCH 2/2] drm/i915/HuC/GLK: Load HuC " Anusha Srivatsa 2017-03-21 21:30 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork 0 siblings, 2 replies; 6+ 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] 6+ messages in thread
* [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK 2017-03-21 21:10 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa @ 2017-03-21 21:10 ` Anusha Srivatsa 2017-03-21 22:40 ` Spotswood, John A 2017-03-21 23:39 ` John Spotswood 2017-03-21 21:30 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork 1 sibling, 2 replies; 6+ messages in thread From: Anusha Srivatsa @ 2017-03-21 21:10 UTC (permalink / raw) To: intel-gfx; +Cc: Rodrigo Vivi Load HuC version 1.07.1748 on GLK. 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..8dfb917 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 = KBL_HUC_FW_MAJOR; + huc->fw.minor_ver_wanted = KBL_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] 6+ messages in thread
* Re: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK 2017-03-21 21:10 ` [PATCH 2/2] drm/i915/HuC/GLK: Load HuC " Anusha Srivatsa @ 2017-03-21 22:40 ` Spotswood, John A 2017-03-22 0:20 ` Srivatsa, Anusha 2017-03-21 23:39 ` John Spotswood 1 sibling, 1 reply; 6+ messages in thread From: Spotswood, John A @ 2017-03-21 22:40 UTC (permalink / raw) To: Srivatsa, Anusha, intel-gfx@lists.freedesktop.org; +Cc: Vivi, Rodrigo In Hunk #3 at lines 174 and 175, you are still referencing KBL_HUC_FW_MAJOR and KBL_HUC_FW_MINOR instead of GLK_HUC_FW_MAJOR and GLK_HUC_FW_MINOR. John -----Original Message----- From: Srivatsa, Anusha Sent: Tuesday, March 21, 2017 2:11 PM To: intel-gfx@lists.freedesktop.org Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>; Mcgee, Jeff <jeff.mcgee@intel.com>; Spotswood, John A <john.a.spotswood@intel.com>; Vivi, Rodrigo <rodrigo.vivi@intel.com> Subject: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK Load HuC version 1.07.1748 on GLK. 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..8dfb917 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 = KBL_HUC_FW_MAJOR; + huc->fw.minor_ver_wanted = KBL_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] 6+ messages in thread
* Re: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK 2017-03-21 22:40 ` Spotswood, John A @ 2017-03-22 0:20 ` Srivatsa, Anusha 0 siblings, 0 replies; 6+ messages in thread From: Srivatsa, Anusha @ 2017-03-22 0:20 UTC (permalink / raw) To: Spotswood, John A, intel-gfx@lists.freedesktop.org; +Cc: Vivi, Rodrigo >-----Original Message----- >From: Spotswood, John A >Sent: Tuesday, March 21, 2017 3:40 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 2/2] drm/i915/HuC/GLK: Load HuC on GLK > >In Hunk #3 at lines 174 and 175, you are still referencing KBL_HUC_FW_MAJOR >and KBL_HUC_FW_MINOR instead of GLK_HUC_FW_MAJOR and >GLK_HUC_FW_MINOR. Oops! Thanks for pointing it out. Will correct it. Thanks, Anusha >John > >-----Original Message----- >From: Srivatsa, Anusha >Sent: Tuesday, March 21, 2017 2:11 PM >To: intel-gfx@lists.freedesktop.org >Cc: Srivatsa, Anusha <anusha.srivatsa@intel.com>; Mcgee, Jeff ><jeff.mcgee@intel.com>; Spotswood, John A <john.a.spotswood@intel.com>; >Vivi, Rodrigo <rodrigo.vivi@intel.com> >Subject: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK > >Load HuC version 1.07.1748 on GLK. > >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..8dfb917 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 = KBL_HUC_FW_MAJOR; >+ huc->fw.minor_ver_wanted = KBL_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 [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] drm/i915/HuC/GLK: Load HuC on GLK 2017-03-21 21:10 ` [PATCH 2/2] drm/i915/HuC/GLK: Load HuC " Anusha Srivatsa 2017-03-21 22:40 ` Spotswood, John A @ 2017-03-21 23:39 ` John Spotswood 1 sibling, 0 replies; 6+ messages in thread From: John Spotswood @ 2017-03-21 23:39 UTC (permalink / raw) To: Anusha Srivatsa, intel-gfx; +Cc: Rodrigo Vivi On 03/21/2017 02:10 PM, Anusha Srivatsa wrote: > Load HuC version 1.07.1748 on GLK. > > 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..8dfb917 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 = KBL_HUC_FW_MAJOR; > + huc->fw.minor_ver_wanted = KBL_HUC_FW_MINOR; These should be GLK_HUC_FW_MAJOR and GLK_HUC_FW_MINOR. > } else { > DRM_ERROR("No HuC firmware known for platform with HuC!\n"); > return; Regards, John _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC on GLK 2017-03-21 21:10 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa 2017-03-21 21:10 ` [PATCH 2/2] drm/i915/HuC/GLK: Load HuC " Anusha Srivatsa @ 2017-03-21 21:30 ` Patchwork 1 sibling, 0 replies; 6+ messages in thread From: Patchwork @ 2017-03-21 21:30 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/21636/ State : success == Summary == Series 21636v1 Series without cover letter https://patchwork.freedesktop.org/api/1.0/series/21636/revisions/1/mbox/ Test gem_exec_flush: Subgroup basic-batch-kernel-default-uc: pass -> FAIL (fi-snb-2600) fdo#100007 fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007 fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 458s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 583s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 508s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 539s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 500s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 506s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 444s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 428s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 436s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 507s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 489s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 474s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 485s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 585s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 474s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 503s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 544s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 419s d17b31b3444ecffa68be0c331a4b20078fd10ccf drm-tip: 2017y-03m-21d-17h-36m-49s UTC integration manifest 2f68d15 drm/i915/HuC/GLK: Load HuC on GLK e70daf5 drm/i915/GuC/GLK: Load GuC on GLK == Logs == For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4253/ _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-22 0:20 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-03-21 21:10 [PATCH 1/2] drm/i915/GuC/GLK: Load GuC on GLK Anusha Srivatsa 2017-03-21 21:10 ` [PATCH 2/2] drm/i915/HuC/GLK: Load HuC " Anusha Srivatsa 2017-03-21 22:40 ` Spotswood, John A 2017-03-22 0:20 ` Srivatsa, Anusha 2017-03-21 23:39 ` John Spotswood 2017-03-21 21:30 ` ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915/GuC/GLK: Load GuC " Patchwork
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).