diff --git a/KAEdriver-1.3.6.tar.gz b/KAEdriver-1.3.6.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..10805423cee0f2c0bd0db34f508dd88fcc36befd Binary files /dev/null and b/KAEdriver-1.3.6.tar.gz differ diff --git a/change-sva-macros-to-version2.patch b/change-sva-macros-to-version2.patch deleted file mode 100644 index 4bd925d1dec65dc4c8dc7c77db2b7688fd25fb96..0000000000000000000000000000000000000000 --- a/change-sva-macros-to-version2.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nur kae_driver-1.2.8.old/uacce/uacce.c kae_driver-1.2.8/uacce/uacce.c ---- kae_driver-1.2.8.old/kae_driver/uacce/uacce.c 2020-02-03 16:15:12.585798416 +0800 -+++ kae_driver-1.2.8/kae_driver/uacce/uacce.c 2020-02-03 16:16:25.797131365 +0800 -@@ -969,7 +969,7 @@ - if (is_to_free_region) - uacce_destroy_region(q, qfr); - } --#ifdef CONFIG_IOMMU_SVA -+#ifdef CONFIG_IOMMU_SVA2 - if (uacce->flags & UACCE_DEV_SVA) - iommu_sva_unbind_device(uacce->pdev, q->pasid); - #endif -@@ -1019,7 +1019,7 @@ - int ret; - int pasid = 0; - --#ifdef CONFIG_IOMMU_SVA -+#ifdef CONFIG_IOMMU_SVA2 - if (uacce->flags & UACCE_DEV_PASID) { - ret = iommu_sva_bind_device(uacce->pdev, current->mm, &pasid, - IOMMU_SVA_FEAT_IOPF, NULL); -@@ -1052,7 +1052,7 @@ - return 0; - - err_unbind: --#ifdef CONFIG_IOMMU_SVA -+#ifdef CONFIG_IOMMU_SVA2 - if (uacce->flags & UACCE_DEV_PASID) - iommu_sva_unbind_device(uacce->pdev, pasid); - #endif -@@ -1557,7 +1557,7 @@ - return 0; - } - --#ifndef CONFIG_IOMMU_SVA -+#ifndef CONFIG_IOMMU_SVA2 - static int uacce_dev_match(struct device *dev, void *data) - { - if (dev->parent == data) -@@ -1732,7 +1732,7 @@ - uacce->ops->get_available_instances = - uacce_default_get_available_instances; - --#ifndef CONFIG_IOMMU_SVA -+#ifndef CONFIG_IOMMU_SVA2 - ret = uacce_set_iommu_domain(uacce); - if (ret) - return ret; -@@ -1745,7 +1745,7 @@ - } - - if (uacce->flags & UACCE_DEV_PASID) { --#ifdef CONFIG_IOMMU_SVA -+#ifdef CONFIG_IOMMU_SVA2 - ret = iommu_sva_init_device(uacce->pdev, IOMMU_SVA_FEAT_IOPF, - 0, 0, NULL); - if (ret) { -@@ -1780,7 +1780,7 @@ - return -EAGAIN; - } - --#ifdef CONFIG_IOMMU_SVA -+#ifdef CONFIG_IOMMU_SVA2 - iommu_sva_shutdown_device(uacce->pdev); - #else - uacce_unset_iommu_domain(uacce); diff --git a/kae_driver-1.2.10.tar.gz b/kae_driver-1.2.10.tar.gz deleted file mode 100644 index 896350745a655c034ddd2966e294caf35bbedbd9..0000000000000000000000000000000000000000 Binary files a/kae_driver-1.2.10.tar.gz and /dev/null differ diff --git a/kae_driver.spec b/kae_driver.spec index 5469d7d06f48eae57b21051a7c046df8f11c16aa..088f0708353146bf6060c492feacd09f3e31aaa2 100644 --- a/kae_driver.spec +++ b/kae_driver.spec @@ -1,9 +1,7 @@ -%global debug_package %{nil} - Name: kae_driver Summary: Kunpeng Accelerator Engine Kernel Driver -Version: 1.2.10 -Release: 4 +Version: 1.3.6 +Release: 1%dist License: GPL-2.0 Source: %{name}-%{version}.tar.gz Vendor: Huawei Corporation @@ -12,9 +10,7 @@ URL: https://support.huawei.com BuildRoot: %{_tmppath}/%{name}-%{version}-root Conflicts: %{name} < %{version}-%{release} Provides: %{name} = %{version}-%{release} -BuildRequires: kernel-devel, gcc, make -ExclusiveArch: aarch64 -Patch0000: change-sva-macros-to-version2.patch +BuildRequires: gcc, make %define kernel_version %(uname -r) %define kae_driver_path %{_builddir}/%{name}-%{version}/%{name} @@ -68,7 +64,9 @@ This package contains the Huawei Hisilicon RDE Accelerator Driver. %prep -%autosetup -c -n %{name}-%{version} -p1 +%global debug_package %{nil} + +%setup -c -n %{name}-%{version} %build cd kae_driver @@ -77,16 +75,16 @@ make %install mkdir -p ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra mkdir -p ${RPM_BUILD_ROOT}/etc/modprobe.d -install -b -m644 %{kae_driver_path}/uacce/uacce.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m644 %{kae_driver_path}/hisilicon/hisi_qm.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m644 %{kae_driver_path}/hisilicon/sec2/hisi_sec2.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m644 %{kae_driver_path}/conf/hisi_sec2.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_sec2.conf -install -b -m644 %{kae_driver_path}/hisilicon/hpre/hisi_hpre.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m644 %{kae_driver_path}/conf/hisi_hpre.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_hpre.conf -install -b -m644 %{kae_driver_path}/hisilicon/zip/hisi_zip.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m644 %{kae_driver_path}/conf/hisi_zip.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_zip.conf -install -b -m644 %{kae_driver_path}/hisilicon/rde/hisi_rde.ko ${RPM_BUILD_ROOT}/lib/modules/%{kernel_version}/extra -install -b -m644 %{kae_driver_path}/conf/hisi_rde.conf ${RPM_BUILD_ROOT}/etc/modprobe.d/hisi_rde.conf +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} @@ -123,55 +121,88 @@ 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 @@ -184,24 +215,36 @@ 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 [ "$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" @@ -233,11 +276,5 @@ echo "hisi_rde modules uninstalled" %config(noreplace) /etc/modprobe.d/hisi_rde.conf %changelog -* Sun Mar 15 2020 zhangtao 1.2.10-3 -- specify aarch64 compilation - -* Tue Mar 03 2020 catastrowings 1.2.10-2 -- openEuler init - * Tue Jan 07 2020 jinbinhua 1.2.7-1 -- First Spec Version Include all Kunpeng Accelerator Engine Kernel Driver Code +- First Spec Version Include all Kunpeng Accelerator Engine Kernel Driver Code \ No newline at end of file