diff --git a/1006-fw-change-4xxx-file-path.patch b/1006-fw-change-4xxx-file-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..8f7224b8b1ddf889ee158f3e449f226a0d78e19c --- /dev/null +++ b/1006-fw-change-4xxx-file-path.patch @@ -0,0 +1,28 @@ +From 4119101cd6b1fba450bd49fb8730875565253a38 Mon Sep 17 00:00:00 2001 +From: Xingrui Yi +Date: Thu, 14 Dec 2023 15:40:31 +0800 +Subject: [PATCH] fw: change 4xxx file path + +Signed-off-by: Xingrui Yi +--- + .../qat/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/quickassist/qat/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h b/quickassist/qat/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h +index 655ca4b..11b09b4 100644 +--- a/quickassist/qat/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h ++++ b/quickassist/qat/drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h +@@ -1544,8 +1544,8 @@ enum icp_qat_4xxx_slice_mask { + }; + + /* Firmware Binary */ +-#define ADF_4XXX_FW "qat_4xxx.bin" +-#define ADF_4XXX_MMP "qat_4xxx_mmp.bin" ++#define ADF_4XXX_FW "qat_4xxx_oot.bin" ++#define ADF_4XXX_MMP "qat_4xxx_mmp_oot.bin" + #define ADF_4XXX_DC_OBJ "qat_4xxx_dc.bin" + #define ADF_4XXX_SYM_OBJ "qat_4xxx_sym.bin" + #define ADF_4XXX_ASYM_OBJ "qat_4xxx_asym.bin" +-- +2.39.3 + diff --git a/kmod-intel-QAT20.spec b/kmod-intel-QAT20.spec index b0b176a7a2fa8ad3afbb910ab7355f9adf96432f..f9d9c14898181260c3b1fe25ec05b9185c022b63 100644 --- a/kmod-intel-QAT20.spec +++ b/kmod-intel-QAT20.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define debug_package %{nil} %define QAT_release 00004 %global pkg intel-QAT20 @@ -19,6 +19,7 @@ Patch1002: 1002-bugfix-crash-of-rmmod-vdcm.patch Patch1003: 1003-src-fix-warning-when-compiling.patch Patch1004: 1004-bugfix-ring-pair-reset-failure.patch Patch1005: 1005-qat_dev_process-add-userspace-request-logic.patch +Patch1006: 1006-fw-change-4xxx-file-path.patch Requires: kernel >= %{kernel} Requires(posttrans): %{_sbindir}/depmod @@ -49,7 +50,7 @@ version %{version} %build unset ICP_ROOT ICP_ARCH_USER ICP_BUILDSYSTEM_PATH ICP_BUILD_OUTPUT ICP_ENV_DIR ICP_TOOLS_TARGET %configure -%make_build qat-driver-all quickassist-all +make all %install rm -rf %{buildroot} @@ -75,6 +76,8 @@ mkdir -p ${DSTMODDIR}/qat_vqat/ /usr/bin/install -D -m 750 ${SRCMODDIR}/qat_4xxxvf/qat_4xxxvf.ko ${DSTMODDIR}/qat_4xxxvf/qat_4xxxvf.ko /usr/bin/install -D -m 750 ${SRCMODDIR}/qat_vqat/qat_vqat.ko ${DSTMODDIR}/qat_vqat/qat_vqat.ko /usr/bin/install -D -m 750 build/usdm_drv.ko %{buildroot}/lib/modules/${KERNEL_VER}/extra/ +/usr/bin/install -D -m 750 build/qat_4xxx.bin %{buildroot}/lib/firmware/qat_4xxx_oot.bin +/usr/bin/install -D -m 750 build/qat_4xxx_mmp.bin %{buildroot}/lib/firmware/qat_4xxx_mmp_oot.bin find %{buildroot}/lib/modules -type f -name \*.ko -exec chmod u+x \{\} \+ @@ -98,6 +101,8 @@ rm -rf $RPM_BUILD_ROOT /lib/modules/%{kernel}.%{_arch}/extra/drivers/crypto/qat/qat_vqat/qat_vqat.ko /lib/modules/%{kernel}.%{_arch}/extra/usdm_drv.ko %config(noreplace) %{_sysconfdir}/depmod.d/%{pkg}.conf +/lib/firmware/qat_4xxx_oot.bin +/lib/firmware/qat_4xxx_mmp_oot.bin %post ECHO=/usr/bin/echo @@ -136,5 +141,8 @@ fi rm /var/run/rpm-%{pkg}-modules.list %changelog +* Thu Dec 14 2023 Xingrui Yi - 0.9.4-00004.2 +- Change qat_4xxx fw patch + * Mon Nov 13 2023 Xingrui Yi - 0.9.4-00004.1 - Change spec for oot weak module