Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: John Spotswood <john.a.spotswood@intel.com>
To: Oscar Mateo <oscar.mateo@intel.com>, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 5/5] drm/i915/icl/huc: Define the HuC firmware version for Icelake
Date: Tue, 08 May 2018 16:23:16 -0700	[thread overview]
Message-ID: <1525821796.3618.18.camel@intel.com> (raw)
In-Reply-To: <1525287804-2071-6-git-send-email-oscar.mateo@intel.com>

On Wed, 2018-05-02 at 12:03 -0700, Oscar Mateo wrote:
> This patch adds the support to load HuC on ICL.
> Version 8.02.2678
> 
> v2 (James): Rebase
> 
> Signed-off-by: Oscar Mateo <oscar.mateo@intel.com>
> Cc: Tony Ye <tony.ye@intel.com>
> Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
> Cc: Michel Thierry <michel.thierry@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: John Spotswood <john.a.spotswood@intel.com>

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

> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_huc_fw.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_huc_fw.c
> b/drivers/gpu/drm/i915/intel_huc_fw.c
> index f93d238..795d585 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 ICL_HUC_FW_MAJOR 8
> +#define ICL_HUC_FW_MINOR 02
> +#define ICL_BLD_NUM 2678
> +
>  #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,9 @@
>  	KBL_HUC_FW_MINOR, KBL_BLD_NUM)
>  MODULE_FIRMWARE(I915_KBL_HUC_UCODE);
>  
> +#define I915_ICL_HUC_UCODE HUC_FW_PATH(icl, ICL_HUC_FW_MAJOR, \
> +	ICL_HUC_FW_MINOR, ICL_BLD_NUM)
> +
>  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 +83,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_ICELAKE(dev_priv)) {
> +		huc->fw.path = I915_ICL_HUC_UCODE;
> +		huc->fw.major_ver_wanted = ICL_HUC_FW_MAJOR;
> +		huc->fw.minor_ver_wanted = ICL_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

  reply	other threads:[~2018-05-08 23:23 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-02 19:03 [PATCH v2 0/8] Enable HuC authentication in Icelake Oscar Mateo
2018-05-02 19:03 ` [PATCH 1/5] drm/i915/icl/guc: Do not allow GuC submission on Icelake for now Oscar Mateo
2018-05-08 23:21   ` John Spotswood
2018-05-02 19:03 ` [PATCH 2/5] drm/i915/icl/guc: Pass the bare minimum GuC init parameters for Icelake Oscar Mateo
2018-05-08 23:22   ` John Spotswood
2018-05-02 19:03 ` [PATCH 3/5] drm/i915/icl/guc: Define the GuC firmware version " Oscar Mateo
2018-05-08 23:22   ` John Spotswood
2018-05-02 19:03 ` [PATCH 4/5] drm/i915/icl/huc: Correctly authenticate the HuC " Oscar Mateo
2018-05-04 22:26   ` John Spotswood
2018-05-08 21:36     ` Oscar Mateo
2018-05-08 23:22   ` John Spotswood
2018-05-02 19:03 ` [PATCH 5/5] drm/i915/icl/huc: Define the HuC firmware version " Oscar Mateo
2018-05-08 23:23   ` John Spotswood [this message]
2018-05-02 19:34 ` ✓ Fi.CI.BAT: success for Enable HuC authentication in Icelake (rev2) Patchwork
2018-05-02 19:44 ` [PATCH v2 0/8] Enable HuC authentication in Icelake Oscar Mateo Lozano
2018-05-03  2:13 ` ✗ Fi.CI.IGT: failure for Enable HuC authentication in Icelake (rev2) Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2018-04-27 21:31 [PATCH 0/5] Enable HuC authentication in Icelake Oscar Mateo
2018-04-27 21:31 ` [PATCH 5/5] drm/i915/icl/huc: Define the HuC firmware version for Icelake Oscar Mateo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1525821796.3618.18.camel@intel.com \
    --to=john.a.spotswood@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=oscar.mateo@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox