From 880ff45aaa624cc9509533513f6d497aee008086 Mon Sep 17 00:00:00 2001 From: tuyawangfq <47593866+tuyawangfq@users.noreply.github.com> Date: Tue, 11 May 2021 15:27:12 +0800 Subject: [PATCH] update kae version to 1.3.11 (#9) * update 1.3.11 * update 1.3.11 * update 1.3.11 --- .travis.yml | 16 -- kae_driver/hisilicon/hpre/hpre_main.c | 2 +- kae_driver/hisilicon/qm.c | 2 +- kae_driver/hisilicon/rde/rde_main.c | 2 +- kae_driver/hisilicon/sec2/sec_main.c | 2 +- kae_driver/hisilicon/sgl.c | 2 +- kae_driver/hisilicon/zip/zip_main.c | 2 +- kae_driver/kae_driver.spec | 280 -------------------------- kae_driver/uacce/uacce.c | 2 +- warpdrive/Makefile.am | 2 +- warpdrive/conf.sh | 2 +- warpdrive/docs/hpre.rst | 2 +- warpdrive/libwd.spec | 87 -------- 13 files changed, 10 insertions(+), 393 deletions(-) delete mode 100644 .travis.yml delete mode 100644 kae_driver/kae_driver.spec delete mode 100644 warpdrive/libwd.spec diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 59a589a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -arch: - - arm64 - -addons: - hosts: - - node1 - -scripts: - - - cd warpdrive - - sudo sh autogen.sh - - sudo ./configure - - sudo make - - sudo make install - - \ No newline at end of file diff --git a/kae_driver/hisilicon/hpre/hpre_main.c b/kae_driver/hisilicon/hpre/hpre_main.c index e3c00ab..d0b9d00 100644 --- a/kae_driver/hisilicon/hpre/hpre_main.c +++ b/kae_driver/hisilicon/hpre/hpre_main.c @@ -1051,4 +1051,4 @@ module_exit(hpre_exit); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Zaibo Xu "); MODULE_DESCRIPTION("Driver for HiSilicon HPRE accelerator"); -MODULE_VERSION("1.3.10"); +MODULE_VERSION("1.3.11"); diff --git a/kae_driver/hisilicon/qm.c b/kae_driver/hisilicon/qm.c index 7d2be84..df092f2 100644 --- a/kae_driver/hisilicon/qm.c +++ b/kae_driver/hisilicon/qm.c @@ -4250,4 +4250,4 @@ EXPORT_SYMBOL_GPL(hisi_qm_reset_done); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Zhou Wang "); MODULE_DESCRIPTION("HiSilicon Accelerator queue manager driver"); -MODULE_VERSION("1.3.10"); +MODULE_VERSION("1.3.11"); diff --git a/kae_driver/hisilicon/rde/rde_main.c b/kae_driver/hisilicon/rde/rde_main.c index 4d3650b..c02c516 100644 --- a/kae_driver/hisilicon/rde/rde_main.c +++ b/kae_driver/hisilicon/rde/rde_main.c @@ -872,4 +872,4 @@ module_exit(hisi_rde_exit); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Yu'an Wang"); MODULE_DESCRIPTION("Driver for HiSilicon RDE accelerator"); -MODULE_VERSION("1.3.10"); +MODULE_VERSION("1.3.11"); diff --git a/kae_driver/hisilicon/sec2/sec_main.c b/kae_driver/hisilicon/sec2/sec_main.c index 4e93f49..8943ea3 100644 --- a/kae_driver/hisilicon/sec2/sec_main.c +++ b/kae_driver/hisilicon/sec2/sec_main.c @@ -1024,4 +1024,4 @@ MODULE_AUTHOR("Zaibo Xu "); MODULE_AUTHOR("Longfang Liu "); MODULE_AUTHOR("Zhang Wei "); MODULE_DESCRIPTION("Driver for HiSilicon SEC accelerator"); -MODULE_VERSION("1.3.10"); +MODULE_VERSION("1.3.11"); diff --git a/kae_driver/hisilicon/sgl.c b/kae_driver/hisilicon/sgl.c index 620de2f..5858ef5 100644 --- a/kae_driver/hisilicon/sgl.c +++ b/kae_driver/hisilicon/sgl.c @@ -269,4 +269,4 @@ void hisi_acc_sg_buf_unmap(struct device *dev, struct scatterlist *sgl, hw_sgl->entry_length_in_sgl = 0; } EXPORT_SYMBOL_GPL(hisi_acc_sg_buf_unmap); -MODULE_VERSION("1.3.10"); +MODULE_VERSION("1.3.11"); diff --git a/kae_driver/hisilicon/zip/zip_main.c b/kae_driver/hisilicon/zip/zip_main.c index 30d799e..501e5d8 100644 --- a/kae_driver/hisilicon/zip/zip_main.c +++ b/kae_driver/hisilicon/zip/zip_main.c @@ -998,4 +998,4 @@ module_exit(hisi_zip_exit); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Zhou Wang "); MODULE_DESCRIPTION("Driver for HiSilicon ZIP accelerator"); -MODULE_VERSION("1.3.10"); +MODULE_VERSION("1.3.11"); diff --git a/kae_driver/kae_driver.spec b/kae_driver/kae_driver.spec deleted file mode 100644 index 72e0949..0000000 --- a/kae_driver/kae_driver.spec +++ /dev/null @@ -1,280 +0,0 @@ -Name: kae_driver -Summary: Kunpeng Accelerator Engine Kernel Driver -Version: 1.3.10 -Release: 1%dist -License: GPL-2.0 -Source: %{name}-%{version}.tar.gz -Vendor: Huawei Corporation -ExclusiveOS: linux -URL: https://support.huawei.com -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} -BuildRequires: gcc, make - -%define kernel_version %(uname -r) -%define kae_driver_path %{_builddir}/%{name}-%{version}/%{name} - -%description -This package contains the Kunpeng Accelerator Engine Kernel Driver - -%package -n uacce -Summary: Unified/User-space-access-intended Accelerator Framework -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} - -%description -n uacce -This package contains the Unified/User-space-access-intended Accelerator Framework. - -%package -n hisi_sec2 -Summary: Huawei Hisilicon SEC Accelerator Driver -Requires: uacce >= %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} - -%description -n hisi_sec2 -This package contains the Huawei Hisilicon SEC Accelerator Driver. - -%package -n hisi_hpre -Summary: Huawei Hisilicon HPRE Accelerator Driver -Requires: uacce >= %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} - -%description -n hisi_hpre -This package contains the Huawei Hisilicon HPRE Accelerator Driver. - -%package -n hisi_zip -Summary: Huawei Hisilicon ZIP Accelerator Driver -Requires: uacce >= %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} - -%description -n hisi_zip -This package contains the Huawei Hisilicon ZIP Accelerator Driver. - -%package -n hisi_rde -Summary: Huawei Hisilicon RDE Accelerator Driver -Requires: uacce >= %{version}-%{release} -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} - -%description -n hisi_rde -This package contains the Huawei Hisilicon RDE Accelerator Driver. - - -%prep -%global debug_package %{nil} - -%setup -c -n %{name}-%{version} - -%build -cd kae_driver -make - -%install -mkdir -p ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -mkdir -p ${RPM_BUILD_ROOT}/etc/modprobe.d -install -b -m -644 %{kae_driver_path}/uacce/uacce.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m -644 %{kae_driver_path}/hisilicon/hisi_qm.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m -644 %{kae_driver_path}/hisilicon/sec2/hisi_sec2.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m -644 %{kae_driver_path}/conf/hisi_sec2.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_sec2.conf -install -b -m -644 %{kae_driver_path}/hisilicon/hpre/hisi_hpre.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m -644 %{kae_driver_path}/conf/hisi_hpre.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_hpre.conf -install -b -m -644 %{kae_driver_path}/hisilicon/zip/hisi_zip.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m -644 %{kae_driver_path}/conf/hisi_zip.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_zip.conf -install -b -m -644 %{kae_driver_path}/hisilicon/rde/hisi_rde.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m -644 %{kae_driver_path}/conf/hisi_rde.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_rde.conf - -%clean -rm -rf ${RPM_BUILD_ROOT} - -%pre -n uacce -echo "checking installed modules" -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - echo "uacce modules start to install" -fi - -%pre -n hisi_sec2 -echo "checking installed modules" -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - echo "hisi_sec2 modules start to install" -fi - -%pre -n hisi_hpre -echo "checking installed modules" -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - echo "hisi_hpre modules start to install" -fi - -%pre -n hisi_zip -echo "checking installed modules" -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - echo "hisi_zip modules start to install" -fi - -%pre -n hisi_rde -echo "checking installed modules" -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - echo "hisi_rde modules start to install" -fi - -%post -n uacce -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/uacce.ko" | /sbin/weak-modules --add-module --no-initramfs - echo "/lib/modules/%{kernel_version}/extra/hisi_qm.ko" | /sbin/weak-modules --add-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "uacce modules installed" - -%post -n hisi_sec2 -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_sec2.ko" | /sbin/weak-modules --add-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_sec2 modules installed" - -%post -n hisi_hpre -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_hpre.ko" | /sbin/weak-modules --add-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_hpre modules installed" - -%post -n hisi_zip -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_zip.ko" | /sbin/weak-modules --add-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_zip modules installed" - -%post -n hisi_rde -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_rde.ko" | /sbin/weak-modules --add-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_rde modules installed" - -%preun -n uacce -if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/uacce.ko" | /sbin/weak-modules --remove-module --no-initramfs - echo "/lib/modules/%{kernel_version}/extra/hisi_qm.ko" | /sbin/weak-modules --remove-module --no-initramfs -fi -/sbin/depmod -a > /dev/null 2>&1 || true -if [ "$1" = "0" ] ; then #0: uninstall - echo "uacce modules uninstalling" -fi - -%preun -n hisi_sec2 -if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_sec2.ko" | /sbin/weak-modules --remove-module --no-initramfs -fi -if [ "$1" = "0" ] ; then #0: uninstall - echo "hisi_sec2 modules uninstalling" -fi - -%preun -n hisi_hpre -if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_hpre.ko" | /sbin/weak-modules --remove-module --no-initramfs -fi -if [ "$1" = "0" ] ; then #0: uninstall - echo "hisi_hpre modules uninstalling" -fi - -%preun -n hisi_zip -if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_zip.ko" | /sbin/weak-modules --remove-module --no-initramfs -fi -if [ "$1" = "0" ] ; then #0: uninstall - echo "hisi_zip modules uninstalling" -fi - -%preun -n hisi_rde -if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_rde.ko" | /sbin/weak-modules --remove-module --no-initramfs -fi -if [ "$1" = "0" ] ; then #0: uninstall - echo "hisi_rde modules uninstalling" -fi - -%postun -n uacce -if [ "$1" = "0" ] ; then #0: uninstall - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "uacce modules uninstalled" - -%postun -n hisi_sec2 -if [ "$1" = "0" ] ; then #0: uninstall - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_sec2.ko" | /sbin/weak-modules --remove-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_sec2 modules uninstalled" - -%postun -n hisi_hpre -if [ "$1" = "0" ] ; then #0: uninstall - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_hpre.ko" | /sbin/weak-modules --remove-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_hpre modules uninstalled" - -%postun -n hisi_zip -if [ "$1" = "0" ]; then #0: uninstall - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_zip.ko" | /sbin/weak-modules --remove-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_zip modules uninstalled" - -%postun -n hisi_rde -if [ "$1" = "0" ] ; then #0: uninstall - if [ -e /sbin/weak-modules ]; then - echo "/lib/modules/%{kernel_version}/extra/hisi_rde.ko" | /sbin/weak-modules --remove-module --no-initramfs - fi - /sbin/depmod -a > /dev/null 2>&1 || true -fi -echo "hisi_rde modules uninstalled" - -%files -n uacce -%defattr(644,root,root) -/lib/modules/%{kernel_version}/extra/uacce.ko -/lib/modules/%{kernel_version}/extra/hisi_qm.ko - - -%files -n hisi_sec2 -%defattr(644,root,root) -/lib/modules/%{kernel_version}/extra/hisi_sec2.ko -%config(noreplace) /etc/modprobe.d/hisi_sec2.conf - -%files -n hisi_hpre -%defattr(644,root,root) -/lib/modules/%{kernel_version}/extra/hisi_hpre.ko -%config(noreplace) /etc/modprobe.d/hisi_hpre.conf - -%files -n hisi_zip -%defattr(644,root,root) -/lib/modules/%{kernel_version}/extra/hisi_zip.ko -%config(noreplace) /etc/modprobe.d/hisi_zip.conf - -%files -n hisi_rde -%defattr(644,root,root) -/lib/modules/%{kernel_version}/extra/hisi_rde.ko -%config(noreplace) /etc/modprobe.d/hisi_rde.conf - -%changelog -* Tue Jan 07 2020 jinbinhua 1.2.7-1 -- First Spec Version Include all Kunpeng Accelerator Engine Kernel Driver Code \ No newline at end of file diff --git a/kae_driver/uacce/uacce.c b/kae_driver/uacce/uacce.c index a562e5c..4aee670 100644 --- a/kae_driver/uacce/uacce.c +++ b/kae_driver/uacce/uacce.c @@ -1352,4 +1352,4 @@ module_exit(uacce_exit); MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("HiSilicon Tech. Co., Ltd."); MODULE_DESCRIPTION("Accelerator interface for Userland applications"); -MODULE_VERSION("1.3.10"); +MODULE_VERSION("1.3.11"); diff --git a/warpdrive/Makefile.am b/warpdrive/Makefile.am index 087563d..483a5b4 100644 --- a/warpdrive/Makefile.am +++ b/warpdrive/Makefile.am @@ -7,7 +7,7 @@ AM_CFLAGS+=-DWITH_LOG_FILE=\"$(with_log_file)\" endif lib_LTLIBRARIES=libwd.la -libwd_la_LDFLAGS=-version-info 4:10:3 +libwd_la_LDFLAGS=-version-info 4:11:3 libwd_la_SOURCES=wd.c wd_adapter.c wd.h wd_adapter.h \ wd_rsa.c wd_rsa.h \ wd_dh.c wd_dh.h \ diff --git a/warpdrive/conf.sh b/warpdrive/conf.sh index 2a64242..4c31cd2 100644 --- a/warpdrive/conf.sh +++ b/warpdrive/conf.sh @@ -1,7 +1,7 @@ #!/bin/sh #to build hpre -# git clone https://github.com/openssl/openssl.git +# git clone openssl # get openssl from github, or get from else where # cd openssl # ./Configure linux-aarch64 --cross-compile-prefix=aarch64-linux-gnu- # add the following configure to this project (assume it is in paralle dir): diff --git a/warpdrive/docs/hpre.rst b/warpdrive/docs/hpre.rst index 489c0f5..840d36f 100644 --- a/warpdrive/docs/hpre.rst +++ b/warpdrive/docs/hpre.rst @@ -8,7 +8,7 @@ Currently we have just tested it with OpenSSL source code. To use HPRE, please compile openssl first. Here is an example to cross compile for aarch64 on linux_x86_64:: - git clone https://github.com/openssl/openssl.git # or get from elsewhere + git clone openssl # get openssl from github, or get from else where cd $openssl ./Configure linux-aarch64 --cross-compile-prefix=aarch64-linux-gnu- cd $warpdrive diff --git a/warpdrive/libwd.spec b/warpdrive/libwd.spec deleted file mode 100644 index 294b476..0000000 --- a/warpdrive/libwd.spec +++ /dev/null @@ -1,87 +0,0 @@ -Name: libwd -Summary: Huawei Accelerator Library -Version: 1.3.10 -Release: 1%dist -License: Apache-2.0 -Source: %{name}-%{version}.tar.gz -Vendor: Huawei Corporation -ExclusiveOS: linux -URL: https://support.huawei.com -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Conflicts: %{name} < %{version}-%{release} -Provides: %{name} = %{version}-%{release} -BuildRequires: automake, autoconf, libtool -BuildRequires: gcc, make - -%description -This package contains the Huawei Accelerator Library - -%prep -%global debug_package %{nil} -%setup -c -n %{name}-%{version} - -%build -cd warpdrive -sh autogen.sh -./configure -make - -%install -mkdir -p ${RPM_BUILD_ROOT}/usr/lib64 -install -b -m -755 warpdrive/.libs/libwd.so.%{version} ${RPM_BUILD_ROOT}/usr/lib64 -mkdir -p ${RPM_BUILD_ROOT}/usr/include/warpdrive -mkdir -p ${RPM_BUILD_ROOT}/usr/include/warpdrive/include -cp warpdrive/wd.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/wd_cipher.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/wd_comp.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/wd_dh.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/wd_digest.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/wd_rsa.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/wd_bmm.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/config.h ${RPM_BUILD_ROOT}/usr/include/warpdrive -cp warpdrive/include/uacce.h ${RPM_BUILD_ROOT}/usr/include/warpdrive/include - -%clean -rm -rf ${RPM_BUILD_ROOT} - -%files -%defattr(755,root,root) -/usr/lib64/libwd.so.%{version} -%defattr(644,root,root) -/usr/include/warpdrive/wd.h -/usr/include/warpdrive/wd_cipher.h -/usr/include/warpdrive/wd_comp.h -/usr/include/warpdrive/wd_dh.h -/usr/include/warpdrive/wd_digest.h -/usr/include/warpdrive/wd_rsa.h -/usr/include/warpdrive/wd_bmm.h -/usr/include/warpdrive/config.h -/usr/include/warpdrive/include/uacce.h - - -%pre -if [ "$1" = "2" ] ; then #2: update - rm -rf /usr/lib64/libwd.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd.so.1 > /dev/null 2>&1 || true -fi - -%post -if [[ "$1" = "1" || "$1" = "2" ]] ; then #1: install 2: update - cd /usr/lib64 - ln -sf libwd.so.%{version} libwd.so - ln -sf libwd.so.%{version} libwd.so.1 -fi -/sbin/ldconfig - -%preun -if [ "$1" = "0" ] ; then #0: uninstall - rm -rf /usr/lib64/libwd.so > /dev/null 2>&1 || true - rm -rf /usr/lib64/libwd.so.1 > /dev/null 2>&1 || true -fi - -%postun -/sbin/ldconfig - -%changelog -* Tue Jan 07 2020 jinbinhua 1.2.7-1 -- First Spec Version Include Warpdrive Code \ No newline at end of file