feat(core) QAT init fix

Signed-off-by: Peter Mikus <peter.mikus@icloud.com>
Change-Id: I45198b17cfb6b62608bb03e6b1a4af0f939d10ae

7 files changed, 16 insertions, 43 deletions

diff --git a/topologies/available/lf_3n_emr_testbed28.yaml b/topologies/available/lf_3n_emr_testbed28.yaml
index a741e86e3e..f16a208022 100644
--- a/topologies/available/lf_3n_emr_testbed28.yaml
+++ b/topologies/available/lf_3n_emr_testbed28.yaml
@@ -49,6 +49,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:70:00.0"
+        qat_dev: qat_dev0
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
@@ -87,6 +88,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:ed:00.0"
+        qat_dev: qat_dev1
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
diff --git a/topologies/available/lf_3n_emr_testbed29.yaml b/topologies/available/lf_3n_emr_testbed29.yaml
index 739c23dc7f..e981bf0090 100644
--- a/topologies/available/lf_3n_emr_testbed29.yaml
+++ b/topologies/available/lf_3n_emr_testbed29.yaml
@@ -20,13 +20,6 @@ nodes:
         pci_address: "0000:6a:01.0"
         driver: idxd
         model: Intel-DSA
-    cryptodev:
-      device1:
-        pci_address: "0000:70:00.0"
-        driver: 4xxx
-        model: HW_4xxx
-        module: qat_4xxx
-        numvfs: 8
     interfaces:
       port1:
         # s41-t29-tg1-c4/p1 - 100GE port1 Intel E810-2C-Q2 2p100GE.
@@ -61,6 +54,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:70:00.0"
+        qat_dev: qat_dev0
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
@@ -99,6 +93,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:ed:00.0"
+        qat_dev: qat_dev1
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
diff --git a/topologies/available/lf_3n_icxd_testbed31.yaml b/topologies/available/lf_3n_icxd_testbed31.yaml
index a3883104f3..ba13bfa4e8 100644
--- a/topologies/available/lf_3n_icxd_testbed31.yaml
+++ b/topologies/available/lf_3n_icxd_testbed31.yaml
@@ -43,6 +43,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:81:00.0"
+        qat_dev: qat_dev0
         driver: c4xxx
         model: HW_C4xxx
         module: qat_c4xxx
@@ -76,6 +77,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:81:00.0"
+        qat_dev: qat_dev0
         driver: c4xxx
         model: HW_C4xxx
         module: qat_c4xxx
diff --git a/topologies/available/lf_3n_icxd_testbed32.yaml b/topologies/available/lf_3n_icxd_testbed32.yaml
index efdeb7d30e..893219b70f 100644
--- a/topologies/available/lf_3n_icxd_testbed32.yaml
+++ b/topologies/available/lf_3n_icxd_testbed32.yaml
@@ -43,6 +43,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:81:00.0"
+        qat_dev: qat_dev0
         driver: c4xxx
         model: HW_C4xxx
         module: qat_c4xxx
@@ -76,6 +77,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:81:00.0"
+        qat_dev: qat_dev0
         driver: c4xxx
         model: HW_C4xxx
         module: qat_c4xxx
diff --git a/topologies/available/lf_3n_snr_testbed39.yaml b/topologies/available/lf_3n_snr_testbed39.yaml
index 53702b04d7..e4f2d82230 100644
--- a/topologies/available/lf_3n_snr_testbed39.yaml
+++ b/topologies/available/lf_3n_snr_testbed39.yaml
@@ -59,6 +59,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:f4:00.0"
+        qat_dev: qat_dev0
         driver: c4xxx
         model: HW_C4xxx
         module: qat_c4xxx
@@ -108,6 +109,7 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:f4:00.0"
+        qat_dev: qat_dev0
         driver: c4xxx
         model: HW_C4xxx
         module: qat_c4xxx
diff --git a/topologies/available/lf_3na_spr_testbed21.yaml b/topologies/available/lf_3na_spr_testbed21.yaml
index 6cee2f22cd..0bb179f118 100644
--- a/topologies/available/lf_3na_spr_testbed21.yaml
+++ b/topologies/available/lf_3na_spr_testbed21.yaml
@@ -27,16 +27,11 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:76:00.0"
+        qat_dev: qat_dev0
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
         numvfs: 8
-      #device2:
-      #  pci_address: "0000:7a:00.0"
-      #  driver: 4xxx
-      #  model: HW_4xxx
-      #  module: qat_4xxx
-      #  numvfs: 8
     interfaces:
       port1:
         # s53-t21-tg1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
@@ -123,16 +118,11 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:76:00.0"
+        qat_dev: qat_dev0
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
         numvfs: 8
-      #device2:
-      #  pci_address: "0000:7a:00.0"
-      #  driver: 4xxx
-      #  model: HW_4xxx
-      #  module: qat_4xxx
-      #  numvfs: 8
     interfaces:
       port1:
         # s52-t21-sut1-c4/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
@@ -203,16 +193,11 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:f3:00.0"
+        qat_dev: qat_dev1
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
         numvfs: 8
-      #device2:
-      #  pci_address: "0000:f7:00.0"
-      #  driver: 4xxx
-      #  model: HW_4xxx
-      #  module: qat_4xxx
-      #  numvfs: 8
     interfaces:
       port1:
         # s52-t21-sut2-c9/p1 - 200GE port1 Mellanox ConnectX7-2p200GE.
diff --git a/topologies/available/lf_3nb_spr_testbed22.yaml b/topologies/available/lf_3nb_spr_testbed22.yaml
index ccabfb38f9..bd4ea57f60 100644
--- a/topologies/available/lf_3nb_spr_testbed22.yaml
+++ b/topologies/available/lf_3nb_spr_testbed22.yaml
@@ -27,16 +27,11 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:76:00.0"
+        qat_dev: qat_dev0
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
         numvfs: 8
-      #device2:
-      #  pci_address: "0000:7a:00.0"
-      #  driver: 4xxx
-      #  model: HW_4xxx
-      #  module: qat_4xxx
-      #  numvfs: 8
     interfaces:
       port1:
         # s55-t22-tg1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
@@ -91,16 +86,11 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:76:00.0"
+        qat_dev: qat_dev0
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
         numvfs: 8
-      #device2:
-      #  pci_address: "0000:7a:00.0"
-      #  driver: 4xxx
-      #  model: HW_4xxx
-      #  module: qat_4xxx
-      #  numvfs: 8
     interfaces:
       port1:
         # s54-t22-sut1-c4/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.
@@ -155,16 +145,11 @@ nodes:
     cryptodev:
       device1:
         pci_address: "0000:f3:00.0"
+        qat_dev: qat_dev1
         driver: 4xxx
         model: HW_4xxx
         module: qat_4xxx
         numvfs: 8
-      #device2:
-      #  pci_address: "0000:f7:00.0"
-      #  driver: 4xxx
-      #  model: HW_4xxx
-      #  module: qat_4xxx
-      #  numvfs: 8
     interfaces:
       port1:
         # s54-t22-sut1-c9/p1 - 100GE port1 Intel E810-CQDA2 2p100GE.