Commit d91fd042 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

pkgdep/git: Add patch for QAT driver addressing changes in 6.4 kernels 



Change-Id: If783f0b1e08e15e7a6eb99aae80e0831eda5360b
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19166


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c2fdd754

test/common/config/pkgdep/git

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,13 @@ function install_qat() { 
		patch --dir="$GIT_REPOS/QAT" -p1

	fi < "$rootdir/test/common/config/pkgdep/patches/qat/0001-iommu_map.patch"



	if ge "$kernel_ver" 6.4.0; then

		patch --dir="$GIT_REPOS/QAT" -p1 \

			< "$rootdir/test/common/config/pkgdep/patches/qat/0001-driver-core+semaphore.patch"

		patch --dir="$GIT_REPOS/QAT" -p1 \

			< "$rootdir/test/common/config/pkgdep/patches/qat/0001-algapi.patch"

	fi



	(cd "$GIT_REPOS/QAT" && sudo ./configure --enable-icp-sriov=host && sudo make install)



	if ! sudo service qat_service start; then

test/common/config/pkgdep/patches/qat/0001-algapi.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
MODULE_ALIAS_CRYPTO() was moved to crypto/algapi.h in kernel 6.4. See:

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0c0edf6168ce1e02518ba44400b9269a13c3b9e6

---

 quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c | 1 +

 1 file changed, 1 insertion(+)



diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c

index 8a33cc7..8e40e91 100644

--- a/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c

+++ b/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c

@@ -12,6 +12,7 @@

 #include <linux/device.h>

 #include <linux/notifier.h>

 #include <linux/reboot.h>

+#include <crypto/algapi.h>

 

 #include "adf_accel_devices.h"

 #include "adf_common_drv.h"

--

test/common/config/pkgdep/patches/qat/0001-driver-core+semaphore.patch

0 → 100644
+106 −0
Original line number Diff line number Diff line 
Changes in class_create() and DEFINE_SEMAPHORE() introduced in kernel 6.4

by the following commits:



https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1aaba11da9aa7d7d6b52a74d45b31cac118295a1

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=48380368dec14859723b9e3fbd43e042638d9a76



---

 quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c   | 2 +-

 .../qat/drivers/crypto/qat/qat_common/adf_dev_processes.c     | 4 ++--

 quickassist/qat/drivers/crypto/qat/qat_common/qat_dbg_drv.c   | 2 +-

 .../utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c    | 2 +-

 .../utilities/osal/src/linux/kernel_space/OsalThread.c        | 4 ++--

 .../utilities/osal/src/linux/kernel_space/OsalUsrKrlProxy.c   | 3 +--

 6 files changed, 8 insertions(+), 9 deletions(-)



diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c

index 10624f8..8e40e91 100644

--- a/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c

+++ b/quickassist/qat/drivers/crypto/qat/qat_common/adf_ctl_drv.c

@@ -161,7 +161,7 @@ static int adf_chr_drv_create(void)

 		return -EFAULT;

 	}

 

-	adf_ctl_drv.drv_class = class_create(THIS_MODULE, DEVICE_NAME);

+	adf_ctl_drv.drv_class = class_create(DEVICE_NAME);

 	if (IS_ERR(adf_ctl_drv.drv_class)) {

 		pr_err("QAT: class_create failed for adf_ctl\n");

 		goto err_chrdev_unreg;

diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/adf_dev_processes.c b/quickassist/qat/drivers/crypto/qat/qat_common/adf_dev_processes.c

index 08e5bea..ad41dbb 100644

--- a/quickassist/qat/drivers/crypto/qat/qat_common/adf_dev_processes.c

+++ b/quickassist/qat/drivers/crypto/qat/qat_common/adf_dev_processes.c

@@ -60,7 +60,7 @@ static struct adf_chr_drv_info adf_processes_drv_info = {

 };

 

 static LIST_HEAD(processes_list);

-static DEFINE_SEMAPHORE(processes_list_sema);

+static DEFINE_SEMAPHORE(processes_list_sema, 1);

 

 static void adf_chr_drv_destroy(void)

 {

@@ -83,7 +83,7 @@ static int adf_chr_drv_create(void)

 	}

 

 	adf_processes_drv_info.drv_class =

-		class_create(THIS_MODULE, ADF_DEV_PROCESSES_NAME);

+		class_create(ADF_DEV_PROCESSES_NAME);

 	if (IS_ERR(adf_processes_drv_info.drv_class)) {

 		pr_err("QAT: class_create failed for adf_ctl\n");

 		goto err_chrdev_unreg;

diff --git a/quickassist/qat/drivers/crypto/qat/qat_common/qat_dbg_drv.c b/quickassist/qat/drivers/crypto/qat/qat_common/qat_dbg_drv.c

index 1868f36..d90542d 100644

--- a/quickassist/qat/drivers/crypto/qat/qat_common/qat_dbg_drv.c

+++ b/quickassist/qat/drivers/crypto/qat/qat_common/qat_dbg_drv.c

@@ -405,7 +405,7 @@ static int qat_dbg_chr_drv_create(void)

 		return -EFAULT;

 	}

 

-	qatd_drv.drv_class = class_create(THIS_MODULE, QATD_DEVICE_NAME);

+	qatd_drv.drv_class = class_create(QATD_DEVICE_NAME);

 	if (IS_ERR(qatd_drv.drv_class)) {

 		pr_err("QAT: class_create failed for qat_dbg\n");

 		goto err_chrdev_unreg;

diff --git a/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c b/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c

index 0cf9733..c2bef72 100644

--- a/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c

+++ b/quickassist/utilities/libusdm_drv/linux/kernel_space/qae_mem_drv.c

@@ -1197,7 +1197,7 @@ chr_drv_create_class(chr_drv_info_t* drv_info)

                      "chr_drv_create_class(): Invalid parameter value ",

                      -EINVAL);

 

-    drv_info->drv_class = class_create(THIS_MODULE, drv_info->name);

+    drv_info->drv_class = class_create(drv_info->name);

     if (IS_ERR(drv_info->drv_class))

     {

         mm_err("%s:%d class_create failed\n",__func__,__LINE__);

diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalThread.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalThread.c

index c7b5839..b2c1927 100644

--- a/quickassist/utilities/osal/src/linux/kernel_space/OsalThread.c

+++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalThread.c

@@ -78,8 +78,8 @@

 DECLARE_MUTEX (osalThreadMutex);

 DECLARE_MUTEX (osalThreadStopMutex);

 #else

-DEFINE_SEMAPHORE (osalThreadMutex);

-DEFINE_SEMAPHORE (osalThreadStopMutex);

+DEFINE_SEMAPHORE (osalThreadMutex, 1);

+DEFINE_SEMAPHORE (osalThreadStopMutex, 1);

 #endif

 

 OSAL_PUBLIC OSAL_STATUS

diff --git a/quickassist/utilities/osal/src/linux/kernel_space/OsalUsrKrlProxy.c b/quickassist/utilities/osal/src/linux/kernel_space/OsalUsrKrlProxy.c

index fe81da1..8886220 100644

--- a/quickassist/utilities/osal/src/linux/kernel_space/OsalUsrKrlProxy.c

+++ b/quickassist/utilities/osal/src/linux/kernel_space/OsalUsrKrlProxy.c

@@ -621,8 +621,7 @@ chr_drv_create_class(chr_drv_info_t* drv_info, char* path)

 

     }

 

-    drv_info->drv_class = class_create(THIS_MODULE,

-                       (path) ? name : drv_info->name);

+    drv_info->drv_class = class_create((path) ? name : drv_info->name);

     if (IS_ERR(drv_info->drv_class)) {

         osalLog(

             OSAL_LOG_LVL_ERROR, OSAL_LOG_DEV_STDOUT, "class_create failed\n");

--