diff --git a/change-sva-macros-to-version2.patch b/change-sva-macros-to-version2.patch index 4bd925d1dec65dc4c8dc7c77db2b7688fd25fb96..224327e7927cd199e15705ba5e65c3b1423d2d72 100644 --- a/change-sva-macros-to-version2.patch +++ b/change-sva-macros-to-version2.patch @@ -1,66 +1,23 @@ -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); +From 8e5adc642156d65303c804e255fc39cb69679c44 Mon Sep 17 00:00:00 2001 +From: l00584920 +Date: Tue, 28 Nov 2023 16:10:51 +0800 +Subject: [PATCH] fix 20.03-sp4 build error + +Signed-off-by: l00584920 +--- + hisilicon/Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/hisilicon/Makefile b/hisilicon/Makefile +index c766a09..eafceb9 100644 +--- a/hisilicon/Makefile ++++ b/hisilicon/Makefile +@@ -1,5 +1,4 @@ + # SPDX-License-Identifier: GPL-2.0 +-obj-$(CONFIG_CRYPTO_DEV_HISI_SEC) += sec/ + obj-$(CONFIG_CRYPTO_DEV_HISI_QM) += hisi_qm.o + hisi_qm-objs = qm.o sgl.o + obj-$(CONFIG_CRYPTO_DEV_HISI_ZIP) += zip/ +-- +2.28.0.windows.1 + diff --git a/kae_driver.spec b/kae_driver.spec index 7e7ed9ad67d5726017508bc184f9a33716b5fc2d..a48c60a075049e6044310ba8c0fa8a166ae2cdfe 100644 --- a/kae_driver.spec +++ b/kae_driver.spec @@ -15,6 +15,8 @@ Provides: %{name} = %{version}-%{release} BuildRequires: kernel-devel, kernel, gcc, make, uname-build-checks ExclusiveArch: aarch64 +Patch0001: change-sva-macros-to-version2.patch + %define kernel_version %(uname -r) %define kae_driver_path %{_builddir}/%{name}-%{version}/%{name}