Support integration with new QAT products

Support integration with new QAT products: Intel(R) C62x Chipset,
or Atom(R) C3000 Processor Product Family SoC:
1. Detect new file name in auto-conf.
2. Change MAX_INSTANCES to 48.
3. Change "num_inst" to U16 to clean a build warning.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Weigang Li <weigang.li@intel.com>
Closes #6767
This commit is contained in:
wli5 2017-10-21 02:11:25 +08:00 committed by Brian Behlendorf
parent 6044cf59cd
commit 1cfdb0e6e4
2 changed files with 7 additions and 5 deletions

View File

@ -532,10 +532,10 @@ AC_DEFUN([ZFS_AC_QAT], [
AC_MSG_RESULT([$qatbuild]) AC_MSG_RESULT([$qatbuild])
QAT_OBJ=${qatbuild} QAT_OBJ=${qatbuild}
AS_IF([ ! test -e "$QAT_OBJ/icp_qa_al.ko"], [ AS_IF([ ! test -e "$QAT_OBJ/icp_qa_al.ko" && ! test -e "$QAT_OBJ/qat_api.ko"], [
AC_MSG_ERROR([ AC_MSG_ERROR([
*** Please make sure the qat driver is installed then try again. *** Please make sure the qat driver is installed then try again.
*** Failed to find icp_qa_al.ko in: *** Failed to find icp_qa_al.ko or qat_api.ko in:
$QAT_OBJ]) $QAT_OBJ])
]) ])

View File

@ -34,9 +34,11 @@
/* /*
* Max instances in QAT device, each instance is a channel to submit * Max instances in QAT device, each instance is a channel to submit
* jobs to QAT hardware * jobs to QAT hardware, this is only for pre-allocating instance,
* and session arrays, the actual number of instances are defined in
* the QAT driver's configure file.
*/ */
#define MAX_INSTANCES 6 #define MAX_INSTANCES 48
/* /*
* ZLIB head and foot size * ZLIB head and foot size
@ -104,7 +106,7 @@ static kstat_t *qat_ksp;
static CpaInstanceHandle dc_inst_handles[MAX_INSTANCES]; static CpaInstanceHandle dc_inst_handles[MAX_INSTANCES];
static CpaDcSessionHandle session_handles[MAX_INSTANCES]; static CpaDcSessionHandle session_handles[MAX_INSTANCES];
static CpaBufferList **buffer_array[MAX_INSTANCES]; static CpaBufferList **buffer_array[MAX_INSTANCES];
static Cpa32U num_inst = 0; static Cpa16U num_inst = 0;
static Cpa32U inst_num = 0; static Cpa32U inst_num = 0;
static boolean_t qat_init_done = B_FALSE; static boolean_t qat_init_done = B_FALSE;
int zfs_qat_disable = 0; int zfs_qat_disable = 0;