[dpdk-dev] [PATCH v2] qat: fix for VFs not getting recognized

[dpdk-dev] [PATCH v2] qat: fix for VFs not getting recognized

[Jain, Deepak K]

Updated the code to use RTE_PCI_DEVICE.

Fixes: 701c8d80c820 ("pci: support class id probing")

Signed-off-by: Jain, Deepak K <deepak.k.jain@intel.com>
---
 drivers/crypto/qat/rte_qat_cryptodev.c          | 10 +++-------
 lib/librte_eal/common/include/rte_pci_dev_ids.h | 10 ++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/crypto/qat/rte_qat_cryptodev.c b/drivers/crypto/qat/rte_qat_cryptodev.c
index a7912f5..31d3c0c 100644
--- a/drivers/crypto/qat/rte_qat_cryptodev.c
+++ b/drivers/crypto/qat/rte_qat_cryptodev.c
@@ -68,13 +68,9 @@ static struct rte_cryptodev_ops crypto_qat_ops = {
  */
 
 static struct rte_pci_id pci_id_qat_map[] = {
-		{
-			.vendor_id = 0x8086,
-			.device_id = 0x0443,
-			.subsystem_vendor_id = PCI_ANY_ID,
-			.subsystem_device_id = PCI_ANY_ID
-		},
-		{.device_id = 0},
+#define RTE_PCI_DEV_ID_DECL_QATVF(vend, dev) {RTE_PCI_DEVICE(vend, dev)},
+#include "rte_pci_dev_ids.h"
+{.device_id = 0},
 };
 
 static int
diff --git a/lib/librte_eal/common/include/rte_pci_dev_ids.h b/lib/librte_eal/common/include/rte_pci_dev_ids.h
index cf7b548..a4fc430 100644
--- a/lib/librte_eal/common/include/rte_pci_dev_ids.h
+++ b/lib/librte_eal/common/include/rte_pci_dev_ids.h
@@ -152,6 +152,10 @@
 #define RTE_PCI_DEV_ID_DECL_BNX2XVF(vend, dev)
 #endif
 
+#ifndef RTE_PCI_DEV_ID_DECL_QATVF
+#define RTE_PCI_DEV_ID_DECL_QATVF(vend, dev)
+#endif
+
 #ifndef PCI_VENDOR_ID_INTEL
 /** Vendor ID used by Intel devices */
 #define PCI_VENDOR_ID_INTEL 0x8086
@@ -615,6 +619,12 @@ RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_A0_VF)
 RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_VF)
 RTE_PCI_DEV_ID_DECL_I40EVF(PCI_VENDOR_ID_INTEL, I40E_DEV_ID_X722_VF_HV)
 
+/****************** Intel QuickAssist(QAT) Device ******************/
+
+#define QAT_DEV_ID_895XCC_VF            0x0443
+
+RTE_PCI_DEV_ID_DECL_QATVF(PCI_VENDOR_ID_INTEL, QAT_DEV_ID_895XCC_VF)
+
 /****************** Virtio devices from virtio.h ******************/
 
 #define QUMRANET_DEV_ID_VIRTIO                  0x1000
-- 
2.5.5

Re: [dpdk-dev] [PATCH v2] qat: fix for VFs not getting recognized

[Thomas Monjalon]

2016-06-20 17:10, Jain, Deepak K:
> Updated the code to use RTE_PCI_DEVICE.
> 
> Fixes: 701c8d80c820 ("pci: support class id probing")
> 
> Signed-off-by: Jain, Deepak K <deepak.k.jain@intel.com>
> ---
>  drivers/crypto/qat/rte_qat_cryptodev.c          | 10 +++-------
>  lib/librte_eal/common/include/rte_pci_dev_ids.h | 10 ++++++++++

Please keep the PCI ids in the driver.

[dpdk-dev] [PATCH v3] qat: fix for VFs not getting recognized

[Deepak Kumar Jain]

From: "Jain, Deepak K" <deepak.k.jain@intel.com>

Updated the code to use RTE_PCI_DEVICE.

Fixes: 701c8d80c820 ("pci: support class id probing")

Signed-off-by: Jain, Deepak K <deepak.k.jain@intel.com>
---
v3: kept PCI id in the driver file

v2: updated code to use RTE_PCI_DEVICE

 drivers/crypto/qat/rte_qat_cryptodev.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/crypto/qat/rte_qat_cryptodev.c b/drivers/crypto/qat/rte_qat_cryptodev.c
index a7912f5..f46ec85 100644
--- a/drivers/crypto/qat/rte_qat_cryptodev.c
+++ b/drivers/crypto/qat/rte_qat_cryptodev.c
@@ -69,10 +69,7 @@ static struct rte_cryptodev_ops crypto_qat_ops = {
 
 static struct rte_pci_id pci_id_qat_map[] = {
 		{
-			.vendor_id = 0x8086,
-			.device_id = 0x0443,
-			.subsystem_vendor_id = PCI_ANY_ID,
-			.subsystem_device_id = PCI_ANY_ID
+			RTE_PCI_DEVICE(0x8086, 0x0443),
 		},
 		{.device_id = 0},
 };
-- 
2.5.5

Re: [dpdk-dev] [PATCH v3] qat: fix for VFs not getting recognized

[Thomas Monjalon]

2016-06-21 10:03, Deepak Kumar Jain:
> From: "Jain, Deepak K" <deepak.k.jain@intel.com>
> 
> Updated the code to use RTE_PCI_DEVICE.
> 
> Fixes: 701c8d80c820 ("pci: support class id probing")
> 
> Signed-off-by: Jain, Deepak K <deepak.k.jain@intel.com>

Applied, thanks