[v3,32/38] crypto/qat: add max PCI devices to config file

Message ID 1528892062-4997-33-git-send-email-tomaszx.jozwiak@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Pablo de Lara Guarch
Headers
Series crypto/qat: refactor to support multiple services |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Tomasz Jozwiak June 13, 2018, 12:14 p.m. UTC
  From: Fiona Trahe <fiona.trahe@intel.com>

Added CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES to
build config files.

Signed-off-by: Tomasz Jozwiak <tomaszx.jozwiak@intel.com>
---
 config/common_base              | 5 ++++-
 config/rte_config.h             | 2 ++
 drivers/crypto/qat/qat_device.c | 8 ++++----
 drivers/crypto/qat/qat_device.h | 2 --
 4 files changed, 10 insertions(+), 7 deletions(-)
  

Patch

diff --git a/config/common_base b/config/common_base
index 6b0d1cbbb..cf0741199 100644
--- a/config/common_base
+++ b/config/common_base
@@ -495,7 +495,10 @@  CONFIG_RTE_LIBRTE_PMD_QAT_DEBUG_DRIVER=n
 # on a single QuickAssist device.
 #
 CONFIG_RTE_QAT_PMD_MAX_NB_SESSIONS=2048
-
+#
+# Max. number of QuickAssist devices, which can be detected and attached
+#
+CONFIG_RTE_PMD_QAT_MAX_PCI_DEVICES=48
 #
 # Compile PMD for virtio crypto devices
 #
diff --git a/config/rte_config.h b/config/rte_config.h
index a1d01759e..e353d8d6d 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -91,6 +91,8 @@ 
  */
 /* QuickAssist device */
 #define RTE_QAT_PMD_MAX_NB_SESSIONS 2048
+/* Max. number of QuickAssist devices which can be attached */
+#define RTE_PMD_QAT_MAX_PCI_DEVICES 48
 
 /* virtio crypto defines */
 #define RTE_VIRTIO_CRYPTO_PMD_MAX_NB_SESSIONS 1024
diff --git a/drivers/crypto/qat/qat_device.c b/drivers/crypto/qat/qat_device.c
index a0e414905..0cab2e928 100644
--- a/drivers/crypto/qat/qat_device.c
+++ b/drivers/crypto/qat/qat_device.c
@@ -23,7 +23,7 @@  struct qat_gen_hw_data qat_gen_config[] =  {
 };
 
 
-static struct qat_pci_device qat_pci_devices[QAT_MAX_PCI_DEVICES];
+static struct qat_pci_device qat_pci_devices[RTE_PMD_QAT_MAX_PCI_DEVICES];
 static int qat_nb_pci_devices;
 
 /*
@@ -62,7 +62,7 @@  qat_pci_get_named_dev(const char *name)
 	if (name == NULL)
 		return NULL;
 
-	for (i = 0; i < QAT_MAX_PCI_DEVICES; i++) {
+	for (i = 0; i < RTE_PMD_QAT_MAX_PCI_DEVICES; i++) {
 		dev = &qat_pci_devices[i];
 
 		if ((dev->attached == QAT_ATTACHED) &&
@@ -78,7 +78,7 @@  qat_pci_find_free_device_index(void)
 {
 	uint8_t dev_id;
 
-	for (dev_id = 0; dev_id < QAT_MAX_PCI_DEVICES; dev_id++) {
+	for (dev_id = 0; dev_id < RTE_PMD_QAT_MAX_PCI_DEVICES; dev_id++) {
 		if (qat_pci_devices[dev_id].attached == QAT_DETACHED)
 			break;
 	}
@@ -111,7 +111,7 @@  qat_pci_device_allocate(struct rte_pci_device *pci_dev)
 	}
 
 	qat_dev_id = qat_pci_find_free_device_index();
-	if (qat_dev_id == QAT_MAX_PCI_DEVICES) {
+	if (qat_dev_id == RTE_PMD_QAT_MAX_PCI_DEVICES) {
 		PMD_DRV_LOG(ERR, "Reached maximum number of QAT devices");
 		return NULL;
 	}
diff --git a/drivers/crypto/qat/qat_device.h b/drivers/crypto/qat/qat_device.h
index 3df6520c3..e18c8a706 100644
--- a/drivers/crypto/qat/qat_device.h
+++ b/drivers/crypto/qat/qat_device.h
@@ -11,11 +11,9 @@ 
 #include "adf_transport_access_macros.h"
 #include "qat_qp.h"
 
-
 #define QAT_DETACHED  (0)
 #define QAT_ATTACHED  (1)
 
-#define QAT_MAX_PCI_DEVICES	48
 #define QAT_DEV_NAME_MAX_LEN	64
 
 /*