starlingx/kernel
Code Issues Proposed changes

kmod-ice: rename the ddp file to avoid conflict

Browse Source 
* qed_init_values_zipped-8.42.2.0.bin is required by
  QLogic FastLinQ 4xxxx Core Module qed 8.37.0.20, but
  it's not provided by linux-firmware-20190429-72.gitddde598.
  So linux-firmware need to be upgraded:
  20190429-72.gitddde598 -> 20200421-79.git78c0348

* But the new version also provides ice.pkg which conflicts
  with kmod-ice, so rename the ddp file in kmod-ice and ensure
  ice driver uses the correct firmware.

Test Plan:

PASS: boot on server with E800 NIC hardware and verify that
      correct ice comms ddp firmware is loaded (dmesg output).

Story: 2010046
Task: 45451

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Joao Pedro Alexandroni
<JoaoPedroAlexandroni.CordovadeSouza@windriver.com>
Change-Id: I5678e4cad85b001339e82ae00e803aa4beadbfc4
This commit is contained in:
Joao Pedro Alexandroni 2022-05-23 11:18:25 -03:00
parent fcf11340b0
commit 3b3e97366d
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel-modules/intel-ice/centos/ice-kmod.spec
View File

@ -32,6 +32,7 @@ Source11: modules-load.conf
Patch1: 0001-ice_main-ice_lib-Use-irq_update_affinity_hint.patch
Patch2: 0002-rename-the-ddp-file-to-avoid-conflict.patch
%define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')
%define find() %(for f in %*; do if [ -e $f ]; then echo $f; break; fi; done)
@ -81,7 +82,7 @@ source scl_source enable devtoolset-8 || :
%{__install} -m 644 ice_comms/*.txt %{buildroot}/lib/firmware/updates/intel/ice/ddp/
%{__install} -m 644 ice_comms/ice_comms*.pkg %{buildroot}/lib/firmware/updates/intel/ice/ddp/
mkdir -p %{buildroot}//lib/firmware/intel/ice/ddp/
ln -frs %{buildroot}/lib/firmware/updates/intel/ice/ddp/ice_comms*.pkg %{buildroot}//lib/firmware/intel/ice/ddp/ice.pkg
ln -frs %{buildroot}/lib/firmware/updates/intel/ice/ddp/ice_comms*.pkg %{buildroot}//lib/firmware/intel/ice/ddp/stx-ice.pkg
# Strip the modules(s).
find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \;
@ -102,7 +103,7 @@ rm -rf %{buildroot}
%defattr(644,root,root,755)
/lib/modules/%{kversion}/
/lib/firmware/updates/intel/ice/ddp/*
/lib/firmware/intel/ice/ddp/ice.pkg
/lib/firmware/intel/ice/ddp/stx-ice.pkg
%{_sysconfdir}/modules-load.d/ice.conf
%doc /usr/share/doc/kmod-ice-%{version}/
%doc /usr/share/man/man7/

29
kernel-modules/intel-ice/files/0002-rename-the-ddp-file-to-avoid-conflict.patch Normal file
View File

@ -0,0 +1,29 @@
From c446031820d75686d1c1dc7606154438d26bd9cc Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Fri, 20 May 2022 03:23:25 -0400
Subject: [PATCH] rename the ddp file to avoid conflict
Rename the ddp file to avoid conflict with the one
provided by linux-firmware.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
src/ice_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ice_main.c b/src/ice_main.c
index 6a056a9..de7b5e5 100644
--- a/src/ice_main.c
+++ b/src/ice_main.c
@@ -46,7 +46,7 @@ static const char ice_copyright[] = "Copyright (C) 2018-2021, Intel Corporation.
#else /* UTS_UBUNTU_RELEASE_ABI */
#define ICE_DDP_PKG_PATH "intel/ice/ddp/"
#endif /* UTS_UBUNTU_RELEASE_ABI */
-#define ICE_DDP_PKG_FILE ICE_DDP_PKG_PATH "ice.pkg"
+#define ICE_DDP_PKG_FILE ICE_DDP_PKG_PATH "stx-ice.pkg"
MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
MODULE_DESCRIPTION(DRV_SUMMARY);
--
2.29.2