diff --git a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/Makefile b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/Makefile index dcab573d6d3336a618b196327daa561185838ded..97b1fd51584532737a2f26c019ec9348b1740779 100644 --- a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/Makefile +++ b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/Makefile @@ -1,4 +1,5 @@ -KERNEL_VERSION_BY_BUILDENV :=`rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' kernel-devel | head -n 1` +#KERNEL_VERSION_BY_BUILDENV :=`rpm -q --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' kernel-devel | head -n 1` +KERNEL_VERSION_BY_BUILDENV :=`uname -r` KERNEL_PATH := /lib/modules/$(KERNEL_VERSION_BY_BUILDENV)/build KSP := $(shell if test -d /lib/modules/$(KERNEL_VERSION_BY_BUILDENV)/source; then \ echo /lib/modules/$(KERNEL_VERSION_BY_BUILDENV)/source; \ diff --git a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/hpre/hpre_main.c b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/hpre/hpre_main.c index 22cb8292170eb2d30cd74a752b0b3fad631353d5..010a010d566303cdd6a5eae8471d65a2927795bb 100644 --- a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/hpre/hpre_main.c +++ b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/hpre/hpre_main.c @@ -13,6 +13,12 @@ #include #include "hpre.h" +#define PCI_DEVICE_ID_HUAWEI_HPRE_PF 0xa258 + +#ifndef PCI_DEVICE_ID_HUAWEI_HPRE_VF +#define PCI_DEVICE_ID_HUAWEI_HPRE_VF 0xa259 +#endif + #define HPRE_CTRL_CNT_CLR_CE_BIT BIT(0) #define HPRE_CTRL_CNT_CLR_CE 0x301000 #define HPRE_FSM_MAX_CNT 0x301008 @@ -67,7 +73,6 @@ #define HPRE_REG_RD_INTVRL_US 10 #define HPRE_REG_RD_TMOUT_US 1000 #define HPRE_DBGFS_VAL_MAX_LEN 20 -#define PCI_DEVICE_ID_HUAWEI_HPRE_PF 0xa258 #define HPRE_QM_USR_CFG_MASK GENMASK(31, 1) #define HPRE_QM_AXI_CFG_MASK GENMASK(15, 0) #define HPRE_QM_VFG_AX_MASK GENMASK(7, 0) diff --git a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/sec2/sec_main.c b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/sec2/sec_main.c index 8a19e096bbe3970f0f93ce689d6e6df5add73cad..76c29ce9e4136f8671b2b15699ee4ac34b16ee5f 100644 --- a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/sec2/sec_main.c +++ b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/sec2/sec_main.c @@ -22,6 +22,10 @@ #define SEC_QUEUE_NUM_V1 4096 #define PCI_DEVICE_ID_HUAWEI_SEC_PF 0xa255 +#ifndef PCI_DEVICE_ID_HUAWEI_SEC_VF +#define PCI_DEVICE_ID_HUAWEI_SEC_VF 0xa256 +#endif + #define SEC_BD_ERR_CHK_EN0 0xEFFFFFFF #define SEC_BD_ERR_CHK_EN1 0x7ffff7fd #define SEC_BD_ERR_CHK_EN3 0xffffbfff diff --git a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/zip/zip_main.c b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/zip/zip_main.c index 6c91a6fa9c23a019cb3d4672dc69954ff08a5b48..4f4c96a240e0257b80fe35006b42bf1e5f047fae 100644 --- a/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/zip/zip_main.c +++ b/KAEKernelDriver/KAEKernelDriver-OLK-5.10/hisilicon/zip/zip_main.c @@ -17,6 +17,10 @@ #define PCI_DEVICE_ID_HUAWEI_ZIP_PF 0xa250 +#ifndef PCI_DEVICE_ID_HUAWEI_ZIP_VF +#define PCI_DEVICE_ID_HUAWEI_ZIP_VF 0xa251 +#endif + #define HZIP_QUEUE_NUM_V1 4096 #define HZIP_CLOCK_GATE_CTRL 0x301004 diff --git a/KAEZlib/setup.sh b/KAEZlib/setup.sh index b34fa556561f94413f4353ffa5ab86c593487814..e93217ec0005a56af2e22d14610d6e910f1fa834 100644 --- a/KAEZlib/setup.sh +++ b/KAEZlib/setup.sh @@ -17,7 +17,7 @@ function Install_warpdrive() tar -zxvf libwd-"${BUILDVERSION}".tar.gz cd warpdrive/ - sh autogen.sh + bash autogen.sh ./configure make clean && make make install diff --git a/build.sh b/build.sh index 1e5dd7e470ace0f68599512e802bd0b4937e9f30..32aebbdc5ae16ce391f3fe3ac1b671576dc8cb81 100644 --- a/build.sh +++ b/build.sh @@ -20,11 +20,16 @@ CPUPART="" function build_check_OS_version() { - local KERNEL_VERSION=`rpm -q --qf '%{VERSION}\n' kernel-devel | head -n 1` + #local KERNEL_VERSION=`rpm -q --qf '%{VERSION}\n' kernel-devel | head -n 1` + local KERNEL_VERSION=`uname -r` if [[ "$KERNEL_VERSION" == 6.6.* ]]; then KAE_KERNEL_DIR=${SRC_PATH}/KAEKernelDriver/KAEKernelDriver-OLK-6.6 KAE_SPEC_FILE=${SRC_PATH}/scripts/specFile/kae_openeuler2403.spec OPENSSL_CONFIGURE_FLAG="--libdir=/usr/local/lib/engines-3.0 --enable-kae --enable-engine --with-openssl_install_dir=/usr/" + elif [[ "$KERNEL_VERSION" == 5.15.* ]]; then + KAE_KERNEL_DIR=${SRC_PATH}/KAEKernelDriver/KAEKernelDriver-OLK-5.10 + KAE_SPEC_FILE=${SRC_PATH}/scripts/specFile/kae.spec + OPENSSL_CONFIGURE_FLAG="--libdir=/usr/local/lib/engines-1.1/ --enable-kae" elif [[ "$KERNEL_VERSION" == 5.10.* ]]; then KAE_KERNEL_DIR=${SRC_PATH}/KAEKernelDriver/KAEKernelDriver-OLK-5.10 KAE_SPEC_FILE=${SRC_PATH}/scripts/specFile/kae.spec @@ -60,8 +65,8 @@ function build_all_comp_sva() # 编译uadk cd $KAE_UADK_DIR - sh autogen.sh - sh conf.sh + bash autogen.sh + bash conf.sh make -j cp ${KAE_UADK_DIR}/.libs/lib* $KAE_BUILD_LIB @@ -82,14 +87,14 @@ function build_all_comp_sva() # 编译zlib cd $KAE_ZLIB_DIR - sh setup.sh devbuild KAE2 + bash setup.sh devbuild KAE2 cp $KAE_ZLIB_DIR/lib* $KAE_BUILD_LIB cp $KAE_ZLIB_DIR/open_source/zlib-1.2.11/lib* $KAE_BUILD_LIB # 编译zstd cd $KAE_ZSTD_DIR - sh build.sh devbuild + bash build.sh devbuild cp $KAE_ZSTD_DIR/lib* $KAE_BUILD_LIB cp $KAE_ZSTD_DIR/open_source/zstd/programs/zstd $KAE_BUILD_LIB @@ -138,8 +143,8 @@ function build_rpm() patch --no-backup-if-mismatch -p1 -N -s --forward < ./scripts/patches/0007-uadk-support-lz77-only-for-kaelz4.patch cd $KAE_UADK_DIR - sh autogen.sh - # sh conf.sh + bash autogen.sh + # bash conf.sh # 在 conf.sh中的内容后添加 --prefix 参数,为了使uadk编译生成的pkgconfig/*.pc文件中动态库的路径为RPM包编译时的临时目录,这样Opensslengine编译时才能够找到uadk动态库。 ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes ./configure \ --enable-perf=yes \ @@ -189,7 +194,7 @@ function build_rpm() # 编译 zlib cd $KAE_ZLIB_DIR - sh setup.sh devbuild KAE2 + bash setup.sh devbuild KAE2 mkdir -p $KAE_BUILD/kaezip mkdir -p $KAE_BUILD/kaezip/include @@ -208,7 +213,7 @@ function build_rpm() # 编译 zstd cd $KAE_ZSTD_DIR - sh build.sh devbuild + bash build.sh devbuild mkdir -p $KAE_BUILD/kaezstd/lib/pkgconfig mkdir -p $KAE_BUILD/kaezstd/bin @@ -233,7 +238,7 @@ function build_rpm() # 编译 lz4 cd ${SRC_PATH}/KAELz4 - sh build.sh devbuild + bash build.sh devbuild mkdir -p $KAE_BUILD/kaelz4/lib mkdir -p $KAE_BUILD/kaelz4/bin @@ -307,8 +312,8 @@ function build_uadk() patch --no-backup-if-mismatch -p1 -N -s --forward < ./scripts/patches/0007-uadk-support-lz77-only-for-kaelz4.patch cd ${SRC_PATH}/uadk - sh autogen.sh - sh conf.sh + bash autogen.sh + bash conf.sh make -j64 make install } @@ -318,20 +323,20 @@ function uadk_clean() cd ${SRC_PATH}/uadk make uninstall make clean - sh cleanup.sh + bash cleanup.sh } function build_engine_log() { - touch /var/log/kae.cnf - chmod 666 /var/log/kae.cnf - touch /var/log/kae.log - chmod 666 /var/log/kae.log + # touch /var/log/kae.cnf + # chmod 666 /var/log/kae.cnf + # touch /var/log/kae.log + # chmod 666 /var/log/kae.log } function engine_log_clean { - rm -rf /var/log/kae.log + # rm -rf /var/log/kae.log } function build_engine() @@ -502,52 +507,52 @@ function engine_clean_boringssl() function build_zlib() { cd ${SRC_PATH}/KAEZlib - sh setup.sh install + bash setup.sh install } function zlib_clean() { cd ${SRC_PATH}/KAEZlib - sh setup.sh uninstall + bash setup.sh uninstall rm -rf /usr/local/kaezip } function build_zstd() { cd ${SRC_PATH}/KAEZstd - sh build.sh install + bash build.sh install } function zstd_clean() { cd ${SRC_PATH}/KAEZstd - sh build.sh uninstall + bash build.sh uninstall rm -rf /usr/local/kaezstd/ } function build_lz4() { cd ${SRC_PATH}/KAELz4 - sh build.sh install + bash build.sh install } function lz4_clean() { cd ${SRC_PATH}/KAELz4 - sh build.sh uninstall + bash build.sh uninstall rm -rf /usr/local/kaelz4/ } function build_gzip() { cd ${SRC_PATH}/KAEGzip - sh build.sh install + bash build.sh install } function gzip_clean() { cd ${SRC_PATH}/KAEGzip - sh build.sh uninstall + bash build.sh uninstall } function help() @@ -630,7 +635,7 @@ function clear_all_components() fi } -main() { +main() { check_environment build_check_OS_version export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH