From 97a9335e8b29ad0b7f6c819909199875679b64f0 Mon Sep 17 00:00:00 2001 From: lean Date: Mon, 25 Apr 2022 19:01:44 +0800 Subject: [PATCH] quickassist-c3xxx:fix quickassist-c3xxx build --- .../qat/firmware/quickassist-c3xxx/Config.in | 2 +- .../patches/0001-fix-build.patch | 32 +++++++++++++++++++ .../0003-OsalServices-musl-bits-time.patch | 13 -------- .../patches/0004-musl-PAGE_SIZE.patch | 14 -------- 4 files changed, 33 insertions(+), 28 deletions(-) create mode 100644 package/qat/firmware/quickassist-c3xxx/patches/0001-fix-build.patch delete mode 100644 package/qat/firmware/quickassist-c3xxx/patches/0003-OsalServices-musl-bits-time.patch delete mode 100644 package/qat/firmware/quickassist-c3xxx/patches/0004-musl-PAGE_SIZE.patch diff --git a/package/qat/firmware/quickassist-c3xxx/Config.in b/package/qat/firmware/quickassist-c3xxx/Config.in index 97c65cde5..6839abf00 100644 --- a/package/qat/firmware/quickassist-c3xxx/Config.in +++ b/package/qat/firmware/quickassist-c3xxx/Config.in @@ -3,7 +3,7 @@ menu "Configuration" config QAT_C3XXX_KERNEL_OPTIONS bool - default n + default y prompt "Required kernel options for Quickassist" select KERNEL_ASN1 select KERNEL_CRYPTO_AKCIPHER diff --git a/package/qat/firmware/quickassist-c3xxx/patches/0001-fix-build.patch b/package/qat/firmware/quickassist-c3xxx/patches/0001-fix-build.patch new file mode 100644 index 000000000..f2da22eee --- /dev/null +++ b/package/qat/firmware/quickassist-c3xxx/patches/0001-fix-build.patch @@ -0,0 +1,32 @@ +From 5a59b3e55b45d9ca6b7f96f3d6a30406aa1b715f Mon Sep 17 00:00:00 2001 +From: W_Y_CPP <383152993@qq.com> +Date: Sun, 24 Apr 2022 02:53:15 -0400 +Subject: [PATCH] fix build + +--- + quickassist/utilities/osal/src/linux/user_space/OsalServices.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/quickassist/utilities/osal/src/linux/user_space/OsalServices.c b/quickassist/utilities/osal/src/linux/user_space/OsalServices.c +index e650330e7..aae8c3040 100644 +--- a/quickassist/utilities/osal/src/linux/user_space/OsalServices.c ++++ b/quickassist/utilities/osal/src/linux/user_space/OsalServices.c +@@ -360,6 +360,7 @@ OSAL_PUBLIC UINT64 osalTimestampGet(void) + OSAL_PUBLIC UINT64 osalTimestampGetNs(void) + { + OsalTimeval ptime; ++#if defined(__GLIBC__) && defined(__GLIBC_PREREQ) + #if __GLIBC_PREREQ(2, 17) + struct timespec tspec; + +@@ -372,6 +373,7 @@ OSAL_PUBLIC UINT64 osalTimestampGetNs(void) + OSAL_LOG_DEV_STDOUT, + "osalTimestampGetNs(): clock_gettime(CLOCK_REALTIME) system call " + "failed. Invoking osalTimeGet() as fallback\n"); ++#endif + #endif + ptime.secs = 0; + ptime.nsecs = 0; +-- +2.17.1 + diff --git a/package/qat/firmware/quickassist-c3xxx/patches/0003-OsalServices-musl-bits-time.patch b/package/qat/firmware/quickassist-c3xxx/patches/0003-OsalServices-musl-bits-time.patch deleted file mode 100644 index 7d62a3134..000000000 --- a/package/qat/firmware/quickassist-c3xxx/patches/0003-OsalServices-musl-bits-time.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: quickassist-c3xxx-1.7/quickassist/utilities/osal/src/linux/user_space/OsalServices.c -=================================================================== ---- quickassist-c3xxx-1.7.orig/quickassist/utilities/osal/src/linux/user_space/OsalServices.c -+++ quickassist-c3xxx-1.7/quickassist/utilities/osal/src/linux/user_space/OsalServices.c -@@ -42,7 +42,7 @@ - #define __STDC_WANT_LIB_EXT1__ 1 - #include - #include --#ifdef __linux__ -+#if defined(__linux__) && defined(__GLIBC__) - #include - #include - #endif diff --git a/package/qat/firmware/quickassist-c3xxx/patches/0004-musl-PAGE_SIZE.patch b/package/qat/firmware/quickassist-c3xxx/patches/0004-musl-PAGE_SIZE.patch deleted file mode 100644 index 1ffaa88ad..000000000 --- a/package/qat/firmware/quickassist-c3xxx/patches/0004-musl-PAGE_SIZE.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: quickassist-c3xxx-1.7/quickassist/utilities/libusdm_drv/linux/user_space/qae_page_table.h -=================================================================== ---- quickassist-c3xxx-1.7.orig/quickassist/utilities/libusdm_drv/linux/user_space/qae_page_table.h -+++ quickassist-c3xxx-1.7/quickassist/utilities/libusdm_drv/linux/user_space/qae_page_table.h -@@ -82,7 +82,9 @@ - #endif - - #ifndef __FreeBSD__ /* FreeBSD, already defined in machine param.h */ -+#if defined(__GLIBC__) - #define PAGE_SIZE (0x1000) -+#endif - #define PAGE_SHIFT (12) - #endif -