Commit 35d97e43 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Daniele Ceraolo Spurio
Browse files

drm/i915/uc: Update HuC firmware naming convention and load latest HuC 



Make both GuC and HuC to use "." as the separator. Hardcode
the separator in MAKE_UC_FW_PATH. Remove the usage of "ver" from HuC.

The current convention being:
<platform>_<g/h>uc_<major>.<minor>.patch.bin

Update the versions of HuC being loaded of the platforms.

SKL - v2.0.0
BXT - v2.0.0
KBL - v4.0.0
GLK - v4.0.0
CFL - KBL v4.0.0
ICL - v9.0.0
CML - v4.0.0

v2: Remove the separator parameter altogether from
__MAKE_UC_FW_PATH.(Daniele)
- Squash all firmware update patches (Daniele)
v3: s/huc/HuC
- Correct the order of platforms
- Change REVID of cml to 5(Michal)
- Code space changes in huc_def (Daniele)

Suggested-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190919201204.9691-1-daniele.ceraolospurio@intel.com
parent e5de91e6

drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c

+14 −13
Original line number Diff line number Diff line
@@ -40,25 +40,26 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, 
 */

#define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \

	fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl,  9, 0, 0)) \

	fw_def(ICELAKE,     0, guc_def(icl, 33, 0, 0), huc_def(icl,  8,  4, 3238)) \

	fw_def(COFFEELAKE,  0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \

	fw_def(GEMINILAKE,  0, guc_def(glk, 33, 0, 0), huc_def(glk, 03, 01, 2893)) \

	fw_def(KABYLAKE,    0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \

	fw_def(BROXTON,     0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 01,  8, 2893)) \

	fw_def(SKYLAKE,     0, guc_def(skl, 33, 0, 0), huc_def(skl, 01, 07, 1398))



#define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_, patch_) \

	fw_def(ICELAKE,     0, guc_def(icl, 33, 0, 0), huc_def(icl,  9, 0, 0)) \

	fw_def(COFFEELAKE,  5, guc_def(cml, 33, 0, 0), huc_def(cml,  4, 0, 0)) \

	fw_def(COFFEELAKE,  0, guc_def(kbl, 33, 0, 0), huc_def(kbl,  4, 0, 0)) \

	fw_def(GEMINILAKE,  0, guc_def(glk, 33, 0, 0), huc_def(glk,  4, 0, 0)) \

	fw_def(KABYLAKE,    0, guc_def(kbl, 33, 0, 0), huc_def(kbl,  4, 0, 0)) \

	fw_def(BROXTON,     0, guc_def(bxt, 33, 0, 0), huc_def(bxt,  2, 0, 0)) \

	fw_def(SKYLAKE,     0, guc_def(skl, 33, 0, 0), huc_def(skl,  2, 0, 0))



#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \

	"i915/" \

	__stringify(prefix_) name_ \

	__stringify(major_) separator_ \

	__stringify(minor_) separator_ \

	__stringify(major_) "." \

	__stringify(minor_) "." \

	__stringify(patch_) ".bin"



#define MAKE_GUC_FW_PATH(prefix_, major_, minor_, patch_) \

	__MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_)

	__MAKE_UC_FW_PATH(prefix_, "_guc_", major_, minor_, patch_)



#define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \

	__MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_, bld_num_)

	__MAKE_UC_FW_PATH(prefix_, "_huc_", major_, minor_, bld_num_)



/* All blobs need to be declared via MODULE_FIRMWARE() */

#define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \

CRA Git | Maintained and supported by SUSTech CRA and CCSE