From 89cd11c9af06ce3b31a121e27a0e7c736ba7689c Mon Sep 17 00:00:00 2001 From: Hao Xiang Date: Mon, 24 Mar 2025 00:16:59 +0800 Subject: [PATCH 1/3] support gnr qat device id number 4944 & 4945 Signed-off-by: Hao Xiang Signed-off-by: xianghao.xiang --- intel-QAT20.spec | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/intel-QAT20.spec b/intel-QAT20.spec index 468c4be..9a6e143 100644 --- a/intel-QAT20.spec +++ b/intel-QAT20.spec @@ -131,6 +131,8 @@ QAT_4XXX_DEVICE_NUMBER="4940" QAT_4XXX_DEVICE_NUMBER_VM="4941" QAT_401XX_DEVICE_NUMBER="4942" QAT_401XX_DEVICE_NUMBER_VM="4943" +QAT_402XX_DEVICE_NUMBER = "4944" +QAT_402XX_DEVICE_NUMBER_VM = "4945" VQAT_DEVICE_NUMBER="0da5" QAT_4XXX_NUM_VFS=16 DEVICES="${QAT_4XXX_DEVICE_NUMBER} ${QAT_4XXX_DEVICE_NUMBER_VM} ${QAT_401XX_DEVICE_NUMBER} ${QAT_401XX_DEVICE_NUMBER_VM} ${VQAT_DEVICE_NUMBER}" @@ -138,6 +140,8 @@ num4xxxDevicesP=`lspci -n | grep -E -c "${INTEL_VENDORID}:${QAT_4XXX_DEVICE_NUMB num4xxxDevicesV=`lspci -n | grep -E -c "${INTEL_VENDORID}:${QAT_4XXX_DEVICE_NUMBER_VM}"` num401xxDevicesP=`lspci -n | egrep -c "${INTEL_VENDORID}:${QAT_401XX_DEVICE_NUMBER}"` num401xxDevicesV=`lspci -n | egrep -c "${INTEL_VENDORID}:${QAT_401XX_DEVICE_NUMBER_VM}"` +num402xxDevicesP=`lspci -n | egrep -c "${INTEL_VENDORID}:${QAT_402XX_DEVICE_NUMBER}"` +num402xxDevicesV=`lspci -n | egrep -c "${INTEL_VENDORID}:${QAT_402XX_DEVICE_NUMBER_VM}"` numVQATDevices=`lspci -n | grep -E -c "${INTEL_VENDORID}:${VQAT_DEVICE_NUMBER}"` if [ -e ${QAT_SERVICE_PATH}/qat_service -a -e "/dev/qat_adf_ctl" ]; then @@ -198,6 +202,28 @@ if [ "${num401xxDevicesV}" -gt "0" ];then echo "SRIOV_ENABLE=1" > /etc/default/qat fi +if [ "${num402xxDevicesP}" -gt "0" ];then + ${ICP_ROOT}/generate_conf_files.sh -n ${num402xxDevicesP} -f ${ICP_ROOT}/build/4xxx_template.conf -o /etc/ + if [ -e "/etc/default/qat" ];then + . /etc/default/qat + if [ -n "${SRIOV_ENABLE}" ];then + if [ "${SRIOV_ENABLE}" -eq "1" ]; then + num402xxDevicesV=$((${QAT_4XXX_NUM_VFS} * ${num402xxDevicesP})) + fi + fi + else + echo "#Remove comment on next line to enable sriov" > /etc/default/qat + echo "#SRIOV_ENABLE=1" >> /etc/default/qat + fi +fi + +if [ "${num402xxDevicesV}" -gt "0" ];then + for (( dev=0; dev<${num402xxDevicesV}; dev++ ));do + ${INSTALL} -D -m 640 ${ICP_ROOT}/build/4xxxvf_dev0.conf.vm /etc/4xxxvf_dev${dev}.conf + done + echo "SRIOV_ENABLE=1" > /etc/default/qat +fi + if [ "${numVQATDevices}" -gt "0" ];then ${ICP_ROOT}/config_vqat.sh echo "SRIOV_ENABLE=1" > /etc/default/qat -- Gitee From a8945a3c82853d6b9d413d9f8558aa61b834d29e Mon Sep 17 00:00:00 2001 From: Hao Xiang Date: Mon, 24 Mar 2025 15:00:47 +0800 Subject: [PATCH 2/3] modify service enabled to asym;dc by default Signed-off-by: Hao Xiang --- ...y-default-ServicesEnabled-to-asym-dc.patch | 59 +++++++++++++++++++ intel-QAT20.spec | 7 ++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 1008-modify-default-ServicesEnabled-to-asym-dc.patch diff --git a/1008-modify-default-ServicesEnabled-to-asym-dc.patch b/1008-modify-default-ServicesEnabled-to-asym-dc.patch new file mode 100644 index 0000000..7e2aedb --- /dev/null +++ b/1008-modify-default-ServicesEnabled-to-asym-dc.patch @@ -0,0 +1,59 @@ +From ce921325382c38ec6781c5cc1ac0487e7d22552c Mon Sep 17 00:00:00 2001 +From: Hao Xiang +Date: Mon, 24 Mar 2025 00:00:06 +0800 +Subject: [PATCH] modify default ServicesEnabled to asym;dc + +Signed-off-by: Hao Xiang +Signed-off-by: xianghao.xiang +--- + quickassist/utilities/adf_ctl/conf_files/4xxx_template.conf | 4 ++-- + quickassist/utilities/adf_ctl/conf_files/4xxxvf_dev0.conf.vm | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/quickassist/utilities/adf_ctl/conf_files/4xxx_template.conf b/quickassist/utilities/adf_ctl/conf_files/4xxx_template.conf +index 8cb705c..58481e4 100644 +--- a/quickassist/utilities/adf_ctl/conf_files/4xxx_template.conf ++++ b/quickassist/utilities/adf_ctl/conf_files/4xxx_template.conf +@@ -59,7 +59,7 @@ + # version: QAT20.L.0.9.4-00004 + ################################################################ + [GENERAL] +-ServicesEnabled = sym;dc ++ServicesEnabled = asym;dc + + ConfigVersion = 2 + +@@ -120,7 +120,7 @@ NumberAdis = 0 + ############################################## + # User Process Instance Section + ############################################## +-[SSL] ++[SHIM] + NumberCyInstances = 3 + NumberDcInstances = 2 + NumProcesses = 1 +diff --git a/quickassist/utilities/adf_ctl/conf_files/4xxxvf_dev0.conf.vm b/quickassist/utilities/adf_ctl/conf_files/4xxxvf_dev0.conf.vm +index 67185d8..f0eb77a 100644 +--- a/quickassist/utilities/adf_ctl/conf_files/4xxxvf_dev0.conf.vm ++++ b/quickassist/utilities/adf_ctl/conf_files/4xxxvf_dev0.conf.vm +@@ -59,7 +59,7 @@ + # version: QAT20.L.0.9.4-00004 + ################################################################ + [GENERAL] +-ServicesEnabled = sym;dc ++ServicesEnabled = asym;dc + + ConfigVersion = 2 + +@@ -100,7 +100,7 @@ NumberDcInstances = 0 + ############################################## + # User Process Instance Section + ############################################## +-[SSL] ++[SHIM] + NumberCyInstances = 2 + NumberDcInstances = 2 + NumProcesses = 1 +-- +2.32.0.3.g01195cf9f + diff --git a/intel-QAT20.spec b/intel-QAT20.spec index 9a6e143..ec854c8 100644 --- a/intel-QAT20.spec +++ b/intel-QAT20.spec @@ -1,4 +1,4 @@ -%define anolis_release 11 +%define anolis_release 12 %define debug_package %{nil} %define QAT_release 00004 @@ -17,6 +17,7 @@ Patch1004: 1004-build-split-kernel-space-and-user-space-building.patch Patch1005: 1005-optimise-qat_service-scripts.patch Patch1006: 1006-replace-usdm-with-udma.patch Patch1007: 1007-Fix-uio-scan-logic.patch +Patch1008: 1008-modify-default-ServicesEnabled-to-asym-dc.patch BuildRequires: gcc gcc-c++ make systemd-devel openssl-devel zlib-devel yasm BuildRequires: udma-devel @@ -287,6 +288,10 @@ fi ${RM} -rf /etc/udev/rules.d/00-qat.rules /etc/default/qat %changelog +* Thu Mar 24 2025 Hao Xiang - 0.9.4-00004.12 +- modify service enabled to asym;dc by default +- support gnr qat device id number 4944 & 4945 + * Thu Sep 14 2023 Xuchun Shang - 0.9.4-00004.11 - Add support for high-freq machine -- Gitee From e55d2f69bbf1b278fd0672ed280d5302b9f51e4c Mon Sep 17 00:00:00 2001 From: Hao Xiang Date: Tue, 25 Mar 2025 14:51:17 +0800 Subject: [PATCH 3/3] remove error space in intel-QAT20.spec Signed-off-by: Hao Xiang --- intel-QAT20.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intel-QAT20.spec b/intel-QAT20.spec index ec854c8..b9f5b4e 100644 --- a/intel-QAT20.spec +++ b/intel-QAT20.spec @@ -132,8 +132,8 @@ QAT_4XXX_DEVICE_NUMBER="4940" QAT_4XXX_DEVICE_NUMBER_VM="4941" QAT_401XX_DEVICE_NUMBER="4942" QAT_401XX_DEVICE_NUMBER_VM="4943" -QAT_402XX_DEVICE_NUMBER = "4944" -QAT_402XX_DEVICE_NUMBER_VM = "4945" +QAT_402XX_DEVICE_NUMBER="4944" +QAT_402XX_DEVICE_NUMBER_VM="4945" VQAT_DEVICE_NUMBER="0da5" QAT_4XXX_NUM_VFS=16 DEVICES="${QAT_4XXX_DEVICE_NUMBER} ${QAT_4XXX_DEVICE_NUMBER_VM} ${QAT_401XX_DEVICE_NUMBER} ${QAT_401XX_DEVICE_NUMBER_VM} ${VQAT_DEVICE_NUMBER}" -- Gitee