[CI,1/2] drm/i915/uc: Update HuC firmware naming convention and load latest HuC
diff mbox series

Message ID 20190919201204.9691-1-daniele.ceraolospurio@intel.com
State New
Headers show
Series
  • [CI,1/2] drm/i915/uc: Update HuC firmware naming convention and load latest HuC
Related show

Commit Message

Daniele Ceraolo Spurio Sept. 19, 2019, 8:12 p.m. UTC
From: Anusha Srivatsa <anusha.srivatsa@intel.com>

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: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Anusha Srivatsa <anusha.srivatsa@intel.com>
Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

Comments

Daniele Ceraolo Spurio Sept. 20, 2019, 6:04 p.m. UTC | #1
On 9/20/19 5:51 AM, Patchwork wrote:
> == Series Details ==
> 
> Series: series starting with [CI,1/2] drm/i915/uc: Update HuC firmware naming convention and load latest HuC
> URL   : https://patchwork.freedesktop.org/series/66955/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_6925_full -> Patchwork_14466_full
> ====================================================
> 
> Summary
> -------
> 
>    **FAILURE**
> 
>    Serious unknown changes coming with Patchwork_14466_full absolutely need to be
>    verified manually.
>    
>    If you think the reported changes have nothing to do with the changes
>    introduced in Patchwork_14466_full, please notify your bug team to allow them
>    to document this new failure mode, which will reduce false positives in CI.
> 
>    
> 
> Possible new issues
> -------------------
> 
>    Here are the unknown changes that may have been introduced in Patchwork_14466_full:
> 
> ### IGT changes ###
> 
> #### Possible regressions ####
> 
>    * igt@i915_suspend@debugfs-reader:
>      - shard-iclb:         [PASS][1] -> [DMESG-WARN][2]
>     [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb5/igt@i915_suspend@debugfs-reader.html
>     [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb4/igt@i915_suspend@debugfs-reader.html
> 

https://bugs.freedesktop.org/show_bug.cgi?id=111165 once again.

I've manually double-checked the new HuC binaries loaded fine and pushed.

Daniele

>    
> Known issues
> ------------
> 
>    Here are the changes found in Patchwork_14466_full that come from known issues:
> 
> ### IGT changes ###
> 
> #### Issues hit ####
> 
>    * igt@gem_ctx_isolation@rcs0-s3:
>      - shard-kbl:          [PASS][3] -> [DMESG-WARN][4] ([fdo#108566]) +14 similar issues
>     [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-kbl2/igt@gem_ctx_isolation@rcs0-s3.html
>     [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-kbl2/igt@gem_ctx_isolation@rcs0-s3.html
> 
>    * igt@gem_exec_balancer@smoke:
>      - shard-iclb:         [PASS][5] -> [SKIP][6] ([fdo#110854])
>     [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb4/igt@gem_exec_balancer@smoke.html
>     [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb7/igt@gem_exec_balancer@smoke.html
> 
>    * igt@gem_exec_schedule@preempt-other-chain-bsd:
>      - shard-iclb:         [PASS][7] -> [SKIP][8] ([fdo#111325]) +3 similar issues
>     [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb3/igt@gem_exec_schedule@preempt-other-chain-bsd.html
>     [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb1/igt@gem_exec_schedule@preempt-other-chain-bsd.html
> 
>    * igt@gem_exec_schedule@preempt-queue-bsd1:
>      - shard-iclb:         [PASS][9] -> [SKIP][10] ([fdo#109276]) +16 similar issues
>     [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb1/igt@gem_exec_schedule@preempt-queue-bsd1.html
>     [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb3/igt@gem_exec_schedule@preempt-queue-bsd1.html
> 
>    * igt@gem_workarounds@suspend-resume-context:
>      - shard-apl:          [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +10 similar issues
>     [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-apl2/igt@gem_workarounds@suspend-resume-context.html
>     [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-apl1/igt@gem_workarounds@suspend-resume-context.html
> 
>    * igt@i915_pm_rc6_residency@rc6-accuracy:
>      - shard-skl:          [PASS][13] -> [SKIP][14] ([fdo#109271])
>     [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-skl10/igt@i915_pm_rc6_residency@rc6-accuracy.html
>     [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-skl5/igt@i915_pm_rc6_residency@rc6-accuracy.html
> 
>    * igt@kms_flip@flip-vs-expired-vblank-interruptible:
>      - shard-skl:          [PASS][15] -> [FAIL][16] ([fdo#105363])
>     [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-skl1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
>     [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-skl6/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
>      - shard-glk:          [PASS][17] -> [FAIL][18] ([fdo#105363])
>     [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
>     [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-glk1/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
> 
>    * igt@kms_flip@flip-vs-suspend-interruptible:
>      - shard-skl:          [PASS][19] -> [INCOMPLETE][20] ([fdo#109507])
>     [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-skl6/igt@kms_flip@flip-vs-suspend-interruptible.html
>     [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-skl4/igt@kms_flip@flip-vs-suspend-interruptible.html
>      - shard-hsw:          [PASS][21] -> [INCOMPLETE][22] ([fdo#103540])
>     [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-hsw1/igt@kms_flip@flip-vs-suspend-interruptible.html
>     [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-hsw2/igt@kms_flip@flip-vs-suspend-interruptible.html
> 
>    * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-pwrite:
>      - shard-iclb:         [PASS][23] -> [FAIL][24] ([fdo#103167]) +5 similar issues
>     [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-pwrite.html
>     [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb1/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-pwrite.html
> 
>    * igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-render:
>      - shard-iclb:         [PASS][25] -> [INCOMPLETE][26] ([fdo#106978] / [fdo#107713])
>     [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb4/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-render.html
>     [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb1/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-shrfb-draw-render.html
> 
>    * igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
>      - shard-skl:          [PASS][27] -> [FAIL][28] ([fdo#108145]) +1 similar issue
>     [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-skl1/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
>     [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-skl7/igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min.html
> 
>    * igt@kms_psr@psr2_cursor_blt:
>      - shard-iclb:         [PASS][29] -> [SKIP][30] ([fdo#109441]) +2 similar issues
>     [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb2/igt@kms_psr@psr2_cursor_blt.html
>     [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb6/igt@kms_psr@psr2_cursor_blt.html
> 
>    * igt@perf@gen8-unprivileged-single-ctx-counters:
>      - shard-apl:          [PASS][31] -> [INCOMPLETE][32] ([fdo#103927])
>     [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-apl1/igt@perf@gen8-unprivileged-single-ctx-counters.html
>     [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-apl3/igt@perf@gen8-unprivileged-single-ctx-counters.html
> 
>    
> #### Possible fixes ####
> 
>    * igt@gem_exec_async@concurrent-writes-bsd:
>      - shard-iclb:         [SKIP][33] ([fdo#111325]) -> [PASS][34] +4 similar issues
>     [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb2/igt@gem_exec_async@concurrent-writes-bsd.html
>     [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb6/igt@gem_exec_async@concurrent-writes-bsd.html
> 
>    * igt@gem_exec_schedule@independent-bsd2:
>      - shard-iclb:         [SKIP][35] ([fdo#109276]) -> [PASS][36] +13 similar issues
>     [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb5/igt@gem_exec_schedule@independent-bsd2.html
>     [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb4/igt@gem_exec_schedule@independent-bsd2.html
> 
>    * igt@gem_partial_pwrite_pread@writes-after-reads-uncached:
>      - shard-apl:          [INCOMPLETE][37] ([fdo#103927]) -> [PASS][38]
>     [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-apl4/igt@gem_partial_pwrite_pread@writes-after-reads-uncached.html
>     [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-apl7/igt@gem_partial_pwrite_pread@writes-after-reads-uncached.html
> 
>    * igt@i915_suspend@fence-restore-tiled2untiled:
>      - shard-apl:          [DMESG-WARN][39] ([fdo#108566]) -> [PASS][40] +2 similar issues
>     [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-apl8/igt@i915_suspend@fence-restore-tiled2untiled.html
>     [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-apl8/igt@i915_suspend@fence-restore-tiled2untiled.html
> 
>    * igt@kms_busy@basic-modeset-a:
>      - shard-iclb:         [INCOMPLETE][41] ([fdo#107713]) -> [PASS][42] +1 similar issue
>     [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb7/igt@kms_busy@basic-modeset-a.html
>     [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb2/igt@kms_busy@basic-modeset-a.html
> 
>    * igt@kms_busy@extended-modeset-hang-oldfb-render-a:
>      - shard-kbl:          [DMESG-WARN][43] ([fdo#111758]) -> [PASS][44]
>     [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-kbl2/igt@kms_busy@extended-modeset-hang-oldfb-render-a.html
>     [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-kbl2/igt@kms_busy@extended-modeset-hang-oldfb-render-a.html
> 
>    * igt@kms_flip_tiling@flip-changes-tiling-yf:
>      - shard-skl:          [FAIL][45] ([fdo#108303]) -> [PASS][46]
>     [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-skl8/igt@kms_flip_tiling@flip-changes-tiling-yf.html
>     [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-skl3/igt@kms_flip_tiling@flip-changes-tiling-yf.html
> 
>    * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
>      - shard-iclb:         [FAIL][47] ([fdo#103167]) -> [PASS][48] +3 similar issues
>     [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
>     [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
> 
>    * igt@kms_plane_lowres@pipe-a-tiling-y:
>      - shard-iclb:         [FAIL][49] ([fdo#103166]) -> [PASS][50]
>     [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb4/igt@kms_plane_lowres@pipe-a-tiling-y.html
>     [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-y.html
> 
>    * igt@kms_psr@psr2_dpms:
>      - shard-iclb:         [SKIP][51] ([fdo#109441]) -> [PASS][52]
>     [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb5/igt@kms_psr@psr2_dpms.html
>     [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb2/igt@kms_psr@psr2_dpms.html
> 
>    * igt@kms_setmode@basic:
>      - shard-apl:          [FAIL][53] ([fdo#99912]) -> [PASS][54]
>     [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-apl3/igt@kms_setmode@basic.html
>     [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-apl3/igt@kms_setmode@basic.html
>      - shard-glk:          [FAIL][55] ([fdo#99912]) -> [PASS][56]
>     [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-glk9/igt@kms_setmode@basic.html
>     [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-glk3/igt@kms_setmode@basic.html
> 
>    * igt@kms_vblank@pipe-c-ts-continuation-modeset:
>      - shard-kbl:          [DMESG-WARN][57] ([fdo#103313]) -> [PASS][58]
>     [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-kbl2/igt@kms_vblank@pipe-c-ts-continuation-modeset.html
>     [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-kbl2/igt@kms_vblank@pipe-c-ts-continuation-modeset.html
> 
>    * igt@perf@blocking:
>      - shard-skl:          [FAIL][59] ([fdo#110728]) -> [PASS][60]
>     [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-skl9/igt@perf@blocking.html
>     [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-skl6/igt@perf@blocking.html
> 
>    
> #### Warnings ####
> 
>    * igt@gem_mocs_settings@mocs-isolation-bsd2:
>      - shard-iclb:         [SKIP][61] ([fdo#109276]) -> [FAIL][62] ([fdo#111330])
>     [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb3/igt@gem_mocs_settings@mocs-isolation-bsd2.html
>     [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb1/igt@gem_mocs_settings@mocs-isolation-bsd2.html
> 
>    * igt@gem_mocs_settings@mocs-reset-bsd2:
>      - shard-iclb:         [FAIL][63] ([fdo#111330]) -> [SKIP][64] ([fdo#109276]) +1 similar issue
>     [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb2/igt@gem_mocs_settings@mocs-reset-bsd2.html
>     [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb6/igt@gem_mocs_settings@mocs-reset-bsd2.html
> 
>    * igt@kms_dp_dsc@basic-dsc-enable-edp:
>      - shard-iclb:         [SKIP][65] ([fdo#109349]) -> [DMESG-WARN][66] ([fdo#107724])
>     [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6925/shard-iclb5/igt@kms_dp_dsc@basic-dsc-enable-edp.html
>     [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
> 
>    
>    [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
>    [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
>    [fdo#103313]: https://bugs.freedesktop.org/show_bug.cgi?id=103313
>    [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
>    [fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
>    [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
>    [fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
>    [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
>    [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
>    [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
>    [fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
>    [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
>    [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
>    [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
>    [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
>    [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
>    [fdo#109507]: https://bugs.freedesktop.org/show_bug.cgi?id=109507
>    [fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
>    [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
>    [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
>    [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
>    [fdo#111758]: https://bugs.freedesktop.org/show_bug.cgi?id=111758
>    [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
> 
> 
> Participating hosts (10 -> 9)
> ------------------------------
> 
>    Missing    (1): pig-skl-6260u
> 
> 
> Build changes
> -------------
> 
>    * CI: CI-20190529 -> None
>    * Linux: CI_DRM_6925 -> Patchwork_14466
> 
>    CI-20190529: 20190529
>    CI_DRM_6925: ccd2c9cb3fd35f9654cdf6743bdecfb489fba70a @ git://anongit.freedesktop.org/gfx-ci/linux
>    IGT_5193: 924e5c59dbb82938e743efd6b0812eeb5760b70d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>    Patchwork_14466: 8e2004a0d670fcdc5e714362d95f9f7a6691315b @ git://anongit.freedesktop.org/gfx-ci/linux
>    piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14466/
>

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 296a82603be0..ea9a807abd4f 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -39,26 +39,27 @@  void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw,
  * Must be ordered based on platform + revid, from newer to older.
  */
 #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(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,  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_) \