diff --git a/MAINTAINERS b/MAINTAINERS
index 854b81f2a3..336bbb3547 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -534,15 +534,6 @@ T: git://dpdk.org/next/dpdk-next-net-mrvl
 F: drivers/mempool/cnxk/
 F: doc/guides/mempool/cnxk.rst
 
-Marvell OCTEON TX2
-M: Jerin Jacob <jerinj@marvell.com>
-M: Nithin Dabilpuram <ndabilpuram@marvell.com>
-F: drivers/common/octeontx2/
-F: drivers/mempool/octeontx2/
-F: doc/guides/platform/img/octeontx2_*
-F: doc/guides/platform/octeontx2.rst
-F: doc/guides/mempool/octeontx2.rst
-
 
 Bus Drivers
 -----------
@@ -795,21 +786,6 @@ F: drivers/net/mvneta/
 F: doc/guides/nics/mvneta.rst
 F: doc/guides/nics/features/mvneta.ini
 
-Marvell OCTEON TX2
-M: Jerin Jacob <jerinj@marvell.com>
-M: Nithin Dabilpuram <ndabilpuram@marvell.com>
-M: Kiran Kumar K <kirankumark@marvell.com>
-T: git://dpdk.org/next/dpdk-next-net-mrvl
-F: drivers/net/octeontx2/
-F: doc/guides/nics/features/octeontx2*.ini
-F: doc/guides/nics/octeontx2.rst
-
-Marvell OCTEON TX2 - security
-M: Anoob Joseph <anoobj@marvell.com>
-T: git://dpdk.org/next/dpdk-next-crypto
-F: drivers/common/octeontx2/otx2_sec*
-F: drivers/net/octeontx2/otx2_ethdev_sec*
-
 Marvell OCTEON TX EP - endpoint
 M: Nalla Pradeep <pnalla@marvell.com>
 M: Radha Mohan Chintakuntla <radhac@marvell.com>
@@ -1115,13 +1091,6 @@ F: drivers/crypto/nitrox/
 F: doc/guides/cryptodevs/nitrox.rst
 F: doc/guides/cryptodevs/features/nitrox.ini
 
-Marvell OCTEON TX2 crypto
-M: Ankur Dwivedi <adwivedi@marvell.com>
-M: Anoob Joseph <anoobj@marvell.com>
-F: drivers/crypto/octeontx2/
-F: doc/guides/cryptodevs/octeontx2.rst
-F: doc/guides/cryptodevs/features/octeontx2.ini
-
 Mellanox mlx5
 M: Matan Azrad <matan@nvidia.com>
 F: drivers/crypto/mlx5/
@@ -1298,12 +1267,6 @@ M: Shijith Thotton <sthotton@marvell.com>
 F: drivers/event/cnxk/
 F: doc/guides/eventdevs/cnxk.rst
 
-Marvell OCTEON TX2
-M: Pavan Nikhilesh <pbhagavatula@marvell.com>
-M: Jerin Jacob <jerinj@marvell.com>
-F: drivers/event/octeontx2/
-F: doc/guides/eventdevs/octeontx2.rst
-
 NXP DPAA eventdev
 M: Hemant Agrawal <hemant.agrawal@nxp.com>
 M: Nipun Gupta <nipun.gupta@nxp.com>
diff --git a/app/test/meson.build b/app/test/meson.build
index 2b480adfba..344a609a4d 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -341,7 +341,6 @@ driver_test_names = [
         'cryptodev_dpaa_sec_autotest',
         'cryptodev_dpaa2_sec_autotest',
         'cryptodev_null_autotest',
-        'cryptodev_octeontx2_autotest',
         'cryptodev_openssl_autotest',
         'cryptodev_openssl_asym_autotest',
         'cryptodev_qat_autotest',
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 10b48cdadb..293f59b48c 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -15615,12 +15615,6 @@ test_cryptodev_octeontx(void)
 	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
 }
 
-static int
-test_cryptodev_octeontx2(void)
-{
-	return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
-}
-
 static int
 test_cryptodev_caam_jr(void)
 {
@@ -15733,7 +15727,6 @@ REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);
 REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);
 REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);
 REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, test_cryptodev_octeontx);
-REGISTER_TEST_COMMAND(cryptodev_octeontx2_autotest, test_cryptodev_octeontx2);
 REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);
 REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox);
 REGISTER_TEST_COMMAND(cryptodev_bcmfs_autotest, test_cryptodev_bcmfs);
diff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h
index 90c8287365..70f23a3f67 100644
--- a/app/test/test_cryptodev.h
+++ b/app/test/test_cryptodev.h
@@ -68,7 +68,6 @@
 #define CRYPTODEV_NAME_CCP_PMD		crypto_ccp
 #define CRYPTODEV_NAME_VIRTIO_PMD	crypto_virtio
 #define CRYPTODEV_NAME_OCTEONTX_SYM_PMD	crypto_octeontx
-#define CRYPTODEV_NAME_OCTEONTX2_PMD	crypto_octeontx2
 #define CRYPTODEV_NAME_CAAM_JR_PMD	crypto_caam_jr
 #define CRYPTODEV_NAME_NITROX_PMD	crypto_nitrox_sym
 #define CRYPTODEV_NAME_BCMFS_PMD	crypto_bcmfs
diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c
index 9d19a6d6d9..68f4d8e7a6 100644
--- a/app/test/test_cryptodev_asym.c
+++ b/app/test/test_cryptodev_asym.c
@@ -2375,20 +2375,6 @@ test_cryptodev_octeontx_asym(void)
 	return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite);
 }
 
-static int
-test_cryptodev_octeontx2_asym(void)
-{
-	gbl_driver_id = rte_cryptodev_driver_id_get(
-			RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
-	if (gbl_driver_id == -1) {
-		RTE_LOG(ERR, USER1, "OCTEONTX2 PMD must be loaded.\n");
-		return TEST_FAILED;
-	}
-
-	/* Use test suite registered for crypto_octeontx PMD */
-	return unit_test_suite_runner(&cryptodev_octeontx_asym_testsuite);
-}
-
 static int
 test_cryptodev_cn9k_asym(void)
 {
@@ -2424,8 +2410,5 @@ REGISTER_TEST_COMMAND(cryptodev_qat_asym_autotest, test_cryptodev_qat_asym);
 
 REGISTER_TEST_COMMAND(cryptodev_octeontx_asym_autotest,
 					  test_cryptodev_octeontx_asym);
-
-REGISTER_TEST_COMMAND(cryptodev_octeontx2_asym_autotest,
-					  test_cryptodev_octeontx2_asym);
 REGISTER_TEST_COMMAND(cryptodev_cn9k_asym_autotest, test_cryptodev_cn9k_asym);
 REGISTER_TEST_COMMAND(cryptodev_cn10k_asym_autotest, test_cryptodev_cn10k_asym);
diff --git a/app/test/test_eventdev.c b/app/test/test_eventdev.c
index 843d9766b0..10028fe11d 100644
--- a/app/test/test_eventdev.c
+++ b/app/test/test_eventdev.c
@@ -1018,12 +1018,6 @@ test_eventdev_selftest_octeontx(void)
 	return test_eventdev_selftest_impl("event_octeontx", "");
 }
 
-static int
-test_eventdev_selftest_octeontx2(void)
-{
-	return test_eventdev_selftest_impl("event_octeontx2", "");
-}
-
 static int
 test_eventdev_selftest_dpaa2(void)
 {
@@ -1052,8 +1046,6 @@ REGISTER_TEST_COMMAND(eventdev_common_autotest, test_eventdev_common);
 REGISTER_TEST_COMMAND(eventdev_selftest_sw, test_eventdev_selftest_sw);
 REGISTER_TEST_COMMAND(eventdev_selftest_octeontx,
 		test_eventdev_selftest_octeontx);
-REGISTER_TEST_COMMAND(eventdev_selftest_octeontx2,
-		test_eventdev_selftest_octeontx2);
 REGISTER_TEST_COMMAND(eventdev_selftest_dpaa2, test_eventdev_selftest_dpaa2);
 REGISTER_TEST_COMMAND(eventdev_selftest_dlb2, test_eventdev_selftest_dlb2);
 REGISTER_TEST_COMMAND(eventdev_selftest_cn9k, test_eventdev_selftest_cn9k);
diff --git a/config/arm/arm64_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc
index 88e5f10945..a3578c03a1 100644
--- a/config/arm/arm64_cn10k_linux_gcc
+++ b/config/arm/arm64_cn10k_linux_gcc
@@ -14,4 +14,3 @@ endian = 'little'
 
 [properties]
 platform = 'cn10k'
-disable_drivers = 'common/octeontx2'
diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_cn9k_linux_gcc
similarity index 84%
rename from config/arm/arm64_octeontx2_linux_gcc
rename to config/arm/arm64_cn9k_linux_gcc
index 8fbdd3868d..a94b44a551 100644
--- a/config/arm/arm64_octeontx2_linux_gcc
+++ b/config/arm/arm64_cn9k_linux_gcc
@@ -13,5 +13,4 @@ cpu = 'armv8-a'
 endian = 'little'
 
 [properties]
-platform = 'octeontx2'
-disable_drivers = 'common/cnxk'
+platform = 'cn9k'
diff --git a/config/arm/meson.build b/config/arm/meson.build
index 213324d262..16e808cdd5 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -139,7 +139,7 @@ implementer_cavium = {
             'march_features': ['crc', 'crypto', 'lse'],
             'compiler_options': ['-mcpu=octeontx2'],
             'flags': [
-                ['RTE_MACHINE', '"octeontx2"'],
+                ['RTE_MACHINE', '"cn9k"'],
                 ['RTE_ARM_FEATURE_ATOMICS', true],
                 ['RTE_USE_C11_MEM_MODEL', true],
                 ['RTE_MAX_LCORE', 36],
@@ -340,8 +340,8 @@ soc_n2 = {
     'numa': false
 }
 
-soc_octeontx2 = {
-    'description': 'Marvell OCTEON TX2',
+soc_cn9k = {
+    'description': 'Marvell OCTEON 9',
     'implementer': '0x43',
     'part_number': '0xb2',
     'numa': false
@@ -377,6 +377,7 @@ generic_aarch32: Generic un-optimized build for armv8 aarch32 execution mode.
 armada:          Marvell ARMADA
 bluefield:       NVIDIA BlueField
 centriq2400:     Qualcomm Centriq 2400
+cn9k:            Marvell OCTEON 9
 cn10k:           Marvell OCTEON 10
 dpaa:            NXP DPAA
 emag:            Ampere eMAG
@@ -385,7 +386,6 @@ kunpeng920:      HiSilicon Kunpeng 920
 kunpeng930:      HiSilicon Kunpeng 930
 n1sdp:           Arm Neoverse N1SDP
 n2:              Arm Neoverse N2
-octeontx2:       Marvell OCTEON TX2
 stingray:        Broadcom Stingray
 thunderx2:       Marvell ThunderX2 T99
 thunderxt88:     Marvell ThunderX T88
@@ -399,6 +399,7 @@ socs = {
     'armada': soc_armada,
     'bluefield': soc_bluefield,
     'centriq2400': soc_centriq2400,
+    'cn9k': soc_cn9k,
     'cn10k' : soc_cn10k,
     'dpaa': soc_dpaa,
     'emag': soc_emag,
@@ -407,7 +408,6 @@ socs = {
     'kunpeng930': soc_kunpeng930,
     'n1sdp': soc_n1sdp,
     'n2': soc_n2,
-    'octeontx2': soc_octeontx2,
     'stingray': soc_stingray,
     'thunderx2': soc_thunderx2,
     'thunderxt88': soc_thunderxt88
diff --git a/devtools/check-abi.sh b/devtools/check-abi.sh
index 5e654189a8..675f10142e 100755
--- a/devtools/check-abi.sh
+++ b/devtools/check-abi.sh
@@ -48,7 +48,7 @@ for dump in $(find $refdir -name "*.dump"); do
 		echo "Skipped removed driver $name."
 		continue
 	fi
-	if grep -qE "\<librte_regex_octeontx2" $dump; then
+	if grep -qE "\<librte_*.*_octeontx2" $dump; then
 		echo "Skipped removed driver $name."
 		continue
 	fi
diff --git a/doc/guides/cryptodevs/features/octeontx2.ini b/doc/guides/cryptodevs/features/octeontx2.ini
deleted file mode 100644
index c54dc9409c..0000000000
--- a/doc/guides/cryptodevs/features/octeontx2.ini
+++ /dev/null
@@ -1,87 +0,0 @@
-;
-; Supported features of the 'octeontx2' crypto driver.
-;
-; Refer to default.ini for the full list of available PMD features.
-;
-[Features]
-Symmetric crypto       = Y
-Asymmetric crypto      = Y
-Sym operation chaining = Y
-HW Accelerated         = Y
-Protocol offload       = Y
-In Place SGL           = Y
-OOP SGL In LB  Out     = Y
-OOP SGL In SGL Out     = Y
-OOP LB  In LB  Out     = Y
-RSA PRIV OP KEY QT     = Y
-Digest encrypted       = Y
-Symmetric sessionless  = Y
-
-;
-; Supported crypto algorithms of 'octeontx2' crypto driver.
-;
-[Cipher]
-NULL           = Y
-3DES CBC       = Y
-3DES ECB       = Y
-AES CBC (128)  = Y
-AES CBC (192)  = Y
-AES CBC (256)  = Y
-AES CTR (128)  = Y
-AES CTR (192)  = Y
-AES CTR (256)  = Y
-AES XTS (128)  = Y
-AES XTS (256)  = Y
-DES CBC        = Y
-KASUMI F8      = Y
-SNOW3G UEA2    = Y
-ZUC EEA3       = Y
-
-;
-; Supported authentication algorithms of 'octeontx2' crypto driver.
-;
-[Auth]
-NULL         = Y
-AES GMAC     = Y
-KASUMI F9    = Y
-MD5          = Y
-MD5 HMAC     = Y
-SHA1         = Y
-SHA1 HMAC    = Y
-SHA224       = Y
-SHA224 HMAC  = Y
-SHA256       = Y
-SHA256 HMAC  = Y
-SHA384       = Y
-SHA384 HMAC  = Y
-SHA512       = Y
-SHA512 HMAC  = Y
-SNOW3G UIA2  = Y
-ZUC EIA3     = Y
-
-;
-; Supported AEAD algorithms of 'octeontx2' crypto driver.
-;
-[AEAD]
-AES GCM (128)     = Y
-AES GCM (192)     = Y
-AES GCM (256)     = Y
-CHACHA20-POLY1305 = Y
-
-;
-; Supported Asymmetric algorithms of the 'octeontx2' crypto driver.
-;
-[Asymmetric]
-RSA                     = Y
-DSA                     =
-Modular Exponentiation  = Y
-Modular Inversion       =
-Diffie-hellman          =
-ECDSA                   = Y
-ECPM                    = Y
-
-;
-; Supported Operating systems of the 'octeontx2' crypto driver.
-;
-[OS]
-Linux = Y
diff --git a/doc/guides/cryptodevs/index.rst b/doc/guides/cryptodevs/index.rst
index 3dcc2ecd2e..39cca6dbde 100644
--- a/doc/guides/cryptodevs/index.rst
+++ b/doc/guides/cryptodevs/index.rst
@@ -22,7 +22,6 @@ Crypto Device Drivers
     dpaa_sec
     kasumi
     octeontx
-    octeontx2
     openssl
     mlx5
     mvsam
diff --git a/doc/guides/cryptodevs/octeontx2.rst b/doc/guides/cryptodevs/octeontx2.rst
deleted file mode 100644
index 811e61a1f6..0000000000
--- a/doc/guides/cryptodevs/octeontx2.rst
+++ /dev/null
@@ -1,188 +0,0 @@
-..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2019 Marvell International Ltd.
-
-
-Marvell OCTEON TX2 Crypto Poll Mode Driver
-==========================================
-
-The OCTEON TX2 crypto poll mode driver provides support for offloading
-cryptographic operations to cryptographic accelerator units on the
-**OCTEON TX2** :sup:`®` family of processors (CN9XXX).
-
-More information about OCTEON TX2 SoCs may be obtained from `<https://www.marvell.com>`_
-
-Features
---------
-
-The OCTEON TX2 crypto PMD has support for:
-
-Symmetric Crypto Algorithms
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Cipher algorithms:
-
-* ``RTE_CRYPTO_CIPHER_NULL``
-* ``RTE_CRYPTO_CIPHER_3DES_CBC``
-* ``RTE_CRYPTO_CIPHER_3DES_ECB``
-* ``RTE_CRYPTO_CIPHER_AES_CBC``
-* ``RTE_CRYPTO_CIPHER_AES_CTR``
-* ``RTE_CRYPTO_CIPHER_AES_XTS``
-* ``RTE_CRYPTO_CIPHER_DES_CBC``
-* ``RTE_CRYPTO_CIPHER_KASUMI_F8``
-* ``RTE_CRYPTO_CIPHER_SNOW3G_UEA2``
-* ``RTE_CRYPTO_CIPHER_ZUC_EEA3``
-
-Hash algorithms:
-
-* ``RTE_CRYPTO_AUTH_NULL``
-* ``RTE_CRYPTO_AUTH_AES_GMAC``
-* ``RTE_CRYPTO_AUTH_KASUMI_F9``
-* ``RTE_CRYPTO_AUTH_MD5``
-* ``RTE_CRYPTO_AUTH_MD5_HMAC``
-* ``RTE_CRYPTO_AUTH_SHA1``
-* ``RTE_CRYPTO_AUTH_SHA1_HMAC``
-* ``RTE_CRYPTO_AUTH_SHA224``
-* ``RTE_CRYPTO_AUTH_SHA224_HMAC``
-* ``RTE_CRYPTO_AUTH_SHA256``
-* ``RTE_CRYPTO_AUTH_SHA256_HMAC``
-* ``RTE_CRYPTO_AUTH_SHA384``
-* ``RTE_CRYPTO_AUTH_SHA384_HMAC``
-* ``RTE_CRYPTO_AUTH_SHA512``
-* ``RTE_CRYPTO_AUTH_SHA512_HMAC``
-* ``RTE_CRYPTO_AUTH_SNOW3G_UIA2``
-* ``RTE_CRYPTO_AUTH_ZUC_EIA3``
-
-AEAD algorithms:
-
-* ``RTE_CRYPTO_AEAD_AES_GCM``
-* ``RTE_CRYPTO_AEAD_CHACHA20_POLY1305``
-
-Asymmetric Crypto Algorithms
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* ``RTE_CRYPTO_ASYM_XFORM_RSA``
-* ``RTE_CRYPTO_ASYM_XFORM_MODEX``
-
-
-Installation
-------------
-
-The OCTEON TX2 crypto PMD may be compiled natively on an OCTEON TX2 platform or
-cross-compiled on an x86 platform.
-
-Refer to :doc:`../platform/octeontx2` for instructions to build your DPDK
-application.
-
-.. note::
-
-   The OCTEON TX2 crypto PMD uses services from the kernel mode OCTEON TX2
-   crypto PF driver in linux. This driver is included in the OCTEON TX SDK.
-
-Initialization
---------------
-
-List the CPT PF devices available on your OCTEON TX2 platform:
-
-.. code-block:: console
-
-    lspci -d:a0fd
-
-``a0fd`` is the CPT PF device id. You should see output similar to:
-
-.. code-block:: console
-
-    0002:10:00.0 Class 1080: Device 177d:a0fd
-
-Set ``sriov_numvfs`` on the CPT PF device, to create a VF:
-
-.. code-block:: console
-
-    echo 1 > /sys/bus/pci/drivers/octeontx2-cpt/0002:10:00.0/sriov_numvfs
-
-Bind the CPT VF device to the vfio_pci driver:
-
-.. code-block:: console
-
-    echo '177d a0fe' > /sys/bus/pci/drivers/vfio-pci/new_id
-    echo 0002:10:00.1 > /sys/bus/pci/devices/0002:10:00.1/driver/unbind
-    echo 0002:10:00.1 > /sys/bus/pci/drivers/vfio-pci/bind
-
-Another way to bind the VF would be to use the ``dpdk-devbind.py`` script:
-
-.. code-block:: console
-
-    cd <dpdk directory>
-    ./usertools/dpdk-devbind.py -u 0002:10:00.1
-    ./usertools/dpdk-devbind.py -b vfio-pci 0002:10.00.1
-
-.. note::
-
-    * For CN98xx SoC, it is recommended to use even and odd DBDF VFs to achieve
-      higher performance as even VF uses one crypto engine and odd one uses
-      another crypto engine.
-
-    * Ensure that sufficient huge pages are available for your application::
-
-         dpdk-hugepages.py --setup 4G --pagesize 512M
-
-      Refer to :ref:`linux_gsg_hugepages` for more details.
-
-Debugging Options
------------------
-
-.. _table_octeontx2_crypto_debug_options:
-
-.. table:: OCTEON TX2 crypto PMD debug options
-
-    +---+------------+-------------------------------------------------------+
-    | # | Component  | EAL log command                                       |
-    +===+============+=======================================================+
-    | 1 | CPT        | --log-level='pmd\.crypto\.octeontx2,8'                |
-    +---+------------+-------------------------------------------------------+
-
-Testing
--------
-
-The symmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test
-application:
-
-.. code-block:: console
-
-    ./dpdk-test
-    RTE>>cryptodev_octeontx2_autotest
-
-The asymmetric crypto operations on OCTEON TX2 crypto PMD may be verified by running the test
-application:
-
-.. code-block:: console
-
-    ./dpdk-test
-    RTE>>cryptodev_octeontx2_asym_autotest
-
-
-Lookaside IPsec Support
------------------------
-
-The OCTEON TX2 SoC can accelerate IPsec traffic in lookaside protocol mode,
-with its **cryptographic accelerator (CPT)**. ``OCTEON TX2 crypto PMD`` implements
-this as an ``RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL`` offload.
-
-Refer to :doc:`../prog_guide/rte_security` for more details on protocol offloads.
-
-This feature can be tested with ipsec-secgw sample application.
-
-
-Features supported
-~~~~~~~~~~~~~~~~~~
-
-* IPv4
-* IPv6
-* ESP
-* Tunnel mode
-* Transport mode(IPv4)
-* ESN
-* Anti-replay
-* UDP Encapsulation
-* AES-128/192/256-GCM
-* AES-128/192/256-CBC-SHA1-HMAC
-* AES-128/192/256-CBC-SHA256-128-HMAC
diff --git a/doc/guides/dmadevs/cnxk.rst b/doc/guides/dmadevs/cnxk.rst
index da2dd59071..418b9a9d63 100644
--- a/doc/guides/dmadevs/cnxk.rst
+++ b/doc/guides/dmadevs/cnxk.rst
@@ -7,7 +7,7 @@ CNXK DMA Device Driver
 ======================
 
 The ``cnxk`` dmadev driver provides a poll-mode driver (PMD) for Marvell DPI DMA
-Hardware Accelerator block found in OCTEONTX2 and OCTEONTX3 family of SoCs.
+Hardware Accelerator block found in OCTEON 9 and OCTEON 10 family of SoCs.
 Each DMA queue is exposed as a VF function when SRIOV is enabled.
 
 The block supports following modes of DMA transfers:
diff --git a/doc/guides/eventdevs/features/octeontx2.ini b/doc/guides/eventdevs/features/octeontx2.ini
deleted file mode 100644
index 05b84beb6e..0000000000
--- a/doc/guides/eventdevs/features/octeontx2.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-;
-; Supported features of the 'octeontx2' eventdev driver.
-;
-; Refer to default.ini for the full list of available PMD features.
-;
-[Scheduling Features]
-queue_qos                  = Y
-distributed_sched          = Y
-queue_all_types            = Y
-nonseq_mode                = Y
-runtime_port_link          = Y
-multiple_queue_port        = Y
-carry_flow_id              = Y
-maintenance_free           = Y
-
-[Eth Rx adapter Features]
-internal_port              = Y
-multi_eventq               = Y
-
-[Eth Tx adapter Features]
-internal_port              = Y
-
-[Crypto adapter Features]
-internal_port_op_new       = Y
-internal_port_op_fwd       = Y
-internal_port_qp_ev_bind   = Y
-
-[Timer adapter Features]
-internal_port              = Y
-periodic                   = Y
diff --git a/doc/guides/eventdevs/index.rst b/doc/guides/eventdevs/index.rst
index b11657f7ae..eed19ad28c 100644
--- a/doc/guides/eventdevs/index.rst
+++ b/doc/guides/eventdevs/index.rst
@@ -19,5 +19,4 @@ application through the eventdev API.
     dsw
     sw
     octeontx
-    octeontx2
     opdl
diff --git a/doc/guides/eventdevs/octeontx2.rst b/doc/guides/eventdevs/octeontx2.rst
deleted file mode 100644
index 0fa57abfa3..0000000000
--- a/doc/guides/eventdevs/octeontx2.rst
+++ /dev/null
@@ -1,178 +0,0 @@
-..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2019 Marvell International Ltd.
-
-OCTEON TX2 SSO Eventdev Driver
-===============================
-
-The OCTEON TX2 SSO PMD (**librte_event_octeontx2**) provides poll mode
-eventdev driver support for the inbuilt event device found in the **Marvell OCTEON TX2**
-SoC family.
-
-More information about OCTEON TX2 SoC can be found at `Marvell Official Website
-<https://www.marvell.com/embedded-processors/infrastructure-processors/>`_.
-
-Features
---------
-
-Features of the OCTEON TX2 SSO PMD are:
-
-- 256 Event queues
-- 26 (dual) and 52 (single) Event ports
-- HW event scheduler
-- Supports 1M flows per event queue
-- Flow based event pipelining
-- Flow pinning support in flow based event pipelining
-- Queue based event pipelining
-- Supports ATOMIC, ORDERED, PARALLEL schedule types per flow
-- Event scheduling QoS based on event queue priority
-- Open system with configurable amount of outstanding events limited only by
-  DRAM
-- HW accelerated dequeue timeout support to enable power management
-- HW managed event timers support through TIM, with high precision and
-  time granularity of 2.5us.
-- Up to 256 TIM rings aka event timer adapters.
-- Up to 8 rings traversed in parallel.
-- HW managed packets enqueued from ethdev to eventdev exposed through event eth
-  RX adapter.
-- N:1 ethernet device Rx queue to Event queue mapping.
-- Lockfree Tx from event eth Tx adapter using ``RTE_ETH_TX_OFFLOAD_MT_LOCKFREE``
-  capability while maintaining receive packet order.
-- Full Rx/Tx offload support defined through ethdev queue config.
-
-Prerequisites and Compilation procedure
----------------------------------------
-
-   See :doc:`../platform/octeontx2` for setup information.
-
-
-Runtime Config Options
-----------------------
-
-- ``Maximum number of in-flight events`` (default ``8192``)
-
-  In **Marvell OCTEON TX2** the max number of in-flight events are only limited
-  by DRAM size, the ``xae_cnt`` devargs parameter is introduced to provide
-  upper limit for in-flight events.
-  For example::
-
-    -a 0002:0e:00.0,xae_cnt=16384
-
-- ``Force legacy mode``
-
-  The ``single_ws`` devargs parameter is introduced to force legacy mode i.e
-  single workslot mode in SSO and disable the default dual workslot mode.
-  For example::
-
-    -a 0002:0e:00.0,single_ws=1
-
-- ``Event Group QoS support``
-
-  SSO GGRPs i.e. queue uses DRAM & SRAM buffers to hold in-flight
-  events. By default the buffers are assigned to the SSO GGRPs to
-  satisfy minimum HW requirements. SSO is free to assign the remaining
-  buffers to GGRPs based on a preconfigured threshold.
-  We can control the QoS of SSO GGRP by modifying the above mentioned
-  thresholds. GGRPs that have higher importance can be assigned higher
-  thresholds than the rest. The dictionary format is as follows
-  [Qx-XAQ-TAQ-IAQ][Qz-XAQ-TAQ-IAQ] expressed in percentages, 0 represents
-  default.
-  For example::
-
-    -a 0002:0e:00.0,qos=[1-50-50-50]
-
-- ``TIM disable NPA``
-
-  By default chunks are allocated from NPA then TIM can automatically free
-  them when traversing the list of chunks. The ``tim_disable_npa`` devargs
-  parameter disables NPA and uses software mempool to manage chunks
-  For example::
-
-    -a 0002:0e:00.0,tim_disable_npa=1
-
-- ``TIM modify chunk slots``
-
-  The ``tim_chnk_slots`` devargs can be used to modify number of chunk slots.
-  Chunks are used to store event timers, a chunk can be visualised as an array
-  where the last element points to the next chunk and rest of them are used to
-  store events. TIM traverses the list of chunks and enqueues the event timers
-  to SSO. The default value is 255 and the max value is 4095.
-  For example::
-
-    -a 0002:0e:00.0,tim_chnk_slots=1023
-
-- ``TIM enable arm/cancel statistics``
-
-  The ``tim_stats_ena`` devargs can be used to enable arm and cancel stats of
-  event timer adapter.
-  For example::
-
-    -a 0002:0e:00.0,tim_stats_ena=1
-
-- ``TIM limit max rings reserved``
-
-  The ``tim_rings_lmt`` devargs can be used to limit the max number of TIM
-  rings i.e. event timer adapter reserved on probe. Since, TIM rings are HW
-  resources we can avoid starving other applications by not grabbing all the
-  rings.
-  For example::
-
-    -a 0002:0e:00.0,tim_rings_lmt=5
-
-- ``TIM ring control internal parameters``
-
-  When using multiple TIM rings the ``tim_ring_ctl`` devargs can be used to
-  control each TIM rings internal parameters uniquely. The following dict
-  format is expected [ring-chnk_slots-disable_npa-stats_ena]. 0 represents
-  default values.
-  For Example::
-
-    -a 0002:0e:00.0,tim_ring_ctl=[2-1023-1-0]
-
-- ``Lock NPA contexts in NDC``
-
-   Lock NPA aura and pool contexts in NDC cache.
-   The device args take hexadecimal bitmask where each bit represent the
-   corresponding aura/pool id.
-
-   For example::
-
-      -a 0002:0e:00.0,npa_lock_mask=0xf
-
-- ``Force Rx Back pressure``
-
-   Force Rx back pressure when same mempool is used across ethernet device
-   connected to event device.
-
-   For example::
-
-      -a 0002:0e:00.0,force_rx_bp=1
-
-Debugging Options
------------------
-
-.. _table_octeontx2_event_debug_options:
-
-.. table:: OCTEON TX2 event device debug options
-
-   +---+------------+-------------------------------------------------------+
-   | # | Component  | EAL log command                                       |
-   +===+============+=======================================================+
-   | 1 | SSO        | --log-level='pmd\.event\.octeontx2,8'                 |
-   +---+------------+-------------------------------------------------------+
-   | 2 | TIM        | --log-level='pmd\.event\.octeontx2\.timer,8'          |
-   +---+------------+-------------------------------------------------------+
-
-Limitations
------------
-
-Rx adapter support
-~~~~~~~~~~~~~~~~~~
-
-Using the same mempool for all the ethernet device ports connected to
-event device would cause back pressure to be asserted only on the first
-ethernet device.
-Back pressure is automatically disabled when using same mempool for all the
-ethernet devices connected to event device to override this applications can
-use `force_rx_bp=1` device arguments.
-Using unique mempool per each ethernet device is recommended when they are
-connected to event device.
diff --git a/doc/guides/mempool/index.rst b/doc/guides/mempool/index.rst
index ce53bc1ac7..e4b6ee7d31 100644
--- a/doc/guides/mempool/index.rst
+++ b/doc/guides/mempool/index.rst
@@ -13,6 +13,5 @@ application through the mempool API.
 
     cnxk
     octeontx
-    octeontx2
     ring
     stack
diff --git a/doc/guides/mempool/octeontx2.rst b/doc/guides/mempool/octeontx2.rst
deleted file mode 100644
index 1272c1e72b..0000000000
--- a/doc/guides/mempool/octeontx2.rst
+++ /dev/null
@@ -1,92 +0,0 @@
-..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2019 Marvell International Ltd.
-
-OCTEON TX2 NPA Mempool Driver
-=============================
-
-The OCTEON TX2 NPA PMD (**librte_mempool_octeontx2**) provides mempool
-driver support for the integrated mempool device found in **Marvell OCTEON TX2** SoC family.
-
-More information about OCTEON TX2 SoC can be found at `Marvell Official Website
-<https://www.marvell.com/embedded-processors/infrastructure-processors/>`_.
-
-Features
---------
-
-OCTEON TX2 NPA PMD supports:
-
-- Up to 128 NPA LFs
-- 1M Pools per LF
-- HW mempool manager
-- Ethdev Rx buffer allocation in HW to save CPU cycles in the Rx path.
-- Ethdev Tx buffer recycling in HW to save CPU cycles in the Tx path.
-
-Prerequisites and Compilation procedure
----------------------------------------
-
-   See :doc:`../platform/octeontx2` for setup information.
-
-Pre-Installation Configuration
-------------------------------
-
-
-Runtime Config Options
-~~~~~~~~~~~~~~~~~~~~~~
-
-- ``Maximum number of mempools per application`` (default ``128``)
-
-  The maximum number of mempools per application needs to be configured on
-  HW during mempool driver initialization. HW can support up to 1M mempools,
-  Since each mempool costs set of HW resources, the ``max_pools`` ``devargs``
-  parameter is being introduced to configure the number of mempools required
-  for the application.
-  For example::
-
-    -a 0002:02:00.0,max_pools=512
-
-  With the above configuration, the driver will set up only 512 mempools for
-  the given application to save HW resources.
-
-.. note::
-
-   Since this configuration is per application, the end user needs to
-   provide ``max_pools`` parameter to the first PCIe device probed by the given
-   application.
-
-- ``Lock NPA contexts in NDC``
-
-   Lock NPA aura and pool contexts in NDC cache.
-   The device args take hexadecimal bitmask where each bit represent the
-   corresponding aura/pool id.
-
-   For example::
-
-      -a 0002:02:00.0,npa_lock_mask=0xf
-
-Debugging Options
-~~~~~~~~~~~~~~~~~
-
-.. _table_octeontx2_mempool_debug_options:
-
-.. table:: OCTEON TX2 mempool debug options
-
-   +---+------------+-------------------------------------------------------+
-   | # | Component  | EAL log command                                       |
-   +===+============+=======================================================+
-   | 1 | NPA        | --log-level='pmd\.mempool.octeontx2,8'                |
-   +---+------------+-------------------------------------------------------+
-
-Standalone mempool device
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-   The ``usertools/dpdk-devbind.py`` script shall enumerate all the mempool devices
-   available in the system. In order to avoid, the end user to bind the mempool
-   device prior to use ethdev and/or eventdev device, the respective driver
-   configures an NPA LF and attach to the first probed ethdev or eventdev device.
-   In case, if end user need to run mempool as a standalone device
-   (without ethdev or eventdev), end user needs to bind a mempool device using
-   ``usertools/dpdk-devbind.py``
-
-   Example command to run ``mempool_autotest`` test with standalone OCTEONTX2 NPA device::
-
-     echo "mempool_autotest" | <build_dir>/app/test/dpdk-test -c 0xf0 --mbuf-pool-ops-name="octeontx2_npa"
diff --git a/doc/guides/nics/cnxk.rst b/doc/guides/nics/cnxk.rst
index 84f9865654..2119ba51c8 100644
--- a/doc/guides/nics/cnxk.rst
+++ b/doc/guides/nics/cnxk.rst
@@ -178,7 +178,7 @@ Runtime Config Options
    * ``rss_adder<7:0> = flow_tag<7:0>``
 
    Latter one aligns with standard NIC behavior vs former one is a legacy
-   RSS adder scheme used in OCTEON TX2 products.
+   RSS adder scheme used in OCTEON 9 products.
 
    By default, the driver runs in the latter mode.
    Setting this flag to 1 to select the legacy mode.
@@ -291,7 +291,7 @@ Limitations
 The OCTEON CN9K/CN10K SoC family NIC has inbuilt HW assisted external mempool manager.
 ``net_cnxk`` PMD only works with ``mempool_cnxk`` mempool handler
 as it is performance wise most effective way for packet allocation and Tx buffer
-recycling on OCTEON TX2 SoC platform.
+recycling on OCTEON 9 SoC platform.
 
 CRC stripping
 ~~~~~~~~~~~~~
diff --git a/doc/guides/nics/features/octeontx2.ini b/doc/guides/nics/features/octeontx2.ini
deleted file mode 100644
index bf0c2890f2..0000000000
--- a/doc/guides/nics/features/octeontx2.ini
+++ /dev/null
@@ -1,97 +0,0 @@
-;
-; Supported features of the 'octeontx2' network poll mode driver.
-;
-; Refer to default.ini for the full list of available PMD features.
-;
-[Features]
-Speed capabilities   = Y
-Rx interrupt         = Y
-Lock-free Tx queue   = Y
-SR-IOV               = Y
-Multiprocess aware   = Y
-Link status          = Y
-Link status event    = Y
-Runtime Rx queue setup = Y
-Runtime Tx queue setup = Y
-Burst mode info      = Y
-Fast mbuf free       = Y
-Free Tx mbuf on demand = Y
-Queue start/stop     = Y
-MTU update           = Y
-TSO                  = Y
-Promiscuous mode     = Y
-Allmulticast mode    = Y
-Unicast MAC filter   = Y
-Multicast MAC filter = Y
-RSS hash             = Y
-RSS key update       = Y
-RSS reta update      = Y
-Inner RSS            = Y
-Inline protocol      = Y
-VLAN filter          = Y
-Flow control         = Y
-Rate limitation      = Y
-Scattered Rx         = Y
-VLAN offload         = Y
-QinQ offload         = Y
-L3 checksum offload  = Y
-L4 checksum offload  = Y
-Inner L3 checksum    = Y
-Inner L4 checksum    = Y
-Packet type parsing  = Y
-Timesync             = Y
-Timestamp offload    = Y
-Rx descriptor status = Y
-Tx descriptor status = Y
-Basic stats          = Y
-Stats per queue      = Y
-Extended stats       = Y
-FW version           = Y
-Module EEPROM dump   = Y
-Registers dump       = Y
-Linux                = Y
-ARMv8                = Y
-Usage doc            = Y
-
-[rte_flow items]
-any                  = Y
-arp_eth_ipv4         = Y
-esp                  = Y
-eth                  = Y
-e_tag                = Y
-geneve               = Y
-gre                  = Y
-gre_key              = Y
-gtpc                 = Y
-gtpu                 = Y
-higig2               = Y
-icmp                 = Y
-ipv4                 = Y
-ipv6                 = Y
-ipv6_ext             = Y
-mpls                 = Y
-nvgre                = Y
-raw                  = Y
-sctp                 = Y
-tcp                  = Y
-udp                  = Y
-vlan                 = Y
-vxlan                = Y
-vxlan_gpe            = Y
-
-[rte_flow actions]
-count                = Y
-drop                 = Y
-flag                 = Y
-mark                 = Y
-of_pop_vlan          = Y
-of_push_vlan         = Y
-of_set_vlan_pcp      = Y
-of_set_vlan_vid      = Y
-pf                   = Y
-port_id              = Y
-port_representor     = Y
-queue                = Y
-rss                  = Y
-security             = Y
-vf                   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini b/doc/guides/nics/features/octeontx2_vec.ini
deleted file mode 100644
index c405db7cf9..0000000000
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-;
-; Supported features of the 'octeontx2_vec' network poll mode driver.
-;
-; Refer to default.ini for the full list of available PMD features.
-;
-[Features]
-Speed capabilities   = Y
-Lock-free Tx queue   = Y
-SR-IOV               = Y
-Multiprocess aware   = Y
-Link status          = Y
-Link status event    = Y
-Runtime Rx queue setup = Y
-Runtime Tx queue setup = Y
-Burst mode info      = Y
-Fast mbuf free       = Y
-Free Tx mbuf on demand = Y
-Queue start/stop     = Y
-MTU update           = Y
-Promiscuous mode     = Y
-Allmulticast mode    = Y
-Unicast MAC filter   = Y
-Multicast MAC filter = Y
-RSS hash             = Y
-RSS key update       = Y
-RSS reta update      = Y
-Inner RSS            = Y
-VLAN filter          = Y
-Flow control         = Y
-Rate limitation      = Y
-VLAN offload         = Y
-QinQ offload         = Y
-L3 checksum offload  = Y
-L4 checksum offload  = Y
-Inner L3 checksum    = Y
-Inner L4 checksum    = Y
-Packet type parsing  = Y
-Rx descriptor status = Y
-Tx descriptor status = Y
-Basic stats          = Y
-Extended stats       = Y
-Stats per queue      = Y
-FW version           = Y
-Module EEPROM dump   = Y
-Registers dump       = Y
-Linux                = Y
-ARMv8                = Y
-Usage doc            = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini b/doc/guides/nics/features/octeontx2_vf.ini
deleted file mode 100644
index 5ac7a49a5c..0000000000
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ /dev/null
@@ -1,45 +0,0 @@
-;
-; Supported features of the 'octeontx2_vf' network poll mode driver.
-;
-; Refer to default.ini for the full list of available PMD features.
-;
-[Features]
-Speed capabilities   = Y
-Lock-free Tx queue   = Y
-Multiprocess aware   = Y
-Rx interrupt         = Y
-Link status          = Y
-Link status event    = Y
-Runtime Rx queue setup = Y
-Runtime Tx queue setup = Y
-Burst mode info      = Y
-Fast mbuf free       = Y
-Free Tx mbuf on demand = Y
-Queue start/stop     = Y
-TSO                  = Y
-RSS hash             = Y
-RSS key update       = Y
-RSS reta update      = Y
-Inner RSS            = Y
-Inline protocol      = Y
-VLAN filter          = Y
-Rate limitation      = Y
-Scattered Rx         = Y
-VLAN offload         = Y
-QinQ offload         = Y
-L3 checksum offload  = Y
-L4 checksum offload  = Y
-Inner L3 checksum    = Y
-Inner L4 checksum    = Y
-Packet type parsing  = Y
-Rx descriptor status = Y
-Tx descriptor status = Y
-Basic stats          = Y
-Extended stats       = Y
-Stats per queue      = Y
-FW version           = Y
-Module EEPROM dump   = Y
-Registers dump       = Y
-Linux                = Y
-ARMv8                = Y
-Usage doc            = Y
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index 1c94caccea..f48e9f815c 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -52,7 +52,6 @@ Network Interface Controller Drivers
     ngbe
     null
     octeontx
-    octeontx2
     octeontx_ep
     pfe
     qede
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
deleted file mode 100644
index 4ce067f2c5..0000000000
--- a/doc/guides/nics/octeontx2.rst
+++ /dev/null
@@ -1,465 +0,0 @@
-..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(C) 2019 Marvell International Ltd.
-
-OCTEON TX2 Poll Mode driver
-===========================
-
-The OCTEON TX2 ETHDEV PMD (**librte_net_octeontx2**) provides poll mode ethdev
-driver support for the inbuilt network device found in **Marvell OCTEON TX2**
-SoC family as well as for their virtual functions (VF) in SR-IOV context.
-
-More information can be found at `Marvell Official Website
-<https://www.marvell.com/embedded-processors/infrastructure-processors>`_.
-
-Features
---------
-
-Features of the OCTEON TX2 Ethdev PMD are:
-
-- Packet type information
-- Promiscuous mode
-- Jumbo frames
-- SR-IOV VF
-- Lock-free Tx queue
-- Multiple queues for TX and RX
-- Receiver Side Scaling (RSS)
-- MAC/VLAN filtering
-- Multicast MAC filtering
-- Generic flow API
-- Inner and Outer Checksum offload
-- VLAN/QinQ stripping and insertion
-- Port hardware statistics
-- Link state information
-- Link flow control
-- MTU update
-- Scatter-Gather IO support
-- Vector Poll mode driver
-- Debug utilities - Context dump and error interrupt support
-- IEEE1588 timestamping
-- HW offloaded `ethdev Rx queue` to `eventdev event queue` packet injection
-- Support Rx interrupt
-- Inline IPsec processing support
-- :ref:`Traffic Management API <otx2_tmapi>`
-
-Prerequisites
--------------
-
-See :doc:`../platform/octeontx2` for setup information.
-
-
-Driver compilation and testing
-------------------------------
-
-Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>`
-for details.
-
-#. Running testpmd:
-
-   Follow instructions available in the document
-   :ref:`compiling and testing a PMD for a NIC <pmd_build_and_test>`
-   to run testpmd.
-
-   Example output:
-
-   .. code-block:: console
-
-      ./<build_dir>/app/dpdk-testpmd -c 0x300 -a 0002:02:00.0 -- --portmask=0x1 --nb-cores=1 --port-topology=loop --rxq=1 --txq=1
-      EAL: Detected 24 lcore(s)
-      EAL: Detected 1 NUMA nodes
-      EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
-      EAL: No available hugepages reported in hugepages-2048kB
-      EAL: Probing VFIO support...
-      EAL: VFIO support initialized
-      EAL: PCI device 0002:02:00.0 on NUMA socket 0
-      EAL:   probe driver: 177d:a063 net_octeontx2
-      EAL:   using IOMMU type 1 (Type 1)
-      testpmd: create a new mbuf pool <mbuf_pool_socket_0>: n=267456, size=2176, socket=0
-      testpmd: preferred mempool ops selected: octeontx2_npa
-      Configuring Port 0 (socket 0)
-      PMD: Port 0: Link Up - speed 40000 Mbps - full-duplex
-
-      Port 0: link state change event
-      Port 0: 36:10:66:88:7A:57
-      Checking link statuses...
-      Done
-      No commandline core given, start packet forwarding
-      io packet forwarding - ports=1 - cores=1 - streams=1 - NUMA support enabled, MP allocation mode: native
-      Logical Core 9 (socket 0) forwards packets on 1 streams:
-        RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00
-
-        io packet forwarding packets/burst=32
-        nb forwarding cores=1 - nb forwarding ports=1
-        port 0: RX queue number: 1 Tx queue number: 1
-          Rx offloads=0x0 Tx offloads=0x10000
-          RX queue: 0
-            RX desc=512 - RX free threshold=0
-            RX threshold registers: pthresh=0 hthresh=0  wthresh=0
-            RX Offloads=0x0
-          TX queue: 0
-            TX desc=512 - TX free threshold=0
-            TX threshold registers: pthresh=0 hthresh=0  wthresh=0
-            TX offloads=0x10000 - TX RS bit threshold=0
-      Press enter to exit
-
-Runtime Config Options
-----------------------
-
-- ``Rx&Tx scalar mode enable`` (default ``0``)
-
-   Ethdev supports both scalar and vector mode, it may be selected at runtime
-   using ``scalar_enable`` ``devargs`` parameter.
-
-- ``RSS reta size`` (default ``64``)
-
-   RSS redirection table size may be configured during runtime using ``reta_size``
-   ``devargs`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,reta_size=256
-
-   With the above configuration, reta table of size 256 is populated.
-
-- ``Flow priority levels`` (default ``3``)
-
-   RTE Flow priority levels can be configured during runtime using
-   ``flow_max_priority`` ``devargs`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,flow_max_priority=10
-
-   With the above configuration, priority level was set to 10 (0-9). Max
-   priority level supported is 32.
-
-- ``Reserve Flow entries`` (default ``8``)
-
-   RTE flow entries can be pre allocated and the size of pre allocation can be
-   selected runtime using ``flow_prealloc_size`` ``devargs`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,flow_prealloc_size=4
-
-   With the above configuration, pre alloc size was set to 4. Max pre alloc
-   size supported is 32.
-
-- ``Max SQB buffer count`` (default ``512``)
-
-   Send queue descriptor buffer count may be limited during runtime using
-   ``max_sqb_count`` ``devargs`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,max_sqb_count=64
-
-   With the above configuration, each send queue's descriptor buffer count is
-   limited to a maximum of 64 buffers.
-
-- ``Switch header enable`` (default ``none``)
-
-   A port can be configured to a specific switch header type by using
-   ``switch_header`` ``devargs`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,switch_header="higig2"
-
-   With the above configuration, higig2 will be enabled on that port and the
-   traffic on this port should be higig2 traffic only. Supported switch header
-   types are "chlen24b", "chlen90b", "dsa", "exdsa", "higig2" and "vlan_exdsa".
-
-- ``RSS tag as XOR`` (default ``0``)
-
-   C0 HW revision onward, The HW gives an option to configure the RSS adder as
-
-   * ``rss_adder<7:0> = flow_tag<7:0> ^ flow_tag<15:8> ^ flow_tag<23:16> ^ flow_tag<31:24>``
-
-   * ``rss_adder<7:0> = flow_tag<7:0>``
-
-   Latter one aligns with standard NIC behavior vs former one is a legacy
-   RSS adder scheme used in OCTEON TX2 products.
-
-   By default, the driver runs in the latter mode from C0 HW revision onward.
-   Setting this flag to 1 to select the legacy mode.
-
-   For example to select the legacy mode(RSS tag adder as XOR)::
-
-      -a 0002:02:00.0,tag_as_xor=1
-
-- ``Max SPI for inbound inline IPsec`` (default ``1``)
-
-   Max SPI supported for inbound inline IPsec processing can be specified by
-   ``ipsec_in_max_spi`` ``devargs`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,ipsec_in_max_spi=128
-
-   With the above configuration, application can enable inline IPsec processing
-   on 128 SAs (SPI 0-127).
-
-- ``Lock Rx contexts in NDC cache``
-
-   Lock Rx contexts in NDC cache by using ``lock_rx_ctx`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,lock_rx_ctx=1
-
-- ``Lock Tx contexts in NDC cache``
-
-   Lock Tx contexts in NDC cache by using ``lock_tx_ctx`` parameter.
-
-   For example::
-
-      -a 0002:02:00.0,lock_tx_ctx=1
-
-.. note::
-
-   Above devarg parameters are configurable per device, user needs to pass the
-   parameters to all the PCIe devices if application requires to configure on
-   all the ethdev ports.
-
-- ``Lock NPA contexts in NDC``
-
-   Lock NPA aura and pool contexts in NDC cache.
-   The device args take hexadecimal bitmask where each bit represent the
-   corresponding aura/pool id.
-
-   For example::
-
-      -a 0002:02:00.0,npa_lock_mask=0xf
-
-.. _otx2_tmapi:
-
-Traffic Management API
-----------------------
-
-OCTEON TX2 PMD supports generic DPDK Traffic Management API which allows to
-configure the following features:
-
-#. Hierarchical scheduling
-#. Single rate - Two color, Two rate - Three color shaping
-
-Both DWRR and Static Priority(SP) hierarchical scheduling is supported.
-
-Every parent can have atmost 10 SP Children and unlimited DWRR children.
-
-Both PF & VF supports traffic management API with PF supporting 6 levels
-and VF supporting 5 levels of topology.
-
-Limitations
------------
-
-``mempool_octeontx2`` external mempool handler dependency
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The OCTEON TX2 SoC family NIC has inbuilt HW assisted external mempool manager.
-``net_octeontx2`` PMD only works with ``mempool_octeontx2`` mempool handler
-as it is performance wise most effective way for packet allocation and Tx buffer
-recycling on OCTEON TX2 SoC platform.
-
-CRC stripping
-~~~~~~~~~~~~~
-
-The OCTEON TX2 SoC family NICs strip the CRC for every packet being received by
-the host interface irrespective of the offload configuration.
-
-Multicast MAC filtering
-~~~~~~~~~~~~~~~~~~~~~~~
-
-``net_octeontx2`` PMD supports multicast mac filtering feature only on physical
-function devices.
-
-SDP interface support
-~~~~~~~~~~~~~~~~~~~~~
-OCTEON TX2 SDP interface support is limited to PF device, No VF support.
-
-Inline Protocol Processing
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-``net_octeontx2`` PMD doesn't support the following features for packets to be
-inline protocol processed.
-- TSO offload
-- VLAN/QinQ offload
-- Fragmentation
-
-Debugging Options
------------------
-
-.. _table_octeontx2_ethdev_debug_options:
-
-.. table:: OCTEON TX2 ethdev debug options
-
-   +---+------------+-------------------------------------------------------+
-   | # | Component  | EAL log command                                       |
-   +===+============+=======================================================+
-   | 1 | NIX        | --log-level='pmd\.net.octeontx2,8'                    |
-   +---+------------+-------------------------------------------------------+
-   | 2 | NPC        | --log-level='pmd\.net.octeontx2\.flow,8'              |
-   +---+------------+-------------------------------------------------------+
-
-RTE Flow Support
-----------------
-
-The OCTEON TX2 SoC family NIC has support for the following patterns and
-actions.
-
-Patterns:
-
-.. _table_octeontx2_supported_flow_item_types:
-
-.. table:: Item types
-
-   +----+--------------------------------+
-   | #  | Pattern Type                   |
-   +====+================================+
-   | 1  | RTE_FLOW_ITEM_TYPE_ETH         |
-   +----+--------------------------------+
-   | 2  | RTE_FLOW_ITEM_TYPE_VLAN        |
-   +----+--------------------------------+
-   | 3  | RTE_FLOW_ITEM_TYPE_E_TAG       |
-   +----+--------------------------------+
-   | 4  | RTE_FLOW_ITEM_TYPE_IPV4        |
-   +----+--------------------------------+
-   | 5  | RTE_FLOW_ITEM_TYPE_IPV6        |
-   +----+--------------------------------+
-   | 6  | RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4|
-   +----+--------------------------------+
-   | 7  | RTE_FLOW_ITEM_TYPE_MPLS        |
-   +----+--------------------------------+
-   | 8  | RTE_FLOW_ITEM_TYPE_ICMP        |
-   +----+--------------------------------+
-   | 9  | RTE_FLOW_ITEM_TYPE_UDP         |
-   +----+--------------------------------+
-   | 10 | RTE_FLOW_ITEM_TYPE_TCP         |
-   +----+--------------------------------+
-   | 11 | RTE_FLOW_ITEM_TYPE_SCTP        |
-   +----+--------------------------------+
-   | 12 | RTE_FLOW_ITEM_TYPE_ESP         |
-   +----+--------------------------------+
-   | 13 | RTE_FLOW_ITEM_TYPE_GRE         |
-   +----+--------------------------------+
-   | 14 | RTE_FLOW_ITEM_TYPE_NVGRE       |
-   +----+--------------------------------+
-   | 15 | RTE_FLOW_ITEM_TYPE_VXLAN       |
-   +----+--------------------------------+
-   | 16 | RTE_FLOW_ITEM_TYPE_GTPC        |
-   +----+--------------------------------+
-   | 17 | RTE_FLOW_ITEM_TYPE_GTPU        |
-   +----+--------------------------------+
-   | 18 | RTE_FLOW_ITEM_TYPE_GENEVE      |
-   +----+--------------------------------+
-   | 19 | RTE_FLOW_ITEM_TYPE_VXLAN_GPE   |
-   +----+--------------------------------+
-   | 20 | RTE_FLOW_ITEM_TYPE_IPV6_EXT    |
-   +----+--------------------------------+
-   | 21 | RTE_FLOW_ITEM_TYPE_VOID        |
-   +----+--------------------------------+
-   | 22 | RTE_FLOW_ITEM_TYPE_ANY         |
-   +----+--------------------------------+
-   | 23 | RTE_FLOW_ITEM_TYPE_GRE_KEY     |
-   +----+--------------------------------+
-   | 24 | RTE_FLOW_ITEM_TYPE_HIGIG2      |
-   +----+--------------------------------+
-   | 25 | RTE_FLOW_ITEM_TYPE_RAW         |
-   +----+--------------------------------+
-
-.. note::
-
-   ``RTE_FLOW_ITEM_TYPE_GRE_KEY`` works only when checksum and routing
-   bits in the GRE header are equal to 0.
-
-Actions:
-
-.. _table_octeontx2_supported_ingress_action_types:
-
-.. table:: Ingress action types
-
-   +----+-----------------------------------------+
-   | #  | Action Type                             |
-   +====+=========================================+
-   | 1  | RTE_FLOW_ACTION_TYPE_VOID               |
-   +----+-----------------------------------------+
-   | 2  | RTE_FLOW_ACTION_TYPE_MARK               |
-   +----+-----------------------------------------+
-   | 3  | RTE_FLOW_ACTION_TYPE_FLAG               |
-   +----+-----------------------------------------+
-   | 4  | RTE_FLOW_ACTION_TYPE_COUNT              |
-   +----+-----------------------------------------+
-   | 5  | RTE_FLOW_ACTION_TYPE_DROP               |
-   +----+-----------------------------------------+
-   | 6  | RTE_FLOW_ACTION_TYPE_QUEUE              |
-   +----+-----------------------------------------+
-   | 7  | RTE_FLOW_ACTION_TYPE_RSS                |
-   +----+-----------------------------------------+
-   | 8  | RTE_FLOW_ACTION_TYPE_SECURITY           |
-   +----+-----------------------------------------+
-   | 9  | RTE_FLOW_ACTION_TYPE_PF                 |
-   +----+-----------------------------------------+
-   | 10 | RTE_FLOW_ACTION_TYPE_VF                 |
-   +----+-----------------------------------------+
-   | 11 | RTE_FLOW_ACTION_TYPE_OF_POP_VLAN        |
-   +----+-----------------------------------------+
-   | 12 | RTE_FLOW_ACTION_TYPE_PORT_ID            |
-   +----+-----------------------------------------+
-   | 13 | RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR   |
-   +----+-----------------------------------------+
-
-.. note::
-
-   ``RTE_FLOW_ACTION_TYPE_PORT_ID``, ``RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR``
-   are only supported between PF and its VFs.
-
-.. _table_octeontx2_supported_egress_action_types:
-
-.. table:: Egress action types
-
-   +----+-----------------------------------------+
-   | #  | Action Type                             |
-   +====+=========================================+
-   | 1  | RTE_FLOW_ACTION_TYPE_COUNT              |
-   +----+-----------------------------------------+
-   | 2  | RTE_FLOW_ACTION_TYPE_DROP               |
-   +----+-----------------------------------------+
-   | 3  | RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN       |
-   +----+-----------------------------------------+
-   | 4  | RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID    |
-   +----+-----------------------------------------+
-   | 5  | RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP    |
-   +----+-----------------------------------------+
-
-Custom protocols supported in RTE Flow
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The ``RTE_FLOW_ITEM_TYPE_RAW`` can be used to parse the below custom protocols.
-
-* ``vlan_exdsa`` and ``exdsa`` can be parsed at L2 level.
-* ``NGIO`` can be parsed at L3 level.
-
-For ``vlan_exdsa`` and ``exdsa``, the port has to be configured with the
-respective switch header.
-
-For example::
-
-   -a 0002:02:00.0,switch_header="vlan_exdsa"
-
-The below fields of ``struct rte_flow_item_raw`` shall be used to specify the
-pattern.
-
-- ``relative`` Selects the layer at which parsing is done.
-
-  - 0 for ``exdsa`` and ``vlan_exdsa``.
-
-  - 1 for  ``NGIO``.
-
-- ``offset`` The offset in the header where the pattern should be matched.
-- ``length`` Length of the pattern.
-- ``pattern`` Pattern as a byte string.
-
-Example usage in testpmd::
-
-   ./dpdk-testpmd -c 3 -w 0002:02:00.0,switch_header=exdsa -- -i \
-                  --rx-offloads=0x00080000 --rxq 8 --txq 8
-   testpmd> flow create 0 ingress pattern eth / raw relative is 0 pattern \
-          spec ab pattern mask ab offset is 4 / end actions queue index 1 / end
diff --git a/doc/guides/nics/octeontx_ep.rst b/doc/guides/nics/octeontx_ep.rst
index b512ccfdab..2ec8a034b5 100644
--- a/doc/guides/nics/octeontx_ep.rst
+++ b/doc/guides/nics/octeontx_ep.rst
@@ -5,7 +5,7 @@ OCTEON TX EP Poll Mode driver
 =============================
 
 The OCTEON TX EP ETHDEV PMD (**librte_pmd_octeontx_ep**) provides poll mode
-ethdev driver support for the virtual functions (VF) of **Marvell OCTEON TX2**
+ethdev driver support for the virtual functions (VF) of **Marvell OCTEON 9**
 and **Cavium OCTEON TX** families of adapters in SR-IOV context.
 
 More information can be found at `Marvell Official Website
@@ -24,4 +24,4 @@ must be installed separately:
   allocates resources such as number of VFs, input/output queues for itself and
   the number of i/o queues each VF can use.
 
-See :doc:`../platform/octeontx2` for SDP interface information which provides PCIe endpoint support for a remote host.
+See :doc:`../platform/cnxk` for SDP interface information which provides PCIe endpoint support for a remote host.
diff --git a/doc/guides/platform/cnxk.rst b/doc/guides/platform/cnxk.rst
index 5213df3ccd..97e38c868c 100644
--- a/doc/guides/platform/cnxk.rst
+++ b/doc/guides/platform/cnxk.rst
@@ -13,6 +13,9 @@ More information about CN9K and CN10K SoC can be found at `Marvell Official Webs
 Supported OCTEON cnxk SoCs
 --------------------------
 
+- CN93xx
+- CN96xx
+- CN98xx
 - CN106xx
 - CNF105xx
 
@@ -583,6 +586,15 @@ Cross Compilation
 
 Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details.
 
+CN9K:
+
+.. code-block:: console
+
+        meson build --cross-file config/arm/arm64_cn9k_linux_gcc
+        ninja -C build
+
+CN10K:
+
 .. code-block:: console
 
         meson build --cross-file config/arm/arm64_cn10k_linux_gcc
diff --git a/doc/guides/platform/img/octeontx2_packet_flow_hw_accelerators.svg b/doc/guides/platform/img/octeontx2_packet_flow_hw_accelerators.svg
deleted file mode 100644
index ecd575947a..0000000000
--- a/doc/guides/platform/img/octeontx2_packet_flow_hw_accelerators.svg
+++ /dev/null
@@ -1,2804 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<!--
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Marvell International Ltd.
-#
--->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="631.91431"
-   height="288.34286"
-   id="svg3868"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="octeontx2_packet_flow_hw_accelerators.svg"
-   sodipodi:version="0.32"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3870">
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible;"
-       id="marker18508"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Send">
-      <path
-         transform="scale(0.2) rotate(180) translate(6,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path18506" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker18096"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path18094"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.2) translate(6,0)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker17550"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Sstart"
-       inkscape:collect="always">
-      <path
-         transform="scale(0.2) translate(6,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path17548" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible;"
-       id="marker17156"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow1Send">
-      <path
-         transform="scale(0.2) rotate(180) translate(6,0)"
-         style="fill-rule:evenodd;stroke:#00db00;stroke-width:1pt;stroke-opacity:1;fill:#00db00;fill-opacity:1"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path17154" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient13962">
-      <stop
-         style="stop-color:#fc0000;stop-opacity:1;"
-         offset="0"
-         id="stop13958" />
-      <stop
-         style="stop-color:#fc0000;stop-opacity:0;"
-         offset="1"
-         id="stop13960" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Send"
-       style="overflow:visible;"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path6218"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.2) rotate(180) translate(6,0)" />
-    </marker>
-    <linearGradient
-       id="linearGradient13170"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop13168" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker12747"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path12745"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#ff0000;stroke-opacity:1;fill:#ff0000;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible;"
-       id="marker10821"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Mend"
-       inkscape:collect="always">
-      <path
-         transform="scale(0.6) rotate(180) translate(0,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#fe0000;stroke-opacity:1;fill:#fe0000;fill-opacity:1"
-         id="path10819" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible;"
-       id="marker10463"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="Arrow2Mend">
-      <path
-         transform="scale(0.6) rotate(180) translate(0,0)"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#fe0000;stroke-opacity:1;fill:#fe0000;fill-opacity:1"
-         id="path10461" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path6230"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#fe0000;stroke-opacity:1;fill:#fe0000;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
-    </marker>
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker9807"
-       refX="0.0"
-       refY="0.0"
-       orient="auto"
-       inkscape:stockid="TriangleOutS">
-      <path
-         transform="scale(0.2)"
-         style="fill-rule:evenodd;stroke:#fe0000;stroke-width:1pt;stroke-opacity:1;fill:#fe0000;fill-opacity:1"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path9805" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleOutS"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path6351"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#fe0000;stroke-width:1pt;stroke-opacity:1;fill:#fe0000;fill-opacity:1"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Sstart"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         id="path6215"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.2) translate(6,0)" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4340">
-      <stop
-         style="stop-color:#d7eef4;stop-opacity:1;"
-         offset="0"
-         id="stop4336" />
-      <stop
-         style="stop-color:#d7eef4;stop-opacity:0;"
-         offset="1"
-         id="stop4338" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4330">
-      <stop
-         style="stop-color:#d7eef4;stop-opacity:1;"
-         offset="0"
-         id="stop4326" />
-      <stop
-         style="stop-color:#d7eef4;stop-opacity:0;"
-         offset="1"
-         id="stop4328" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3596">
-      <stop
-         style="stop-color:#6ba6fd;stop-opacity:1;"
-         offset="0"
-         id="stop3592" />
-      <stop
-         style="stop-color:#6ba6fd;stop-opacity:0;"
-         offset="1"
-         id="stop3594" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker9460"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path9458"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker7396"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path7133"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5474">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5470" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5472" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6545"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffa600;stop-opacity:1;"
-         offset="0"
-         id="stop6543" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3302"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3294"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3290"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3286"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3228"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3188"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3184"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3180"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3176"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3172"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3168"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3164"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3160"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3120"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient3114"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00f900;stop-opacity:1;"
-         offset="0"
-         id="stop3112" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3088"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00f900;stop-opacity:1;"
-         offset="0"
-         id="stop3086" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3058"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00f900;stop-opacity:1;"
-         offset="0"
-         id="stop3056" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3054"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3050"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3046"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3042"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3038"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3034"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3030"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3008"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3004"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient2975"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ff2200;stop-opacity:1;"
-         offset="0"
-         id="stop2973" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2969"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#69ff72;stop-opacity:1;"
-         offset="0"
-         id="stop2967" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2963"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2961" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2929"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ff2d00;stop-opacity:1;"
-         offset="0"
-         id="stop2927" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4610"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop4608" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#6ba6fd;stop-opacity:1;"
-         offset="0"
-         id="stop3991" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3808"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#6ba6fd;stop-opacity:1;"
-         offset="0"
-         id="stop3806" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3776"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#fc0000;stop-opacity:1;"
-         offset="0"
-         id="stop3774" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3438"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#b8e132;stop-opacity:1;"
-         offset="0"
-         id="stop3436" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3408"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3404"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3400"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3392"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3376"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3044"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3040"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3036"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3032"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3028"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3024"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3020"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect2858"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect2854"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2844"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <linearGradient
-       id="linearGradient2828"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop2826" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect329"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart"
-       style="overflow:visible">
-      <path
-         id="path4530"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend"
-       style="overflow:visible">
-      <path
-         id="path4533"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient4513">
-      <stop
-         style="stop-color:#fdffdb;stop-opacity:1;"
-         offset="0"
-         id="stop4515" />
-      <stop
-         style="stop-color:#dfe2d8;stop-opacity:0;"
-         offset="1"
-         id="stop4517" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3876" />
-    <inkscape:perspective
-       id="perspective3886"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3211"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3892"
-       style="overflow:visible">
-      <path
-         id="path3894"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3896"
-       style="overflow:visible">
-      <path
-         id="path3898"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3208"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3902"
-       style="overflow:visible">
-      <path
-         id="path3904"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3906"
-       style="overflow:visible">
-      <path
-         id="path3908"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3910"
-       style="overflow:visible">
-      <path
-         id="path3912"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective4086"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4113"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5195"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-4"
-       style="overflow:visible">
-      <path
-         id="path4533-7"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective5272"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-4"
-       style="overflow:visible">
-      <path
-         id="path4530-5"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-0"
-       style="overflow:visible">
-      <path
-         id="path4533-3"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective5317"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-3"
-       style="overflow:visible">
-      <path
-         id="path4530-2"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-06"
-       style="overflow:visible">
-      <path
-         id="path4533-1"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-8"
-       style="overflow:visible">
-      <path
-         id="path4530-7"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-9"
-       style="overflow:visible">
-      <path
-         id="path4533-2"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect2858-0"
-       is_visible="true" />
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-3"
-       style="overflow:visible">
-      <path
-         id="path4533-75"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3044-9"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-3-2"
-       style="overflow:visible">
-      <path
-         id="path4533-75-8"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3044-9-9"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3008-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3120-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3120-7-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient5695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62723639,0,0,1.0109144,206.76869,3.9208776)"
-       x1="-89.501146"
-       y1="363.57419"
-       x2="-30.959395"
-       y2="363.57419" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-34"
-       style="overflow:visible">
-      <path
-         id="path4530-3"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-45"
-       style="overflow:visible">
-      <path
-         id="path4533-16"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7"
-       style="overflow:visible">
-      <path
-         id="path4530-58"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1"
-       style="overflow:visible">
-      <path
-         id="path4533-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7-6"
-       style="overflow:visible">
-      <path
-         id="path4530-58-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1-9"
-       style="overflow:visible">
-      <path
-         id="path4533-6-3"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7-2"
-       style="overflow:visible">
-      <path
-         id="path4530-58-46"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1-1"
-       style="overflow:visible">
-      <path
-         id="path4533-6-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7-2-6"
-       style="overflow:visible">
-      <path
-         id="path4530-58-46-8"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1-1-9"
-       style="overflow:visible">
-      <path
-         id="path4533-6-4-9"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#grad0-40"
-       id="linearGradient5917"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.8786147,-0.0235964,-0.00460261,1.50035,-400.25558,-2006.3745)"
-       x1="-0.12893644"
-       y1="1717.1688"
-       x2="28.140806"
-       y2="1717.1688" />
-    <linearGradient
-       id="grad0-40"
-       x1="0"
-       y1="0"
-       x2="1"
-       y2="0"
-       gradientTransform="rotate(60,0.5,0.5)">
-      <stop
-         offset="0"
-         stop-color="#f3f6fa"
-         stop-opacity="1"
-         id="stop3419" />
-      <stop
-         offset="0.24"
-         stop-color="#f9fafc"
-         stop-opacity="1"
-         id="stop3421" />
-      <stop
-         offset="0.54"
-         stop-color="#feffff"
-         stop-opacity="1"
-         id="stop3423" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30"
-       style="overflow:visible">
-      <path
-         id="path4530-0"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6"
-       style="overflow:visible">
-      <path
-         id="path4533-19"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30-0"
-       style="overflow:visible">
-      <path
-         id="path4530-0-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6-8"
-       style="overflow:visible">
-      <path
-         id="path4533-19-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30-0-9"
-       style="overflow:visible">
-      <path
-         id="path4530-0-6-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6-8-3"
-       style="overflow:visible">
-      <path
-         id="path4533-19-6-1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient6997-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62723639,0,0,1.0109144,321.82147,-1.8659026)"
-       x1="-89.501144"
-       y1="363.57419"
-       x2="-30.959394"
-       y2="363.57419" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-81"
-       style="overflow:visible">
-      <path
-         id="path4530-9"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-5"
-       style="overflow:visible">
-      <path
-         id="path4533-72"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-1"
-       style="overflow:visible">
-      <path
-         id="path4530-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker9714"
-       style="overflow:visible">
-      <path
-         id="path9712"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-48"
-       style="overflow:visible">
-      <path
-         id="path4530-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker10117"
-       style="overflow:visible">
-      <path
-         id="path10115"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-48-6"
-       style="overflow:visible">
-      <path
-         id="path4530-4-0"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker11186"
-       style="overflow:visible">
-      <path
-         id="path11184"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30-0-9-0"
-       style="overflow:visible">
-      <path
-         id="path4530-0-6-4-1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6-8-3-7"
-       style="overflow:visible">
-      <path
-         id="path4533-19-6-1-5"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3602"
-       x1="113.62777"
-       y1="238.35289"
-       x2="178.07406"
-       y2="238.35289"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4,-22)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3604"
-       x1="106.04746"
-       y1="231.17514"
-       x2="170.49375"
-       y2="231.17514"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4,-22)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3606"
-       x1="97.456466"
-       y1="223.48468"
-       x2="161.90276"
-       y2="223.48468"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4,-22)" />
-    <linearGradient
-       gradientTransform="matrix(1.2309135,0,0,0.9993652,112.21043,-29.394096)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-4"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(1.2419105,0,0,0.99933655,110.714,51.863352)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-4-8"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(1.3078944,0,0,0.99916717,224.87462,63.380078)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-4-8-7"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(1.2309135,0,0,0.9993652,359.82239,-48.56566)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-4-9"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(-35.122992,139.17627)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(32.977515,139.08289)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-9"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(100.97751,139.08289)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-9-1"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(168.97751,139.08289)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-9-1-5"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(236.97751,139.08289)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-9-1-5-7"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(516.30192,138.74331)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-9-1-5-73"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(448.30192,138.74331)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-9-1-59"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(380.30193,138.74331)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-9-8"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(312.20142,138.83669)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3596"
-       id="linearGradient3608-8"
-       x1="88.739166"
-       y1="215.40981"
-       x2="153.18546"
-       y2="215.40981"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4330"
-       id="radialGradient4334"
-       cx="222.02666"
-       cy="354.61401"
-       fx="222.02666"
-       fy="354.61401"
-       r="171.25233"
-       gradientTransform="matrix(1,0,0,0.15767701,0,298.69953)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4340"
-       id="radialGradient4342"
-       cx="535.05641"
-       cy="353.56737"
-       fx="535.05641"
-       fy="353.56737"
-       r="136.95767"
-       gradientTransform="matrix(1.0000096,0,0,0.19866251,-0.00515595,284.82679)"
-       gradientUnits="userSpaceOnUse" />
-    <marker
-       inkscape:isstock="true"
-       style="overflow:visible"
-       id="marker28236"
-       refX="0"
-       refY="0"
-       orient="auto"
-       inkscape:stockid="Arrow2Mstart">
-      <path
-         inkscape:connector-curvature="0"
-         transform="scale(0.6)"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         id="path28234" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3706"
-       style="overflow:visible">
-      <path
-         id="path3704"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect14461"
-       is_visible="true" />
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mend-3"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6230-9"
-         style="fill:#fe0000;fill-opacity:1;fill-rule:evenodd;stroke:#fe0000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(-0.6)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mend-3-1"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6230-9-8"
-         style="fill:#fe0000;fill-opacity:1;fill-rule:evenodd;stroke:#fe0000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(-0.6)" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13962"
-       id="linearGradient14808"
-       x1="447.95767"
-       y1="176.3018"
-       x2="576.27008"
-       y2="176.3018"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-8)" />
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Mend-3-1-6"
-       style="overflow:visible"
-       inkscape:isstock="true"
-       inkscape:collect="always">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6230-9-8-5"
-         style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#808080;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="scale(-0.6)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-53"
-       style="overflow:visible">
-      <path
-         id="path4533-35"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-99"
-       style="overflow:visible">
-      <path
-         id="path4533-8"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.8101934"
-     inkscape:cx="434.42776"
-     inkscape:cy="99.90063"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1057"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     fit-margin-top="0.1"
-     fit-margin-left="0.1"
-     fit-margin-right="0.1"
-     fit-margin-bottom="0.1"
-     inkscape:measure-start="-29.078,219.858"
-     inkscape:measure-end="346.809,219.858"
-     showguides="true"
-     inkscape:snap-page="true"
-     inkscape:snap-others="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:lockguides="false"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       position="-120.20815,574.17069"
-       orientation="0,1"
-       id="guide7077"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3873">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-46.542857,-100.33361)">
-    <rect
-       style="fill:#aaffcc;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.26491222;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-7"
-       width="64.18129"
-       height="45.550591"
-       x="575.72662"
-       y="144.79553" />
-    <rect
-       style="fill:#aaffcc;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.26491222;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-8-5"
-       width="64.18129"
-       height="45.550591"
-       x="584.44391"
-       y="152.87041" />
-    <rect
-       style="fill:#aaffcc;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.26491222;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-42-0"
-       width="64.18129"
-       height="45.550591"
-       x="593.03491"
-       y="160.56087" />
-    <rect
-       style="fill:#aaffcc;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.26491222;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-0-3"
-       width="64.18129"
-       height="45.550591"
-       x="600.61523"
-       y="167.73862" />
-    <rect
-       style="fill:#aaffcc;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.26491222;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-46-4"
-       width="64.18129"
-       height="45.550591"
-       x="608.70087"
-       y="175.42906" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1853-7"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#aaffcc;fill-opacity:1;stroke:none"
-       transform="matrix(0.71467688,0,0,0.72506311,529.61388,101.41825)"><flowRegion
-         id="flowRegion1855-0"
-         style="fill:#aaffcc"><rect
-           id="rect1857-5"
-           width="67.17514"
-           height="33.941124"
-           x="120.20815"
-           y="120.75856"
-           style="fill:#aaffcc" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#aaffcc"
-         id="flowPara1976" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5313"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;letter-spacing:0px;word-spacing:0px"><flowRegion
-         id="flowRegion5315"><rect
-           id="rect5317"
-           width="120.91525"
-           height="96.873627"
-           x="-192.33304"
-           y="-87.130829" /></flowRegion><flowPara
-         id="flowPara5319" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot8331"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:13.33333333px;line-height:1.25;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"><flowRegion
-         id="flowRegion8333"><rect
-           id="rect8335"
-           width="48.5"
-           height="28"
-           x="252.5"
-           y="208.34286" /></flowRegion><flowPara
-         id="flowPara8337" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot11473"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       transform="translate(46.542857,100.33361)"><flowRegion
-         id="flowRegion11475"><rect
-           id="rect11477"
-           width="90"
-           height="14.5"
-           x="426"
-           y="26.342873" /></flowRegion><flowPara
-         id="flowPara11479">DDDpk</flowPara></flowRoot>    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="533.54285"
-       y="158.17648"
-       id="text11489"><tspan
-         sodipodi:role="line"
-         id="tspan11487"
-         x="533.54285"
-         y="170.34088" /></text>
-    <rect
-       style="fill:#f4d7d7;fill-opacity:1;stroke:url(#linearGradient3606);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-8"
-       width="64.18129"
-       height="45.550591"
-       x="101.58897"
-       y="178.70938" />
-    <rect
-       style="fill:#f4d7d7;fill-opacity:1;stroke:url(#linearGradient3604);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-42"
-       width="64.18129"
-       height="45.550591"
-       x="110.17996"
-       y="186.39984" />
-    <rect
-       style="fill:#f4d7d7;fill-opacity:1;stroke:url(#linearGradient3602);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-0"
-       width="64.18129"
-       height="45.550591"
-       x="117.76027"
-       y="193.57759" />
-    <rect
-       style="fill:#f4d7d7;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-46"
-       width="64.18129"
-       height="45.550591"
-       x="125.84592"
-       y="201.26804" />
-    <rect
-       style="fill:#d7f4e3;fill-opacity:1;stroke:url(#linearGradient3608-4);stroke-width:0.293915;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-86"
-       width="79.001617"
-       height="45.521675"
-       x="221.60374"
-       y="163.11812" />
-    <rect
-       style="fill:#d7f4e3;fill-opacity:1;stroke:url(#linearGradient3608-4-8);stroke-width:0.29522076;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-86-5"
-       width="79.70742"
-       height="45.52037"
-       x="221.08463"
-       y="244.37004" />
-    <rect
-       style="opacity:1;fill:#d7eef4;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.31139579;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718"
-       width="125.8186"
-       height="100.36277"
-       x="321.87323"
-       y="112.72702" />
-    <rect
-       style="fill:#ffd5d5;fill-opacity:1;stroke:url(#linearGradient3608-4-8-7);stroke-width:0.30293623;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-86-5-3"
-       width="83.942352"
-       height="45.512653"
-       x="341.10928"
-       y="255.85414" />
-    <rect
-       style="fill:#ffb380;fill-opacity:1;stroke:url(#linearGradient3608-4-9);stroke-width:0.293915;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-86-2"
-       width="79.001617"
-       height="45.521675"
-       x="469.21576"
-       y="143.94656" />
-    <rect
-       style="opacity:1;fill:url(#radialGradient4334);fill-opacity:1;stroke:#6ba6fd;stroke-width:0.32037571;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3783"
-       width="342.1843"
-       height="53.684738"
-       x="50.934502"
-       y="327.77164" />
-    <rect
-       style="fill:#e9ddaf;fill-opacity:1;stroke:url(#linearGradient3608);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1"
-       width="64.18129"
-       height="45.550591"
-       x="53.748672"
-       y="331.81079" />
-    <rect
-       style="fill:#e9ddaf;fill-opacity:1;stroke:url(#linearGradient3608-9);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-3"
-       width="64.18129"
-       height="45.550591"
-       x="121.84918"
-       y="331.71741" />
-    <rect
-       style="fill:#e9ddaf;fill-opacity:1;stroke:url(#linearGradient3608-9-1);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-3-6"
-       width="64.18129"
-       height="45.550591"
-       x="189.84918"
-       y="331.71741" />
-    <rect
-       style="fill:#e9ddaf;fill-opacity:1;stroke:url(#linearGradient3608-9-1-5);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-3-6-4"
-       width="64.18129"
-       height="45.550591"
-       x="257.84918"
-       y="331.71741" />
-    <rect
-       style="fill:#e9ddaf;fill-opacity:1;stroke:url(#linearGradient3608-9-1-5-7);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-3-6-4-9"
-       width="64.18129"
-       height="45.550591"
-       x="325.84918"
-       y="331.71741" />
-    <rect
-       style="opacity:1;fill:url(#radialGradient4342);fill-opacity:1;stroke:#6ba6fd;stroke-width:0.28768006;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3783-8"
-       width="273.62766"
-       height="54.131645"
-       x="398.24258"
-       y="328.00156" />
-    <rect
-       style="fill:#dde9af;fill-opacity:1;stroke:url(#linearGradient3608-8);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-5"
-       width="64.18129"
-       height="45.550591"
-       x="401.07309"
-       y="331.47122" />
-    <rect
-       style="fill:#dde9af;fill-opacity:1;stroke:url(#linearGradient3608-9-8);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-3-0"
-       width="64.18129"
-       height="45.550591"
-       x="469.17358"
-       y="331.37781" />
-    <rect
-       style="fill:#dde9af;fill-opacity:1;stroke:url(#linearGradient3608-9-1-59);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-3-6-3"
-       width="64.18129"
-       height="45.550591"
-       x="537.17358"
-       y="331.37781" />
-    <rect
-       style="fill:#dde9af;fill-opacity:1;stroke:url(#linearGradient3608-9-1-5-73);stroke-width:0.26499999;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-3-6-4-6"
-       width="64.18129"
-       height="45.550591"
-       x="605.17358"
-       y="331.37781" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3"
-       width="27.798103"
-       height="21.434149"
-       x="325.80197"
-       y="117.21037" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8"
-       width="27.798103"
-       height="21.434149"
-       x="325.2959"
-       y="140.20857" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9"
-       width="27.798103"
-       height="21.434149"
-       x="325.2959"
-       y="164.20857" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-5"
-       width="27.798103"
-       height="21.434149"
-       x="356.37054"
-       y="117.39072" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-1"
-       width="27.798103"
-       height="21.434149"
-       x="355.86447"
-       y="140.38893" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2"
-       width="27.798103"
-       height="21.434149"
-       x="355.86447"
-       y="164.38893" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-5-5"
-       width="27.798103"
-       height="21.434149"
-       x="386.37054"
-       y="117.39072" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-1-9"
-       width="27.798103"
-       height="21.434149"
-       x="385.86447"
-       y="140.38895" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6"
-       width="27.798103"
-       height="21.434149"
-       x="385.86447"
-       y="164.38895" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-5-5-9"
-       width="27.798103"
-       height="21.434149"
-       x="416.37054"
-       y="117.39072" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-1-9-3"
-       width="27.798103"
-       height="21.434149"
-       x="415.86447"
-       y="140.38895" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6-8"
-       width="27.798103"
-       height="21.434149"
-       x="415.86447"
-       y="164.38896" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-5"
-       width="27.798103"
-       height="21.434149"
-       x="324.61139"
-       y="187.85849" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-0"
-       width="27.798103"
-       height="21.434149"
-       x="355.17996"
-       y="188.03886" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6-0"
-       width="27.798103"
-       height="21.434149"
-       x="385.17996"
-       y="188.03888" />
-    <rect
-       style="opacity:1;fill:#ffeeaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6-8-4"
-       width="27.798103"
-       height="21.434149"
-       x="415.17996"
-       y="188.03889" />
-    <rect
-       style="opacity:1;fill:#d7eef4;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.31139579;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-5"
-       width="125.8186"
-       height="100.36277"
-       x="452.24075"
-       y="208.56764" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-9"
-       width="27.798103"
-       height="21.434149"
-       x="456.16949"
-       y="213.05098" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-8"
-       width="27.798103"
-       height="21.434149"
-       x="455.66342"
-       y="236.04919" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-55"
-       width="27.798103"
-       height="21.434149"
-       x="455.66342"
-       y="260.04919" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-5-7"
-       width="27.798103"
-       height="21.434149"
-       x="486.73807"
-       y="213.23134" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-1-5"
-       width="27.798103"
-       height="21.434149"
-       x="486.23199"
-       y="236.22954" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-3"
-       width="27.798103"
-       height="21.434149"
-       x="486.23199"
-       y="260.22955" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-5-5-2"
-       width="27.798103"
-       height="21.434149"
-       x="516.73804"
-       y="213.23134" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-1-9-5"
-       width="27.798103"
-       height="21.434149"
-       x="516.23199"
-       y="236.22955" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6-1"
-       width="27.798103"
-       height="21.434149"
-       x="516.23199"
-       y="260.22955" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-5-5-9-6"
-       width="27.798103"
-       height="21.434149"
-       x="546.73804"
-       y="213.23134" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-1-9-3-1"
-       width="27.798103"
-       height="21.434149"
-       x="546.23199"
-       y="236.22955" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6-8-7"
-       width="27.798103"
-       height="21.434149"
-       x="546.23199"
-       y="260.22955" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-5-1"
-       width="27.798103"
-       height="21.434149"
-       x="454.97891"
-       y="283.6991" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-0-6"
-       width="27.798103"
-       height="21.434149"
-       x="485.54749"
-       y="283.87946" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6-0-7"
-       width="27.798103"
-       height="21.434149"
-       x="515.54749"
-       y="283.87949" />
-    <rect
-       style="opacity:1;fill:#ffccaa;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.837071;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3718-3-8-9-2-6-8-4-2"
-       width="27.798103"
-       height="21.434149"
-       x="545.54749"
-       y="283.87952" />
-    <g
-       id="g5089"
-       transform="matrix(0.7206312,0,0,1.0073979,12.37404,-312.02679)"
-       style="fill:#ff8080">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 64.439519,501.23542 v 5.43455 h 45.917801 v -5.43455 z"
-         style="opacity:1;fill:#ff8080;fill-opacity:1;stroke:#6ba6fd;stroke-width:1.09656608;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
-         id="rect4455" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5083"
-         d="m 108.30535,494.82846 c 13.96414,8.6951 13.96414,8.40526 13.96414,8.40526 l -12.46798,9.85445 z"
-         style="fill:#ff8080;stroke:#000000;stroke-width:0.53767502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <g
-       id="g5089-4"
-       transform="matrix(-0.6745281,0,0,0.97266112,143.12774,-266.3349)"
-       style="fill:#000080;fill-opacity:1">
-      <path
-         inkscape:connector-curvature="0"
-         d="m 64.439519,501.23542 v 5.43455 h 45.917801 v -5.43455 z"
-         style="opacity:1;fill:#000080;fill-opacity:1;stroke:#6ba6fd;stroke-width:1.09656608;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke"
-         id="rect4455-9" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5083-2"
-         d="m 108.30535,494.82846 c 13.96414,8.6951 13.96414,8.40526 13.96414,8.40526 l -12.46798,9.85445 z"
-         style="fill:#000080;stroke:#000000;stroke-width:0.53767502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
-    </g>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5112"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       transform="translate(52.199711,162.55901)"><flowRegion
-         id="flowRegion5114"><rect
-           id="rect5116"
-           width="28.991377"
-           height="19.79899"
-           x="22.627417"
-           y="64.897125" /></flowRegion><flowPara
-         id="flowPara5118">Tx</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5112-8"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       transform="translate(49.878465,112.26812)"><flowRegion
-         id="flowRegion5114-7"><rect
-           id="rect5116-7"
-           width="28.991377"
-           height="19.79899"
-           x="22.627417"
-           y="64.897125" /></flowRegion><flowPara
-         id="flowPara5118-5">Rx</flowPara></flowRoot>    <path
-       style="fill:none;stroke:#f60300;stroke-width:0.783;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:0.783, 0.78300000000000003;stroke-dashoffset:0;marker-start:url(#Arrow1Sstart);marker-end:url(#TriangleOutS)"
-       d="m 116.81066,179.28348 v -11.31903 l -0.37893,-12.93605 0.37893,-5.25526 3.03134,-5.25526 4.16811,-2.82976 8.3362,-1.61701 h 7.19945 l 7.19946,2.02126 3.03135,2.02126 0.37892,2.02125 -0.37892,3.23401 -0.37892,7.27652 -0.37892,8.48927 -0.37892,14.55304"
-       id="path8433"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="104.04285"
-       y="144.86398"
-       id="text9071"><tspan
-         sodipodi:role="line"
-         id="tspan9069"
-         x="104.04285"
-         y="144.86398"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333333px;font-family:monospace;-inkscape-font-specification:monospace;fill:#0000ff">HW loop back device</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="59.542858"
-       y="53.676483"
-       id="text9621"><tspan
-         sodipodi:role="line"
-         id="tspan9619"
-         x="59.542858"
-         y="65.840889" /></text>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1853-7-2-7-8-7-2-4-3-9-0-2-9-5-6-7-7"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.57822568,0,0,0.72506311,454.1297,247.6848)"><flowRegion
-         id="flowRegion1855-0-1-3-66-99-9-2-5-4-1-1-1-4-0-5-4"><rect
-           id="rect1857-5-1-5-2-6-1-4-9-3-8-1-8-5-7-9-1"
-           width="162.09244"
-           height="78.764809"
-           x="120.20815"
-           y="120.75856" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#5500d4"
-         id="flowPara9723" /></flowRoot>    <path
-       style="fill:none;stroke:#fe0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;marker-end:url(#Arrow2Mend)"
-       d="m 181.60025,194.22211 12.72792,-7.07106 14.14214,-2.82843 12.02081,0.70711 h 1.41422 v 0"
-       id="path9797"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fe0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;marker-end:url(#marker10821)"
-       d="m 179.47893,193.51501 3.53554,-14.14214 5.65685,-12.72792 16.97056,-9.19239 8.48528,-9.19238 14.84924,-7.77818 24.04163,-8.48528 18.38478,-6.36396 38.89087,-2.82843 h 12.02082 l -2.12132,-0.7071"
-       id="path10453"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fe0000;stroke-width:0.70021206;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.70021208, 0.70021208;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow2Mend-3)"
-       d="m 299.68795,188.0612 7.97521,-5.53298 8.86135,-2.2132 7.53214,0.5533 h 0.88614 v 0"
-       id="path9797-9"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fe0000;stroke-width:0.96708673;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.96708673, 0.96708673;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow2Mend-3-1)"
-       d="m 300.49277,174.25976 7.49033,-11.23756 8.32259,-4.49504 7.07419,1.12376 h 0.83227 v 0"
-       id="path9797-9-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#ff0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;marker-end:url(#marker12747)"
-       d="m 299.68708,196.34344 9.19239,7.77817 7.07107,1.41421 h 4.94974 v 0"
-       id="path12737"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:url(#linearGradient14808);stroke-width:4.66056013;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:4.66056002, 4.66056002;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Send)"
-       d="m 447.95767,168.30181 c 119.99171,0 119.99171,0 119.99171,0"
-       id="path13236"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#808080;stroke-width:0.96708673;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.96708673, 0.96708673000000001;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow2Mend-3-1-6)"
-       d="m 529.56098,142.71226 7.49033,-11.23756 8.32259,-4.49504 7.07419,1.12376 h 0.83227 v 0"
-       id="path9797-9-7-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00ffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;marker-end:url(#Arrow1Mend)"
-       d="m 612.93538,222.50639 -5.65686,12.72792 -14.84924,3.53553 -14.14213,0.70711"
-       id="path16128"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00ffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0"
-       d="m 624.95619,220.38507 -3.53553,13.43502 -12.72792,14.84925 -9.19239,5.65685 -19.09188,2.82843 -1.41422,-0.70711 h -1.41421"
-       id="path16130"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00ffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0"
-       d="m 635.56279,221.09217 -7.77817,33.94113 -4.24264,6.36396 -8.48528,3.53553 -10.6066,4.94975 -19.09189,5.65685 -6.36396,3.53554"
-       id="path16132"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00ffff;stroke-width:1.01083219;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.01083222, 1.01083221999999995;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-53)"
-       d="m 456.03282,270.85761 -4.96024,14.83162 -13.02062,4.11988 -12.40058,0.82399"
-       id="path16128-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00ffff;stroke-width:0.80101544;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.80101541, 0.80101540999999998;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-99)"
-       d="m 341.29831,266.70565 -6.88826,6.70663 -18.08168,1.86296 -17.22065,0.37258"
-       id="path16128-6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00faf5;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;marker-end:url(#Arrow1Mend)"
-       d="m 219.78402,264.93279 -6.36396,-9.89949 -3.53554,-16.26346 -7.77817,-8.48528 -8.48528,-4.94975 -4.94975,-2.82842"
-       id="path17144"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00db00;stroke-width:1.4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.4, 1.39999999999999991;stroke-dashoffset:0;marker-end:url(#marker17156);marker-start:url(#marker17550)"
-       d="m 651.11914,221.09217 -7.07107,31.81981 -17.67766,34.64823 -21.21321,26.87005 -80.61017,1.41422 -86.97413,1.41421 -79.90306,-3.53553 -52.3259,1.41421 -24.04163,10.6066 -2.82843,1.41422"
-       id="path17146"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1.3, 1.30000000000000004;stroke-dashoffset:0;marker-start:url(#marker18096);marker-end:url(#marker18508)"
-       d="M 659.60442,221.09217 C 656.776,327.86529 656.776,328.5724 656.776,328.5724"
-       id="path18086"
-       inkscape:connector-curvature="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1853-7-2-7-8-7-2"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.57822568,0,0,0.72506311,137.7802,161.1139)"><flowRegion
-         id="flowRegion1855-0-1-3-66-99-9"><rect
-           id="rect1857-5-1-5-2-6-1"
-           width="174.19844"
-           height="91.867104"
-           x="120.20815"
-           y="120.75856" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#5500d4"
-         id="flowPara9188-8-4" /></flowRoot>    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       x="155.96185"
-       y="220.07472"
-       id="text9071-6"><tspan
-         sodipodi:role="line"
-         x="158.29518"
-         y="220.07472"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"
-         id="tspan2100"> <tspan
-   style="fill:#0000ff"
-   id="tspan2327">Ethdev Ports </tspan></tspan><tspan
-         sodipodi:role="line"
-         x="155.96185"
-         y="236.74139"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2104">(NIX)</tspan></text>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2106"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:13.33333333px;line-height:1.25;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"><flowRegion
-         id="flowRegion2108"><rect
-           id="rect2110"
-           width="42.1875"
-           height="28.125"
-           x="178.125"
-           y="71.155365" /></flowRegion><flowPara
-         id="flowPara2112" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2114"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:13.33333333px;line-height:1.25;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"><flowRegion
-         id="flowRegion2116"><rect
-           id="rect2118"
-           width="38.28125"
-           height="28.90625"
-           x="196.09375"
-           y="74.280365" /></flowRegion><flowPara
-         id="flowPara2120" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2122"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:13.33333333px;line-height:1.25;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"><flowRegion
-         id="flowRegion2124"><rect
-           id="rect2126"
-           width="39.0625"
-           height="23.4375"
-           x="186.71875"
-           y="153.96786" /></flowRegion><flowPara
-         id="flowPara2128" /></flowRoot>    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       x="262.1366"
-       y="172.08614"
-       id="text9071-6-4"><tspan
-         sodipodi:role="line"
-         x="264.46994"
-         y="172.08614"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2104-0">Ingress  </tspan><tspan
-         sodipodi:role="line"
-         x="262.1366"
-         y="188.75281"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2176">Classification</tspan><tspan
-         sodipodi:role="line"
-         x="262.1366"
-         y="205.41946"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2180">(NPC)</tspan><tspan
-         sodipodi:role="line"
-         x="262.1366"
-         y="222.08614"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2178" /><tspan
-         sodipodi:role="line"
-         x="262.1366"
-         y="238.75281"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2174" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       x="261.26727"
-       y="254.46307"
-       id="text9071-6-4-9"><tspan
-         sodipodi:role="line"
-         x="263.60062"
-         y="254.46307"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2104-0-0">Egress  </tspan><tspan
-         sodipodi:role="line"
-         x="261.26727"
-         y="271.12973"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2176-8">Classification</tspan><tspan
-         sodipodi:role="line"
-         x="261.26727"
-         y="287.79642"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2180-9">(NPC)</tspan><tspan
-         sodipodi:role="line"
-         x="261.26727"
-         y="304.46307"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2178-3" /><tspan
-         sodipodi:role="line"
-         x="261.26727"
-         y="321.12973"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"
-         id="tspan2174-7" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="362.7016"
-       y="111.81297"
-       id="text9071-4"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8"
-         x="362.7016"
-         y="111.81297"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;fill:#0000ff">Rx Queues</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="488.21777"
-       y="207.21898"
-       id="text9071-4-3"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-8"
-         x="488.21777"
-         y="207.21898"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;fill:#0000ff">Tx Queues</tspan></text>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2311"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:13.33333333px;line-height:1.25;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"><flowRegion
-         id="flowRegion2313"><rect
-           id="rect2315"
-           width="49.21875"
-           height="41.40625"
-           x="195.3125"
-           y="68.811615" /></flowRegion><flowPara
-         id="flowPara2317" /></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2319"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:13.33333333px;line-height:1.25;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"><flowRegion
-         id="flowRegion2321"><rect
-           id="rect2323"
-           width="40.625"
-           height="39.0625"
-           x="196.09375"
-           y="69.592865" /></flowRegion><flowPara
-         id="flowPara2325" /></flowRoot>    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       x="382.20477"
-       y="263.74432"
-       id="text9071-6-4-6"><tspan
-         sodipodi:role="line"
-         x="382.20477"
-         y="263.74432"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2104-0-9">Egress</tspan><tspan
-         sodipodi:role="line"
-         x="382.20477"
-         y="280.41098"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2176-3">Traffic Manager</tspan><tspan
-         sodipodi:role="line"
-         x="382.20477"
-         y="297.07767"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2180-1">(NIX)</tspan><tspan
-         sodipodi:role="line"
-         x="382.20477"
-         y="313.74432"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2178-6" /><tspan
-         sodipodi:role="line"
-         x="382.20477"
-         y="330.41098"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2174-8" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       x="500.98602"
-       y="154.02556"
-       id="text9071-6-4-0"><tspan
-         sodipodi:role="line"
-         x="503.31937"
-         y="154.02556"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2104-0-97">Scheduler </tspan><tspan
-         sodipodi:role="line"
-         x="500.98602"
-         y="170.69223"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2389" /><tspan
-         sodipodi:role="line"
-         x="500.98602"
-         y="187.35889"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2391">SSO</tspan><tspan
-         sodipodi:role="line"
-         x="500.98602"
-         y="204.02556"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2178-60" /><tspan
-         sodipodi:role="line"
-         x="500.98602"
-         y="220.69223"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2174-3" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="571.61627"
-       y="119.24016"
-       id="text9071-4-2"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-82"
-         x="571.61627"
-         y="119.24016"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff">Supports both poll mode and/or event mode</tspan><tspan
-         sodipodi:role="line"
-         x="571.61627"
-         y="135.90683"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2416">by configuring scheduler</tspan><tspan
-         sodipodi:role="line"
-         x="571.61627"
-         y="152.57349"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2418" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       x="638.14227"
-       y="192.46773"
-       id="text9071-6-4-9-2"><tspan
-         sodipodi:role="line"
-         x="638.14227"
-         y="192.46773"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2178-3-2">ARMv8</tspan><tspan
-         sodipodi:role="line"
-         x="638.14227"
-         y="209.1344"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2499">Cores</tspan><tspan
-         sodipodi:role="line"
-         x="638.14227"
-         y="225.80106"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"
-         id="tspan2174-7-8" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="180.24902"
-       y="325.09399"
-       id="text9071-4-1"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-7"
-         x="180.24902"
-         y="325.09399"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;fill:#0000ff">Hardware Libraries</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="487.8916"
-       y="325.91599"
-       id="text9071-4-1-1"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-7-1"
-         x="487.8916"
-         y="325.91599"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;fill:#0000ff">Software Libraries</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="81.178604"
-       y="350.03149"
-       id="text9071-4-18"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-83"
-         x="81.178604"
-         y="350.03149"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff">Mempool</tspan><tspan
-         sodipodi:role="line"
-         x="81.178604"
-         y="366.69815"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2555">(NPA)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="151.09518"
-       y="348.77365"
-       id="text9071-4-18-9"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-83-3"
-         x="151.09518"
-         y="348.77365"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff">Timer</tspan><tspan
-         sodipodi:role="line"
-         x="151.09518"
-         y="365.44031"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2555-9">(TIM)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="222.56393"
-       y="347.1174"
-       id="text9071-4-18-0"><tspan
-         sodipodi:role="line"
-         x="222.56393"
-         y="347.1174"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2555-90">Crypto</tspan><tspan
-         sodipodi:role="line"
-         x="222.56393"
-         y="363.78406"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2601">(CPT)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="289.00229"
-       y="347.69473"
-       id="text9071-4-18-0-5"><tspan
-         sodipodi:role="line"
-         x="289.00229"
-         y="347.69473"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2555-90-9">Compress</tspan><tspan
-         sodipodi:role="line"
-         x="289.00229"
-         y="364.36139"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2601-6">(ZIP)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="355.50653"
-       y="348.60098"
-       id="text9071-4-18-0-5-6"><tspan
-         sodipodi:role="line"
-         x="355.50653"
-         y="348.60098"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2555-90-9-5">Shared</tspan><tspan
-         sodipodi:role="line"
-         x="355.50653"
-         y="365.26764"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2645">Memory</tspan><tspan
-         sodipodi:role="line"
-         x="355.50653"
-         y="381.93433"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2601-6-1" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="430.31393"
-       y="356.4924"
-       id="text9071-4-18-1"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-83-35"
-         x="430.31393"
-         y="356.4924"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff">SW Ring</tspan><tspan
-         sodipodi:role="line"
-         x="430.31393"
-         y="373.15906"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2555-6" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="569.37646"
-       y="341.1799"
-       id="text9071-4-18-2"><tspan
-         sodipodi:role="line"
-         id="tspan9069-8-83-4"
-         x="569.37646"
-         y="341.1799"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff">HASH</tspan><tspan
-         sodipodi:role="line"
-         x="569.37646"
-         y="357.84656"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2742">LPM</tspan><tspan
-         sodipodi:role="line"
-         x="569.37646"
-         y="374.51324"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2555-2">ACL</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="503.75143"
-       y="355.02365"
-       id="text9071-4-18-2-3"><tspan
-         sodipodi:role="line"
-         x="503.75143"
-         y="355.02365"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2733">Mbuf</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="639.34521"
-       y="355.6174"
-       id="text9071-4-18-19"><tspan
-         sodipodi:role="line"
-         x="639.34521"
-         y="355.6174"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#0000ff"
-         id="tspan2771">De(Frag)</tspan></text>
-  </g>
-</svg>
diff --git a/doc/guides/platform/img/octeontx2_resource_virtualization.svg b/doc/guides/platform/img/octeontx2_resource_virtualization.svg
deleted file mode 100644
index bf976b52af..0000000000
--- a/doc/guides/platform/img/octeontx2_resource_virtualization.svg
+++ /dev/null
@@ -1,2418 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<!--
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2019 Marvell International Ltd.
-#
--->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="631.91431"
-   height="288.34286"
-   id="svg3868"
-   version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="octeontx2_resource_virtualization.svg"
-   sodipodi:version="0.32"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3870">
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker9460"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path9458"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="marker7396"
-       style="overflow:visible"
-       inkscape:isstock="true">
-      <path
-         id="path7133"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
-         transform="scale(0.8) translate(12.5,0)" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5474">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5470" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5472" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5464">
-      <stop
-         style="stop-color:#daeef5;stop-opacity:1;"
-         offset="0"
-         id="stop5460" />
-      <stop
-         style="stop-color:#daeef5;stop-opacity:0;"
-         offset="1"
-         id="stop5462" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6545"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ffa600;stop-opacity:1;"
-         offset="0"
-         id="stop6543" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3302"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3294"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3290"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3286"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3228"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3188"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3184"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3180"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3176"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3172"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3168"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3164"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3160"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3120"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient3114"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00f900;stop-opacity:1;"
-         offset="0"
-         id="stop3112" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3088"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00f900;stop-opacity:1;"
-         offset="0"
-         id="stop3086" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3058"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00f900;stop-opacity:1;"
-         offset="0"
-         id="stop3056" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3054"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3050"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3046"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3042"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3038"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3034"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3030"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3008"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3004"
-       is_visible="true" />
-    <linearGradient
-       id="linearGradient2975"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ff2200;stop-opacity:1;"
-         offset="0"
-         id="stop2973" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2969"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#69ff72;stop-opacity:1;"
-         offset="0"
-         id="stop2967" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2963"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2961" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2929"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ff2d00;stop-opacity:1;"
-         offset="0"
-         id="stop2927" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4610"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#00ffff;stop-opacity:1;"
-         offset="0"
-         id="stop4608" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3993"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#6ba6fd;stop-opacity:1;"
-         offset="0"
-         id="stop3991" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3808"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#6ba6fd;stop-opacity:1;"
-         offset="0"
-         id="stop3806" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3776"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#fc0000;stop-opacity:1;"
-         offset="0"
-         id="stop3774" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3438"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#b8e132;stop-opacity:1;"
-         offset="0"
-         id="stop3436" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3408"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3404"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3400"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3392"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3376"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3044"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3040"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3036"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3032"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3028"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3024"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3020"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect2858"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect2854"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect2844"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <linearGradient
-       id="linearGradient2828"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:1;"
-         offset="0"
-         id="stop2826" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect329"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart"
-       style="overflow:visible">
-      <path
-         id="path4530"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend"
-       style="overflow:visible">
-      <path
-         id="path4533"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       id="linearGradient4513">
-      <stop
-         style="stop-color:#fdffdb;stop-opacity:1;"
-         offset="0"
-         id="stop4515" />
-      <stop
-         style="stop-color:#dfe2d8;stop-opacity:0;"
-         offset="1"
-         id="stop4517" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3876" />
-    <inkscape:perspective
-       id="perspective3886"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3211"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3892"
-       style="overflow:visible">
-      <path
-         id="path3894"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3896"
-       style="overflow:visible">
-      <path
-         id="path3898"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path3208"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3902"
-       style="overflow:visible">
-      <path
-         id="path3904"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3906"
-       style="overflow:visible">
-      <path
-         id="path3908"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.8,0,0,0.8,10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker3910"
-       style="overflow:visible">
-      <path
-         id="path3912"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective4086"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4113"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5195"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-4"
-       style="overflow:visible">
-      <path
-         id="path4533-7"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective5272"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-4"
-       style="overflow:visible">
-      <path
-         id="path4530-5"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-0"
-       style="overflow:visible">
-      <path
-         id="path4533-3"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:perspective
-       id="perspective5317"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-3"
-       style="overflow:visible">
-      <path
-         id="path4530-2"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-06"
-       style="overflow:visible">
-      <path
-         id="path4533-1"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-8"
-       style="overflow:visible">
-      <path
-         id="path4530-7"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-9"
-       style="overflow:visible">
-      <path
-         id="path4533-2"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect2858-0"
-       is_visible="true" />
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-3"
-       style="overflow:visible">
-      <path
-         id="path4533-75"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3044-9"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-3-2"
-       style="overflow:visible">
-      <path
-         id="path4533-75-8"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <inkscape:path-effect
-       effect="bspline"
-       id="path-effect3044-9-9"
-       is_visible="true"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3008-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3120-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3120-7-3"
-       is_visible="true" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5464"
-       id="linearGradient5466"
-       x1="65.724048"
-       y1="169.38839"
-       x2="183.38978"
-       y2="169.38839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-14,-4)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient5476"
-       x1="-89.501146"
-       y1="363.57419"
-       x2="-30.959395"
-       y2="363.57419"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62723639,0,0,1.0109144,105.65926,-0.6580533)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient5658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62723639,0,0,1.0109144,148.76869,-0.0791224)"
-       x1="-89.501146"
-       y1="363.57419"
-       x2="-30.959395"
-       y2="363.57419" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient5695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62723639,0,0,1.0109144,206.76869,3.9208776)"
-       x1="-89.501146"
-       y1="363.57419"
-       x2="-30.959395"
-       y2="363.57419" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-34"
-       style="overflow:visible">
-      <path
-         id="path4530-3"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-45"
-       style="overflow:visible">
-      <path
-         id="path4533-16"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7"
-       style="overflow:visible">
-      <path
-         id="path4530-58"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1"
-       style="overflow:visible">
-      <path
-         id="path4533-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7-6"
-       style="overflow:visible">
-      <path
-         id="path4530-58-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1-9"
-       style="overflow:visible">
-      <path
-         id="path4533-6-3"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7-2"
-       style="overflow:visible">
-      <path
-         id="path4530-58-46"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1-1"
-       style="overflow:visible">
-      <path
-         id="path4533-6-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-7-2-6"
-       style="overflow:visible">
-      <path
-         id="path4530-58-46-8"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-1-1-9"
-       style="overflow:visible">
-      <path
-         id="path4533-6-4-9"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient6997"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62723639,0,0,1.0109144,192.76869,-0.0791224)"
-       x1="-89.501146"
-       y1="363.57419"
-       x2="-30.959395"
-       y2="363.57419" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#grad0-40"
-       id="linearGradient5917"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.8786147,-0.0235964,-0.00460261,1.50035,-400.25558,-2006.3745)"
-       x1="-0.12893644"
-       y1="1717.1688"
-       x2="28.140806"
-       y2="1717.1688" />
-    <linearGradient
-       id="grad0-40"
-       x1="0"
-       y1="0"
-       x2="1"
-       y2="0"
-       gradientTransform="rotate(60,0.5,0.5)">
-      <stop
-         offset="0"
-         stop-color="#f3f6fa"
-         stop-opacity="1"
-         id="stop3419" />
-      <stop
-         offset="0.24"
-         stop-color="#f9fafc"
-         stop-opacity="1"
-         id="stop3421" />
-      <stop
-         offset="0.54"
-         stop-color="#feffff"
-         stop-opacity="1"
-         id="stop3423" />
-    </linearGradient>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30"
-       style="overflow:visible">
-      <path
-         id="path4530-0"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6"
-       style="overflow:visible">
-      <path
-         id="path4533-19"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30-0"
-       style="overflow:visible">
-      <path
-         id="path4530-0-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6-8"
-       style="overflow:visible">
-      <path
-         id="path4533-19-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30-0-9"
-       style="overflow:visible">
-      <path
-         id="path4530-0-6-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6-8-3"
-       style="overflow:visible">
-      <path
-         id="path4533-19-6-1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient6997-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62723639,0,0,1.0109144,321.82147,-1.8659026)"
-       x1="-89.501144"
-       y1="363.57419"
-       x2="-30.959394"
-       y2="363.57419" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient6997-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3985479,0,0,0.98036646,376.02779,12.240541)"
-       x1="-89.501144"
-       y1="363.57419"
-       x2="-30.959394"
-       y2="363.57419" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-81"
-       style="overflow:visible">
-      <path
-         id="path4530-9"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-5"
-       style="overflow:visible">
-      <path
-         id="path4533-72"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-1"
-       style="overflow:visible">
-      <path
-         id="path4530-6"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker9714"
-       style="overflow:visible">
-      <path
-         id="path9712"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-48"
-       style="overflow:visible">
-      <path
-         id="path4530-4"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker10117"
-       style="overflow:visible">
-      <path
-         id="path10115"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-48-6"
-       style="overflow:visible">
-      <path
-         id="path4530-4-0"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker11186"
-       style="overflow:visible">
-      <path
-         id="path11184"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5474"
-       id="linearGradient6997-8-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3985479,0,0,0.98036646,497.77779,12.751681)"
-       x1="-89.501144"
-       y1="363.57419"
-       x2="-30.959394"
-       y2="363.57419" />
-    <marker
-       inkscape:stockid="Arrow1Mstart"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mstart-30-0-9-0"
-       style="overflow:visible">
-      <path
-         id="path4530-0-6-4-1"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(0.4,0,0,0.4,4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Mend-6-8-3-7"
-       style="overflow:visible">
-      <path
-         id="path4533-19-6-1-5"
-         d="M 0,0 5,-5 -12.5,0 5,5 Z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;marker-start:none"
-         transform="matrix(-0.4,0,0,-0.4,-4,0)"
-         inkscape:connector-curvature="0" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="371.09569"
-     inkscape:cy="130.22425"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1057"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     fit-margin-top="0.1"
-     fit-margin-left="0.1"
-     fit-margin-right="0.1"
-     fit-margin-bottom="0.1"
-     inkscape:measure-start="-29.078,219.858"
-     inkscape:measure-end="346.809,219.858"
-     showguides="true"
-     inkscape:snap-page="true"
-     inkscape:snap-others="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:lockguides="false"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       position="-120.20815,574.17069"
-       orientation="0,1"
-       id="guide7077"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3873">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-46.542857,-100.33361)">
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot5313"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;letter-spacing:0px;word-spacing:0px"><flowRegion
-         id="flowRegion5315"><rect
-           id="rect5317"
-           width="120.91525"
-           height="96.873627"
-           x="-192.33304"
-           y="-87.130829" /></flowRegion><flowPara
-         id="flowPara5319" /></flowRoot>    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="90.320152"
-       y="299.67871"
-       id="text2978"
-       inkscape:export-filename="/home/matz/barracuda/rapports/mbuf-api-v2-images/octeon_multi.png"
-       inkscape:export-xdpi="112"
-       inkscape:export-ydpi="112"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="90.320152"
-         y="299.67871"
-         id="tspan3006"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.74255753px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025"> </tspan></text>
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.82973665;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066"
-       width="127.44949"
-       height="225.03024"
-       x="47.185646"
-       y="111.20448" />
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.55883217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5096"
-       width="117.1069"
-       height="20.907221"
-       x="52.003464"
-       y="154.93478" />
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b78fd;stroke-width:0.55900002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5096-6"
-       width="117.1069"
-       height="20.907221"
-       x="51.955002"
-       y="181.51834" />
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b7dfd;stroke-width:0.55883217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5096-6-2"
-       width="117.1069"
-       height="20.907221"
-       x="51.691605"
-       y="205.82234" />
-    <rect
-       y="154.93478"
-       x="52.003464"
-       height="20.907221"
-       width="117.1069"
-       id="rect5160"
-       style="fill:url(#linearGradient5466);fill-opacity:1;stroke:#6b8afd;stroke-width:0.55883217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b78fd;stroke-width:0.55883217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5162"
-       width="117.1069"
-       height="20.907221"
-       x="52.003464"
-       y="231.92767" />
-    <rect
-       y="255.45328"
-       x="52.003464"
-       height="20.907221"
-       width="117.1069"
-       id="rect5164"
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b6ffd;stroke-width:0.55883217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.55883217;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166"
-       width="117.1069"
-       height="20.907221"
-       x="52.003464"
-       y="281.11758" />
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b78fd;stroke-width:0.59729731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-6"
-       width="117.0697"
-       height="23.892008"
-       x="52.659744"
-       y="306.01089" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="96.955597"
-       y="163.55217"
-       id="text5219-26-1"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="96.955597"
-         y="163.55217"
-         id="tspan5223-10-9"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.33980179px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">NIX AF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="96.098343"
-       y="187.18845"
-       id="text5219-26-1-1"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="96.098343"
-         y="187.18845"
-         id="tspan5223-10-9-4"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.33980179px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">NPA AF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="96.829468"
-       y="211.79611"
-       id="text5219-26-1-5"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="96.829468"
-         y="211.79611"
-         id="tspan5223-10-9-1"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.33980179px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">SSO AF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="94.770523"
-       y="235.66898"
-       id="text5219-26-1-5-7-6"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="94.770523"
-         y="235.66898"
-         id="tspan5223-10-9-1-6-8"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.33980179px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">NPC AF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="94.895973"
-       y="259.25156"
-       id="text5219-26-1-5-7-6-3"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="94.895973"
-         y="259.25156"
-         id="tspan5223-10-9-1-6-8-3"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.33980179px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">CPT AF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="94.645073"
-       y="282.35391"
-       id="text5219-26-1-5-7-6-3-0"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="94.645073"
-         y="282.35391"
-         id="tspan5223-10-9-1-6-8-3-1"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.33980179px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">RVU AF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.93084431px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.07757032"
-       x="110.2803"
-       y="126.02858"
-       id="text5219-26"
-       transform="scale(1.0076913,0.9923674)"><tspan
-         sodipodi:role="line"
-         x="110.2803"
-         y="126.02858"
-         id="tspan5223-10"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.77570343px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;stroke-width:1.07757032">Linux AF driver</tspan><tspan
-         sodipodi:role="line"
-         x="110.2803"
-         y="139.49821"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.77570343px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;stroke-width:1.07757032"
-         id="tspan5325">(octeontx2_af)</tspan><tspan
-         sodipodi:role="line"
-         x="110.2803"
-         y="152.96783"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.77570343px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#ff0000;stroke-width:1.07757032"
-         id="tspan5327">PF0</tspan><tspan
-         sodipodi:role="line"
-         x="110.2803"
-         y="160.38988"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.77570343px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;stroke-width:1.07757032"
-         id="tspan5329" /></text>
-    <rect
-       style="fill:url(#linearGradient5476);fill-opacity:1;stroke:#695400;stroke-width:1.16700006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5468"
-       width="36.554455"
-       height="18.169683"
-       x="49.603416"
-       y="357.7995" />
-    <g
-       id="g5594"
-       transform="translate(-18,-40)">
-      <text
-         id="text5480"
-         y="409.46326"
-         x="73.41291"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#6a5400;fill-opacity:1;stroke:none"
-         xml:space="preserve"><tspan
-           style="font-size:8px;fill:#6a5400;fill-opacity:1"
-           y="409.46326"
-           x="73.41291"
-           id="tspan5478"
-           sodipodi:role="line">CGX-0</tspan></text>
-    </g>
-    <rect
-       style="fill:url(#linearGradient5658);fill-opacity:1;stroke:#695400;stroke-width:1.16700006;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5468-2"
-       width="36.554455"
-       height="18.169683"
-       x="92.712852"
-       y="358.37842" />
-    <g
-       id="g5594-7"
-       transform="translate(25.109434,2.578931)">
-      <text
-         id="text5480-9"
-         y="367.46326"
-         x="73.41291"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#695400;fill-opacity:1;stroke:none"
-         xml:space="preserve"><tspan
-           style="font-size:8px;fill:#695400;fill-opacity:1"
-           y="367.46326"
-           x="73.41291"
-           id="tspan5478-0"
-           sodipodi:role="line">CGX-1</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-         x="104.15788"
-         y="355.79947"
-         id="text5711"><tspan
-           sodipodi:role="line"
-           id="tspan5709"
-           x="104.15788"
-           y="392.29269" /></text>
-    </g>
-    <rect
-       style="opacity:1;fill:url(#linearGradient6997);fill-opacity:1;stroke:#695400;stroke-width:1.16700006;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5468-2-1"
-       width="36.554455"
-       height="18.169683"
-       x="136.71284"
-       y="358.37842" />
-    <g
-       id="g5594-7-0"
-       transform="translate(69.109434,2.578931)">
-      <text
-         id="text5480-9-7"
-         y="367.46326"
-         x="73.41291"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-         xml:space="preserve"><tspan
-           style="font-size:8px;fill:#695400;fill-opacity:1"
-           y="367.46326"
-           x="73.41291"
-           id="tspan5478-0-4"
-           sodipodi:role="line">CGX-2</tspan></text>
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="116.4436"
-       y="309.90784"
-       id="text5219-26-1-5-7-6-3-0-4"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="116.4436"
-         y="309.90784"
-         id="tspan5223-10-9-1-6-8-3-1-1"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.33980179px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;stroke-width:1.03398025">CGX-FW Interface</tspan></text>
-    <path
-       style="fill:none;stroke:#ff0000;stroke-width:0.45899999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:2.29999995;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)"
-       d="m 65.54286,336.17648 v 23"
-       id="path7614"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#ff0000;stroke-width:0.45899999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:2.29999995;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart-30);marker-end:url(#Arrow1Mend-6)"
-       d="m 108.54285,336.67647 v 23"
-       id="path7614-2"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#ff0000;stroke-width:0.45899999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:2.29999995;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart-30-0);marker-end:url(#Arrow1Mend-6-8)"
-       d="m 152.54285,336.67647 v 23"
-       id="path7614-2-2"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.50469553;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1"
-       width="100.27454"
-       height="105.81976"
-       x="242.65558"
-       y="233.7666" />
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.50588065;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-6"
-       width="100.27335"
-       height="106.31857"
-       x="361.40619"
-       y="233.7672" />
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.50588065;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-6-7"
-       width="100.27335"
-       height="106.31857"
-       x="467.40619"
-       y="233.7672" />
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.49445513;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-6-7-0"
-       width="95.784782"
-       height="106.33"
-       x="573.40039"
-       y="233.76149" />
-    <path
-       style="fill:none;stroke:#00ff00;stroke-width:0.984;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.984, 0.98400000000000021;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend)"
-       d="M 176.02438,304.15296 C 237.06133,305.2 237.06133,305.2 237.06133,305.2"
-       id="path8315"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       x="177.04286"
-       y="299.17648"
-       id="text8319"><tspan
-         sodipodi:role="line"
-         id="tspan8317"
-         x="177.04286"
-         y="299.17648"
-         style="font-size:10.66666698px;line-height:1">AF-PF MBOX</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="291.53308"
-       y="264.67648"
-       id="text8323"><tspan
-         sodipodi:role="line"
-         id="tspan8321"
-         x="291.53308"
-         y="264.67648"
-         style="font-size:10px;text-align:center;text-anchor:middle"><tspan
-           style="font-size:10px;fill:#0000ff"
-           id="tspan8339"><tspan
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace"
-             id="tspan11972">Linux</tspan></tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace"
-           id="tspan11970"> Netdev </tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;fill:#00d4aa"
-           id="tspan8343">PF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="291.53308"
-         y="281.34314"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"
-         id="tspan8345">driver</tspan><tspan
-         sodipodi:role="line"
-         x="291.53308"
-         y="298.00983"
-         id="tspan8325"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle">(octeontx2_pf)</tspan><tspan
-         sodipodi:role="line"
-         x="291.53308"
-         y="314.67648"
-         id="tspan8327"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle">PF<tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#ff0000"
-   id="tspan10511">x</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="291.53308"
-         y="331.34314"
-         id="tspan8329" /></text>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot8331"
-       style="fill:black;fill-opacity:1;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:13.33333333px;line-height:1.25;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:'sans-serif, Normal';font-stretch:normal;font-variant:normal;text-anchor:start;text-align:start;writing-mode:lr;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal"><flowRegion
-         id="flowRegion8333"><rect
-           id="rect8335"
-           width="48.5"
-           height="28"
-           x="252.5"
-           y="208.34286" /></flowRegion><flowPara
-         id="flowPara8337" /></flowRoot>    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.37650499;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9"
-       width="71.28923"
-       height="15.589548"
-       x="253.89825"
-       y="320.63168" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="283.97266"
-       y="319.09348"
-       id="text5219-26-1-5-7-6-3-0-1"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="283.97266"
-         y="319.09348"
-         id="tspan5223-10-9-1-6-8-3-1-0"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">NIX LF</tspan></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.37650499;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-7"
-       width="71.28923"
-       height="15.589548"
-       x="255.89822"
-       y="237.88171" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="285.03787"
-       y="239.81017"
-       id="text5219-26-1-5-7-6-3-0-1-4"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="285.03787"
-         y="239.81017"
-         id="tspan5223-10-9-1-6-8-3-1-0-8"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333333px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">NPA LF</tspan></text>
-    <path
-       style="fill:none;stroke:#ff0000;stroke-width:0.41014698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:2.29999995;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart-30-0-9);marker-end:url(#Arrow1Mend-6-8-3)"
-       d="m 287.54285,340.99417 v 18.3646"
-       id="path7614-2-2-8"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient6997-8);fill-opacity:1;stroke:#695400;stroke-width:1.316;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5468-2-1-4"
-       width="81.505402"
-       height="17.62063"
-       x="251.04015"
-       y="359.86615" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       x="263.46152"
-       y="224.99915"
-       id="text8319-7"><tspan
-         sodipodi:role="line"
-         id="tspan8317-7"
-         x="263.46152"
-         y="224.99915"
-         style="font-size:10.66666698px;line-height:1">PF-VF MBOX</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       x="259.23218"
-       y="371.46179"
-       id="text8319-7-7"><tspan
-         sodipodi:role="line"
-         id="tspan8317-7-3"
-         x="259.23218"
-         y="371.46179"
-         style="font-size:9.33333302px;line-height:1">CGX-x LMAC-y</tspan></text>
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.42349124;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-6-3"
-       width="80.855743"
-       height="92.400963"
-       x="197.86496"
-       y="112.97599" />
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.42349124;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-6-3-4"
-       width="80.855743"
-       height="92.400963"
-       x="286.61499"
-       y="112.476" />
-    <path
-       style="fill:none;stroke:#580000;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.3, 0.3;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 188.04286,109.67648 c 2.5,238.5 2,238 2,238 163.49999,0.5 163.49999,0.5 163.49999,0.5 v -124 l -70,0.5 -1.5,-116 v 1.5 z"
-       id="path9240"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.42349124;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-6-3-4-0"
-       width="80.855743"
-       height="92.400963"
-       x="375.11499"
-       y="111.976" />
-    <rect
-       style="fill:#d6eaf8;fill-opacity:1;stroke:#6ba6fd;stroke-width:0.42349124;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5066-1-6-3-4-0-0"
-       width="80.855743"
-       height="92.400963"
-       x="586.61499"
-       y="111.476" />
-    <path
-       style="fill:none;stroke:#ff00cc;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:7.2, 0.29999999999999999;stroke-dashoffset:0"
-       d="m 675.54284,107.17648 1,239.5 -317.99999,0.5 -1,-125 14.5,0.5 -0.5,-113.5 z"
-       id="path9272"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00ffff;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:7.2,0.3;stroke-dashoffset:0"
-       d="m 284.54285,109.17648 0.5,100 84,-0.5 v -99.5 z"
-       id="path9274"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.82769489px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.81207716"
-       x="231.87221"
-       y="146.02637"
-       id="text8323-1"
-       transform="scale(1.0315378,0.96942639)"><tspan
-         sodipodi:role="line"
-         id="tspan8321-2"
-         x="231.87221"
-         y="146.02637"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"><tspan
-   style="font-size:8.12077141px;fill:#0000ff;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan8339-6">Linux</tspan> Netdev <tspan
-   style="fill:#0066ff;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan9396">VF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="231.87221"
-         y="159.56099"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan8345-6">driver</tspan><tspan
-         sodipodi:role="line"
-         x="231.87221"
-         y="173.09561"
-         id="tspan8325-2"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">(octeontx2_vf)</tspan><tspan
-         sodipodi:role="line"
-         x="231.87221"
-         y="186.63022"
-         id="tspan8327-7"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">PF<tspan
-   style="fill:#782121;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan10513">x</tspan><tspan
-   style="font-size:8.12077141px;fill:#782121;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan8347-1">-VF0</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="231.87221"
-         y="200.16484"
-         id="tspan8329-3"
-         style="stroke-width:0.81207716;fill:#782121" /></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.30575109;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-9"
-       width="59.718147"
-       height="12.272857"
-       x="207.65872"
-       y="185.61246" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.0760603px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83967167"
-       x="225.56583"
-       y="192.49615"
-       id="text5219-26-1-5-7-6-3-0-1-6"
-       transform="scale(0.99742277,1.0025839)"><tspan
-         sodipodi:role="line"
-         x="225.56583"
-         y="192.49615"
-         id="tspan5223-10-9-1-6-8-3-1-0-5"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.57938623px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:0.83967167">NIX LF</tspan></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.30575109;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-7-5"
-       width="59.718147"
-       height="12.272857"
-       x="209.33406"
-       y="116.46765" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.0760603px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83967167"
-       x="226.43088"
-       y="124.1223"
-       id="text5219-26-1-5-7-6-3-0-1-4-7"
-       transform="scale(0.99742276,1.0025839)"><tspan
-         sodipodi:role="line"
-         x="226.43088"
-         y="124.1223"
-         id="tspan5223-10-9-1-6-8-3-1-0-8-0"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.57938623px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:0.83967167">NPA LF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.82769489px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.81207716"
-       x="317.66635"
-       y="121.26925"
-       id="text8323-1-9"
-       transform="scale(1.0315378,0.96942642)"><tspan
-         sodipodi:role="line"
-         id="tspan8321-2-3"
-         x="317.66635"
-         y="131.14769"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716" /><tspan
-         sodipodi:role="line"
-         x="317.66635"
-         y="144.6823"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan9400"><tspan
-   style="fill:#ff2a2a;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan9402">DPDK</tspan> Ethdev <tspan
-   style="fill:#0066ff;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan9398">VF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="317.66635"
-         y="158.21692"
-         id="tspan8325-2-7"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">driver</tspan><tspan
-         sodipodi:role="line"
-         x="317.66635"
-         y="171.75154"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan9392" /><tspan
-         sodipodi:role="line"
-         x="317.66635"
-         y="185.28616"
-         id="tspan8327-7-8"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">PF<tspan
-   style="fill:#782121;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan10515">x</tspan><tspan
-   style="font-size:8.12077141px;fill:#782121;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan8347-1-0">-VF1</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="317.66635"
-         y="198.82077"
-         id="tspan8329-3-3"
-         style="stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal" /></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.30575109;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-9-3"
-       width="59.718147"
-       height="12.272857"
-       x="295.65872"
-       y="185.11246" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.0760603px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83967167"
-       x="313.79312"
-       y="191.99756"
-       id="text5219-26-1-5-7-6-3-0-1-6-1"
-       transform="scale(0.99742276,1.0025839)"><tspan
-         sodipodi:role="line"
-         x="313.79312"
-         y="191.99756"
-         id="tspan5223-10-9-1-6-8-3-1-0-5-5"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.57938623px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:0.83967167">NIX LF</tspan></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.30575109;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-7-5-8"
-       width="59.718147"
-       height="12.272857"
-       x="297.33408"
-       y="115.96765" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.0760603px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83967167"
-       x="314.65817"
-       y="123.62372"
-       id="text5219-26-1-5-7-6-3-0-1-4-7-9"
-       transform="scale(0.99742276,1.0025839)"><tspan
-         sodipodi:role="line"
-         x="314.65817"
-         y="123.62372"
-         id="tspan5223-10-9-1-6-8-3-1-0-8-0-9"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.57938623px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:0.83967167">NPA LF</tspan></text>
-    <path
-       style="fill:none;stroke:#00ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;marker-end:url(#Arrow1Mstart);marker-start:url(#Arrow1Mstart)"
-       d="m 254.54285,205.17648 c 1,29 1,28.5 1,28.5"
-       id="path9405"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#00ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Arrow1Mstart-1);marker-end:url(#Arrow1Mstart-1)"
-       d="m 324.42292,203.92589 c 1,29 1,28.5 1,28.5"
-       id="path9405-3"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="408.28308"
-       y="265.83011"
-       id="text8323-7"><tspan
-         sodipodi:role="line"
-         id="tspan8321-3"
-         x="408.28308"
-         y="265.83011"
-         style="font-size:10px;text-align:center;text-anchor:middle;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"><tspan
-   style="fill:#ff2a2a;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan10440">DPDK</tspan> Ethdev <tspan
-   style="font-size:10px;fill:#00d4aa;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan8343-5">PF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="408.28308"
-         y="282.49677"
-         style="font-size:10px;text-align:center;text-anchor:middle;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan8345-8">driver</tspan><tspan
-         sodipodi:role="line"
-         x="408.28308"
-         y="299.16345"
-         id="tspan8325-5"
-         style="font-size:10px;text-align:center;text-anchor:middle;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal" /><tspan
-         sodipodi:role="line"
-         x="408.28308"
-         y="315.83011"
-         id="tspan8327-1"
-         style="font-size:10px;text-align:center;text-anchor:middle;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">PF<tspan
-   style="fill:#ff0000;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan10517">y</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="408.28308"
-         y="332.49677"
-         id="tspan8329-2" /></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.37650499;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-3"
-       width="71.28923"
-       height="15.589548"
-       x="376.64825"
-       y="319.78531" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="410.92075"
-       y="318.27411"
-       id="text5219-26-1-5-7-6-3-0-1-62"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="410.92075"
-         y="318.27411"
-         id="tspan5223-10-9-1-6-8-3-1-0-4"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">NIX LF</tspan></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.37650499;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-7-2"
-       width="71.28923"
-       height="15.589548"
-       x="378.64822"
-       y="237.03534" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="411.98596"
-       y="238.99095"
-       id="text5219-26-1-5-7-6-3-0-1-4-4"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="411.98596"
-         y="238.99095"
-         id="tspan5223-10-9-1-6-8-3-1-0-8-7"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">NPA LF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       x="386.21152"
-       y="224.15277"
-       id="text8319-7-5"><tspan
-         sodipodi:role="line"
-         id="tspan8317-7-8"
-         x="386.21152"
-         y="224.15277"
-         style="font-size:10.66666698px;line-height:1">PF-VF MBOX</tspan></text>
-    <path
-       style="fill:none;stroke:#00ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Arrow1Mstart-48);marker-end:url(#Arrow1Mstart-48)"
-       d="m 411.29285,204.33011 c 1,29 1,28.5 1,28.5"
-       id="path9405-0"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="520.61176"
-       y="265.49265"
-       id="text8323-7-8"><tspan
-         sodipodi:role="line"
-         id="tspan8321-3-3"
-         x="520.61176"
-         y="265.49265"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"><tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#ff2a2a"
-   id="tspan10440-2">DPDK</tspan> Eventdev <tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;fill:#00d4aa"
-   id="tspan8343-5-3">PF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="520.61176"
-         y="282.1593"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"
-         id="tspan8345-8-6">driver</tspan><tspan
-         sodipodi:role="line"
-         x="520.61176"
-         y="298.82599"
-         id="tspan8325-5-4"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle" /><tspan
-         sodipodi:role="line"
-         x="520.61176"
-         y="315.49265"
-         id="tspan8327-1-0"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle">PF<tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#ff0000"
-   id="tspan10519">z</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="520.61176"
-         y="332.1593"
-         id="tspan8329-2-1" /></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.37650499;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-3-6"
-       width="71.28923"
-       height="15.589548"
-       x="484.97693"
-       y="319.44785" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="522.95496"
-       y="317.94733"
-       id="text5219-26-1-5-7-6-3-0-1-62-1"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="522.95496"
-         y="317.94733"
-         id="tspan5223-10-9-1-6-8-3-1-0-4-7"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">TIM LF</tspan></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.37650499;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-7-2-8"
-       width="71.28923"
-       height="15.589548"
-       x="486.9769"
-       y="236.69788" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.40776253px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03398025"
-       x="524.0202"
-       y="238.66432"
-       id="text5219-26-1-5-7-6-3-0-1-4-4-3"
-       transform="scale(0.96692797,1.0342032)"><tspan
-         sodipodi:role="line"
-         x="524.0202"
-         y="238.66432"
-         id="tspan5223-10-9-1-6-8-3-1-0-8-7-6"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:9.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:1.03398025">SSO LF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="619.6156"
-       y="265.47531"
-       id="text8323-7-8-3"><tspan
-         sodipodi:role="line"
-         id="tspan8321-3-3-1"
-         x="619.6156"
-         y="265.47531"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"> <tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#0000ff"
-   id="tspan10562">Linux </tspan>Crypto <tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;fill:#00d4aa"
-   id="tspan8343-5-3-7">PF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="619.6156"
-         y="282.14197"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle"
-         id="tspan8345-8-6-8">driver</tspan><tspan
-         sodipodi:role="line"
-         x="619.6156"
-         y="298.80865"
-         id="tspan8325-5-4-3"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle" /><tspan
-         sodipodi:role="line"
-         x="619.6156"
-         y="315.47531"
-         id="tspan8327-1-0-5"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle">PF<tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#ff0000"
-   id="tspan10560">m</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="619.6156"
-         y="332.14197"
-         id="tspan8329-2-1-9" /></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.30575109;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-9-3-0"
-       width="59.718147"
-       height="12.272857"
-       x="385.10458"
-       y="183.92126" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.0760603px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83967167"
-       x="403.46997"
-       y="190.80957"
-       id="text5219-26-1-5-7-6-3-0-1-6-1-5"
-       transform="scale(0.99742276,1.0025839)"><tspan
-         sodipodi:role="line"
-         x="403.46997"
-         y="190.80957"
-         id="tspan5223-10-9-1-6-8-3-1-0-5-5-5"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.57938623px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:0.83967167">NIX LF</tspan></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.30575109;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-7-5-8-5"
-       width="59.718147"
-       height="12.272857"
-       x="386.77994"
-       y="116.77647" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.0760603px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83967167"
-       x="404.33502"
-       y="124.43062"
-       id="text5219-26-1-5-7-6-3-0-1-4-7-9-8"
-       transform="scale(0.99742276,1.0025839)"><tspan
-         sodipodi:role="line"
-         x="404.33502"
-         y="124.43062"
-         id="tspan5223-10-9-1-6-8-3-1-0-8-0-9-8"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.57938623px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:0.83967167">NPA LF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.82769489px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.81207716"
-       x="402.97598"
-       y="143.8235"
-       id="text8323-1-7"
-       transform="scale(1.0315378,0.96942642)"><tspan
-         sodipodi:role="line"
-         id="tspan8321-2-1"
-         x="402.97598"
-         y="143.8235"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"><tspan
-   style="fill:#ff2a2a;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan11102">DPDK</tspan> Ethdev <tspan
-   style="fill:#0066ff;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan9396-1">VF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="402.97598"
-         y="157.35812"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan8345-6-5">driver</tspan><tspan
-         sodipodi:role="line"
-         x="402.97598"
-         y="170.89275"
-         id="tspan8327-7-2"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal" /><tspan
-         sodipodi:role="line"
-         x="402.97598"
-         y="184.42735"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan11106">PF<tspan
-   style="fill:#a02c2c;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan11110">y</tspan><tspan
-   style="font-size:8.12077141px;fill:#a02c2c;stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-   id="tspan8347-1-2">-VF0</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="402.97598"
-         y="197.96198"
-         id="tspan8329-3-4"
-         style="stroke-width:0.81207716;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal" /></text>
-    <rect
-       style="fill:#daeef5;fill-opacity:1;stroke:#6b86fd;stroke-width:0.30575109;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect5166-9-9-3-0-0"
-       width="59.718147"
-       height="12.272857"
-       x="596.60461"
-       y="185.11246" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.0760603px;line-height:0%;font-family:monospace;-inkscape-font-specification:monospace;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.83967167"
-       x="615.51703"
-       y="191.99774"
-       id="text5219-26-1-5-7-6-3-0-1-6-1-5-1"
-       transform="scale(0.99742276,1.0025839)"><tspan
-         sodipodi:role="line"
-         x="615.51703"
-         y="191.99774"
-         id="tspan5223-10-9-1-6-8-3-1-0-5-5-5-2"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.57938623px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;stroke-width:0.83967167">CPT LF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.82769489px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.81207716"
-       x="608.00879"
-       y="145.05219"
-       id="text8323-1-7-3"
-       transform="scale(1.0315378,0.96942642)"><tspan
-         sodipodi:role="line"
-         id="tspan8321-2-1-5"
-         x="608.00879"
-         y="145.05219"
-         style="font-size:8.12077141px;text-align:center;text-anchor:middle;stroke-width:0.81207716"><tspan
-           id="tspan1793"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#ff2a2a">DPDK</tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace"
-           id="tspan11966"> Crypto </tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#0066ff"
-           id="tspan9396-1-1">VF</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="608.00879"
-         y="158.58681"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.12077141px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;stroke-width:0.81207716"
-         id="tspan8345-6-5-4">driver</tspan><tspan
-         sodipodi:role="line"
-         x="608.00879"
-         y="172.12143"
-         id="tspan8327-7-2-1"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.12077141px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;stroke-width:0.81207716" /><tspan
-         sodipodi:role="line"
-         x="608.00879"
-         y="185.65604"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.12077141px;font-family:monospace;-inkscape-font-specification:monospace;text-align:center;text-anchor:middle;stroke-width:0.81207716"
-         id="tspan11106-8">PF<tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:monospace;-inkscape-font-specification:monospace;fill:#c83737"
-   id="tspan11172">m</tspan><tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.12077141px;font-family:monospace;-inkscape-font-specification:monospace;fill:#c83737;stroke-width:0.81207716"
-   id="tspan8347-1-2-0">-VF0</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="608.00879"
-         y="199.19066"
-         id="tspan8329-3-4-0"
-         style="stroke-width:0.81207716" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       x="603.23218"
-       y="224.74855"
-       id="text8319-7-5-1"><tspan
-         sodipodi:role="line"
-         id="tspan8317-7-8-4"
-         x="603.23218"
-         y="224.74855"
-         style="font-size:10.66666698px;line-height:1">PF-VF MBOX</tspan></text>
-    <path
-       style="fill:none;stroke:#00ff00;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Arrow1Mstart-48-6);marker-end:url(#Arrow1Mstart-48-6)"
-       d="m 628.31351,204.92589 c 1,29 1,28.5 1,28.5"
-       id="path9405-0-2"
-       inkscape:connector-curvature="0" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot11473"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       transform="translate(46.542857,100.33361)"><flowRegion
-         id="flowRegion11475"><rect
-           id="rect11477"
-           width="90"
-           height="14.5"
-           x="426"
-           y="26.342873" /></flowRegion><flowPara
-         id="flowPara11479">DDDpk</flowPara></flowRoot>    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="509.60013"
-       y="128.17648"
-       id="text11483"><tspan
-         sodipodi:role="line"
-         id="tspan11481"
-         x="511.47513"
-         y="128.17648"
-         style="font-size:8px;text-align:center;text-anchor:middle;fill:#005544">D<tspan
-   style="-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;fill:#005544"
-   id="tspan11962">PDK-APP1 with </tspan></tspan><tspan
-         sodipodi:role="line"
-         x="511.47513"
-         y="144.84315"
-         style="font-size:8px;text-align:center;text-anchor:middle;fill:#005544;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan11485">one ethdev </tspan><tspan
-         sodipodi:role="line"
-         x="509.60013"
-         y="161.50981"
-         style="font-size:8px;text-align:center;text-anchor:middle;fill:#005544;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan11491">over Linux PF</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="533.54285"
-       y="158.17648"
-       id="text11489"><tspan
-         sodipodi:role="line"
-         id="tspan11487"
-         x="533.54285"
-         y="170.34088" /></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none"
-       x="518.02197"
-       y="179.98117"
-       id="text11483-6"><tspan
-         sodipodi:role="line"
-         id="tspan11481-4"
-         x="519.42822"
-         y="179.98117"
-         style="font-size:8px;text-align:center;text-anchor:middle;fill:#ff2a2a;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal">DPDK-APP2 with </tspan><tspan
-         sodipodi:role="line"
-         x="518.02197"
-         y="196.64784"
-         style="font-size:8px;text-align:center;text-anchor:middle;fill:#ff2a2a;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan11485-5">Two ethdevs(PF,VF) ,</tspan><tspan
-         sodipodi:role="line"
-         x="518.02197"
-         y="213.3145"
-         style="font-size:8px;text-align:center;text-anchor:middle;fill:#ff2a2a;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan11517">eventdev, timer adapter and</tspan><tspan
-         sodipodi:role="line"
-         x="518.02197"
-         y="229.98117"
-         style="font-size:8px;text-align:center;text-anchor:middle;fill:#ff2a2a;-inkscape-font-specification:monospace;font-family:monospace;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal"
-         id="tspan11519"> cryptodev</tspan><tspan
-         sodipodi:role="line"
-         x="518.02197"
-         y="246.64784"
-         style="font-size:10.66666698px;text-align:center;text-anchor:middle;fill:#00ffff"
-         id="tspan11491-6" /></text>
-    <path
-       style="fill:#005544;stroke:#00ffff;stroke-width:1.02430511;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.02430516, 4.09722065999999963;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mstart-8)"
-       d="m 483.99846,150.16496 -112.95349,13.41069 v 0 l -0.48897,-0.53643 h 0.48897"
-       id="path11521"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#ff0000;stroke:#ff5555;stroke-width:1.16440296;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.16440301, 2.32880602999999997;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#Arrow1Mend-0)"
-       d="m 545.54814,186.52569 c 26.3521,-76.73875 26.3521,-76.73875 26.3521,-76.73875"
-       id="path11523"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#ff0000;stroke-width:0.41014698;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:2.29999995;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow1Mstart-30-0-9-0);marker-end:url(#Arrow1Mend-6-8-3-7)"
-       d="m 409.29286,341.50531 v 18.3646"
-       id="path7614-2-2-8-2"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient6997-8-0);fill-opacity:1;stroke:#695400;stroke-width:1.31599998;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5468-2-1-4-9"
-       width="81.505402"
-       height="17.62063"
-       x="372.79016"
-       y="360.37729" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;line-height:1.25;font-family:monospace;-inkscape-font-specification:monospace;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       x="380.98218"
-       y="371.97293"
-       id="text8319-7-7-1"><tspan
-         sodipodi:role="line"
-         id="tspan8317-7-3-1"
-         x="380.98218"
-         y="371.97293"
-         style="font-size:9.33333302px;line-height:1">CGX-x LMAC-y</tspan></text>
-  </g>
-</svg>
diff --git a/doc/guides/platform/index.rst b/doc/guides/platform/index.rst
index 7614e1a368..2ff91a6018 100644
--- a/doc/guides/platform/index.rst
+++ b/doc/guides/platform/index.rst
@@ -15,4 +15,3 @@ The following are platform specific guides and setup information.
     dpaa
     dpaa2
     octeontx
-    octeontx2
diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst
deleted file mode 100644
index 5ab43abbdd..0000000000
--- a/doc/guides/platform/octeontx2.rst
+++ /dev/null
@@ -1,520 +0,0 @@
-..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2019 Marvell International Ltd.
-
-Marvell OCTEON TX2 Platform Guide
-=================================
-
-This document gives an overview of **Marvell OCTEON TX2** RVU H/W block,
-packet flow and procedure to build DPDK on OCTEON TX2 platform.
-
-More information about OCTEON TX2 SoC can be found at `Marvell Official Website
-<https://www.marvell.com/embedded-processors/infrastructure-processors/>`_.
-
-Supported OCTEON TX2 SoCs
--------------------------
-
-- CN98xx
-- CN96xx
-- CN93xx
-
-OCTEON TX2 Resource Virtualization Unit architecture
-----------------------------------------------------
-
-The :numref:`figure_octeontx2_resource_virtualization` diagram depicts the
-RVU architecture and a resource provisioning example.
-
-.. _figure_octeontx2_resource_virtualization:
-
-.. figure:: img/octeontx2_resource_virtualization.*
-
-    OCTEON TX2 Resource virtualization architecture and provisioning example
-
-
-Resource Virtualization Unit (RVU) on Marvell's OCTEON TX2 SoC maps HW
-resources belonging to the network, crypto and other functional blocks onto
-PCI-compatible physical and virtual functions.
-
-Each functional block has multiple local functions (LFs) for
-provisioning to different PCIe devices. RVU supports multiple PCIe SRIOV
-physical functions (PFs) and virtual functions (VFs).
-
-The :numref:`table_octeontx2_rvu_dpdk_mapping` shows the various local
-functions (LFs) provided by the RVU and its functional mapping to
-DPDK subsystem.
-
-.. _table_octeontx2_rvu_dpdk_mapping:
-
-.. table:: RVU managed functional blocks and its mapping to DPDK subsystem
-
-   +---+-----+--------------------------------------------------------------+
-   | # | LF  | DPDK subsystem mapping                                       |
-   +===+=====+==============================================================+
-   | 1 | NIX | rte_ethdev, rte_tm, rte_event_eth_[rt]x_adapter, rte_security|
-   +---+-----+--------------------------------------------------------------+
-   | 2 | NPA | rte_mempool                                                  |
-   +---+-----+--------------------------------------------------------------+
-   | 3 | NPC | rte_flow                                                     |
-   +---+-----+--------------------------------------------------------------+
-   | 4 | CPT | rte_cryptodev, rte_event_crypto_adapter                      |
-   +---+-----+--------------------------------------------------------------+
-   | 5 | SSO | rte_eventdev                                                 |
-   +---+-----+--------------------------------------------------------------+
-   | 6 | TIM | rte_event_timer_adapter                                      |
-   +---+-----+--------------------------------------------------------------+
-   | 7 | LBK | rte_ethdev                                                   |
-   +---+-----+--------------------------------------------------------------+
-   | 8 | DPI | rte_rawdev                                                   |
-   +---+-----+--------------------------------------------------------------+
-   | 9 | SDP | rte_ethdev                                                   |
-   +---+-----+--------------------------------------------------------------+
-   | 10| REE | rte_regexdev                                                 |
-   +---+-----+--------------------------------------------------------------+
-
-PF0 is called the administrative / admin function (AF) and has exclusive
-privileges to provision RVU functional block's LFs to each of the PF/VF.
-
-PF/VFs communicates with AF via a shared memory region (mailbox).Upon receiving
-requests from PF/VF, AF does resource provisioning and other HW configuration.
-
-AF is always attached to host, but PF/VFs may be used by host kernel itself,
-or attached to VMs or to userspace applications like DPDK, etc. So, AF has to
-handle provisioning/configuration requests sent by any device from any domain.
-
-The AF driver does not receive or process any data.
-It is only a configuration driver used in control path.
-
-The :numref:`figure_octeontx2_resource_virtualization` diagram also shows a
-resource provisioning example where,
-
-1. PFx and PFx-VF0 bound to Linux netdev driver.
-2. PFx-VF1 ethdev driver bound to the first DPDK application.
-3. PFy ethdev driver, PFy-VF0 ethdev driver, PFz eventdev driver, PFm-VF0 cryptodev driver bound to the second DPDK application.
-
-LBK HW Access
--------------
-
-Loopback HW Unit (LBK) receives packets from NIX-RX and sends packets back to NIX-TX.
-The loopback block has N channels and contains data buffering that is shared across
-all channels. The LBK HW Unit is abstracted using ethdev subsystem, Where PF0's
-VFs are exposed as ethdev device and odd-even pairs of VFs are tied together,
-that is, packets sent on odd VF end up received on even VF and vice versa.
-This would enable HW accelerated means of communication between two domains
-where even VF bound to the first domain and odd VF bound to the second domain.
-
-Typical application usage models are,
-
-#. Communication between the Linux kernel and DPDK application.
-#. Exception path to Linux kernel from DPDK application as SW ``KNI`` replacement.
-#. Communication between two different DPDK applications.
-
-SDP interface
--------------
-
-System DPI Packet Interface unit(SDP) provides PCIe endpoint support for remote host
-to DMA packets into and out of OCTEON TX2 SoC. SDP interface comes in to live only when
-OCTEON TX2 SoC is connected in PCIe endpoint mode. It can be used to send/receive
-packets to/from remote host machine using input/output queue pairs exposed to it.
-SDP interface receives input packets from remote host from NIX-RX and sends packets
-to remote host using NIX-TX. Remote host machine need to use corresponding driver
-(kernel/user mode) to communicate with SDP interface on OCTEON TX2 SoC. SDP supports
-single PCIe SRIOV physical function(PF) and multiple virtual functions(VF's). Users
-can bind PF or VF to use SDP interface and it will be enumerated as ethdev ports.
-
-The primary use case for SDP is to enable the smart NIC use case. Typical usage models are,
-
-#. Communication channel between remote host and OCTEON TX2 SoC over PCIe.
-#. Transfer packets received from network interface to remote host over PCIe and
-   vice-versa.
-
-OCTEON TX2 packet flow
-----------------------
-
-The :numref:`figure_octeontx2_packet_flow_hw_accelerators` diagram depicts
-the packet flow on OCTEON TX2 SoC in conjunction with use of various HW accelerators.
-
-.. _figure_octeontx2_packet_flow_hw_accelerators:
-
-.. figure:: img/octeontx2_packet_flow_hw_accelerators.*
-
-    OCTEON TX2 packet flow in conjunction with use of HW accelerators
-
-HW Offload Drivers
-------------------
-
-This section lists dataplane H/W block(s) available in OCTEON TX2 SoC.
-
-#. **Ethdev Driver**
-   See :doc:`../nics/octeontx2` for NIX Ethdev driver information.
-
-#. **Mempool Driver**
-   See :doc:`../mempool/octeontx2` for NPA mempool driver information.
-
-#. **Event Device Driver**
-   See :doc:`../eventdevs/octeontx2` for SSO event device driver information.
-
-#. **Crypto Device Driver**
-   See :doc:`../cryptodevs/octeontx2` for CPT crypto device driver information.
-
-Procedure to Setup Platform
----------------------------
-
-There are three main prerequisites for setting up DPDK on OCTEON TX2
-compatible board:
-
-1. **OCTEON TX2 Linux kernel driver**
-
-   The dependent kernel drivers can be obtained from the
-   `kernel.org <https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/net/ethernet/marvell/octeontx2>`_.
-
-   Alternatively, the Marvell SDK also provides the required kernel drivers.
-
-   Linux kernel should be configured with the following features enabled:
-
-.. code-block:: console
-
-        # 64K pages enabled for better performance
-        CONFIG_ARM64_64K_PAGES=y
-        CONFIG_ARM64_VA_BITS_48=y
-        # huge pages support enabled
-        CONFIG_HUGETLBFS=y
-        CONFIG_HUGETLB_PAGE=y
-        # VFIO enabled with TYPE1 IOMMU at minimum
-        CONFIG_VFIO_IOMMU_TYPE1=y
-        CONFIG_VFIO_VIRQFD=y
-        CONFIG_VFIO=y
-        CONFIG_VFIO_NOIOMMU=y
-        CONFIG_VFIO_PCI=y
-        CONFIG_VFIO_PCI_MMAP=y
-        # SMMUv3 driver
-        CONFIG_ARM_SMMU_V3=y
-        # ARMv8.1 LSE atomics
-        CONFIG_ARM64_LSE_ATOMICS=y
-        # OCTEONTX2 drivers
-        CONFIG_OCTEONTX2_MBOX=y
-        CONFIG_OCTEONTX2_AF=y
-        # Enable if netdev PF driver required
-        CONFIG_OCTEONTX2_PF=y
-        # Enable if netdev VF driver required
-        CONFIG_OCTEONTX2_VF=y
-        CONFIG_CRYPTO_DEV_OCTEONTX2_CPT=y
-        # Enable if OCTEONTX2 DMA PF driver required
-        CONFIG_OCTEONTX2_DPI_PF=n
-
-2. **ARM64 Linux Tool Chain**
-
-   For example, the *aarch64* Linaro Toolchain, which can be obtained from
-   `here <https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/>`_.
-
-   Alternatively, the Marvell SDK also provides GNU GCC toolchain, which is
-   optimized for OCTEON TX2 CPU.
-
-3. **Rootfile system**
-
-   Any *aarch64* supporting filesystem may be used. For example,
-   Ubuntu 15.10 (Wily) or 16.04 LTS (Xenial) userland which can be obtained
-   from `<http://cdimage.ubuntu.com/ubuntu-base/releases/16.04/release/ubuntu-base-16.04.1-base-arm64.tar.gz>`_.
-
-   Alternatively, the Marvell SDK provides the buildroot based root filesystem.
-   The SDK includes all the above prerequisites necessary to bring up the OCTEON TX2 board.
-
-- Follow the DPDK :doc:`../linux_gsg/index` to setup the basic DPDK environment.
-
-
-Debugging Options
------------------
-
-.. _table_octeontx2_common_debug_options:
-
-.. table:: OCTEON TX2 common debug options
-
-   +---+------------+-------------------------------------------------------+
-   | # | Component  | EAL log command                                       |
-   +===+============+=======================================================+
-   | 1 | Common     | --log-level='pmd\.octeontx2\.base,8'                  |
-   +---+------------+-------------------------------------------------------+
-   | 2 | Mailbox    | --log-level='pmd\.octeontx2\.mbox,8'                  |
-   +---+------------+-------------------------------------------------------+
-
-Debugfs support
-~~~~~~~~~~~~~~~
-
-The **OCTEON TX2 Linux kernel driver** provides support to dump RVU blocks
-context or stats using debugfs.
-
-Enable ``debugfs`` by:
-
-1. Compile kernel with debugfs enabled, i.e ``CONFIG_DEBUGFS=y``.
-2. Boot OCTEON TX2 with debugfs supported kernel.
-3. Verify ``debugfs`` mounted by default "mount | grep -i debugfs" or mount it manually by using.
-
-.. code-block:: console
-
-       # mount -t debugfs none /sys/kernel/debug
-
-Currently ``debugfs`` supports the following RVU blocks NIX, NPA, NPC, NDC,
-SSO & CGX.
-
-The file structure under ``/sys/kernel/debug`` is as follows
-
-.. code-block:: console
-
-        octeontx2/
-        |-- cgx
-        |   |-- cgx0
-        |   |   '-- lmac0
-        |   |       '-- stats
-        |   |-- cgx1
-        |   |   |-- lmac0
-        |   |   |   '-- stats
-        |   |   '-- lmac1
-        |   |       '-- stats
-        |   '-- cgx2
-        |       '-- lmac0
-        |           '-- stats
-        |-- cpt
-        |   |-- cpt_engines_info
-        |   |-- cpt_engines_sts
-        |   |-- cpt_err_info
-        |   |-- cpt_lfs_info
-        |   '-- cpt_pc
-        |---- nix
-        |   |-- cq_ctx
-        |   |-- ndc_rx_cache
-        |   |-- ndc_rx_hits_miss
-        |   |-- ndc_tx_cache
-        |   |-- ndc_tx_hits_miss
-        |   |-- qsize
-        |   |-- rq_ctx
-        |   |-- sq_ctx
-        |   '-- tx_stall_hwissue
-        |-- npa
-        |   |-- aura_ctx
-        |   |-- ndc_cache
-        |   |-- ndc_hits_miss
-        |   |-- pool_ctx
-        |   '-- qsize
-        |-- npc
-        |    |-- mcam_info
-        |    '-- rx_miss_act_stats
-        |-- rsrc_alloc
-        '-- sso
-             |-- hws
-             |   '-- sso_hws_info
-             '-- hwgrp
-                 |-- sso_hwgrp_aq_thresh
-                 |-- sso_hwgrp_iaq_walk
-                 |-- sso_hwgrp_pc
-                 |-- sso_hwgrp_free_list_walk
-                 |-- sso_hwgrp_ient_walk
-                 '-- sso_hwgrp_taq_walk
-
-RVU block LF allocation:
-
-.. code-block:: console
-
-        cat /sys/kernel/debug/octeontx2/rsrc_alloc
-
-        pcifunc    NPA    NIX    SSO GROUP    SSOWS    TIM    CPT
-        PF1         0       0
-        PF4                 1
-        PF13                          0, 1     0, 1      0
-
-CGX example usage:
-
-.. code-block:: console
-
-        cat /sys/kernel/debug/octeontx2/cgx/cgx2/lmac0/stats
-
-        =======Link Status======
-        Link is UP 40000 Mbps
-        =======RX_STATS======
-        Received packets: 0
-        Octets of received packets: 0
-        Received PAUSE packets: 0
-        Received PAUSE and control packets: 0
-        Filtered DMAC0 (NIX-bound) packets: 0
-        Filtered DMAC0 (NIX-bound) octets: 0
-        Packets dropped due to RX FIFO full: 0
-        Octets dropped due to RX FIFO full: 0
-        Error packets: 0
-        Filtered DMAC1 (NCSI-bound) packets: 0
-        Filtered DMAC1 (NCSI-bound) octets: 0
-        NCSI-bound packets dropped: 0
-        NCSI-bound octets dropped: 0
-        =======TX_STATS======
-        Packets dropped due to excessive collisions: 0
-        Packets dropped due to excessive deferral: 0
-        Multiple collisions before successful transmission: 0
-        Single collisions before successful transmission: 0
-        Total octets sent on the interface: 0
-        Total frames sent on the interface: 0
-        Packets sent with an octet count < 64: 0
-        Packets sent with an octet count == 64: 0
-        Packets sent with an octet count of 65127: 0
-        Packets sent with an octet count of 128-255: 0
-        Packets sent with an octet count of 256-511: 0
-        Packets sent with an octet count of 512-1023: 0
-        Packets sent with an octet count of 1024-1518: 0
-        Packets sent with an octet count of > 1518: 0
-        Packets sent to a broadcast DMAC: 0
-        Packets sent to the multicast DMAC: 0
-        Transmit underflow and were truncated: 0
-        Control/PAUSE packets sent: 0
-
-CPT example usage:
-
-.. code-block:: console
-
-        cat /sys/kernel/debug/octeontx2/cpt/cpt_pc
-
-        CPT instruction requests   0
-        CPT instruction latency    0
-        CPT NCB read requests      0
-        CPT NCB read latency       0
-        CPT read requests caused by UC fills   0
-        CPT active cycles pc       1395642
-        CPT clock count pc         5579867595493
-
-NIX example usage:
-
-.. code-block:: console
-
-        Usage: echo <nixlf> [cq number/all] > /sys/kernel/debug/octeontx2/nix/cq_ctx
-               cat /sys/kernel/debug/octeontx2/nix/cq_ctx
-        echo 0 0 > /sys/kernel/debug/octeontx2/nix/cq_ctx
-        cat /sys/kernel/debug/octeontx2/nix/cq_ctx
-
-        =====cq_ctx for nixlf:0 and qidx:0 is=====
-        W0: base                        158ef1a00
-
-        W1: wrptr                       0
-        W1: avg_con                     0
-        W1: cint_idx                    0
-        W1: cq_err                      0
-        W1: qint_idx                    0
-        W1: bpid                        0
-        W1: bp_ena                      0
-
-        W2: update_time                 31043
-        W2:avg_level                    255
-        W2: head                        0
-        W2:tail                         0
-
-        W3: cq_err_int_ena              5
-        W3:cq_err_int                   0
-        W3: qsize                       4
-        W3:caching                      1
-        W3: substream                   0x000
-        W3: ena                                 1
-        W3: drop_ena                    1
-        W3: drop                        64
-        W3: bp                          0
-
-NPA example usage:
-
-.. code-block:: console
-
-        Usage: echo <npalf> [pool number/all] > /sys/kernel/debug/octeontx2/npa/pool_ctx
-               cat /sys/kernel/debug/octeontx2/npa/pool_ctx
-        echo 0 0 > /sys/kernel/debug/octeontx2/npa/pool_ctx
-        cat /sys/kernel/debug/octeontx2/npa/pool_ctx
-
-        ======POOL : 0=======
-        W0: Stack base          1375bff00
-        W1: ena                 1
-        W1: nat_align           1
-        W1: stack_caching       1
-        W1: stack_way_mask      0
-        W1: buf_offset          1
-        W1: buf_size            19
-        W2: stack_max_pages     24315
-        W2: stack_pages         24314
-        W3: op_pc               267456
-        W4: stack_offset        2
-        W4: shift               5
-        W4: avg_level           255
-        W4: avg_con             0
-        W4: fc_ena              0
-        W4: fc_stype            0
-        W4: fc_hyst_bits        0
-        W4: fc_up_crossing      0
-        W4: update_time         62993
-        W5: fc_addr             0
-        W6: ptr_start           1593adf00
-        W7: ptr_end             180000000
-        W8: err_int             0
-        W8: err_int_ena         7
-        W8: thresh_int          0
-        W8: thresh_int_ena      0
-        W8: thresh_up           0
-        W8: thresh_qint_idx     0
-        W8: err_qint_idx        0
-
-NPC example usage:
-
-.. code-block:: console
-
-        cat /sys/kernel/debug/octeontx2/npc/mcam_info
-
-        NPC MCAM info:
-        RX keywidth    : 224bits
-        TX keywidth    : 224bits
-
-        MCAM entries   : 2048
-        Reserved       : 158
-        Available      : 1890
-
-        MCAM counters  : 512
-        Reserved       : 1
-        Available      : 511
-
-SSO example usage:
-
-.. code-block:: console
-
-        Usage: echo [<hws>/all] > /sys/kernel/debug/octeontx2/sso/hws/sso_hws_info
-        echo 0 > /sys/kernel/debug/octeontx2/sso/hws/sso_hws_info
-
-        ==================================================
-        SSOW HWS[0] Arbitration State      0x0
-        SSOW HWS[0] Guest Machine Control  0x0
-        SSOW HWS[0] SET[0] Group Mask[0] 0xffffffffffffffff
-        SSOW HWS[0] SET[0] Group Mask[1] 0xffffffffffffffff
-        SSOW HWS[0] SET[0] Group Mask[2] 0xffffffffffffffff
-        SSOW HWS[0] SET[0] Group Mask[3] 0xffffffffffffffff
-        SSOW HWS[0] SET[1] Group Mask[0] 0xffffffffffffffff
-        SSOW HWS[0] SET[1] Group Mask[1] 0xffffffffffffffff
-        SSOW HWS[0] SET[1] Group Mask[2] 0xffffffffffffffff
-        SSOW HWS[0] SET[1] Group Mask[3] 0xffffffffffffffff
-        ==================================================
-
-Compile DPDK
-------------
-
-DPDK may be compiled either natively on OCTEON TX2 platform or cross-compiled on
-an x86 based platform.
-
-Native Compilation
-~~~~~~~~~~~~~~~~~~
-
-.. code-block:: console
-
-        meson build
-        ninja -C build
-
-Cross Compilation
-~~~~~~~~~~~~~~~~~
-
-Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 details.
-
-.. code-block:: console
-
-        meson build --cross-file config/arm/arm64_octeontx2_linux_gcc
-        ninja -C build
-
-.. note::
-
-   By default, meson cross compilation uses ``aarch64-linux-gnu-gcc`` toolchain,
-   if Marvell toolchain is available then it can be used by overriding the
-   c, cpp, ar, strip ``binaries`` attributes to respective Marvell
-   toolchain binaries in ``config/arm/arm64_octeontx2_linux_gcc`` file.
diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index 5581822d10..4e5b23c53d 100644
--- a/doc/guides/rel_notes/deprecation.rst
+++ b/doc/guides/rel_notes/deprecation.rst
@@ -125,20 +125,3 @@ Deprecation Notices
   applications should be updated to use the ``dmadev`` library instead,
   with the underlying HW-functionality being provided by the ``ioat`` or
   ``idxd`` dma drivers
-
-* drivers/octeontx2: remove octeontx2 drivers
-
-  In the view of enabling unified driver for ``octeontx2(cn9k)``/``octeontx3(cn10k)``,
-  removing ``drivers/octeontx2`` drivers and replace with ``drivers/cnxk/`` which
-  supports both ``octeontx2(cn9k)`` and ``octeontx3(cn10k)`` SoCs.
-  This deprecation notice is to do following actions in DPDK v22.02 version.
-
-  #. Replace ``drivers/common/octeontx2/`` with ``drivers/common/cnxk/``
-  #. Replace ``drivers/mempool/octeontx2/`` with ``drivers/mempool/cnxk/``
-  #. Replace ``drivers/net/octeontx2/`` with ``drivers/net/cnxk/``
-  #. Replace ``drivers/event/octeontx2/`` with ``drivers/event/cnxk/``
-  #. Replace ``drivers/crypto/octeontx2/`` with ``drivers/crypto/cnxk/``
-  #. Rename ``drivers/regex/octeontx2/`` as ``drivers/regex/cn9k/``
-  #. Rename ``config/arm/arm64_octeontx2_linux_gcc`` as ``config/arm/arm64_cn9k_linux_gcc``
-
-  Last two actions are to align naming convention as cnxk scheme.
diff --git a/doc/guides/rel_notes/release_19_08.rst b/doc/guides/rel_notes/release_19_08.rst
index 1a0e6111d7..31fcebdf95 100644
--- a/doc/guides/rel_notes/release_19_08.rst
+++ b/doc/guides/rel_notes/release_19_08.rst
@@ -152,11 +152,11 @@ New Features
   ``eventdev Tx adapter``, ``eventdev Timer adapter`` and ``rawdev DMA``
   drivers for various HW co-processors available in ``OCTEON TX2`` SoC.
 
-  See :doc:`../platform/octeontx2` and driver information:
+  See ``platform/octeontx2`` and driver information:
 
-  * :doc:`../nics/octeontx2`
-  * :doc:`../mempool/octeontx2`
-  * :doc:`../eventdevs/octeontx2`
+  * ``nics/octeontx2``
+  * ``mempool/octeontx2``
+  * ``eventdevs/octeontx2``
   * ``rawdevs/octeontx2_dma``
 
 * **Introduced the Intel NTB PMD.**
diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index 302b3e5f37..79f3475ae6 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -192,7 +192,7 @@ New Features
   Added a new PMD for hardware crypto offload block on ``OCTEON TX2``
   SoC.
 
-  See :doc:`../cryptodevs/octeontx2` for more details
+  See ``cryptodevs/octeontx2`` for more details
 
 * **Updated NXP crypto PMDs for PDCP support.**
 
diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst
index ce93483291..d3d5ebe4dc 100644
--- a/doc/guides/tools/cryptoperf.rst
+++ b/doc/guides/tools/cryptoperf.rst
@@ -157,7 +157,6 @@ The following are the application command-line options:
            crypto_mvsam
            crypto_null
            crypto_octeontx
-           crypto_octeontx2
            crypto_openssl
            crypto_qat
            crypto_scheduler
diff --git a/drivers/common/meson.build b/drivers/common/meson.build
index 4acbad60b1..ea261dd70a 100644
--- a/drivers/common/meson.build
+++ b/drivers/common/meson.build
@@ -8,5 +8,4 @@ drivers = [
         'iavf',
         'mvep',
         'octeontx',
-        'octeontx2',
 ]
diff --git a/drivers/common/octeontx2/hw/otx2_nix.h b/drivers/common/octeontx2/hw/otx2_nix.h
deleted file mode 100644
index e3b68505b7..0000000000
--- a/drivers/common/octeontx2/hw/otx2_nix.h
+++ /dev/null
@@ -1,1391 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_NIX_HW_H__
-#define __OTX2_NIX_HW_H__
-
-/* Register offsets */
-
-#define NIX_AF_CFG                              (0x0ull)
-#define NIX_AF_STATUS                           (0x10ull)
-#define NIX_AF_NDC_CFG                          (0x18ull)
-#define NIX_AF_CONST                            (0x20ull)
-#define NIX_AF_CONST1                           (0x28ull)
-#define NIX_AF_CONST2                           (0x30ull)
-#define NIX_AF_CONST3                           (0x38ull)
-#define NIX_AF_SQ_CONST                         (0x40ull)
-#define NIX_AF_CQ_CONST                         (0x48ull)
-#define NIX_AF_RQ_CONST                         (0x50ull)
-#define NIX_AF_PSE_CONST                        (0x60ull)
-#define NIX_AF_TL1_CONST                        (0x70ull)
-#define NIX_AF_TL2_CONST                        (0x78ull)
-#define NIX_AF_TL3_CONST                        (0x80ull)
-#define NIX_AF_TL4_CONST                        (0x88ull)
-#define NIX_AF_MDQ_CONST                        (0x90ull)
-#define NIX_AF_MC_MIRROR_CONST                  (0x98ull)
-#define NIX_AF_LSO_CFG                          (0xa8ull)
-#define NIX_AF_BLK_RST                          (0xb0ull)
-#define NIX_AF_TX_TSTMP_CFG                     (0xc0ull)
-#define NIX_AF_RX_CFG                           (0xd0ull)
-#define NIX_AF_AVG_DELAY                        (0xe0ull)
-#define NIX_AF_CINT_DELAY                       (0xf0ull)
-#define NIX_AF_RX_MCAST_BASE                    (0x100ull)
-#define NIX_AF_RX_MCAST_CFG                     (0x110ull)
-#define NIX_AF_RX_MCAST_BUF_BASE                (0x120ull)
-#define NIX_AF_RX_MCAST_BUF_CFG                 (0x130ull)
-#define NIX_AF_RX_MIRROR_BUF_BASE               (0x140ull)
-#define NIX_AF_RX_MIRROR_BUF_CFG                (0x148ull)
-#define NIX_AF_LF_RST                           (0x150ull)
-#define NIX_AF_GEN_INT                          (0x160ull)
-#define NIX_AF_GEN_INT_W1S                      (0x168ull)
-#define NIX_AF_GEN_INT_ENA_W1S                  (0x170ull)
-#define NIX_AF_GEN_INT_ENA_W1C                  (0x178ull)
-#define NIX_AF_ERR_INT                          (0x180ull)
-#define NIX_AF_ERR_INT_W1S                      (0x188ull)
-#define NIX_AF_ERR_INT_ENA_W1S                  (0x190ull)
-#define NIX_AF_ERR_INT_ENA_W1C                  (0x198ull)
-#define NIX_AF_RAS                              (0x1a0ull)
-#define NIX_AF_RAS_W1S                          (0x1a8ull)
-#define NIX_AF_RAS_ENA_W1S                      (0x1b0ull)
-#define NIX_AF_RAS_ENA_W1C                      (0x1b8ull)
-#define NIX_AF_RVU_INT                          (0x1c0ull)
-#define NIX_AF_RVU_INT_W1S                      (0x1c8ull)
-#define NIX_AF_RVU_INT_ENA_W1S                  (0x1d0ull)
-#define NIX_AF_RVU_INT_ENA_W1C                  (0x1d8ull)
-#define NIX_AF_TCP_TIMER                        (0x1e0ull)
-#define NIX_AF_RX_DEF_OL2                       (0x200ull)
-#define NIX_AF_RX_DEF_OIP4                      (0x210ull)
-#define NIX_AF_RX_DEF_IIP4                      (0x220ull)
-#define NIX_AF_RX_DEF_OIP6                      (0x230ull)
-#define NIX_AF_RX_DEF_IIP6                      (0x240ull)
-#define NIX_AF_RX_DEF_OTCP                      (0x250ull)
-#define NIX_AF_RX_DEF_ITCP                      (0x260ull)
-#define NIX_AF_RX_DEF_OUDP                      (0x270ull)
-#define NIX_AF_RX_DEF_IUDP                      (0x280ull)
-#define NIX_AF_RX_DEF_OSCTP                     (0x290ull)
-#define NIX_AF_RX_DEF_ISCTP                     (0x2a0ull)
-#define NIX_AF_RX_DEF_IPSECX(a)                 (0x2b0ull | (uint64_t)(a) << 3)
-#define NIX_AF_RX_IPSEC_GEN_CFG                 (0x300ull)
-#define NIX_AF_RX_CPTX_INST_QSEL(a)             (0x320ull | (uint64_t)(a) << 3)
-#define NIX_AF_RX_CPTX_CREDIT(a)                (0x360ull | (uint64_t)(a) << 3)
-#define NIX_AF_NDC_RX_SYNC                      (0x3e0ull)
-#define NIX_AF_NDC_TX_SYNC                      (0x3f0ull)
-#define NIX_AF_AQ_CFG                           (0x400ull)
-#define NIX_AF_AQ_BASE                          (0x410ull)
-#define NIX_AF_AQ_STATUS                        (0x420ull)
-#define NIX_AF_AQ_DOOR                          (0x430ull)
-#define NIX_AF_AQ_DONE_WAIT                     (0x440ull)
-#define NIX_AF_AQ_DONE                          (0x450ull)
-#define NIX_AF_AQ_DONE_ACK                      (0x460ull)
-#define NIX_AF_AQ_DONE_TIMER                    (0x470ull)
-#define NIX_AF_AQ_DONE_ENA_W1S                  (0x490ull)
-#define NIX_AF_AQ_DONE_ENA_W1C                  (0x498ull)
-#define NIX_AF_RX_LINKX_CFG(a)                  (0x540ull | (uint64_t)(a) << 16)
-#define NIX_AF_RX_SW_SYNC                       (0x550ull)
-#define NIX_AF_RX_LINKX_WRR_CFG(a)              (0x560ull | (uint64_t)(a) << 16)
-#define NIX_AF_EXPR_TX_FIFO_STATUS              (0x640ull)
-#define NIX_AF_NORM_TX_FIFO_STATUS              (0x648ull)
-#define NIX_AF_SDP_TX_FIFO_STATUS               (0x650ull)
-#define NIX_AF_TX_NPC_CAPTURE_CONFIG            (0x660ull)
-#define NIX_AF_TX_NPC_CAPTURE_INFO              (0x668ull)
-#define NIX_AF_TX_NPC_CAPTURE_RESPX(a)          (0x680ull | (uint64_t)(a) << 3)
-#define NIX_AF_SEB_ACTIVE_CYCLES_PCX(a)         (0x6c0ull | (uint64_t)(a) << 3)
-#define NIX_AF_SMQX_CFG(a)                      (0x700ull | (uint64_t)(a) << 16)
-#define NIX_AF_SMQX_HEAD(a)                     (0x710ull | (uint64_t)(a) << 16)
-#define NIX_AF_SMQX_TAIL(a)                     (0x720ull | (uint64_t)(a) << 16)
-#define NIX_AF_SMQX_STATUS(a)                   (0x730ull | (uint64_t)(a) << 16)
-#define NIX_AF_SMQX_NXT_HEAD(a)                 (0x740ull | (uint64_t)(a) << 16)
-#define NIX_AF_SQM_ACTIVE_CYCLES_PC             (0x770ull)
-#define NIX_AF_PSE_CHANNEL_LEVEL                (0x800ull)
-#define NIX_AF_PSE_SHAPER_CFG                   (0x810ull)
-#define NIX_AF_PSE_ACTIVE_CYCLES_PC             (0x8c0ull)
-#define NIX_AF_MARK_FORMATX_CTL(a)              (0x900ull | (uint64_t)(a) << 18)
-#define NIX_AF_TX_LINKX_NORM_CREDIT(a)          (0xa00ull | (uint64_t)(a) << 16)
-#define NIX_AF_TX_LINKX_EXPR_CREDIT(a)          (0xa10ull | (uint64_t)(a) << 16)
-#define NIX_AF_TX_LINKX_SW_XOFF(a)              (0xa20ull | (uint64_t)(a) << 16)
-#define NIX_AF_TX_LINKX_HW_XOFF(a)              (0xa30ull | (uint64_t)(a) << 16)
-#define NIX_AF_SDP_LINK_CREDIT                  (0xa40ull)
-#define NIX_AF_SDP_SW_XOFFX(a)                  (0xa60ull | (uint64_t)(a) << 3)
-#define NIX_AF_SDP_HW_XOFFX(a)                  (0xac0ull | (uint64_t)(a) << 3)
-#define NIX_AF_TL4X_BP_STATUS(a)                (0xb00ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_SDP_LINK_CFG(a)             (0xb10ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_SCHEDULE(a)                 (0xc00ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_SHAPE(a)                    (0xc10ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_CIR(a)                      (0xc20ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_SHAPE_STATE(a)              (0xc50ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_SW_XOFF(a)                  (0xc70ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_TOPOLOGY(a)                 (0xc80ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_MD_DEBUG0(a)                (0xcc0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_MD_DEBUG1(a)                (0xcc8ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_MD_DEBUG2(a)                (0xcd0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_MD_DEBUG3(a)                (0xcd8ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_DROPPED_PACKETS(a)          (0xd20ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_DROPPED_BYTES(a)            (0xd30ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_RED_PACKETS(a)              (0xd40ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_RED_BYTES(a)                (0xd50ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_YELLOW_PACKETS(a)           (0xd60ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_YELLOW_BYTES(a)             (0xd70ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_GREEN_PACKETS(a)            (0xd80ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL1X_GREEN_BYTES(a)              (0xd90ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_SCHEDULE(a)                 (0xe00ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_SHAPE(a)                    (0xe10ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_CIR(a)                      (0xe20ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_PIR(a)                      (0xe30ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_SCHED_STATE(a)              (0xe40ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_SHAPE_STATE(a)              (0xe50ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_SW_XOFF(a)                  (0xe70ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_TOPOLOGY(a)                 (0xe80ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_PARENT(a)                   (0xe88ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_MD_DEBUG0(a)                (0xec0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_MD_DEBUG1(a)                (0xec8ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_MD_DEBUG2(a)                (0xed0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL2X_MD_DEBUG3(a)                (0xed8ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_SCHEDULE(a)                 \
-	(0x1000ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_SHAPE(a)                    \
-	(0x1010ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_CIR(a)                      \
-	(0x1020ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_PIR(a)                      \
-	(0x1030ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_SCHED_STATE(a)              \
-	(0x1040ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_SHAPE_STATE(a)              \
-	(0x1050ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_SW_XOFF(a)                  \
-	(0x1070ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_TOPOLOGY(a)                 \
-	(0x1080ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_PARENT(a)                   \
-	(0x1088ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_MD_DEBUG0(a)                \
-	(0x10c0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_MD_DEBUG1(a)                \
-	(0x10c8ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_MD_DEBUG2(a)                \
-	(0x10d0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3X_MD_DEBUG3(a)                \
-	(0x10d8ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_SCHEDULE(a)                 \
-	(0x1200ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_SHAPE(a)                    \
-	(0x1210ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_CIR(a)                      \
-	(0x1220ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_PIR(a)                      \
-	(0x1230ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_SCHED_STATE(a)              \
-	(0x1240ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_SHAPE_STATE(a)              \
-	(0x1250ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_SW_XOFF(a)                  \
-	(0x1270ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_TOPOLOGY(a)                 \
-	(0x1280ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_PARENT(a)                   \
-	(0x1288ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_MD_DEBUG0(a)                \
-	(0x12c0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_MD_DEBUG1(a)                \
-	(0x12c8ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_MD_DEBUG2(a)                \
-	(0x12d0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL4X_MD_DEBUG3(a)                \
-	(0x12d8ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_SCHEDULE(a)                 \
-	(0x1400ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_SHAPE(a)                    \
-	(0x1410ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_CIR(a)                      \
-	(0x1420ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_PIR(a)                      \
-	(0x1430ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_SCHED_STATE(a)              \
-	(0x1440ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_SHAPE_STATE(a)              \
-	(0x1450ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_SW_XOFF(a)                  \
-	(0x1470ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_PARENT(a)                   \
-	(0x1480ull | (uint64_t)(a) << 16)
-#define NIX_AF_MDQX_MD_DEBUG(a)                 \
-	(0x14c0ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3_TL2X_CFG(a)                  \
-	(0x1600ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3_TL2X_BP_STATUS(a)            \
-	(0x1610ull | (uint64_t)(a) << 16)
-#define NIX_AF_TL3_TL2X_LINKX_CFG(a, b)         \
-	(0x1700ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 3)
-#define NIX_AF_RX_FLOW_KEY_ALGX_FIELDX(a, b)    \
-	(0x1800ull | (uint64_t)(a) << 18 | (uint64_t)(b) << 3)
-#define NIX_AF_TX_MCASTX(a)                     \
-	(0x1900ull | (uint64_t)(a) << 15)
-#define NIX_AF_TX_VTAG_DEFX_CTL(a)              \
-	(0x1a00ull | (uint64_t)(a) << 16)
-#define NIX_AF_TX_VTAG_DEFX_DATA(a)             \
-	(0x1a10ull | (uint64_t)(a) << 16)
-#define NIX_AF_RX_BPIDX_STATUS(a)               \
-	(0x1a20ull | (uint64_t)(a) << 17)
-#define NIX_AF_RX_CHANX_CFG(a)                  \
-	(0x1a30ull | (uint64_t)(a) << 15)
-#define NIX_AF_CINT_TIMERX(a)                   \
-	(0x1a40ull | (uint64_t)(a) << 18)
-#define NIX_AF_LSO_FORMATX_FIELDX(a, b)         \
-	(0x1b00ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 3)
-#define NIX_AF_LFX_CFG(a)                       \
-	(0x4000ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_SQS_CFG(a)                   \
-	(0x4020ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_TX_CFG2(a)                   \
-	(0x4028ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_SQS_BASE(a)                  \
-	(0x4030ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RQS_CFG(a)                   \
-	(0x4040ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RQS_BASE(a)                  \
-	(0x4050ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_CQS_CFG(a)                   \
-	(0x4060ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_CQS_BASE(a)                  \
-	(0x4070ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_TX_CFG(a)                    \
-	(0x4080ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_TX_PARSE_CFG(a)              \
-	(0x4090ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RX_CFG(a)                    \
-	(0x40a0ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RSS_CFG(a)                   \
-	(0x40c0ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RSS_BASE(a)                  \
-	(0x40d0ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_QINTS_CFG(a)                 \
-	(0x4100ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_QINTS_BASE(a)                \
-	(0x4110ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_CINTS_CFG(a)                 \
-	(0x4120ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_CINTS_BASE(a)                \
-	(0x4130ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RX_IPSEC_CFG0(a)             \
-	(0x4140ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RX_IPSEC_CFG1(a)             \
-	(0x4148ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RX_IPSEC_DYNO_CFG(a)         \
-	(0x4150ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RX_IPSEC_DYNO_BASE(a)        \
-	(0x4158ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RX_IPSEC_SA_BASE(a)          \
-	(0x4170ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_TX_STATUS(a)                 \
-	(0x4180ull | (uint64_t)(a) << 17)
-#define NIX_AF_LFX_RX_VTAG_TYPEX(a, b)          \
-	(0x4200ull | (uint64_t)(a) << 17 | (uint64_t)(b) << 3)
-#define NIX_AF_LFX_LOCKX(a, b)                  \
-	(0x4300ull | (uint64_t)(a) << 17 | (uint64_t)(b) << 3)
-#define NIX_AF_LFX_TX_STATX(a, b)               \
-	(0x4400ull | (uint64_t)(a) << 17 | (uint64_t)(b) << 3)
-#define NIX_AF_LFX_RX_STATX(a, b)               \
-	(0x4500ull | (uint64_t)(a) << 17 | (uint64_t)(b) << 3)
-#define NIX_AF_LFX_RSS_GRPX(a, b)               \
-	(0x4600ull | (uint64_t)(a) << 17 | (uint64_t)(b) << 3)
-#define NIX_AF_RX_NPC_MC_RCV                    (0x4700ull)
-#define NIX_AF_RX_NPC_MC_DROP                   (0x4710ull)
-#define NIX_AF_RX_NPC_MIRROR_RCV                (0x4720ull)
-#define NIX_AF_RX_NPC_MIRROR_DROP               (0x4730ull)
-#define NIX_AF_RX_ACTIVE_CYCLES_PCX(a)          \
-	(0x4800ull | (uint64_t)(a) << 16)
-#define NIX_PRIV_AF_INT_CFG                     (0x8000000ull)
-#define NIX_PRIV_LFX_CFG(a)                     \
-	(0x8000010ull | (uint64_t)(a) << 8)
-#define NIX_PRIV_LFX_INT_CFG(a)                 \
-	(0x8000020ull | (uint64_t)(a) << 8)
-#define NIX_AF_RVU_LF_CFG_DEBUG                 (0x8000030ull)
-
-#define NIX_LF_RX_SECRETX(a)                    (0x0ull | (uint64_t)(a) << 3)
-#define NIX_LF_CFG                              (0x100ull)
-#define NIX_LF_GINT                             (0x200ull)
-#define NIX_LF_GINT_W1S                         (0x208ull)
-#define NIX_LF_GINT_ENA_W1C                     (0x210ull)
-#define NIX_LF_GINT_ENA_W1S                     (0x218ull)
-#define NIX_LF_ERR_INT                          (0x220ull)
-#define NIX_LF_ERR_INT_W1S                      (0x228ull)
-#define NIX_LF_ERR_INT_ENA_W1C                  (0x230ull)
-#define NIX_LF_ERR_INT_ENA_W1S                  (0x238ull)
-#define NIX_LF_RAS                              (0x240ull)
-#define NIX_LF_RAS_W1S                          (0x248ull)
-#define NIX_LF_RAS_ENA_W1C                      (0x250ull)
-#define NIX_LF_RAS_ENA_W1S                      (0x258ull)
-#define NIX_LF_SQ_OP_ERR_DBG                    (0x260ull)
-#define NIX_LF_MNQ_ERR_DBG                      (0x270ull)
-#define NIX_LF_SEND_ERR_DBG                     (0x280ull)
-#define NIX_LF_TX_STATX(a)                      (0x300ull | (uint64_t)(a) << 3)
-#define NIX_LF_RX_STATX(a)                      (0x400ull | (uint64_t)(a) << 3)
-#define NIX_LF_OP_SENDX(a)                      (0x800ull | (uint64_t)(a) << 3)
-#define NIX_LF_RQ_OP_INT                        (0x900ull)
-#define NIX_LF_RQ_OP_OCTS                       (0x910ull)
-#define NIX_LF_RQ_OP_PKTS                       (0x920ull)
-#define NIX_LF_RQ_OP_DROP_OCTS                  (0x930ull)
-#define NIX_LF_RQ_OP_DROP_PKTS                  (0x940ull)
-#define NIX_LF_RQ_OP_RE_PKTS                    (0x950ull)
-#define NIX_LF_OP_IPSEC_DYNO_CNT                (0x980ull)
-#define NIX_LF_SQ_OP_INT                        (0xa00ull)
-#define NIX_LF_SQ_OP_OCTS                       (0xa10ull)
-#define NIX_LF_SQ_OP_PKTS                       (0xa20ull)
-#define NIX_LF_SQ_OP_STATUS                     (0xa30ull)
-#define NIX_LF_SQ_OP_DROP_OCTS                  (0xa40ull)
-#define NIX_LF_SQ_OP_DROP_PKTS                  (0xa50ull)
-#define NIX_LF_CQ_OP_INT                        (0xb00ull)
-#define NIX_LF_CQ_OP_DOOR                       (0xb30ull)
-#define NIX_LF_CQ_OP_STATUS                     (0xb40ull)
-#define NIX_LF_QINTX_CNT(a)                     (0xc00ull | (uint64_t)(a) << 12)
-#define NIX_LF_QINTX_INT(a)                     (0xc10ull | (uint64_t)(a) << 12)
-#define NIX_LF_QINTX_ENA_W1S(a)                 (0xc20ull | (uint64_t)(a) << 12)
-#define NIX_LF_QINTX_ENA_W1C(a)                 (0xc30ull | (uint64_t)(a) << 12)
-#define NIX_LF_CINTX_CNT(a)                     (0xd00ull | (uint64_t)(a) << 12)
-#define NIX_LF_CINTX_WAIT(a)                    (0xd10ull | (uint64_t)(a) << 12)
-#define NIX_LF_CINTX_INT(a)                     (0xd20ull | (uint64_t)(a) << 12)
-#define NIX_LF_CINTX_INT_W1S(a)                 (0xd30ull | (uint64_t)(a) << 12)
-#define NIX_LF_CINTX_ENA_W1S(a)                 (0xd40ull | (uint64_t)(a) << 12)
-#define NIX_LF_CINTX_ENA_W1C(a)                 (0xd50ull | (uint64_t)(a) << 12)
-
-
-/* Enum offsets */
-
-#define NIX_TX_VTAGOP_NOP                     (0x0ull)
-#define NIX_TX_VTAGOP_INSERT                  (0x1ull)
-#define NIX_TX_VTAGOP_REPLACE                 (0x2ull)
-
-#define NIX_TX_ACTIONOP_DROP                  (0x0ull)
-#define NIX_TX_ACTIONOP_UCAST_DEFAULT         (0x1ull)
-#define NIX_TX_ACTIONOP_UCAST_CHAN            (0x2ull)
-#define NIX_TX_ACTIONOP_MCAST                 (0x3ull)
-#define NIX_TX_ACTIONOP_DROP_VIOL             (0x5ull)
-
-#define NIX_INTF_RX                           (0x0ull)
-#define NIX_INTF_TX                           (0x1ull)
-
-#define NIX_TXLAYER_OL3                       (0x0ull)
-#define NIX_TXLAYER_OL4                       (0x1ull)
-#define NIX_TXLAYER_IL3                       (0x2ull)
-#define NIX_TXLAYER_IL4                       (0x3ull)
-
-#define NIX_SUBDC_NOP                         (0x0ull)
-#define NIX_SUBDC_EXT                         (0x1ull)
-#define NIX_SUBDC_CRC                         (0x2ull)
-#define NIX_SUBDC_IMM                         (0x3ull)
-#define NIX_SUBDC_SG                          (0x4ull)
-#define NIX_SUBDC_MEM                         (0x5ull)
-#define NIX_SUBDC_JUMP                        (0x6ull)
-#define NIX_SUBDC_WORK                        (0x7ull)
-#define NIX_SUBDC_SOD                         (0xfull)
-
-#define NIX_STYPE_STF                         (0x0ull)
-#define NIX_STYPE_STT                         (0x1ull)
-#define NIX_STYPE_STP                         (0x2ull)
-
-#define NIX_STAT_LF_TX_TX_UCAST               (0x0ull)
-#define NIX_STAT_LF_TX_TX_BCAST               (0x1ull)
-#define NIX_STAT_LF_TX_TX_MCAST               (0x2ull)
-#define NIX_STAT_LF_TX_TX_DROP                (0x3ull)
-#define NIX_STAT_LF_TX_TX_OCTS                (0x4ull)
-
-#define NIX_STAT_LF_RX_RX_OCTS                (0x0ull)
-#define NIX_STAT_LF_RX_RX_UCAST               (0x1ull)
-#define NIX_STAT_LF_RX_RX_BCAST               (0x2ull)
-#define NIX_STAT_LF_RX_RX_MCAST               (0x3ull)
-#define NIX_STAT_LF_RX_RX_DROP                (0x4ull)
-#define NIX_STAT_LF_RX_RX_DROP_OCTS           (0x5ull)
-#define NIX_STAT_LF_RX_RX_FCS                 (0x6ull)
-#define NIX_STAT_LF_RX_RX_ERR                 (0x7ull)
-#define NIX_STAT_LF_RX_RX_DRP_BCAST           (0x8ull)
-#define NIX_STAT_LF_RX_RX_DRP_MCAST           (0x9ull)
-#define NIX_STAT_LF_RX_RX_DRP_L3BCAST         (0xaull)
-#define NIX_STAT_LF_RX_RX_DRP_L3MCAST         (0xbull)
-
-#define NIX_SQOPERR_SQ_OOR                    (0x0ull)
-#define NIX_SQOPERR_SQ_CTX_FAULT              (0x1ull)
-#define NIX_SQOPERR_SQ_CTX_POISON             (0x2ull)
-#define NIX_SQOPERR_SQ_DISABLED               (0x3ull)
-#define NIX_SQOPERR_MAX_SQE_SIZE_ERR          (0x4ull)
-#define NIX_SQOPERR_SQE_OFLOW                 (0x5ull)
-#define NIX_SQOPERR_SQB_NULL                  (0x6ull)
-#define NIX_SQOPERR_SQB_FAULT                 (0x7ull)
-
-#define NIX_XQESZ_W64                         (0x0ull)
-#define NIX_XQESZ_W16                         (0x1ull)
-
-#define NIX_VTAGSIZE_T4                       (0x0ull)
-#define NIX_VTAGSIZE_T8                       (0x1ull)
-
-#define NIX_RX_ACTIONOP_DROP                  (0x0ull)
-#define NIX_RX_ACTIONOP_UCAST                 (0x1ull)
-#define NIX_RX_ACTIONOP_UCAST_IPSEC           (0x2ull)
-#define NIX_RX_ACTIONOP_MCAST                 (0x3ull)
-#define NIX_RX_ACTIONOP_RSS                   (0x4ull)
-#define NIX_RX_ACTIONOP_PF_FUNC_DROP          (0x5ull)
-#define NIX_RX_ACTIONOP_MIRROR                (0x6ull)
-
-#define NIX_RX_VTAGACTION_VTAG0_RELPTR        (0x0ull)
-#define NIX_RX_VTAGACTION_VTAG1_RELPTR        (0x4ull)
-#define NIX_RX_VTAGACTION_VTAG_VALID          (0x1ull)
-#define NIX_TX_VTAGACTION_VTAG0_RELPTR        \
-	(sizeof(struct nix_inst_hdr_s) + 2 * 6)
-#define NIX_TX_VTAGACTION_VTAG1_RELPTR        \
-	(sizeof(struct nix_inst_hdr_s) + 2 * 6 + 4)
-#define NIX_RQINT_DROP                        (0x0ull)
-#define NIX_RQINT_RED                         (0x1ull)
-#define NIX_RQINT_R2                          (0x2ull)
-#define NIX_RQINT_R3                          (0x3ull)
-#define NIX_RQINT_R4                          (0x4ull)
-#define NIX_RQINT_R5                          (0x5ull)
-#define NIX_RQINT_R6                          (0x6ull)
-#define NIX_RQINT_R7                          (0x7ull)
-
-#define NIX_MAXSQESZ_W16                      (0x0ull)
-#define NIX_MAXSQESZ_W8                       (0x1ull)
-
-#define NIX_LSOALG_NOP                        (0x0ull)
-#define NIX_LSOALG_ADD_SEGNUM                 (0x1ull)
-#define NIX_LSOALG_ADD_PAYLEN                 (0x2ull)
-#define NIX_LSOALG_ADD_OFFSET                 (0x3ull)
-#define NIX_LSOALG_TCP_FLAGS                  (0x4ull)
-
-#define NIX_MNQERR_SQ_CTX_FAULT               (0x0ull)
-#define NIX_MNQERR_SQ_CTX_POISON              (0x1ull)
-#define NIX_MNQERR_SQB_FAULT                  (0x2ull)
-#define NIX_MNQERR_SQB_POISON                 (0x3ull)
-#define NIX_MNQERR_TOTAL_ERR                  (0x4ull)
-#define NIX_MNQERR_LSO_ERR                    (0x5ull)
-#define NIX_MNQERR_CQ_QUERY_ERR               (0x6ull)
-#define NIX_MNQERR_MAX_SQE_SIZE_ERR           (0x7ull)
-#define NIX_MNQERR_MAXLEN_ERR                 (0x8ull)
-#define NIX_MNQERR_SQE_SIZEM1_ZERO            (0x9ull)
-
-#define NIX_MDTYPE_RSVD                       (0x0ull)
-#define NIX_MDTYPE_FLUSH                      (0x1ull)
-#define NIX_MDTYPE_PMD                        (0x2ull)
-
-#define NIX_NDC_TX_PORT_LMT                   (0x0ull)
-#define NIX_NDC_TX_PORT_ENQ                   (0x1ull)
-#define NIX_NDC_TX_PORT_MNQ                   (0x2ull)
-#define NIX_NDC_TX_PORT_DEQ                   (0x3ull)
-#define NIX_NDC_TX_PORT_DMA                   (0x4ull)
-#define NIX_NDC_TX_PORT_XQE                   (0x5ull)
-
-#define NIX_NDC_RX_PORT_AQ                    (0x0ull)
-#define NIX_NDC_RX_PORT_CQ                    (0x1ull)
-#define NIX_NDC_RX_PORT_CINT                  (0x2ull)
-#define NIX_NDC_RX_PORT_MC                    (0x3ull)
-#define NIX_NDC_RX_PORT_PKT                   (0x4ull)
-#define NIX_NDC_RX_PORT_RQ                    (0x5ull)
-
-#define NIX_RE_OPCODE_RE_NONE                 (0x0ull)
-#define NIX_RE_OPCODE_RE_PARTIAL              (0x1ull)
-#define NIX_RE_OPCODE_RE_JABBER               (0x2ull)
-#define NIX_RE_OPCODE_RE_FCS                  (0x7ull)
-#define NIX_RE_OPCODE_RE_FCS_RCV              (0x8ull)
-#define NIX_RE_OPCODE_RE_TERMINATE            (0x9ull)
-#define NIX_RE_OPCODE_RE_RX_CTL               (0xbull)
-#define NIX_RE_OPCODE_RE_SKIP                 (0xcull)
-#define NIX_RE_OPCODE_RE_DMAPKT               (0xfull)
-#define NIX_RE_OPCODE_UNDERSIZE               (0x10ull)
-#define NIX_RE_OPCODE_OVERSIZE                (0x11ull)
-#define NIX_RE_OPCODE_OL2_LENMISM             (0x12ull)
-
-#define NIX_REDALG_STD                        (0x0ull)
-#define NIX_REDALG_SEND                       (0x1ull)
-#define NIX_REDALG_STALL                      (0x2ull)
-#define NIX_REDALG_DISCARD                    (0x3ull)
-
-#define NIX_RX_MCOP_RQ                        (0x0ull)
-#define NIX_RX_MCOP_RSS                       (0x1ull)
-
-#define NIX_RX_PERRCODE_NPC_RESULT_ERR        (0x2ull)
-#define NIX_RX_PERRCODE_MCAST_FAULT           (0x4ull)
-#define NIX_RX_PERRCODE_MIRROR_FAULT          (0x5ull)
-#define NIX_RX_PERRCODE_MCAST_POISON          (0x6ull)
-#define NIX_RX_PERRCODE_MIRROR_POISON         (0x7ull)
-#define NIX_RX_PERRCODE_DATA_FAULT            (0x8ull)
-#define NIX_RX_PERRCODE_MEMOUT                (0x9ull)
-#define NIX_RX_PERRCODE_BUFS_OFLOW            (0xaull)
-#define NIX_RX_PERRCODE_OL3_LEN               (0x10ull)
-#define NIX_RX_PERRCODE_OL4_LEN               (0x11ull)
-#define NIX_RX_PERRCODE_OL4_CHK               (0x12ull)
-#define NIX_RX_PERRCODE_OL4_PORT              (0x13ull)
-#define NIX_RX_PERRCODE_IL3_LEN               (0x20ull)
-#define NIX_RX_PERRCODE_IL4_LEN               (0x21ull)
-#define NIX_RX_PERRCODE_IL4_CHK               (0x22ull)
-#define NIX_RX_PERRCODE_IL4_PORT              (0x23ull)
-
-#define NIX_SENDCRCALG_CRC32                  (0x0ull)
-#define NIX_SENDCRCALG_CRC32C                 (0x1ull)
-#define NIX_SENDCRCALG_ONES16                 (0x2ull)
-
-#define NIX_SENDL3TYPE_NONE                   (0x0ull)
-#define NIX_SENDL3TYPE_IP4                    (0x2ull)
-#define NIX_SENDL3TYPE_IP4_CKSUM              (0x3ull)
-#define NIX_SENDL3TYPE_IP6                    (0x4ull)
-
-#define NIX_SENDL4TYPE_NONE                   (0x0ull)
-#define NIX_SENDL4TYPE_TCP_CKSUM              (0x1ull)
-#define NIX_SENDL4TYPE_SCTP_CKSUM             (0x2ull)
-#define NIX_SENDL4TYPE_UDP_CKSUM              (0x3ull)
-
-#define NIX_SENDLDTYPE_LDD                    (0x0ull)
-#define NIX_SENDLDTYPE_LDT                    (0x1ull)
-#define NIX_SENDLDTYPE_LDWB                   (0x2ull)
-
-#define NIX_SENDMEMALG_SET                    (0x0ull)
-#define NIX_SENDMEMALG_SETTSTMP               (0x1ull)
-#define NIX_SENDMEMALG_SETRSLT                (0x2ull)
-#define NIX_SENDMEMALG_ADD                    (0x8ull)
-#define NIX_SENDMEMALG_SUB                    (0x9ull)
-#define NIX_SENDMEMALG_ADDLEN                 (0xaull)
-#define NIX_SENDMEMALG_SUBLEN                 (0xbull)
-#define NIX_SENDMEMALG_ADDMBUF                (0xcull)
-#define NIX_SENDMEMALG_SUBMBUF                (0xdull)
-
-#define NIX_SENDMEMDSZ_B64                    (0x0ull)
-#define NIX_SENDMEMDSZ_B32                    (0x1ull)
-#define NIX_SENDMEMDSZ_B16                    (0x2ull)
-#define NIX_SENDMEMDSZ_B8                     (0x3ull)
-
-#define NIX_SEND_STATUS_GOOD                  (0x0ull)
-#define NIX_SEND_STATUS_SQ_CTX_FAULT          (0x1ull)
-#define NIX_SEND_STATUS_SQ_CTX_POISON         (0x2ull)
-#define NIX_SEND_STATUS_SQB_FAULT             (0x3ull)
-#define NIX_SEND_STATUS_SQB_POISON            (0x4ull)
-#define NIX_SEND_STATUS_SEND_HDR_ERR          (0x5ull)
-#define NIX_SEND_STATUS_SEND_EXT_ERR          (0x6ull)
-#define NIX_SEND_STATUS_JUMP_FAULT            (0x7ull)
-#define NIX_SEND_STATUS_JUMP_POISON           (0x8ull)
-#define NIX_SEND_STATUS_SEND_CRC_ERR          (0x10ull)
-#define NIX_SEND_STATUS_SEND_IMM_ERR          (0x11ull)
-#define NIX_SEND_STATUS_SEND_SG_ERR           (0x12ull)
-#define NIX_SEND_STATUS_SEND_MEM_ERR          (0x13ull)
-#define NIX_SEND_STATUS_INVALID_SUBDC         (0x14ull)
-#define NIX_SEND_STATUS_SUBDC_ORDER_ERR       (0x15ull)
-#define NIX_SEND_STATUS_DATA_FAULT            (0x16ull)
-#define NIX_SEND_STATUS_DATA_POISON           (0x17ull)
-#define NIX_SEND_STATUS_NPC_DROP_ACTION       (0x20ull)
-#define NIX_SEND_STATUS_LOCK_VIOL             (0x21ull)
-#define NIX_SEND_STATUS_NPC_UCAST_CHAN_ERR    (0x22ull)
-#define NIX_SEND_STATUS_NPC_MCAST_CHAN_ERR    (0x23ull)
-#define NIX_SEND_STATUS_NPC_MCAST_ABORT       (0x24ull)
-#define NIX_SEND_STATUS_NPC_VTAG_PTR_ERR      (0x25ull)
-#define NIX_SEND_STATUS_NPC_VTAG_SIZE_ERR     (0x26ull)
-#define NIX_SEND_STATUS_SEND_MEM_FAULT        (0x27ull)
-
-#define NIX_SQINT_LMT_ERR                     (0x0ull)
-#define NIX_SQINT_MNQ_ERR                     (0x1ull)
-#define NIX_SQINT_SEND_ERR                    (0x2ull)
-#define NIX_SQINT_SQB_ALLOC_FAIL              (0x3ull)
-
-#define NIX_XQE_TYPE_INVALID                  (0x0ull)
-#define NIX_XQE_TYPE_RX                       (0x1ull)
-#define NIX_XQE_TYPE_RX_IPSECS                (0x2ull)
-#define NIX_XQE_TYPE_RX_IPSECH                (0x3ull)
-#define NIX_XQE_TYPE_RX_IPSECD                (0x4ull)
-#define NIX_XQE_TYPE_SEND                     (0x8ull)
-
-#define NIX_AQ_COMP_NOTDONE                   (0x0ull)
-#define NIX_AQ_COMP_GOOD                      (0x1ull)
-#define NIX_AQ_COMP_SWERR                     (0x2ull)
-#define NIX_AQ_COMP_CTX_POISON                (0x3ull)
-#define NIX_AQ_COMP_CTX_FAULT                 (0x4ull)
-#define NIX_AQ_COMP_LOCKERR                   (0x5ull)
-#define NIX_AQ_COMP_SQB_ALLOC_FAIL            (0x6ull)
-
-#define NIX_AF_INT_VEC_RVU                    (0x0ull)
-#define NIX_AF_INT_VEC_GEN                    (0x1ull)
-#define NIX_AF_INT_VEC_AQ_DONE                (0x2ull)
-#define NIX_AF_INT_VEC_AF_ERR                 (0x3ull)
-#define NIX_AF_INT_VEC_POISON                 (0x4ull)
-
-#define NIX_AQINT_GEN_RX_MCAST_DROP           (0x0ull)
-#define NIX_AQINT_GEN_RX_MIRROR_DROP          (0x1ull)
-#define NIX_AQINT_GEN_TL1_DRAIN               (0x3ull)
-#define NIX_AQINT_GEN_SMQ_FLUSH_DONE          (0x4ull)
-
-#define NIX_AQ_INSTOP_NOP                     (0x0ull)
-#define NIX_AQ_INSTOP_INIT                    (0x1ull)
-#define NIX_AQ_INSTOP_WRITE                   (0x2ull)
-#define NIX_AQ_INSTOP_READ                    (0x3ull)
-#define NIX_AQ_INSTOP_LOCK                    (0x4ull)
-#define NIX_AQ_INSTOP_UNLOCK                  (0x5ull)
-
-#define NIX_AQ_CTYPE_RQ                       (0x0ull)
-#define NIX_AQ_CTYPE_SQ                       (0x1ull)
-#define NIX_AQ_CTYPE_CQ                       (0x2ull)
-#define NIX_AQ_CTYPE_MCE                      (0x3ull)
-#define NIX_AQ_CTYPE_RSS                      (0x4ull)
-#define NIX_AQ_CTYPE_DYNO                     (0x5ull)
-
-#define NIX_COLORRESULT_GREEN                 (0x0ull)
-#define NIX_COLORRESULT_YELLOW                (0x1ull)
-#define NIX_COLORRESULT_RED_SEND              (0x2ull)
-#define NIX_COLORRESULT_RED_DROP              (0x3ull)
-
-#define NIX_CHAN_LBKX_CHX(a, b)               \
-	(0x000ull | ((uint64_t)(a) << 8) | (uint64_t)(b))
-#define NIX_CHAN_R4                           (0x400ull)
-#define NIX_CHAN_R5                           (0x500ull)
-#define NIX_CHAN_R6                           (0x600ull)
-#define NIX_CHAN_SDP_CH_END                   (0x7ffull)
-#define NIX_CHAN_SDP_CH_START                 (0x700ull)
-#define NIX_CHAN_CGXX_LMACX_CHX(a, b, c)      \
-	(0x800ull | ((uint64_t)(a) << 8) | ((uint64_t)(b) << 4) | \
-	(uint64_t)(c))
-
-#define NIX_INTF_SDP                          (0x4ull)
-#define NIX_INTF_CGX0                         (0x0ull)
-#define NIX_INTF_CGX1                         (0x1ull)
-#define NIX_INTF_CGX2                         (0x2ull)
-#define NIX_INTF_LBK0                         (0x3ull)
-
-#define NIX_CQERRINT_DOOR_ERR                 (0x0ull)
-#define NIX_CQERRINT_WR_FULL                  (0x1ull)
-#define NIX_CQERRINT_CQE_FAULT                (0x2ull)
-
-#define NIX_LF_INT_VEC_GINT                   (0x80ull)
-#define NIX_LF_INT_VEC_ERR_INT                (0x81ull)
-#define NIX_LF_INT_VEC_POISON                 (0x82ull)
-#define NIX_LF_INT_VEC_QINT_END               (0x3full)
-#define NIX_LF_INT_VEC_QINT_START             (0x0ull)
-#define NIX_LF_INT_VEC_CINT_END               (0x7full)
-#define NIX_LF_INT_VEC_CINT_START             (0x40ull)
-
-/* Enums definitions */
-
-/* Structures definitions */
-
-/* NIX admin queue instruction structure */
-struct nix_aq_inst_s {
-	uint64_t op         : 4;
-	uint64_t ctype      : 4;
-	uint64_t lf         : 7;
-	uint64_t rsvd_23_15 : 9;
-	uint64_t cindex     : 20;
-	uint64_t rsvd_62_44 : 19;
-	uint64_t doneint    : 1;
-	uint64_t res_addr   : 64;    /* W1 */
-};
-
-/* NIX admin queue result structure */
-struct nix_aq_res_s {
-	uint64_t op          : 4;
-	uint64_t ctype       : 4;
-	uint64_t compcode    : 8;
-	uint64_t doneint     : 1;
-	uint64_t rsvd_63_17  : 47;
-	uint64_t rsvd_127_64 : 64;   /* W1 */
-};
-
-/* NIX completion interrupt context hardware structure */
-struct nix_cint_hw_s {
-	uint64_t ecount       : 32;
-	uint64_t qcount       : 16;
-	uint64_t intr         : 1;
-	uint64_t ena          : 1;
-	uint64_t timer_idx    : 8;
-	uint64_t rsvd_63_58   : 6;
-	uint64_t ecount_wait  : 32;
-	uint64_t qcount_wait  : 16;
-	uint64_t time_wait    : 8;
-	uint64_t rsvd_127_120 : 8;
-};
-
-/* NIX completion queue entry header structure */
-struct nix_cqe_hdr_s {
-	uint64_t tag        : 32;
-	uint64_t q          : 20;
-	uint64_t rsvd_57_52 : 6;
-	uint64_t node       : 2;
-	uint64_t cqe_type   : 4;
-};
-
-/* NIX completion queue context structure */
-struct nix_cq_ctx_s {
-	uint64_t base           : 64;/* W0 */
-	uint64_t rsvd_67_64     : 4;
-	uint64_t bp_ena         : 1;
-	uint64_t rsvd_71_69     : 3;
-	uint64_t bpid           : 9;
-	uint64_t rsvd_83_81     : 3;
-	uint64_t qint_idx       : 7;
-	uint64_t cq_err         : 1;
-	uint64_t cint_idx       : 7;
-	uint64_t avg_con        : 9;
-	uint64_t wrptr          : 20;
-	uint64_t tail           : 20;
-	uint64_t head           : 20;
-	uint64_t avg_level      : 8;
-	uint64_t update_time    : 16;
-	uint64_t bp             : 8;
-	uint64_t drop           : 8;
-	uint64_t drop_ena       : 1;
-	uint64_t ena            : 1;
-	uint64_t rsvd_211_210   : 2;
-	uint64_t substream      : 20;
-	uint64_t caching        : 1;
-	uint64_t rsvd_235_233   : 3;
-	uint64_t qsize          : 4;
-	uint64_t cq_err_int     : 8;
-	uint64_t cq_err_int_ena : 8;
-};
-
-/* NIX instruction header structure */
-struct nix_inst_hdr_s {
-	uint64_t pf_func    : 16;
-	uint64_t sq         : 20;
-	uint64_t rsvd_63_36 : 28;
-};
-
-/* NIX i/o virtual address structure */
-struct nix_iova_s {
-	uint64_t addr : 64;          /* W0 */
-};
-
-/* NIX IPsec dynamic ordering counter structure */
-struct nix_ipsec_dyno_s {
-	uint32_t count : 32;         /* W0 */
-};
-
-/* NIX memory value structure */
-struct nix_mem_result_s {
-	uint64_t v         : 1;
-	uint64_t color     : 2;
-	uint64_t rsvd_63_3 : 61;
-};
-
-/* NIX statistics operation write data structure */
-struct nix_op_q_wdata_s {
-	uint64_t rsvd_31_0  : 32;
-	uint64_t q          : 20;
-	uint64_t rsvd_63_52 : 12;
-};
-
-/* NIX queue interrupt context hardware structure */
-struct nix_qint_hw_s {
-	uint32_t count      : 22;
-	uint32_t rsvd_30_22 : 9;
-	uint32_t ena        : 1;
-};
-
-/* NIX receive queue context structure */
-struct nix_rq_ctx_hw_s {
-	uint64_t ena           : 1;
-	uint64_t sso_ena       : 1;
-	uint64_t ipsech_ena    : 1;
-	uint64_t ena_wqwd      : 1;
-	uint64_t cq            : 20;
-	uint64_t substream     : 20;
-	uint64_t wqe_aura      : 20;
-	uint64_t spb_aura      : 20;
-	uint64_t lpb_aura      : 20;
-	uint64_t sso_grp       : 10;
-	uint64_t sso_tt        : 2;
-	uint64_t pb_caching    : 2;
-	uint64_t wqe_caching   : 1;
-	uint64_t xqe_drop_ena  : 1;
-	uint64_t spb_drop_ena  : 1;
-	uint64_t lpb_drop_ena  : 1;
-	uint64_t wqe_skip      : 2;
-	uint64_t rsvd_127_124  : 4;
-	uint64_t rsvd_139_128  : 12;
-	uint64_t spb_sizem1    : 6;
-	uint64_t rsvd_150_146  : 5;
-	uint64_t spb_ena       : 1;
-	uint64_t lpb_sizem1    : 12;
-	uint64_t first_skip    : 7;
-	uint64_t rsvd_171      : 1;
-	uint64_t later_skip    : 6;
-	uint64_t xqe_imm_size  : 6;
-	uint64_t rsvd_189_184  : 6;
-	uint64_t xqe_imm_copy  : 1;
-	uint64_t xqe_hdr_split : 1;
-	uint64_t xqe_drop      : 8;
-	uint64_t xqe_pass      : 8;
-	uint64_t wqe_pool_drop : 8;
-	uint64_t wqe_pool_pass : 8;
-	uint64_t spb_aura_drop : 8;
-	uint64_t spb_aura_pass : 8;
-	uint64_t spb_pool_drop : 8;
-	uint64_t spb_pool_pass : 8;
-	uint64_t lpb_aura_drop : 8;
-	uint64_t lpb_aura_pass : 8;
-	uint64_t lpb_pool_drop : 8;
-	uint64_t lpb_pool_pass : 8;
-	uint64_t rsvd_319_288  : 32;
-	uint64_t ltag          : 24;
-	uint64_t good_utag     : 8;
-	uint64_t bad_utag      : 8;
-	uint64_t flow_tagw     : 6;
-	uint64_t rsvd_383_366  : 18;
-	uint64_t octs          : 48;
-	uint64_t rsvd_447_432  : 16;
-	uint64_t pkts          : 48;
-	uint64_t rsvd_511_496  : 16;
-	uint64_t drop_octs     : 48;
-	uint64_t rsvd_575_560  : 16;
-	uint64_t drop_pkts     : 48;
-	uint64_t rsvd_639_624  : 16;
-	uint64_t re_pkts       : 48;
-	uint64_t rsvd_702_688  : 15;
-	uint64_t ena_copy      : 1;
-	uint64_t rsvd_739_704  : 36;
-	uint64_t rq_int        : 8;
-	uint64_t rq_int_ena    : 8;
-	uint64_t qint_idx      : 7;
-	uint64_t rsvd_767_763  : 5;
-	uint64_t rsvd_831_768  : 64;/* W12 */
-	uint64_t rsvd_895_832  : 64;/* W13 */
-	uint64_t rsvd_959_896  : 64;/* W14 */
-	uint64_t rsvd_1023_960 : 64;/* W15 */
-};
-
-/* NIX receive queue context structure */
-struct nix_rq_ctx_s {
-	uint64_t ena           : 1;
-	uint64_t sso_ena       : 1;
-	uint64_t ipsech_ena    : 1;
-	uint64_t ena_wqwd      : 1;
-	uint64_t cq            : 20;
-	uint64_t substream     : 20;
-	uint64_t wqe_aura      : 20;
-	uint64_t spb_aura      : 20;
-	uint64_t lpb_aura      : 20;
-	uint64_t sso_grp       : 10;
-	uint64_t sso_tt        : 2;
-	uint64_t pb_caching    : 2;
-	uint64_t wqe_caching   : 1;
-	uint64_t xqe_drop_ena  : 1;
-	uint64_t spb_drop_ena  : 1;
-	uint64_t lpb_drop_ena  : 1;
-	uint64_t rsvd_127_122  : 6;
-	uint64_t rsvd_139_128  : 12;
-	uint64_t spb_sizem1    : 6;
-	uint64_t wqe_skip      : 2;
-	uint64_t rsvd_150_148  : 3;
-	uint64_t spb_ena       : 1;
-	uint64_t lpb_sizem1    : 12;
-	uint64_t first_skip    : 7;
-	uint64_t rsvd_171      : 1;
-	uint64_t later_skip    : 6;
-	uint64_t xqe_imm_size  : 6;
-	uint64_t rsvd_189_184  : 6;
-	uint64_t xqe_imm_copy  : 1;
-	uint64_t xqe_hdr_split : 1;
-	uint64_t xqe_drop      : 8;
-	uint64_t xqe_pass      : 8;
-	uint64_t wqe_pool_drop : 8;
-	uint64_t wqe_pool_pass : 8;
-	uint64_t spb_aura_drop : 8;
-	uint64_t spb_aura_pass : 8;
-	uint64_t spb_pool_drop : 8;
-	uint64_t spb_pool_pass : 8;
-	uint64_t lpb_aura_drop : 8;
-	uint64_t lpb_aura_pass : 8;
-	uint64_t lpb_pool_drop : 8;
-	uint64_t lpb_pool_pass : 8;
-	uint64_t rsvd_291_288  : 4;
-	uint64_t rq_int        : 8;
-	uint64_t rq_int_ena    : 8;
-	uint64_t qint_idx      : 7;
-	uint64_t rsvd_319_315  : 5;
-	uint64_t ltag          : 24;
-	uint64_t good_utag     : 8;
-	uint64_t bad_utag      : 8;
-	uint64_t flow_tagw     : 6;
-	uint64_t rsvd_383_366  : 18;
-	uint64_t octs          : 48;
-	uint64_t rsvd_447_432  : 16;
-	uint64_t pkts          : 48;
-	uint64_t rsvd_511_496  : 16;
-	uint64_t drop_octs     : 48;
-	uint64_t rsvd_575_560  : 16;
-	uint64_t drop_pkts     : 48;
-	uint64_t rsvd_639_624  : 16;
-	uint64_t re_pkts       : 48;
-	uint64_t rsvd_703_688  : 16;
-	uint64_t rsvd_767_704  : 64;/* W11 */
-	uint64_t rsvd_831_768  : 64;/* W12 */
-	uint64_t rsvd_895_832  : 64;/* W13 */
-	uint64_t rsvd_959_896  : 64;/* W14 */
-	uint64_t rsvd_1023_960 : 64;/* W15 */
-};
-
-/* NIX receive side scaling entry structure */
-struct nix_rsse_s {
-	uint32_t rq         : 20;
-	uint32_t rsvd_31_20 : 12;
-};
-
-/* NIX receive action structure */
-struct nix_rx_action_s {
-	uint64_t op           : 4;
-	uint64_t pf_func      : 16;
-	uint64_t index        : 20;
-	uint64_t match_id     : 16;
-	uint64_t flow_key_alg : 5;
-	uint64_t rsvd_63_61   : 3;
-};
-
-/* NIX receive immediate sub descriptor structure */
-struct nix_rx_imm_s {
-	uint64_t size       : 16;
-	uint64_t apad       : 3;
-	uint64_t rsvd_59_19 : 41;
-	uint64_t subdc      : 4;
-};
-
-/* NIX receive multicast/mirror entry structure */
-struct nix_rx_mce_s {
-	uint64_t op         : 2;
-	uint64_t rsvd_2     : 1;
-	uint64_t eol        : 1;
-	uint64_t index      : 20;
-	uint64_t rsvd_31_24 : 8;
-	uint64_t pf_func    : 16;
-	uint64_t next       : 16;
-};
-
-/* NIX receive parse structure */
-struct nix_rx_parse_s {
-	uint64_t chan         : 12;
-	uint64_t desc_sizem1  : 5;
-	uint64_t imm_copy     : 1;
-	uint64_t express      : 1;
-	uint64_t wqwd         : 1;
-	uint64_t errlev       : 4;
-	uint64_t errcode      : 8;
-	uint64_t latype       : 4;
-	uint64_t lbtype       : 4;
-	uint64_t lctype       : 4;
-	uint64_t ldtype       : 4;
-	uint64_t letype       : 4;
-	uint64_t lftype       : 4;
-	uint64_t lgtype       : 4;
-	uint64_t lhtype       : 4;
-	uint64_t pkt_lenm1    : 16;
-	uint64_t l2m          : 1;
-	uint64_t l2b          : 1;
-	uint64_t l3m          : 1;
-	uint64_t l3b          : 1;
-	uint64_t vtag0_valid  : 1;
-	uint64_t vtag0_gone   : 1;
-	uint64_t vtag1_valid  : 1;
-	uint64_t vtag1_gone   : 1;
-	uint64_t pkind        : 6;
-	uint64_t rsvd_95_94   : 2;
-	uint64_t vtag0_tci    : 16;
-	uint64_t vtag1_tci    : 16;
-	uint64_t laflags      : 8;
-	uint64_t lbflags      : 8;
-	uint64_t lcflags      : 8;
-	uint64_t ldflags      : 8;
-	uint64_t leflags      : 8;
-	uint64_t lfflags      : 8;
-	uint64_t lgflags      : 8;
-	uint64_t lhflags      : 8;
-	uint64_t eoh_ptr      : 8;
-	uint64_t wqe_aura     : 20;
-	uint64_t pb_aura      : 20;
-	uint64_t match_id     : 16;
-	uint64_t laptr        : 8;
-	uint64_t lbptr        : 8;
-	uint64_t lcptr        : 8;
-	uint64_t ldptr        : 8;
-	uint64_t leptr        : 8;
-	uint64_t lfptr        : 8;
-	uint64_t lgptr        : 8;
-	uint64_t lhptr        : 8;
-	uint64_t vtag0_ptr    : 8;
-	uint64_t vtag1_ptr    : 8;
-	uint64_t flow_key_alg : 5;
-	uint64_t rsvd_383_341 : 43;
-	uint64_t rsvd_447_384 : 64;  /* W6 */
-};
-
-/* NIX receive scatter/gather sub descriptor structure */
-struct nix_rx_sg_s {
-	uint64_t seg1_size  : 16;
-	uint64_t seg2_size  : 16;
-	uint64_t seg3_size  : 16;
-	uint64_t segs       : 2;
-	uint64_t rsvd_59_50 : 10;
-	uint64_t subdc      : 4;
-};
-
-/* NIX receive vtag action structure */
-struct nix_rx_vtag_action_s {
-	uint64_t vtag0_relptr : 8;
-	uint64_t vtag0_lid    : 3;
-	uint64_t rsvd_11      : 1;
-	uint64_t vtag0_type   : 3;
-	uint64_t vtag0_valid  : 1;
-	uint64_t rsvd_31_16   : 16;
-	uint64_t vtag1_relptr : 8;
-	uint64_t vtag1_lid    : 3;
-	uint64_t rsvd_43      : 1;
-	uint64_t vtag1_type   : 3;
-	uint64_t vtag1_valid  : 1;
-	uint64_t rsvd_63_48   : 16;
-};
-
-/* NIX send completion structure */
-struct nix_send_comp_s {
-	uint64_t status     : 8;
-	uint64_t sqe_id     : 16;
-	uint64_t rsvd_63_24 : 40;
-};
-
-/* NIX send CRC sub descriptor structure */
-struct nix_send_crc_s {
-	uint64_t size        : 16;
-	uint64_t start       : 16;
-	uint64_t insert      : 16;
-	uint64_t rsvd_57_48  : 10;
-	uint64_t alg         : 2;
-	uint64_t subdc       : 4;
-	uint64_t iv          : 32;
-	uint64_t rsvd_127_96 : 32;
-};
-
-/* NIX send extended header sub descriptor structure */
-RTE_STD_C11
-union nix_send_ext_w0_u {
-	uint64_t u;
-	struct {
-		uint64_t lso_mps       : 14;
-		uint64_t lso           : 1;
-		uint64_t tstmp         : 1;
-		uint64_t lso_sb        : 8;
-		uint64_t lso_format    : 5;
-		uint64_t rsvd_31_29    : 3;
-		uint64_t shp_chg       : 9;
-		uint64_t shp_dis       : 1;
-		uint64_t shp_ra        : 2;
-		uint64_t markptr       : 8;
-		uint64_t markform      : 7;
-		uint64_t mark_en       : 1;
-		uint64_t subdc         : 4;
-	};
-};
-
-RTE_STD_C11
-union nix_send_ext_w1_u {
-	uint64_t u;
-	struct {
-		uint64_t vlan0_ins_ptr : 8;
-		uint64_t vlan0_ins_tci : 16;
-		uint64_t vlan1_ins_ptr : 8;
-		uint64_t vlan1_ins_tci : 16;
-		uint64_t vlan0_ins_ena : 1;
-		uint64_t vlan1_ins_ena : 1;
-		uint64_t rsvd_127_114  : 14;
-	};
-};
-
-struct nix_send_ext_s {
-	union nix_send_ext_w0_u w0;
-	union nix_send_ext_w1_u w1;
-};
-
-/* NIX send header sub descriptor structure */
-RTE_STD_C11
-union nix_send_hdr_w0_u {
-	uint64_t u;
-	struct {
-		uint64_t total   : 18;
-		uint64_t rsvd_18 : 1;
-		uint64_t df      : 1;
-		uint64_t aura    : 20;
-		uint64_t sizem1  : 3;
-		uint64_t pnc     : 1;
-		uint64_t sq      : 20;
-	};
-};
-
-RTE_STD_C11
-union nix_send_hdr_w1_u {
-	uint64_t u;
-	struct {
-		uint64_t ol3ptr  : 8;
-		uint64_t ol4ptr  : 8;
-		uint64_t il3ptr  : 8;
-		uint64_t il4ptr  : 8;
-		uint64_t ol3type : 4;
-		uint64_t ol4type : 4;
-		uint64_t il3type : 4;
-		uint64_t il4type : 4;
-		uint64_t sqe_id  : 16;
-	};
-};
-
-struct nix_send_hdr_s {
-	union nix_send_hdr_w0_u w0;
-	union nix_send_hdr_w1_u w1;
-};
-
-/* NIX send immediate sub descriptor structure */
-struct nix_send_imm_s {
-	uint64_t size       : 16;
-	uint64_t apad       : 3;
-	uint64_t rsvd_59_19 : 41;
-	uint64_t subdc      : 4;
-};
-
-/* NIX send jump sub descriptor structure */
-struct nix_send_jump_s {
-	uint64_t sizem1     : 7;
-	uint64_t rsvd_13_7  : 7;
-	uint64_t ld_type    : 2;
-	uint64_t aura       : 20;
-	uint64_t rsvd_58_36 : 23;
-	uint64_t f          : 1;
-	uint64_t subdc      : 4;
-	uint64_t addr       : 64;    /* W1 */
-};
-
-/* NIX send memory sub descriptor structure */
-struct nix_send_mem_s {
-	uint64_t offset     : 16;
-	uint64_t rsvd_52_16 : 37;
-	uint64_t wmem       : 1;
-	uint64_t dsz        : 2;
-	uint64_t alg        : 4;
-	uint64_t subdc      : 4;
-	uint64_t addr       : 64;    /* W1 */
-};
-
-/* NIX send scatter/gather sub descriptor structure */
-RTE_STD_C11
-union nix_send_sg_s {
-	uint64_t u;
-	struct {
-		uint64_t seg1_size  : 16;
-		uint64_t seg2_size  : 16;
-		uint64_t seg3_size  : 16;
-		uint64_t segs       : 2;
-		uint64_t rsvd_54_50 : 5;
-		uint64_t i1         : 1;
-		uint64_t i2         : 1;
-		uint64_t i3         : 1;
-		uint64_t ld_type    : 2;
-		uint64_t subdc      : 4;
-	};
-};
-
-/* NIX send work sub descriptor structure */
-struct nix_send_work_s {
-	uint64_t tag        : 32;
-	uint64_t tt         : 2;
-	uint64_t grp        : 10;
-	uint64_t rsvd_59_44 : 16;
-	uint64_t subdc      : 4;
-	uint64_t addr       : 64;    /* W1 */
-};
-
-/* NIX sq context hardware structure */
-struct nix_sq_ctx_hw_s {
-	uint64_t ena                   : 1;
-	uint64_t substream             : 20;
-	uint64_t max_sqe_size          : 2;
-	uint64_t sqe_way_mask          : 16;
-	uint64_t sqb_aura              : 20;
-	uint64_t gbl_rsvd1             : 5;
-	uint64_t cq_id                 : 20;
-	uint64_t cq_ena                : 1;
-	uint64_t qint_idx              : 6;
-	uint64_t gbl_rsvd2             : 1;
-	uint64_t sq_int                : 8;
-	uint64_t sq_int_ena            : 8;
-	uint64_t xoff                  : 1;
-	uint64_t sqe_stype             : 2;
-	uint64_t gbl_rsvd              : 17;
-	uint64_t head_sqb              : 64;/* W2 */
-	uint64_t head_offset           : 6;
-	uint64_t sqb_dequeue_count     : 16;
-	uint64_t default_chan          : 12;
-	uint64_t sdp_mcast             : 1;
-	uint64_t sso_ena               : 1;
-	uint64_t dse_rsvd1             : 28;
-	uint64_t sqb_enqueue_count     : 16;
-	uint64_t tail_offset           : 6;
-	uint64_t lmt_dis               : 1;
-	uint64_t smq_rr_quantum        : 24;
-	uint64_t dnq_rsvd1             : 17;
-	uint64_t tail_sqb              : 64;/* W5 */
-	uint64_t next_sqb              : 64;/* W6 */
-	uint64_t mnq_dis               : 1;
-	uint64_t smq                   : 9;
-	uint64_t smq_pend              : 1;
-	uint64_t smq_next_sq           : 20;
-	uint64_t smq_next_sq_vld       : 1;
-	uint64_t scm1_rsvd2            : 32;
-	uint64_t smenq_sqb             : 64;/* W8 */
-	uint64_t smenq_offset          : 6;
-	uint64_t cq_limit              : 8;
-	uint64_t smq_rr_count          : 25;
-	uint64_t scm_lso_rem           : 18;
-	uint64_t scm_dq_rsvd0          : 7;
-	uint64_t smq_lso_segnum        : 8;
-	uint64_t vfi_lso_total         : 18;
-	uint64_t vfi_lso_sizem1        : 3;
-	uint64_t vfi_lso_sb            : 8;
-	uint64_t vfi_lso_mps           : 14;
-	uint64_t vfi_lso_vlan0_ins_ena : 1;
-	uint64_t vfi_lso_vlan1_ins_ena : 1;
-	uint64_t vfi_lso_vld           : 1;
-	uint64_t smenq_next_sqb_vld    : 1;
-	uint64_t scm_dq_rsvd1          : 9;
-	uint64_t smenq_next_sqb        : 64;/* W11 */
-	uint64_t seb_rsvd1             : 64;/* W12 */
-	uint64_t drop_pkts             : 48;
-	uint64_t drop_octs_lsw         : 16;
-	uint64_t drop_octs_msw         : 32;
-	uint64_t pkts_lsw              : 32;
-	uint64_t pkts_msw              : 16;
-	uint64_t octs                  : 48;
-};
-
-/* NIX send queue context structure */
-struct nix_sq_ctx_s {
-	uint64_t ena                   : 1;
-	uint64_t qint_idx              : 6;
-	uint64_t substream             : 20;
-	uint64_t sdp_mcast             : 1;
-	uint64_t cq                    : 20;
-	uint64_t sqe_way_mask          : 16;
-	uint64_t smq                   : 9;
-	uint64_t cq_ena                : 1;
-	uint64_t xoff                  : 1;
-	uint64_t sso_ena               : 1;
-	uint64_t smq_rr_quantum        : 24;
-	uint64_t default_chan          : 12;
-	uint64_t sqb_count             : 16;
-	uint64_t smq_rr_count          : 25;
-	uint64_t sqb_aura              : 20;
-	uint64_t sq_int                : 8;
-	uint64_t sq_int_ena            : 8;
-	uint64_t sqe_stype             : 2;
-	uint64_t rsvd_191              : 1;
-	uint64_t max_sqe_size          : 2;
-	uint64_t cq_limit              : 8;
-	uint64_t lmt_dis               : 1;
-	uint64_t mnq_dis               : 1;
-	uint64_t smq_next_sq           : 20;
-	uint64_t smq_lso_segnum        : 8;
-	uint64_t tail_offset           : 6;
-	uint64_t smenq_offset          : 6;
-	uint64_t head_offset           : 6;
-	uint64_t smenq_next_sqb_vld    : 1;
-	uint64_t smq_pend              : 1;
-	uint64_t smq_next_sq_vld       : 1;
-	uint64_t rsvd_255_253          : 3;
-	uint64_t next_sqb              : 64;/* W4 */
-	uint64_t tail_sqb              : 64;/* W5 */
-	uint64_t smenq_sqb             : 64;/* W6 */
-	uint64_t smenq_next_sqb        : 64;/* W7 */
-	uint64_t head_sqb              : 64;/* W8 */
-	uint64_t rsvd_583_576          : 8;
-	uint64_t vfi_lso_total         : 18;
-	uint64_t vfi_lso_sizem1        : 3;
-	uint64_t vfi_lso_sb            : 8;
-	uint64_t vfi_lso_mps           : 14;
-	uint64_t vfi_lso_vlan0_ins_ena : 1;
-	uint64_t vfi_lso_vlan1_ins_ena : 1;
-	uint64_t vfi_lso_vld           : 1;
-	uint64_t rsvd_639_630          : 10;
-	uint64_t scm_lso_rem           : 18;
-	uint64_t rsvd_703_658          : 46;
-	uint64_t octs                  : 48;
-	uint64_t rsvd_767_752          : 16;
-	uint64_t pkts                  : 48;
-	uint64_t rsvd_831_816          : 16;
-	uint64_t rsvd_895_832          : 64;/* W13 */
-	uint64_t drop_octs             : 48;
-	uint64_t rsvd_959_944          : 16;
-	uint64_t drop_pkts             : 48;
-	uint64_t rsvd_1023_1008        : 16;
-};
-
-/* NIX transmit action structure */
-struct nix_tx_action_s {
-	uint64_t op         : 4;
-	uint64_t rsvd_11_4  : 8;
-	uint64_t index      : 20;
-	uint64_t match_id   : 16;
-	uint64_t rsvd_63_48 : 16;
-};
-
-/* NIX transmit vtag action structure */
-struct nix_tx_vtag_action_s {
-	uint64_t vtag0_relptr : 8;
-	uint64_t vtag0_lid    : 3;
-	uint64_t rsvd_11      : 1;
-	uint64_t vtag0_op     : 2;
-	uint64_t rsvd_15_14   : 2;
-	uint64_t vtag0_def    : 10;
-	uint64_t rsvd_31_26   : 6;
-	uint64_t vtag1_relptr : 8;
-	uint64_t vtag1_lid    : 3;
-	uint64_t rsvd_43      : 1;
-	uint64_t vtag1_op     : 2;
-	uint64_t rsvd_47_46   : 2;
-	uint64_t vtag1_def    : 10;
-	uint64_t rsvd_63_58   : 6;
-};
-
-/* NIX work queue entry header structure */
-struct nix_wqe_hdr_s {
-	uint64_t tag      : 32;
-	uint64_t tt       : 2;
-	uint64_t grp      : 10;
-	uint64_t node     : 2;
-	uint64_t q        : 14;
-	uint64_t wqe_type : 4;
-};
-
-/* NIX Rx flow key algorithm field structure */
-struct nix_rx_flowkey_alg {
-	uint64_t key_offset      :6;
-	uint64_t ln_mask     :1;
-	uint64_t fn_mask     :1;
-	uint64_t hdr_offset      :8;
-	uint64_t bytesm1     :5;
-	uint64_t lid         :3;
-	uint64_t reserved_24_24  :1;
-	uint64_t ena         :1;
-	uint64_t sel_chan        :1;
-	uint64_t ltype_mask      :4;
-	uint64_t ltype_match     :4;
-	uint64_t reserved_35_63  :29;
-};
-
-/* NIX LSO format field structure */
-struct nix_lso_format {
-	uint64_t offset      : 8;
-	uint64_t layer       : 2;
-	uint64_t rsvd_10_11  : 2;
-	uint64_t sizem1      : 2;
-	uint64_t rsvd_14_15  : 2;
-	uint64_t alg         : 3;
-	uint64_t rsvd_19_63  : 45;
-};
-
-#define NIX_LSO_FIELD_MAX	(8)
-#define NIX_LSO_FIELD_ALG_MASK	GENMASK(18, 16)
-#define NIX_LSO_FIELD_SZ_MASK	GENMASK(13, 12)
-#define NIX_LSO_FIELD_LY_MASK	GENMASK(9, 8)
-#define NIX_LSO_FIELD_OFF_MASK	GENMASK(7, 0)
-
-#define NIX_LSO_FIELD_MASK			\
-		(NIX_LSO_FIELD_OFF_MASK |	\
-		 NIX_LSO_FIELD_LY_MASK |	\
-		 NIX_LSO_FIELD_SZ_MASK |	\
-		 NIX_LSO_FIELD_ALG_MASK)
-
-#endif /* __OTX2_NIX_HW_H__ */
diff --git a/drivers/common/octeontx2/hw/otx2_npa.h b/drivers/common/octeontx2/hw/otx2_npa.h
deleted file mode 100644
index 2224216c96..0000000000
--- a/drivers/common/octeontx2/hw/otx2_npa.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_NPA_HW_H__
-#define __OTX2_NPA_HW_H__
-
-/* Register offsets */
-
-#define NPA_AF_BLK_RST                  (0x0ull)
-#define NPA_AF_CONST                    (0x10ull)
-#define NPA_AF_CONST1                   (0x18ull)
-#define NPA_AF_LF_RST                   (0x20ull)
-#define NPA_AF_GEN_CFG                  (0x30ull)
-#define NPA_AF_NDC_CFG                  (0x40ull)
-#define NPA_AF_NDC_SYNC                 (0x50ull)
-#define NPA_AF_INP_CTL                  (0xd0ull)
-#define NPA_AF_ACTIVE_CYCLES_PC         (0xf0ull)
-#define NPA_AF_AVG_DELAY                (0x100ull)
-#define NPA_AF_GEN_INT                  (0x140ull)
-#define NPA_AF_GEN_INT_W1S              (0x148ull)
-#define NPA_AF_GEN_INT_ENA_W1S          (0x150ull)
-#define NPA_AF_GEN_INT_ENA_W1C          (0x158ull)
-#define NPA_AF_RVU_INT                  (0x160ull)
-#define NPA_AF_RVU_INT_W1S              (0x168ull)
-#define NPA_AF_RVU_INT_ENA_W1S          (0x170ull)
-#define NPA_AF_RVU_INT_ENA_W1C          (0x178ull)
-#define NPA_AF_ERR_INT                  (0x180ull)
-#define NPA_AF_ERR_INT_W1S              (0x188ull)
-#define NPA_AF_ERR_INT_ENA_W1S          (0x190ull)
-#define NPA_AF_ERR_INT_ENA_W1C          (0x198ull)
-#define NPA_AF_RAS                      (0x1a0ull)
-#define NPA_AF_RAS_W1S                  (0x1a8ull)
-#define NPA_AF_RAS_ENA_W1S              (0x1b0ull)
-#define NPA_AF_RAS_ENA_W1C              (0x1b8ull)
-#define NPA_AF_AQ_CFG                   (0x600ull)
-#define NPA_AF_AQ_BASE                  (0x610ull)
-#define NPA_AF_AQ_STATUS                (0x620ull)
-#define NPA_AF_AQ_DOOR                  (0x630ull)
-#define NPA_AF_AQ_DONE_WAIT             (0x640ull)
-#define NPA_AF_AQ_DONE                  (0x650ull)
-#define NPA_AF_AQ_DONE_ACK              (0x660ull)
-#define NPA_AF_AQ_DONE_TIMER            (0x670ull)
-#define NPA_AF_AQ_DONE_INT              (0x680ull)
-#define NPA_AF_AQ_DONE_ENA_W1S          (0x690ull)
-#define NPA_AF_AQ_DONE_ENA_W1C          (0x698ull)
-#define NPA_AF_LFX_AURAS_CFG(a)         (0x4000ull | (uint64_t)(a) << 18)
-#define NPA_AF_LFX_LOC_AURAS_BASE(a)    (0x4010ull | (uint64_t)(a) << 18)
-#define NPA_AF_LFX_QINTS_CFG(a)         (0x4100ull | (uint64_t)(a) << 18)
-#define NPA_AF_LFX_QINTS_BASE(a)        (0x4110ull | (uint64_t)(a) << 18)
-#define NPA_PRIV_AF_INT_CFG             (0x10000ull)
-#define NPA_PRIV_LFX_CFG(a)             (0x10010ull | (uint64_t)(a) << 8)
-#define NPA_PRIV_LFX_INT_CFG(a)         (0x10020ull | (uint64_t)(a) << 8)
-#define NPA_AF_RVU_LF_CFG_DEBUG         (0x10030ull)
-#define NPA_AF_DTX_FILTER_CTL           (0x10040ull)
-
-#define NPA_LF_AURA_OP_ALLOCX(a)        (0x10ull | (uint64_t)(a) << 3)
-#define NPA_LF_AURA_OP_FREE0            (0x20ull)
-#define NPA_LF_AURA_OP_FREE1            (0x28ull)
-#define NPA_LF_AURA_OP_CNT              (0x30ull)
-#define NPA_LF_AURA_OP_LIMIT            (0x50ull)
-#define NPA_LF_AURA_OP_INT              (0x60ull)
-#define NPA_LF_AURA_OP_THRESH           (0x70ull)
-#define NPA_LF_POOL_OP_PC               (0x100ull)
-#define NPA_LF_POOL_OP_AVAILABLE        (0x110ull)
-#define NPA_LF_POOL_OP_PTR_START0       (0x120ull)
-#define NPA_LF_POOL_OP_PTR_START1       (0x128ull)
-#define NPA_LF_POOL_OP_PTR_END0         (0x130ull)
-#define NPA_LF_POOL_OP_PTR_END1         (0x138ull)
-#define NPA_LF_POOL_OP_INT              (0x160ull)
-#define NPA_LF_POOL_OP_THRESH           (0x170ull)
-#define NPA_LF_ERR_INT                  (0x200ull)
-#define NPA_LF_ERR_INT_W1S              (0x208ull)
-#define NPA_LF_ERR_INT_ENA_W1C          (0x210ull)
-#define NPA_LF_ERR_INT_ENA_W1S          (0x218ull)
-#define NPA_LF_RAS                      (0x220ull)
-#define NPA_LF_RAS_W1S                  (0x228ull)
-#define NPA_LF_RAS_ENA_W1C              (0x230ull)
-#define NPA_LF_RAS_ENA_W1S              (0x238ull)
-#define NPA_LF_QINTX_CNT(a)             (0x300ull | (uint64_t)(a) << 12)
-#define NPA_LF_QINTX_INT(a)             (0x310ull | (uint64_t)(a) << 12)
-#define NPA_LF_QINTX_ENA_W1S(a)         (0x320ull | (uint64_t)(a) << 12)
-#define NPA_LF_QINTX_ENA_W1C(a)         (0x330ull | (uint64_t)(a) << 12)
-
-
-/* Enum offsets */
-
-#define NPA_AQ_COMP_NOTDONE                 (0x0ull)
-#define NPA_AQ_COMP_GOOD                    (0x1ull)
-#define NPA_AQ_COMP_SWERR                   (0x2ull)
-#define NPA_AQ_COMP_CTX_POISON              (0x3ull)
-#define NPA_AQ_COMP_CTX_FAULT               (0x4ull)
-#define NPA_AQ_COMP_LOCKERR                 (0x5ull)
-
-#define NPA_AF_INT_VEC_RVU                  (0x0ull)
-#define NPA_AF_INT_VEC_GEN                  (0x1ull)
-#define NPA_AF_INT_VEC_AQ_DONE              (0x2ull)
-#define NPA_AF_INT_VEC_AF_ERR               (0x3ull)
-#define NPA_AF_INT_VEC_POISON               (0x4ull)
-
-#define NPA_AQ_INSTOP_NOP                   (0x0ull)
-#define NPA_AQ_INSTOP_INIT                  (0x1ull)
-#define NPA_AQ_INSTOP_WRITE                 (0x2ull)
-#define NPA_AQ_INSTOP_READ                  (0x3ull)
-#define NPA_AQ_INSTOP_LOCK                  (0x4ull)
-#define NPA_AQ_INSTOP_UNLOCK                (0x5ull)
-
-#define NPA_AQ_CTYPE_AURA                   (0x0ull)
-#define NPA_AQ_CTYPE_POOL                   (0x1ull)
-
-#define NPA_BPINTF_NIX0_RX                  (0x0ull)
-#define NPA_BPINTF_NIX1_RX                  (0x1ull)
-
-#define NPA_AURA_ERR_INT_AURA_FREE_UNDER    (0x0ull)
-#define NPA_AURA_ERR_INT_AURA_ADD_OVER      (0x1ull)
-#define NPA_AURA_ERR_INT_AURA_ADD_UNDER     (0x2ull)
-#define NPA_AURA_ERR_INT_POOL_DIS           (0x3ull)
-#define NPA_AURA_ERR_INT_R4                 (0x4ull)
-#define NPA_AURA_ERR_INT_R5                 (0x5ull)
-#define NPA_AURA_ERR_INT_R6                 (0x6ull)
-#define NPA_AURA_ERR_INT_R7                 (0x7ull)
-
-#define NPA_LF_INT_VEC_ERR_INT              (0x40ull)
-#define NPA_LF_INT_VEC_POISON               (0x41ull)
-#define NPA_LF_INT_VEC_QINT_END             (0x3full)
-#define NPA_LF_INT_VEC_QINT_START           (0x0ull)
-
-#define NPA_INPQ_SSO                        (0x4ull)
-#define NPA_INPQ_TIM                        (0x5ull)
-#define NPA_INPQ_DPI                        (0x6ull)
-#define NPA_INPQ_AURA_OP                    (0xeull)
-#define NPA_INPQ_INTERNAL_RSV               (0xfull)
-#define NPA_INPQ_NIX0_RX                    (0x0ull)
-#define NPA_INPQ_NIX1_RX                    (0x2ull)
-#define NPA_INPQ_NIX0_TX                    (0x1ull)
-#define NPA_INPQ_NIX1_TX                    (0x3ull)
-#define NPA_INPQ_R_END                      (0xdull)
-#define NPA_INPQ_R_START                    (0x7ull)
-
-#define NPA_POOL_ERR_INT_OVFLS              (0x0ull)
-#define NPA_POOL_ERR_INT_RANGE              (0x1ull)
-#define NPA_POOL_ERR_INT_PERR               (0x2ull)
-#define NPA_POOL_ERR_INT_R3                 (0x3ull)
-#define NPA_POOL_ERR_INT_R4                 (0x4ull)
-#define NPA_POOL_ERR_INT_R5                 (0x5ull)
-#define NPA_POOL_ERR_INT_R6                 (0x6ull)
-#define NPA_POOL_ERR_INT_R7                 (0x7ull)
-
-#define NPA_NDC0_PORT_AURA0                 (0x0ull)
-#define NPA_NDC0_PORT_AURA1                 (0x1ull)
-#define NPA_NDC0_PORT_POOL0                 (0x2ull)
-#define NPA_NDC0_PORT_POOL1                 (0x3ull)
-#define NPA_NDC0_PORT_STACK0                (0x4ull)
-#define NPA_NDC0_PORT_STACK1                (0x5ull)
-
-#define NPA_LF_ERR_INT_AURA_DIS             (0x0ull)
-#define NPA_LF_ERR_INT_AURA_OOR             (0x1ull)
-#define NPA_LF_ERR_INT_AURA_FAULT           (0xcull)
-#define NPA_LF_ERR_INT_POOL_FAULT           (0xdull)
-#define NPA_LF_ERR_INT_STACK_FAULT          (0xeull)
-#define NPA_LF_ERR_INT_QINT_FAULT           (0xfull)
-
-/* Structures definitions */
-
-/* NPA admin queue instruction structure */
-struct npa_aq_inst_s {
-	uint64_t op         : 4;
-	uint64_t ctype      : 4;
-	uint64_t lf         : 9;
-	uint64_t rsvd_23_17 : 7;
-	uint64_t cindex     : 20;
-	uint64_t rsvd_62_44 : 19;
-	uint64_t doneint    : 1;
-	uint64_t res_addr   : 64;    /* W1 */
-};
-
-/* NPA admin queue result structure */
-struct npa_aq_res_s {
-	uint64_t op          : 4;
-	uint64_t ctype       : 4;
-	uint64_t compcode    : 8;
-	uint64_t doneint     : 1;
-	uint64_t rsvd_63_17  : 47;
-	uint64_t rsvd_127_64 : 64;   /* W1 */
-};
-
-/* NPA aura operation write data structure */
-struct npa_aura_op_wdata_s {
-	uint64_t aura       : 20;
-	uint64_t rsvd_62_20 : 43;
-	uint64_t drop       : 1;
-};
-
-/* NPA aura context structure */
-struct npa_aura_s {
-	uint64_t pool_addr       : 64;/* W0 */
-	uint64_t ena             : 1;
-	uint64_t rsvd_66_65      : 2;
-	uint64_t pool_caching    : 1;
-	uint64_t pool_way_mask   : 16;
-	uint64_t avg_con         : 9;
-	uint64_t rsvd_93         : 1;
-	uint64_t pool_drop_ena   : 1;
-	uint64_t aura_drop_ena   : 1;
-	uint64_t bp_ena          : 2;
-	uint64_t rsvd_103_98     : 6;
-	uint64_t aura_drop       : 8;
-	uint64_t shift           : 6;
-	uint64_t rsvd_119_118    : 2;
-	uint64_t avg_level       : 8;
-	uint64_t count           : 36;
-	uint64_t rsvd_167_164    : 4;
-	uint64_t nix0_bpid       : 9;
-	uint64_t rsvd_179_177    : 3;
-	uint64_t nix1_bpid       : 9;
-	uint64_t rsvd_191_189    : 3;
-	uint64_t limit           : 36;
-	uint64_t rsvd_231_228    : 4;
-	uint64_t bp              : 8;
-	uint64_t rsvd_243_240    : 4;
-	uint64_t fc_ena          : 1;
-	uint64_t fc_up_crossing  : 1;
-	uint64_t fc_stype        : 2;
-	uint64_t fc_hyst_bits    : 4;
-	uint64_t rsvd_255_252    : 4;
-	uint64_t fc_addr         : 64;/* W4 */
-	uint64_t pool_drop       : 8;
-	uint64_t update_time     : 16;
-	uint64_t err_int         : 8;
-	uint64_t err_int_ena     : 8;
-	uint64_t thresh_int      : 1;
-	uint64_t thresh_int_ena  : 1;
-	uint64_t thresh_up       : 1;
-	uint64_t rsvd_363        : 1;
-	uint64_t thresh_qint_idx : 7;
-	uint64_t rsvd_371        : 1;
-	uint64_t err_qint_idx    : 7;
-	uint64_t rsvd_383_379    : 5;
-	uint64_t thresh          : 36;
-	uint64_t rsvd_447_420    : 28;
-	uint64_t rsvd_511_448    : 64;/* W7 */
-};
-
-/* NPA pool context structure */
-struct npa_pool_s {
-	uint64_t stack_base      : 64;/* W0 */
-	uint64_t ena             : 1;
-	uint64_t nat_align       : 1;
-	uint64_t rsvd_67_66      : 2;
-	uint64_t stack_caching   : 1;
-	uint64_t rsvd_71_69      : 3;
-	uint64_t stack_way_mask  : 16;
-	uint64_t buf_offset      : 12;
-	uint64_t rsvd_103_100    : 4;
-	uint64_t buf_size        : 11;
-	uint64_t rsvd_127_115    : 13;
-	uint64_t stack_max_pages : 32;
-	uint64_t stack_pages     : 32;
-	uint64_t op_pc           : 48;
-	uint64_t rsvd_255_240    : 16;
-	uint64_t stack_offset    : 4;
-	uint64_t rsvd_263_260    : 4;
-	uint64_t shift           : 6;
-	uint64_t rsvd_271_270    : 2;
-	uint64_t avg_level       : 8;
-	uint64_t avg_con         : 9;
-	uint64_t fc_ena          : 1;
-	uint64_t fc_stype        : 2;
-	uint64_t fc_hyst_bits    : 4;
-	uint64_t fc_up_crossing  : 1;
-	uint64_t rsvd_299_297    : 3;
-	uint64_t update_time     : 16;
-	uint64_t rsvd_319_316    : 4;
-	uint64_t fc_addr         : 64;/* W5 */
-	uint64_t ptr_start       : 64;/* W6 */
-	uint64_t ptr_end         : 64;/* W7 */
-	uint64_t rsvd_535_512    : 24;
-	uint64_t err_int         : 8;
-	uint64_t err_int_ena     : 8;
-	uint64_t thresh_int      : 1;
-	uint64_t thresh_int_ena  : 1;
-	uint64_t thresh_up       : 1;
-	uint64_t rsvd_555        : 1;
-	uint64_t thresh_qint_idx : 7;
-	uint64_t rsvd_563        : 1;
-	uint64_t err_qint_idx    : 7;
-	uint64_t rsvd_575_571    : 5;
-	uint64_t thresh          : 36;
-	uint64_t rsvd_639_612    : 28;
-	uint64_t rsvd_703_640    : 64;/* W10 */
-	uint64_t rsvd_767_704    : 64;/* W11 */
-	uint64_t rsvd_831_768    : 64;/* W12 */
-	uint64_t rsvd_895_832    : 64;/* W13 */
-	uint64_t rsvd_959_896    : 64;/* W14 */
-	uint64_t rsvd_1023_960   : 64;/* W15 */
-};
-
-/* NPA queue interrupt context hardware structure */
-struct npa_qint_hw_s {
-	uint32_t count      : 22;
-	uint32_t rsvd_30_22 : 9;
-	uint32_t ena        : 1;
-};
-
-#endif /* __OTX2_NPA_HW_H__ */
diff --git a/drivers/common/octeontx2/hw/otx2_npc.h b/drivers/common/octeontx2/hw/otx2_npc.h
deleted file mode 100644
index b4e3c1eedc..0000000000
--- a/drivers/common/octeontx2/hw/otx2_npc.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_NPC_HW_H__
-#define __OTX2_NPC_HW_H__
-
-/* Register offsets */
-
-#define NPC_AF_CFG                                   (0x0ull)
-#define NPC_AF_ACTIVE_PC                             (0x10ull)
-#define NPC_AF_CONST                                 (0x20ull)
-#define NPC_AF_CONST1                                (0x30ull)
-#define NPC_AF_BLK_RST                               (0x40ull)
-#define NPC_AF_MCAM_SCRUB_CTL                        (0xa0ull)
-#define NPC_AF_KCAM_SCRUB_CTL                        (0xb0ull)
-#define NPC_AF_KPUX_CFG(a)                           \
-	(0x500ull | (uint64_t)(a) << 3)
-#define NPC_AF_PCK_CFG                               (0x600ull)
-#define NPC_AF_PCK_DEF_OL2                           (0x610ull)
-#define NPC_AF_PCK_DEF_OIP4                          (0x620ull)
-#define NPC_AF_PCK_DEF_OIP6                          (0x630ull)
-#define NPC_AF_PCK_DEF_IIP4                          (0x640ull)
-#define NPC_AF_KEX_LDATAX_FLAGS_CFG(a)               \
-	(0x800ull | (uint64_t)(a) << 3)
-#define NPC_AF_INTFX_KEX_CFG(a)                      \
-	(0x1010ull | (uint64_t)(a) << 8)
-#define NPC_AF_PKINDX_ACTION0(a)                     \
-	(0x80000ull | (uint64_t)(a) << 6)
-#define NPC_AF_PKINDX_ACTION1(a)                     \
-	(0x80008ull | (uint64_t)(a) << 6)
-#define NPC_AF_PKINDX_CPI_DEFX(a, b)                 \
-	(0x80020ull | (uint64_t)(a) << 6 | (uint64_t)(b) << 3)
-#define NPC_AF_CHLEN90B_PKIND                        (0x3bull)
-#define NPC_AF_KPUX_ENTRYX_CAMX(a, b, c)             \
-	(0x100000ull | (uint64_t)(a) << 14 | (uint64_t)(b) << 6 | \
-	(uint64_t)(c) << 3)
-#define NPC_AF_KPUX_ENTRYX_ACTION0(a, b)             \
-	(0x100020ull | (uint64_t)(a) << 14 | (uint64_t)(b) << 6)
-#define NPC_AF_KPUX_ENTRYX_ACTION1(a, b)             \
-	(0x100028ull | (uint64_t)(a) << 14 | (uint64_t)(b) << 6)
-#define NPC_AF_KPUX_ENTRY_DISX(a, b)                 \
-	(0x180000ull | (uint64_t)(a) << 6 | (uint64_t)(b) << 3)
-#define NPC_AF_CPIX_CFG(a)                           \
-	(0x200000ull | (uint64_t)(a) << 3)
-#define NPC_AF_INTFX_LIDX_LTX_LDX_CFG(a, b, c, d)    \
-	(0x900000ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 12 | \
-	(uint64_t)(c) << 5 | (uint64_t)(d) << 3)
-#define NPC_AF_INTFX_LDATAX_FLAGSX_CFG(a, b, c)      \
-	(0x980000ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 12 | \
-	(uint64_t)(c) << 3)
-#define NPC_AF_MCAMEX_BANKX_CAMX_INTF(a, b, c)       \
-	(0x1000000ull | (uint64_t)(a) << 10 | (uint64_t)(b) << 6 | \
-	(uint64_t)(c) << 3)
-#define NPC_AF_MCAMEX_BANKX_CAMX_W0(a, b, c)         \
-	(0x1000010ull | (uint64_t)(a) << 10 | (uint64_t)(b) << 6 | \
-	(uint64_t)(c) << 3)
-#define NPC_AF_MCAMEX_BANKX_CAMX_W1(a, b, c)         \
-	(0x1000020ull | (uint64_t)(a) << 10 | (uint64_t)(b) << 6 | \
-	(uint64_t)(c) << 3)
-#define NPC_AF_MCAMEX_BANKX_CFG(a, b)                \
-	(0x1800000ull | (uint64_t)(a) << 8 | (uint64_t)(b) << 4)
-#define NPC_AF_MCAMEX_BANKX_STAT_ACT(a, b)           \
-	(0x1880000ull | (uint64_t)(a) << 8 | (uint64_t)(b) << 4)
-#define NPC_AF_MATCH_STATX(a)                        \
-	(0x1880008ull | (uint64_t)(a) << 8)
-#define NPC_AF_INTFX_MISS_STAT_ACT(a)                \
-	(0x1880040ull + (uint64_t)(a) * 0x8)
-#define NPC_AF_MCAMEX_BANKX_ACTION(a, b)             \
-	(0x1900000ull | (uint64_t)(a) << 8 | (uint64_t)(b) << 4)
-#define NPC_AF_MCAMEX_BANKX_TAG_ACT(a, b)            \
-	(0x1900008ull | (uint64_t)(a) << 8 | (uint64_t)(b) << 4)
-#define NPC_AF_INTFX_MISS_ACT(a)                     \
-	(0x1a00000ull | (uint64_t)(a) << 4)
-#define NPC_AF_INTFX_MISS_TAG_ACT(a)                 \
-	(0x1b00008ull | (uint64_t)(a) << 4)
-#define NPC_AF_MCAM_BANKX_HITX(a, b)                 \
-	(0x1c80000ull | (uint64_t)(a) << 8 | (uint64_t)(b) << 4)
-#define NPC_AF_LKUP_CTL                              (0x2000000ull)
-#define NPC_AF_LKUP_DATAX(a)                         \
-	(0x2000200ull | (uint64_t)(a) << 4)
-#define NPC_AF_LKUP_RESULTX(a)                       \
-	(0x2000400ull | (uint64_t)(a) << 4)
-#define NPC_AF_INTFX_STAT(a)                         \
-	(0x2000800ull | (uint64_t)(a) << 4)
-#define NPC_AF_DBG_CTL                               (0x3000000ull)
-#define NPC_AF_DBG_STATUS                            (0x3000010ull)
-#define NPC_AF_KPUX_DBG(a)                           \
-	(0x3000020ull | (uint64_t)(a) << 8)
-#define NPC_AF_IKPU_ERR_CTL                          (0x3000080ull)
-#define NPC_AF_KPUX_ERR_CTL(a)                       \
-	(0x30000a0ull | (uint64_t)(a) << 8)
-#define NPC_AF_MCAM_DBG                              (0x3001000ull)
-#define NPC_AF_DBG_DATAX(a)                          \
-	(0x3001400ull | (uint64_t)(a) << 4)
-#define NPC_AF_DBG_RESULTX(a)                        \
-	(0x3001800ull | (uint64_t)(a) << 4)
-
-
-/* Enum offsets */
-
-#define NPC_INTF_NIX0_RX    (0x0ull)
-#define NPC_INTF_NIX0_TX    (0x1ull)
-
-#define NPC_LKUPOP_PKT      (0x0ull)
-#define NPC_LKUPOP_KEY      (0x1ull)
-
-#define NPC_MCAM_KEY_X1     (0x0ull)
-#define NPC_MCAM_KEY_X2     (0x1ull)
-#define NPC_MCAM_KEY_X4     (0x2ull)
-
-enum NPC_ERRLEV_E {
-	NPC_ERRLEV_RE = 0,
-	NPC_ERRLEV_LA = 1,
-	NPC_ERRLEV_LB = 2,
-	NPC_ERRLEV_LC = 3,
-	NPC_ERRLEV_LD = 4,
-	NPC_ERRLEV_LE = 5,
-	NPC_ERRLEV_LF = 6,
-	NPC_ERRLEV_LG = 7,
-	NPC_ERRLEV_LH = 8,
-	NPC_ERRLEV_R9 = 9,
-	NPC_ERRLEV_R10 = 10,
-	NPC_ERRLEV_R11 = 11,
-	NPC_ERRLEV_R12 = 12,
-	NPC_ERRLEV_R13 = 13,
-	NPC_ERRLEV_R14 = 14,
-	NPC_ERRLEV_NIX = 15,
-	NPC_ERRLEV_ENUM_LAST = 16,
-};
-
-enum npc_kpu_err_code {
-	NPC_EC_NOERR = 0, /* has to be zero */
-	NPC_EC_UNK,
-	NPC_EC_IH_LENGTH,
-	NPC_EC_EDSA_UNK,
-	NPC_EC_L2_K1,
-	NPC_EC_L2_K2,
-	NPC_EC_L2_K3,
-	NPC_EC_L2_K3_ETYPE_UNK,
-	NPC_EC_L2_K4,
-	NPC_EC_MPLS_2MANY,
-	NPC_EC_MPLS_UNK,
-	NPC_EC_NSH_UNK,
-	NPC_EC_IP_TTL_0,
-	NPC_EC_IP_FRAG_OFFSET_1,
-	NPC_EC_IP_VER,
-	NPC_EC_IP6_HOP_0,
-	NPC_EC_IP6_VER,
-	NPC_EC_TCP_FLAGS_FIN_ONLY,
-	NPC_EC_TCP_FLAGS_ZERO,
-	NPC_EC_TCP_FLAGS_RST_FIN,
-	NPC_EC_TCP_FLAGS_URG_SYN,
-	NPC_EC_TCP_FLAGS_RST_SYN,
-	NPC_EC_TCP_FLAGS_SYN_FIN,
-	NPC_EC_VXLAN,
-	NPC_EC_NVGRE,
-	NPC_EC_GRE,
-	NPC_EC_GRE_VER1,
-	NPC_EC_L4,
-	NPC_EC_OIP4_CSUM,
-	NPC_EC_IIP4_CSUM,
-	NPC_EC_LAST /* has to be the last item */
-};
-
-enum NPC_LID_E {
-	NPC_LID_LA = 0,
-	NPC_LID_LB,
-	NPC_LID_LC,
-	NPC_LID_LD,
-	NPC_LID_LE,
-	NPC_LID_LF,
-	NPC_LID_LG,
-	NPC_LID_LH,
-};
-
-#define NPC_LT_NA 0
-
-enum npc_kpu_la_ltype {
-	NPC_LT_LA_8023 = 1,
-	NPC_LT_LA_ETHER,
-	NPC_LT_LA_IH_NIX_ETHER,
-	NPC_LT_LA_IH_8_ETHER,
-	NPC_LT_LA_IH_4_ETHER,
-	NPC_LT_LA_IH_2_ETHER,
-	NPC_LT_LA_HIGIG2_ETHER,
-	NPC_LT_LA_IH_NIX_HIGIG2_ETHER,
-	NPC_LT_LA_CUSTOM_L2_90B_ETHER,
-	NPC_LT_LA_CPT_HDR,
-	NPC_LT_LA_CUSTOM_L2_24B_ETHER,
-	NPC_LT_LA_CUSTOM0 = 0xE,
-	NPC_LT_LA_CUSTOM1 = 0xF,
-};
-
-enum npc_kpu_lb_ltype {
-	NPC_LT_LB_ETAG = 1,
-	NPC_LT_LB_CTAG,
-	NPC_LT_LB_STAG_QINQ,
-	NPC_LT_LB_BTAG,
-	NPC_LT_LB_ITAG,
-	NPC_LT_LB_DSA,
-	NPC_LT_LB_DSA_VLAN,
-	NPC_LT_LB_EDSA,
-	NPC_LT_LB_EDSA_VLAN,
-	NPC_LT_LB_EXDSA,
-	NPC_LT_LB_EXDSA_VLAN,
-	NPC_LT_LB_FDSA,
-	NPC_LT_LB_VLAN_EXDSA,
-	NPC_LT_LB_CUSTOM0 = 0xE,
-	NPC_LT_LB_CUSTOM1 = 0xF,
-};
-
-enum npc_kpu_lc_ltype {
-	NPC_LT_LC_PTP = 1,
-	NPC_LT_LC_IP,
-	NPC_LT_LC_IP_OPT,
-	NPC_LT_LC_IP6,
-	NPC_LT_LC_IP6_EXT,
-	NPC_LT_LC_ARP,
-	NPC_LT_LC_RARP,
-	NPC_LT_LC_MPLS,
-	NPC_LT_LC_NSH,
-	NPC_LT_LC_FCOE,
-	NPC_LT_LC_NGIO,
-	NPC_LT_LC_CUSTOM0 = 0xE,
-	NPC_LT_LC_CUSTOM1 = 0xF,
-};
-
-/* Don't modify Ltypes up to SCTP, otherwise it will
- * effect flow tag calculation and thus RSS.
- */
-enum npc_kpu_ld_ltype {
-	NPC_LT_LD_TCP = 1,
-	NPC_LT_LD_UDP,
-	NPC_LT_LD_ICMP,
-	NPC_LT_LD_SCTP,
-	NPC_LT_LD_ICMP6,
-	NPC_LT_LD_CUSTOM0,
-	NPC_LT_LD_CUSTOM1,
-	NPC_LT_LD_IGMP = 8,
-	NPC_LT_LD_AH,
-	NPC_LT_LD_GRE,
-	NPC_LT_LD_NVGRE,
-	NPC_LT_LD_NSH,
-	NPC_LT_LD_TU_MPLS_IN_NSH,
-	NPC_LT_LD_TU_MPLS_IN_IP,
-};
-
-enum npc_kpu_le_ltype {
-	NPC_LT_LE_VXLAN = 1,
-	NPC_LT_LE_GENEVE,
-	NPC_LT_LE_ESP,
-	NPC_LT_LE_GTPU = 4,
-	NPC_LT_LE_VXLANGPE,
-	NPC_LT_LE_GTPC,
-	NPC_LT_LE_NSH,
-	NPC_LT_LE_TU_MPLS_IN_GRE,
-	NPC_LT_LE_TU_NSH_IN_GRE,
-	NPC_LT_LE_TU_MPLS_IN_UDP,
-	NPC_LT_LE_CUSTOM0 = 0xE,
-	NPC_LT_LE_CUSTOM1 = 0xF,
-};
-
-enum npc_kpu_lf_ltype {
-	NPC_LT_LF_TU_ETHER = 1,
-	NPC_LT_LF_TU_PPP,
-	NPC_LT_LF_TU_MPLS_IN_VXLANGPE,
-	NPC_LT_LF_TU_NSH_IN_VXLANGPE,
-	NPC_LT_LF_TU_MPLS_IN_NSH,
-	NPC_LT_LF_TU_3RD_NSH,
-	NPC_LT_LF_CUSTOM0 = 0xE,
-	NPC_LT_LF_CUSTOM1 = 0xF,
-};
-
-enum npc_kpu_lg_ltype {
-	NPC_LT_LG_TU_IP = 1,
-	NPC_LT_LG_TU_IP6,
-	NPC_LT_LG_TU_ARP,
-	NPC_LT_LG_TU_ETHER_IN_NSH,
-	NPC_LT_LG_CUSTOM0 = 0xE,
-	NPC_LT_LG_CUSTOM1 = 0xF,
-};
-
-/* Don't modify Ltypes up to SCTP, otherwise it will
- * effect flow tag calculation and thus RSS.
- */
-enum npc_kpu_lh_ltype {
-	NPC_LT_LH_TU_TCP = 1,
-	NPC_LT_LH_TU_UDP,
-	NPC_LT_LH_TU_ICMP,
-	NPC_LT_LH_TU_SCTP,
-	NPC_LT_LH_TU_ICMP6,
-	NPC_LT_LH_TU_IGMP = 8,
-	NPC_LT_LH_TU_ESP,
-	NPC_LT_LH_TU_AH,
-	NPC_LT_LH_CUSTOM0 = 0xE,
-	NPC_LT_LH_CUSTOM1 = 0xF,
-};
-
-/* Structures definitions */
-struct npc_kpu_profile_cam {
-	uint8_t state;
-	uint8_t state_mask;
-	uint16_t dp0;
-	uint16_t dp0_mask;
-	uint16_t dp1;
-	uint16_t dp1_mask;
-	uint16_t dp2;
-	uint16_t dp2_mask;
-};
-
-struct npc_kpu_profile_action {
-	uint8_t errlev;
-	uint8_t errcode;
-	uint8_t dp0_offset;
-	uint8_t dp1_offset;
-	uint8_t dp2_offset;
-	uint8_t bypass_count;
-	uint8_t parse_done;
-	uint8_t next_state;
-	uint8_t ptr_advance;
-	uint8_t cap_ena;
-	uint8_t lid;
-	uint8_t ltype;
-	uint8_t flags;
-	uint8_t offset;
-	uint8_t mask;
-	uint8_t right;
-	uint8_t shift;
-};
-
-struct npc_kpu_profile {
-	int cam_entries;
-	int action_entries;
-	struct npc_kpu_profile_cam *cam;
-	struct npc_kpu_profile_action *action;
-};
-
-/* NPC KPU register formats */
-struct npc_kpu_cam {
-	uint64_t dp0_data       : 16;
-	uint64_t dp1_data       : 16;
-	uint64_t dp2_data       : 16;
-	uint64_t state          : 8;
-	uint64_t rsvd_63_56     : 8;
-};
-
-struct npc_kpu_action0 {
-	uint64_t var_len_shift  : 3;
-	uint64_t var_len_right  : 1;
-	uint64_t var_len_mask   : 8;
-	uint64_t var_len_offset : 8;
-	uint64_t ptr_advance    : 8;
-	uint64_t capture_flags  : 8;
-	uint64_t capture_ltype  : 4;
-	uint64_t capture_lid    : 3;
-	uint64_t rsvd_43        : 1;
-	uint64_t next_state     : 8;
-	uint64_t parse_done     : 1;
-	uint64_t capture_ena    : 1;
-	uint64_t byp_count      : 3;
-	uint64_t rsvd_63_57     : 7;
-};
-
-struct npc_kpu_action1 {
-	uint64_t dp0_offset     : 8;
-	uint64_t dp1_offset     : 8;
-	uint64_t dp2_offset     : 8;
-	uint64_t errcode        : 8;
-	uint64_t errlev         : 4;
-	uint64_t rsvd_63_36     : 28;
-};
-
-struct npc_kpu_pkind_cpi_def {
-	uint64_t cpi_base       : 10;
-	uint64_t rsvd_11_10     : 2;
-	uint64_t add_shift      : 3;
-	uint64_t rsvd_15        : 1;
-	uint64_t add_mask       : 8;
-	uint64_t add_offset     : 8;
-	uint64_t flags_mask     : 8;
-	uint64_t flags_match    : 8;
-	uint64_t ltype_mask     : 4;
-	uint64_t ltype_match    : 4;
-	uint64_t lid            : 3;
-	uint64_t rsvd_62_59     : 4;
-	uint64_t ena            : 1;
-};
-
-struct nix_rx_action {
-	uint64_t op      :4;
-	uint64_t pf_func     :16;
-	uint64_t index       :20;
-	uint64_t match_id    :16;
-	uint64_t flow_key_alg    :5;
-	uint64_t rsvd_63_61  :3;
-};
-
-struct nix_tx_action {
-	uint64_t	op		:4;
-	uint64_t	rsvd_11_4	:8;
-	uint64_t	index		:20;
-	uint64_t	match_id	:16;
-	uint64_t	rsvd_63_48	:16;
-};
-
-/* NPC layer parse information structure */
-struct npc_layer_info_s {
-	uint32_t lptr       : 8;
-	uint32_t flags      : 8;
-	uint32_t ltype      : 4;
-	uint32_t rsvd_31_20 : 12;
-};
-
-/* NPC layer mcam search key extract structure */
-struct npc_layer_kex_s {
-	uint16_t flags      : 8;
-	uint16_t ltype      : 4;
-	uint16_t rsvd_15_12 : 4;
-};
-
-/* NPC mcam search key x1 structure */
-struct npc_mcam_key_x1_s {
-	uint64_t intf         : 2;
-	uint64_t rsvd_63_2    : 62;
-	uint64_t kw0          : 64;  /* W1 */
-	uint64_t kw1          : 48;
-	uint64_t rsvd_191_176 : 16;
-};
-
-/* NPC mcam search key x2 structure */
-struct npc_mcam_key_x2_s {
-	uint64_t intf         : 2;
-	uint64_t rsvd_63_2    : 62;
-	uint64_t kw0          : 64;  /* W1 */
-	uint64_t kw1          : 64;  /* W2 */
-	uint64_t kw2          : 64;  /* W3 */
-	uint64_t kw3          : 32;
-	uint64_t rsvd_319_288 : 32;
-};
-
-/* NPC mcam search key x4 structure */
-struct npc_mcam_key_x4_s {
-	uint64_t intf      : 2;
-	uint64_t rsvd_63_2 : 62;
-	uint64_t kw0       : 64;     /* W1 */
-	uint64_t kw1       : 64;     /* W2 */
-	uint64_t kw2       : 64;     /* W3 */
-	uint64_t kw3       : 64;     /* W4 */
-	uint64_t kw4       : 64;     /* W5 */
-	uint64_t kw5       : 64;     /* W6 */
-	uint64_t kw6       : 64;     /* W7 */
-};
-
-/* NPC parse key extract structure */
-struct npc_parse_kex_s {
-	uint64_t chan         : 12;
-	uint64_t errlev       : 4;
-	uint64_t errcode      : 8;
-	uint64_t l2m          : 1;
-	uint64_t l2b          : 1;
-	uint64_t l3m          : 1;
-	uint64_t l3b          : 1;
-	uint64_t la           : 12;
-	uint64_t lb           : 12;
-	uint64_t lc           : 12;
-	uint64_t ld           : 12;
-	uint64_t le           : 12;
-	uint64_t lf           : 12;
-	uint64_t lg           : 12;
-	uint64_t lh           : 12;
-	uint64_t rsvd_127_124 : 4;
-};
-
-/* NPC result structure */
-struct npc_result_s {
-	uint64_t intf         : 2;
-	uint64_t pkind        : 6;
-	uint64_t chan         : 12;
-	uint64_t errlev       : 4;
-	uint64_t errcode      : 8;
-	uint64_t l2m          : 1;
-	uint64_t l2b          : 1;
-	uint64_t l3m          : 1;
-	uint64_t l3b          : 1;
-	uint64_t eoh_ptr      : 8;
-	uint64_t rsvd_63_44   : 20;
-	uint64_t action       : 64;  /* W1 */
-	uint64_t vtag_action  : 64;  /* W2 */
-	uint64_t la           : 20;
-	uint64_t lb           : 20;
-	uint64_t lc           : 20;
-	uint64_t rsvd_255_252 : 4;
-	uint64_t ld           : 20;
-	uint64_t le           : 20;
-	uint64_t lf           : 20;
-	uint64_t rsvd_319_316 : 4;
-	uint64_t lg           : 20;
-	uint64_t lh           : 20;
-	uint64_t rsvd_383_360 : 24;
-};
-
-#endif /* __OTX2_NPC_HW_H__ */
diff --git a/drivers/common/octeontx2/hw/otx2_ree.h b/drivers/common/octeontx2/hw/otx2_ree.h
deleted file mode 100644
index b7481f125f..0000000000
--- a/drivers/common/octeontx2/hw/otx2_ree.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_REE_HW_H__
-#define __OTX2_REE_HW_H__
-
-/* REE BAR0*/
-#define REE_AF_REEXM_MAX_MATCH		(0x80c8)
-
-/* REE BAR02 */
-#define REE_LF_MISC_INT                 (0x300)
-#define REE_LF_DONE_INT                 (0x120)
-
-#define REE_AF_QUEX_GMCTL(a)            (0x800 | (a) << 3)
-
-#define REE_AF_INT_VEC_RAS          (0x0ull)
-#define REE_AF_INT_VEC_RVU          (0x1ull)
-#define REE_AF_INT_VEC_QUE_DONE     (0x2ull)
-#define REE_AF_INT_VEC_AQ           (0x3ull)
-
-/* ENUMS */
-
-#define REE_LF_INT_VEC_QUE_DONE	(0x0ull)
-#define REE_LF_INT_VEC_MISC		(0x1ull)
-
-#endif /* __OTX2_REE_HW_H__*/
diff --git a/drivers/common/octeontx2/hw/otx2_rvu.h b/drivers/common/octeontx2/hw/otx2_rvu.h
deleted file mode 100644
index b98dbcb1cd..0000000000
--- a/drivers/common/octeontx2/hw/otx2_rvu.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_RVU_HW_H__
-#define __OTX2_RVU_HW_H__
-
-/* Register offsets */
-
-#define RVU_AF_MSIXTR_BASE                  (0x10ull)
-#define RVU_AF_BLK_RST                      (0x30ull)
-#define RVU_AF_PF_BAR4_ADDR                 (0x40ull)
-#define RVU_AF_RAS                          (0x100ull)
-#define RVU_AF_RAS_W1S                      (0x108ull)
-#define RVU_AF_RAS_ENA_W1S                  (0x110ull)
-#define RVU_AF_RAS_ENA_W1C                  (0x118ull)
-#define RVU_AF_GEN_INT                      (0x120ull)
-#define RVU_AF_GEN_INT_W1S                  (0x128ull)
-#define RVU_AF_GEN_INT_ENA_W1S              (0x130ull)
-#define RVU_AF_GEN_INT_ENA_W1C              (0x138ull)
-#define RVU_AF_AFPFX_MBOXX(a, b)            \
-	(0x2000ull | (uint64_t)(a) << 4 | (uint64_t)(b) << 3)
-#define RVU_AF_PFME_STATUS                  (0x2800ull)
-#define RVU_AF_PFTRPEND                     (0x2810ull)
-#define RVU_AF_PFTRPEND_W1S                 (0x2820ull)
-#define RVU_AF_PF_RST                       (0x2840ull)
-#define RVU_AF_HWVF_RST                     (0x2850ull)
-#define RVU_AF_PFAF_MBOX_INT                (0x2880ull)
-#define RVU_AF_PFAF_MBOX_INT_W1S            (0x2888ull)
-#define RVU_AF_PFAF_MBOX_INT_ENA_W1S        (0x2890ull)
-#define RVU_AF_PFAF_MBOX_INT_ENA_W1C        (0x2898ull)
-#define RVU_AF_PFFLR_INT                    (0x28a0ull)
-#define RVU_AF_PFFLR_INT_W1S                (0x28a8ull)
-#define RVU_AF_PFFLR_INT_ENA_W1S            (0x28b0ull)
-#define RVU_AF_PFFLR_INT_ENA_W1C            (0x28b8ull)
-#define RVU_AF_PFME_INT                     (0x28c0ull)
-#define RVU_AF_PFME_INT_W1S                 (0x28c8ull)
-#define RVU_AF_PFME_INT_ENA_W1S             (0x28d0ull)
-#define RVU_AF_PFME_INT_ENA_W1C             (0x28d8ull)
-#define RVU_PRIV_CONST                      (0x8000000ull)
-#define RVU_PRIV_GEN_CFG                    (0x8000010ull)
-#define RVU_PRIV_CLK_CFG                    (0x8000020ull)
-#define RVU_PRIV_ACTIVE_PC                  (0x8000030ull)
-#define RVU_PRIV_PFX_CFG(a)                 (0x8000100ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_MSIX_CFG(a)            (0x8000110ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_ID_CFG(a)              (0x8000120ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_INT_CFG(a)             (0x8000200ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_NIXX_CFG(a, b)         \
-	(0x8000300ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 3)
-#define RVU_PRIV_PFX_NPA_CFG(a)             (0x8000310ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_SSO_CFG(a)             (0x8000320ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_SSOW_CFG(a)            (0x8000330ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_TIM_CFG(a)             (0x8000340ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_PFX_CPTX_CFG(a, b)         \
-	(0x8000350ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 3)
-#define RVU_PRIV_BLOCK_TYPEX_REV(a)         (0x8000400ull | (uint64_t)(a) << 3)
-#define RVU_PRIV_HWVFX_INT_CFG(a)           (0x8001280ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_HWVFX_NIXX_CFG(a, b)       \
-	(0x8001300ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 3)
-#define RVU_PRIV_HWVFX_NPA_CFG(a)           (0x8001310ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_HWVFX_SSO_CFG(a)           (0x8001320ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_HWVFX_SSOW_CFG(a)          (0x8001330ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_HWVFX_TIM_CFG(a)           (0x8001340ull | (uint64_t)(a) << 16)
-#define RVU_PRIV_HWVFX_CPTX_CFG(a, b)       \
-	(0x8001350ull | (uint64_t)(a) << 16 | (uint64_t)(b) << 3)
-
-#define RVU_PF_VFX_PFVF_MBOXX(a, b)         \
-	(0x0ull | (uint64_t)(a) << 12 | (uint64_t)(b) << 3)
-#define RVU_PF_VF_BAR4_ADDR                 (0x10ull)
-#define RVU_PF_BLOCK_ADDRX_DISC(a)          (0x200ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFME_STATUSX(a)              (0x800ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFTRPENDX(a)                 (0x820ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFTRPEND_W1SX(a)             (0x840ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFPF_MBOX_INTX(a)            (0x880ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFPF_MBOX_INT_W1SX(a)        (0x8a0ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFPF_MBOX_INT_ENA_W1SX(a)    (0x8c0ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFPF_MBOX_INT_ENA_W1CX(a)    (0x8e0ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFFLR_INTX(a)                (0x900ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFFLR_INT_W1SX(a)            (0x920ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFFLR_INT_ENA_W1SX(a)        (0x940ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFFLR_INT_ENA_W1CX(a)        (0x960ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFME_INTX(a)                 (0x980ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFME_INT_W1SX(a)             (0x9a0ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFME_INT_ENA_W1SX(a)         (0x9c0ull | (uint64_t)(a) << 3)
-#define RVU_PF_VFME_INT_ENA_W1CX(a)         (0x9e0ull | (uint64_t)(a) << 3)
-#define RVU_PF_PFAF_MBOXX(a)                (0xc00ull | (uint64_t)(a) << 3)
-#define RVU_PF_INT                          (0xc20ull)
-#define RVU_PF_INT_W1S                      (0xc28ull)
-#define RVU_PF_INT_ENA_W1S                  (0xc30ull)
-#define RVU_PF_INT_ENA_W1C                  (0xc38ull)
-#define RVU_PF_MSIX_VECX_ADDR(a)            (0x80000ull | (uint64_t)(a) << 4)
-#define RVU_PF_MSIX_VECX_CTL(a)             (0x80008ull | (uint64_t)(a) << 4)
-#define RVU_PF_MSIX_PBAX(a)                 (0xf0000ull | (uint64_t)(a) << 3)
-#define RVU_VF_VFPF_MBOXX(a)                (0x0ull | (uint64_t)(a) << 3)
-#define RVU_VF_INT                          (0x20ull)
-#define RVU_VF_INT_W1S                      (0x28ull)
-#define RVU_VF_INT_ENA_W1S                  (0x30ull)
-#define RVU_VF_INT_ENA_W1C                  (0x38ull)
-#define RVU_VF_BLOCK_ADDRX_DISC(a)          (0x200ull | (uint64_t)(a) << 3)
-#define RVU_VF_MSIX_VECX_ADDR(a)            (0x80000ull | (uint64_t)(a) << 4)
-#define RVU_VF_MSIX_VECX_CTL(a)             (0x80008ull | (uint64_t)(a) << 4)
-#define RVU_VF_MSIX_PBAX(a)                 (0xf0000ull | (uint64_t)(a) << 3)
-
-
-/* Enum offsets */
-
-#define RVU_BAR_RVU_PF_END_BAR0             (0x84f000000000ull)
-#define RVU_BAR_RVU_PF_START_BAR0           (0x840000000000ull)
-#define RVU_BAR_RVU_PFX_FUNCX_BAR2(a, b)    \
-	(0x840200000000ull | ((uint64_t)(a) << 36) | ((uint64_t)(b) << 25))
-
-#define RVU_AF_INT_VEC_POISON               (0x0ull)
-#define RVU_AF_INT_VEC_PFFLR                (0x1ull)
-#define RVU_AF_INT_VEC_PFME                 (0x2ull)
-#define RVU_AF_INT_VEC_GEN                  (0x3ull)
-#define RVU_AF_INT_VEC_MBOX                 (0x4ull)
-
-#define RVU_BLOCK_TYPE_RVUM                 (0x0ull)
-#define RVU_BLOCK_TYPE_LMT                  (0x2ull)
-#define RVU_BLOCK_TYPE_NIX                  (0x3ull)
-#define RVU_BLOCK_TYPE_NPA                  (0x4ull)
-#define RVU_BLOCK_TYPE_NPC                  (0x5ull)
-#define RVU_BLOCK_TYPE_SSO                  (0x6ull)
-#define RVU_BLOCK_TYPE_SSOW                 (0x7ull)
-#define RVU_BLOCK_TYPE_TIM                  (0x8ull)
-#define RVU_BLOCK_TYPE_CPT                  (0x9ull)
-#define RVU_BLOCK_TYPE_NDC                  (0xaull)
-#define RVU_BLOCK_TYPE_DDF                  (0xbull)
-#define RVU_BLOCK_TYPE_ZIP                  (0xcull)
-#define RVU_BLOCK_TYPE_RAD                  (0xdull)
-#define RVU_BLOCK_TYPE_DFA                  (0xeull)
-#define RVU_BLOCK_TYPE_HNA                  (0xfull)
-#define RVU_BLOCK_TYPE_REE                  (0xeull)
-
-#define RVU_BLOCK_ADDR_RVUM                 (0x0ull)
-#define RVU_BLOCK_ADDR_LMT                  (0x1ull)
-#define RVU_BLOCK_ADDR_NPA                  (0x3ull)
-#define RVU_BLOCK_ADDR_NIX0                 (0x4ull)
-#define RVU_BLOCK_ADDR_NIX1                 (0x5ull)
-#define RVU_BLOCK_ADDR_NPC                  (0x6ull)
-#define RVU_BLOCK_ADDR_SSO                  (0x7ull)
-#define RVU_BLOCK_ADDR_SSOW                 (0x8ull)
-#define RVU_BLOCK_ADDR_TIM                  (0x9ull)
-#define RVU_BLOCK_ADDR_CPT0                 (0xaull)
-#define RVU_BLOCK_ADDR_CPT1                 (0xbull)
-#define RVU_BLOCK_ADDR_NDC0                 (0xcull)
-#define RVU_BLOCK_ADDR_NDC1                 (0xdull)
-#define RVU_BLOCK_ADDR_NDC2                 (0xeull)
-#define RVU_BLOCK_ADDR_R_END                (0x1full)
-#define RVU_BLOCK_ADDR_R_START              (0x14ull)
-#define RVU_BLOCK_ADDR_REE0                 (0x14ull)
-#define RVU_BLOCK_ADDR_REE1                 (0x15ull)
-
-#define RVU_VF_INT_VEC_MBOX                 (0x0ull)
-
-#define RVU_PF_INT_VEC_AFPF_MBOX            (0x6ull)
-#define RVU_PF_INT_VEC_VFFLR0               (0x0ull)
-#define RVU_PF_INT_VEC_VFFLR1               (0x1ull)
-#define RVU_PF_INT_VEC_VFME0                (0x2ull)
-#define RVU_PF_INT_VEC_VFME1                (0x3ull)
-#define RVU_PF_INT_VEC_VFPF_MBOX0           (0x4ull)
-#define RVU_PF_INT_VEC_VFPF_MBOX1           (0x5ull)
-
-
-#define AF_BAR2_ALIASX_SIZE		(0x100000ull)
-
-#define TIM_AF_BAR2_SEL			(0x9000000ull)
-#define SSO_AF_BAR2_SEL			(0x9000000ull)
-#define NIX_AF_BAR2_SEL			(0x9000000ull)
-#define SSOW_AF_BAR2_SEL		(0x9000000ull)
-#define NPA_AF_BAR2_SEL			(0x9000000ull)
-#define CPT_AF_BAR2_SEL			(0x9000000ull)
-#define RVU_AF_BAR2_SEL			(0x9000000ull)
-#define REE_AF_BAR2_SEL			(0x9000000ull)
-
-#define AF_BAR2_ALIASX(a, b) \
-	(0x9100000ull | (uint64_t)(a) << 12 | (uint64_t)(b))
-#define TIM_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(a, b)
-#define SSO_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(a, b)
-#define NIX_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(0, b)
-#define SSOW_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(a, b)
-#define NPA_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(0, b)
-#define CPT_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(a, b)
-#define RVU_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(a, b)
-#define REE_AF_BAR2_ALIASX(a, b)		AF_BAR2_ALIASX(a, b)
-
-/* Structures definitions */
-
-/* RVU admin function register address structure */
-struct rvu_af_addr_s {
-	uint64_t addr       : 28;
-	uint64_t block      : 5;
-	uint64_t rsvd_63_33 : 31;
-};
-
-/* RVU function-unique address structure */
-struct rvu_func_addr_s {
-	uint32_t addr       : 12;
-	uint32_t lf_slot    : 8;
-	uint32_t block      : 5;
-	uint32_t rsvd_31_25 : 7;
-};
-
-/* RVU msi-x vector structure */
-struct rvu_msix_vec_s {
-	uint64_t addr        : 64;   /* W0 */
-	uint64_t data        : 32;
-	uint64_t mask        : 1;
-	uint64_t pend        : 1;
-	uint64_t rsvd_127_98 : 30;
-};
-
-/* RVU pf function identification structure */
-struct rvu_pf_func_s {
-	uint16_t func : 10;
-	uint16_t pf   : 6;
-};
-
-#endif /* __OTX2_RVU_HW_H__ */
diff --git a/drivers/common/octeontx2/hw/otx2_sdp.h b/drivers/common/octeontx2/hw/otx2_sdp.h
deleted file mode 100644
index 1e690f8b32..0000000000
--- a/drivers/common/octeontx2/hw/otx2_sdp.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_SDP_HW_H_
-#define __OTX2_SDP_HW_H_
-
-/* SDP VF IOQs */
-#define SDP_MIN_RINGS_PER_VF        (1)
-#define SDP_MAX_RINGS_PER_VF        (8)
-
-/* SDP VF IQ configuration */
-#define SDP_VF_MAX_IQ_DESCRIPTORS   (512)
-#define SDP_VF_MIN_IQ_DESCRIPTORS   (128)
-
-#define SDP_VF_DB_MIN               (1)
-#define SDP_VF_DB_TIMEOUT           (1)
-#define SDP_VF_INTR_THRESHOLD       (0xFFFFFFFF)
-
-#define SDP_VF_64BYTE_INSTR         (64)
-#define SDP_VF_32BYTE_INSTR         (32)
-
-/* SDP VF OQ configuration */
-#define SDP_VF_MAX_OQ_DESCRIPTORS   (512)
-#define SDP_VF_MIN_OQ_DESCRIPTORS   (128)
-#define SDP_VF_OQ_BUF_SIZE          (2048)
-#define SDP_VF_OQ_REFIL_THRESHOLD   (16)
-
-#define SDP_VF_OQ_INFOPTR_MODE      (1)
-#define SDP_VF_OQ_BUFPTR_MODE       (0)
-
-#define SDP_VF_OQ_INTR_PKT          (1)
-#define SDP_VF_OQ_INTR_TIME         (10)
-#define SDP_VF_CFG_IO_QUEUES        SDP_MAX_RINGS_PER_VF
-
-/* Wait time in milliseconds for FLR */
-#define SDP_VF_PCI_FLR_WAIT         (100)
-#define SDP_VF_BUSY_LOOP_COUNT      (10000)
-
-#define SDP_VF_MAX_IO_QUEUES        SDP_MAX_RINGS_PER_VF
-#define SDP_VF_MIN_IO_QUEUES        SDP_MIN_RINGS_PER_VF
-
-/* SDP VF IOQs per rawdev */
-#define SDP_VF_MAX_IOQS_PER_RAWDEV      SDP_VF_MAX_IO_QUEUES
-#define SDP_VF_DEFAULT_IOQS_PER_RAWDEV  SDP_VF_MIN_IO_QUEUES
-
-/* SDP VF Register definitions */
-#define SDP_VF_RING_OFFSET                (0x1ull << 17)
-
-/* SDP VF IQ Registers */
-#define SDP_VF_R_IN_CONTROL_START         (0x10000)
-#define SDP_VF_R_IN_ENABLE_START          (0x10010)
-#define SDP_VF_R_IN_INSTR_BADDR_START     (0x10020)
-#define SDP_VF_R_IN_INSTR_RSIZE_START     (0x10030)
-#define SDP_VF_R_IN_INSTR_DBELL_START     (0x10040)
-#define SDP_VF_R_IN_CNTS_START            (0x10050)
-#define SDP_VF_R_IN_INT_LEVELS_START      (0x10060)
-#define SDP_VF_R_IN_PKT_CNT_START         (0x10080)
-#define SDP_VF_R_IN_BYTE_CNT_START        (0x10090)
-
-#define SDP_VF_R_IN_CONTROL(ring)  \
-	(SDP_VF_R_IN_CONTROL_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_ENABLE(ring)   \
-	(SDP_VF_R_IN_ENABLE_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_INSTR_BADDR(ring)   \
-	(SDP_VF_R_IN_INSTR_BADDR_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_INSTR_RSIZE(ring)   \
-	(SDP_VF_R_IN_INSTR_RSIZE_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_INSTR_DBELL(ring)   \
-	(SDP_VF_R_IN_INSTR_DBELL_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_CNTS(ring)          \
-	(SDP_VF_R_IN_CNTS_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_INT_LEVELS(ring)    \
-	(SDP_VF_R_IN_INT_LEVELS_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_PKT_CNT(ring)       \
-	(SDP_VF_R_IN_PKT_CNT_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_IN_BYTE_CNT(ring)          \
-	(SDP_VF_R_IN_BYTE_CNT_START + ((ring) * SDP_VF_RING_OFFSET))
-
-/* SDP VF IQ Masks */
-#define SDP_VF_R_IN_CTL_RPVF_MASK       (0xF)
-#define	SDP_VF_R_IN_CTL_RPVF_POS        (48)
-
-#define SDP_VF_R_IN_CTL_IDLE            (0x1ull << 28)
-#define SDP_VF_R_IN_CTL_RDSIZE          (0x3ull << 25) /* Setting to max(4) */
-#define SDP_VF_R_IN_CTL_IS_64B          (0x1ull << 24)
-#define SDP_VF_R_IN_CTL_D_NSR           (0x1ull << 8)
-#define SDP_VF_R_IN_CTL_D_ESR           (0x1ull << 6)
-#define SDP_VF_R_IN_CTL_D_ROR           (0x1ull << 5)
-#define SDP_VF_R_IN_CTL_NSR             (0x1ull << 3)
-#define SDP_VF_R_IN_CTL_ESR             (0x1ull << 1)
-#define SDP_VF_R_IN_CTL_ROR             (0x1ull << 0)
-
-#define SDP_VF_R_IN_CTL_MASK  \
-	(SDP_VF_R_IN_CTL_RDSIZE | SDP_VF_R_IN_CTL_IS_64B)
-
-/* SDP VF OQ Registers */
-#define SDP_VF_R_OUT_CNTS_START              (0x10100)
-#define SDP_VF_R_OUT_INT_LEVELS_START        (0x10110)
-#define SDP_VF_R_OUT_SLIST_BADDR_START       (0x10120)
-#define SDP_VF_R_OUT_SLIST_RSIZE_START       (0x10130)
-#define SDP_VF_R_OUT_SLIST_DBELL_START       (0x10140)
-#define SDP_VF_R_OUT_CONTROL_START           (0x10150)
-#define SDP_VF_R_OUT_ENABLE_START            (0x10160)
-#define SDP_VF_R_OUT_PKT_CNT_START           (0x10180)
-#define SDP_VF_R_OUT_BYTE_CNT_START          (0x10190)
-
-#define SDP_VF_R_OUT_CONTROL(ring)    \
-	(SDP_VF_R_OUT_CONTROL_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_ENABLE(ring)     \
-	(SDP_VF_R_OUT_ENABLE_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_SLIST_BADDR(ring)  \
-	(SDP_VF_R_OUT_SLIST_BADDR_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_SLIST_RSIZE(ring)  \
-	(SDP_VF_R_OUT_SLIST_RSIZE_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_SLIST_DBELL(ring)  \
-	(SDP_VF_R_OUT_SLIST_DBELL_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_CNTS(ring)   \
-	(SDP_VF_R_OUT_CNTS_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_INT_LEVELS(ring)   \
-	(SDP_VF_R_OUT_INT_LEVELS_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_PKT_CNT(ring)   \
-	(SDP_VF_R_OUT_PKT_CNT_START + ((ring) * SDP_VF_RING_OFFSET))
-
-#define SDP_VF_R_OUT_BYTE_CNT(ring)   \
-	(SDP_VF_R_OUT_BYTE_CNT_START + ((ring) * SDP_VF_RING_OFFSET))
-
-/* SDP VF OQ Masks */
-#define SDP_VF_R_OUT_CTL_IDLE         (1ull << 40)
-#define SDP_VF_R_OUT_CTL_ES_I         (1ull << 34)
-#define SDP_VF_R_OUT_CTL_NSR_I        (1ull << 33)
-#define SDP_VF_R_OUT_CTL_ROR_I        (1ull << 32)
-#define SDP_VF_R_OUT_CTL_ES_D         (1ull << 30)
-#define SDP_VF_R_OUT_CTL_NSR_D        (1ull << 29)
-#define SDP_VF_R_OUT_CTL_ROR_D        (1ull << 28)
-#define SDP_VF_R_OUT_CTL_ES_P         (1ull << 26)
-#define SDP_VF_R_OUT_CTL_NSR_P        (1ull << 25)
-#define SDP_VF_R_OUT_CTL_ROR_P        (1ull << 24)
-#define SDP_VF_R_OUT_CTL_IMODE        (1ull << 23)
-
-#define SDP_VF_R_OUT_INT_LEVELS_BMODE     (1ull << 63)
-#define SDP_VF_R_OUT_INT_LEVELS_TIMET     (32)
-
-/* SDP Instruction Header */
-struct sdp_instr_ih {
-	/* Data Len */
-	uint64_t tlen:16;
-
-	/* Reserved1 */
-	uint64_t rsvd1:20;
-
-	/* PKIND for SDP */
-	uint64_t pkind:6;
-
-	/* Front Data size */
-	uint64_t fsz:6;
-
-	/* No. of entries in gather list */
-	uint64_t gsz:14;
-
-	/* Gather indicator */
-	uint64_t gather:1;
-
-	/* Reserved2 */
-	uint64_t rsvd2:1;
-} __rte_packed;
-
-#endif /* __OTX2_SDP_HW_H_  */
-
diff --git a/drivers/common/octeontx2/hw/otx2_sso.h b/drivers/common/octeontx2/hw/otx2_sso.h
deleted file mode 100644
index 98a8130b16..0000000000
--- a/drivers/common/octeontx2/hw/otx2_sso.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_SSO_HW_H__
-#define __OTX2_SSO_HW_H__
-
-/* Register offsets */
-
-#define SSO_AF_CONST                        (0x1000ull)
-#define SSO_AF_CONST1                       (0x1008ull)
-#define SSO_AF_WQ_INT_PC                    (0x1020ull)
-#define SSO_AF_NOS_CNT                      (0x1050ull)
-#define SSO_AF_AW_WE                        (0x1080ull)
-#define SSO_AF_WS_CFG                       (0x1088ull)
-#define SSO_AF_GWE_CFG                      (0x1098ull)
-#define SSO_AF_GWE_RANDOM                   (0x10b0ull)
-#define SSO_AF_LF_HWGRP_RST                 (0x10e0ull)
-#define SSO_AF_AW_CFG                       (0x10f0ull)
-#define SSO_AF_BLK_RST                      (0x10f8ull)
-#define SSO_AF_ACTIVE_CYCLES0               (0x1100ull)
-#define SSO_AF_ACTIVE_CYCLES1               (0x1108ull)
-#define SSO_AF_ACTIVE_CYCLES2               (0x1110ull)
-#define SSO_AF_ERR0                         (0x1220ull)
-#define SSO_AF_ERR0_W1S                     (0x1228ull)
-#define SSO_AF_ERR0_ENA_W1C                 (0x1230ull)
-#define SSO_AF_ERR0_ENA_W1S                 (0x1238ull)
-#define SSO_AF_ERR2                         (0x1260ull)
-#define SSO_AF_ERR2_W1S                     (0x1268ull)
-#define SSO_AF_ERR2_ENA_W1C                 (0x1270ull)
-#define SSO_AF_ERR2_ENA_W1S                 (0x1278ull)
-#define SSO_AF_UNMAP_INFO                   (0x12f0ull)
-#define SSO_AF_UNMAP_INFO2                  (0x1300ull)
-#define SSO_AF_UNMAP_INFO3                  (0x1310ull)
-#define SSO_AF_RAS                          (0x1420ull)
-#define SSO_AF_RAS_W1S                      (0x1430ull)
-#define SSO_AF_RAS_ENA_W1C                  (0x1460ull)
-#define SSO_AF_RAS_ENA_W1S                  (0x1470ull)
-#define SSO_AF_AW_INP_CTL                   (0x2070ull)
-#define SSO_AF_AW_ADD                       (0x2080ull)
-#define SSO_AF_AW_READ_ARB                  (0x2090ull)
-#define SSO_AF_XAQ_REQ_PC                   (0x20b0ull)
-#define SSO_AF_XAQ_LATENCY_PC               (0x20b8ull)
-#define SSO_AF_TAQ_CNT                      (0x20c0ull)
-#define SSO_AF_TAQ_ADD                      (0x20e0ull)
-#define SSO_AF_POISONX(a)                   (0x2100ull | (uint64_t)(a) << 3)
-#define SSO_AF_POISONX_W1S(a)               (0x2200ull | (uint64_t)(a) << 3)
-#define SSO_PRIV_AF_INT_CFG                 (0x3000ull)
-#define SSO_AF_RVU_LF_CFG_DEBUG             (0x3800ull)
-#define SSO_PRIV_LFX_HWGRP_CFG(a)           (0x10000ull | (uint64_t)(a) << 3)
-#define SSO_PRIV_LFX_HWGRP_INT_CFG(a)       (0x20000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IU_ACCNTX_CFG(a)             (0x50000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IU_ACCNTX_RST(a)             (0x60000ull | (uint64_t)(a) << 3)
-#define SSO_AF_XAQX_HEAD_PTR(a)             (0x80000ull | (uint64_t)(a) << 3)
-#define SSO_AF_XAQX_TAIL_PTR(a)             (0x90000ull | (uint64_t)(a) << 3)
-#define SSO_AF_XAQX_HEAD_NEXT(a)            (0xa0000ull | (uint64_t)(a) << 3)
-#define SSO_AF_XAQX_TAIL_NEXT(a)            (0xb0000ull | (uint64_t)(a) << 3)
-#define SSO_AF_TIAQX_STATUS(a)              (0xc0000ull | (uint64_t)(a) << 3)
-#define SSO_AF_TOAQX_STATUS(a)              (0xd0000ull | (uint64_t)(a) << 3)
-#define SSO_AF_XAQX_GMCTL(a)                (0xe0000ull | (uint64_t)(a) << 3)
-#define SSO_AF_HWGRPX_IAQ_THR(a)            (0x200000ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_TAQ_THR(a)            (0x200010ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_PRI(a)                (0x200020ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_WS_PC(a)              (0x200050ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_EXT_PC(a)             (0x200060ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_WA_PC(a)              (0x200070ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_TS_PC(a)              (0x200080ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_DS_PC(a)              (0x200090ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_DQ_PC(a)              (0x2000A0ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_PAGE_CNT(a)           (0x200100ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_AW_STATUS(a)          (0x200110ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_AW_CFG(a)             (0x200120ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_AW_TAGSPACE(a)        (0x200130ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_XAQ_AURA(a)           (0x200140ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_XAQ_LIMIT(a)          (0x200220ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWGRPX_IU_ACCNT(a)           (0x200230ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWSX_ARB(a)                  (0x400100ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWSX_INV(a)                  (0x400180ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWSX_GMCTL(a)                (0x400200ull | (uint64_t)(a) << 12)
-#define SSO_AF_HWSX_SX_GRPMSKX(a, b, c)     \
-	(0x400400ull | (uint64_t)(a) << 12 | (uint64_t)(b) << 5 | \
-	(uint64_t)(c) << 3)
-#define SSO_AF_IPL_FREEX(a)                 (0x800000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IPL_IAQX(a)                  (0x840000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IPL_DESCHEDX(a)              (0x860000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IPL_CONFX(a)                 (0x880000ull | (uint64_t)(a) << 3)
-#define SSO_AF_NPA_DIGESTX(a)               (0x900000ull | (uint64_t)(a) << 3)
-#define SSO_AF_NPA_DIGESTX_W1S(a)           (0x900100ull | (uint64_t)(a) << 3)
-#define SSO_AF_BFP_DIGESTX(a)               (0x900200ull | (uint64_t)(a) << 3)
-#define SSO_AF_BFP_DIGESTX_W1S(a)           (0x900300ull | (uint64_t)(a) << 3)
-#define SSO_AF_BFPN_DIGESTX(a)              (0x900400ull | (uint64_t)(a) << 3)
-#define SSO_AF_BFPN_DIGESTX_W1S(a)          (0x900500ull | (uint64_t)(a) << 3)
-#define SSO_AF_GRPDIS_DIGESTX(a)            (0x900600ull | (uint64_t)(a) << 3)
-#define SSO_AF_GRPDIS_DIGESTX_W1S(a)        (0x900700ull | (uint64_t)(a) << 3)
-#define SSO_AF_AWEMPTY_DIGESTX(a)           (0x900800ull | (uint64_t)(a) << 3)
-#define SSO_AF_AWEMPTY_DIGESTX_W1S(a)       (0x900900ull | (uint64_t)(a) << 3)
-#define SSO_AF_WQP0_DIGESTX(a)              (0x900a00ull | (uint64_t)(a) << 3)
-#define SSO_AF_WQP0_DIGESTX_W1S(a)          (0x900b00ull | (uint64_t)(a) << 3)
-#define SSO_AF_AW_DROPPED_DIGESTX(a)        (0x900c00ull | (uint64_t)(a) << 3)
-#define SSO_AF_AW_DROPPED_DIGESTX_W1S(a)    (0x900d00ull | (uint64_t)(a) << 3)
-#define SSO_AF_QCTLDIS_DIGESTX(a)           (0x900e00ull | (uint64_t)(a) << 3)
-#define SSO_AF_QCTLDIS_DIGESTX_W1S(a)       (0x900f00ull | (uint64_t)(a) << 3)
-#define SSO_AF_XAQDIS_DIGESTX(a)            (0x901000ull | (uint64_t)(a) << 3)
-#define SSO_AF_XAQDIS_DIGESTX_W1S(a)        (0x901100ull | (uint64_t)(a) << 3)
-#define SSO_AF_FLR_AQ_DIGESTX(a)            (0x901200ull | (uint64_t)(a) << 3)
-#define SSO_AF_FLR_AQ_DIGESTX_W1S(a)        (0x901300ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_GMULTI_DIGESTX(a)         (0x902000ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_GMULTI_DIGESTX_W1S(a)     (0x902100ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_GUNMAP_DIGESTX(a)         (0x902200ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_GUNMAP_DIGESTX_W1S(a)     (0x902300ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_AWE_DIGESTX(a)            (0x902400ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_AWE_DIGESTX_W1S(a)        (0x902500ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_GWI_DIGESTX(a)            (0x902600ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_GWI_DIGESTX_W1S(a)        (0x902700ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_NE_DIGESTX(a)             (0x902800ull | (uint64_t)(a) << 3)
-#define SSO_AF_WS_NE_DIGESTX_W1S(a)         (0x902900ull | (uint64_t)(a) << 3)
-#define SSO_AF_IENTX_TAG(a)                 (0xa00000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IENTX_GRP(a)                 (0xa20000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IENTX_PENDTAG(a)             (0xa40000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IENTX_LINKS(a)               (0xa60000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IENTX_QLINKS(a)              (0xa80000ull | (uint64_t)(a) << 3)
-#define SSO_AF_IENTX_WQP(a)                 (0xaa0000ull | (uint64_t)(a) << 3)
-#define SSO_AF_TAQX_LINK(a)                 (0xc00000ull | (uint64_t)(a) << 3)
-#define SSO_AF_TAQX_WAEX_TAG(a, b)          \
-	(0xe00000ull | (uint64_t)(a) << 8 | (uint64_t)(b) << 4)
-#define SSO_AF_TAQX_WAEX_WQP(a, b)          \
-	(0xe00008ull | (uint64_t)(a) << 8 | (uint64_t)(b) << 4)
-
-#define SSO_LF_GGRP_OP_ADD_WORK0            (0x0ull)
-#define SSO_LF_GGRP_OP_ADD_WORK1            (0x8ull)
-#define SSO_LF_GGRP_QCTL                    (0x20ull)
-#define SSO_LF_GGRP_EXE_DIS                 (0x80ull)
-#define SSO_LF_GGRP_INT                     (0x100ull)
-#define SSO_LF_GGRP_INT_W1S                 (0x108ull)
-#define SSO_LF_GGRP_INT_ENA_W1S             (0x110ull)
-#define SSO_LF_GGRP_INT_ENA_W1C             (0x118ull)
-#define SSO_LF_GGRP_INT_THR                 (0x140ull)
-#define SSO_LF_GGRP_INT_CNT                 (0x180ull)
-#define SSO_LF_GGRP_XAQ_CNT                 (0x1b0ull)
-#define SSO_LF_GGRP_AQ_CNT                  (0x1c0ull)
-#define SSO_LF_GGRP_AQ_THR                  (0x1e0ull)
-#define SSO_LF_GGRP_MISC_CNT                (0x200ull)
-
-#define SSO_AF_IAQ_FREE_CNT_MASK        0x3FFFull
-#define SSO_AF_IAQ_RSVD_FREE_MASK       0x3FFFull
-#define SSO_AF_IAQ_RSVD_FREE_SHIFT      16
-#define SSO_AF_IAQ_FREE_CNT_MAX         SSO_AF_IAQ_FREE_CNT_MASK
-#define SSO_AF_AW_ADD_RSVD_FREE_MASK    0x3FFFull
-#define SSO_AF_AW_ADD_RSVD_FREE_SHIFT   16
-#define SSO_HWGRP_IAQ_MAX_THR_MASK      0x3FFFull
-#define SSO_HWGRP_IAQ_RSVD_THR_MASK     0x3FFFull
-#define SSO_HWGRP_IAQ_MAX_THR_SHIFT     32
-#define SSO_HWGRP_IAQ_RSVD_THR          0x2
-
-#define SSO_AF_TAQ_FREE_CNT_MASK        0x7FFull
-#define SSO_AF_TAQ_RSVD_FREE_MASK       0x7FFull
-#define SSO_AF_TAQ_RSVD_FREE_SHIFT      16
-#define SSO_AF_TAQ_FREE_CNT_MAX         SSO_AF_TAQ_FREE_CNT_MASK
-#define SSO_AF_TAQ_ADD_RSVD_FREE_MASK   0x1FFFull
-#define SSO_AF_TAQ_ADD_RSVD_FREE_SHIFT  16
-#define SSO_HWGRP_TAQ_MAX_THR_MASK      0x7FFull
-#define SSO_HWGRP_TAQ_RSVD_THR_MASK     0x7FFull
-#define SSO_HWGRP_TAQ_MAX_THR_SHIFT     32
-#define SSO_HWGRP_TAQ_RSVD_THR          0x3
-
-#define SSO_HWGRP_PRI_AFF_MASK          0xFull
-#define SSO_HWGRP_PRI_AFF_SHIFT         8
-#define SSO_HWGRP_PRI_WGT_MASK          0x3Full
-#define SSO_HWGRP_PRI_WGT_SHIFT         16
-#define SSO_HWGRP_PRI_WGT_LEFT_MASK     0x3Full
-#define SSO_HWGRP_PRI_WGT_LEFT_SHIFT    24
-
-#define SSO_HWGRP_AW_CFG_RWEN           BIT_ULL(0)
-#define SSO_HWGRP_AW_CFG_LDWB           BIT_ULL(1)
-#define SSO_HWGRP_AW_CFG_LDT            BIT_ULL(2)
-#define SSO_HWGRP_AW_CFG_STT            BIT_ULL(3)
-#define SSO_HWGRP_AW_CFG_XAQ_BYP_DIS    BIT_ULL(4)
-
-#define SSO_HWGRP_AW_STS_TPTR_VLD       BIT_ULL(8)
-#define SSO_HWGRP_AW_STS_NPA_FETCH      BIT_ULL(9)
-#define SSO_HWGRP_AW_STS_XAQ_BUFSC_MASK 0x7ull
-#define SSO_HWGRP_AW_STS_INIT_STS       0x18ull
-
-/* Enum offsets */
-
-#define SSO_LF_INT_VEC_GRP     (0x0ull)
-
-#define SSO_AF_INT_VEC_ERR0    (0x0ull)
-#define SSO_AF_INT_VEC_ERR2    (0x1ull)
-#define SSO_AF_INT_VEC_RAS     (0x2ull)
-
-#define SSO_WA_IOBN            (0x0ull)
-#define SSO_WA_NIXRX           (0x1ull)
-#define SSO_WA_CPT             (0x2ull)
-#define SSO_WA_ADDWQ           (0x3ull)
-#define SSO_WA_DPI             (0x4ull)
-#define SSO_WA_NIXTX           (0x5ull)
-#define SSO_WA_TIM             (0x6ull)
-#define SSO_WA_ZIP             (0x7ull)
-
-#define SSO_TT_ORDERED         (0x0ull)
-#define SSO_TT_ATOMIC          (0x1ull)
-#define SSO_TT_UNTAGGED        (0x2ull)
-#define SSO_TT_EMPTY           (0x3ull)
-
-
-/* Structures definitions */
-
-#endif /* __OTX2_SSO_HW_H__ */
diff --git a/drivers/common/octeontx2/hw/otx2_ssow.h b/drivers/common/octeontx2/hw/otx2_ssow.h
deleted file mode 100644
index 8a44578036..0000000000
--- a/drivers/common/octeontx2/hw/otx2_ssow.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_SSOW_HW_H__
-#define __OTX2_SSOW_HW_H__
-
-/* Register offsets */
-
-#define SSOW_AF_RVU_LF_HWS_CFG_DEBUG    (0x10ull)
-#define SSOW_AF_LF_HWS_RST              (0x30ull)
-#define SSOW_PRIV_LFX_HWS_CFG(a)        (0x1000ull | (uint64_t)(a) << 3)
-#define SSOW_PRIV_LFX_HWS_INT_CFG(a)    (0x2000ull | (uint64_t)(a) << 3)
-#define SSOW_AF_SCRATCH_WS              (0x100000ull)
-#define SSOW_AF_SCRATCH_GW              (0x200000ull)
-#define SSOW_AF_SCRATCH_AW              (0x300000ull)
-
-#define SSOW_LF_GWS_LINKS               (0x10ull)
-#define SSOW_LF_GWS_PENDWQP             (0x40ull)
-#define SSOW_LF_GWS_PENDSTATE           (0x50ull)
-#define SSOW_LF_GWS_NW_TIM              (0x70ull)
-#define SSOW_LF_GWS_GRPMSK_CHG          (0x80ull)
-#define SSOW_LF_GWS_INT                 (0x100ull)
-#define SSOW_LF_GWS_INT_W1S             (0x108ull)
-#define SSOW_LF_GWS_INT_ENA_W1S         (0x110ull)
-#define SSOW_LF_GWS_INT_ENA_W1C         (0x118ull)
-#define SSOW_LF_GWS_TAG                 (0x200ull)
-#define SSOW_LF_GWS_WQP                 (0x210ull)
-#define SSOW_LF_GWS_SWTP                (0x220ull)
-#define SSOW_LF_GWS_PENDTAG             (0x230ull)
-#define SSOW_LF_GWS_OP_ALLOC_WE         (0x400ull)
-#define SSOW_LF_GWS_OP_GET_WORK         (0x600ull)
-#define SSOW_LF_GWS_OP_SWTAG_FLUSH      (0x800ull)
-#define SSOW_LF_GWS_OP_SWTAG_UNTAG      (0x810ull)
-#define SSOW_LF_GWS_OP_SWTP_CLR         (0x820ull)
-#define SSOW_LF_GWS_OP_UPD_WQP_GRP0     (0x830ull)
-#define SSOW_LF_GWS_OP_UPD_WQP_GRP1     (0x838ull)
-#define SSOW_LF_GWS_OP_DESCHED          (0x880ull)
-#define SSOW_LF_GWS_OP_DESCHED_NOSCH    (0x8c0ull)
-#define SSOW_LF_GWS_OP_SWTAG_DESCHED    (0x980ull)
-#define SSOW_LF_GWS_OP_SWTAG_NOSCHED    (0x9c0ull)
-#define SSOW_LF_GWS_OP_CLR_NSCHED0      (0xa00ull)
-#define SSOW_LF_GWS_OP_CLR_NSCHED1      (0xa08ull)
-#define SSOW_LF_GWS_OP_SWTP_SET         (0xc00ull)
-#define SSOW_LF_GWS_OP_SWTAG_NORM       (0xc10ull)
-#define SSOW_LF_GWS_OP_SWTAG_FULL0      (0xc20ull)
-#define SSOW_LF_GWS_OP_SWTAG_FULL1      (0xc28ull)
-#define SSOW_LF_GWS_OP_GWC_INVAL        (0xe00ull)
-
-
-/* Enum offsets */
-
-#define SSOW_LF_INT_VEC_IOP    (0x0ull)
-
-
-#endif /* __OTX2_SSOW_HW_H__ */
diff --git a/drivers/common/octeontx2/hw/otx2_tim.h b/drivers/common/octeontx2/hw/otx2_tim.h
deleted file mode 100644
index 41442ad0a8..0000000000
--- a/drivers/common/octeontx2/hw/otx2_tim.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_TIM_HW_H__
-#define __OTX2_TIM_HW_H__
-
-/* TIM */
-#define TIM_AF_CONST                    (0x90)
-#define TIM_PRIV_LFX_CFG(a)             (0x20000 | (a) << 3)
-#define TIM_PRIV_LFX_INT_CFG(a)         (0x24000 | (a) << 3)
-#define TIM_AF_RVU_LF_CFG_DEBUG         (0x30000)
-#define TIM_AF_BLK_RST                  (0x10)
-#define TIM_AF_LF_RST                   (0x20)
-#define TIM_AF_BLK_RST                  (0x10)
-#define TIM_AF_RINGX_GMCTL(a)           (0x2000 | (a) << 3)
-#define TIM_AF_RINGX_CTL0(a)            (0x4000 | (a) << 3)
-#define TIM_AF_RINGX_CTL1(a)            (0x6000 | (a) << 3)
-#define TIM_AF_RINGX_CTL2(a)            (0x8000 | (a) << 3)
-#define TIM_AF_FLAGS_REG                (0x80)
-#define TIM_AF_FLAGS_REG_ENA_TIM        BIT_ULL(0)
-#define TIM_AF_RINGX_CTL1_ENA           BIT_ULL(47)
-#define TIM_AF_RINGX_CTL1_RCF_BUSY      BIT_ULL(50)
-#define TIM_AF_RINGX_CLT1_CLK_10NS      (0)
-#define TIM_AF_RINGX_CLT1_CLK_GPIO      (1)
-#define TIM_AF_RINGX_CLT1_CLK_GTI       (2)
-#define TIM_AF_RINGX_CLT1_CLK_PTP       (3)
-
-/* ENUMS */
-
-#define TIM_LF_INT_VEC_NRSPERR_INT	(0x0ull)
-#define TIM_LF_INT_VEC_RAS_INT		(0x1ull)
-
-#endif /* __OTX2_TIM_HW_H__ */
diff --git a/drivers/common/octeontx2/meson.build b/drivers/common/octeontx2/meson.build
deleted file mode 100644
index 223ba5ef51..0000000000
--- a/drivers/common/octeontx2/meson.build
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-    build = false
-    reason = 'only supported on 64-bit Linux'
-    subdir_done()
-endif
-
-sources= files(
-        'otx2_common.c',
-        'otx2_dev.c',
-        'otx2_irq.c',
-        'otx2_mbox.c',
-        'otx2_sec_idev.c',
-)
-
-deps = ['eal', 'pci', 'ethdev', 'kvargs']
-includes += include_directories(
-        '../../common/octeontx2',
-        '../../mempool/octeontx2',
-        '../../bus/pci',
-)
diff --git a/drivers/common/octeontx2/otx2_common.c b/drivers/common/octeontx2/otx2_common.c
deleted file mode 100644
index d23c50242e..0000000000
--- a/drivers/common/octeontx2/otx2_common.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_atomic.h>
-#include <rte_malloc.h>
-#include <rte_log.h>
-
-#include "otx2_common.h"
-#include "otx2_dev.h"
-#include "otx2_mbox.h"
-
-/**
- * @internal
- * Set default NPA configuration.
- */
-void
-otx2_npa_set_defaults(struct otx2_idev_cfg *idev)
-{
-	idev->npa_pf_func = 0;
-	rte_atomic16_set(&idev->npa_refcnt, 0);
-}
-
-/**
- * @internal
- * Get intra device config structure.
- */
-struct otx2_idev_cfg *
-otx2_intra_dev_get_cfg(void)
-{
-	const char name[] = "octeontx2_intra_device_conf";
-	const struct rte_memzone *mz;
-	struct otx2_idev_cfg *idev;
-
-	mz = rte_memzone_lookup(name);
-	if (mz != NULL)
-		return mz->addr;
-
-	/* Request for the first time */
-	mz = rte_memzone_reserve_aligned(name, sizeof(struct otx2_idev_cfg),
-					 SOCKET_ID_ANY, 0, OTX2_ALIGN);
-	if (mz != NULL) {
-		idev = mz->addr;
-		idev->sso_pf_func = 0;
-		idev->npa_lf = NULL;
-		otx2_npa_set_defaults(idev);
-		return idev;
-	}
-	return NULL;
-}
-
-/**
- * @internal
- * Get SSO PF_FUNC.
- */
-uint16_t
-otx2_sso_pf_func_get(void)
-{
-	struct otx2_idev_cfg *idev;
-	uint16_t sso_pf_func;
-
-	sso_pf_func = 0;
-	idev = otx2_intra_dev_get_cfg();
-
-	if (idev != NULL)
-		sso_pf_func = idev->sso_pf_func;
-
-	return sso_pf_func;
-}
-
-/**
- * @internal
- * Set SSO PF_FUNC.
- */
-void
-otx2_sso_pf_func_set(uint16_t sso_pf_func)
-{
-	struct otx2_idev_cfg *idev;
-
-	idev = otx2_intra_dev_get_cfg();
-
-	if (idev != NULL) {
-		idev->sso_pf_func = sso_pf_func;
-		rte_smp_wmb();
-	}
-}
-
-/**
- * @internal
- * Get NPA PF_FUNC.
- */
-uint16_t
-otx2_npa_pf_func_get(void)
-{
-	struct otx2_idev_cfg *idev;
-	uint16_t npa_pf_func;
-
-	npa_pf_func = 0;
-	idev = otx2_intra_dev_get_cfg();
-
-	if (idev != NULL)
-		npa_pf_func = idev->npa_pf_func;
-
-	return npa_pf_func;
-}
-
-/**
- * @internal
- * Get NPA lf object.
- */
-struct otx2_npa_lf *
-otx2_npa_lf_obj_get(void)
-{
-	struct otx2_idev_cfg *idev;
-
-	idev = otx2_intra_dev_get_cfg();
-
-	if (idev != NULL && rte_atomic16_read(&idev->npa_refcnt))
-		return idev->npa_lf;
-
-	return NULL;
-}
-
-/**
- * @internal
- * Is NPA lf active for the given device?.
- */
-int
-otx2_npa_lf_active(void *otx2_dev)
-{
-	struct otx2_dev *dev = otx2_dev;
-	struct otx2_idev_cfg *idev;
-
-	/* Check if npalf is actively used on this dev */
-	idev = otx2_intra_dev_get_cfg();
-	if (!idev || !idev->npa_lf || idev->npa_lf->mbox != dev->mbox)
-		return 0;
-
-	return rte_atomic16_read(&idev->npa_refcnt);
-}
-
-/*
- * @internal
- * Gets reference only to existing NPA LF object.
- */
-int otx2_npa_lf_obj_ref(void)
-{
-	struct otx2_idev_cfg *idev;
-	uint16_t cnt;
-	int rc;
-
-	idev = otx2_intra_dev_get_cfg();
-
-	/* Check if ref not possible */
-	if (idev == NULL)
-		return -EINVAL;
-
-
-	/* Get ref only if > 0 */
-	cnt = rte_atomic16_read(&idev->npa_refcnt);
-	while (cnt != 0) {
-		rc = rte_atomic16_cmpset(&idev->npa_refcnt_u16, cnt, cnt + 1);
-		if (rc)
-			break;
-
-		cnt = rte_atomic16_read(&idev->npa_refcnt);
-	}
-
-	return cnt ? 0 : -EINVAL;
-}
-
-static int
-parse_npa_lock_mask(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-	uint64_t val;
-
-	val = strtoull(value, NULL, 16);
-
-	*(uint64_t *)extra_args = val;
-
-	return 0;
-}
-
-/*
- * @internal
- * Parse common device arguments
- */
-void otx2_parse_common_devargs(struct rte_kvargs *kvlist)
-{
-
-	struct otx2_idev_cfg *idev;
-	uint64_t npa_lock_mask = 0;
-
-	idev = otx2_intra_dev_get_cfg();
-
-	if (idev == NULL)
-		return;
-
-	rte_kvargs_process(kvlist, OTX2_NPA_LOCK_MASK,
-			&parse_npa_lock_mask, &npa_lock_mask);
-
-	idev->npa_lock_mask = npa_lock_mask;
-}
-
-RTE_LOG_REGISTER(otx2_logtype_base, pmd.octeontx2.base, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_mbox, pmd.octeontx2.mbox, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_npa, pmd.mempool.octeontx2, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_nix, pmd.net.octeontx2, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_npc, pmd.net.octeontx2.flow, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_tm, pmd.net.octeontx2.tm, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_sso, pmd.event.octeontx2, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_tim, pmd.event.octeontx2.timer, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_dpi, pmd.raw.octeontx2.dpi, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_ep, pmd.raw.octeontx2.ep, NOTICE);
-RTE_LOG_REGISTER(otx2_logtype_ree, pmd.regex.octeontx2, NOTICE);
diff --git a/drivers/common/octeontx2/otx2_common.h b/drivers/common/octeontx2/otx2_common.h
deleted file mode 100644
index cd52e098e6..0000000000
--- a/drivers/common/octeontx2/otx2_common.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_COMMON_H_
-#define _OTX2_COMMON_H_
-
-#include <rte_atomic.h>
-#include <rte_common.h>
-#include <rte_cycles.h>
-#include <rte_kvargs.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_io.h>
-
-#include "hw/otx2_rvu.h"
-#include "hw/otx2_nix.h"
-#include "hw/otx2_npc.h"
-#include "hw/otx2_npa.h"
-#include "hw/otx2_sdp.h"
-#include "hw/otx2_sso.h"
-#include "hw/otx2_ssow.h"
-#include "hw/otx2_tim.h"
-#include "hw/otx2_ree.h"
-
-/* Alignment */
-#define OTX2_ALIGN  128
-
-/* Bits manipulation */
-#ifndef BIT_ULL
-#define BIT_ULL(nr) (1ULL << (nr))
-#endif
-#ifndef BIT
-#define BIT(nr)     (1UL << (nr))
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
-#ifndef BITS_PER_LONG_LONG
-#define BITS_PER_LONG_LONG (__SIZEOF_LONG_LONG__ * 8)
-#endif
-
-#ifndef GENMASK
-#define GENMASK(h, l) \
-		(((~0UL) << (l)) & (~0UL >> (BITS_PER_LONG - 1 - (h))))
-#endif
-#ifndef GENMASK_ULL
-#define GENMASK_ULL(h, l) \
-	(((~0ULL) - (1ULL << (l)) + 1) & \
-	 (~0ULL >> (BITS_PER_LONG_LONG - 1 - (h))))
-#endif
-
-#define OTX2_NPA_LOCK_MASK "npa_lock_mask"
-
-/* Intra device related functions */
-struct otx2_npa_lf;
-struct otx2_idev_cfg {
-	uint16_t sso_pf_func;
-	uint16_t npa_pf_func;
-	struct otx2_npa_lf *npa_lf;
-	RTE_STD_C11
-	union {
-		rte_atomic16_t npa_refcnt;
-		uint16_t npa_refcnt_u16;
-	};
-	uint64_t npa_lock_mask;
-};
-
-__rte_internal
-struct otx2_idev_cfg *otx2_intra_dev_get_cfg(void);
-__rte_internal
-void otx2_sso_pf_func_set(uint16_t sso_pf_func);
-__rte_internal
-uint16_t otx2_sso_pf_func_get(void);
-__rte_internal
-uint16_t otx2_npa_pf_func_get(void);
-__rte_internal
-struct otx2_npa_lf *otx2_npa_lf_obj_get(void);
-__rte_internal
-void otx2_npa_set_defaults(struct otx2_idev_cfg *idev);
-__rte_internal
-int otx2_npa_lf_active(void *dev);
-__rte_internal
-int otx2_npa_lf_obj_ref(void);
-__rte_internal
-void otx2_parse_common_devargs(struct rte_kvargs *kvlist);
-
-/* Log */
-extern int otx2_logtype_base;
-extern int otx2_logtype_mbox;
-extern int otx2_logtype_npa;
-extern int otx2_logtype_nix;
-extern int otx2_logtype_sso;
-extern int otx2_logtype_npc;
-extern int otx2_logtype_tm;
-extern int otx2_logtype_tim;
-extern int otx2_logtype_dpi;
-extern int otx2_logtype_ep;
-extern int otx2_logtype_ree;
-
-#define otx2_err(fmt, args...)			\
-	RTE_LOG(ERR, PMD, "%s():%u " fmt "\n",	\
-		__func__, __LINE__, ## args)
-
-#define otx2_info(fmt, args...)						\
-	RTE_LOG(INFO, PMD, fmt"\n", ## args)
-
-#define otx2_dbg(subsystem, fmt, args...)				\
-	rte_log(RTE_LOG_DEBUG, otx2_logtype_ ## subsystem,		\
-		"[%s] %s():%u " fmt "\n",				\
-		 #subsystem, __func__, __LINE__, ##args)
-
-#define otx2_base_dbg(fmt, ...) otx2_dbg(base, fmt, ##__VA_ARGS__)
-#define otx2_mbox_dbg(fmt, ...) otx2_dbg(mbox, fmt, ##__VA_ARGS__)
-#define otx2_npa_dbg(fmt, ...) otx2_dbg(npa, fmt, ##__VA_ARGS__)
-#define otx2_nix_dbg(fmt, ...) otx2_dbg(nix, fmt, ##__VA_ARGS__)
-#define otx2_sso_dbg(fmt, ...) otx2_dbg(sso, fmt, ##__VA_ARGS__)
-#define otx2_npc_dbg(fmt, ...) otx2_dbg(npc, fmt, ##__VA_ARGS__)
-#define otx2_tm_dbg(fmt, ...) otx2_dbg(tm, fmt, ##__VA_ARGS__)
-#define otx2_tim_dbg(fmt, ...) otx2_dbg(tim, fmt, ##__VA_ARGS__)
-#define otx2_dpi_dbg(fmt, ...) otx2_dbg(dpi, fmt, ##__VA_ARGS__)
-#define otx2_sdp_dbg(fmt, ...) otx2_dbg(ep, fmt, ##__VA_ARGS__)
-#define otx2_ree_dbg(fmt, ...) otx2_dbg(ree, fmt, ##__VA_ARGS__)
-
-/* PCI IDs */
-#define PCI_VENDOR_ID_CAVIUM			0x177D
-#define PCI_DEVID_OCTEONTX2_RVU_PF              0xA063
-#define PCI_DEVID_OCTEONTX2_RVU_VF		0xA064
-#define PCI_DEVID_OCTEONTX2_RVU_AF		0xA065
-#define PCI_DEVID_OCTEONTX2_RVU_SSO_TIM_PF	0xA0F9
-#define PCI_DEVID_OCTEONTX2_RVU_SSO_TIM_VF	0xA0FA
-#define PCI_DEVID_OCTEONTX2_RVU_NPA_PF		0xA0FB
-#define PCI_DEVID_OCTEONTX2_RVU_NPA_VF		0xA0FC
-#define PCI_DEVID_OCTEONTX2_RVU_CPT_PF		0xA0FD
-#define PCI_DEVID_OCTEONTX2_RVU_CPT_VF		0xA0FE
-#define PCI_DEVID_OCTEONTX2_RVU_AF_VF		0xA0f8
-#define PCI_DEVID_OCTEONTX2_DPI_VF		0xA081
-#define PCI_DEVID_OCTEONTX2_EP_NET_VF		0xB203 /* OCTEON TX2 EP mode */
-/* OCTEON TX2 98xx EP mode */
-#define PCI_DEVID_CN98XX_EP_NET_VF		0xB103
-#define PCI_DEVID_OCTEONTX2_EP_RAW_VF		0xB204 /* OCTEON TX2 EP mode */
-#define PCI_DEVID_OCTEONTX2_RVU_SDP_PF		0xA0f6
-#define PCI_DEVID_OCTEONTX2_RVU_SDP_VF		0xA0f7
-#define PCI_DEVID_OCTEONTX2_RVU_REE_PF		0xA0f4
-#define PCI_DEVID_OCTEONTX2_RVU_REE_VF		0xA0f5
-
-/*
- * REVID for RVU PCIe devices.
- * Bits 0..1: minor pass
- * Bits 3..2: major pass
- * Bits 7..4: midr id, 0:96, 1:95, 2:loki, f:unknown
- */
-
-#define RVU_PCI_REV_MIDR_ID(rev_id)		(rev_id >> 4)
-#define RVU_PCI_REV_MAJOR(rev_id)		((rev_id >> 2) & 0x3)
-#define RVU_PCI_REV_MINOR(rev_id)		(rev_id & 0x3)
-
-#define RVU_PCI_CN96XX_MIDR_ID			0x0
-#define RVU_PCI_CNF95XX_MIDR_ID			0x1
-
-/* PCI Config offsets */
-#define RVU_PCI_REVISION_ID			0x08
-
-/* IO Access */
-#define otx2_read64(addr) rte_read64_relaxed((void *)(addr))
-#define otx2_write64(val, addr) rte_write64_relaxed((val), (void *)(addr))
-
-#if defined(RTE_ARCH_ARM64)
-#include "otx2_io_arm64.h"
-#else
-#include "otx2_io_generic.h"
-#endif
-
-/* Fastpath lookup */
-#define OTX2_NIX_FASTPATH_LOOKUP_MEM	"otx2_nix_fastpath_lookup_mem"
-#define OTX2_NIX_SA_TBL_START		(4096*4 + 69632*2)
-
-#endif /* _OTX2_COMMON_H_ */
diff --git a/drivers/common/octeontx2/otx2_dev.c b/drivers/common/octeontx2/otx2_dev.c
deleted file mode 100644
index 08dca87848..0000000000
--- a/drivers/common/octeontx2/otx2_dev.c
+++ /dev/null
@@ -1,1074 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <fcntl.h>
-#include <inttypes.h>
-#include <sys/mman.h>
-#include <unistd.h>
-
-#include <rte_alarm.h>
-#include <rte_common.h>
-#include <rte_eal.h>
-#include <rte_memcpy.h>
-#include <rte_eal_paging.h>
-
-#include "otx2_dev.h"
-#include "otx2_mbox.h"
-
-#define RVU_MAX_VF		64 /* RVU_PF_VFPF_MBOX_INT(0..1) */
-#define RVU_MAX_INT_RETRY	3
-
-/* PF/VF message handling timer */
-#define VF_PF_MBOX_TIMER_MS	(20 * 1000)
-
-static void *
-mbox_mem_map(off_t off, size_t size)
-{
-	void *va = MAP_FAILED;
-	int mem_fd;
-
-	if (size <= 0)
-		goto error;
-
-	mem_fd = open("/dev/mem", O_RDWR);
-	if (mem_fd < 0)
-		goto error;
-
-	va = rte_mem_map(NULL, size, RTE_PROT_READ | RTE_PROT_WRITE,
-			RTE_MAP_SHARED, mem_fd, off);
-	close(mem_fd);
-
-	if (va == NULL)
-		otx2_err("Failed to mmap sz=0x%zx, fd=%d, off=%jd",
-			 size, mem_fd, (intmax_t)off);
-error:
-	return va;
-}
-
-static void
-mbox_mem_unmap(void *va, size_t size)
-{
-	if (va)
-		rte_mem_unmap(va, size);
-}
-
-static int
-pf_af_sync_msg(struct otx2_dev *dev, struct mbox_msghdr **rsp)
-{
-	uint32_t timeout = 0, sleep = 1; struct otx2_mbox *mbox = dev->mbox;
-	struct otx2_mbox_dev *mdev = &mbox->dev[0];
-	volatile uint64_t int_status;
-	struct mbox_msghdr *msghdr;
-	uint64_t off;
-	int rc = 0;
-
-	/* We need to disable PF interrupts. We are in timer interrupt */
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT_ENA_W1C);
-
-	/* Send message */
-	otx2_mbox_msg_send(mbox, 0);
-
-	do {
-		rte_delay_ms(sleep);
-		timeout += sleep;
-		if (timeout >= MBOX_RSP_TIMEOUT) {
-			otx2_err("Message timeout: %dms", MBOX_RSP_TIMEOUT);
-			rc = -EIO;
-			break;
-		}
-		int_status = otx2_read64(dev->bar2 + RVU_PF_INT);
-	} while ((int_status & 0x1) != 0x1);
-
-	/* Clear */
-	otx2_write64(int_status, dev->bar2 + RVU_PF_INT);
-
-	/* Enable interrupts */
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT_ENA_W1S);
-
-	if (rc == 0) {
-		/* Get message */
-		off = mbox->rx_start +
-			RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-		msghdr = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + off);
-		if (rsp)
-			*rsp = msghdr;
-		rc = msghdr->rc;
-	}
-
-	return rc;
-}
-
-static int
-af_pf_wait_msg(struct otx2_dev *dev, uint16_t vf, int num_msg)
-{
-	uint32_t timeout = 0, sleep = 1; struct otx2_mbox *mbox = dev->mbox;
-	struct otx2_mbox_dev *mdev = &mbox->dev[0];
-	volatile uint64_t int_status;
-	struct mbox_hdr *req_hdr;
-	struct mbox_msghdr *msg;
-	struct mbox_msghdr *rsp;
-	uint64_t offset;
-	size_t size;
-	int i;
-
-	/* We need to disable PF interrupts. We are in timer interrupt */
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT_ENA_W1C);
-
-	/* Send message */
-	otx2_mbox_msg_send(mbox, 0);
-
-	do {
-		rte_delay_ms(sleep);
-		timeout++;
-		if (timeout >= MBOX_RSP_TIMEOUT) {
-			otx2_err("Routed messages %d timeout: %dms",
-				 num_msg, MBOX_RSP_TIMEOUT);
-			break;
-		}
-		int_status = otx2_read64(dev->bar2 + RVU_PF_INT);
-	} while ((int_status & 0x1) != 0x1);
-
-	/* Clear */
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT);
-
-	/* Enable interrupts */
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT_ENA_W1S);
-
-	rte_spinlock_lock(&mdev->mbox_lock);
-
-	req_hdr = (struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->rx_start);
-	if (req_hdr->num_msgs != num_msg)
-		otx2_err("Routed messages: %d received: %d", num_msg,
-			 req_hdr->num_msgs);
-
-	/* Get messages from mbox */
-	offset = mbox->rx_start +
-			RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-	for (i = 0; i < req_hdr->num_msgs; i++) {
-		msg = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + offset);
-		size = mbox->rx_start + msg->next_msgoff - offset;
-
-		/* Reserve PF/VF mbox message */
-		size = RTE_ALIGN(size, MBOX_MSG_ALIGN);
-		rsp = otx2_mbox_alloc_msg(&dev->mbox_vfpf, vf, size);
-		otx2_mbox_rsp_init(msg->id, rsp);
-
-		/* Copy message from AF<->PF mbox to PF<->VF mbox */
-		otx2_mbox_memcpy((uint8_t *)rsp + sizeof(struct mbox_msghdr),
-				 (uint8_t *)msg + sizeof(struct mbox_msghdr),
-				 size - sizeof(struct mbox_msghdr));
-
-		/* Set status and sender pf_func data */
-		rsp->rc = msg->rc;
-		rsp->pcifunc = msg->pcifunc;
-
-		/* Whenever a PF comes up, AF sends the link status to it but
-		 * when VF comes up no such event is sent to respective VF.
-		 * Using MBOX_MSG_NIX_LF_START_RX response from AF for the
-		 * purpose and send the link status of PF to VF.
-		 */
-		if (msg->id == MBOX_MSG_NIX_LF_START_RX) {
-			/* Send link status to VF */
-			struct cgx_link_user_info linfo;
-			struct mbox_msghdr *vf_msg;
-			size_t sz;
-
-			/* Get the link status */
-			if (dev->ops && dev->ops->link_status_get)
-				dev->ops->link_status_get(dev, &linfo);
-
-			sz = RTE_ALIGN(otx2_mbox_id2size(
-				MBOX_MSG_CGX_LINK_EVENT), MBOX_MSG_ALIGN);
-			/* Prepare the message to be sent */
-			vf_msg = otx2_mbox_alloc_msg(&dev->mbox_vfpf_up, vf,
-						     sz);
-			otx2_mbox_req_init(MBOX_MSG_CGX_LINK_EVENT, vf_msg);
-			memcpy((uint8_t *)vf_msg + sizeof(struct mbox_msghdr),
-			       &linfo, sizeof(struct cgx_link_user_info));
-
-			vf_msg->rc = msg->rc;
-			vf_msg->pcifunc = msg->pcifunc;
-			/* Send to VF */
-			otx2_mbox_msg_send(&dev->mbox_vfpf_up, vf);
-		}
-		offset = mbox->rx_start + msg->next_msgoff;
-	}
-	rte_spinlock_unlock(&mdev->mbox_lock);
-
-	return req_hdr->num_msgs;
-}
-
-static int
-vf_pf_process_msgs(struct otx2_dev *dev, uint16_t vf)
-{
-	int offset, routed = 0; struct otx2_mbox *mbox = &dev->mbox_vfpf;
-	struct otx2_mbox_dev *mdev = &mbox->dev[vf];
-	struct mbox_hdr *req_hdr;
-	struct mbox_msghdr *msg;
-	size_t size;
-	uint16_t i;
-
-	req_hdr = (struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->rx_start);
-	if (!req_hdr->num_msgs)
-		return 0;
-
-	offset = mbox->rx_start + RTE_ALIGN(sizeof(*req_hdr), MBOX_MSG_ALIGN);
-
-	for (i = 0; i < req_hdr->num_msgs; i++) {
-
-		msg = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + offset);
-		size = mbox->rx_start + msg->next_msgoff - offset;
-
-		/* RVU_PF_FUNC_S */
-		msg->pcifunc = otx2_pfvf_func(dev->pf, vf);
-
-		if (msg->id == MBOX_MSG_READY) {
-			struct ready_msg_rsp *rsp;
-			uint16_t max_bits = sizeof(dev->active_vfs[0]) * 8;
-
-			/* Handle READY message in PF */
-			dev->active_vfs[vf / max_bits] |=
-						BIT_ULL(vf % max_bits);
-			rsp = (struct ready_msg_rsp *)
-			       otx2_mbox_alloc_msg(mbox, vf, sizeof(*rsp));
-			otx2_mbox_rsp_init(msg->id, rsp);
-
-			/* PF/VF function ID */
-			rsp->hdr.pcifunc = msg->pcifunc;
-			rsp->hdr.rc = 0;
-		} else {
-			struct mbox_msghdr *af_req;
-			/* Reserve AF/PF mbox message */
-			size = RTE_ALIGN(size, MBOX_MSG_ALIGN);
-			af_req = otx2_mbox_alloc_msg(dev->mbox, 0, size);
-			otx2_mbox_req_init(msg->id, af_req);
-
-			/* Copy message from VF<->PF mbox to PF<->AF mbox */
-			otx2_mbox_memcpy((uint8_t *)af_req +
-				   sizeof(struct mbox_msghdr),
-				   (uint8_t *)msg + sizeof(struct mbox_msghdr),
-				   size - sizeof(struct mbox_msghdr));
-			af_req->pcifunc = msg->pcifunc;
-			routed++;
-		}
-		offset = mbox->rx_start + msg->next_msgoff;
-	}
-
-	if (routed > 0) {
-		otx2_base_dbg("pf:%d routed %d messages from vf:%d to AF",
-			      dev->pf, routed, vf);
-		af_pf_wait_msg(dev, vf, routed);
-		otx2_mbox_reset(dev->mbox, 0);
-	}
-
-	/* Send mbox responses to VF */
-	if (mdev->num_msgs) {
-		otx2_base_dbg("pf:%d reply %d messages to vf:%d",
-			      dev->pf, mdev->num_msgs, vf);
-		otx2_mbox_msg_send(mbox, vf);
-	}
-
-	return i;
-}
-
-static int
-vf_pf_process_up_msgs(struct otx2_dev *dev, uint16_t vf)
-{
-	struct otx2_mbox *mbox = &dev->mbox_vfpf_up;
-	struct otx2_mbox_dev *mdev = &mbox->dev[vf];
-	struct mbox_hdr *req_hdr;
-	struct mbox_msghdr *msg;
-	int msgs_acked = 0;
-	int offset;
-	uint16_t i;
-
-	req_hdr = (struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->rx_start);
-	if (req_hdr->num_msgs == 0)
-		return 0;
-
-	offset = mbox->rx_start + RTE_ALIGN(sizeof(*req_hdr), MBOX_MSG_ALIGN);
-
-	for (i = 0; i < req_hdr->num_msgs; i++) {
-		msg = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + offset);
-
-		msgs_acked++;
-		/* RVU_PF_FUNC_S */
-		msg->pcifunc = otx2_pfvf_func(dev->pf, vf);
-
-		switch (msg->id) {
-		case MBOX_MSG_CGX_LINK_EVENT:
-			otx2_base_dbg("PF: Msg 0x%x (%s) fn:0x%x (pf:%d,vf:%d)",
-				      msg->id, otx2_mbox_id2name(msg->id),
-				      msg->pcifunc, otx2_get_pf(msg->pcifunc),
-				      otx2_get_vf(msg->pcifunc));
-			break;
-		case MBOX_MSG_CGX_PTP_RX_INFO:
-			otx2_base_dbg("PF: Msg 0x%x (%s) fn:0x%x (pf:%d,vf:%d)",
-				      msg->id, otx2_mbox_id2name(msg->id),
-				      msg->pcifunc, otx2_get_pf(msg->pcifunc),
-				      otx2_get_vf(msg->pcifunc));
-			break;
-		default:
-			otx2_err("Not handled UP msg 0x%x (%s) func:0x%x",
-				 msg->id, otx2_mbox_id2name(msg->id),
-				 msg->pcifunc);
-		}
-		offset = mbox->rx_start + msg->next_msgoff;
-	}
-	otx2_mbox_reset(mbox, vf);
-	mdev->msgs_acked = msgs_acked;
-	rte_wmb();
-
-	return i;
-}
-
-static void
-otx2_vf_pf_mbox_handle_msg(void *param)
-{
-	uint16_t vf, max_vf, max_bits;
-	struct otx2_dev *dev = param;
-
-	max_bits = sizeof(dev->intr.bits[0]) * sizeof(uint64_t);
-	max_vf = max_bits * MAX_VFPF_DWORD_BITS;
-
-	for (vf = 0; vf < max_vf; vf++) {
-		if (dev->intr.bits[vf/max_bits] & BIT_ULL(vf%max_bits)) {
-			otx2_base_dbg("Process vf:%d request (pf:%d, vf:%d)",
-				       vf, dev->pf, dev->vf);
-			vf_pf_process_msgs(dev, vf);
-			/* UP messages */
-			vf_pf_process_up_msgs(dev, vf);
-			dev->intr.bits[vf/max_bits] &= ~(BIT_ULL(vf%max_bits));
-		}
-	}
-	dev->timer_set = 0;
-}
-
-static void
-otx2_vf_pf_mbox_irq(void *param)
-{
-	struct otx2_dev *dev = param;
-	bool alarm_set = false;
-	uint64_t intr;
-	int vfpf;
-
-	for (vfpf = 0; vfpf < MAX_VFPF_DWORD_BITS; ++vfpf) {
-		intr = otx2_read64(dev->bar2 + RVU_PF_VFPF_MBOX_INTX(vfpf));
-		if (!intr)
-			continue;
-
-		otx2_base_dbg("vfpf: %d intr: 0x%" PRIx64 " (pf:%d, vf:%d)",
-			      vfpf, intr, dev->pf, dev->vf);
-
-		/* Save and clear intr bits */
-		dev->intr.bits[vfpf] |= intr;
-		otx2_write64(intr, dev->bar2 + RVU_PF_VFPF_MBOX_INTX(vfpf));
-		alarm_set = true;
-	}
-
-	if (!dev->timer_set && alarm_set) {
-		dev->timer_set = 1;
-		/* Start timer to handle messages */
-		rte_eal_alarm_set(VF_PF_MBOX_TIMER_MS,
-				  otx2_vf_pf_mbox_handle_msg, dev);
-	}
-}
-
-static void
-otx2_process_msgs(struct otx2_dev *dev, struct otx2_mbox *mbox)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[0];
-	struct mbox_hdr *req_hdr;
-	struct mbox_msghdr *msg;
-	int msgs_acked = 0;
-	int offset;
-	uint16_t i;
-
-	req_hdr = (struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->rx_start);
-	if (req_hdr->num_msgs == 0)
-		return;
-
-	offset = mbox->rx_start + RTE_ALIGN(sizeof(*req_hdr), MBOX_MSG_ALIGN);
-	for (i = 0; i < req_hdr->num_msgs; i++) {
-		msg = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + offset);
-
-		msgs_acked++;
-		otx2_base_dbg("Message 0x%x (%s) pf:%d/vf:%d",
-			      msg->id, otx2_mbox_id2name(msg->id),
-			      otx2_get_pf(msg->pcifunc),
-			      otx2_get_vf(msg->pcifunc));
-
-		switch (msg->id) {
-			/* Add message id's that are handled here */
-		case MBOX_MSG_READY:
-			/* Get our identity */
-			dev->pf_func = msg->pcifunc;
-			break;
-
-		default:
-			if (msg->rc)
-				otx2_err("Message (%s) response has err=%d",
-					 otx2_mbox_id2name(msg->id), msg->rc);
-			break;
-		}
-		offset = mbox->rx_start + msg->next_msgoff;
-	}
-
-	otx2_mbox_reset(mbox, 0);
-	/* Update acked if someone is waiting a message */
-	mdev->msgs_acked = msgs_acked;
-	rte_wmb();
-}
-
-/* Copies the message received from AF and sends it to VF */
-static void
-pf_vf_mbox_send_up_msg(struct otx2_dev *dev, void *rec_msg)
-{
-	uint16_t max_bits = sizeof(dev->active_vfs[0]) * sizeof(uint64_t);
-	struct otx2_mbox *vf_mbox = &dev->mbox_vfpf_up;
-	struct msg_req *msg = rec_msg;
-	struct mbox_msghdr *vf_msg;
-	uint16_t vf;
-	size_t size;
-
-	size = RTE_ALIGN(otx2_mbox_id2size(msg->hdr.id), MBOX_MSG_ALIGN);
-	/* Send UP message to all VF's */
-	for (vf = 0; vf < vf_mbox->ndevs; vf++) {
-		/* VF active */
-		if (!(dev->active_vfs[vf / max_bits] & (BIT_ULL(vf))))
-			continue;
-
-		otx2_base_dbg("(%s) size: %zx to VF: %d",
-			      otx2_mbox_id2name(msg->hdr.id), size, vf);
-
-		/* Reserve PF/VF mbox message */
-		vf_msg = otx2_mbox_alloc_msg(vf_mbox, vf, size);
-		if (!vf_msg) {
-			otx2_err("Failed to alloc VF%d UP message", vf);
-			continue;
-		}
-		otx2_mbox_req_init(msg->hdr.id, vf_msg);
-
-		/*
-		 * Copy message from AF<->PF UP mbox
-		 * to PF<->VF UP mbox
-		 */
-		otx2_mbox_memcpy((uint8_t *)vf_msg +
-				 sizeof(struct mbox_msghdr), (uint8_t *)msg
-				 + sizeof(struct mbox_msghdr), size -
-				 sizeof(struct mbox_msghdr));
-
-		vf_msg->rc = msg->hdr.rc;
-		/* Set PF to be a sender */
-		vf_msg->pcifunc = dev->pf_func;
-
-		/* Send to VF */
-		otx2_mbox_msg_send(vf_mbox, vf);
-	}
-}
-
-static int
-otx2_mbox_up_handler_cgx_link_event(struct otx2_dev *dev,
-				    struct cgx_link_info_msg *msg,
-				    struct msg_rsp *rsp)
-{
-	struct cgx_link_user_info *linfo = &msg->link_info;
-
-	otx2_base_dbg("pf:%d/vf:%d NIC Link %s --> 0x%x (%s) from: pf:%d/vf:%d",
-		      otx2_get_pf(dev->pf_func), otx2_get_vf(dev->pf_func),
-		      linfo->link_up ? "UP" : "DOWN", msg->hdr.id,
-		      otx2_mbox_id2name(msg->hdr.id),
-		      otx2_get_pf(msg->hdr.pcifunc),
-		      otx2_get_vf(msg->hdr.pcifunc));
-
-	/* PF gets link notification from AF */
-	if (otx2_get_pf(msg->hdr.pcifunc) == 0) {
-		if (dev->ops && dev->ops->link_status_update)
-			dev->ops->link_status_update(dev, linfo);
-
-		/* Forward the same message as received from AF to VF */
-		pf_vf_mbox_send_up_msg(dev, msg);
-	} else {
-		/* VF gets link up notification */
-		if (dev->ops && dev->ops->link_status_update)
-			dev->ops->link_status_update(dev, linfo);
-	}
-
-	rsp->hdr.rc = 0;
-	return 0;
-}
-
-static int
-otx2_mbox_up_handler_cgx_ptp_rx_info(struct otx2_dev *dev,
-				     struct cgx_ptp_rx_info_msg *msg,
-				     struct msg_rsp *rsp)
-{
-	otx2_nix_dbg("pf:%d/vf:%d PTP mode %s --> 0x%x (%s) from: pf:%d/vf:%d",
-		 otx2_get_pf(dev->pf_func),
-		 otx2_get_vf(dev->pf_func),
-		 msg->ptp_en ? "ENABLED" : "DISABLED",
-		 msg->hdr.id, otx2_mbox_id2name(msg->hdr.id),
-		 otx2_get_pf(msg->hdr.pcifunc),
-		 otx2_get_vf(msg->hdr.pcifunc));
-
-	/* PF gets PTP notification from AF */
-	if (otx2_get_pf(msg->hdr.pcifunc) == 0) {
-		if (dev->ops && dev->ops->ptp_info_update)
-			dev->ops->ptp_info_update(dev, msg->ptp_en);
-
-		/* Forward the same message as received from AF to VF */
-		pf_vf_mbox_send_up_msg(dev, msg);
-	} else {
-		/* VF gets PTP notification */
-		if (dev->ops && dev->ops->ptp_info_update)
-			dev->ops->ptp_info_update(dev, msg->ptp_en);
-	}
-
-	rsp->hdr.rc = 0;
-	return 0;
-}
-
-static int
-mbox_process_msgs_up(struct otx2_dev *dev, struct mbox_msghdr *req)
-{
-	/* Check if valid, if not reply with a invalid msg */
-	if (req->sig != OTX2_MBOX_REQ_SIG)
-		return -EIO;
-
-	switch (req->id) {
-#define M(_name, _id, _fn_name, _req_type, _rsp_type)		\
-	case _id: {						\
-		struct _rsp_type *rsp;				\
-		int err;					\
-								\
-		rsp = (struct _rsp_type *)otx2_mbox_alloc_msg(	\
-			&dev->mbox_up, 0,			\
-			sizeof(struct _rsp_type));		\
-		if (!rsp)					\
-			return -ENOMEM;				\
-								\
-		rsp->hdr.id = _id;				\
-		rsp->hdr.sig = OTX2_MBOX_RSP_SIG;		\
-		rsp->hdr.pcifunc = dev->pf_func;		\
-		rsp->hdr.rc = 0;				\
-								\
-		err = otx2_mbox_up_handler_ ## _fn_name(	\
-			dev, (struct _req_type *)req, rsp);	\
-		return err;					\
-	}
-MBOX_UP_CGX_MESSAGES
-#undef M
-
-	default :
-		otx2_reply_invalid_msg(&dev->mbox_up, 0, 0, req->id);
-	}
-
-	return -ENODEV;
-}
-
-static void
-otx2_process_msgs_up(struct otx2_dev *dev, struct otx2_mbox *mbox)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[0];
-	struct mbox_hdr *req_hdr;
-	struct mbox_msghdr *msg;
-	int i, err, offset;
-
-	req_hdr = (struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->rx_start);
-	if (req_hdr->num_msgs == 0)
-		return;
-
-	offset = mbox->rx_start + RTE_ALIGN(sizeof(*req_hdr), MBOX_MSG_ALIGN);
-	for (i = 0; i < req_hdr->num_msgs; i++) {
-		msg = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + offset);
-
-		otx2_base_dbg("Message 0x%x (%s) pf:%d/vf:%d",
-				msg->id, otx2_mbox_id2name(msg->id),
-				otx2_get_pf(msg->pcifunc),
-				otx2_get_vf(msg->pcifunc));
-		err = mbox_process_msgs_up(dev, msg);
-		if (err)
-			otx2_err("Error %d handling 0x%x (%s)",
-				 err, msg->id, otx2_mbox_id2name(msg->id));
-		offset = mbox->rx_start + msg->next_msgoff;
-	}
-	/* Send mbox responses */
-	if (mdev->num_msgs) {
-		otx2_base_dbg("Reply num_msgs:%d", mdev->num_msgs);
-		otx2_mbox_msg_send(mbox, 0);
-	}
-}
-
-static void
-otx2_pf_vf_mbox_irq(void *param)
-{
-	struct otx2_dev *dev = param;
-	uint64_t intr;
-
-	intr = otx2_read64(dev->bar2 + RVU_VF_INT);
-	if (intr == 0)
-		otx2_base_dbg("Proceeding to check mbox UP messages if any");
-
-	otx2_write64(intr, dev->bar2 + RVU_VF_INT);
-	otx2_base_dbg("Irq 0x%" PRIx64 "(pf:%d,vf:%d)", intr, dev->pf, dev->vf);
-
-	/* First process all configuration messages */
-	otx2_process_msgs(dev, dev->mbox);
-
-	/* Process Uplink messages */
-	otx2_process_msgs_up(dev, &dev->mbox_up);
-}
-
-static void
-otx2_af_pf_mbox_irq(void *param)
-{
-	struct otx2_dev *dev = param;
-	uint64_t intr;
-
-	intr = otx2_read64(dev->bar2 + RVU_PF_INT);
-	if (intr == 0)
-		otx2_base_dbg("Proceeding to check mbox UP messages if any");
-
-	otx2_write64(intr, dev->bar2 + RVU_PF_INT);
-	otx2_base_dbg("Irq 0x%" PRIx64 "(pf:%d,vf:%d)", intr, dev->pf, dev->vf);
-
-	/* First process all configuration messages */
-	otx2_process_msgs(dev, dev->mbox);
-
-	/* Process Uplink messages */
-	otx2_process_msgs_up(dev, &dev->mbox_up);
-}
-
-static int
-mbox_register_pf_irq(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
-	int i, rc;
-
-	/* HW clear irq */
-	for (i = 0; i < MAX_VFPF_DWORD_BITS; ++i)
-		otx2_write64(~0ull, dev->bar2 +
-			     RVU_PF_VFPF_MBOX_INT_ENA_W1CX(i));
-
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT_ENA_W1C);
-
-	dev->timer_set = 0;
-
-	/* MBOX interrupt for VF(0...63) <-> PF */
-	rc = otx2_register_irq(intr_handle, otx2_vf_pf_mbox_irq, dev,
-			       RVU_PF_INT_VEC_VFPF_MBOX0);
-
-	if (rc) {
-		otx2_err("Fail to register PF(VF0-63) mbox irq");
-		return rc;
-	}
-	/* MBOX interrupt for VF(64...128) <-> PF */
-	rc = otx2_register_irq(intr_handle, otx2_vf_pf_mbox_irq, dev,
-			       RVU_PF_INT_VEC_VFPF_MBOX1);
-
-	if (rc) {
-		otx2_err("Fail to register PF(VF64-128) mbox irq");
-		return rc;
-	}
-	/* MBOX interrupt AF <-> PF */
-	rc = otx2_register_irq(intr_handle, otx2_af_pf_mbox_irq,
-			       dev, RVU_PF_INT_VEC_AFPF_MBOX);
-	if (rc) {
-		otx2_err("Fail to register AF<->PF mbox irq");
-		return rc;
-	}
-
-	/* HW enable intr */
-	for (i = 0; i < MAX_VFPF_DWORD_BITS; ++i)
-		otx2_write64(~0ull, dev->bar2 +
-			RVU_PF_VFPF_MBOX_INT_ENA_W1SX(i));
-
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT);
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT_ENA_W1S);
-
-	return rc;
-}
-
-static int
-mbox_register_vf_irq(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
-	int rc;
-
-	/* Clear irq */
-	otx2_write64(~0ull, dev->bar2 + RVU_VF_INT_ENA_W1C);
-
-	/* MBOX interrupt PF <-> VF */
-	rc = otx2_register_irq(intr_handle, otx2_pf_vf_mbox_irq,
-			       dev, RVU_VF_INT_VEC_MBOX);
-	if (rc) {
-		otx2_err("Fail to register PF<->VF mbox irq");
-		return rc;
-	}
-
-	/* HW enable intr */
-	otx2_write64(~0ull, dev->bar2 + RVU_VF_INT);
-	otx2_write64(~0ull, dev->bar2 + RVU_VF_INT_ENA_W1S);
-
-	return rc;
-}
-
-static int
-mbox_register_irq(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	if (otx2_dev_is_vf(dev))
-		return mbox_register_vf_irq(pci_dev, dev);
-	else
-		return mbox_register_pf_irq(pci_dev, dev);
-}
-
-static void
-mbox_unregister_pf_irq(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
-	int i;
-
-	/* HW clear irq */
-	for (i = 0; i < MAX_VFPF_DWORD_BITS; ++i)
-		otx2_write64(~0ull, dev->bar2 +
-			     RVU_PF_VFPF_MBOX_INT_ENA_W1CX(i));
-
-	otx2_write64(~0ull, dev->bar2 + RVU_PF_INT_ENA_W1C);
-
-	dev->timer_set = 0;
-
-	rte_eal_alarm_cancel(otx2_vf_pf_mbox_handle_msg, dev);
-
-	/* Unregister the interrupt handler for each vectors */
-	/* MBOX interrupt for VF(0...63) <-> PF */
-	otx2_unregister_irq(intr_handle, otx2_vf_pf_mbox_irq, dev,
-			    RVU_PF_INT_VEC_VFPF_MBOX0);
-
-	/* MBOX interrupt for VF(64...128) <-> PF */
-	otx2_unregister_irq(intr_handle, otx2_vf_pf_mbox_irq, dev,
-			    RVU_PF_INT_VEC_VFPF_MBOX1);
-
-	/* MBOX interrupt AF <-> PF */
-	otx2_unregister_irq(intr_handle, otx2_af_pf_mbox_irq, dev,
-			    RVU_PF_INT_VEC_AFPF_MBOX);
-
-}
-
-static void
-mbox_unregister_vf_irq(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
-
-	/* Clear irq */
-	otx2_write64(~0ull, dev->bar2 + RVU_VF_INT_ENA_W1C);
-
-	/* Unregister the interrupt handler */
-	otx2_unregister_irq(intr_handle, otx2_pf_vf_mbox_irq, dev,
-			    RVU_VF_INT_VEC_MBOX);
-}
-
-static void
-mbox_unregister_irq(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	if (otx2_dev_is_vf(dev))
-		mbox_unregister_vf_irq(pci_dev, dev);
-	else
-		mbox_unregister_pf_irq(pci_dev, dev);
-}
-
-static int
-vf_flr_send_msg(struct otx2_dev *dev, uint16_t vf)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct msg_req *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_vf_flr(mbox);
-	/* Overwrite pcifunc to indicate VF */
-	req->hdr.pcifunc = otx2_pfvf_func(dev->pf, vf);
-
-	/* Sync message in interrupt context */
-	rc = pf_af_sync_msg(dev, NULL);
-	if (rc)
-		otx2_err("Failed to send VF FLR mbox msg, rc=%d", rc);
-
-	return rc;
-}
-
-static void
-otx2_pf_vf_flr_irq(void *param)
-{
-	struct otx2_dev *dev = (struct otx2_dev *)param;
-	uint16_t max_vf = 64, vf;
-	uintptr_t bar2;
-	uint64_t intr;
-	int i;
-
-	max_vf = (dev->maxvf > 0) ? dev->maxvf : 64;
-	bar2 = dev->bar2;
-
-	otx2_base_dbg("FLR VF interrupt: max_vf: %d", max_vf);
-
-	for (i = 0; i < MAX_VFPF_DWORD_BITS; ++i) {
-		intr = otx2_read64(bar2 + RVU_PF_VFFLR_INTX(i));
-		if (!intr)
-			continue;
-
-		for (vf = 0; vf < max_vf; vf++) {
-			if (!(intr & (1ULL << vf)))
-				continue;
-
-			otx2_base_dbg("FLR: i :%d intr: 0x%" PRIx64 ", vf-%d",
-				      i, intr, (64 * i + vf));
-			/* Clear interrupt */
-			otx2_write64(BIT_ULL(vf), bar2 + RVU_PF_VFFLR_INTX(i));
-			/* Disable the interrupt */
-			otx2_write64(BIT_ULL(vf),
-				     bar2 + RVU_PF_VFFLR_INT_ENA_W1CX(i));
-			/* Inform AF about VF reset */
-			vf_flr_send_msg(dev, vf);
-
-			/* Signal FLR finish */
-			otx2_write64(BIT_ULL(vf), bar2 + RVU_PF_VFTRPENDX(i));
-			/* Enable interrupt */
-			otx2_write64(~0ull,
-				     bar2 + RVU_PF_VFFLR_INT_ENA_W1SX(i));
-		}
-	}
-}
-
-static int
-vf_flr_unregister_irqs(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
-	int i;
-
-	otx2_base_dbg("Unregister VF FLR interrupts for %s", pci_dev->name);
-
-	/* HW clear irq */
-	for (i = 0; i < MAX_VFPF_DWORD_BITS; i++)
-		otx2_write64(~0ull, dev->bar2 + RVU_PF_VFFLR_INT_ENA_W1CX(i));
-
-	otx2_unregister_irq(intr_handle, otx2_pf_vf_flr_irq, dev,
-			    RVU_PF_INT_VEC_VFFLR0);
-
-	otx2_unregister_irq(intr_handle, otx2_pf_vf_flr_irq, dev,
-			    RVU_PF_INT_VEC_VFFLR1);
-
-	return 0;
-}
-
-static int
-vf_flr_register_irqs(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int i, rc;
-
-	otx2_base_dbg("Register VF FLR interrupts for %s", pci_dev->name);
-
-	rc = otx2_register_irq(handle, otx2_pf_vf_flr_irq, dev,
-			       RVU_PF_INT_VEC_VFFLR0);
-	if (rc)
-		otx2_err("Failed to init RVU_PF_INT_VEC_VFFLR0 rc=%d", rc);
-
-	rc = otx2_register_irq(handle, otx2_pf_vf_flr_irq, dev,
-			       RVU_PF_INT_VEC_VFFLR1);
-	if (rc)
-		otx2_err("Failed to init RVU_PF_INT_VEC_VFFLR1 rc=%d", rc);
-
-	/* Enable HW interrupt */
-	for (i = 0; i < MAX_VFPF_DWORD_BITS; ++i) {
-		otx2_write64(~0ull, dev->bar2 + RVU_PF_VFFLR_INTX(i));
-		otx2_write64(~0ull, dev->bar2 + RVU_PF_VFTRPENDX(i));
-		otx2_write64(~0ull, dev->bar2 + RVU_PF_VFFLR_INT_ENA_W1SX(i));
-	}
-	return 0;
-}
-
-/**
- * @internal
- * Get number of active VFs for the given PF device.
- */
-int
-otx2_dev_active_vfs(void *otx2_dev)
-{
-	struct otx2_dev *dev = otx2_dev;
-	int i, count = 0;
-
-	for (i = 0; i < MAX_VFPF_DWORD_BITS; i++)
-		count += __builtin_popcount(dev->active_vfs[i]);
-
-	return count;
-}
-
-static void
-otx2_update_vf_hwcap(struct rte_pci_device *pci_dev, struct otx2_dev *dev)
-{
-	switch (pci_dev->id.device_id) {
-	case PCI_DEVID_OCTEONTX2_RVU_PF:
-		break;
-	case PCI_DEVID_OCTEONTX2_RVU_SSO_TIM_VF:
-	case PCI_DEVID_OCTEONTX2_RVU_NPA_VF:
-	case PCI_DEVID_OCTEONTX2_RVU_CPT_VF:
-	case PCI_DEVID_OCTEONTX2_RVU_AF_VF:
-	case PCI_DEVID_OCTEONTX2_RVU_VF:
-	case PCI_DEVID_OCTEONTX2_RVU_SDP_VF:
-		dev->hwcap |= OTX2_HWCAP_F_VF;
-		break;
-	}
-}
-
-/**
- * @internal
- * Initialize the otx2 device
- */
-int
-otx2_dev_priv_init(struct rte_pci_device *pci_dev, void *otx2_dev)
-{
-	int up_direction = MBOX_DIR_PFAF_UP;
-	int rc, direction = MBOX_DIR_PFAF;
-	uint64_t intr_offset = RVU_PF_INT;
-	struct otx2_dev *dev = otx2_dev;
-	uintptr_t bar2, bar4;
-	uint64_t bar4_addr;
-	void *hwbase;
-
-	bar2 = (uintptr_t)pci_dev->mem_resource[2].addr;
-	bar4 = (uintptr_t)pci_dev->mem_resource[4].addr;
-
-	if (bar2 == 0 || bar4 == 0) {
-		otx2_err("Failed to get pci bars");
-		rc = -ENODEV;
-		goto error;
-	}
-
-	dev->node = pci_dev->device.numa_node;
-	dev->maxvf = pci_dev->max_vfs;
-	dev->bar2 = bar2;
-	dev->bar4 = bar4;
-
-	otx2_update_vf_hwcap(pci_dev, dev);
-
-	if (otx2_dev_is_vf(dev)) {
-		direction = MBOX_DIR_VFPF;
-		up_direction = MBOX_DIR_VFPF_UP;
-		intr_offset = RVU_VF_INT;
-	}
-
-	/* Initialize the local mbox */
-	rc = otx2_mbox_init(&dev->mbox_local, bar4, bar2, direction, 1,
-			    intr_offset);
-	if (rc)
-		goto error;
-	dev->mbox = &dev->mbox_local;
-
-	rc = otx2_mbox_init(&dev->mbox_up, bar4, bar2, up_direction, 1,
-			    intr_offset);
-	if (rc)
-		goto error;
-
-	/* Register mbox interrupts */
-	rc = mbox_register_irq(pci_dev, dev);
-	if (rc)
-		goto mbox_fini;
-
-	/* Check the readiness of PF/VF */
-	rc = otx2_send_ready_msg(dev->mbox, &dev->pf_func);
-	if (rc)
-		goto mbox_unregister;
-
-	dev->pf = otx2_get_pf(dev->pf_func);
-	dev->vf = otx2_get_vf(dev->pf_func);
-	memset(&dev->active_vfs, 0, sizeof(dev->active_vfs));
-
-	/* Found VF devices in a PF device */
-	if (pci_dev->max_vfs > 0) {
-
-		/* Remap mbox area for all vf's */
-		bar4_addr = otx2_read64(bar2 + RVU_PF_VF_BAR4_ADDR);
-		if (bar4_addr == 0) {
-			rc = -ENODEV;
-			goto mbox_fini;
-		}
-
-		hwbase = mbox_mem_map(bar4_addr, MBOX_SIZE * pci_dev->max_vfs);
-		if (hwbase == MAP_FAILED) {
-			rc = -ENOMEM;
-			goto mbox_fini;
-		}
-		/* Init mbox object */
-		rc = otx2_mbox_init(&dev->mbox_vfpf, (uintptr_t)hwbase,
-				    bar2, MBOX_DIR_PFVF, pci_dev->max_vfs,
-				    intr_offset);
-		if (rc)
-			goto iounmap;
-
-		/* PF -> VF UP messages */
-		rc = otx2_mbox_init(&dev->mbox_vfpf_up, (uintptr_t)hwbase,
-				    bar2, MBOX_DIR_PFVF_UP, pci_dev->max_vfs,
-				    intr_offset);
-		if (rc)
-			goto mbox_fini;
-	}
-
-	/* Register VF-FLR irq handlers */
-	if (otx2_dev_is_pf(dev)) {
-		rc = vf_flr_register_irqs(pci_dev, dev);
-		if (rc)
-			goto iounmap;
-	}
-	dev->mbox_active = 1;
-	return rc;
-
-iounmap:
-	mbox_mem_unmap(hwbase, MBOX_SIZE * pci_dev->max_vfs);
-mbox_unregister:
-	mbox_unregister_irq(pci_dev, dev);
-mbox_fini:
-	otx2_mbox_fini(dev->mbox);
-	otx2_mbox_fini(&dev->mbox_up);
-error:
-	return rc;
-}
-
-/**
- * @internal
- * Finalize the otx2 device
- */
-void
-otx2_dev_fini(struct rte_pci_device *pci_dev, void *otx2_dev)
-{
-	struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
-	struct otx2_dev *dev = otx2_dev;
-	struct otx2_idev_cfg *idev;
-	struct otx2_mbox *mbox;
-
-	/* Clear references to this pci dev */
-	idev = otx2_intra_dev_get_cfg();
-	if (idev->npa_lf && idev->npa_lf->pci_dev == pci_dev)
-		idev->npa_lf = NULL;
-
-	mbox_unregister_irq(pci_dev, dev);
-
-	if (otx2_dev_is_pf(dev))
-		vf_flr_unregister_irqs(pci_dev, dev);
-	/* Release PF - VF */
-	mbox = &dev->mbox_vfpf;
-	if (mbox->hwbase && mbox->dev)
-		mbox_mem_unmap((void *)mbox->hwbase,
-			       MBOX_SIZE * pci_dev->max_vfs);
-	otx2_mbox_fini(mbox);
-	mbox = &dev->mbox_vfpf_up;
-	otx2_mbox_fini(mbox);
-
-	/* Release PF - AF */
-	mbox = dev->mbox;
-	otx2_mbox_fini(mbox);
-	mbox = &dev->mbox_up;
-	otx2_mbox_fini(mbox);
-	dev->mbox_active = 0;
-
-	/* Disable MSIX vectors */
-	otx2_disable_irqs(intr_handle);
-}
diff --git a/drivers/common/octeontx2/otx2_dev.h b/drivers/common/octeontx2/otx2_dev.h
deleted file mode 100644
index d5b2b0d9af..0000000000
--- a/drivers/common/octeontx2/otx2_dev.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_DEV_H
-#define _OTX2_DEV_H
-
-#include <rte_bus_pci.h>
-
-#include "otx2_common.h"
-#include "otx2_irq.h"
-#include "otx2_mbox.h"
-#include "otx2_mempool.h"
-
-/* Common HWCAP flags. Use from LSB bits */
-#define OTX2_HWCAP_F_VF		BIT_ULL(8) /* VF device */
-#define otx2_dev_is_vf(dev)	(dev->hwcap & OTX2_HWCAP_F_VF)
-#define otx2_dev_is_pf(dev)	(!(dev->hwcap & OTX2_HWCAP_F_VF))
-#define otx2_dev_is_lbk(dev)	((dev->hwcap & OTX2_HWCAP_F_VF) && \
-				 (dev->tx_chan_base < 0x700))
-#define otx2_dev_revid(dev)	(dev->hwcap & 0xFF)
-#define otx2_dev_is_sdp(dev)	(dev->sdp_link)
-
-#define otx2_dev_is_vf_or_sdp(dev)				\
-	(otx2_dev_is_vf(dev) || otx2_dev_is_sdp(dev))
-
-#define otx2_dev_is_A0(dev)					\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MINOR(otx2_dev_revid(dev)) == 0x0))
-#define otx2_dev_is_Ax(dev)					\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0))
-
-#define otx2_dev_is_95xx_A0(dev)				\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MINOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x1))
-#define otx2_dev_is_95xx_Ax(dev)				\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x1))
-
-#define otx2_dev_is_96xx_A0(dev)				\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MINOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x0))
-#define otx2_dev_is_96xx_Ax(dev)				\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x0))
-
-#define otx2_dev_is_96xx_Cx(dev)				\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x2) &&	\
-	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x0))
-
-#define otx2_dev_is_96xx_C0(dev)				\
-	((RVU_PCI_REV_MAJOR(otx2_dev_revid(dev)) == 0x2) &&	\
-	 (RVU_PCI_REV_MINOR(otx2_dev_revid(dev)) == 0x0) &&	\
-	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x0))
-
-#define otx2_dev_is_98xx(dev)                                   \
-	 (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x3)
-
-struct otx2_dev;
-
-/* Link status update callback */
-typedef void (*otx2_link_status_update_t)(struct otx2_dev *dev,
-				   struct cgx_link_user_info *link);
-/* PTP info callback */
-typedef int (*otx2_ptp_info_t)(struct otx2_dev *dev, bool ptp_en);
-/* Link status get callback */
-typedef void (*otx2_link_status_get_t)(struct otx2_dev *dev,
-				   struct cgx_link_user_info *link);
-
-struct otx2_dev_ops {
-	otx2_link_status_update_t link_status_update;
-	otx2_ptp_info_t ptp_info_update;
-	otx2_link_status_get_t link_status_get;
-};
-
-#define OTX2_DEV					\
-	int node __rte_cache_aligned;			\
-	uint16_t pf;					\
-	int16_t vf;					\
-	uint16_t pf_func;				\
-	uint8_t mbox_active;				\
-	bool drv_inited;				\
-	uint64_t active_vfs[MAX_VFPF_DWORD_BITS];	\
-	uintptr_t bar2;					\
-	uintptr_t bar4;					\
-	struct otx2_mbox mbox_local;			\
-	struct otx2_mbox mbox_up;			\
-	struct otx2_mbox mbox_vfpf;			\
-	struct otx2_mbox mbox_vfpf_up;			\
-	otx2_intr_t intr;				\
-	int timer_set;	/* ~0 : no alarm handling */	\
-	uint64_t hwcap;					\
-	struct otx2_npa_lf npalf;			\
-	struct otx2_mbox *mbox;				\
-	uint16_t maxvf;					\
-	const struct otx2_dev_ops *ops
-
-struct otx2_dev {
-	OTX2_DEV;
-};
-
-__rte_internal
-int otx2_dev_priv_init(struct rte_pci_device *pci_dev, void *otx2_dev);
-
-/* Common dev init and fini routines */
-
-static __rte_always_inline int
-otx2_dev_init(struct rte_pci_device *pci_dev, void *otx2_dev)
-{
-	struct otx2_dev *dev = otx2_dev;
-	uint8_t rev_id;
-	int rc;
-
-	rc = rte_pci_read_config(pci_dev, &rev_id,
-				 1, RVU_PCI_REVISION_ID);
-	if (rc != 1) {
-		otx2_err("Failed to read pci revision id, rc=%d", rc);
-		return rc;
-	}
-
-	dev->hwcap = rev_id;
-	return otx2_dev_priv_init(pci_dev, otx2_dev);
-}
-
-__rte_internal
-void otx2_dev_fini(struct rte_pci_device *pci_dev, void *otx2_dev);
-__rte_internal
-int otx2_dev_active_vfs(void *otx2_dev);
-
-#define RVU_PFVF_PF_SHIFT	10
-#define RVU_PFVF_PF_MASK	0x3F
-#define RVU_PFVF_FUNC_SHIFT	0
-#define RVU_PFVF_FUNC_MASK	0x3FF
-
-static inline int
-otx2_get_vf(uint16_t pf_func)
-{
-	return (((pf_func >> RVU_PFVF_FUNC_SHIFT) & RVU_PFVF_FUNC_MASK) - 1);
-}
-
-static inline int
-otx2_get_pf(uint16_t pf_func)
-{
-	return (pf_func >> RVU_PFVF_PF_SHIFT) & RVU_PFVF_PF_MASK;
-}
-
-static inline int
-otx2_pfvf_func(int pf, int vf)
-{
-	return (pf << RVU_PFVF_PF_SHIFT) | ((vf << RVU_PFVF_FUNC_SHIFT) + 1);
-}
-
-static inline int
-otx2_is_afvf(uint16_t pf_func)
-{
-	return !(pf_func & ~RVU_PFVF_FUNC_MASK);
-}
-
-#endif /* _OTX2_DEV_H */
diff --git a/drivers/common/octeontx2/otx2_io_arm64.h b/drivers/common/octeontx2/otx2_io_arm64.h
deleted file mode 100644
index 34268e3af3..0000000000
--- a/drivers/common/octeontx2/otx2_io_arm64.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_IO_ARM64_H_
-#define _OTX2_IO_ARM64_H_
-
-#define otx2_load_pair(val0, val1, addr) ({		\
-	asm volatile(					\
-	"ldp %x[x0], %x[x1], [%x[p1]]"			\
-	:[x0]"=r"(val0), [x1]"=r"(val1)			\
-	:[p1]"r"(addr)					\
-	); })
-
-#define otx2_store_pair(val0, val1, addr) ({		\
-	asm volatile(					\
-	"stp %x[x0], %x[x1], [%x[p1],#0]!"		\
-	::[x0]"r"(val0), [x1]"r"(val1), [p1]"r"(addr)	\
-	); })
-
-#define otx2_prefetch_store_keep(ptr) ({\
-	asm volatile("prfm pstl1keep, [%x0]\n" : : "r" (ptr)); })
-
-#if defined(__ARM_FEATURE_SVE)
-#define __LSE_PREAMBLE " .cpu  generic+lse+sve\n"
-#else
-#define __LSE_PREAMBLE " .cpu  generic+lse\n"
-#endif
-
-static __rte_always_inline uint64_t
-otx2_atomic64_add_nosync(int64_t incr, int64_t *ptr)
-{
-	uint64_t result;
-
-	/* Atomic add with no ordering */
-	asm volatile (
-		__LSE_PREAMBLE
-		"ldadd %x[i], %x[r], [%[b]]"
-		: [r] "=r" (result), "+m" (*ptr)
-		: [i] "r" (incr), [b] "r" (ptr)
-		: "memory");
-	return result;
-}
-
-static __rte_always_inline uint64_t
-otx2_atomic64_add_sync(int64_t incr, int64_t *ptr)
-{
-	uint64_t result;
-
-	/* Atomic add with ordering */
-	asm volatile (
-		__LSE_PREAMBLE
-		"ldadda %x[i], %x[r], [%[b]]"
-		: [r] "=r" (result), "+m" (*ptr)
-		: [i] "r" (incr), [b] "r" (ptr)
-		: "memory");
-	return result;
-}
-
-static __rte_always_inline uint64_t
-otx2_lmt_submit(rte_iova_t io_address)
-{
-	uint64_t result;
-
-	asm volatile (
-		__LSE_PREAMBLE
-		"ldeor xzr,%x[rf],[%[rs]]" :
-		 [rf] "=r"(result): [rs] "r"(io_address));
-	return result;
-}
-
-static __rte_always_inline uint64_t
-otx2_lmt_submit_release(rte_iova_t io_address)
-{
-	uint64_t result;
-
-	asm volatile (
-		__LSE_PREAMBLE
-		"ldeorl xzr,%x[rf],[%[rs]]" :
-		 [rf] "=r"(result) : [rs] "r"(io_address));
-	return result;
-}
-
-static __rte_always_inline void
-otx2_lmt_mov(void *out, const void *in, const uint32_t lmtext)
-{
-	volatile const __uint128_t *src128 = (const __uint128_t *)in;
-	volatile __uint128_t *dst128 = (__uint128_t *)out;
-	dst128[0] = src128[0];
-	dst128[1] = src128[1];
-	/* lmtext receives following value:
-	 * 1: NIX_SUBDC_EXT needed i.e. tx vlan case
-	 * 2: NIX_SUBDC_EXT + NIX_SUBDC_MEM i.e. tstamp case
-	 */
-	if (lmtext) {
-		dst128[2] = src128[2];
-		if (lmtext > 1)
-			dst128[3] = src128[3];
-	}
-}
-
-static __rte_always_inline void
-otx2_lmt_mov_seg(void *out, const void *in, const uint16_t segdw)
-{
-	volatile const __uint128_t *src128 = (const __uint128_t *)in;
-	volatile __uint128_t *dst128 = (__uint128_t *)out;
-	uint8_t i;
-
-	for (i = 0; i < segdw; i++)
-		dst128[i] = src128[i];
-}
-
-#undef __LSE_PREAMBLE
-#endif /* _OTX2_IO_ARM64_H_ */
diff --git a/drivers/common/octeontx2/otx2_io_generic.h b/drivers/common/octeontx2/otx2_io_generic.h
deleted file mode 100644
index 3436a6c3d5..0000000000
--- a/drivers/common/octeontx2/otx2_io_generic.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_IO_GENERIC_H_
-#define _OTX2_IO_GENERIC_H_
-
-#include <string.h>
-
-#define otx2_load_pair(val0, val1, addr)			\
-do {								\
-	val0 = rte_read64_relaxed((void *)(addr));		\
-	val1 = rte_read64_relaxed((uint8_t *)(addr) + 8);	\
-} while (0)
-
-#define otx2_store_pair(val0, val1, addr)			\
-do {								\
-	rte_write64_relaxed(val0, (void *)(addr));		\
-	rte_write64_relaxed(val1, (((uint8_t *)(addr)) + 8));	\
-} while (0)
-
-#define otx2_prefetch_store_keep(ptr) do {} while (0)
-
-static inline uint64_t
-otx2_atomic64_add_nosync(int64_t incr, int64_t *ptr)
-{
-	RTE_SET_USED(ptr);
-	RTE_SET_USED(incr);
-
-	return 0;
-}
-
-static inline uint64_t
-otx2_atomic64_add_sync(int64_t incr, int64_t *ptr)
-{
-	RTE_SET_USED(ptr);
-	RTE_SET_USED(incr);
-
-	return 0;
-}
-
-static inline int64_t
-otx2_lmt_submit(uint64_t io_address)
-{
-	RTE_SET_USED(io_address);
-
-	return 0;
-}
-
-static inline int64_t
-otx2_lmt_submit_release(uint64_t io_address)
-{
-	RTE_SET_USED(io_address);
-
-	return 0;
-}
-
-static __rte_always_inline void
-otx2_lmt_mov(void *out, const void *in, const uint32_t lmtext)
-{
-	/* Copy four words if lmtext = 0
-	 *      six words if lmtext = 1
-	 *      eight words if lmtext =2
-	 */
-	memcpy(out, in, (4 + (2 * lmtext)) * sizeof(uint64_t));
-}
-
-static __rte_always_inline void
-otx2_lmt_mov_seg(void *out, const void *in, const uint16_t segdw)
-{
-	RTE_SET_USED(out);
-	RTE_SET_USED(in);
-	RTE_SET_USED(segdw);
-}
-#endif /* _OTX2_IO_GENERIC_H_ */
diff --git a/drivers/common/octeontx2/otx2_irq.c b/drivers/common/octeontx2/otx2_irq.c
deleted file mode 100644
index 93fc95c0e1..0000000000
--- a/drivers/common/octeontx2/otx2_irq.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_alarm.h>
-#include <rte_common.h>
-#include <rte_eal.h>
-#include <rte_interrupts.h>
-
-#include "otx2_common.h"
-#include "otx2_irq.h"
-
-#ifdef RTE_EAL_VFIO
-
-#include <inttypes.h>
-#include <linux/vfio.h>
-#include <sys/eventfd.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-
-#define MAX_INTR_VEC_ID RTE_MAX_RXTX_INTR_VEC_ID
-#define MSIX_IRQ_SET_BUF_LEN (sizeof(struct vfio_irq_set) + \
-			      sizeof(int) * (MAX_INTR_VEC_ID))
-
-static int
-irq_get_info(struct rte_intr_handle *intr_handle)
-{
-	struct vfio_irq_info irq = { .argsz = sizeof(irq) };
-	int rc, vfio_dev_fd;
-
-	irq.index = VFIO_PCI_MSIX_IRQ_INDEX;
-
-	vfio_dev_fd = rte_intr_dev_fd_get(intr_handle);
-	rc = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_IRQ_INFO, &irq);
-	if (rc < 0) {
-		otx2_err("Failed to get IRQ info rc=%d errno=%d", rc, errno);
-		return rc;
-	}
-
-	otx2_base_dbg("Flags=0x%x index=0x%x count=0x%x max_intr_vec_id=0x%x",
-		      irq.flags, irq.index, irq.count, MAX_INTR_VEC_ID);
-
-	if (irq.count > MAX_INTR_VEC_ID) {
-		otx2_err("HW max=%d > MAX_INTR_VEC_ID: %d",
-			 rte_intr_max_intr_get(intr_handle),
-			 MAX_INTR_VEC_ID);
-		if (rte_intr_max_intr_set(intr_handle, MAX_INTR_VEC_ID))
-			return -1;
-	} else {
-		if (rte_intr_max_intr_set(intr_handle, irq.count))
-			return -1;
-	}
-
-	return 0;
-}
-
-static int
-irq_config(struct rte_intr_handle *intr_handle, unsigned int vec)
-{
-	char irq_set_buf[MSIX_IRQ_SET_BUF_LEN];
-	struct vfio_irq_set *irq_set;
-	int len, rc, vfio_dev_fd;
-	int32_t *fd_ptr;
-
-	if (vec > (uint32_t)rte_intr_max_intr_get(intr_handle)) {
-		otx2_err("vector=%d greater than max_intr=%d", vec,
-			 rte_intr_max_intr_get(intr_handle));
-		return -EINVAL;
-	}
-
-	len = sizeof(struct vfio_irq_set) + sizeof(int32_t);
-
-	irq_set = (struct vfio_irq_set *)irq_set_buf;
-	irq_set->argsz = len;
-
-	irq_set->start = vec;
-	irq_set->count = 1;
-	irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
-			VFIO_IRQ_SET_ACTION_TRIGGER;
-	irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
-
-	/* Use vec fd to set interrupt vectors */
-	fd_ptr = (int32_t *)&irq_set->data[0];
-	fd_ptr[0] = rte_intr_efds_index_get(intr_handle, vec);
-
-	vfio_dev_fd = rte_intr_dev_fd_get(intr_handle);
-	rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
-	if (rc)
-		otx2_err("Failed to set_irqs vector=0x%x rc=%d", vec, rc);
-
-	return rc;
-}
-
-static int
-irq_init(struct rte_intr_handle *intr_handle)
-{
-	char irq_set_buf[MSIX_IRQ_SET_BUF_LEN];
-	struct vfio_irq_set *irq_set;
-	int len, rc, vfio_dev_fd;
-	int32_t *fd_ptr;
-	uint32_t i;
-
-	if (rte_intr_max_intr_get(intr_handle) > MAX_INTR_VEC_ID) {
-		otx2_err("Max_intr=%d greater than MAX_INTR_VEC_ID=%d",
-			 rte_intr_max_intr_get(intr_handle),
-			 MAX_INTR_VEC_ID);
-		return -ERANGE;
-	}
-
-	len = sizeof(struct vfio_irq_set) +
-		sizeof(int32_t) * rte_intr_max_intr_get(intr_handle);
-
-	irq_set = (struct vfio_irq_set *)irq_set_buf;
-	irq_set->argsz = len;
-	irq_set->start = 0;
-	irq_set->count = rte_intr_max_intr_get(intr_handle);
-	irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
-			VFIO_IRQ_SET_ACTION_TRIGGER;
-	irq_set->index = VFIO_PCI_MSIX_IRQ_INDEX;
-
-	fd_ptr = (int32_t *)&irq_set->data[0];
-	for (i = 0; i < irq_set->count; i++)
-		fd_ptr[i] = -1;
-
-	vfio_dev_fd = rte_intr_dev_fd_get(intr_handle);
-	rc = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
-	if (rc)
-		otx2_err("Failed to set irqs vector rc=%d", rc);
-
-	return rc;
-}
-
-/**
- * @internal
- * Disable IRQ
- */
-int
-otx2_disable_irqs(struct rte_intr_handle *intr_handle)
-{
-	/* Clear max_intr to indicate re-init next time */
-	if (rte_intr_max_intr_set(intr_handle, 0))
-		return -1;
-	return rte_intr_disable(intr_handle);
-}
-
-/**
- * @internal
- * Register IRQ
- */
-int
-otx2_register_irq(struct rte_intr_handle *intr_handle,
-		  rte_intr_callback_fn cb, void *data, unsigned int vec)
-{
-	struct rte_intr_handle *tmp_handle;
-	uint32_t nb_efd, tmp_nb_efd;
-	int rc, fd;
-
-	/* If no max_intr read from VFIO */
-	if (rte_intr_max_intr_get(intr_handle) == 0) {
-		irq_get_info(intr_handle);
-		irq_init(intr_handle);
-	}
-
-	if (vec > (uint32_t)rte_intr_max_intr_get(intr_handle)) {
-		otx2_err("Vector=%d greater than max_intr=%d", vec,
-			rte_intr_max_intr_get(intr_handle));
-		return -EINVAL;
-	}
-
-	tmp_handle = intr_handle;
-	/* Create new eventfd for interrupt vector */
-	fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
-	if (fd == -1)
-		return -ENODEV;
-
-	if (rte_intr_fd_set(tmp_handle, fd))
-		return errno;
-
-	/* Register vector interrupt callback */
-	rc = rte_intr_callback_register(tmp_handle, cb, data);
-	if (rc) {
-		otx2_err("Failed to register vector:0x%x irq callback.", vec);
-		return rc;
-	}
-
-	rte_intr_efds_index_set(intr_handle, vec, fd);
-	nb_efd = (vec > (uint32_t)rte_intr_nb_efd_get(intr_handle)) ?
-		vec : (uint32_t)rte_intr_nb_efd_get(intr_handle);
-	rte_intr_nb_efd_set(intr_handle, nb_efd);
-
-	tmp_nb_efd = rte_intr_nb_efd_get(intr_handle) + 1;
-	if (tmp_nb_efd > (uint32_t)rte_intr_max_intr_get(intr_handle))
-		rte_intr_max_intr_set(intr_handle, tmp_nb_efd);
-
-	otx2_base_dbg("Enable vector:0x%x for vfio (efds: %d, max:%d)", vec,
-		     rte_intr_nb_efd_get(intr_handle),
-		     rte_intr_max_intr_get(intr_handle));
-
-	/* Enable MSIX vectors to VFIO */
-	return irq_config(intr_handle, vec);
-}
-
-/**
- * @internal
- * Unregister IRQ
- */
-void
-otx2_unregister_irq(struct rte_intr_handle *intr_handle,
-		    rte_intr_callback_fn cb, void *data, unsigned int vec)
-{
-	struct rte_intr_handle *tmp_handle;
-	uint8_t retries = 5; /* 5 ms */
-	int rc, fd;
-
-	if (vec > (uint32_t)rte_intr_max_intr_get(intr_handle)) {
-		otx2_err("Error unregistering MSI-X interrupts vec:%d > %d",
-			 vec, rte_intr_max_intr_get(intr_handle));
-		return;
-	}
-
-	tmp_handle = intr_handle;
-	fd = rte_intr_efds_index_get(intr_handle, vec);
-	if (fd == -1)
-		return;
-
-	if (rte_intr_fd_set(tmp_handle, fd))
-		return;
-
-	do {
-		/* Un-register callback func from platform lib */
-		rc = rte_intr_callback_unregister(tmp_handle, cb, data);
-		/* Retry only if -EAGAIN */
-		if (rc != -EAGAIN)
-			break;
-		rte_delay_ms(1);
-		retries--;
-	} while (retries);
-
-	if (rc < 0) {
-		otx2_err("Error unregistering MSI-X vec %d cb, rc=%d", vec, rc);
-		return;
-	}
-
-	otx2_base_dbg("Disable vector:0x%x for vfio (efds: %d, max:%d)", vec,
-		     rte_intr_nb_efd_get(intr_handle),
-		     rte_intr_max_intr_get(intr_handle));
-
-	if (rte_intr_efds_index_get(intr_handle, vec) != -1)
-		close(rte_intr_efds_index_get(intr_handle, vec));
-	/* Disable MSIX vectors from VFIO */
-	rte_intr_efds_index_set(intr_handle, vec, -1);
-	irq_config(intr_handle, vec);
-}
-
-#else
-
-/**
- * @internal
- * Register IRQ
- */
-int otx2_register_irq(__rte_unused struct rte_intr_handle *intr_handle,
-		      __rte_unused rte_intr_callback_fn cb,
-		      __rte_unused void *data, __rte_unused unsigned int vec)
-{
-	return -ENOTSUP;
-}
-
-
-/**
- * @internal
- * Unregister IRQ
- */
-void otx2_unregister_irq(__rte_unused struct rte_intr_handle *intr_handle,
-			 __rte_unused rte_intr_callback_fn cb,
-			 __rte_unused void *data, __rte_unused unsigned int vec)
-{
-}
-
-/**
- * @internal
- * Disable IRQ
- */
-int otx2_disable_irqs(__rte_unused struct rte_intr_handle *intr_handle)
-{
-	return -ENOTSUP;
-}
-
-#endif /* RTE_EAL_VFIO */
diff --git a/drivers/common/octeontx2/otx2_irq.h b/drivers/common/octeontx2/otx2_irq.h
deleted file mode 100644
index 0683cf5543..0000000000
--- a/drivers/common/octeontx2/otx2_irq.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_IRQ_H_
-#define _OTX2_IRQ_H_
-
-#include <rte_pci.h>
-#include <rte_interrupts.h>
-
-#include "otx2_common.h"
-
-typedef struct {
-/* 128 devices translate to two 64 bits dwords */
-#define MAX_VFPF_DWORD_BITS 2
-	uint64_t bits[MAX_VFPF_DWORD_BITS];
-} otx2_intr_t;
-
-__rte_internal
-int otx2_register_irq(struct rte_intr_handle *intr_handle,
-		      rte_intr_callback_fn cb, void *data, unsigned int vec);
-__rte_internal
-void otx2_unregister_irq(struct rte_intr_handle *intr_handle,
-			 rte_intr_callback_fn cb, void *data, unsigned int vec);
-__rte_internal
-int otx2_disable_irqs(struct rte_intr_handle *intr_handle);
-
-#endif /* _OTX2_IRQ_H_ */
diff --git a/drivers/common/octeontx2/otx2_mbox.c b/drivers/common/octeontx2/otx2_mbox.c
deleted file mode 100644
index 6df1e8ea63..0000000000
--- a/drivers/common/octeontx2/otx2_mbox.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rte_atomic.h>
-#include <rte_cycles.h>
-#include <rte_malloc.h>
-
-#include "otx2_mbox.h"
-#include "otx2_dev.h"
-
-#define RVU_AF_AFPF_MBOX0	(0x02000)
-#define RVU_AF_AFPF_MBOX1	(0x02008)
-
-#define RVU_PF_PFAF_MBOX0	(0xC00)
-#define RVU_PF_PFAF_MBOX1	(0xC08)
-
-#define RVU_PF_VFX_PFVF_MBOX0	(0x0000)
-#define RVU_PF_VFX_PFVF_MBOX1	(0x0008)
-
-#define	RVU_VF_VFPF_MBOX0	(0x0000)
-#define	RVU_VF_VFPF_MBOX1	(0x0008)
-
-static inline uint16_t
-msgs_offset(void)
-{
-	return RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-}
-
-void
-otx2_mbox_fini(struct otx2_mbox *mbox)
-{
-	mbox->reg_base = 0;
-	mbox->hwbase = 0;
-	rte_free(mbox->dev);
-	mbox->dev = NULL;
-}
-
-void
-otx2_mbox_reset(struct otx2_mbox *mbox, int devid)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	struct mbox_hdr *tx_hdr =
-		(struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->tx_start);
-	struct mbox_hdr *rx_hdr =
-		(struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->rx_start);
-
-	rte_spinlock_lock(&mdev->mbox_lock);
-	mdev->msg_size = 0;
-	mdev->rsp_size = 0;
-	tx_hdr->msg_size = 0;
-	tx_hdr->num_msgs = 0;
-	rx_hdr->msg_size = 0;
-	rx_hdr->num_msgs = 0;
-	rte_spinlock_unlock(&mdev->mbox_lock);
-}
-
-int
-otx2_mbox_init(struct otx2_mbox *mbox, uintptr_t hwbase, uintptr_t reg_base,
-	       int direction, int ndevs, uint64_t intr_offset)
-{
-	struct otx2_mbox_dev *mdev;
-	int devid;
-
-	mbox->intr_offset = intr_offset;
-	mbox->reg_base = reg_base;
-	mbox->hwbase = hwbase;
-
-	switch (direction) {
-	case MBOX_DIR_AFPF:
-	case MBOX_DIR_PFVF:
-		mbox->tx_start = MBOX_DOWN_TX_START;
-		mbox->rx_start = MBOX_DOWN_RX_START;
-		mbox->tx_size  = MBOX_DOWN_TX_SIZE;
-		mbox->rx_size  = MBOX_DOWN_RX_SIZE;
-		break;
-	case MBOX_DIR_PFAF:
-	case MBOX_DIR_VFPF:
-		mbox->tx_start = MBOX_DOWN_RX_START;
-		mbox->rx_start = MBOX_DOWN_TX_START;
-		mbox->tx_size  = MBOX_DOWN_RX_SIZE;
-		mbox->rx_size  = MBOX_DOWN_TX_SIZE;
-		break;
-	case MBOX_DIR_AFPF_UP:
-	case MBOX_DIR_PFVF_UP:
-		mbox->tx_start = MBOX_UP_TX_START;
-		mbox->rx_start = MBOX_UP_RX_START;
-		mbox->tx_size  = MBOX_UP_TX_SIZE;
-		mbox->rx_size  = MBOX_UP_RX_SIZE;
-		break;
-	case MBOX_DIR_PFAF_UP:
-	case MBOX_DIR_VFPF_UP:
-		mbox->tx_start = MBOX_UP_RX_START;
-		mbox->rx_start = MBOX_UP_TX_START;
-		mbox->tx_size  = MBOX_UP_RX_SIZE;
-		mbox->rx_size  = MBOX_UP_TX_SIZE;
-		break;
-	default:
-		return -ENODEV;
-	}
-
-	switch (direction) {
-	case MBOX_DIR_AFPF:
-	case MBOX_DIR_AFPF_UP:
-		mbox->trigger = RVU_AF_AFPF_MBOX0;
-		mbox->tr_shift = 4;
-		break;
-	case MBOX_DIR_PFAF:
-	case MBOX_DIR_PFAF_UP:
-		mbox->trigger = RVU_PF_PFAF_MBOX1;
-		mbox->tr_shift = 0;
-		break;
-	case MBOX_DIR_PFVF:
-	case MBOX_DIR_PFVF_UP:
-		mbox->trigger = RVU_PF_VFX_PFVF_MBOX0;
-		mbox->tr_shift = 12;
-		break;
-	case MBOX_DIR_VFPF:
-	case MBOX_DIR_VFPF_UP:
-		mbox->trigger = RVU_VF_VFPF_MBOX1;
-		mbox->tr_shift = 0;
-		break;
-	default:
-		return -ENODEV;
-	}
-
-	mbox->dev = rte_zmalloc("mbox dev",
-				ndevs * sizeof(struct otx2_mbox_dev),
-				OTX2_ALIGN);
-	if (!mbox->dev) {
-		otx2_mbox_fini(mbox);
-		return -ENOMEM;
-	}
-	mbox->ndevs = ndevs;
-	for (devid = 0; devid < ndevs; devid++) {
-		mdev = &mbox->dev[devid];
-		mdev->mbase = (void *)(mbox->hwbase + (devid * MBOX_SIZE));
-		rte_spinlock_init(&mdev->mbox_lock);
-		/* Init header to reset value */
-		otx2_mbox_reset(mbox, devid);
-	}
-
-	return 0;
-}
-
-/**
- * @internal
- * Allocate a message response
- */
-struct mbox_msghdr *
-otx2_mbox_alloc_msg_rsp(struct otx2_mbox *mbox, int devid, int size,
-			int size_rsp)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	struct mbox_msghdr *msghdr = NULL;
-
-	rte_spinlock_lock(&mdev->mbox_lock);
-	size = RTE_ALIGN(size, MBOX_MSG_ALIGN);
-	size_rsp = RTE_ALIGN(size_rsp, MBOX_MSG_ALIGN);
-	/* Check if there is space in mailbox */
-	if ((mdev->msg_size + size) > mbox->tx_size - msgs_offset())
-		goto exit;
-	if ((mdev->rsp_size + size_rsp) > mbox->rx_size - msgs_offset())
-		goto exit;
-	if (mdev->msg_size == 0)
-		mdev->num_msgs = 0;
-	mdev->num_msgs++;
-
-	msghdr = (struct mbox_msghdr *)(((uintptr_t)mdev->mbase +
-			mbox->tx_start + msgs_offset() + mdev->msg_size));
-
-	/* Clear the whole msg region */
-	otx2_mbox_memset(msghdr, 0, sizeof(*msghdr) + size);
-	/* Init message header with reset values */
-	msghdr->ver = OTX2_MBOX_VERSION;
-	mdev->msg_size += size;
-	mdev->rsp_size += size_rsp;
-	msghdr->next_msgoff = mdev->msg_size + msgs_offset();
-exit:
-	rte_spinlock_unlock(&mdev->mbox_lock);
-
-	return msghdr;
-}
-
-/**
- * @internal
- * Send a mailbox message
- */
-void
-otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	struct mbox_hdr *tx_hdr =
-		(struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->tx_start);
-	struct mbox_hdr *rx_hdr =
-		(struct mbox_hdr *)((uintptr_t)mdev->mbase + mbox->rx_start);
-
-	/* Reset header for next messages */
-	tx_hdr->msg_size = mdev->msg_size;
-	mdev->msg_size = 0;
-	mdev->rsp_size = 0;
-	mdev->msgs_acked = 0;
-
-	/* num_msgs != 0 signals to the peer that the buffer has a number of
-	 * messages. So this should be written after copying txmem
-	 */
-	tx_hdr->num_msgs = mdev->num_msgs;
-	rx_hdr->num_msgs = 0;
-
-	/* Sync mbox data into memory */
-	rte_wmb();
-
-	/* The interrupt should be fired after num_msgs is written
-	 * to the shared memory
-	 */
-	rte_write64(1, (volatile void *)(mbox->reg_base +
-		(mbox->trigger | (devid << mbox->tr_shift))));
-}
-
-/**
- * @internal
- * Wait and get mailbox response
- */
-int
-otx2_mbox_get_rsp(struct otx2_mbox *mbox, int devid, void **msg)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	struct mbox_msghdr *msghdr;
-	uint64_t offset;
-	int rc;
-
-	rc = otx2_mbox_wait_for_rsp(mbox, devid);
-	if (rc != 1)
-		return -EIO;
-
-	rte_rmb();
-
-	offset = mbox->rx_start +
-		RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-	msghdr = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + offset);
-	if (msg != NULL)
-		*msg = msghdr;
-
-	return msghdr->rc;
-}
-
-/**
- * Polling for given wait time to get mailbox response
- */
-static int
-mbox_poll(struct otx2_mbox *mbox, uint32_t wait)
-{
-	uint32_t timeout = 0, sleep = 1;
-	uint32_t wait_us = wait * 1000;
-	uint64_t rsp_reg = 0;
-	uintptr_t reg_addr;
-
-	reg_addr = mbox->reg_base + mbox->intr_offset;
-	do {
-		rsp_reg = otx2_read64(reg_addr);
-
-		if (timeout >= wait_us)
-			return -ETIMEDOUT;
-
-		rte_delay_us(sleep);
-		timeout += sleep;
-	} while (!rsp_reg);
-
-	rte_smp_rmb();
-
-	/* Clear interrupt */
-	otx2_write64(rsp_reg, reg_addr);
-
-	/* Reset mbox */
-	otx2_mbox_reset(mbox, 0);
-
-	return 0;
-}
-
-/**
- * @internal
- * Wait and get mailbox response with timeout
- */
-int
-otx2_mbox_get_rsp_tmo(struct otx2_mbox *mbox, int devid, void **msg,
-		      uint32_t tmo)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	struct mbox_msghdr *msghdr;
-	uint64_t offset;
-	int rc;
-
-	rc = otx2_mbox_wait_for_rsp_tmo(mbox, devid, tmo);
-	if (rc != 1)
-		return -EIO;
-
-	rte_rmb();
-
-	offset = mbox->rx_start +
-			RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-	msghdr = (struct mbox_msghdr *)((uintptr_t)mdev->mbase + offset);
-	if (msg != NULL)
-		*msg = msghdr;
-
-	return msghdr->rc;
-}
-
-static int
-mbox_wait(struct otx2_mbox *mbox, int devid, uint32_t rst_timo)
-{
-	volatile struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	uint32_t timeout = 0, sleep = 1;
-
-	rst_timo  = rst_timo * 1000; /* Milli seconds to micro seconds */
-	while (mdev->num_msgs > mdev->msgs_acked) {
-		rte_delay_us(sleep);
-		timeout += sleep;
-		if (timeout >= rst_timo) {
-			struct mbox_hdr *tx_hdr =
-				(struct mbox_hdr *)((uintptr_t)mdev->mbase +
-							mbox->tx_start);
-			struct mbox_hdr *rx_hdr =
-				(struct mbox_hdr *)((uintptr_t)mdev->mbase +
-							mbox->rx_start);
-
-			otx2_err("MBOX[devid: %d] message wait timeout %d, "
-				 "num_msgs: %d, msgs_acked: %d "
-				 "(tx/rx num_msgs: %d/%d), msg_size: %d, "
-				 "rsp_size: %d",
-				 devid, timeout, mdev->num_msgs,
-				 mdev->msgs_acked, tx_hdr->num_msgs,
-				 rx_hdr->num_msgs, mdev->msg_size,
-				 mdev->rsp_size);
-
-			return -EIO;
-		}
-		rte_rmb();
-	}
-	return 0;
-}
-
-int
-otx2_mbox_wait_for_rsp_tmo(struct otx2_mbox *mbox, int devid, uint32_t tmo)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	int rc = 0;
-
-	/* Sync with mbox region */
-	rte_rmb();
-
-	if (mbox->trigger == RVU_PF_VFX_PFVF_MBOX1 ||
-		mbox->trigger == RVU_PF_VFX_PFVF_MBOX0) {
-		/* In case of VF, Wait a bit more to account round trip delay */
-		tmo = tmo * 2;
-	}
-
-	/* Wait message */
-	if (rte_thread_is_intr())
-		rc = mbox_poll(mbox, tmo);
-	else
-		rc = mbox_wait(mbox, devid, tmo);
-
-	if (!rc)
-		rc = mdev->num_msgs;
-
-	return rc;
-}
-
-/**
- * @internal
- * Wait for the mailbox response
- */
-int
-otx2_mbox_wait_for_rsp(struct otx2_mbox *mbox, int devid)
-{
-	return otx2_mbox_wait_for_rsp_tmo(mbox, devid, MBOX_RSP_TIMEOUT);
-}
-
-int
-otx2_mbox_get_availmem(struct otx2_mbox *mbox, int devid)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	int avail;
-
-	rte_spinlock_lock(&mdev->mbox_lock);
-	avail = mbox->tx_size - mdev->msg_size - msgs_offset();
-	rte_spinlock_unlock(&mdev->mbox_lock);
-
-	return avail;
-}
-
-int
-otx2_send_ready_msg(struct otx2_mbox *mbox, uint16_t *pcifunc)
-{
-	struct ready_msg_rsp *rsp;
-	int rc;
-
-	otx2_mbox_alloc_msg_ready(mbox);
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	if (rsp->hdr.ver != OTX2_MBOX_VERSION) {
-		otx2_err("Incompatible MBox versions(AF: 0x%04x DPDK: 0x%04x)",
-			  rsp->hdr.ver, OTX2_MBOX_VERSION);
-		return -EPIPE;
-	}
-
-	if (pcifunc)
-		*pcifunc = rsp->hdr.pcifunc;
-
-	return 0;
-}
-
-int
-otx2_reply_invalid_msg(struct otx2_mbox *mbox, int devid, uint16_t pcifunc,
-		       uint16_t id)
-{
-	struct msg_rsp *rsp;
-
-	rsp = (struct msg_rsp *)otx2_mbox_alloc_msg(mbox, devid, sizeof(*rsp));
-	if (!rsp)
-		return -ENOMEM;
-	rsp->hdr.id = id;
-	rsp->hdr.sig = OTX2_MBOX_RSP_SIG;
-	rsp->hdr.rc = MBOX_MSG_INVALID;
-	rsp->hdr.pcifunc = pcifunc;
-
-	return 0;
-}
-
-/**
- * @internal
- * Convert mail box ID to name
- */
-const char *otx2_mbox_id2name(uint16_t id)
-{
-	switch (id) {
-#define M(_name, _id, _1, _2, _3) case _id: return # _name;
-	MBOX_MESSAGES
-	MBOX_UP_CGX_MESSAGES
-#undef M
-	default :
-		return "INVALID ID";
-	}
-}
-
-int otx2_mbox_id2size(uint16_t id)
-{
-	switch (id) {
-#define M(_1, _id, _2, _req_type, _3) case _id: return sizeof(struct _req_type);
-	MBOX_MESSAGES
-	MBOX_UP_CGX_MESSAGES
-#undef M
-	default :
-		return 0;
-	}
-}
diff --git a/drivers/common/octeontx2/otx2_mbox.h b/drivers/common/octeontx2/otx2_mbox.h
deleted file mode 100644
index 25b521a7fa..0000000000
--- a/drivers/common/octeontx2/otx2_mbox.h
+++ /dev/null
@@ -1,1958 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_MBOX_H__
-#define __OTX2_MBOX_H__
-
-#include <errno.h>
-#include <stdbool.h>
-
-#include <rte_ether.h>
-#include <rte_spinlock.h>
-
-#include <otx2_common.h>
-
-#define SZ_64K			(64ULL * 1024ULL)
-#define SZ_1K			(1ULL * 1024ULL)
-#define MBOX_SIZE		SZ_64K
-
-/* AF/PF: PF initiated, PF/VF VF initiated */
-#define MBOX_DOWN_RX_START	0
-#define MBOX_DOWN_RX_SIZE	(46 * SZ_1K)
-#define MBOX_DOWN_TX_START	(MBOX_DOWN_RX_START + MBOX_DOWN_RX_SIZE)
-#define MBOX_DOWN_TX_SIZE	(16 * SZ_1K)
-/* AF/PF: AF initiated, PF/VF PF initiated */
-#define MBOX_UP_RX_START	(MBOX_DOWN_TX_START + MBOX_DOWN_TX_SIZE)
-#define MBOX_UP_RX_SIZE		SZ_1K
-#define MBOX_UP_TX_START	(MBOX_UP_RX_START + MBOX_UP_RX_SIZE)
-#define MBOX_UP_TX_SIZE		SZ_1K
-
-#if MBOX_UP_TX_SIZE + MBOX_UP_TX_START != MBOX_SIZE
-# error "Incorrect mailbox area sizes"
-#endif
-
-#define INTR_MASK(pfvfs) ((pfvfs < 64) ? (BIT_ULL(pfvfs) - 1) : (~0ull))
-
-#define MBOX_RSP_TIMEOUT	3000 /* Time to wait for mbox response in ms */
-
-#define MBOX_MSG_ALIGN		16  /* Align mbox msg start to 16bytes */
-
-/* Mailbox directions */
-#define MBOX_DIR_AFPF		0  /* AF replies to PF */
-#define MBOX_DIR_PFAF		1  /* PF sends messages to AF */
-#define MBOX_DIR_PFVF		2  /* PF replies to VF */
-#define MBOX_DIR_VFPF		3  /* VF sends messages to PF */
-#define MBOX_DIR_AFPF_UP	4  /* AF sends messages to PF */
-#define MBOX_DIR_PFAF_UP	5  /* PF replies to AF */
-#define MBOX_DIR_PFVF_UP	6  /* PF sends messages to VF */
-#define MBOX_DIR_VFPF_UP	7  /* VF replies to PF */
-
-/* Device memory does not support unaligned access, instruct compiler to
- * not optimize the memory access when working with mailbox memory.
- */
-#define __otx2_io volatile
-
-struct otx2_mbox_dev {
-	void	    *mbase;   /* This dev's mbox region */
-	rte_spinlock_t  mbox_lock;
-	uint16_t     msg_size; /* Total msg size to be sent */
-	uint16_t     rsp_size; /* Total rsp size to be sure the reply is ok */
-	uint16_t     num_msgs; /* No of msgs sent or waiting for response */
-	uint16_t     msgs_acked; /* No of msgs for which response is received */
-};
-
-struct otx2_mbox {
-	uintptr_t hwbase;  /* Mbox region advertised by HW */
-	uintptr_t reg_base;/* CSR base for this dev */
-	uint64_t trigger;  /* Trigger mbox notification */
-	uint16_t tr_shift; /* Mbox trigger shift */
-	uint64_t rx_start; /* Offset of Rx region in mbox memory */
-	uint64_t tx_start; /* Offset of Tx region in mbox memory */
-	uint16_t rx_size;  /* Size of Rx region */
-	uint16_t tx_size;  /* Size of Tx region */
-	uint16_t ndevs;    /* The number of peers */
-	struct otx2_mbox_dev *dev;
-	uint64_t intr_offset; /* Offset to interrupt register */
-};
-
-/* Header which precedes all mbox messages */
-struct mbox_hdr {
-	uint64_t __otx2_io msg_size;   /* Total msgs size embedded */
-	uint16_t __otx2_io num_msgs;   /* No of msgs embedded */
-};
-
-/* Header which precedes every msg and is also part of it */
-struct mbox_msghdr {
-	uint16_t __otx2_io pcifunc; /* Who's sending this msg */
-	uint16_t __otx2_io id;      /* Mbox message ID */
-#define OTX2_MBOX_REQ_SIG (0xdead)
-#define OTX2_MBOX_RSP_SIG (0xbeef)
-	/* Signature, for validating corrupted msgs */
-	uint16_t __otx2_io sig;
-#define OTX2_MBOX_VERSION (0x000b)
-	/* Version of msg's structure for this ID */
-	uint16_t __otx2_io ver;
-	/* Offset of next msg within mailbox region */
-	uint16_t __otx2_io next_msgoff;
-	int __otx2_io rc; /* Msg processed response code */
-};
-
-/* Mailbox message types */
-#define MBOX_MSG_MASK				0xFFFF
-#define MBOX_MSG_INVALID			0xFFFE
-#define MBOX_MSG_MAX				0xFFFF
-
-#define MBOX_MESSAGES							\
-/* Generic mbox IDs (range 0x000 - 0x1FF) */				\
-M(READY,		0x001, ready, msg_req, ready_msg_rsp)		\
-M(ATTACH_RESOURCES,	0x002, attach_resources, rsrc_attach_req, msg_rsp)\
-M(DETACH_RESOURCES,	0x003, detach_resources, rsrc_detach_req, msg_rsp)\
-M(FREE_RSRC_CNT,	0x004, free_rsrc_cnt, msg_req, free_rsrcs_rsp)	\
-M(MSIX_OFFSET,		0x005, msix_offset, msg_req, msix_offset_rsp)	\
-M(VF_FLR,		0x006, vf_flr, msg_req, msg_rsp)		\
-M(PTP_OP,		0x007, ptp_op, ptp_req, ptp_rsp)		\
-M(GET_HW_CAP,		0x008, get_hw_cap, msg_req, get_hw_cap_rsp)	\
-M(NDC_SYNC_OP,		0x009, ndc_sync_op, ndc_sync_op, msg_rsp)	\
-/* CGX mbox IDs (range 0x200 - 0x3FF) */				\
-M(CGX_START_RXTX,	0x200, cgx_start_rxtx, msg_req, msg_rsp)	\
-M(CGX_STOP_RXTX,	0x201, cgx_stop_rxtx, msg_req, msg_rsp)		\
-M(CGX_STATS,		0x202, cgx_stats, msg_req, cgx_stats_rsp)	\
-M(CGX_MAC_ADDR_SET,	0x203, cgx_mac_addr_set, cgx_mac_addr_set_or_get,\
-				cgx_mac_addr_set_or_get)		\
-M(CGX_MAC_ADDR_GET,	0x204, cgx_mac_addr_get, cgx_mac_addr_set_or_get,\
-				cgx_mac_addr_set_or_get)		\
-M(CGX_PROMISC_ENABLE,	0x205, cgx_promisc_enable, msg_req, msg_rsp)	\
-M(CGX_PROMISC_DISABLE,	0x206, cgx_promisc_disable, msg_req, msg_rsp)	\
-M(CGX_START_LINKEVENTS, 0x207, cgx_start_linkevents, msg_req, msg_rsp)	\
-M(CGX_STOP_LINKEVENTS,	0x208, cgx_stop_linkevents, msg_req, msg_rsp)	\
-M(CGX_GET_LINKINFO,	0x209, cgx_get_linkinfo, msg_req, cgx_link_info_msg)\
-M(CGX_INTLBK_ENABLE,	0x20A, cgx_intlbk_enable, msg_req, msg_rsp)	\
-M(CGX_INTLBK_DISABLE,	0x20B, cgx_intlbk_disable, msg_req, msg_rsp)	\
-M(CGX_PTP_RX_ENABLE,	0x20C, cgx_ptp_rx_enable, msg_req, msg_rsp)	\
-M(CGX_PTP_RX_DISABLE,	0x20D, cgx_ptp_rx_disable, msg_req, msg_rsp)	\
-M(CGX_CFG_PAUSE_FRM,	0x20E, cgx_cfg_pause_frm, cgx_pause_frm_cfg,	\
-				cgx_pause_frm_cfg)			\
-M(CGX_FW_DATA_GET,	0x20F, cgx_get_aux_link_info, msg_req, cgx_fw_data) \
-M(CGX_FEC_SET,		0x210, cgx_set_fec_param, fec_mode, fec_mode) \
-M(CGX_MAC_ADDR_ADD,     0x211, cgx_mac_addr_add, cgx_mac_addr_add_req,	\
-				cgx_mac_addr_add_rsp)			\
-M(CGX_MAC_ADDR_DEL,     0x212, cgx_mac_addr_del, cgx_mac_addr_del_req,	\
-				msg_rsp)				\
-M(CGX_MAC_MAX_ENTRIES_GET, 0x213, cgx_mac_max_entries_get, msg_req,	\
-				 cgx_max_dmac_entries_get_rsp)		\
-M(CGX_SET_LINK_STATE,	0x214, cgx_set_link_state,		\
-			cgx_set_link_state_msg, msg_rsp)		\
-M(CGX_GET_PHY_MOD_TYPE, 0x215, cgx_get_phy_mod_type, msg_req,		\
-				cgx_phy_mod_type)			\
-M(CGX_SET_PHY_MOD_TYPE, 0x216, cgx_set_phy_mod_type, cgx_phy_mod_type,	\
-				msg_rsp)				\
-M(CGX_FEC_STATS,	0x217, cgx_fec_stats, msg_req, cgx_fec_stats_rsp) \
-M(CGX_SET_LINK_MODE,	0x218, cgx_set_link_mode, cgx_set_link_mode_req,\
-			       cgx_set_link_mode_rsp)			\
-M(CGX_GET_PHY_FEC_STATS, 0x219, cgx_get_phy_fec_stats, msg_req, msg_rsp) \
-M(CGX_STATS_RST,	0x21A, cgx_stats_rst, msg_req, msg_rsp)		\
-/* NPA mbox IDs (range 0x400 - 0x5FF) */				\
-M(NPA_LF_ALLOC,		0x400, npa_lf_alloc, npa_lf_alloc_req,		\
-				npa_lf_alloc_rsp)			\
-M(NPA_LF_FREE,		0x401, npa_lf_free, msg_req, msg_rsp)		\
-M(NPA_AQ_ENQ,		0x402, npa_aq_enq, npa_aq_enq_req, npa_aq_enq_rsp)\
-M(NPA_HWCTX_DISABLE,	0x403, npa_hwctx_disable, hwctx_disable_req, msg_rsp)\
-/* SSO/SSOW mbox IDs (range 0x600 - 0x7FF) */				\
-M(SSO_LF_ALLOC,		0x600, sso_lf_alloc, sso_lf_alloc_req,		\
-				sso_lf_alloc_rsp)			\
-M(SSO_LF_FREE,		0x601, sso_lf_free, sso_lf_free_req, msg_rsp)	\
-M(SSOW_LF_ALLOC,	0x602, ssow_lf_alloc, ssow_lf_alloc_req, msg_rsp)\
-M(SSOW_LF_FREE,		0x603, ssow_lf_free, ssow_lf_free_req, msg_rsp)	\
-M(SSO_HW_SETCONFIG,	0x604, sso_hw_setconfig, sso_hw_setconfig,	\
-				msg_rsp)				\
-M(SSO_GRP_SET_PRIORITY,	0x605, sso_grp_set_priority, sso_grp_priority,	\
-				msg_rsp)				\
-M(SSO_GRP_GET_PRIORITY,	0x606, sso_grp_get_priority, sso_info_req,	\
-				sso_grp_priority)			\
-M(SSO_WS_CACHE_INV,	0x607, sso_ws_cache_inv, msg_req, msg_rsp)	\
-M(SSO_GRP_QOS_CONFIG,	0x608, sso_grp_qos_config, sso_grp_qos_cfg,	\
-				msg_rsp)				\
-M(SSO_GRP_GET_STATS,	0x609, sso_grp_get_stats, sso_info_req,		\
-				sso_grp_stats)				\
-M(SSO_HWS_GET_STATS,	0x610, sso_hws_get_stats, sso_info_req,		\
-				sso_hws_stats)				\
-M(SSO_HW_RELEASE_XAQ,	0x611, sso_hw_release_xaq_aura,			\
-				sso_release_xaq, msg_rsp)		\
-/* TIM mbox IDs (range 0x800 - 0x9FF) */				\
-M(TIM_LF_ALLOC,		0x800, tim_lf_alloc, tim_lf_alloc_req,		\
-				tim_lf_alloc_rsp)			\
-M(TIM_LF_FREE,		0x801, tim_lf_free, tim_ring_req, msg_rsp)	\
-M(TIM_CONFIG_RING,	0x802, tim_config_ring, tim_config_req, msg_rsp)\
-M(TIM_ENABLE_RING,	0x803, tim_enable_ring, tim_ring_req,		\
-				tim_enable_rsp)				\
-M(TIM_DISABLE_RING,	0x804, tim_disable_ring, tim_ring_req, msg_rsp)	\
-/* CPT mbox IDs (range 0xA00 - 0xBFF) */				\
-M(CPT_LF_ALLOC,		0xA00, cpt_lf_alloc, cpt_lf_alloc_req_msg,	\
-			       cpt_lf_alloc_rsp_msg)			\
-M(CPT_LF_FREE,		0xA01, cpt_lf_free, msg_req, msg_rsp)		\
-M(CPT_RD_WR_REGISTER,	0xA02, cpt_rd_wr_register, cpt_rd_wr_reg_msg,	\
-			       cpt_rd_wr_reg_msg)			\
-M(CPT_SET_CRYPTO_GRP,	0xA03, cpt_set_crypto_grp,			\
-			       cpt_set_crypto_grp_req_msg,		\
-			       msg_rsp)					\
-M(CPT_INLINE_IPSEC_CFG, 0xA04, cpt_inline_ipsec_cfg,			\
-			       cpt_inline_ipsec_cfg_msg, msg_rsp)	\
-M(CPT_RX_INLINE_LF_CFG, 0xBFE, cpt_rx_inline_lf_cfg,			\
-			       cpt_rx_inline_lf_cfg_msg, msg_rsp)	\
-M(CPT_GET_CAPS,		0xBFD, cpt_caps_get, msg_req, cpt_caps_rsp_msg)	\
-/* REE mbox IDs (range 0xE00 - 0xFFF) */				\
-M(REE_CONFIG_LF,	0xE01, ree_config_lf, ree_lf_req_msg,		\
-				msg_rsp)				\
-M(REE_RD_WR_REGISTER,	0xE02, ree_rd_wr_register, ree_rd_wr_reg_msg,	\
-				ree_rd_wr_reg_msg)			\
-M(REE_RULE_DB_PROG,	0xE03, ree_rule_db_prog,			\
-				ree_rule_db_prog_req_msg,		\
-				msg_rsp)				\
-M(REE_RULE_DB_LEN_GET,	0xE04, ree_rule_db_len_get, ree_req_msg,	\
-				ree_rule_db_len_rsp_msg)		\
-M(REE_RULE_DB_GET,	0xE05, ree_rule_db_get,				\
-				ree_rule_db_get_req_msg,		\
-				ree_rule_db_get_rsp_msg)		\
-/* NPC mbox IDs (range 0x6000 - 0x7FFF) */				\
-M(NPC_MCAM_ALLOC_ENTRY,	0x6000, npc_mcam_alloc_entry,			\
-				npc_mcam_alloc_entry_req,		\
-				npc_mcam_alloc_entry_rsp)		\
-M(NPC_MCAM_FREE_ENTRY,	0x6001, npc_mcam_free_entry,			\
-				npc_mcam_free_entry_req, msg_rsp)	\
-M(NPC_MCAM_WRITE_ENTRY,	0x6002, npc_mcam_write_entry,			\
-				npc_mcam_write_entry_req, msg_rsp)	\
-M(NPC_MCAM_ENA_ENTRY,	0x6003, npc_mcam_ena_entry,			\
-				npc_mcam_ena_dis_entry_req, msg_rsp)	\
-M(NPC_MCAM_DIS_ENTRY,	0x6004, npc_mcam_dis_entry,			\
-				npc_mcam_ena_dis_entry_req, msg_rsp)	\
-M(NPC_MCAM_SHIFT_ENTRY,	0x6005, npc_mcam_shift_entry,			\
-				npc_mcam_shift_entry_req,		\
-				npc_mcam_shift_entry_rsp)		\
-M(NPC_MCAM_ALLOC_COUNTER,	0x6006, npc_mcam_alloc_counter,		\
-				npc_mcam_alloc_counter_req,		\
-				npc_mcam_alloc_counter_rsp)		\
-M(NPC_MCAM_FREE_COUNTER,	0x6007, npc_mcam_free_counter,		\
-				npc_mcam_oper_counter_req,		\
-				msg_rsp)				\
-M(NPC_MCAM_UNMAP_COUNTER,	0x6008, npc_mcam_unmap_counter,		\
-				npc_mcam_unmap_counter_req,		\
-				msg_rsp)				\
-M(NPC_MCAM_CLEAR_COUNTER,	0x6009, npc_mcam_clear_counter,		\
-				npc_mcam_oper_counter_req,		\
-				msg_rsp)				\
-M(NPC_MCAM_COUNTER_STATS,	0x600a, npc_mcam_counter_stats,		\
-				npc_mcam_oper_counter_req,		\
-				npc_mcam_oper_counter_rsp)		\
-M(NPC_MCAM_ALLOC_AND_WRITE_ENTRY, 0x600b, npc_mcam_alloc_and_write_entry,\
-				npc_mcam_alloc_and_write_entry_req,	\
-				npc_mcam_alloc_and_write_entry_rsp)	\
-M(NPC_GET_KEX_CFG,	  0x600c, npc_get_kex_cfg, msg_req,		\
-				npc_get_kex_cfg_rsp)			\
-M(NPC_INSTALL_FLOW,	  0x600d, npc_install_flow,			\
-				  npc_install_flow_req,			\
-				  npc_install_flow_rsp)			\
-M(NPC_DELETE_FLOW,	  0x600e, npc_delete_flow,			\
-				  npc_delete_flow_req, msg_rsp)		\
-M(NPC_MCAM_READ_ENTRY,	  0x600f, npc_mcam_read_entry,			\
-				  npc_mcam_read_entry_req,		\
-				  npc_mcam_read_entry_rsp)		\
-M(NPC_SET_PKIND,          0x6010, npc_set_pkind,                        \
-				  npc_set_pkind,                        \
-				  msg_rsp)                              \
-M(NPC_MCAM_READ_BASE_RULE, 0x6011, npc_read_base_steer_rule, msg_req,   \
-				   npc_mcam_read_base_rule_rsp)         \
-/* NIX mbox IDs (range 0x8000 - 0xFFFF) */				\
-M(NIX_LF_ALLOC,		0x8000, nix_lf_alloc, nix_lf_alloc_req,		\
-				nix_lf_alloc_rsp)			\
-M(NIX_LF_FREE,		0x8001, nix_lf_free, nix_lf_free_req, msg_rsp)	\
-M(NIX_AQ_ENQ,		0x8002, nix_aq_enq, nix_aq_enq_req,		\
-				nix_aq_enq_rsp)				\
-M(NIX_HWCTX_DISABLE,	0x8003, nix_hwctx_disable, hwctx_disable_req,	\
-				msg_rsp)				\
-M(NIX_TXSCH_ALLOC,	0x8004, nix_txsch_alloc, nix_txsch_alloc_req,	\
-				nix_txsch_alloc_rsp)			\
-M(NIX_TXSCH_FREE,	0x8005, nix_txsch_free,	nix_txsch_free_req,	\
-				msg_rsp)				\
-M(NIX_TXSCHQ_CFG,	0x8006, nix_txschq_cfg, nix_txschq_config,	\
-				nix_txschq_config)			\
-M(NIX_STATS_RST,	0x8007, nix_stats_rst, msg_req, msg_rsp)	\
-M(NIX_VTAG_CFG,		0x8008, nix_vtag_cfg, nix_vtag_config, msg_rsp)	\
-M(NIX_RSS_FLOWKEY_CFG,	0x8009, nix_rss_flowkey_cfg,			\
-				nix_rss_flowkey_cfg,			\
-				nix_rss_flowkey_cfg_rsp)		\
-M(NIX_SET_MAC_ADDR,	0x800a, nix_set_mac_addr, nix_set_mac_addr,	\
-				msg_rsp)				\
-M(NIX_SET_RX_MODE,	0x800b, nix_set_rx_mode, nix_rx_mode, msg_rsp)	\
-M(NIX_SET_HW_FRS,	0x800c, nix_set_hw_frs,	nix_frs_cfg, msg_rsp)	\
-M(NIX_LF_START_RX,	0x800d, nix_lf_start_rx, msg_req, msg_rsp)	\
-M(NIX_LF_STOP_RX,	0x800e, nix_lf_stop_rx,	msg_req, msg_rsp)	\
-M(NIX_MARK_FORMAT_CFG,	0x800f, nix_mark_format_cfg,			\
-				nix_mark_format_cfg,			\
-				nix_mark_format_cfg_rsp)		\
-M(NIX_SET_RX_CFG,	0x8010, nix_set_rx_cfg, nix_rx_cfg, msg_rsp)	\
-M(NIX_LSO_FORMAT_CFG,	0x8011, nix_lso_format_cfg, nix_lso_format_cfg,	\
-				nix_lso_format_cfg_rsp)			\
-M(NIX_LF_PTP_TX_ENABLE,	0x8013, nix_lf_ptp_tx_enable, msg_req,		\
-				msg_rsp)				\
-M(NIX_LF_PTP_TX_DISABLE,	0x8014, nix_lf_ptp_tx_disable, msg_req,	\
-				msg_rsp)				\
-M(NIX_SET_VLAN_TPID,	0x8015, nix_set_vlan_tpid, nix_set_vlan_tpid,	\
-				msg_rsp)				\
-M(NIX_BP_ENABLE,	0x8016, nix_bp_enable, nix_bp_cfg_req,		\
-				nix_bp_cfg_rsp)				\
-M(NIX_BP_DISABLE,	0x8017, nix_bp_disable,	nix_bp_cfg_req, msg_rsp)\
-M(NIX_GET_MAC_ADDR,	0x8018, nix_get_mac_addr, msg_req,		\
-				nix_get_mac_addr_rsp)			\
-M(NIX_INLINE_IPSEC_CFG,	0x8019, nix_inline_ipsec_cfg,			\
-				nix_inline_ipsec_cfg, msg_rsp)		\
-M(NIX_INLINE_IPSEC_LF_CFG,						\
-			0x801a, nix_inline_ipsec_lf_cfg,		\
-				nix_inline_ipsec_lf_cfg, msg_rsp)
-
-/* Messages initiated by AF (range 0xC00 - 0xDFF) */
-#define MBOX_UP_CGX_MESSAGES						\
-M(CGX_LINK_EVENT,	0xC00, cgx_link_event, cgx_link_info_msg,	\
-				msg_rsp)				\
-M(CGX_PTP_RX_INFO,	0xC01, cgx_ptp_rx_info, cgx_ptp_rx_info_msg,	\
-				msg_rsp)
-
-enum {
-#define M(_name, _id, _1, _2, _3) MBOX_MSG_ ## _name = _id,
-MBOX_MESSAGES
-MBOX_UP_CGX_MESSAGES
-#undef M
-};
-
-/* Mailbox message formats */
-
-#define RVU_DEFAULT_PF_FUNC     0xFFFF
-
-/* Generic request msg used for those mbox messages which
- * don't send any data in the request.
- */
-struct msg_req {
-	struct mbox_msghdr hdr;
-};
-
-/* Generic response msg used a ack or response for those mbox
- * messages which doesn't have a specific rsp msg format.
- */
-struct msg_rsp {
-	struct mbox_msghdr hdr;
-};
-
-/* RVU mailbox error codes
- * Range 256 - 300.
- */
-enum rvu_af_status {
-	RVU_INVALID_VF_ID           = -256,
-};
-
-struct ready_msg_rsp {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io sclk_feq; /* SCLK frequency */
-	uint16_t __otx2_io rclk_freq; /* RCLK frequency */
-};
-
-enum npc_pkind_type {
-	NPC_RX_CUSTOM_PRE_L2_PKIND = 55ULL,
-	NPC_RX_VLAN_EXDSA_PKIND = 56ULL,
-	NPC_RX_CHLEN24B_PKIND,
-	NPC_RX_CPT_HDR_PKIND,
-	NPC_RX_CHLEN90B_PKIND,
-	NPC_TX_HIGIG_PKIND,
-	NPC_RX_HIGIG_PKIND,
-	NPC_RX_EXDSA_PKIND,
-	NPC_RX_EDSA_PKIND,
-	NPC_TX_DEF_PKIND,
-};
-
-#define OTX2_PRIV_FLAGS_CH_LEN_90B 254
-#define OTX2_PRIV_FLAGS_CH_LEN_24B 255
-
-/* Struct to set pkind */
-struct npc_set_pkind {
-	struct mbox_msghdr hdr;
-#define OTX2_PRIV_FLAGS_DEFAULT	   BIT_ULL(0)
-#define OTX2_PRIV_FLAGS_EDSA	   BIT_ULL(1)
-#define OTX2_PRIV_FLAGS_HIGIG	   BIT_ULL(2)
-#define OTX2_PRIV_FLAGS_FDSA	   BIT_ULL(3)
-#define OTX2_PRIV_FLAGS_EXDSA	   BIT_ULL(4)
-#define OTX2_PRIV_FLAGS_VLAN_EXDSA BIT_ULL(5)
-#define OTX2_PRIV_FLAGS_CUSTOM	   BIT_ULL(63)
-	uint64_t __otx2_io mode;
-#define PKIND_TX BIT_ULL(0)
-#define PKIND_RX BIT_ULL(1)
-	uint8_t __otx2_io dir;
-	uint8_t __otx2_io pkind; /* valid only in case custom flag */
-	uint8_t __otx2_io var_len_off;
-	/* Offset of custom header length field.
-	 * Valid only for pkind NPC_RX_CUSTOM_PRE_L2_PKIND
-	 */
-	uint8_t __otx2_io var_len_off_mask; /* Mask for length with in offset */
-	uint8_t __otx2_io shift_dir;
-	/* Shift direction to get length of the
-	 * header at var_len_off
-	 */
-};
-
-/* Structure for requesting resource provisioning.
- * 'modify' flag to be used when either requesting more
- * or to detach partial of a certain resource type.
- * Rest of the fields specify how many of what type to
- * be attached.
- * To request LFs from two blocks of same type this mailbox
- * can be sent twice as below:
- *      struct rsrc_attach *attach;
- *       .. Allocate memory for message ..
- *       attach->cptlfs = 3; <3 LFs from CPT0>
- *       .. Send message ..
- *       .. Allocate memory for message ..
- *       attach->modify = 1;
- *       attach->cpt_blkaddr = BLKADDR_CPT1;
- *       attach->cptlfs = 2; <2 LFs from CPT1>
- *       .. Send message ..
- */
-struct rsrc_attach_req {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io modify:1;
-	uint8_t __otx2_io npalf:1;
-	uint8_t __otx2_io nixlf:1;
-	uint16_t __otx2_io sso;
-	uint16_t __otx2_io ssow;
-	uint16_t __otx2_io timlfs;
-	uint16_t __otx2_io cptlfs;
-	uint16_t __otx2_io reelfs;
-	/* BLKADDR_CPT0/BLKADDR_CPT1 or 0 for BLKADDR_CPT0 */
-	int __otx2_io cpt_blkaddr;
-	/* BLKADDR_REE0/BLKADDR_REE1 or 0 for BLKADDR_REE0 */
-	int __otx2_io ree_blkaddr;
-};
-
-/* Structure for relinquishing resources.
- * 'partial' flag to be used when relinquishing all resources
- * but only of a certain type. If not set, all resources of all
- * types provisioned to the RVU function will be detached.
- */
-struct rsrc_detach_req {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io partial:1;
-	uint8_t __otx2_io npalf:1;
-	uint8_t __otx2_io nixlf:1;
-	uint8_t __otx2_io sso:1;
-	uint8_t __otx2_io ssow:1;
-	uint8_t __otx2_io timlfs:1;
-	uint8_t __otx2_io cptlfs:1;
-	uint8_t __otx2_io reelfs:1;
-};
-
-/* NIX Transmit schedulers */
-#define	NIX_TXSCH_LVL_SMQ 0x0
-#define	NIX_TXSCH_LVL_MDQ 0x0
-#define	NIX_TXSCH_LVL_TL4 0x1
-#define	NIX_TXSCH_LVL_TL3 0x2
-#define	NIX_TXSCH_LVL_TL2 0x3
-#define	NIX_TXSCH_LVL_TL1 0x4
-#define	NIX_TXSCH_LVL_CNT 0x5
-
-/*
- * Number of resources available to the caller.
- * In reply to MBOX_MSG_FREE_RSRC_CNT.
- */
-struct free_rsrcs_rsp {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io schq[NIX_TXSCH_LVL_CNT];
-	uint16_t __otx2_io sso;
-	uint16_t __otx2_io tim;
-	uint16_t __otx2_io ssow;
-	uint16_t __otx2_io cpt;
-	uint8_t __otx2_io npa;
-	uint8_t __otx2_io nix;
-	uint16_t  __otx2_io schq_nix1[NIX_TXSCH_LVL_CNT];
-	uint8_t  __otx2_io nix1;
-	uint8_t  __otx2_io cpt1;
-	uint8_t  __otx2_io ree0;
-	uint8_t  __otx2_io ree1;
-};
-
-#define MSIX_VECTOR_INVALID	0xFFFF
-#define MAX_RVU_BLKLF_CNT	256
-
-struct msix_offset_rsp {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io npa_msixoff;
-	uint16_t __otx2_io nix_msixoff;
-	uint16_t __otx2_io sso;
-	uint16_t __otx2_io ssow;
-	uint16_t __otx2_io timlfs;
-	uint16_t __otx2_io cptlfs;
-	uint16_t __otx2_io sso_msixoff[MAX_RVU_BLKLF_CNT];
-	uint16_t __otx2_io ssow_msixoff[MAX_RVU_BLKLF_CNT];
-	uint16_t __otx2_io timlf_msixoff[MAX_RVU_BLKLF_CNT];
-	uint16_t __otx2_io cptlf_msixoff[MAX_RVU_BLKLF_CNT];
-	uint16_t __otx2_io cpt1_lfs;
-	uint16_t __otx2_io ree0_lfs;
-	uint16_t __otx2_io ree1_lfs;
-	uint16_t __otx2_io cpt1_lf_msixoff[MAX_RVU_BLKLF_CNT];
-	uint16_t __otx2_io ree0_lf_msixoff[MAX_RVU_BLKLF_CNT];
-	uint16_t __otx2_io ree1_lf_msixoff[MAX_RVU_BLKLF_CNT];
-
-};
-
-/* CGX mbox message formats */
-
-struct cgx_stats_rsp {
-	struct mbox_msghdr hdr;
-#define CGX_RX_STATS_COUNT	13
-#define CGX_TX_STATS_COUNT	18
-	uint64_t __otx2_io rx_stats[CGX_RX_STATS_COUNT];
-	uint64_t __otx2_io tx_stats[CGX_TX_STATS_COUNT];
-};
-
-struct cgx_fec_stats_rsp {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io fec_corr_blks;
-	uint64_t __otx2_io fec_uncorr_blks;
-};
-/* Structure for requesting the operation for
- * setting/getting mac address in the CGX interface
- */
-struct cgx_mac_addr_set_or_get {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io mac_addr[RTE_ETHER_ADDR_LEN];
-};
-
-/* Structure for requesting the operation to
- * add DMAC filter entry into CGX interface
- */
-struct cgx_mac_addr_add_req {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io mac_addr[RTE_ETHER_ADDR_LEN];
-};
-
-/* Structure for response against the operation to
- * add DMAC filter entry into CGX interface
- */
-struct cgx_mac_addr_add_rsp {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io index;
-};
-
-/* Structure for requesting the operation to
- * delete DMAC filter entry from CGX interface
- */
-struct cgx_mac_addr_del_req {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io index;
-};
-
-/* Structure for response against the operation to
- * get maximum supported DMAC filter entries
- */
-struct cgx_max_dmac_entries_get_rsp {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io max_dmac_filters;
-};
-
-struct cgx_link_user_info {
-	uint64_t __otx2_io link_up:1;
-	uint64_t __otx2_io full_duplex:1;
-	uint64_t __otx2_io lmac_type_id:4;
-	uint64_t __otx2_io speed:20; /* speed in Mbps */
-	uint64_t __otx2_io an:1; /* AN supported or not */
-	uint64_t __otx2_io fec:2; /* FEC type if enabled else 0 */
-	uint64_t __otx2_io port:8;
-#define LMACTYPE_STR_LEN 16
-	char lmac_type[LMACTYPE_STR_LEN];
-};
-
-struct cgx_link_info_msg {
-	struct mbox_msghdr hdr;
-	struct cgx_link_user_info link_info;
-};
-
-struct cgx_ptp_rx_info_msg {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io ptp_en;
-};
-
-struct cgx_pause_frm_cfg {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io set;
-	/* set = 1 if the request is to config pause frames */
-	/* set = 0 if the request is to fetch pause frames config */
-	uint8_t __otx2_io rx_pause;
-	uint8_t __otx2_io tx_pause;
-};
-
-struct sfp_eeprom_s {
-#define SFP_EEPROM_SIZE 256
-	uint16_t __otx2_io sff_id;
-	uint8_t __otx2_io buf[SFP_EEPROM_SIZE];
-	uint64_t __otx2_io reserved;
-};
-
-enum fec_type {
-	OTX2_FEC_NONE,
-	OTX2_FEC_BASER,
-	OTX2_FEC_RS,
-};
-
-struct phy_s {
-	uint64_t __otx2_io can_change_mod_type : 1;
-	uint64_t __otx2_io mod_type            : 1;
-};
-
-struct cgx_lmac_fwdata_s {
-	uint16_t __otx2_io rw_valid;
-	uint64_t __otx2_io supported_fec;
-	uint64_t __otx2_io supported_an;
-	uint64_t __otx2_io supported_link_modes;
-	/* Only applicable if AN is supported */
-	uint64_t __otx2_io advertised_fec;
-	uint64_t __otx2_io advertised_link_modes;
-	/* Only applicable if SFP/QSFP slot is present */
-	struct sfp_eeprom_s sfp_eeprom;
-	struct phy_s phy;
-#define LMAC_FWDATA_RESERVED_MEM 1023
-	uint64_t __otx2_io reserved[LMAC_FWDATA_RESERVED_MEM];
-};
-
-struct cgx_fw_data {
-	struct mbox_msghdr hdr;
-	struct cgx_lmac_fwdata_s fwdata;
-};
-
-struct fec_mode {
-	struct mbox_msghdr hdr;
-	int __otx2_io fec;
-};
-
-struct cgx_set_link_state_msg {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io enable;
-};
-
-struct cgx_phy_mod_type {
-	struct mbox_msghdr hdr;
-	int __otx2_io mod;
-};
-
-struct cgx_set_link_mode_args {
-	uint32_t __otx2_io speed;
-	uint8_t __otx2_io duplex;
-	uint8_t __otx2_io an;
-	uint8_t __otx2_io ports;
-	uint64_t __otx2_io mode;
-};
-
-struct cgx_set_link_mode_req {
-	struct mbox_msghdr hdr;
-	struct cgx_set_link_mode_args args;
-};
-
-struct cgx_set_link_mode_rsp {
-	struct mbox_msghdr hdr;
-	int __otx2_io status;
-};
-/* NPA mbox message formats */
-
-/* NPA mailbox error codes
- * Range 301 - 400.
- */
-enum npa_af_status {
-	NPA_AF_ERR_PARAM            = -301,
-	NPA_AF_ERR_AQ_FULL          = -302,
-	NPA_AF_ERR_AQ_ENQUEUE       = -303,
-	NPA_AF_ERR_AF_LF_INVALID    = -304,
-	NPA_AF_ERR_AF_LF_ALLOC      = -305,
-	NPA_AF_ERR_LF_RESET         = -306,
-};
-
-#define NPA_AURA_SZ_0		0
-#define NPA_AURA_SZ_128		1
-#define	NPA_AURA_SZ_256		2
-#define	NPA_AURA_SZ_512		3
-#define	NPA_AURA_SZ_1K		4
-#define	NPA_AURA_SZ_2K		5
-#define	NPA_AURA_SZ_4K		6
-#define	NPA_AURA_SZ_8K		7
-#define	NPA_AURA_SZ_16K		8
-#define	NPA_AURA_SZ_32K		9
-#define	NPA_AURA_SZ_64K		10
-#define	NPA_AURA_SZ_128K	11
-#define	NPA_AURA_SZ_256K	12
-#define	NPA_AURA_SZ_512K	13
-#define	NPA_AURA_SZ_1M		14
-#define	NPA_AURA_SZ_MAX		15
-
-/* For NPA LF context alloc and init */
-struct npa_lf_alloc_req {
-	struct mbox_msghdr hdr;
-	int __otx2_io node;
-	int __otx2_io aura_sz; /* No of auras. See NPA_AURA_SZ_* */
-	uint32_t __otx2_io nr_pools; /* No of pools */
-	uint64_t __otx2_io way_mask;
-};
-
-struct npa_lf_alloc_rsp {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io stack_pg_ptrs;  /* No of ptrs per stack page */
-	uint32_t __otx2_io stack_pg_bytes; /* Size of stack page */
-	uint16_t __otx2_io qints; /* NPA_AF_CONST::QINTS */
-};
-
-/* NPA AQ enqueue msg */
-struct npa_aq_enq_req {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io aura_id;
-	uint8_t __otx2_io ctype;
-	uint8_t __otx2_io op;
-	union {
-		/* Valid when op == WRITE/INIT and ctype == AURA.
-		 * LF fills the pool_id in aura.pool_addr. AF will translate
-		 * the pool_id to pool context pointer.
-		 */
-		__otx2_io struct npa_aura_s aura;
-		/* Valid when op == WRITE/INIT and ctype == POOL */
-		__otx2_io struct npa_pool_s pool;
-	};
-	/* Mask data when op == WRITE (1=write, 0=don't write) */
-	union {
-		/* Valid when op == WRITE and ctype == AURA */
-		__otx2_io struct npa_aura_s aura_mask;
-		/* Valid when op == WRITE and ctype == POOL */
-		__otx2_io struct npa_pool_s pool_mask;
-	};
-};
-
-struct npa_aq_enq_rsp {
-	struct mbox_msghdr hdr;
-	union {
-		/* Valid when op == READ and ctype == AURA */
-		__otx2_io struct npa_aura_s aura;
-		/* Valid when op == READ and ctype == POOL */
-		__otx2_io struct npa_pool_s pool;
-	};
-};
-
-/* Disable all contexts of type 'ctype' */
-struct hwctx_disable_req {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io ctype;
-};
-
-/* NIX mbox message formats */
-
-/* NIX mailbox error codes
- * Range 401 - 500.
- */
-enum nix_af_status {
-	NIX_AF_ERR_PARAM            = -401,
-	NIX_AF_ERR_AQ_FULL          = -402,
-	NIX_AF_ERR_AQ_ENQUEUE       = -403,
-	NIX_AF_ERR_AF_LF_INVALID    = -404,
-	NIX_AF_ERR_AF_LF_ALLOC      = -405,
-	NIX_AF_ERR_TLX_ALLOC_FAIL   = -406,
-	NIX_AF_ERR_TLX_INVALID      = -407,
-	NIX_AF_ERR_RSS_SIZE_INVALID = -408,
-	NIX_AF_ERR_RSS_GRPS_INVALID = -409,
-	NIX_AF_ERR_FRS_INVALID      = -410,
-	NIX_AF_ERR_RX_LINK_INVALID  = -411,
-	NIX_AF_INVAL_TXSCHQ_CFG     = -412,
-	NIX_AF_SMQ_FLUSH_FAILED     = -413,
-	NIX_AF_ERR_LF_RESET         = -414,
-	NIX_AF_ERR_RSS_NOSPC_FIELD  = -415,
-	NIX_AF_ERR_RSS_NOSPC_ALGO   = -416,
-	NIX_AF_ERR_MARK_CFG_FAIL    = -417,
-	NIX_AF_ERR_LSO_CFG_FAIL     = -418,
-	NIX_AF_INVAL_NPA_PF_FUNC    = -419,
-	NIX_AF_INVAL_SSO_PF_FUNC    = -420,
-	NIX_AF_ERR_TX_VTAG_NOSPC    = -421,
-	NIX_AF_ERR_RX_VTAG_INUSE    = -422,
-	NIX_AF_ERR_PTP_CONFIG_FAIL  = -423,
-};
-
-/* For NIX LF context alloc and init */
-struct nix_lf_alloc_req {
-	struct mbox_msghdr hdr;
-	int __otx2_io node;
-	uint32_t __otx2_io rq_cnt;   /* No of receive queues */
-	uint32_t __otx2_io sq_cnt;   /* No of send queues */
-	uint32_t __otx2_io cq_cnt;   /* No of completion queues */
-	uint8_t __otx2_io xqe_sz;
-	uint16_t __otx2_io rss_sz;
-	uint8_t __otx2_io rss_grps;
-	uint16_t __otx2_io npa_func;
-	/* RVU_DEFAULT_PF_FUNC == default pf_func associated with lf */
-	uint16_t __otx2_io sso_func;
-	uint64_t __otx2_io rx_cfg;   /* See NIX_AF_LF(0..127)_RX_CFG */
-	uint64_t __otx2_io way_mask;
-#define NIX_LF_RSS_TAG_LSB_AS_ADDER BIT_ULL(0)
-	uint64_t flags;
-};
-
-struct nix_lf_alloc_rsp {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io sqb_size;
-	uint16_t __otx2_io rx_chan_base;
-	uint16_t __otx2_io tx_chan_base;
-	uint8_t __otx2_io rx_chan_cnt; /* Total number of RX channels */
-	uint8_t __otx2_io tx_chan_cnt; /* Total number of TX channels */
-	uint8_t __otx2_io lso_tsov4_idx;
-	uint8_t __otx2_io lso_tsov6_idx;
-	uint8_t __otx2_io mac_addr[RTE_ETHER_ADDR_LEN];
-	uint8_t __otx2_io lf_rx_stats; /* NIX_AF_CONST1::LF_RX_STATS */
-	uint8_t __otx2_io lf_tx_stats; /* NIX_AF_CONST1::LF_TX_STATS */
-	uint16_t __otx2_io cints; /* NIX_AF_CONST2::CINTS */
-	uint16_t __otx2_io qints; /* NIX_AF_CONST2::QINTS */
-	uint8_t __otx2_io hw_rx_tstamp_en; /*set if rx timestamping enabled */
-	uint8_t __otx2_io cgx_links;  /* No. of CGX links present in HW */
-	uint8_t __otx2_io lbk_links;  /* No. of LBK links present in HW */
-	uint8_t __otx2_io sdp_links;  /* No. of SDP links present in HW */
-	uint8_t __otx2_io tx_link;    /* Transmit channel link number */
-};
-
-struct nix_lf_free_req {
-	struct mbox_msghdr hdr;
-#define NIX_LF_DISABLE_FLOWS		BIT_ULL(0)
-#define NIX_LF_DONT_FREE_TX_VTAG	BIT_ULL(1)
-	uint64_t __otx2_io flags;
-};
-
-/* NIX AQ enqueue msg */
-struct nix_aq_enq_req {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io qidx;
-	uint8_t __otx2_io ctype;
-	uint8_t __otx2_io op;
-	union {
-		/* Valid when op == WRITE/INIT and ctype == NIX_AQ_CTYPE_RQ */
-		__otx2_io struct nix_rq_ctx_s rq;
-		/* Valid when op == WRITE/INIT and ctype == NIX_AQ_CTYPE_SQ */
-		__otx2_io struct nix_sq_ctx_s sq;
-		/* Valid when op == WRITE/INIT and ctype == NIX_AQ_CTYPE_CQ */
-		__otx2_io struct nix_cq_ctx_s cq;
-		/* Valid when op == WRITE/INIT and ctype == NIX_AQ_CTYPE_RSS */
-		__otx2_io struct nix_rsse_s rss;
-		/* Valid when op == WRITE/INIT and ctype == NIX_AQ_CTYPE_MCE */
-		__otx2_io struct nix_rx_mce_s mce;
-	};
-	/* Mask data when op == WRITE (1=write, 0=don't write) */
-	union {
-		/* Valid when op == WRITE and ctype == NIX_AQ_CTYPE_RQ */
-		__otx2_io struct nix_rq_ctx_s rq_mask;
-		/* Valid when op == WRITE and ctype == NIX_AQ_CTYPE_SQ */
-		__otx2_io struct nix_sq_ctx_s sq_mask;
-		/* Valid when op == WRITE and ctype == NIX_AQ_CTYPE_CQ */
-		__otx2_io struct nix_cq_ctx_s cq_mask;
-		/* Valid when op == WRITE and ctype == NIX_AQ_CTYPE_RSS */
-		__otx2_io struct nix_rsse_s rss_mask;
-		/* Valid when op == WRITE and ctype == NIX_AQ_CTYPE_MCE */
-		__otx2_io struct nix_rx_mce_s mce_mask;
-	};
-};
-
-struct nix_aq_enq_rsp {
-	struct mbox_msghdr hdr;
-	union {
-		__otx2_io struct nix_rq_ctx_s rq;
-		__otx2_io struct nix_sq_ctx_s sq;
-		__otx2_io struct nix_cq_ctx_s cq;
-		__otx2_io struct nix_rsse_s   rss;
-		__otx2_io struct nix_rx_mce_s mce;
-	};
-};
-
-/* Tx scheduler/shaper mailbox messages */
-
-#define MAX_TXSCHQ_PER_FUNC	128
-
-struct nix_txsch_alloc_req {
-	struct mbox_msghdr hdr;
-	/* Scheduler queue count request at each level */
-	uint16_t __otx2_io schq_contig[NIX_TXSCH_LVL_CNT]; /* Contig. queues */
-	uint16_t __otx2_io schq[NIX_TXSCH_LVL_CNT]; /* Non-Contig. queues */
-};
-
-struct nix_txsch_alloc_rsp {
-	struct mbox_msghdr hdr;
-	/* Scheduler queue count allocated at each level */
-	uint16_t __otx2_io schq_contig[NIX_TXSCH_LVL_CNT]; /* Contig. queues */
-	uint16_t __otx2_io schq[NIX_TXSCH_LVL_CNT]; /* Non-Contig. queues */
-	/* Scheduler queue list allocated at each level */
-	uint16_t __otx2_io
-		schq_contig_list[NIX_TXSCH_LVL_CNT][MAX_TXSCHQ_PER_FUNC];
-	uint16_t __otx2_io schq_list[NIX_TXSCH_LVL_CNT][MAX_TXSCHQ_PER_FUNC];
-	/* Traffic aggregation scheduler level */
-	uint8_t  __otx2_io aggr_level;
-	/* Aggregation lvl's RR_PRIO config */
-	uint8_t  __otx2_io aggr_lvl_rr_prio;
-	/* LINKX_CFG CSRs mapped to TL3 or TL2's index ? */
-	uint8_t  __otx2_io link_cfg_lvl;
-};
-
-struct nix_txsch_free_req {
-	struct mbox_msghdr hdr;
-#define TXSCHQ_FREE_ALL BIT_ULL(0)
-	uint16_t __otx2_io flags;
-	/* Scheduler queue level to be freed */
-	uint16_t __otx2_io schq_lvl;
-	/* List of scheduler queues to be freed */
-	uint16_t __otx2_io schq;
-};
-
-struct nix_txschq_config {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io lvl; /* SMQ/MDQ/TL4/TL3/TL2/TL1 */
-	uint8_t __otx2_io read;
-#define TXSCHQ_IDX_SHIFT 16
-#define TXSCHQ_IDX_MASK (BIT_ULL(10) - 1)
-#define TXSCHQ_IDX(reg, shift) (((reg) >> (shift)) & TXSCHQ_IDX_MASK)
-	uint8_t __otx2_io num_regs;
-#define MAX_REGS_PER_MBOX_MSG 20
-	uint64_t __otx2_io reg[MAX_REGS_PER_MBOX_MSG];
-	uint64_t __otx2_io regval[MAX_REGS_PER_MBOX_MSG];
-	/* All 0's => overwrite with new value */
-	uint64_t __otx2_io regval_mask[MAX_REGS_PER_MBOX_MSG];
-};
-
-struct nix_vtag_config {
-	struct mbox_msghdr hdr;
-	/* '0' for 4 octet VTAG, '1' for 8 octet VTAG */
-	uint8_t __otx2_io vtag_size;
-	/* cfg_type is '0' for tx vlan cfg
-	 * cfg_type is '1' for rx vlan cfg
-	 */
-	uint8_t __otx2_io cfg_type;
-	union {
-		/* Valid when cfg_type is '0' */
-		struct {
-			uint64_t __otx2_io vtag0;
-			uint64_t __otx2_io vtag1;
-
-			/* cfg_vtag0 & cfg_vtag1 fields are valid
-			 * when free_vtag0 & free_vtag1 are '0's.
-			 */
-			/* cfg_vtag0 = 1 to configure vtag0 */
-			uint8_t __otx2_io cfg_vtag0 :1;
-			/* cfg_vtag1 = 1 to configure vtag1 */
-			uint8_t __otx2_io cfg_vtag1 :1;
-
-			/* vtag0_idx & vtag1_idx are only valid when
-			 * both cfg_vtag0 & cfg_vtag1 are '0's,
-			 * these fields are used along with free_vtag0
-			 * & free_vtag1 to free the nix lf's tx_vlan
-			 * configuration.
-			 *
-			 * Denotes the indices of tx_vtag def registers
-			 * that needs to be cleared and freed.
-			 */
-			int __otx2_io vtag0_idx;
-			int __otx2_io vtag1_idx;
-
-			/* Free_vtag0 & free_vtag1 fields are valid
-			 * when cfg_vtag0 & cfg_vtag1 are '0's.
-			 */
-			/* Free_vtag0 = 1 clears vtag0 configuration
-			 * vtag0_idx denotes the index to be cleared.
-			 */
-			uint8_t __otx2_io free_vtag0 :1;
-			/* Free_vtag1 = 1 clears vtag1 configuration
-			 * vtag1_idx denotes the index to be cleared.
-			 */
-			uint8_t __otx2_io free_vtag1 :1;
-		} tx;
-
-		/* Valid when cfg_type is '1' */
-		struct {
-			/* Rx vtag type index, valid values are in 0..7 range */
-			uint8_t __otx2_io vtag_type;
-			/* Rx vtag strip */
-			uint8_t __otx2_io strip_vtag :1;
-			/* Rx vtag capture */
-			uint8_t __otx2_io capture_vtag :1;
-		} rx;
-	};
-};
-
-struct nix_vtag_config_rsp {
-	struct mbox_msghdr hdr;
-	/* Indices of tx_vtag def registers used to configure
-	 * tx vtag0 & vtag1 headers, these indices are valid
-	 * when nix_vtag_config mbox requested for vtag0 and/
-	 * or vtag1 configuration.
-	 */
-	int __otx2_io vtag0_idx;
-	int __otx2_io vtag1_idx;
-};
-
-struct nix_rss_flowkey_cfg {
-	struct mbox_msghdr hdr;
-	int __otx2_io mcam_index;  /* MCAM entry index to modify */
-	uint32_t __otx2_io flowkey_cfg; /* Flowkey types selected */
-#define FLOW_KEY_TYPE_PORT     BIT(0)
-#define FLOW_KEY_TYPE_IPV4     BIT(1)
-#define FLOW_KEY_TYPE_IPV6     BIT(2)
-#define FLOW_KEY_TYPE_TCP      BIT(3)
-#define FLOW_KEY_TYPE_UDP      BIT(4)
-#define FLOW_KEY_TYPE_SCTP     BIT(5)
-#define FLOW_KEY_TYPE_NVGRE    BIT(6)
-#define FLOW_KEY_TYPE_VXLAN    BIT(7)
-#define FLOW_KEY_TYPE_GENEVE   BIT(8)
-#define FLOW_KEY_TYPE_ETH_DMAC BIT(9)
-#define FLOW_KEY_TYPE_IPV6_EXT BIT(10)
-#define FLOW_KEY_TYPE_GTPU       BIT(11)
-#define FLOW_KEY_TYPE_INNR_IPV4     BIT(12)
-#define FLOW_KEY_TYPE_INNR_IPV6     BIT(13)
-#define FLOW_KEY_TYPE_INNR_TCP      BIT(14)
-#define FLOW_KEY_TYPE_INNR_UDP      BIT(15)
-#define FLOW_KEY_TYPE_INNR_SCTP     BIT(16)
-#define FLOW_KEY_TYPE_INNR_ETH_DMAC BIT(17)
-#define FLOW_KEY_TYPE_CH_LEN_90B	BIT(18)
-#define FLOW_KEY_TYPE_CUSTOM0		BIT(19)
-#define FLOW_KEY_TYPE_VLAN		BIT(20)
-#define FLOW_KEY_TYPE_L4_DST BIT(28)
-#define FLOW_KEY_TYPE_L4_SRC BIT(29)
-#define FLOW_KEY_TYPE_L3_DST BIT(30)
-#define FLOW_KEY_TYPE_L3_SRC BIT(31)
-	uint8_t	__otx2_io group;       /* RSS context or group */
-};
-
-struct nix_rss_flowkey_cfg_rsp {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io alg_idx; /* Selected algo index */
-};
-
-struct nix_set_mac_addr {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io mac_addr[RTE_ETHER_ADDR_LEN];
-};
-
-struct nix_get_mac_addr_rsp {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io mac_addr[RTE_ETHER_ADDR_LEN];
-};
-
-struct nix_mark_format_cfg {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io offset;
-	uint8_t __otx2_io y_mask;
-	uint8_t __otx2_io y_val;
-	uint8_t __otx2_io r_mask;
-	uint8_t __otx2_io r_val;
-};
-
-struct nix_mark_format_cfg_rsp {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io mark_format_idx;
-};
-
-struct nix_lso_format_cfg {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io field_mask;
-	uint64_t __otx2_io fields[NIX_LSO_FIELD_MAX];
-};
-
-struct nix_lso_format_cfg_rsp {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io lso_format_idx;
-};
-
-struct nix_rx_mode {
-	struct mbox_msghdr hdr;
-#define NIX_RX_MODE_UCAST    BIT(0)
-#define NIX_RX_MODE_PROMISC  BIT(1)
-#define NIX_RX_MODE_ALLMULTI BIT(2)
-	uint16_t __otx2_io mode;
-};
-
-struct nix_rx_cfg {
-	struct mbox_msghdr hdr;
-#define NIX_RX_OL3_VERIFY   BIT(0)
-#define NIX_RX_OL4_VERIFY   BIT(1)
-	uint8_t __otx2_io len_verify; /* Outer L3/L4 len check */
-#define NIX_RX_CSUM_OL4_VERIFY  BIT(0)
-	uint8_t __otx2_io csum_verify; /* Outer L4 checksum verification */
-};
-
-struct nix_frs_cfg {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io update_smq;    /* Update SMQ's min/max lens */
-	uint8_t __otx2_io update_minlen; /* Set minlen also */
-	uint8_t __otx2_io sdp_link;      /* Set SDP RX link */
-	uint16_t __otx2_io maxlen;
-	uint16_t __otx2_io minlen;
-};
-
-struct nix_set_vlan_tpid {
-	struct mbox_msghdr hdr;
-#define NIX_VLAN_TYPE_INNER 0
-#define NIX_VLAN_TYPE_OUTER 1
-	uint8_t __otx2_io vlan_type;
-	uint16_t __otx2_io tpid;
-};
-
-struct nix_bp_cfg_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io chan_base; /* Starting channel number */
-	uint8_t __otx2_io chan_cnt; /* Number of channels */
-	uint8_t __otx2_io bpid_per_chan;
-	/* bpid_per_chan = 0  assigns single bp id for range of channels */
-	/* bpid_per_chan = 1 assigns separate bp id for each channel */
-};
-
-/* PF can be mapped to either CGX or LBK interface,
- * so maximum 64 channels are possible.
- */
-#define NIX_MAX_CHAN	64
-struct nix_bp_cfg_rsp {
-	struct mbox_msghdr hdr;
-	/* Channel and bpid mapping */
-	uint16_t __otx2_io chan_bpid[NIX_MAX_CHAN];
-	/* Number of channel for which bpids are assigned */
-	uint8_t __otx2_io chan_cnt;
-};
-
-/* Global NIX inline IPSec configuration */
-struct nix_inline_ipsec_cfg {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io cpt_credit;
-	struct {
-		uint8_t __otx2_io egrp;
-		uint8_t __otx2_io opcode;
-	} gen_cfg;
-	struct {
-		uint16_t __otx2_io cpt_pf_func;
-		uint8_t __otx2_io cpt_slot;
-	} inst_qsel;
-	uint8_t __otx2_io enable;
-};
-
-/* Per NIX LF inline IPSec configuration */
-struct nix_inline_ipsec_lf_cfg {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io sa_base_addr;
-	struct {
-		uint32_t __otx2_io tag_const;
-		uint16_t __otx2_io lenm1_max;
-		uint8_t __otx2_io sa_pow2_size;
-		uint8_t __otx2_io tt;
-	} ipsec_cfg0;
-	struct {
-		uint32_t __otx2_io sa_idx_max;
-		uint8_t __otx2_io sa_idx_w;
-	} ipsec_cfg1;
-	uint8_t __otx2_io enable;
-};
-
-/* SSO mailbox error codes
- * Range 501 - 600.
- */
-enum sso_af_status {
-	SSO_AF_ERR_PARAM	= -501,
-	SSO_AF_ERR_LF_INVALID	= -502,
-	SSO_AF_ERR_AF_LF_ALLOC	= -503,
-	SSO_AF_ERR_GRP_EBUSY	= -504,
-	SSO_AF_INVAL_NPA_PF_FUNC = -505,
-};
-
-struct sso_lf_alloc_req {
-	struct mbox_msghdr hdr;
-	int __otx2_io node;
-	uint16_t __otx2_io hwgrps;
-};
-
-struct sso_lf_alloc_rsp {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io xaq_buf_size;
-	uint32_t __otx2_io xaq_wq_entries;
-	uint32_t __otx2_io in_unit_entries;
-	uint16_t __otx2_io hwgrps;
-};
-
-struct sso_lf_free_req {
-	struct mbox_msghdr hdr;
-	int __otx2_io node;
-	uint16_t __otx2_io hwgrps;
-};
-
-/* SSOW mailbox error codes
- * Range 601 - 700.
- */
-enum ssow_af_status {
-	SSOW_AF_ERR_PARAM	= -601,
-	SSOW_AF_ERR_LF_INVALID	= -602,
-	SSOW_AF_ERR_AF_LF_ALLOC	= -603,
-};
-
-struct ssow_lf_alloc_req {
-	struct mbox_msghdr hdr;
-	int __otx2_io node;
-	uint16_t __otx2_io hws;
-};
-
-struct ssow_lf_free_req {
-	struct mbox_msghdr hdr;
-	int __otx2_io node;
-	uint16_t __otx2_io hws;
-};
-
-struct sso_hw_setconfig {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io npa_aura_id;
-	uint16_t __otx2_io npa_pf_func;
-	uint16_t __otx2_io hwgrps;
-};
-
-struct sso_release_xaq {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io hwgrps;
-};
-
-struct sso_info_req {
-	struct mbox_msghdr hdr;
-	union {
-		uint16_t __otx2_io grp;
-		uint16_t __otx2_io hws;
-	};
-};
-
-struct sso_grp_priority {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io grp;
-	uint8_t __otx2_io priority;
-	uint8_t __otx2_io affinity;
-	uint8_t __otx2_io weight;
-};
-
-struct sso_grp_qos_cfg {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io grp;
-	uint32_t __otx2_io xaq_limit;
-	uint16_t __otx2_io taq_thr;
-	uint16_t __otx2_io iaq_thr;
-};
-
-struct sso_grp_stats {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io grp;
-	uint64_t __otx2_io ws_pc;
-	uint64_t __otx2_io ext_pc;
-	uint64_t __otx2_io wa_pc;
-	uint64_t __otx2_io ts_pc;
-	uint64_t __otx2_io ds_pc;
-	uint64_t __otx2_io dq_pc;
-	uint64_t __otx2_io aw_status;
-	uint64_t __otx2_io page_cnt;
-};
-
-struct sso_hws_stats {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io hws;
-	uint64_t __otx2_io arbitration;
-};
-
-/* CPT mailbox error codes
- * Range 901 - 1000.
- */
-enum cpt_af_status {
-	CPT_AF_ERR_PARAM		= -901,
-	CPT_AF_ERR_GRP_INVALID		= -902,
-	CPT_AF_ERR_LF_INVALID		= -903,
-	CPT_AF_ERR_ACCESS_DENIED	= -904,
-	CPT_AF_ERR_SSO_PF_FUNC_INVALID	= -905,
-	CPT_AF_ERR_NIX_PF_FUNC_INVALID	= -906,
-	CPT_AF_ERR_INLINE_IPSEC_INB_ENA	= -907,
-	CPT_AF_ERR_INLINE_IPSEC_OUT_ENA	= -908
-};
-
-/* CPT mbox message formats */
-
-struct cpt_rd_wr_reg_msg {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io reg_offset;
-	uint64_t __otx2_io *ret_val;
-	uint64_t __otx2_io val;
-	uint8_t __otx2_io is_write;
-	/* BLKADDR_CPT0/BLKADDR_CPT1 or 0 for BLKADDR_CPT0 */
-	uint8_t __otx2_io blkaddr;
-};
-
-struct cpt_set_crypto_grp_req_msg {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io crypto_eng_grp;
-};
-
-struct cpt_lf_alloc_req_msg {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io nix_pf_func;
-	uint16_t __otx2_io sso_pf_func;
-	uint16_t __otx2_io eng_grpmask;
-	/* BLKADDR_CPT0/BLKADDR_CPT1 or 0 for BLKADDR_CPT0 */
-	uint8_t __otx2_io blkaddr;
-};
-
-struct cpt_lf_alloc_rsp_msg {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io eng_grpmsk;
-};
-
-#define CPT_INLINE_INBOUND	0
-#define CPT_INLINE_OUTBOUND	1
-
-struct cpt_inline_ipsec_cfg_msg {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io enable;
-	uint8_t __otx2_io slot;
-	uint8_t __otx2_io dir;
-	uint16_t __otx2_io sso_pf_func; /* Inbound path SSO_PF_FUNC */
-	uint16_t __otx2_io nix_pf_func; /* Outbound path NIX_PF_FUNC */
-};
-
-struct cpt_rx_inline_lf_cfg_msg {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io sso_pf_func;
-};
-
-enum cpt_eng_type {
-	CPT_ENG_TYPE_AE = 1,
-	CPT_ENG_TYPE_SE = 2,
-	CPT_ENG_TYPE_IE = 3,
-	CPT_MAX_ENG_TYPES,
-};
-
-/* CPT HW capabilities */
-union cpt_eng_caps {
-	uint64_t __otx2_io u;
-	struct {
-		uint64_t __otx2_io reserved_0_4:5;
-		uint64_t __otx2_io mul:1;
-		uint64_t __otx2_io sha1_sha2:1;
-		uint64_t __otx2_io chacha20:1;
-		uint64_t __otx2_io zuc_snow3g:1;
-		uint64_t __otx2_io sha3:1;
-		uint64_t __otx2_io aes:1;
-		uint64_t __otx2_io kasumi:1;
-		uint64_t __otx2_io des:1;
-		uint64_t __otx2_io crc:1;
-		uint64_t __otx2_io reserved_14_63:50;
-	};
-};
-
-struct cpt_caps_rsp_msg {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io cpt_pf_drv_version;
-	uint8_t __otx2_io cpt_revision;
-	union cpt_eng_caps eng_caps[CPT_MAX_ENG_TYPES];
-};
-
-/* NPC mbox message structs */
-
-#define NPC_MCAM_ENTRY_INVALID	0xFFFF
-#define NPC_MCAM_INVALID_MAP	0xFFFF
-
-/* NPC mailbox error codes
- * Range 701 - 800.
- */
-enum npc_af_status {
-	NPC_MCAM_INVALID_REQ	= -701,
-	NPC_MCAM_ALLOC_DENIED	= -702,
-	NPC_MCAM_ALLOC_FAILED	= -703,
-	NPC_MCAM_PERM_DENIED	= -704,
-	NPC_AF_ERR_HIGIG_CONFIG_FAIL	= -705,
-};
-
-struct npc_mcam_alloc_entry_req {
-	struct mbox_msghdr hdr;
-#define NPC_MAX_NONCONTIG_ENTRIES	256
-	uint8_t __otx2_io contig;   /* Contiguous entries ? */
-#define NPC_MCAM_ANY_PRIO		0
-#define NPC_MCAM_LOWER_PRIO		1
-#define NPC_MCAM_HIGHER_PRIO		2
-	uint8_t __otx2_io priority; /* Lower or higher w.r.t ref_entry */
-	uint16_t __otx2_io ref_entry;
-	uint16_t __otx2_io count;    /* Number of entries requested */
-};
-
-struct npc_mcam_alloc_entry_rsp {
-	struct mbox_msghdr hdr;
-	/* Entry alloc'ed or start index if contiguous.
-	 * Invalid in case of non-contiguous.
-	 */
-	uint16_t __otx2_io entry;
-	uint16_t __otx2_io count; /* Number of entries allocated */
-	uint16_t __otx2_io free_count; /* Number of entries available */
-	uint16_t __otx2_io entry_list[NPC_MAX_NONCONTIG_ENTRIES];
-};
-
-struct npc_mcam_free_entry_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io entry; /* Entry index to be freed */
-	uint8_t __otx2_io all;   /* Free all entries alloc'ed to this PFVF */
-};
-
-struct mcam_entry {
-#define NPC_MAX_KWS_IN_KEY	7 /* Number of keywords in max key width */
-	uint64_t __otx2_io kw[NPC_MAX_KWS_IN_KEY];
-	uint64_t __otx2_io kw_mask[NPC_MAX_KWS_IN_KEY];
-	uint64_t __otx2_io action;
-	uint64_t __otx2_io vtag_action;
-};
-
-struct npc_mcam_write_entry_req {
-	struct mbox_msghdr hdr;
-	struct mcam_entry entry_data;
-	uint16_t __otx2_io entry; /* MCAM entry to write this match key */
-	uint16_t __otx2_io cntr;	 /* Counter for this MCAM entry */
-	uint8_t __otx2_io intf;	 /* Rx or Tx interface */
-	uint8_t __otx2_io enable_entry;/* Enable this MCAM entry ? */
-	uint8_t __otx2_io set_cntr;    /* Set counter for this entry ? */
-};
-
-/* Enable/Disable a given entry */
-struct npc_mcam_ena_dis_entry_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io entry;
-};
-
-struct npc_mcam_shift_entry_req {
-	struct mbox_msghdr hdr;
-#define NPC_MCAM_MAX_SHIFTS	64
-	uint16_t __otx2_io curr_entry[NPC_MCAM_MAX_SHIFTS];
-	uint16_t __otx2_io new_entry[NPC_MCAM_MAX_SHIFTS];
-	uint16_t __otx2_io shift_count; /* Number of entries to shift */
-};
-
-struct npc_mcam_shift_entry_rsp {
-	struct mbox_msghdr hdr;
-	/* Index in 'curr_entry', not entry itself */
-	uint16_t __otx2_io failed_entry_idx;
-};
-
-struct npc_mcam_alloc_counter_req {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io contig;	/* Contiguous counters ? */
-#define NPC_MAX_NONCONTIG_COUNTERS 64
-	uint16_t __otx2_io count;	/* Number of counters requested */
-};
-
-struct npc_mcam_alloc_counter_rsp {
-	struct mbox_msghdr hdr;
-	/* Counter alloc'ed or start idx if contiguous.
-	 * Invalid incase of non-contiguous.
-	 */
-	uint16_t __otx2_io cntr;
-	uint16_t __otx2_io count; /* Number of counters allocated */
-	uint16_t __otx2_io cntr_list[NPC_MAX_NONCONTIG_COUNTERS];
-};
-
-struct npc_mcam_oper_counter_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io cntr; /* Free a counter or clear/fetch it's stats */
-};
-
-struct npc_mcam_oper_counter_rsp {
-	struct mbox_msghdr hdr;
-	/* valid only while fetching counter's stats */
-	uint64_t __otx2_io stat;
-};
-
-struct npc_mcam_unmap_counter_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io cntr;
-	uint16_t __otx2_io entry; /* Entry and counter to be unmapped */
-	uint8_t __otx2_io all;   /* Unmap all entries using this counter ? */
-};
-
-struct npc_mcam_alloc_and_write_entry_req {
-	struct mbox_msghdr hdr;
-	struct mcam_entry entry_data;
-	uint16_t __otx2_io ref_entry;
-	uint8_t __otx2_io priority;    /* Lower or higher w.r.t ref_entry */
-	uint8_t __otx2_io intf;	 /* Rx or Tx interface */
-	uint8_t __otx2_io enable_entry;/* Enable this MCAM entry ? */
-	uint8_t __otx2_io alloc_cntr;  /* Allocate counter and map ? */
-};
-
-struct npc_mcam_alloc_and_write_entry_rsp {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io entry;
-	uint16_t __otx2_io cntr;
-};
-
-struct npc_get_kex_cfg_rsp {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io rx_keyx_cfg;   /* NPC_AF_INTF(0)_KEX_CFG */
-	uint64_t __otx2_io tx_keyx_cfg;   /* NPC_AF_INTF(1)_KEX_CFG */
-#define NPC_MAX_INTF	2
-#define NPC_MAX_LID	8
-#define NPC_MAX_LT	16
-#define NPC_MAX_LD	2
-#define NPC_MAX_LFL	16
-	/* NPC_AF_KEX_LDATA(0..1)_FLAGS_CFG */
-	uint64_t __otx2_io kex_ld_flags[NPC_MAX_LD];
-	/* NPC_AF_INTF(0..1)_LID(0..7)_LT(0..15)_LD(0..1)_CFG */
-	uint64_t __otx2_io
-	intf_lid_lt_ld[NPC_MAX_INTF][NPC_MAX_LID][NPC_MAX_LT][NPC_MAX_LD];
-	/* NPC_AF_INTF(0..1)_LDATA(0..1)_FLAGS(0..15)_CFG */
-	uint64_t __otx2_io
-	intf_ld_flags[NPC_MAX_INTF][NPC_MAX_LD][NPC_MAX_LFL];
-#define MKEX_NAME_LEN 128
-	uint8_t __otx2_io mkex_pfl_name[MKEX_NAME_LEN];
-};
-
-enum header_fields {
-	NPC_DMAC,
-	NPC_SMAC,
-	NPC_ETYPE,
-	NPC_OUTER_VID,
-	NPC_TOS,
-	NPC_SIP_IPV4,
-	NPC_DIP_IPV4,
-	NPC_SIP_IPV6,
-	NPC_DIP_IPV6,
-	NPC_SPORT_TCP,
-	NPC_DPORT_TCP,
-	NPC_SPORT_UDP,
-	NPC_DPORT_UDP,
-	NPC_FDSA_VAL,
-	NPC_HEADER_FIELDS_MAX,
-};
-
-struct flow_msg {
-	unsigned char __otx2_io dmac[6];
-	unsigned char __otx2_io smac[6];
-	uint16_t __otx2_io etype;
-	uint16_t __otx2_io vlan_etype;
-	uint16_t __otx2_io vlan_tci;
-	union {
-		uint32_t __otx2_io ip4src;
-		uint32_t __otx2_io ip6src[4];
-	};
-	union {
-		uint32_t __otx2_io ip4dst;
-		uint32_t __otx2_io ip6dst[4];
-	};
-	uint8_t __otx2_io tos;
-	uint8_t __otx2_io ip_ver;
-	uint8_t __otx2_io ip_proto;
-	uint8_t __otx2_io tc;
-	uint16_t __otx2_io sport;
-	uint16_t __otx2_io dport;
-};
-
-struct npc_install_flow_req {
-	struct mbox_msghdr hdr;
-	struct flow_msg packet;
-	struct flow_msg mask;
-	uint64_t __otx2_io features;
-	uint16_t __otx2_io entry;
-	uint16_t __otx2_io channel;
-	uint8_t __otx2_io intf;
-	uint8_t __otx2_io set_cntr;
-	uint8_t __otx2_io default_rule;
-	/* Overwrite(0) or append(1) flow to default rule? */
-	uint8_t __otx2_io append;
-	uint16_t __otx2_io vf;
-	/* action */
-	uint32_t __otx2_io index;
-	uint16_t __otx2_io match_id;
-	uint8_t __otx2_io flow_key_alg;
-	uint8_t __otx2_io op;
-	/* vtag action */
-	uint8_t __otx2_io vtag0_type;
-	uint8_t __otx2_io vtag0_valid;
-	uint8_t __otx2_io vtag1_type;
-	uint8_t __otx2_io vtag1_valid;
-
-	/* vtag tx action */
-	uint16_t __otx2_io vtag0_def;
-	uint8_t  __otx2_io vtag0_op;
-	uint16_t __otx2_io vtag1_def;
-	uint8_t  __otx2_io vtag1_op;
-};
-
-struct npc_install_flow_rsp {
-	struct mbox_msghdr hdr;
-	/* Negative if no counter else counter number */
-	int __otx2_io counter;
-};
-
-struct npc_delete_flow_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io entry;
-	uint16_t __otx2_io start;/*Disable range of entries */
-	uint16_t __otx2_io end;
-	uint8_t __otx2_io all; /* PF + VFs */
-};
-
-struct npc_mcam_read_entry_req {
-	struct mbox_msghdr hdr;
-	/* MCAM entry to read */
-	uint16_t __otx2_io entry;
-};
-
-struct npc_mcam_read_entry_rsp {
-	struct mbox_msghdr hdr;
-	struct mcam_entry entry_data;
-	uint8_t __otx2_io intf;
-	uint8_t __otx2_io enable;
-};
-
-struct npc_mcam_read_base_rule_rsp {
-	struct mbox_msghdr hdr;
-	struct mcam_entry entry_data;
-};
-
-/* TIM mailbox error codes
- * Range 801 - 900.
- */
-enum tim_af_status {
-	TIM_AF_NO_RINGS_LEFT			= -801,
-	TIM_AF_INVALID_NPA_PF_FUNC		= -802,
-	TIM_AF_INVALID_SSO_PF_FUNC		= -803,
-	TIM_AF_RING_STILL_RUNNING		= -804,
-	TIM_AF_LF_INVALID			= -805,
-	TIM_AF_CSIZE_NOT_ALIGNED		= -806,
-	TIM_AF_CSIZE_TOO_SMALL			= -807,
-	TIM_AF_CSIZE_TOO_BIG			= -808,
-	TIM_AF_INTERVAL_TOO_SMALL		= -809,
-	TIM_AF_INVALID_BIG_ENDIAN_VALUE		= -810,
-	TIM_AF_INVALID_CLOCK_SOURCE		= -811,
-	TIM_AF_GPIO_CLK_SRC_NOT_ENABLED		= -812,
-	TIM_AF_INVALID_BSIZE			= -813,
-	TIM_AF_INVALID_ENABLE_PERIODIC		= -814,
-	TIM_AF_INVALID_ENABLE_DONTFREE		= -815,
-	TIM_AF_ENA_DONTFRE_NSET_PERIODIC	= -816,
-	TIM_AF_RING_ALREADY_DISABLED		= -817,
-};
-
-enum tim_clk_srcs {
-	TIM_CLK_SRCS_TENNS	= 0,
-	TIM_CLK_SRCS_GPIO	= 1,
-	TIM_CLK_SRCS_GTI	= 2,
-	TIM_CLK_SRCS_PTP	= 3,
-	TIM_CLK_SRSC_INVALID,
-};
-
-enum tim_gpio_edge {
-	TIM_GPIO_NO_EDGE		= 0,
-	TIM_GPIO_LTOH_TRANS		= 1,
-	TIM_GPIO_HTOL_TRANS		= 2,
-	TIM_GPIO_BOTH_TRANS		= 3,
-	TIM_GPIO_INVALID,
-};
-
-enum ptp_op {
-	PTP_OP_ADJFINE = 0, /* adjfine(req.scaled_ppm); */
-	PTP_OP_GET_CLOCK = 1, /* rsp.clk = get_clock() */
-};
-
-struct ptp_req {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io op;
-	int64_t __otx2_io scaled_ppm;
-	uint8_t __otx2_io is_pmu;
-};
-
-struct ptp_rsp {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io clk;
-	uint64_t __otx2_io tsc;
-};
-
-struct get_hw_cap_rsp {
-	struct mbox_msghdr hdr;
-	/* Schq mapping fixed or flexible */
-	uint8_t __otx2_io nix_fixed_txschq_mapping;
-	uint8_t __otx2_io nix_shaping; /* Is shaping and coloring supported */
-};
-
-struct ndc_sync_op {
-	struct mbox_msghdr hdr;
-	uint8_t __otx2_io nix_lf_tx_sync;
-	uint8_t __otx2_io nix_lf_rx_sync;
-	uint8_t __otx2_io npa_lf_sync;
-};
-
-struct tim_lf_alloc_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io ring;
-	uint16_t __otx2_io npa_pf_func;
-	uint16_t __otx2_io sso_pf_func;
-};
-
-struct tim_ring_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io ring;
-};
-
-struct tim_config_req {
-	struct mbox_msghdr hdr;
-	uint16_t __otx2_io ring;
-	uint8_t __otx2_io bigendian;
-	uint8_t __otx2_io clocksource;
-	uint8_t __otx2_io enableperiodic;
-	uint8_t __otx2_io enabledontfreebuffer;
-	uint32_t __otx2_io bucketsize;
-	uint32_t __otx2_io chunksize;
-	uint32_t __otx2_io interval;
-};
-
-struct tim_lf_alloc_rsp {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io tenns_clk;
-};
-
-struct tim_enable_rsp {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io timestarted;
-	uint32_t __otx2_io currentbucket;
-};
-
-/* REE mailbox error codes
- * Range 1001 - 1100.
- */
-enum ree_af_status {
-	REE_AF_ERR_RULE_UNKNOWN_VALUE		= -1001,
-	REE_AF_ERR_LF_NO_MORE_RESOURCES		= -1002,
-	REE_AF_ERR_LF_INVALID			= -1003,
-	REE_AF_ERR_ACCESS_DENIED		= -1004,
-	REE_AF_ERR_RULE_DB_PARTIAL		= -1005,
-	REE_AF_ERR_RULE_DB_EQ_BAD_VALUE		= -1006,
-	REE_AF_ERR_RULE_DB_BLOCK_ALLOC_FAILED	= -1007,
-	REE_AF_ERR_BLOCK_NOT_IMPLEMENTED	= -1008,
-	REE_AF_ERR_RULE_DB_INC_OFFSET_TOO_BIG	= -1009,
-	REE_AF_ERR_RULE_DB_OFFSET_TOO_BIG	= -1010,
-	REE_AF_ERR_Q_IS_GRACEFUL_DIS		= -1011,
-	REE_AF_ERR_Q_NOT_GRACEFUL_DIS		= -1012,
-	REE_AF_ERR_RULE_DB_ALLOC_FAILED		= -1013,
-	REE_AF_ERR_RULE_DB_TOO_BIG		= -1014,
-	REE_AF_ERR_RULE_DB_GEQ_BAD_VALUE	= -1015,
-	REE_AF_ERR_RULE_DB_LEQ_BAD_VALUE	= -1016,
-	REE_AF_ERR_RULE_DB_WRONG_LENGTH		= -1017,
-	REE_AF_ERR_RULE_DB_WRONG_OFFSET		= -1018,
-	REE_AF_ERR_RULE_DB_BLOCK_TOO_BIG	= -1019,
-	REE_AF_ERR_RULE_DB_SHOULD_FILL_REQUEST	= -1020,
-	REE_AF_ERR_RULE_DBI_ALLOC_FAILED	= -1021,
-	REE_AF_ERR_LF_WRONG_PRIORITY		= -1022,
-	REE_AF_ERR_LF_SIZE_TOO_BIG		= -1023,
-};
-
-/* REE mbox message formats */
-
-struct ree_req_msg {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io blkaddr;
-};
-
-struct ree_lf_req_msg {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io blkaddr;
-	uint32_t __otx2_io size;
-	uint8_t __otx2_io lf;
-	uint8_t __otx2_io pri;
-};
-
-struct ree_rule_db_prog_req_msg {
-	struct mbox_msghdr hdr;
-#define REE_RULE_DB_REQ_BLOCK_SIZE (MBOX_SIZE >> 1)
-	uint8_t __otx2_io rule_db[REE_RULE_DB_REQ_BLOCK_SIZE];
-	uint32_t __otx2_io blkaddr; /* REE0 or REE1 */
-	uint32_t __otx2_io total_len; /* total len of rule db */
-	uint32_t __otx2_io offset; /* offset of current rule db block */
-	uint16_t __otx2_io len; /* length of rule db block */
-	uint8_t __otx2_io is_last; /* is this the last block */
-	uint8_t __otx2_io is_incremental; /* is incremental flow */
-	uint8_t __otx2_io is_dbi; /* is rule db incremental */
-};
-
-struct ree_rule_db_get_req_msg {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io blkaddr;
-	uint32_t __otx2_io offset; /* retrieve db from this offset */
-	uint8_t __otx2_io is_dbi; /* is request for rule db incremental */
-};
-
-struct ree_rd_wr_reg_msg {
-	struct mbox_msghdr hdr;
-	uint64_t __otx2_io reg_offset;
-	uint64_t __otx2_io *ret_val;
-	uint64_t __otx2_io val;
-	uint32_t __otx2_io blkaddr;
-	uint8_t __otx2_io is_write;
-};
-
-struct ree_rule_db_len_rsp_msg {
-	struct mbox_msghdr hdr;
-	uint32_t __otx2_io blkaddr;
-	uint32_t __otx2_io len;
-	uint32_t __otx2_io inc_len;
-};
-
-struct ree_rule_db_get_rsp_msg {
-	struct mbox_msghdr hdr;
-#define REE_RULE_DB_RSP_BLOCK_SIZE (MBOX_DOWN_TX_SIZE - SZ_1K)
-	uint8_t __otx2_io rule_db[REE_RULE_DB_RSP_BLOCK_SIZE];
-	uint32_t __otx2_io total_len; /* total len of rule db */
-	uint32_t __otx2_io offset; /* offset of current rule db block */
-	uint16_t __otx2_io len; /* length of rule db block */
-	uint8_t __otx2_io is_last; /* is this the last block */
-};
-
-__rte_internal
-const char *otx2_mbox_id2name(uint16_t id);
-int otx2_mbox_id2size(uint16_t id);
-void otx2_mbox_reset(struct otx2_mbox *mbox, int devid);
-int otx2_mbox_init(struct otx2_mbox *mbox, uintptr_t hwbase, uintptr_t reg_base,
-		   int direction, int ndevsi, uint64_t intr_offset);
-void otx2_mbox_fini(struct otx2_mbox *mbox);
-__rte_internal
-void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid);
-__rte_internal
-int otx2_mbox_wait_for_rsp(struct otx2_mbox *mbox, int devid);
-int otx2_mbox_wait_for_rsp_tmo(struct otx2_mbox *mbox, int devid, uint32_t tmo);
-__rte_internal
-int otx2_mbox_get_rsp(struct otx2_mbox *mbox, int devid, void **msg);
-__rte_internal
-int otx2_mbox_get_rsp_tmo(struct otx2_mbox *mbox, int devid, void **msg,
-			  uint32_t tmo);
-int otx2_mbox_get_availmem(struct otx2_mbox *mbox, int devid);
-__rte_internal
-struct mbox_msghdr *otx2_mbox_alloc_msg_rsp(struct otx2_mbox *mbox, int devid,
-					    int size, int size_rsp);
-
-static inline struct mbox_msghdr *
-otx2_mbox_alloc_msg(struct otx2_mbox *mbox, int devid, int size)
-{
-	return otx2_mbox_alloc_msg_rsp(mbox, devid, size, 0);
-}
-
-static inline void
-otx2_mbox_req_init(uint16_t mbox_id, void *msghdr)
-{
-	struct mbox_msghdr *hdr = msghdr;
-
-	hdr->sig = OTX2_MBOX_REQ_SIG;
-	hdr->ver = OTX2_MBOX_VERSION;
-	hdr->id = mbox_id;
-	hdr->pcifunc = 0;
-}
-
-static inline void
-otx2_mbox_rsp_init(uint16_t mbox_id, void *msghdr)
-{
-	struct mbox_msghdr *hdr = msghdr;
-
-	hdr->sig = OTX2_MBOX_RSP_SIG;
-	hdr->rc = -ETIMEDOUT;
-	hdr->id = mbox_id;
-}
-
-static inline bool
-otx2_mbox_nonempty(struct otx2_mbox *mbox, int devid)
-{
-	struct otx2_mbox_dev *mdev = &mbox->dev[devid];
-	bool ret;
-
-	rte_spinlock_lock(&mdev->mbox_lock);
-	ret = mdev->num_msgs != 0;
-	rte_spinlock_unlock(&mdev->mbox_lock);
-
-	return ret;
-}
-
-static inline int
-otx2_mbox_process(struct otx2_mbox *mbox)
-{
-	otx2_mbox_msg_send(mbox, 0);
-	return otx2_mbox_get_rsp(mbox, 0, NULL);
-}
-
-static inline int
-otx2_mbox_process_msg(struct otx2_mbox *mbox, void **msg)
-{
-	otx2_mbox_msg_send(mbox, 0);
-	return otx2_mbox_get_rsp(mbox, 0, msg);
-}
-
-static inline int
-otx2_mbox_process_tmo(struct otx2_mbox *mbox, uint32_t tmo)
-{
-	otx2_mbox_msg_send(mbox, 0);
-	return otx2_mbox_get_rsp_tmo(mbox, 0, NULL, tmo);
-}
-
-static inline int
-otx2_mbox_process_msg_tmo(struct otx2_mbox *mbox, void **msg, uint32_t tmo)
-{
-	otx2_mbox_msg_send(mbox, 0);
-	return otx2_mbox_get_rsp_tmo(mbox, 0, msg, tmo);
-}
-
-int otx2_send_ready_msg(struct otx2_mbox *mbox, uint16_t *pf_func /* out */);
-int otx2_reply_invalid_msg(struct otx2_mbox *mbox, int devid, uint16_t pf_func,
-			uint16_t id);
-
-#define M(_name, _id, _fn_name, _req_type, _rsp_type)			\
-static inline struct _req_type						\
-*otx2_mbox_alloc_msg_ ## _fn_name(struct otx2_mbox *mbox)		\
-{									\
-	struct _req_type *req;						\
-									\
-	req = (struct _req_type *)otx2_mbox_alloc_msg_rsp(		\
-		mbox, 0, sizeof(struct _req_type),			\
-		sizeof(struct _rsp_type));				\
-	if (!req)							\
-		return NULL;						\
-									\
-	req->hdr.sig = OTX2_MBOX_REQ_SIG;				\
-	req->hdr.id = _id;						\
-	otx2_mbox_dbg("id=0x%x (%s)",					\
-			req->hdr.id, otx2_mbox_id2name(req->hdr.id));	\
-	return req;							\
-}
-
-MBOX_MESSAGES
-#undef M
-
-/* This is required for copy operations from device memory which do not work on
- * addresses which are unaligned to 16B. This is because of specific
- * optimizations to libc memcpy.
- */
-static inline volatile void *
-otx2_mbox_memcpy(volatile void *d, const volatile void *s, size_t l)
-{
-	const volatile uint8_t *sb;
-	volatile uint8_t *db;
-	size_t i;
-
-	if (!d || !s)
-		return NULL;
-	db = (volatile uint8_t *)d;
-	sb = (const volatile uint8_t *)s;
-	for (i = 0; i < l; i++)
-		db[i] = sb[i];
-	return d;
-}
-
-/* This is required for memory operations from device memory which do not
- * work on addresses which are unaligned to 16B. This is because of specific
- * optimizations to libc memset.
- */
-static inline void
-otx2_mbox_memset(volatile void *d, uint8_t val, size_t l)
-{
-	volatile uint8_t *db;
-	size_t i = 0;
-
-	if (!d || !l)
-		return;
-	db = (volatile uint8_t *)d;
-	for (i = 0; i < l; i++)
-		db[i] = val;
-}
-
-#endif /* __OTX2_MBOX_H__ */
diff --git a/drivers/common/octeontx2/otx2_sec_idev.c b/drivers/common/octeontx2/otx2_sec_idev.c
deleted file mode 100644
index b561b67174..0000000000
--- a/drivers/common/octeontx2/otx2_sec_idev.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2020 Marvell International Ltd.
- */
-
-#include <rte_atomic.h>
-#include <rte_bus_pci.h>
-#include <ethdev_driver.h>
-#include <rte_spinlock.h>
-
-#include "otx2_common.h"
-#include "otx2_sec_idev.h"
-
-static struct otx2_sec_idev_cfg sec_cfg[OTX2_MAX_INLINE_PORTS];
-
-/**
- * @internal
- * Check if rte_eth_dev is security offload capable otx2_eth_dev
- */
-uint8_t
-otx2_eth_dev_is_sec_capable(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev;
-
-	pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-
-	if (pci_dev->id.device_id == PCI_DEVID_OCTEONTX2_RVU_PF ||
-	    pci_dev->id.device_id == PCI_DEVID_OCTEONTX2_RVU_VF ||
-	    pci_dev->id.device_id == PCI_DEVID_OCTEONTX2_RVU_AF_VF)
-		return 1;
-
-	return 0;
-}
-
-int
-otx2_sec_idev_cfg_init(int port_id)
-{
-	struct otx2_sec_idev_cfg *cfg;
-	int i;
-
-	cfg = &sec_cfg[port_id];
-	cfg->tx_cpt_idx = 0;
-	rte_spinlock_init(&cfg->tx_cpt_lock);
-
-	for (i = 0; i < OTX2_MAX_CPT_QP_PER_PORT; i++) {
-		cfg->tx_cpt[i].qp = NULL;
-		rte_atomic16_set(&cfg->tx_cpt[i].ref_cnt, 0);
-	}
-
-	return 0;
-}
-
-int
-otx2_sec_idev_tx_cpt_qp_add(uint16_t port_id, struct otx2_cpt_qp *qp)
-{
-	struct otx2_sec_idev_cfg *cfg;
-	int i, ret;
-
-	if (qp == NULL || port_id >= OTX2_MAX_INLINE_PORTS)
-		return -EINVAL;
-
-	cfg = &sec_cfg[port_id];
-
-	/* Find a free slot to save CPT LF */
-
-	rte_spinlock_lock(&cfg->tx_cpt_lock);
-
-	for (i = 0; i < OTX2_MAX_CPT_QP_PER_PORT; i++) {
-		if (cfg->tx_cpt[i].qp == NULL) {
-			cfg->tx_cpt[i].qp = qp;
-			ret = 0;
-			goto unlock;
-		}
-	}
-
-	ret = -EINVAL;
-
-unlock:
-	rte_spinlock_unlock(&cfg->tx_cpt_lock);
-	return ret;
-}
-
-int
-otx2_sec_idev_tx_cpt_qp_remove(struct otx2_cpt_qp *qp)
-{
-	struct otx2_sec_idev_cfg *cfg;
-	uint16_t port_id;
-	int i, ret;
-
-	if (qp == NULL)
-		return -EINVAL;
-
-	for (port_id = 0; port_id < OTX2_MAX_INLINE_PORTS; port_id++) {
-		cfg = &sec_cfg[port_id];
-
-		rte_spinlock_lock(&cfg->tx_cpt_lock);
-
-		for (i = 0; i < OTX2_MAX_CPT_QP_PER_PORT; i++) {
-			if (cfg->tx_cpt[i].qp != qp)
-				continue;
-
-			/* Don't free if the QP is in use by any sec session */
-			if (rte_atomic16_read(&cfg->tx_cpt[i].ref_cnt)) {
-				ret = -EBUSY;
-			} else {
-				cfg->tx_cpt[i].qp = NULL;
-				ret = 0;
-			}
-
-			goto unlock;
-		}
-
-		rte_spinlock_unlock(&cfg->tx_cpt_lock);
-	}
-
-	return -ENOENT;
-
-unlock:
-	rte_spinlock_unlock(&cfg->tx_cpt_lock);
-	return ret;
-}
-
-int
-otx2_sec_idev_tx_cpt_qp_get(uint16_t port_id, struct otx2_cpt_qp **qp)
-{
-	struct otx2_sec_idev_cfg *cfg;
-	uint16_t index;
-	int i, ret;
-
-	if (port_id >= OTX2_MAX_INLINE_PORTS || qp == NULL)
-		return -EINVAL;
-
-	cfg = &sec_cfg[port_id];
-
-	rte_spinlock_lock(&cfg->tx_cpt_lock);
-
-	index = cfg->tx_cpt_idx;
-
-	/* Get the next index with valid data */
-	for (i = 0; i < OTX2_MAX_CPT_QP_PER_PORT; i++) {
-		if (cfg->tx_cpt[index].qp != NULL)
-			break;
-		index = (index + 1) % OTX2_MAX_CPT_QP_PER_PORT;
-	}
-
-	if (i >= OTX2_MAX_CPT_QP_PER_PORT) {
-		ret = -EINVAL;
-		goto unlock;
-	}
-
-	*qp = cfg->tx_cpt[index].qp;
-	rte_atomic16_inc(&cfg->tx_cpt[index].ref_cnt);
-
-	cfg->tx_cpt_idx = (index + 1) % OTX2_MAX_CPT_QP_PER_PORT;
-
-	ret = 0;
-
-unlock:
-	rte_spinlock_unlock(&cfg->tx_cpt_lock);
-	return ret;
-}
-
-int
-otx2_sec_idev_tx_cpt_qp_put(struct otx2_cpt_qp *qp)
-{
-	struct otx2_sec_idev_cfg *cfg;
-	uint16_t port_id;
-	int i;
-
-	if (qp == NULL)
-		return -EINVAL;
-
-	for (port_id = 0; port_id < OTX2_MAX_INLINE_PORTS; port_id++) {
-		cfg = &sec_cfg[port_id];
-		for (i = 0; i < OTX2_MAX_CPT_QP_PER_PORT; i++) {
-			if (cfg->tx_cpt[i].qp == qp) {
-				rte_atomic16_dec(&cfg->tx_cpt[i].ref_cnt);
-				return 0;
-			}
-		}
-	}
-
-	return -EINVAL;
-}
diff --git a/drivers/common/octeontx2/otx2_sec_idev.h b/drivers/common/octeontx2/otx2_sec_idev.h
deleted file mode 100644
index 89cdaf66ab..0000000000
--- a/drivers/common/octeontx2/otx2_sec_idev.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2020 Marvell International Ltd.
- */
-
-#ifndef _OTX2_SEC_IDEV_H_
-#define _OTX2_SEC_IDEV_H_
-
-#include <rte_ethdev.h>
-
-#define OTX2_MAX_CPT_QP_PER_PORT 64
-#define OTX2_MAX_INLINE_PORTS 64
-
-struct otx2_cpt_qp;
-
-struct otx2_sec_idev_cfg {
-	struct {
-		struct otx2_cpt_qp *qp;
-		rte_atomic16_t ref_cnt;
-	} tx_cpt[OTX2_MAX_CPT_QP_PER_PORT];
-
-	uint16_t tx_cpt_idx;
-	rte_spinlock_t tx_cpt_lock;
-};
-
-__rte_internal
-uint8_t otx2_eth_dev_is_sec_capable(struct rte_eth_dev *eth_dev);
-
-__rte_internal
-int otx2_sec_idev_cfg_init(int port_id);
-
-__rte_internal
-int otx2_sec_idev_tx_cpt_qp_add(uint16_t port_id, struct otx2_cpt_qp *qp);
-
-__rte_internal
-int otx2_sec_idev_tx_cpt_qp_remove(struct otx2_cpt_qp *qp);
-
-__rte_internal
-int otx2_sec_idev_tx_cpt_qp_put(struct otx2_cpt_qp *qp);
-
-__rte_internal
-int otx2_sec_idev_tx_cpt_qp_get(uint16_t port_id, struct otx2_cpt_qp **qp);
-
-#endif /* _OTX2_SEC_IDEV_H_ */
diff --git a/drivers/common/octeontx2/version.map b/drivers/common/octeontx2/version.map
deleted file mode 100644
index b58f19ce32..0000000000
--- a/drivers/common/octeontx2/version.map
+++ /dev/null
@@ -1,44 +0,0 @@
-INTERNAL {
-	global:
-
-	otx2_dev_active_vfs;
-	otx2_dev_fini;
-	otx2_dev_priv_init;
-	otx2_disable_irqs;
-	otx2_eth_dev_is_sec_capable;
-	otx2_intra_dev_get_cfg;
-	otx2_logtype_base;
-	otx2_logtype_dpi;
-	otx2_logtype_ep;
-	otx2_logtype_mbox;
-	otx2_logtype_nix;
-	otx2_logtype_npa;
-	otx2_logtype_npc;
-	otx2_logtype_ree;
-	otx2_logtype_sso;
-	otx2_logtype_tim;
-	otx2_logtype_tm;
-	otx2_mbox_alloc_msg_rsp;
-	otx2_mbox_get_rsp;
-	otx2_mbox_get_rsp_tmo;
-	otx2_mbox_id2name;
-	otx2_mbox_msg_send;
-	otx2_mbox_wait_for_rsp;
-	otx2_npa_lf_active;
-	otx2_npa_lf_obj_get;
-	otx2_npa_lf_obj_ref;
-	otx2_npa_pf_func_get;
-	otx2_npa_set_defaults;
-	otx2_parse_common_devargs;
-	otx2_register_irq;
-	otx2_sec_idev_cfg_init;
-	otx2_sec_idev_tx_cpt_qp_add;
-	otx2_sec_idev_tx_cpt_qp_get;
-	otx2_sec_idev_tx_cpt_qp_put;
-	otx2_sec_idev_tx_cpt_qp_remove;
-	otx2_sso_pf_func_get;
-	otx2_sso_pf_func_set;
-	otx2_unregister_irq;
-
-	local: *;
-};
diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index 59f02ea47c..147b8cf633 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build
@@ -16,7 +16,6 @@ drivers = [
         'nitrox',
         'null',
         'octeontx',
-        'octeontx2',
         'openssl',
         'scheduler',
         'virtio',
diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build
deleted file mode 100644
index 3b387cc570..0000000000
--- a/drivers/crypto/octeontx2/meson.build
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) 2019 Marvell International Ltd.
-
-if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-    build = false
-    reason = 'only supported on 64-bit Linux'
-    subdir_done()
-endif
-
-deps += ['bus_pci']
-deps += ['common_cpt']
-deps += ['common_octeontx2']
-deps += ['ethdev']
-deps += ['eventdev']
-deps += ['security']
-
-sources = files(
-        'otx2_cryptodev.c',
-        'otx2_cryptodev_capabilities.c',
-        'otx2_cryptodev_hw_access.c',
-        'otx2_cryptodev_mbox.c',
-        'otx2_cryptodev_ops.c',
-        'otx2_cryptodev_sec.c',
-)
-
-includes += include_directories('../../common/cpt')
-includes += include_directories('../../common/octeontx2')
-includes += include_directories('../../crypto/octeontx2')
-includes += include_directories('../../mempool/octeontx2')
-includes += include_directories('../../net/octeontx2')
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c b/drivers/crypto/octeontx2/otx2_cryptodev.c
deleted file mode 100644
index fc7ad05366..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#include <rte_bus_pci.h>
-#include <rte_common.h>
-#include <rte_crypto.h>
-#include <rte_cryptodev.h>
-#include <cryptodev_pmd.h>
-#include <rte_dev.h>
-#include <rte_errno.h>
-#include <rte_mempool.h>
-#include <rte_pci.h>
-
-#include "otx2_common.h"
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_capabilities.h"
-#include "otx2_cryptodev_mbox.h"
-#include "otx2_cryptodev_ops.h"
-#include "otx2_cryptodev_sec.h"
-#include "otx2_dev.h"
-
-/* CPT common headers */
-#include "cpt_common.h"
-#include "cpt_pmd_logs.h"
-
-uint8_t otx2_cryptodev_driver_id;
-
-static struct rte_pci_id pci_id_cpt_table[] = {
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
-			       PCI_DEVID_OCTEONTX2_RVU_CPT_VF)
-	},
-	/* sentinel */
-	{
-		.device_id = 0
-	},
-};
-
-uint64_t
-otx2_cpt_default_ff_get(void)
-{
-	return RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
-	       RTE_CRYPTODEV_FF_HW_ACCELERATED |
-	       RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
-	       RTE_CRYPTODEV_FF_IN_PLACE_SGL |
-	       RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
-	       RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |
-	       RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |
-	       RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO |
-	       RTE_CRYPTODEV_FF_RSA_PRIV_OP_KEY_QT |
-	       RTE_CRYPTODEV_FF_SYM_SESSIONLESS |
-	       RTE_CRYPTODEV_FF_SECURITY |
-	       RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED;
-}
-
-static int
-otx2_cpt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
-		   struct rte_pci_device *pci_dev)
-{
-	struct rte_cryptodev_pmd_init_params init_params = {
-		.name = "",
-		.socket_id = rte_socket_id(),
-		.private_data_size = sizeof(struct otx2_cpt_vf)
-	};
-	char name[RTE_CRYPTODEV_NAME_MAX_LEN];
-	struct rte_cryptodev *dev;
-	struct otx2_dev *otx2_dev;
-	struct otx2_cpt_vf *vf;
-	uint16_t nb_queues;
-	int ret;
-
-	rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
-
-	dev = rte_cryptodev_pmd_create(name, &pci_dev->device, &init_params);
-	if (dev == NULL) {
-		ret = -ENODEV;
-		goto exit;
-	}
-
-	dev->dev_ops = &otx2_cpt_ops;
-
-	dev->driver_id = otx2_cryptodev_driver_id;
-
-	/* Get private data space allocated */
-	vf = dev->data->dev_private;
-
-	otx2_dev = &vf->otx2_dev;
-
-	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-		/* Initialize the base otx2_dev object */
-		ret = otx2_dev_init(pci_dev, otx2_dev);
-		if (ret) {
-			CPT_LOG_ERR("Could not initialize otx2_dev");
-			goto pmd_destroy;
-		}
-
-		/* Get number of queues available on the device */
-		ret = otx2_cpt_available_queues_get(dev, &nb_queues);
-		if (ret) {
-			CPT_LOG_ERR("Could not determine the number of queues available");
-			goto otx2_dev_fini;
-		}
-
-		/* Don't exceed the limits set per VF */
-		nb_queues = RTE_MIN(nb_queues, OTX2_CPT_MAX_QUEUES_PER_VF);
-
-		if (nb_queues == 0) {
-			CPT_LOG_ERR("No free queues available on the device");
-			goto otx2_dev_fini;
-		}
-
-		vf->max_queues = nb_queues;
-
-		CPT_LOG_INFO("Max queues supported by device: %d",
-				vf->max_queues);
-
-		ret = otx2_cpt_hardware_caps_get(dev, vf->hw_caps);
-		if (ret) {
-			CPT_LOG_ERR("Could not determine hardware capabilities");
-			goto otx2_dev_fini;
-		}
-	}
-
-	otx2_crypto_capabilities_init(vf->hw_caps);
-	otx2_crypto_sec_capabilities_init(vf->hw_caps);
-
-	/* Create security ctx */
-	ret = otx2_crypto_sec_ctx_create(dev);
-	if (ret)
-		goto otx2_dev_fini;
-
-	dev->feature_flags = otx2_cpt_default_ff_get();
-
-	if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-		otx2_cpt_set_enqdeq_fns(dev);
-
-	rte_cryptodev_pmd_probing_finish(dev);
-
-	return 0;
-
-otx2_dev_fini:
-	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-		otx2_dev_fini(pci_dev, otx2_dev);
-pmd_destroy:
-	rte_cryptodev_pmd_destroy(dev);
-exit:
-	CPT_LOG_ERR("Could not create device (vendor_id: 0x%x device_id: 0x%x)",
-		    pci_dev->id.vendor_id, pci_dev->id.device_id);
-	return ret;
-}
-
-static int
-otx2_cpt_pci_remove(struct rte_pci_device *pci_dev)
-{
-	char name[RTE_CRYPTODEV_NAME_MAX_LEN];
-	struct rte_cryptodev *dev;
-
-	if (pci_dev == NULL)
-		return -EINVAL;
-
-	rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
-
-	dev = rte_cryptodev_pmd_get_named_dev(name);
-	if (dev == NULL)
-		return -ENODEV;
-
-	/* Destroy security ctx */
-	otx2_crypto_sec_ctx_destroy(dev);
-
-	return rte_cryptodev_pmd_destroy(dev);
-}
-
-static struct rte_pci_driver otx2_cryptodev_pmd = {
-	.id_table = pci_id_cpt_table,
-	.drv_flags = RTE_PCI_DRV_NEED_MAPPING,
-	.probe = otx2_cpt_pci_probe,
-	.remove = otx2_cpt_pci_remove,
-};
-
-static struct cryptodev_driver otx2_cryptodev_drv;
-
-RTE_PMD_REGISTER_PCI(CRYPTODEV_NAME_OCTEONTX2_PMD, otx2_cryptodev_pmd);
-RTE_PMD_REGISTER_PCI_TABLE(CRYPTODEV_NAME_OCTEONTX2_PMD, pci_id_cpt_table);
-RTE_PMD_REGISTER_KMOD_DEP(CRYPTODEV_NAME_OCTEONTX2_PMD, "vfio-pci");
-RTE_PMD_REGISTER_CRYPTO_DRIVER(otx2_cryptodev_drv, otx2_cryptodev_pmd.driver,
-		otx2_cryptodev_driver_id);
-RTE_LOG_REGISTER_DEFAULT(otx2_cpt_logtype, NOTICE);
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h b/drivers/crypto/octeontx2/otx2_cryptodev.h
deleted file mode 100644
index 15ecfe45b6..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_CRYPTODEV_H_
-#define _OTX2_CRYPTODEV_H_
-
-#include "cpt_common.h"
-#include "cpt_hw_types.h"
-
-#include "otx2_dev.h"
-
-/* Marvell OCTEON TX2 Crypto PMD device name */
-#define CRYPTODEV_NAME_OCTEONTX2_PMD	crypto_octeontx2
-
-#define OTX2_CPT_MAX_LFS		128
-#define OTX2_CPT_MAX_QUEUES_PER_VF	64
-#define OTX2_CPT_MAX_BLKS		2
-#define OTX2_CPT_PMD_VERSION		3
-#define OTX2_CPT_REVISION_ID_3		3
-
-/**
- * Device private data
- */
-struct otx2_cpt_vf {
-	struct otx2_dev otx2_dev;
-	/**< Base class */
-	uint16_t max_queues;
-	/**< Max queues supported */
-	uint8_t nb_queues;
-	/**< Number of crypto queues attached */
-	uint16_t lf_msixoff[OTX2_CPT_MAX_LFS];
-	/**< MSI-X offsets */
-	uint8_t lf_blkaddr[OTX2_CPT_MAX_LFS];
-	/**<  CPT0/1 BLKADDR of LFs */
-	uint8_t cpt_revision;
-	/**<  CPT revision */
-	uint8_t err_intr_registered:1;
-	/**< Are error interrupts registered? */
-	union cpt_eng_caps hw_caps[CPT_MAX_ENG_TYPES];
-	/**< CPT device capabilities */
-};
-
-struct cpt_meta_info {
-	uint64_t deq_op_info[5];
-	uint64_t comp_code_sz;
-	union cpt_res_s cpt_res __rte_aligned(16);
-	struct cpt_request_info cpt_req;
-};
-
-#define CPT_LOGTYPE otx2_cpt_logtype
-
-extern int otx2_cpt_logtype;
-
-/*
- * Crypto device driver ID
- */
-extern uint8_t otx2_cryptodev_driver_id;
-
-uint64_t otx2_cpt_default_ff_get(void);
-void otx2_cpt_set_enqdeq_fns(struct rte_cryptodev *dev);
-
-#endif /* _OTX2_CRYPTODEV_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c b/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c
deleted file mode 100644
index ba3fbbbe22..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c
+++ /dev/null
@@ -1,924 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#include <rte_cryptodev.h>
-#include <rte_security.h>
-
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_capabilities.h"
-#include "otx2_mbox.h"
-
-#define CPT_EGRP_GET(hw_caps, name, egrp) do {	\
-	if ((hw_caps[CPT_ENG_TYPE_SE].name) &&	\
-	    (hw_caps[CPT_ENG_TYPE_IE].name))	\
-		*egrp = OTX2_CPT_EGRP_SE_IE;	\
-	else if (hw_caps[CPT_ENG_TYPE_SE].name)	\
-		*egrp = OTX2_CPT_EGRP_SE;	\
-	else if (hw_caps[CPT_ENG_TYPE_AE].name)	\
-		*egrp = OTX2_CPT_EGRP_AE;	\
-	else					\
-		*egrp = OTX2_CPT_EGRP_MAX;	\
-} while (0)
-
-#define CPT_CAPS_ADD(hw_caps, name) do {				\
-	enum otx2_cpt_egrp egrp;					\
-	CPT_EGRP_GET(hw_caps, name, &egrp);				\
-	if (egrp < OTX2_CPT_EGRP_MAX)					\
-		cpt_caps_add(caps_##name, RTE_DIM(caps_##name));	\
-} while (0)
-
-#define SEC_CAPS_ADD(hw_caps, name) do {				\
-	enum otx2_cpt_egrp egrp;					\
-	CPT_EGRP_GET(hw_caps, name, &egrp);				\
-	if (egrp < OTX2_CPT_EGRP_MAX)					\
-		sec_caps_add(sec_caps_##name, RTE_DIM(sec_caps_##name));\
-} while (0)
-
-#define OTX2_CPT_MAX_CAPS 34
-#define OTX2_SEC_MAX_CAPS 4
-
-static struct rte_cryptodev_capabilities otx2_cpt_caps[OTX2_CPT_MAX_CAPS];
-static struct rte_cryptodev_capabilities otx2_cpt_sec_caps[OTX2_SEC_MAX_CAPS];
-
-static const struct rte_cryptodev_capabilities caps_mul[] = {
-	{	/* RSA */
-		.op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
-		{.asym = {
-			.xform_capa = {
-				.xform_type = RTE_CRYPTO_ASYM_XFORM_RSA,
-				.op_types = ((1 << RTE_CRYPTO_ASYM_OP_SIGN) |
-					(1 << RTE_CRYPTO_ASYM_OP_VERIFY) |
-					(1 << RTE_CRYPTO_ASYM_OP_ENCRYPT) |
-					(1 << RTE_CRYPTO_ASYM_OP_DECRYPT)),
-				{.modlen = {
-					.min = 17,
-					.max = 1024,
-					.increment = 1
-				}, }
-			}
-		}, }
-	},
-	{	/* MOD_EXP */
-		.op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
-		{.asym = {
-			.xform_capa = {
-				.xform_type = RTE_CRYPTO_ASYM_XFORM_MODEX,
-				.op_types = 0,
-				{.modlen = {
-					.min = 17,
-					.max = 1024,
-					.increment = 1
-				}, }
-			}
-		}, }
-	},
-	{	/* ECDSA */
-		.op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
-		{.asym = {
-			.xform_capa = {
-				.xform_type = RTE_CRYPTO_ASYM_XFORM_ECDSA,
-				.op_types = ((1 << RTE_CRYPTO_ASYM_OP_SIGN) |
-					(1 << RTE_CRYPTO_ASYM_OP_VERIFY)),
-				}
-			},
-		}
-	},
-	{	/* ECPM */
-		.op = RTE_CRYPTO_OP_TYPE_ASYMMETRIC,
-		{.asym = {
-			.xform_capa = {
-				.xform_type = RTE_CRYPTO_ASYM_XFORM_ECPM,
-				.op_types = 0
-				}
-			},
-		}
-	},
-};
-
-static const struct rte_cryptodev_capabilities caps_sha1_sha2[] = {
-	{	/* SHA1 */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA1,
-				.block_size = 64,
-				.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 20,
-					.max = 20,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA1 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
-				.block_size = 64,
-				.key_size = {
-					.min = 1,
-					.max = 1024,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 12,
-					.max = 20,
-					.increment = 8
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA224 */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA224,
-				.block_size = 64,
-					.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 28,
-					.max = 28,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA224 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA224_HMAC,
-				.block_size = 64,
-					.key_size = {
-					.min = 1,
-					.max = 1024,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 28,
-					.max = 28,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA256 */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA256,
-				.block_size = 64,
-				.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 32,
-					.max = 32,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA256 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
-				.block_size = 64,
-				.key_size = {
-					.min = 1,
-					.max = 1024,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 16
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA384 */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA384,
-				.block_size = 64,
-				.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 48,
-					.max = 48,
-					.increment = 0
-					},
-			}, }
-		}, }
-	},
-	{	/* SHA384 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA384_HMAC,
-				.block_size = 64,
-				.key_size = {
-					.min = 1,
-					.max = 1024,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 24,
-					.max = 48,
-					.increment = 24
-					},
-			}, }
-		}, }
-	},
-	{	/* SHA512 */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA512,
-				.block_size = 128,
-				.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 64,
-					.max = 64,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA512 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA512_HMAC,
-				.block_size = 128,
-				.key_size = {
-					.min = 1,
-					.max = 1024,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 32,
-					.max = 64,
-					.increment = 32
-				},
-			}, }
-		}, }
-	},
-	{	/* MD5 */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_MD5,
-				.block_size = 64,
-				.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-	{	/* MD5 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_MD5_HMAC,
-				.block_size = 64,
-				.key_size = {
-					.min = 8,
-					.max = 64,
-					.increment = 8
-				},
-				.digest_size = {
-					.min = 12,
-					.max = 16,
-					.increment = 4
-				},
-			}, }
-		}, }
-	},
-};
-
-static const struct rte_cryptodev_capabilities caps_chacha20[] = {
-	{	/* Chacha20-Poly1305 */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
-			{.aead = {
-				.algo = RTE_CRYPTO_AEAD_CHACHA20_POLY1305,
-				.block_size = 64,
-				.key_size = {
-					.min = 32,
-					.max = 32,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.aad_size = {
-					.min = 0,
-					.max = 1024,
-					.increment = 1
-				},
-				.iv_size = {
-					.min = 12,
-					.max = 12,
-					.increment = 0
-				},
-			}, }
-		}, }
-	}
-};
-
-static const struct rte_cryptodev_capabilities caps_zuc_snow3g[] = {
-	{	/* SNOW 3G (UEA2) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* ZUC (EEA3) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_ZUC_EEA3,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* SNOW 3G (UIA2) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 4,
-					.max = 4,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* ZUC (EIA3) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_ZUC_EIA3,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 4,
-					.max = 4,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-};
-
-static const struct rte_cryptodev_capabilities caps_aes[] = {
-	{	/* AES GMAC (AUTH) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_AES_GMAC,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.digest_size = {
-					.min = 8,
-					.max = 16,
-					.increment = 4
-				},
-				.iv_size = {
-					.min = 12,
-					.max = 12,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* AES CBC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* AES CTR */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_AES_CTR,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.iv_size = {
-					.min = 12,
-					.max = 16,
-					.increment = 4
-				}
-			}, }
-		}, }
-	},
-	{	/* AES XTS */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_AES_XTS,
-				.block_size = 16,
-				.key_size = {
-					.min = 32,
-					.max = 64,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* AES GCM */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
-			{.aead = {
-				.algo = RTE_CRYPTO_AEAD_AES_GCM,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.digest_size = {
-					.min = 4,
-					.max = 16,
-					.increment = 1
-				},
-				.aad_size = {
-					.min = 0,
-					.max = 1024,
-					.increment = 1
-				},
-				.iv_size = {
-					.min = 12,
-					.max = 12,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-};
-
-static const struct rte_cryptodev_capabilities caps_kasumi[] = {
-	{	/* KASUMI (F8) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_KASUMI_F8,
-				.block_size = 8,
-				.key_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 8,
-					.max = 8,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* KASUMI (F9) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_KASUMI_F9,
-				.block_size = 8,
-				.key_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 4,
-					.max = 4,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-};
-
-static const struct rte_cryptodev_capabilities caps_des[] = {
-	{	/* 3DES CBC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_3DES_CBC,
-				.block_size = 8,
-				.key_size = {
-					.min = 24,
-					.max = 24,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 8,
-					.max = 16,
-					.increment = 8
-				}
-			}, }
-		}, }
-	},
-	{	/* 3DES ECB */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_3DES_ECB,
-				.block_size = 8,
-				.key_size = {
-					.min = 24,
-					.max = 24,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* DES CBC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_DES_CBC,
-				.block_size = 8,
-				.key_size = {
-					.min = 8,
-					.max = 8,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 8,
-					.max = 8,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-};
-
-static const struct rte_cryptodev_capabilities caps_null[] = {
-	{	/* NULL (AUTH) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_NULL,
-				.block_size = 1,
-				.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.digest_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-			}, },
-		}, },
-	},
-	{	/* NULL (CIPHER) */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_NULL,
-				.block_size = 1,
-				.key_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				},
-				.iv_size = {
-					.min = 0,
-					.max = 0,
-					.increment = 0
-				}
-			}, },
-		}, }
-	},
-};
-
-static const struct rte_cryptodev_capabilities caps_end[] = {
-	RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
-};
-
-static const struct rte_cryptodev_capabilities sec_caps_aes[] = {
-	{	/* AES GCM */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
-			{.aead = {
-				.algo = RTE_CRYPTO_AEAD_AES_GCM,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.digest_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.aad_size = {
-					.min = 8,
-					.max = 12,
-					.increment = 4
-				},
-				.iv_size = {
-					.min = 12,
-					.max = 12,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* AES CBC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-};
-
-static const struct rte_cryptodev_capabilities sec_caps_sha1_sha2[] = {
-	{	/* SHA1 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
-				.block_size = 64,
-				.key_size = {
-					.min = 1,
-					.max = 1024,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 12,
-					.max = 20,
-					.increment = 8
-				},
-			}, }
-		}, }
-	},
-	{	/* SHA256 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
-				.block_size = 64,
-				.key_size = {
-					.min = 1,
-					.max = 1024,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 16
-				},
-			}, }
-		}, }
-	},
-};
-
-static const struct rte_security_capability
-otx2_crypto_sec_capabilities[] = {
-	{	/* IPsec Lookaside Protocol ESP Tunnel Ingress */
-		.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
-		.protocol = RTE_SECURITY_PROTOCOL_IPSEC,
-		.ipsec = {
-			.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
-			.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
-			.direction = RTE_SECURITY_IPSEC_SA_DIR_INGRESS,
-			.options = { 0 }
-		},
-		.crypto_capabilities = otx2_cpt_sec_caps,
-		.ol_flags = RTE_SECURITY_TX_OLOAD_NEED_MDATA
-	},
-	{	/* IPsec Lookaside Protocol ESP Tunnel Egress */
-		.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
-		.protocol = RTE_SECURITY_PROTOCOL_IPSEC,
-		.ipsec = {
-			.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
-			.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
-			.direction = RTE_SECURITY_IPSEC_SA_DIR_EGRESS,
-			.options = { 0 }
-		},
-		.crypto_capabilities = otx2_cpt_sec_caps,
-		.ol_flags = RTE_SECURITY_TX_OLOAD_NEED_MDATA
-	},
-	{
-		.action = RTE_SECURITY_ACTION_TYPE_NONE
-	}
-};
-
-static void
-cpt_caps_add(const struct rte_cryptodev_capabilities *caps, int nb_caps)
-{
-	static int cur_pos;
-
-	if (cur_pos + nb_caps > OTX2_CPT_MAX_CAPS)
-		return;
-
-	memcpy(&otx2_cpt_caps[cur_pos], caps, nb_caps * sizeof(caps[0]));
-	cur_pos += nb_caps;
-}
-
-void
-otx2_crypto_capabilities_init(union cpt_eng_caps *hw_caps)
-{
-	CPT_CAPS_ADD(hw_caps, mul);
-	CPT_CAPS_ADD(hw_caps, sha1_sha2);
-	CPT_CAPS_ADD(hw_caps, chacha20);
-	CPT_CAPS_ADD(hw_caps, zuc_snow3g);
-	CPT_CAPS_ADD(hw_caps, aes);
-	CPT_CAPS_ADD(hw_caps, kasumi);
-	CPT_CAPS_ADD(hw_caps, des);
-
-	cpt_caps_add(caps_null, RTE_DIM(caps_null));
-	cpt_caps_add(caps_end, RTE_DIM(caps_end));
-}
-
-const struct rte_cryptodev_capabilities *
-otx2_cpt_capabilities_get(void)
-{
-	return otx2_cpt_caps;
-}
-
-static void
-sec_caps_add(const struct rte_cryptodev_capabilities *caps, int nb_caps)
-{
-	static int cur_pos;
-
-	if (cur_pos + nb_caps > OTX2_SEC_MAX_CAPS)
-		return;
-
-	memcpy(&otx2_cpt_sec_caps[cur_pos], caps, nb_caps * sizeof(caps[0]));
-	cur_pos += nb_caps;
-}
-
-void
-otx2_crypto_sec_capabilities_init(union cpt_eng_caps *hw_caps)
-{
-	SEC_CAPS_ADD(hw_caps, aes);
-	SEC_CAPS_ADD(hw_caps, sha1_sha2);
-
-	sec_caps_add(caps_end, RTE_DIM(caps_end));
-}
-
-const struct rte_security_capability *
-otx2_crypto_sec_capabilities_get(void *device __rte_unused)
-{
-	return otx2_crypto_sec_capabilities;
-}
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.h b/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.h
deleted file mode 100644
index c1e0001190..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_capabilities.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_CRYPTODEV_CAPABILITIES_H_
-#define _OTX2_CRYPTODEV_CAPABILITIES_H_
-
-#include <rte_cryptodev.h>
-
-#include "otx2_mbox.h"
-
-enum otx2_cpt_egrp {
-	OTX2_CPT_EGRP_SE = 0,
-	OTX2_CPT_EGRP_SE_IE = 1,
-	OTX2_CPT_EGRP_AE = 2,
-	OTX2_CPT_EGRP_MAX,
-};
-
-/*
- * Initialize crypto capabilities for the device
- *
- */
-void otx2_crypto_capabilities_init(union cpt_eng_caps *hw_caps);
-
-/*
- * Get capabilities list for the device
- *
- */
-const struct rte_cryptodev_capabilities *
-otx2_cpt_capabilities_get(void);
-
-/*
- * Initialize security capabilities for the device
- *
- */
-void otx2_crypto_sec_capabilities_init(union cpt_eng_caps *hw_caps);
-
-/*
- * Get security capabilities list for the device
- *
- */
-const struct rte_security_capability *
-otx2_crypto_sec_capabilities_get(void *device __rte_unused);
-
-#endif /* _OTX2_CRYPTODEV_CAPABILITIES_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.c b/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.c
deleted file mode 100644
index d5d6b5bad7..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-#include <rte_cryptodev.h>
-
-#include "otx2_common.h"
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_hw_access.h"
-#include "otx2_cryptodev_mbox.h"
-#include "otx2_cryptodev_ops.h"
-#include "otx2_dev.h"
-
-#include "cpt_pmd_logs.h"
-
-static void
-otx2_cpt_lf_err_intr_handler(void *param)
-{
-	uintptr_t base = (uintptr_t)param;
-	uint8_t lf_id;
-	uint64_t intr;
-
-	lf_id = (base >> 12) & 0xFF;
-
-	intr = otx2_read64(base + OTX2_CPT_LF_MISC_INT);
-	if (intr == 0)
-		return;
-
-	CPT_LOG_ERR("LF %d MISC_INT: 0x%" PRIx64 "", lf_id, intr);
-
-	/* Clear interrupt */
-	otx2_write64(intr, base + OTX2_CPT_LF_MISC_INT);
-}
-
-static void
-otx2_cpt_lf_err_intr_unregister(const struct rte_cryptodev *dev,
-				uint16_t msix_off, uintptr_t base)
-{
-	struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-
-	/* Disable error interrupts */
-	otx2_write64(~0ull, base + OTX2_CPT_LF_MISC_INT_ENA_W1C);
-
-	otx2_unregister_irq(handle, otx2_cpt_lf_err_intr_handler, (void *)base,
-			    msix_off);
-}
-
-void
-otx2_cpt_err_intr_unregister(const struct rte_cryptodev *dev)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	uintptr_t base;
-	uint32_t i;
-
-	for (i = 0; i < vf->nb_queues; i++) {
-		base = OTX2_CPT_LF_BAR2(vf, vf->lf_blkaddr[i], i);
-		otx2_cpt_lf_err_intr_unregister(dev, vf->lf_msixoff[i], base);
-	}
-
-	vf->err_intr_registered = 0;
-}
-
-static int
-otx2_cpt_lf_err_intr_register(const struct rte_cryptodev *dev,
-			     uint16_t msix_off, uintptr_t base)
-{
-	struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int ret;
-
-	/* Disable error interrupts */
-	otx2_write64(~0ull, base + OTX2_CPT_LF_MISC_INT_ENA_W1C);
-
-	/* Register error interrupt handler */
-	ret = otx2_register_irq(handle, otx2_cpt_lf_err_intr_handler,
-				(void *)base, msix_off);
-	if (ret)
-		return ret;
-
-	/* Enable error interrupts */
-	otx2_write64(~0ull, base + OTX2_CPT_LF_MISC_INT_ENA_W1S);
-
-	return 0;
-}
-
-int
-otx2_cpt_err_intr_register(const struct rte_cryptodev *dev)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	uint32_t i, j, ret;
-	uintptr_t base;
-
-	for (i = 0; i < vf->nb_queues; i++) {
-		if (vf->lf_msixoff[i] == MSIX_VECTOR_INVALID) {
-			CPT_LOG_ERR("Invalid CPT LF MSI-X offset: 0x%x",
-				    vf->lf_msixoff[i]);
-			return -EINVAL;
-		}
-	}
-
-	for (i = 0; i < vf->nb_queues; i++) {
-		base = OTX2_CPT_LF_BAR2(vf, vf->lf_blkaddr[i], i);
-		ret = otx2_cpt_lf_err_intr_register(dev, vf->lf_msixoff[i],
-						   base);
-		if (ret)
-			goto intr_unregister;
-	}
-
-	vf->err_intr_registered = 1;
-	return 0;
-
-intr_unregister:
-	/* Unregister the ones already registered */
-	for (j = 0; j < i; j++) {
-		base = OTX2_CPT_LF_BAR2(vf, vf->lf_blkaddr[j], j);
-		otx2_cpt_lf_err_intr_unregister(dev, vf->lf_msixoff[j], base);
-	}
-
-	/*
-	 * Failed to register error interrupt. Not returning error as this would
-	 * prevent application from enabling larger number of devs.
-	 *
-	 * This failure is a known issue because otx2_dev_init() initializes
-	 * interrupts based on static values from ATF, and the actual number
-	 * of interrupts needed (which is based on LFs) can be determined only
-	 * after otx2_dev_init() sets up interrupts which includes mbox
-	 * interrupts.
-	 */
-	return 0;
-}
-
-int
-otx2_cpt_iq_enable(const struct rte_cryptodev *dev,
-		   const struct otx2_cpt_qp *qp, uint8_t grp_mask, uint8_t pri,
-		   uint32_t size_div40)
-{
-	union otx2_cpt_af_lf_ctl af_lf_ctl;
-	union otx2_cpt_lf_inprog inprog;
-	union otx2_cpt_lf_q_base base;
-	union otx2_cpt_lf_q_size size;
-	union otx2_cpt_lf_ctl lf_ctl;
-	int ret;
-
-	/* Set engine group mask and priority */
-
-	ret = otx2_cpt_af_reg_read(dev, OTX2_CPT_AF_LF_CTL(qp->id),
-				   qp->blkaddr, &af_lf_ctl.u);
-	if (ret)
-		return ret;
-	af_lf_ctl.s.grp = grp_mask;
-	af_lf_ctl.s.pri = pri ? 1 : 0;
-	ret = otx2_cpt_af_reg_write(dev, OTX2_CPT_AF_LF_CTL(qp->id),
-				    qp->blkaddr, af_lf_ctl.u);
-	if (ret)
-		return ret;
-
-	/* Set instruction queue base address */
-
-	base.u = otx2_read64(qp->base + OTX2_CPT_LF_Q_BASE);
-	base.s.fault = 0;
-	base.s.stopped = 0;
-	base.s.addr = qp->iq_dma_addr >> 7;
-	otx2_write64(base.u, qp->base + OTX2_CPT_LF_Q_BASE);
-
-	/* Set instruction queue size */
-
-	size.u = otx2_read64(qp->base + OTX2_CPT_LF_Q_SIZE);
-	size.s.size_div40 = size_div40;
-	otx2_write64(size.u, qp->base + OTX2_CPT_LF_Q_SIZE);
-
-	/* Enable instruction queue */
-
-	lf_ctl.u = otx2_read64(qp->base + OTX2_CPT_LF_CTL);
-	lf_ctl.s.ena = 1;
-	otx2_write64(lf_ctl.u, qp->base + OTX2_CPT_LF_CTL);
-
-	/* Start instruction execution */
-
-	inprog.u = otx2_read64(qp->base + OTX2_CPT_LF_INPROG);
-	inprog.s.eena = 1;
-	otx2_write64(inprog.u, qp->base + OTX2_CPT_LF_INPROG);
-
-	return 0;
-}
-
-void
-otx2_cpt_iq_disable(struct otx2_cpt_qp *qp)
-{
-	union otx2_cpt_lf_q_grp_ptr grp_ptr;
-	union otx2_cpt_lf_inprog inprog;
-	union otx2_cpt_lf_ctl ctl;
-	int cnt;
-
-	/* Stop instruction execution */
-	inprog.u = otx2_read64(qp->base + OTX2_CPT_LF_INPROG);
-	inprog.s.eena = 0x0;
-	otx2_write64(inprog.u, qp->base + OTX2_CPT_LF_INPROG);
-
-	/* Disable instructions enqueuing */
-	ctl.u = otx2_read64(qp->base + OTX2_CPT_LF_CTL);
-	ctl.s.ena = 0;
-	otx2_write64(ctl.u, qp->base + OTX2_CPT_LF_CTL);
-
-	/* Wait for instruction queue to become empty */
-	cnt = 0;
-	do {
-		inprog.u = otx2_read64(qp->base + OTX2_CPT_LF_INPROG);
-		if (inprog.s.grb_partial)
-			cnt = 0;
-		else
-			cnt++;
-		grp_ptr.u = otx2_read64(qp->base + OTX2_CPT_LF_Q_GRP_PTR);
-	} while ((cnt < 10) && (grp_ptr.s.nq_ptr != grp_ptr.s.dq_ptr));
-
-	cnt = 0;
-	do {
-		inprog.u = otx2_read64(qp->base + OTX2_CPT_LF_INPROG);
-		if ((inprog.s.inflight == 0) &&
-		    (inprog.s.gwb_cnt < 40) &&
-		    ((inprog.s.grb_cnt == 0) || (inprog.s.grb_cnt == 40)))
-			cnt++;
-		else
-			cnt = 0;
-	} while (cnt < 10);
-}
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h b/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h
deleted file mode 100644
index 90a338e05a..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_CRYPTODEV_HW_ACCESS_H_
-#define _OTX2_CRYPTODEV_HW_ACCESS_H_
-
-#include <stdint.h>
-
-#include <rte_cryptodev.h>
-#include <rte_memory.h>
-
-#include "cpt_common.h"
-#include "cpt_hw_types.h"
-#include "cpt_mcode_defines.h"
-
-#include "otx2_dev.h"
-#include "otx2_cryptodev_qp.h"
-
-/* CPT instruction queue length.
- * Use queue size as power of 2 for aiding in pending queue calculations.
- */
-#define OTX2_CPT_DEFAULT_CMD_QLEN	8192
-
-/* Mask which selects all engine groups */
-#define OTX2_CPT_ENG_GRPS_MASK		0xFF
-
-/* Register offsets */
-
-/* LMT LF registers */
-#define OTX2_LMT_LF_LMTLINE(a)		(0x0ull | (uint64_t)(a) << 3)
-
-/* CPT LF registers */
-#define OTX2_CPT_LF_CTL			0x10ull
-#define OTX2_CPT_LF_INPROG		0x40ull
-#define OTX2_CPT_LF_MISC_INT		0xb0ull
-#define OTX2_CPT_LF_MISC_INT_ENA_W1S	0xd0ull
-#define OTX2_CPT_LF_MISC_INT_ENA_W1C	0xe0ull
-#define OTX2_CPT_LF_Q_BASE		0xf0ull
-#define OTX2_CPT_LF_Q_SIZE		0x100ull
-#define OTX2_CPT_LF_Q_GRP_PTR		0x120ull
-#define OTX2_CPT_LF_NQ(a)		(0x400ull | (uint64_t)(a) << 3)
-
-#define OTX2_CPT_AF_LF_CTL(a)		(0x27000ull | (uint64_t)(a) << 3)
-#define OTX2_CPT_AF_LF_CTL2(a)		(0x29000ull | (uint64_t)(a) << 3)
-
-#define OTX2_CPT_LF_BAR2(vf, blk_addr, q_id) \
-		((vf)->otx2_dev.bar2 + \
-		 ((blk_addr << 20) | ((q_id) << 12)))
-
-#define OTX2_CPT_QUEUE_HI_PRIO 0x1
-
-union otx2_cpt_lf_ctl {
-	uint64_t u;
-	struct {
-		uint64_t ena                         : 1;
-		uint64_t fc_ena                      : 1;
-		uint64_t fc_up_crossing              : 1;
-		uint64_t reserved_3_3                : 1;
-		uint64_t fc_hyst_bits                : 4;
-		uint64_t reserved_8_63               : 56;
-	} s;
-};
-
-union otx2_cpt_lf_inprog {
-	uint64_t u;
-	struct {
-		uint64_t inflight                    : 9;
-		uint64_t reserved_9_15               : 7;
-		uint64_t eena                        : 1;
-		uint64_t grp_drp                     : 1;
-		uint64_t reserved_18_30              : 13;
-		uint64_t grb_partial                 : 1;
-		uint64_t grb_cnt                     : 8;
-		uint64_t gwb_cnt                     : 8;
-		uint64_t reserved_48_63              : 16;
-	} s;
-};
-
-union otx2_cpt_lf_q_base {
-	uint64_t u;
-	struct {
-		uint64_t fault                       : 1;
-		uint64_t stopped                     : 1;
-		uint64_t reserved_2_6                : 5;
-		uint64_t addr                        : 46;
-		uint64_t reserved_53_63              : 11;
-	} s;
-};
-
-union otx2_cpt_lf_q_size {
-	uint64_t u;
-	struct {
-		uint64_t size_div40                  : 15;
-		uint64_t reserved_15_63              : 49;
-	} s;
-};
-
-union otx2_cpt_af_lf_ctl {
-	uint64_t u;
-	struct {
-		uint64_t pri                         : 1;
-		uint64_t reserved_1_8                : 8;
-		uint64_t pf_func_inst                : 1;
-		uint64_t cont_err                    : 1;
-		uint64_t reserved_11_15              : 5;
-		uint64_t nixtx_en                    : 1;
-		uint64_t reserved_17_47              : 31;
-		uint64_t grp                         : 8;
-		uint64_t reserved_56_63              : 8;
-	} s;
-};
-
-union otx2_cpt_af_lf_ctl2 {
-	uint64_t u;
-	struct {
-		uint64_t exe_no_swap                 : 1;
-		uint64_t exe_ldwb                    : 1;
-		uint64_t reserved_2_31               : 30;
-		uint64_t sso_pf_func                 : 16;
-		uint64_t nix_pf_func                 : 16;
-	} s;
-};
-
-union otx2_cpt_lf_q_grp_ptr {
-	uint64_t u;
-	struct {
-		uint64_t dq_ptr                      : 15;
-		uint64_t reserved_31_15              : 17;
-		uint64_t nq_ptr                      : 15;
-		uint64_t reserved_47_62              : 16;
-		uint64_t xq_xor                      : 1;
-	} s;
-};
-
-/*
- * Enumeration cpt_9x_comp_e
- *
- * CPT 9X Completion Enumeration
- * Enumerates the values of CPT_RES_S[COMPCODE].
- */
-enum cpt_9x_comp_e {
-	CPT_9X_COMP_E_NOTDONE = 0x00,
-	CPT_9X_COMP_E_GOOD = 0x01,
-	CPT_9X_COMP_E_FAULT = 0x02,
-	CPT_9X_COMP_E_HWERR = 0x04,
-	CPT_9X_COMP_E_INSTERR = 0x05,
-	CPT_9X_COMP_E_LAST_ENTRY = 0x06
-};
-
-void otx2_cpt_err_intr_unregister(const struct rte_cryptodev *dev);
-
-int otx2_cpt_err_intr_register(const struct rte_cryptodev *dev);
-
-int otx2_cpt_iq_enable(const struct rte_cryptodev *dev,
-		       const struct otx2_cpt_qp *qp, uint8_t grp_mask,
-		       uint8_t pri, uint32_t size_div40);
-
-void otx2_cpt_iq_disable(struct otx2_cpt_qp *qp);
-
-#endif /* _OTX2_CRYPTODEV_HW_ACCESS_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.c b/drivers/crypto/octeontx2/otx2_cryptodev_mbox.c
deleted file mode 100644
index f9e7b0b474..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-#include <cryptodev_pmd.h>
-#include <rte_ethdev.h>
-
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_hw_access.h"
-#include "otx2_cryptodev_mbox.h"
-#include "otx2_dev.h"
-#include "otx2_ethdev.h"
-#include "otx2_sec_idev.h"
-#include "otx2_mbox.h"
-
-#include "cpt_pmd_logs.h"
-
-int
-otx2_cpt_hardware_caps_get(const struct rte_cryptodev *dev,
-			      union cpt_eng_caps *hw_caps)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_dev *otx2_dev = &vf->otx2_dev;
-	struct cpt_caps_rsp_msg *rsp;
-	int ret;
-
-	otx2_mbox_alloc_msg_cpt_caps_get(otx2_dev->mbox);
-
-	ret = otx2_mbox_process_msg(otx2_dev->mbox, (void *)&rsp);
-	if (ret)
-		return -EIO;
-
-	if (rsp->cpt_pf_drv_version != OTX2_CPT_PMD_VERSION) {
-		otx2_err("Incompatible CPT PMD version"
-			 "(Kernel: 0x%04x DPDK: 0x%04x)",
-			  rsp->cpt_pf_drv_version, OTX2_CPT_PMD_VERSION);
-		return -EPIPE;
-	}
-
-	vf->cpt_revision = rsp->cpt_revision;
-	otx2_mbox_memcpy(hw_caps, rsp->eng_caps,
-		sizeof(union cpt_eng_caps) * CPT_MAX_ENG_TYPES);
-
-	return 0;
-}
-
-int
-otx2_cpt_available_queues_get(const struct rte_cryptodev *dev,
-			      uint16_t *nb_queues)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_dev *otx2_dev = &vf->otx2_dev;
-	struct free_rsrcs_rsp *rsp;
-	int ret;
-
-	otx2_mbox_alloc_msg_free_rsrc_cnt(otx2_dev->mbox);
-
-	ret = otx2_mbox_process_msg(otx2_dev->mbox, (void *)&rsp);
-	if (ret)
-		return -EIO;
-
-	*nb_queues = rsp->cpt + rsp->cpt1;
-	return 0;
-}
-
-int
-otx2_cpt_queues_attach(const struct rte_cryptodev *dev, uint8_t nb_queues)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	int blkaddr[OTX2_CPT_MAX_BLKS];
-	struct rsrc_attach_req *req;
-	int blknum = 0;
-	int i, ret;
-
-	blkaddr[0] = RVU_BLOCK_ADDR_CPT0;
-	blkaddr[1] = RVU_BLOCK_ADDR_CPT1;
-
-	/* Ask AF to attach required LFs */
-
-	req = otx2_mbox_alloc_msg_attach_resources(mbox);
-
-	if ((vf->cpt_revision == OTX2_CPT_REVISION_ID_3) &&
-	    (vf->otx2_dev.pf_func & 0x1))
-		blknum = (blknum + 1) % OTX2_CPT_MAX_BLKS;
-
-	/* 1 LF = 1 queue */
-	req->cptlfs = nb_queues;
-	req->cpt_blkaddr = blkaddr[blknum];
-
-	ret = otx2_mbox_process(mbox);
-	if (ret == -ENOSPC) {
-		if (vf->cpt_revision == OTX2_CPT_REVISION_ID_3) {
-			blknum = (blknum + 1) % OTX2_CPT_MAX_BLKS;
-			req->cpt_blkaddr = blkaddr[blknum];
-			if (otx2_mbox_process(mbox) < 0)
-				return -EIO;
-		} else {
-			return -EIO;
-		}
-	} else if (ret < 0) {
-		return -EIO;
-	}
-
-	/* Update number of attached queues */
-	vf->nb_queues = nb_queues;
-	for (i = 0; i < nb_queues; i++)
-		vf->lf_blkaddr[i] = req->cpt_blkaddr;
-
-	return 0;
-}
-
-int
-otx2_cpt_queues_detach(const struct rte_cryptodev *dev)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	struct rsrc_detach_req *req;
-
-	req = otx2_mbox_alloc_msg_detach_resources(mbox);
-	req->cptlfs = true;
-	req->partial = true;
-	if (otx2_mbox_process(mbox) < 0)
-		return -EIO;
-
-	/* Queues have been detached */
-	vf->nb_queues = 0;
-
-	return 0;
-}
-
-int
-otx2_cpt_msix_offsets_get(const struct rte_cryptodev *dev)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	struct msix_offset_rsp *rsp;
-	uint32_t i, ret;
-
-	/* Get CPT MSI-X vector offsets */
-
-	otx2_mbox_alloc_msg_msix_offset(mbox);
-
-	ret = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (ret)
-		return ret;
-
-	for (i = 0; i < vf->nb_queues; i++)
-		vf->lf_msixoff[i] = (vf->lf_blkaddr[i] == RVU_BLOCK_ADDR_CPT1) ?
-			rsp->cpt1_lf_msixoff[i] : rsp->cptlf_msixoff[i];
-
-	return 0;
-}
-
-static int
-otx2_cpt_send_mbox_msg(struct otx2_cpt_vf *vf)
-{
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	int ret;
-
-	otx2_mbox_msg_send(mbox, 0);
-
-	ret = otx2_mbox_wait_for_rsp(mbox, 0);
-	if (ret < 0) {
-		CPT_LOG_ERR("Could not get mailbox response");
-		return ret;
-	}
-
-	return 0;
-}
-
-int
-otx2_cpt_af_reg_read(const struct rte_cryptodev *dev, uint64_t reg,
-		     uint8_t blkaddr, uint64_t *val)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	struct otx2_mbox_dev *mdev = &mbox->dev[0];
-	struct cpt_rd_wr_reg_msg *msg;
-	int ret, off;
-
-	msg = (struct cpt_rd_wr_reg_msg *)
-			otx2_mbox_alloc_msg_rsp(mbox, 0, sizeof(*msg),
-						sizeof(*msg));
-	if (msg == NULL) {
-		CPT_LOG_ERR("Could not allocate mailbox message");
-		return -EFAULT;
-	}
-
-	msg->hdr.id = MBOX_MSG_CPT_RD_WR_REGISTER;
-	msg->hdr.sig = OTX2_MBOX_REQ_SIG;
-	msg->hdr.pcifunc = vf->otx2_dev.pf_func;
-	msg->is_write = 0;
-	msg->reg_offset = reg;
-	msg->ret_val = val;
-	msg->blkaddr = blkaddr;
-
-	ret = otx2_cpt_send_mbox_msg(vf);
-	if (ret < 0)
-		return ret;
-
-	off = mbox->rx_start +
-			RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-	msg = (struct cpt_rd_wr_reg_msg *) ((uintptr_t)mdev->mbase + off);
-
-	*val = msg->val;
-
-	return 0;
-}
-
-int
-otx2_cpt_af_reg_write(const struct rte_cryptodev *dev, uint64_t reg,
-		      uint8_t blkaddr, uint64_t val)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	struct cpt_rd_wr_reg_msg *msg;
-
-	msg = (struct cpt_rd_wr_reg_msg *)
-			otx2_mbox_alloc_msg_rsp(mbox, 0, sizeof(*msg),
-						sizeof(*msg));
-	if (msg == NULL) {
-		CPT_LOG_ERR("Could not allocate mailbox message");
-		return -EFAULT;
-	}
-
-	msg->hdr.id = MBOX_MSG_CPT_RD_WR_REGISTER;
-	msg->hdr.sig = OTX2_MBOX_REQ_SIG;
-	msg->hdr.pcifunc = vf->otx2_dev.pf_func;
-	msg->is_write = 1;
-	msg->reg_offset = reg;
-	msg->val = val;
-	msg->blkaddr = blkaddr;
-
-	return otx2_cpt_send_mbox_msg(vf);
-}
-
-int
-otx2_cpt_inline_init(const struct rte_cryptodev *dev)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	struct cpt_rx_inline_lf_cfg_msg *msg;
-	int ret;
-
-	msg = otx2_mbox_alloc_msg_cpt_rx_inline_lf_cfg(mbox);
-	msg->sso_pf_func = otx2_sso_pf_func_get();
-
-	otx2_mbox_msg_send(mbox, 0);
-	ret = otx2_mbox_process(mbox);
-	if (ret < 0)
-		return -EIO;
-
-	return 0;
-}
-
-int
-otx2_cpt_qp_ethdev_bind(const struct rte_cryptodev *dev, struct otx2_cpt_qp *qp,
-			uint16_t port_id)
-{
-	struct rte_eth_dev *eth_dev = &rte_eth_devices[port_id];
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	struct otx2_mbox *mbox = vf->otx2_dev.mbox;
-	struct cpt_inline_ipsec_cfg_msg *msg;
-	struct otx2_eth_dev *otx2_eth_dev;
-	int ret;
-
-	if (!otx2_eth_dev_is_sec_capable(&rte_eth_devices[port_id]))
-		return -EINVAL;
-
-	otx2_eth_dev = otx2_eth_pmd_priv(eth_dev);
-
-	msg = otx2_mbox_alloc_msg_cpt_inline_ipsec_cfg(mbox);
-	msg->dir = CPT_INLINE_OUTBOUND;
-	msg->enable = 1;
-	msg->slot = qp->id;
-
-	msg->nix_pf_func = otx2_eth_dev->pf_func;
-
-	otx2_mbox_msg_send(mbox, 0);
-	ret = otx2_mbox_process(mbox);
-	if (ret < 0)
-		return -EIO;
-
-	return 0;
-}
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.h b/drivers/crypto/octeontx2/otx2_cryptodev_mbox.h
deleted file mode 100644
index 03323e418c..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_CRYPTODEV_MBOX_H_
-#define _OTX2_CRYPTODEV_MBOX_H_
-
-#include <rte_cryptodev.h>
-
-#include "otx2_cryptodev_hw_access.h"
-
-int otx2_cpt_hardware_caps_get(const struct rte_cryptodev *dev,
-			      union cpt_eng_caps *hw_caps);
-
-int otx2_cpt_available_queues_get(const struct rte_cryptodev *dev,
-				  uint16_t *nb_queues);
-
-int otx2_cpt_queues_attach(const struct rte_cryptodev *dev, uint8_t nb_queues);
-
-int otx2_cpt_queues_detach(const struct rte_cryptodev *dev);
-
-int otx2_cpt_msix_offsets_get(const struct rte_cryptodev *dev);
-
-__rte_internal
-int otx2_cpt_af_reg_read(const struct rte_cryptodev *dev, uint64_t reg,
-			 uint8_t blkaddr, uint64_t *val);
-
-__rte_internal
-int otx2_cpt_af_reg_write(const struct rte_cryptodev *dev, uint64_t reg,
-			  uint8_t blkaddr, uint64_t val);
-
-int otx2_cpt_qp_ethdev_bind(const struct rte_cryptodev *dev,
-			    struct otx2_cpt_qp *qp, uint16_t port_id);
-
-int otx2_cpt_inline_init(const struct rte_cryptodev *dev);
-
-#endif /* _OTX2_CRYPTODEV_MBOX_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c b/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
deleted file mode 100644
index 339b82f33e..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.c
+++ /dev/null
@@ -1,1438 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#include <unistd.h>
-
-#include <cryptodev_pmd.h>
-#include <rte_errno.h>
-#include <ethdev_driver.h>
-#include <rte_event_crypto_adapter.h>
-
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_capabilities.h"
-#include "otx2_cryptodev_hw_access.h"
-#include "otx2_cryptodev_mbox.h"
-#include "otx2_cryptodev_ops.h"
-#include "otx2_cryptodev_ops_helper.h"
-#include "otx2_ipsec_anti_replay.h"
-#include "otx2_ipsec_po_ops.h"
-#include "otx2_mbox.h"
-#include "otx2_sec_idev.h"
-#include "otx2_security.h"
-
-#include "cpt_hw_types.h"
-#include "cpt_pmd_logs.h"
-#include "cpt_pmd_ops_helper.h"
-#include "cpt_ucode.h"
-#include "cpt_ucode_asym.h"
-
-#define METABUF_POOL_CACHE_SIZE	512
-
-static uint64_t otx2_fpm_iova[CPT_EC_ID_PMAX];
-
-/* Forward declarations */
-
-static int
-otx2_cpt_queue_pair_release(struct rte_cryptodev *dev, uint16_t qp_id);
-
-static void
-qp_memzone_name_get(char *name, int size, int dev_id, int qp_id)
-{
-	snprintf(name, size, "otx2_cpt_lf_mem_%u:%u", dev_id, qp_id);
-}
-
-static int
-otx2_cpt_metabuf_mempool_create(const struct rte_cryptodev *dev,
-				struct otx2_cpt_qp *qp, uint8_t qp_id,
-				unsigned int nb_elements)
-{
-	char mempool_name[RTE_MEMPOOL_NAMESIZE];
-	struct cpt_qp_meta_info *meta_info;
-	int lcore_cnt = rte_lcore_count();
-	int ret, max_mlen, mb_pool_sz;
-	struct rte_mempool *pool;
-	int asym_mlen = 0;
-	int lb_mlen = 0;
-	int sg_mlen = 0;
-
-	if (dev->feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) {
-
-		/* Get meta len for scatter gather mode */
-		sg_mlen = cpt_pmd_ops_helper_get_mlen_sg_mode();
-
-		/* Extra 32B saved for future considerations */
-		sg_mlen += 4 * sizeof(uint64_t);
-
-		/* Get meta len for linear buffer (direct) mode */
-		lb_mlen = cpt_pmd_ops_helper_get_mlen_direct_mode();
-
-		/* Extra 32B saved for future considerations */
-		lb_mlen += 4 * sizeof(uint64_t);
-	}
-
-	if (dev->feature_flags & RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO) {
-
-		/* Get meta len required for asymmetric operations */
-		asym_mlen = cpt_pmd_ops_helper_asym_get_mlen();
-	}
-
-	/*
-	 * Check max requirement for meta buffer to
-	 * support crypto op of any type (sym/asym).
-	 */
-	max_mlen = RTE_MAX(RTE_MAX(lb_mlen, sg_mlen), asym_mlen);
-
-	/* Allocate mempool */
-
-	snprintf(mempool_name, RTE_MEMPOOL_NAMESIZE, "otx2_cpt_mb_%u:%u",
-		 dev->data->dev_id, qp_id);
-
-	mb_pool_sz = nb_elements;
-
-	/* For poll mode, core that enqueues and core that dequeues can be
-	 * different. For event mode, all cores are allowed to use same crypto
-	 * queue pair.
-	 */
-	mb_pool_sz += (RTE_MAX(2, lcore_cnt) * METABUF_POOL_CACHE_SIZE);
-
-	pool = rte_mempool_create_empty(mempool_name, mb_pool_sz, max_mlen,
-					METABUF_POOL_CACHE_SIZE, 0,
-					rte_socket_id(), 0);
-
-	if (pool == NULL) {
-		CPT_LOG_ERR("Could not create mempool for metabuf");
-		return rte_errno;
-	}
-
-	ret = rte_mempool_set_ops_byname(pool, RTE_MBUF_DEFAULT_MEMPOOL_OPS,
-					 NULL);
-	if (ret) {
-		CPT_LOG_ERR("Could not set mempool ops");
-		goto mempool_free;
-	}
-
-	ret = rte_mempool_populate_default(pool);
-	if (ret <= 0) {
-		CPT_LOG_ERR("Could not populate metabuf pool");
-		goto mempool_free;
-	}
-
-	meta_info = &qp->meta_info;
-
-	meta_info->pool = pool;
-	meta_info->lb_mlen = lb_mlen;
-	meta_info->sg_mlen = sg_mlen;
-
-	return 0;
-
-mempool_free:
-	rte_mempool_free(pool);
-	return ret;
-}
-
-static void
-otx2_cpt_metabuf_mempool_destroy(struct otx2_cpt_qp *qp)
-{
-	struct cpt_qp_meta_info *meta_info = &qp->meta_info;
-
-	rte_mempool_free(meta_info->pool);
-
-	meta_info->pool = NULL;
-	meta_info->lb_mlen = 0;
-	meta_info->sg_mlen = 0;
-}
-
-static int
-otx2_cpt_qp_inline_cfg(const struct rte_cryptodev *dev, struct otx2_cpt_qp *qp)
-{
-	static rte_atomic16_t port_offset = RTE_ATOMIC16_INIT(-1);
-	uint16_t port_id, nb_ethport = rte_eth_dev_count_avail();
-	int i, ret;
-
-	for (i = 0; i < nb_ethport; i++) {
-		port_id = rte_atomic16_add_return(&port_offset, 1) % nb_ethport;
-		if (otx2_eth_dev_is_sec_capable(&rte_eth_devices[port_id]))
-			break;
-	}
-
-	if (i >= nb_ethport)
-		return 0;
-
-	ret = otx2_cpt_qp_ethdev_bind(dev, qp, port_id);
-	if (ret)
-		return ret;
-
-	/* Publish inline Tx QP to eth dev security */
-	ret = otx2_sec_idev_tx_cpt_qp_add(port_id, qp);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static struct otx2_cpt_qp *
-otx2_cpt_qp_create(const struct rte_cryptodev *dev, uint16_t qp_id,
-		   uint8_t group)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	uint64_t pg_sz = sysconf(_SC_PAGESIZE);
-	const struct rte_memzone *lf_mem;
-	uint32_t len, iq_len, size_div40;
-	char name[RTE_MEMZONE_NAMESIZE];
-	uint64_t used_len, iova;
-	struct otx2_cpt_qp *qp;
-	uint64_t lmtline;
-	uint8_t *va;
-	int ret;
-
-	/* Allocate queue pair */
-	qp = rte_zmalloc_socket("OCTEON TX2 Crypto PMD Queue Pair", sizeof(*qp),
-				OTX2_ALIGN, 0);
-	if (qp == NULL) {
-		CPT_LOG_ERR("Could not allocate queue pair");
-		return NULL;
-	}
-
-	/*
-	 * Pending queue updates make assumption that queue size is a power
-	 * of 2.
-	 */
-	RTE_BUILD_BUG_ON(!RTE_IS_POWER_OF_2(OTX2_CPT_DEFAULT_CMD_QLEN));
-
-	iq_len = OTX2_CPT_DEFAULT_CMD_QLEN;
-
-	/*
-	 * Queue size must be a multiple of 40 and effective queue size to
-	 * software is (size_div40 - 1) * 40
-	 */
-	size_div40 = (iq_len + 40 - 1) / 40 + 1;
-
-	/* For pending queue */
-	len = iq_len * RTE_ALIGN(sizeof(qp->pend_q.rid_queue[0]), 8);
-
-	/* Space for instruction group memory */
-	len += size_div40 * 16;
-
-	/* So that instruction queues start as pg size aligned */
-	len = RTE_ALIGN(len, pg_sz);
-
-	/* For instruction queues */
-	len += OTX2_CPT_DEFAULT_CMD_QLEN * sizeof(union cpt_inst_s);
-
-	/* Wastage after instruction queues */
-	len = RTE_ALIGN(len, pg_sz);
-
-	qp_memzone_name_get(name, RTE_MEMZONE_NAMESIZE, dev->data->dev_id,
-			    qp_id);
-
-	lf_mem = rte_memzone_reserve_aligned(name, len, vf->otx2_dev.node,
-			RTE_MEMZONE_SIZE_HINT_ONLY | RTE_MEMZONE_256MB,
-			RTE_CACHE_LINE_SIZE);
-	if (lf_mem == NULL) {
-		CPT_LOG_ERR("Could not allocate reserved memzone");
-		goto qp_free;
-	}
-
-	va = lf_mem->addr;
-	iova = lf_mem->iova;
-
-	memset(va, 0, len);
-
-	ret = otx2_cpt_metabuf_mempool_create(dev, qp, qp_id, iq_len);
-	if (ret) {
-		CPT_LOG_ERR("Could not create mempool for metabuf");
-		goto lf_mem_free;
-	}
-
-	/* Initialize pending queue */
-	qp->pend_q.rid_queue = (void **)va;
-	qp->pend_q.tail = 0;
-	qp->pend_q.head = 0;
-
-	used_len = iq_len * RTE_ALIGN(sizeof(qp->pend_q.rid_queue[0]), 8);
-	used_len += size_div40 * 16;
-	used_len = RTE_ALIGN(used_len, pg_sz);
-	iova += used_len;
-
-	qp->iq_dma_addr = iova;
-	qp->id = qp_id;
-	qp->blkaddr = vf->lf_blkaddr[qp_id];
-	qp->base = OTX2_CPT_LF_BAR2(vf, qp->blkaddr, qp_id);
-
-	lmtline = vf->otx2_dev.bar2 +
-		  (RVU_BLOCK_ADDR_LMT << 20 | qp_id << 12) +
-		  OTX2_LMT_LF_LMTLINE(0);
-
-	qp->lmtline = (void *)lmtline;
-
-	qp->lf_nq_reg = qp->base + OTX2_CPT_LF_NQ(0);
-
-	ret = otx2_sec_idev_tx_cpt_qp_remove(qp);
-	if (ret && (ret != -ENOENT)) {
-		CPT_LOG_ERR("Could not delete inline configuration");
-		goto mempool_destroy;
-	}
-
-	otx2_cpt_iq_disable(qp);
-
-	ret = otx2_cpt_qp_inline_cfg(dev, qp);
-	if (ret) {
-		CPT_LOG_ERR("Could not configure queue for inline IPsec");
-		goto mempool_destroy;
-	}
-
-	ret = otx2_cpt_iq_enable(dev, qp, group, OTX2_CPT_QUEUE_HI_PRIO,
-				 size_div40);
-	if (ret) {
-		CPT_LOG_ERR("Could not enable instruction queue");
-		goto mempool_destroy;
-	}
-
-	return qp;
-
-mempool_destroy:
-	otx2_cpt_metabuf_mempool_destroy(qp);
-lf_mem_free:
-	rte_memzone_free(lf_mem);
-qp_free:
-	rte_free(qp);
-	return NULL;
-}
-
-static int
-otx2_cpt_qp_destroy(const struct rte_cryptodev *dev, struct otx2_cpt_qp *qp)
-{
-	const struct rte_memzone *lf_mem;
-	char name[RTE_MEMZONE_NAMESIZE];
-	int ret;
-
-	ret = otx2_sec_idev_tx_cpt_qp_remove(qp);
-	if (ret && (ret != -ENOENT)) {
-		CPT_LOG_ERR("Could not delete inline configuration");
-		return ret;
-	}
-
-	otx2_cpt_iq_disable(qp);
-
-	otx2_cpt_metabuf_mempool_destroy(qp);
-
-	qp_memzone_name_get(name, RTE_MEMZONE_NAMESIZE, dev->data->dev_id,
-			    qp->id);
-
-	lf_mem = rte_memzone_lookup(name);
-
-	ret = rte_memzone_free(lf_mem);
-	if (ret)
-		return ret;
-
-	rte_free(qp);
-
-	return 0;
-}
-
-static int
-sym_xform_verify(struct rte_crypto_sym_xform *xform)
-{
-	if (xform->next) {
-		if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
-		    xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
-		    xform->next->cipher.op == RTE_CRYPTO_CIPHER_OP_ENCRYPT &&
-		    (xform->auth.algo != RTE_CRYPTO_AUTH_SHA1_HMAC ||
-		     xform->next->cipher.algo != RTE_CRYPTO_CIPHER_AES_CBC))
-			return -ENOTSUP;
-
-		if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
-		    xform->cipher.op == RTE_CRYPTO_CIPHER_OP_DECRYPT &&
-		    xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
-		    (xform->cipher.algo != RTE_CRYPTO_CIPHER_AES_CBC ||
-		     xform->next->auth.algo != RTE_CRYPTO_AUTH_SHA1_HMAC))
-			return -ENOTSUP;
-
-		if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
-		    xform->cipher.algo == RTE_CRYPTO_CIPHER_3DES_CBC &&
-		    xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
-		    xform->next->auth.algo == RTE_CRYPTO_AUTH_SHA1)
-			return -ENOTSUP;
-
-		if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
-		    xform->auth.algo == RTE_CRYPTO_AUTH_SHA1 &&
-		    xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER &&
-		    xform->next->cipher.algo == RTE_CRYPTO_CIPHER_3DES_CBC)
-			return -ENOTSUP;
-
-	} else {
-		if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH &&
-		    xform->auth.algo == RTE_CRYPTO_AUTH_NULL &&
-		    xform->auth.op == RTE_CRYPTO_AUTH_OP_VERIFY)
-			return -ENOTSUP;
-	}
-	return 0;
-}
-
-static int
-sym_session_configure(int driver_id, struct rte_crypto_sym_xform *xform,
-		      struct rte_cryptodev_sym_session *sess,
-		      struct rte_mempool *pool)
-{
-	struct rte_crypto_sym_xform *temp_xform = xform;
-	struct cpt_sess_misc *misc;
-	vq_cmd_word3_t vq_cmd_w3;
-	void *priv;
-	int ret;
-
-	ret = sym_xform_verify(xform);
-	if (unlikely(ret))
-		return ret;
-
-	if (unlikely(rte_mempool_get(pool, &priv))) {
-		CPT_LOG_ERR("Could not allocate session private data");
-		return -ENOMEM;
-	}
-
-	memset(priv, 0, sizeof(struct cpt_sess_misc) +
-			offsetof(struct cpt_ctx, mc_ctx));
-
-	misc = priv;
-
-	for ( ; xform != NULL; xform = xform->next) {
-		switch (xform->type) {
-		case RTE_CRYPTO_SYM_XFORM_AEAD:
-			ret = fill_sess_aead(xform, misc);
-			break;
-		case RTE_CRYPTO_SYM_XFORM_CIPHER:
-			ret = fill_sess_cipher(xform, misc);
-			break;
-		case RTE_CRYPTO_SYM_XFORM_AUTH:
-			if (xform->auth.algo == RTE_CRYPTO_AUTH_AES_GMAC)
-				ret = fill_sess_gmac(xform, misc);
-			else
-				ret = fill_sess_auth(xform, misc);
-			break;
-		default:
-			ret = -1;
-		}
-
-		if (ret)
-			goto priv_put;
-	}
-
-	if ((GET_SESS_FC_TYPE(misc) == HASH_HMAC) &&
-			cpt_mac_len_verify(&temp_xform->auth)) {
-		CPT_LOG_ERR("MAC length is not supported");
-		struct cpt_ctx *ctx = SESS_PRIV(misc);
-		if (ctx->auth_key != NULL) {
-			rte_free(ctx->auth_key);
-			ctx->auth_key = NULL;
-		}
-		ret = -ENOTSUP;
-		goto priv_put;
-	}
-
-	set_sym_session_private_data(sess, driver_id, misc);
-
-	misc->ctx_dma_addr = rte_mempool_virt2iova(misc) +
-			     sizeof(struct cpt_sess_misc);
-
-	vq_cmd_w3.u64 = 0;
-	vq_cmd_w3.s.cptr = misc->ctx_dma_addr + offsetof(struct cpt_ctx,
-							 mc_ctx);
-
-	/*
-	 * IE engines support IPsec operations
-	 * SE engines support IPsec operations, Chacha-Poly and
-	 * Air-Crypto operations
-	 */
-	if (misc->zsk_flag || misc->chacha_poly)
-		vq_cmd_w3.s.grp = OTX2_CPT_EGRP_SE;
-	else
-		vq_cmd_w3.s.grp = OTX2_CPT_EGRP_SE_IE;
-
-	misc->cpt_inst_w7 = vq_cmd_w3.u64;
-
-	return 0;
-
-priv_put:
-	rte_mempool_put(pool, priv);
-
-	return -ENOTSUP;
-}
-
-static __rte_always_inline int32_t __rte_hot
-otx2_ca_enqueue_req(const struct otx2_cpt_qp *qp,
-		    struct cpt_request_info *req,
-		    void *lmtline,
-		    struct rte_crypto_op *op,
-		    uint64_t cpt_inst_w7)
-{
-	union rte_event_crypto_metadata *m_data;
-	union cpt_inst_s inst;
-	uint64_t lmt_status;
-
-	if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
-		m_data = rte_cryptodev_sym_session_get_user_data(
-						op->sym->session);
-		if (m_data == NULL) {
-			rte_pktmbuf_free(op->sym->m_src);
-			rte_crypto_op_free(op);
-			rte_errno = EINVAL;
-			return -EINVAL;
-		}
-	} else if (op->sess_type == RTE_CRYPTO_OP_SESSIONLESS &&
-		   op->private_data_offset) {
-		m_data = (union rte_event_crypto_metadata *)
-			 ((uint8_t *)op +
-			  op->private_data_offset);
-	} else {
-		return -EINVAL;
-	}
-
-	inst.u[0] = 0;
-	inst.s9x.res_addr = req->comp_baddr;
-	inst.u[2] = 0;
-	inst.u[3] = 0;
-
-	inst.s9x.ei0 = req->ist.ei0;
-	inst.s9x.ei1 = req->ist.ei1;
-	inst.s9x.ei2 = req->ist.ei2;
-	inst.s9x.ei3 = cpt_inst_w7;
-
-	inst.u[2] = (((RTE_EVENT_TYPE_CRYPTODEV << 28) |
-		      m_data->response_info.flow_id) |
-		     ((uint64_t)m_data->response_info.sched_type << 32) |
-		     ((uint64_t)m_data->response_info.queue_id << 34));
-	inst.u[3] = 1 | (((uint64_t)req >> 3) << 3);
-	req->qp = qp;
-
-	do {
-		/* Copy CPT command to LMTLINE */
-		memcpy(lmtline, &inst, sizeof(inst));
-
-		/*
-		 * Make sure compiler does not reorder memcpy and ldeor.
-		 * LMTST transactions are always flushed from the write
-		 * buffer immediately, a DMB is not required to push out
-		 * LMTSTs.
-		 */
-		rte_io_wmb();
-		lmt_status = otx2_lmt_submit(qp->lf_nq_reg);
-	} while (lmt_status == 0);
-
-	return 0;
-}
-
-static __rte_always_inline int32_t __rte_hot
-otx2_cpt_enqueue_req(const struct otx2_cpt_qp *qp,
-		     struct pending_queue *pend_q,
-		     struct cpt_request_info *req,
-		     struct rte_crypto_op *op,
-		     uint64_t cpt_inst_w7,
-		     unsigned int burst_index)
-{
-	void *lmtline = qp->lmtline;
-	union cpt_inst_s inst;
-	uint64_t lmt_status;
-
-	if (qp->ca_enable)
-		return otx2_ca_enqueue_req(qp, req, lmtline, op, cpt_inst_w7);
-
-	inst.u[0] = 0;
-	inst.s9x.res_addr = req->comp_baddr;
-	inst.u[2] = 0;
-	inst.u[3] = 0;
-
-	inst.s9x.ei0 = req->ist.ei0;
-	inst.s9x.ei1 = req->ist.ei1;
-	inst.s9x.ei2 = req->ist.ei2;
-	inst.s9x.ei3 = cpt_inst_w7;
-
-	req->time_out = rte_get_timer_cycles() +
-			DEFAULT_COMMAND_TIMEOUT * rte_get_timer_hz();
-
-	do {
-		/* Copy CPT command to LMTLINE */
-		memcpy(lmtline, &inst, sizeof(inst));
-
-		/*
-		 * Make sure compiler does not reorder memcpy and ldeor.
-		 * LMTST transactions are always flushed from the write
-		 * buffer immediately, a DMB is not required to push out
-		 * LMTSTs.
-		 */
-		rte_io_wmb();
-		lmt_status = otx2_lmt_submit(qp->lf_nq_reg);
-	} while (lmt_status == 0);
-
-	pending_queue_push(pend_q, req, burst_index, OTX2_CPT_DEFAULT_CMD_QLEN);
-
-	return 0;
-}
-
-static __rte_always_inline int32_t __rte_hot
-otx2_cpt_enqueue_asym(struct otx2_cpt_qp *qp,
-		      struct rte_crypto_op *op,
-		      struct pending_queue *pend_q,
-		      unsigned int burst_index)
-{
-	struct cpt_qp_meta_info *minfo = &qp->meta_info;
-	struct rte_crypto_asym_op *asym_op = op->asym;
-	struct asym_op_params params = {0};
-	struct cpt_asym_sess_misc *sess;
-	uintptr_t *cop;
-	void *mdata;
-	int ret;
-
-	if (unlikely(rte_mempool_get(minfo->pool, &mdata) < 0)) {
-		CPT_LOG_ERR("Could not allocate meta buffer for request");
-		return -ENOMEM;
-	}
-
-	sess = get_asym_session_private_data(asym_op->session,
-					     otx2_cryptodev_driver_id);
-
-	/* Store IO address of the mdata to meta_buf */
-	params.meta_buf = rte_mempool_virt2iova(mdata);
-
-	cop = mdata;
-	cop[0] = (uintptr_t)mdata;
-	cop[1] = (uintptr_t)op;
-	cop[2] = cop[3] = 0ULL;
-
-	params.req = RTE_PTR_ADD(cop, 4 * sizeof(uintptr_t));
-	params.req->op = cop;
-
-	/* Adjust meta_buf to point to end of cpt_request_info structure */
-	params.meta_buf += (4 * sizeof(uintptr_t)) +
-			    sizeof(struct cpt_request_info);
-	switch (sess->xfrm_type) {
-	case RTE_CRYPTO_ASYM_XFORM_MODEX:
-		ret = cpt_modex_prep(&params, &sess->mod_ctx);
-		if (unlikely(ret))
-			goto req_fail;
-		break;
-	case RTE_CRYPTO_ASYM_XFORM_RSA:
-		ret = cpt_enqueue_rsa_op(op, &params, sess);
-		if (unlikely(ret))
-			goto req_fail;
-		break;
-	case RTE_CRYPTO_ASYM_XFORM_ECDSA:
-		ret = cpt_enqueue_ecdsa_op(op, &params, sess, otx2_fpm_iova);
-		if (unlikely(ret))
-			goto req_fail;
-		break;
-	case RTE_CRYPTO_ASYM_XFORM_ECPM:
-		ret = cpt_ecpm_prep(&asym_op->ecpm, &params,
-				    sess->ec_ctx.curveid);
-		if (unlikely(ret))
-			goto req_fail;
-		break;
-	default:
-		op->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-		ret = -EINVAL;
-		goto req_fail;
-	}
-
-	ret = otx2_cpt_enqueue_req(qp, pend_q, params.req, op,
-				   sess->cpt_inst_w7, burst_index);
-	if (unlikely(ret)) {
-		CPT_LOG_DP_ERR("Could not enqueue crypto req");
-		goto req_fail;
-	}
-
-	return 0;
-
-req_fail:
-	free_op_meta(mdata, minfo->pool);
-
-	return ret;
-}
-
-static __rte_always_inline int __rte_hot
-otx2_cpt_enqueue_sym(struct otx2_cpt_qp *qp, struct rte_crypto_op *op,
-		     struct pending_queue *pend_q, unsigned int burst_index)
-{
-	struct rte_crypto_sym_op *sym_op = op->sym;
-	struct cpt_request_info *req;
-	struct cpt_sess_misc *sess;
-	uint64_t cpt_op;
-	void *mdata;
-	int ret;
-
-	sess = get_sym_session_private_data(sym_op->session,
-					    otx2_cryptodev_driver_id);
-
-	cpt_op = sess->cpt_op;
-
-	if (cpt_op & CPT_OP_CIPHER_MASK)
-		ret = fill_fc_params(op, sess, &qp->meta_info, &mdata,
-				     (void **)&req);
-	else
-		ret = fill_digest_params(op, sess, &qp->meta_info, &mdata,
-					 (void **)&req);
-
-	if (unlikely(ret)) {
-		CPT_LOG_DP_ERR("Crypto req : op %p, cpt_op 0x%x ret 0x%x",
-				op, (unsigned int)cpt_op, ret);
-		return ret;
-	}
-
-	ret = otx2_cpt_enqueue_req(qp, pend_q, req, op, sess->cpt_inst_w7,
-				    burst_index);
-	if (unlikely(ret)) {
-		/* Free buffer allocated by fill params routines */
-		free_op_meta(mdata, qp->meta_info.pool);
-	}
-
-	return ret;
-}
-
-static __rte_always_inline int __rte_hot
-otx2_cpt_enqueue_sec(struct otx2_cpt_qp *qp, struct rte_crypto_op *op,
-		     struct pending_queue *pend_q,
-		     const unsigned int burst_index)
-{
-	uint32_t winsz, esn_low = 0, esn_hi = 0, seql = 0, seqh = 0;
-	struct rte_mbuf *m_src = op->sym->m_src;
-	struct otx2_sec_session_ipsec_lp *sess;
-	struct otx2_ipsec_po_sa_ctl *ctl_wrd;
-	struct otx2_ipsec_po_in_sa *sa;
-	struct otx2_sec_session *priv;
-	struct cpt_request_info *req;
-	uint64_t seq_in_sa, seq = 0;
-	uint8_t esn;
-	int ret;
-
-	priv = get_sec_session_private_data(op->sym->sec_session);
-	sess = &priv->ipsec.lp;
-	sa = &sess->in_sa;
-
-	ctl_wrd = &sa->ctl;
-	esn = ctl_wrd->esn_en;
-	winsz = sa->replay_win_sz;
-
-	if (ctl_wrd->direction == OTX2_IPSEC_PO_SA_DIRECTION_OUTBOUND)
-		ret = process_outb_sa(op, sess, &qp->meta_info, (void **)&req);
-	else {
-		if (winsz) {
-			esn_low = rte_be_to_cpu_32(sa->esn_low);
-			esn_hi = rte_be_to_cpu_32(sa->esn_hi);
-			seql = *rte_pktmbuf_mtod_offset(m_src, uint32_t *,
-				sizeof(struct rte_ipv4_hdr) + 4);
-			seql = rte_be_to_cpu_32(seql);
-
-			if (!esn)
-				seq = (uint64_t)seql;
-			else {
-				seqh = anti_replay_get_seqh(winsz, seql, esn_hi,
-						esn_low);
-				seq = ((uint64_t)seqh << 32) | seql;
-			}
-
-			if (unlikely(seq == 0))
-				return IPSEC_ANTI_REPLAY_FAILED;
-
-			ret = anti_replay_check(sa->replay, seq, winsz);
-			if (unlikely(ret)) {
-				otx2_err("Anti replay check failed");
-				return IPSEC_ANTI_REPLAY_FAILED;
-			}
-
-			if (esn) {
-				seq_in_sa = ((uint64_t)esn_hi << 32) | esn_low;
-				if (seq > seq_in_sa) {
-					sa->esn_low = rte_cpu_to_be_32(seql);
-					sa->esn_hi = rte_cpu_to_be_32(seqh);
-				}
-			}
-		}
-
-		ret = process_inb_sa(op, sess, &qp->meta_info, (void **)&req);
-	}
-
-	if (unlikely(ret)) {
-		otx2_err("Crypto req : op %p, ret 0x%x", op, ret);
-		return ret;
-	}
-
-	ret = otx2_cpt_enqueue_req(qp, pend_q, req, op, sess->cpt_inst_w7,
-				    burst_index);
-
-	return ret;
-}
-
-static __rte_always_inline int __rte_hot
-otx2_cpt_enqueue_sym_sessless(struct otx2_cpt_qp *qp, struct rte_crypto_op *op,
-			      struct pending_queue *pend_q,
-			      unsigned int burst_index)
-{
-	const int driver_id = otx2_cryptodev_driver_id;
-	struct rte_crypto_sym_op *sym_op = op->sym;
-	struct rte_cryptodev_sym_session *sess;
-	int ret;
-
-	/* Create temporary session */
-	sess = rte_cryptodev_sym_session_create(qp->sess_mp);
-	if (sess == NULL)
-		return -ENOMEM;
-
-	ret = sym_session_configure(driver_id, sym_op->xform, sess,
-				    qp->sess_mp_priv);
-	if (ret)
-		goto sess_put;
-
-	sym_op->session = sess;
-
-	ret = otx2_cpt_enqueue_sym(qp, op, pend_q, burst_index);
-
-	if (unlikely(ret))
-		goto priv_put;
-
-	return 0;
-
-priv_put:
-	sym_session_clear(driver_id, sess);
-sess_put:
-	rte_mempool_put(qp->sess_mp, sess);
-	return ret;
-}
-
-static uint16_t
-otx2_cpt_enqueue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
-{
-	uint16_t nb_allowed, count = 0;
-	struct otx2_cpt_qp *qp = qptr;
-	struct pending_queue *pend_q;
-	struct rte_crypto_op *op;
-	int ret;
-
-	pend_q = &qp->pend_q;
-
-	nb_allowed = pending_queue_free_slots(pend_q,
-				OTX2_CPT_DEFAULT_CMD_QLEN, 0);
-	nb_ops = RTE_MIN(nb_ops, nb_allowed);
-
-	for (count = 0; count < nb_ops; count++) {
-		op = ops[count];
-		if (op->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
-			if (op->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION)
-				ret = otx2_cpt_enqueue_sec(qp, op, pend_q,
-							   count);
-			else if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)
-				ret = otx2_cpt_enqueue_sym(qp, op, pend_q,
-							   count);
-			else
-				ret = otx2_cpt_enqueue_sym_sessless(qp, op,
-						pend_q, count);
-		} else if (op->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
-			if (op->sess_type == RTE_CRYPTO_OP_WITH_SESSION)
-				ret = otx2_cpt_enqueue_asym(qp, op, pend_q,
-								count);
-			else
-				break;
-		} else
-			break;
-
-		if (unlikely(ret))
-			break;
-	}
-
-	if (unlikely(!qp->ca_enable))
-		pending_queue_commit(pend_q, count, OTX2_CPT_DEFAULT_CMD_QLEN);
-
-	return count;
-}
-
-static __rte_always_inline void
-otx2_cpt_asym_rsa_op(struct rte_crypto_op *cop, struct cpt_request_info *req,
-		     struct rte_crypto_rsa_xform *rsa_ctx)
-{
-	struct rte_crypto_rsa_op_param *rsa = &cop->asym->rsa;
-
-	switch (rsa->op_type) {
-	case RTE_CRYPTO_ASYM_OP_ENCRYPT:
-		rsa->cipher.length = rsa_ctx->n.length;
-		memcpy(rsa->cipher.data, req->rptr, rsa->cipher.length);
-		break;
-	case RTE_CRYPTO_ASYM_OP_DECRYPT:
-		if (rsa->pad == RTE_CRYPTO_RSA_PADDING_NONE) {
-			rsa->message.length = rsa_ctx->n.length;
-			memcpy(rsa->message.data, req->rptr,
-			       rsa->message.length);
-		} else {
-			/* Get length of decrypted output */
-			rsa->message.length = rte_cpu_to_be_16
-					     (*((uint16_t *)req->rptr));
-			/*
-			 * Offset output data pointer by length field
-			 * (2 bytes) and copy decrypted data.
-			 */
-			memcpy(rsa->message.data, req->rptr + 2,
-			       rsa->message.length);
-		}
-		break;
-	case RTE_CRYPTO_ASYM_OP_SIGN:
-		rsa->sign.length = rsa_ctx->n.length;
-		memcpy(rsa->sign.data, req->rptr, rsa->sign.length);
-		break;
-	case RTE_CRYPTO_ASYM_OP_VERIFY:
-		if (rsa->pad == RTE_CRYPTO_RSA_PADDING_NONE) {
-			rsa->sign.length = rsa_ctx->n.length;
-			memcpy(rsa->sign.data, req->rptr, rsa->sign.length);
-		} else {
-			/* Get length of signed output */
-			rsa->sign.length = rte_cpu_to_be_16
-					  (*((uint16_t *)req->rptr));
-			/*
-			 * Offset output data pointer by length field
-			 * (2 bytes) and copy signed data.
-			 */
-			memcpy(rsa->sign.data, req->rptr + 2,
-			       rsa->sign.length);
-		}
-		if (memcmp(rsa->sign.data, rsa->message.data,
-			   rsa->message.length)) {
-			CPT_LOG_DP_ERR("RSA verification failed");
-			cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
-		}
-		break;
-	default:
-		CPT_LOG_DP_DEBUG("Invalid RSA operation type");
-		cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-		break;
-	}
-}
-
-static __rte_always_inline void
-otx2_cpt_asym_dequeue_ecdsa_op(struct rte_crypto_ecdsa_op_param *ecdsa,
-			       struct cpt_request_info *req,
-			       struct cpt_asym_ec_ctx *ec)
-{
-	int prime_len = ec_grp[ec->curveid].prime.length;
-
-	if (ecdsa->op_type == RTE_CRYPTO_ASYM_OP_VERIFY)
-		return;
-
-	/* Separate out sign r and s components */
-	memcpy(ecdsa->r.data, req->rptr, prime_len);
-	memcpy(ecdsa->s.data, req->rptr + RTE_ALIGN_CEIL(prime_len, 8),
-	       prime_len);
-	ecdsa->r.length = prime_len;
-	ecdsa->s.length = prime_len;
-}
-
-static __rte_always_inline void
-otx2_cpt_asym_dequeue_ecpm_op(struct rte_crypto_ecpm_op_param *ecpm,
-			     struct cpt_request_info *req,
-			     struct cpt_asym_ec_ctx *ec)
-{
-	int prime_len = ec_grp[ec->curveid].prime.length;
-
-	memcpy(ecpm->r.x.data, req->rptr, prime_len);
-	memcpy(ecpm->r.y.data, req->rptr + RTE_ALIGN_CEIL(prime_len, 8),
-	       prime_len);
-	ecpm->r.x.length = prime_len;
-	ecpm->r.y.length = prime_len;
-}
-
-static void
-otx2_cpt_asym_post_process(struct rte_crypto_op *cop,
-			   struct cpt_request_info *req)
-{
-	struct rte_crypto_asym_op *op = cop->asym;
-	struct cpt_asym_sess_misc *sess;
-
-	sess = get_asym_session_private_data(op->session,
-					     otx2_cryptodev_driver_id);
-
-	switch (sess->xfrm_type) {
-	case RTE_CRYPTO_ASYM_XFORM_RSA:
-		otx2_cpt_asym_rsa_op(cop, req, &sess->rsa_ctx);
-		break;
-	case RTE_CRYPTO_ASYM_XFORM_MODEX:
-		op->modex.result.length = sess->mod_ctx.modulus.length;
-		memcpy(op->modex.result.data, req->rptr,
-		       op->modex.result.length);
-		break;
-	case RTE_CRYPTO_ASYM_XFORM_ECDSA:
-		otx2_cpt_asym_dequeue_ecdsa_op(&op->ecdsa, req, &sess->ec_ctx);
-		break;
-	case RTE_CRYPTO_ASYM_XFORM_ECPM:
-		otx2_cpt_asym_dequeue_ecpm_op(&op->ecpm, req, &sess->ec_ctx);
-		break;
-	default:
-		CPT_LOG_DP_DEBUG("Invalid crypto xform type");
-		cop->status = RTE_CRYPTO_OP_STATUS_INVALID_ARGS;
-		break;
-	}
-}
-
-static void
-otx2_cpt_sec_post_process(struct rte_crypto_op *cop, uintptr_t *rsp)
-{
-	struct cpt_request_info *req = (struct cpt_request_info *)rsp[2];
-	vq_cmd_word0_t *word0 = (vq_cmd_word0_t *)&req->ist.ei0;
-	struct rte_crypto_sym_op *sym_op = cop->sym;
-	struct rte_mbuf *m = sym_op->m_src;
-	struct rte_ipv6_hdr *ip6;
-	struct rte_ipv4_hdr *ip;
-	uint16_t m_len = 0;
-	int mdata_len;
-	char *data;
-
-	mdata_len = (int)rsp[3];
-	rte_pktmbuf_trim(m, mdata_len);
-
-	if (word0->s.opcode.major == OTX2_IPSEC_PO_PROCESS_IPSEC_INB) {
-		data = rte_pktmbuf_mtod(m, char *);
-		ip = (struct rte_ipv4_hdr *)(data +
-			OTX2_IPSEC_PO_INB_RPTR_HDR);
-
-		if ((ip->version_ihl >> 4) == 4) {
-			m_len = rte_be_to_cpu_16(ip->total_length);
-		} else {
-			ip6 = (struct rte_ipv6_hdr *)(data +
-				OTX2_IPSEC_PO_INB_RPTR_HDR);
-			m_len = rte_be_to_cpu_16(ip6->payload_len) +
-				sizeof(struct rte_ipv6_hdr);
-		}
-
-		m->data_len = m_len;
-		m->pkt_len = m_len;
-		m->data_off += OTX2_IPSEC_PO_INB_RPTR_HDR;
-	}
-}
-
-static inline void
-otx2_cpt_dequeue_post_process(struct otx2_cpt_qp *qp, struct rte_crypto_op *cop,
-			      uintptr_t *rsp, uint8_t cc)
-{
-	unsigned int sz;
-
-	if (cop->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
-		if (cop->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) {
-			if (likely(cc == OTX2_IPSEC_PO_CC_SUCCESS)) {
-				otx2_cpt_sec_post_process(cop, rsp);
-				cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
-			} else
-				cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
-
-			return;
-		}
-
-		if (likely(cc == NO_ERR)) {
-			/* Verify authentication data if required */
-			if (unlikely(rsp[2]))
-				compl_auth_verify(cop, (uint8_t *)rsp[2],
-						 rsp[3]);
-			else
-				cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
-		} else {
-			if (cc == ERR_GC_ICV_MISCOMPARE)
-				cop->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
-			else
-				cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
-		}
-
-		if (unlikely(cop->sess_type == RTE_CRYPTO_OP_SESSIONLESS)) {
-			sym_session_clear(otx2_cryptodev_driver_id,
-					  cop->sym->session);
-			sz = rte_cryptodev_sym_get_existing_header_session_size(
-					cop->sym->session);
-			memset(cop->sym->session, 0, sz);
-			rte_mempool_put(qp->sess_mp, cop->sym->session);
-			cop->sym->session = NULL;
-		}
-	}
-
-	if (cop->type == RTE_CRYPTO_OP_TYPE_ASYMMETRIC) {
-		if (likely(cc == NO_ERR)) {
-			cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
-			/*
-			 * Pass cpt_req_info stored in metabuf during
-			 * enqueue.
-			 */
-			rsp = RTE_PTR_ADD(rsp, 4 * sizeof(uintptr_t));
-			otx2_cpt_asym_post_process(cop,
-					(struct cpt_request_info *)rsp);
-		} else
-			cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
-	}
-}
-
-static uint16_t
-otx2_cpt_dequeue_burst(void *qptr, struct rte_crypto_op **ops, uint16_t nb_ops)
-{
-	int i, nb_pending, nb_completed;
-	struct otx2_cpt_qp *qp = qptr;
-	struct pending_queue *pend_q;
-	struct cpt_request_info *req;
-	struct rte_crypto_op *cop;
-	uint8_t cc[nb_ops];
-	uintptr_t *rsp;
-	void *metabuf;
-
-	pend_q = &qp->pend_q;
-
-	nb_pending = pending_queue_level(pend_q, OTX2_CPT_DEFAULT_CMD_QLEN);
-
-	/* Ensure pcount isn't read before data lands */
-	rte_atomic_thread_fence(__ATOMIC_ACQUIRE);
-
-	nb_ops = RTE_MIN(nb_ops, nb_pending);
-
-	for (i = 0; i < nb_ops; i++) {
-		pending_queue_peek(pend_q, (void **)&req,
-			OTX2_CPT_DEFAULT_CMD_QLEN, 0);
-
-		cc[i] = otx2_cpt_compcode_get(req);
-
-		if (unlikely(cc[i] == ERR_REQ_PENDING))
-			break;
-
-		ops[i] = req->op;
-
-		pending_queue_pop(pend_q, OTX2_CPT_DEFAULT_CMD_QLEN);
-	}
-
-	nb_completed = i;
-
-	for (i = 0; i < nb_completed; i++) {
-		rsp = (void *)ops[i];
-
-		metabuf = (void *)rsp[0];
-		cop = (void *)rsp[1];
-
-		ops[i] = cop;
-
-		otx2_cpt_dequeue_post_process(qp, cop, rsp, cc[i]);
-
-		free_op_meta(metabuf, qp->meta_info.pool);
-	}
-
-	return nb_completed;
-}
-
-void
-otx2_cpt_set_enqdeq_fns(struct rte_cryptodev *dev)
-{
-	dev->enqueue_burst = otx2_cpt_enqueue_burst;
-	dev->dequeue_burst = otx2_cpt_dequeue_burst;
-
-	rte_mb();
-}
-
-/* PMD ops */
-
-static int
-otx2_cpt_dev_config(struct rte_cryptodev *dev,
-		    struct rte_cryptodev_config *conf)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	int ret;
-
-	if (conf->nb_queue_pairs > vf->max_queues) {
-		CPT_LOG_ERR("Invalid number of queue pairs requested");
-		return -EINVAL;
-	}
-
-	dev->feature_flags = otx2_cpt_default_ff_get() & ~conf->ff_disable;
-
-	if (dev->feature_flags & RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO) {
-		/* Initialize shared FPM table */
-		ret = cpt_fpm_init(otx2_fpm_iova);
-		if (ret)
-			return ret;
-	}
-
-	/* Unregister error interrupts */
-	if (vf->err_intr_registered)
-		otx2_cpt_err_intr_unregister(dev);
-
-	/* Detach queues */
-	if (vf->nb_queues) {
-		ret = otx2_cpt_queues_detach(dev);
-		if (ret) {
-			CPT_LOG_ERR("Could not detach CPT queues");
-			return ret;
-		}
-	}
-
-	/* Attach queues */
-	ret = otx2_cpt_queues_attach(dev, conf->nb_queue_pairs);
-	if (ret) {
-		CPT_LOG_ERR("Could not attach CPT queues");
-		return -ENODEV;
-	}
-
-	ret = otx2_cpt_msix_offsets_get(dev);
-	if (ret) {
-		CPT_LOG_ERR("Could not get MSI-X offsets");
-		goto queues_detach;
-	}
-
-	/* Register error interrupts */
-	ret = otx2_cpt_err_intr_register(dev);
-	if (ret) {
-		CPT_LOG_ERR("Could not register error interrupts");
-		goto queues_detach;
-	}
-
-	ret = otx2_cpt_inline_init(dev);
-	if (ret) {
-		CPT_LOG_ERR("Could not enable inline IPsec");
-		goto intr_unregister;
-	}
-
-	otx2_cpt_set_enqdeq_fns(dev);
-
-	return 0;
-
-intr_unregister:
-	otx2_cpt_err_intr_unregister(dev);
-queues_detach:
-	otx2_cpt_queues_detach(dev);
-	return ret;
-}
-
-static int
-otx2_cpt_dev_start(struct rte_cryptodev *dev)
-{
-	RTE_SET_USED(dev);
-
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	return 0;
-}
-
-static void
-otx2_cpt_dev_stop(struct rte_cryptodev *dev)
-{
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	if (dev->feature_flags & RTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO)
-		cpt_fpm_clear();
-}
-
-static int
-otx2_cpt_dev_close(struct rte_cryptodev *dev)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-	int i, ret = 0;
-
-	for (i = 0; i < dev->data->nb_queue_pairs; i++) {
-		ret = otx2_cpt_queue_pair_release(dev, i);
-		if (ret)
-			return ret;
-	}
-
-	/* Unregister error interrupts */
-	if (vf->err_intr_registered)
-		otx2_cpt_err_intr_unregister(dev);
-
-	/* Detach queues */
-	if (vf->nb_queues) {
-		ret = otx2_cpt_queues_detach(dev);
-		if (ret)
-			CPT_LOG_ERR("Could not detach CPT queues");
-	}
-
-	return ret;
-}
-
-static void
-otx2_cpt_dev_info_get(struct rte_cryptodev *dev,
-		      struct rte_cryptodev_info *info)
-{
-	struct otx2_cpt_vf *vf = dev->data->dev_private;
-
-	if (info != NULL) {
-		info->max_nb_queue_pairs = vf->max_queues;
-		info->feature_flags = otx2_cpt_default_ff_get();
-		info->capabilities = otx2_cpt_capabilities_get();
-		info->sym.max_nb_sessions = 0;
-		info->driver_id = otx2_cryptodev_driver_id;
-		info->min_mbuf_headroom_req = OTX2_CPT_MIN_HEADROOM_REQ;
-		info->min_mbuf_tailroom_req = OTX2_CPT_MIN_TAILROOM_REQ;
-	}
-}
-
-static int
-otx2_cpt_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
-			  const struct rte_cryptodev_qp_conf *conf,
-			  int socket_id __rte_unused)
-{
-	uint8_t grp_mask = OTX2_CPT_ENG_GRPS_MASK;
-	struct rte_pci_device *pci_dev;
-	struct otx2_cpt_qp *qp;
-
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	if (dev->data->queue_pairs[qp_id] != NULL)
-		otx2_cpt_queue_pair_release(dev, qp_id);
-
-	if (conf->nb_descriptors > OTX2_CPT_DEFAULT_CMD_QLEN) {
-		CPT_LOG_ERR("Could not setup queue pair for %u descriptors",
-			    conf->nb_descriptors);
-		return -EINVAL;
-	}
-
-	pci_dev = RTE_DEV_TO_PCI(dev->device);
-
-	if (pci_dev->mem_resource[2].addr == NULL) {
-		CPT_LOG_ERR("Invalid PCI mem address");
-		return -EIO;
-	}
-
-	qp = otx2_cpt_qp_create(dev, qp_id, grp_mask);
-	if (qp == NULL) {
-		CPT_LOG_ERR("Could not create queue pair %d", qp_id);
-		return -ENOMEM;
-	}
-
-	qp->sess_mp = conf->mp_session;
-	qp->sess_mp_priv = conf->mp_session_private;
-	dev->data->queue_pairs[qp_id] = qp;
-
-	return 0;
-}
-
-static int
-otx2_cpt_queue_pair_release(struct rte_cryptodev *dev, uint16_t qp_id)
-{
-	struct otx2_cpt_qp *qp = dev->data->queue_pairs[qp_id];
-	int ret;
-
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	if (qp == NULL)
-		return -EINVAL;
-
-	CPT_LOG_INFO("Releasing queue pair %d", qp_id);
-
-	ret = otx2_cpt_qp_destroy(dev, qp);
-	if (ret) {
-		CPT_LOG_ERR("Could not destroy queue pair %d", qp_id);
-		return ret;
-	}
-
-	dev->data->queue_pairs[qp_id] = NULL;
-
-	return 0;
-}
-
-static unsigned int
-otx2_cpt_sym_session_get_size(struct rte_cryptodev *dev __rte_unused)
-{
-	return cpt_get_session_size();
-}
-
-static int
-otx2_cpt_sym_session_configure(struct rte_cryptodev *dev,
-			       struct rte_crypto_sym_xform *xform,
-			       struct rte_cryptodev_sym_session *sess,
-			       struct rte_mempool *pool)
-{
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	return sym_session_configure(dev->driver_id, xform, sess, pool);
-}
-
-static void
-otx2_cpt_sym_session_clear(struct rte_cryptodev *dev,
-			   struct rte_cryptodev_sym_session *sess)
-{
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	return sym_session_clear(dev->driver_id, sess);
-}
-
-static unsigned int
-otx2_cpt_asym_session_size_get(struct rte_cryptodev *dev __rte_unused)
-{
-	return sizeof(struct cpt_asym_sess_misc);
-}
-
-static int
-otx2_cpt_asym_session_cfg(struct rte_cryptodev *dev,
-			  struct rte_crypto_asym_xform *xform,
-			  struct rte_cryptodev_asym_session *sess,
-			  struct rte_mempool *pool)
-{
-	struct cpt_asym_sess_misc *priv;
-	vq_cmd_word3_t vq_cmd_w3;
-	int ret;
-
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	if (rte_mempool_get(pool, (void **)&priv)) {
-		CPT_LOG_ERR("Could not allocate session_private_data");
-		return -ENOMEM;
-	}
-
-	memset(priv, 0, sizeof(struct cpt_asym_sess_misc));
-
-	ret = cpt_fill_asym_session_parameters(priv, xform);
-	if (ret) {
-		CPT_LOG_ERR("Could not configure session parameters");
-
-		/* Return session to mempool */
-		rte_mempool_put(pool, priv);
-		return ret;
-	}
-
-	vq_cmd_w3.u64 = 0;
-	vq_cmd_w3.s.grp = OTX2_CPT_EGRP_AE;
-	priv->cpt_inst_w7 = vq_cmd_w3.u64;
-
-	set_asym_session_private_data(sess, dev->driver_id, priv);
-
-	return 0;
-}
-
-static void
-otx2_cpt_asym_session_clear(struct rte_cryptodev *dev,
-			    struct rte_cryptodev_asym_session *sess)
-{
-	struct cpt_asym_sess_misc *priv;
-	struct rte_mempool *sess_mp;
-
-	CPT_PMD_INIT_FUNC_TRACE();
-
-	priv = get_asym_session_private_data(sess, dev->driver_id);
-	if (priv == NULL)
-		return;
-
-	/* Free resources allocated in session_cfg */
-	cpt_free_asym_session_parameters(priv);
-
-	/* Reset and free object back to pool */
-	memset(priv, 0, otx2_cpt_asym_session_size_get(dev));
-	sess_mp = rte_mempool_from_obj(priv);
-	set_asym_session_private_data(sess, dev->driver_id, NULL);
-	rte_mempool_put(sess_mp, priv);
-}
-
-struct rte_cryptodev_ops otx2_cpt_ops = {
-	/* Device control ops */
-	.dev_configure = otx2_cpt_dev_config,
-	.dev_start = otx2_cpt_dev_start,
-	.dev_stop = otx2_cpt_dev_stop,
-	.dev_close = otx2_cpt_dev_close,
-	.dev_infos_get = otx2_cpt_dev_info_get,
-
-	.stats_get = NULL,
-	.stats_reset = NULL,
-	.queue_pair_setup = otx2_cpt_queue_pair_setup,
-	.queue_pair_release = otx2_cpt_queue_pair_release,
-
-	/* Symmetric crypto ops */
-	.sym_session_get_size = otx2_cpt_sym_session_get_size,
-	.sym_session_configure = otx2_cpt_sym_session_configure,
-	.sym_session_clear = otx2_cpt_sym_session_clear,
-
-	/* Asymmetric crypto ops */
-	.asym_session_get_size = otx2_cpt_asym_session_size_get,
-	.asym_session_configure = otx2_cpt_asym_session_cfg,
-	.asym_session_clear = otx2_cpt_asym_session_clear,
-
-};
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
deleted file mode 100644
index 7faf7ad034..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2019 Marvell International Ltd.
- */
-
-#ifndef _OTX2_CRYPTODEV_OPS_H_
-#define _OTX2_CRYPTODEV_OPS_H_
-
-#include <cryptodev_pmd.h>
-
-#define OTX2_CPT_MIN_HEADROOM_REQ	48
-#define OTX2_CPT_MIN_TAILROOM_REQ	208
-
-extern struct rte_cryptodev_ops otx2_cpt_ops;
-
-#endif /* _OTX2_CRYPTODEV_OPS_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h
deleted file mode 100644
index 01c081a216..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#ifndef _OTX2_CRYPTODEV_OPS_HELPER_H_
-#define _OTX2_CRYPTODEV_OPS_HELPER_H_
-
-#include "cpt_pmd_logs.h"
-
-static void
-sym_session_clear(int driver_id, struct rte_cryptodev_sym_session *sess)
-{
-	void *priv = get_sym_session_private_data(sess, driver_id);
-	struct cpt_sess_misc *misc;
-	struct rte_mempool *pool;
-	struct cpt_ctx *ctx;
-
-	if (priv == NULL)
-		return;
-
-	misc = priv;
-	ctx = SESS_PRIV(misc);
-
-	if (ctx->auth_key != NULL)
-		rte_free(ctx->auth_key);
-
-	memset(priv, 0, cpt_get_session_size());
-
-	pool = rte_mempool_from_obj(priv);
-
-	set_sym_session_private_data(sess, driver_id, NULL);
-
-	rte_mempool_put(pool, priv);
-}
-
-static __rte_always_inline uint8_t
-otx2_cpt_compcode_get(struct cpt_request_info *req)
-{
-	volatile struct cpt_res_s_9s *res;
-	uint8_t ret;
-
-	res = (volatile struct cpt_res_s_9s *)req->completion_addr;
-
-	if (unlikely(res->compcode == CPT_9X_COMP_E_NOTDONE)) {
-		if (rte_get_timer_cycles() < req->time_out)
-			return ERR_REQ_PENDING;
-
-		CPT_LOG_DP_ERR("Request timed out");
-		return ERR_REQ_TIMEOUT;
-	}
-
-	if (likely(res->compcode == CPT_9X_COMP_E_GOOD)) {
-		ret = NO_ERR;
-		if (unlikely(res->uc_compcode)) {
-			ret = res->uc_compcode;
-			CPT_LOG_DP_DEBUG("Request failed with microcode error");
-			CPT_LOG_DP_DEBUG("MC completion code 0x%x",
-					 res->uc_compcode);
-		}
-	} else {
-		CPT_LOG_DP_DEBUG("HW completion code 0x%x", res->compcode);
-
-		ret = res->compcode;
-		switch (res->compcode) {
-		case CPT_9X_COMP_E_INSTERR:
-			CPT_LOG_DP_ERR("Request failed with instruction error");
-			break;
-		case CPT_9X_COMP_E_FAULT:
-			CPT_LOG_DP_ERR("Request failed with DMA fault");
-			break;
-		case CPT_9X_COMP_E_HWERR:
-			CPT_LOG_DP_ERR("Request failed with hardware error");
-			break;
-		default:
-			CPT_LOG_DP_ERR("Request failed with unknown completion code");
-		}
-	}
-
-	return ret;
-}
-
-#endif /* _OTX2_CRYPTODEV_OPS_HELPER_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h b/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
deleted file mode 100644
index 95bce3621a..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_qp.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020-2021 Marvell.
- */
-
-#ifndef _OTX2_CRYPTODEV_QP_H_
-#define _OTX2_CRYPTODEV_QP_H_
-
-#include <rte_common.h>
-#include <rte_eventdev.h>
-#include <rte_mempool.h>
-#include <rte_spinlock.h>
-
-#include "cpt_common.h"
-
-struct otx2_cpt_qp {
-	uint32_t id;
-	/**< Queue pair id */
-	uint8_t blkaddr;
-	/**<  CPT0/1 BLKADDR of LF */
-	uintptr_t base;
-	/**< Base address where BAR is mapped */
-	void *lmtline;
-	/**< Address of LMTLINE */
-	rte_iova_t lf_nq_reg;
-	/**< LF enqueue register address */
-	struct pending_queue pend_q;
-	/**< Pending queue */
-	struct rte_mempool *sess_mp;
-	/**< Session mempool */
-	struct rte_mempool *sess_mp_priv;
-	/**< Session private data mempool */
-	struct cpt_qp_meta_info meta_info;
-	/**< Metabuf info required to support operations on the queue pair */
-	rte_iova_t iq_dma_addr;
-	/**< Instruction queue address */
-	struct rte_event ev;
-	/**< Event information required for binding cryptodev queue to
-	 * eventdev queue. Used by crypto adapter.
-	 */
-	uint8_t ca_enable;
-	/**< Set when queue pair is added to crypto adapter */
-	uint8_t qp_ev_bind;
-	/**< Set when queue pair is bound to event queue */
-};
-
-#endif /* _OTX2_CRYPTODEV_QP_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c b/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
deleted file mode 100644
index 9a4f84f8d8..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#include <rte_cryptodev.h>
-#include <rte_esp.h>
-#include <rte_ethdev.h>
-#include <rte_ip.h>
-#include <rte_malloc.h>
-#include <rte_security.h>
-#include <rte_security_driver.h>
-#include <rte_udp.h>
-
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_capabilities.h"
-#include "otx2_cryptodev_hw_access.h"
-#include "otx2_cryptodev_ops.h"
-#include "otx2_cryptodev_sec.h"
-#include "otx2_security.h"
-
-static int
-ipsec_lp_len_precalc(struct rte_security_ipsec_xform *ipsec,
-		struct rte_crypto_sym_xform *xform,
-		struct otx2_sec_session_ipsec_lp *lp)
-{
-	struct rte_crypto_sym_xform *cipher_xform, *auth_xform;
-
-	lp->partial_len = 0;
-	if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL) {
-		if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV4)
-			lp->partial_len = sizeof(struct rte_ipv4_hdr);
-		else if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV6)
-			lp->partial_len = sizeof(struct rte_ipv6_hdr);
-		else
-			return -EINVAL;
-	}
-
-	if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_ESP) {
-		lp->partial_len += sizeof(struct rte_esp_hdr);
-		lp->roundup_len = sizeof(struct rte_esp_tail);
-	} else if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_AH) {
-		lp->partial_len += OTX2_SEC_AH_HDR_LEN;
-	} else {
-		return -EINVAL;
-	}
-
-	if (ipsec->options.udp_encap)
-		lp->partial_len += sizeof(struct rte_udp_hdr);
-
-	if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		if (xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM) {
-			lp->partial_len += OTX2_SEC_AES_GCM_IV_LEN;
-			lp->partial_len += OTX2_SEC_AES_GCM_MAC_LEN;
-			lp->roundup_byte = OTX2_SEC_AES_GCM_ROUNDUP_BYTE_LEN;
-			return 0;
-		} else {
-			return -EINVAL;
-		}
-	}
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {
-		cipher_xform = xform;
-		auth_xform = xform->next;
-	} else if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
-		auth_xform = xform;
-		cipher_xform = xform->next;
-	} else {
-		return -EINVAL;
-	}
-
-	if (cipher_xform->cipher.algo == RTE_CRYPTO_CIPHER_AES_CBC) {
-		lp->partial_len += OTX2_SEC_AES_CBC_IV_LEN;
-		lp->roundup_byte = OTX2_SEC_AES_CBC_ROUNDUP_BYTE_LEN;
-	} else {
-		return -EINVAL;
-	}
-
-	if (auth_xform->auth.algo == RTE_CRYPTO_AUTH_SHA1_HMAC)
-		lp->partial_len += OTX2_SEC_SHA1_HMAC_LEN;
-	else if (auth_xform->auth.algo == RTE_CRYPTO_AUTH_SHA256_HMAC)
-		lp->partial_len += OTX2_SEC_SHA2_HMAC_LEN;
-	else
-		return -EINVAL;
-
-	return 0;
-}
-
-static int
-otx2_cpt_enq_sa_write(struct otx2_sec_session_ipsec_lp *lp,
-		      struct otx2_cpt_qp *qptr, uint8_t opcode)
-{
-	uint64_t lmt_status, time_out;
-	void *lmtline = qptr->lmtline;
-	struct otx2_cpt_inst_s inst;
-	struct otx2_cpt_res *res;
-	uint64_t *mdata;
-	int ret = 0;
-
-	if (unlikely(rte_mempool_get(qptr->meta_info.pool,
-				     (void **)&mdata) < 0))
-		return -ENOMEM;
-
-	res = (struct otx2_cpt_res *)RTE_PTR_ALIGN(mdata, 16);
-	res->compcode = CPT_9X_COMP_E_NOTDONE;
-
-	inst.opcode = opcode | (lp->ctx_len << 8);
-	inst.param1 = 0;
-	inst.param2 = 0;
-	inst.dlen = lp->ctx_len << 3;
-	inst.dptr = rte_mempool_virt2iova(lp);
-	inst.rptr = 0;
-	inst.cptr = rte_mempool_virt2iova(lp);
-	inst.egrp  = OTX2_CPT_EGRP_SE;
-
-	inst.u64[0] = 0;
-	inst.u64[2] = 0;
-	inst.u64[3] = 0;
-	inst.res_addr = rte_mempool_virt2iova(res);
-
-	rte_io_wmb();
-
-	do {
-		/* Copy CPT command to LMTLINE */
-		otx2_lmt_mov(lmtline, &inst, 2);
-		lmt_status = otx2_lmt_submit(qptr->lf_nq_reg);
-	} while (lmt_status == 0);
-
-	time_out = rte_get_timer_cycles() +
-			DEFAULT_COMMAND_TIMEOUT * rte_get_timer_hz();
-
-	while (res->compcode == CPT_9X_COMP_E_NOTDONE) {
-		if (rte_get_timer_cycles() > time_out) {
-			rte_mempool_put(qptr->meta_info.pool, mdata);
-			otx2_err("Request timed out");
-			return -ETIMEDOUT;
-		}
-	    rte_io_rmb();
-	}
-
-	if (unlikely(res->compcode != CPT_9X_COMP_E_GOOD)) {
-		ret = res->compcode;
-		switch (ret) {
-		case CPT_9X_COMP_E_INSTERR:
-			otx2_err("Request failed with instruction error");
-			break;
-		case CPT_9X_COMP_E_FAULT:
-			otx2_err("Request failed with DMA fault");
-			break;
-		case CPT_9X_COMP_E_HWERR:
-			otx2_err("Request failed with hardware error");
-			break;
-		default:
-			otx2_err("Request failed with unknown hardware "
-				 "completion code : 0x%x", ret);
-		}
-		goto mempool_put;
-	}
-
-	if (unlikely(res->uc_compcode != OTX2_IPSEC_PO_CC_SUCCESS)) {
-		ret = res->uc_compcode;
-		switch (ret) {
-		case OTX2_IPSEC_PO_CC_AUTH_UNSUPPORTED:
-			otx2_err("Invalid auth type");
-			break;
-		case OTX2_IPSEC_PO_CC_ENCRYPT_UNSUPPORTED:
-			otx2_err("Invalid encrypt type");
-			break;
-		default:
-			otx2_err("Request failed with unknown microcode "
-				 "completion code : 0x%x", ret);
-		}
-	}
-
-mempool_put:
-	rte_mempool_put(qptr->meta_info.pool, mdata);
-	return ret;
-}
-
-static void
-set_session_misc_attributes(struct otx2_sec_session_ipsec_lp *sess,
-			    struct rte_crypto_sym_xform *crypto_xform,
-			    struct rte_crypto_sym_xform *auth_xform,
-			    struct rte_crypto_sym_xform *cipher_xform)
-{
-	if (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		sess->iv_offset = crypto_xform->aead.iv.offset;
-		sess->iv_length = crypto_xform->aead.iv.length;
-		sess->aad_length = crypto_xform->aead.aad_length;
-		sess->mac_len = crypto_xform->aead.digest_length;
-	} else {
-		sess->iv_offset = cipher_xform->cipher.iv.offset;
-		sess->iv_length = cipher_xform->cipher.iv.length;
-		sess->auth_iv_offset = auth_xform->auth.iv.offset;
-		sess->auth_iv_length = auth_xform->auth.iv.length;
-		sess->mac_len = auth_xform->auth.digest_length;
-	}
-}
-
-static int
-crypto_sec_ipsec_outb_session_create(struct rte_cryptodev *crypto_dev,
-				     struct rte_security_ipsec_xform *ipsec,
-				     struct rte_crypto_sym_xform *crypto_xform,
-				     struct rte_security_session *sec_sess)
-{
-	struct rte_crypto_sym_xform *auth_xform, *cipher_xform;
-	struct otx2_ipsec_po_ip_template *template = NULL;
-	const uint8_t *cipher_key, *auth_key;
-	struct otx2_sec_session_ipsec_lp *lp;
-	struct otx2_ipsec_po_sa_ctl *ctl;
-	int cipher_key_len, auth_key_len;
-	struct otx2_ipsec_po_out_sa *sa;
-	struct otx2_sec_session *sess;
-	struct otx2_cpt_inst_s inst;
-	struct rte_ipv6_hdr *ip6;
-	struct rte_ipv4_hdr *ip;
-	int ret, ctx_len;
-
-	sess = get_sec_session_private_data(sec_sess);
-	sess->ipsec.dir = RTE_SECURITY_IPSEC_SA_DIR_EGRESS;
-	lp = &sess->ipsec.lp;
-
-	sa = &lp->out_sa;
-	ctl = &sa->ctl;
-	if (ctl->valid) {
-		otx2_err("SA already registered");
-		return -EINVAL;
-	}
-
-	memset(sa, 0, sizeof(struct otx2_ipsec_po_out_sa));
-
-	/* Initialize lookaside ipsec private data */
-	lp->ip_id = 0;
-	lp->seq_lo = 1;
-	lp->seq_hi = 0;
-
-	ret = ipsec_po_sa_ctl_set(ipsec, crypto_xform, ctl);
-	if (ret)
-		return ret;
-
-	ret = ipsec_lp_len_precalc(ipsec, crypto_xform, lp);
-	if (ret)
-		return ret;
-
-	/* Start ip id from 1 */
-	lp->ip_id = 1;
-
-	if (ctl->enc_type == OTX2_IPSEC_PO_SA_ENC_AES_GCM) {
-		template = &sa->aes_gcm.template;
-		ctx_len = offsetof(struct otx2_ipsec_po_out_sa,
-				aes_gcm.template) + sizeof(
-				sa->aes_gcm.template.ip4);
-		ctx_len = RTE_ALIGN_CEIL(ctx_len, 8);
-		lp->ctx_len = ctx_len >> 3;
-	} else if (ctl->auth_type ==
-			OTX2_IPSEC_PO_SA_AUTH_SHA1) {
-		template = &sa->sha1.template;
-		ctx_len = offsetof(struct otx2_ipsec_po_out_sa,
-				sha1.template) + sizeof(
-				sa->sha1.template.ip4);
-		ctx_len = RTE_ALIGN_CEIL(ctx_len, 8);
-		lp->ctx_len = ctx_len >> 3;
-	} else if (ctl->auth_type ==
-			OTX2_IPSEC_PO_SA_AUTH_SHA2_256) {
-		template = &sa->sha2.template;
-		ctx_len = offsetof(struct otx2_ipsec_po_out_sa,
-				sha2.template) + sizeof(
-				sa->sha2.template.ip4);
-		ctx_len = RTE_ALIGN_CEIL(ctx_len, 8);
-		lp->ctx_len = ctx_len >> 3;
-	} else {
-		return -EINVAL;
-	}
-	ip = &template->ip4.ipv4_hdr;
-	if (ipsec->options.udp_encap) {
-		ip->next_proto_id = IPPROTO_UDP;
-		template->ip4.udp_src = rte_be_to_cpu_16(4500);
-		template->ip4.udp_dst = rte_be_to_cpu_16(4500);
-	} else {
-		ip->next_proto_id = IPPROTO_ESP;
-	}
-
-	if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL) {
-		if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV4) {
-			ip->version_ihl = RTE_IPV4_VHL_DEF;
-			ip->time_to_live = ipsec->tunnel.ipv4.ttl;
-			ip->type_of_service |= (ipsec->tunnel.ipv4.dscp << 2);
-			if (ipsec->tunnel.ipv4.df)
-				ip->fragment_offset = BIT(14);
-			memcpy(&ip->src_addr, &ipsec->tunnel.ipv4.src_ip,
-				sizeof(struct in_addr));
-			memcpy(&ip->dst_addr, &ipsec->tunnel.ipv4.dst_ip,
-				sizeof(struct in_addr));
-		} else if (ipsec->tunnel.type ==
-				RTE_SECURITY_IPSEC_TUNNEL_IPV6) {
-
-			if (ctl->enc_type == OTX2_IPSEC_PO_SA_ENC_AES_GCM) {
-				template = &sa->aes_gcm.template;
-				ctx_len = offsetof(struct otx2_ipsec_po_out_sa,
-						aes_gcm.template) + sizeof(
-						sa->aes_gcm.template.ip6);
-				ctx_len = RTE_ALIGN_CEIL(ctx_len, 8);
-				lp->ctx_len = ctx_len >> 3;
-			} else if (ctl->auth_type ==
-					OTX2_IPSEC_PO_SA_AUTH_SHA1) {
-				template = &sa->sha1.template;
-				ctx_len = offsetof(struct otx2_ipsec_po_out_sa,
-						sha1.template) + sizeof(
-						sa->sha1.template.ip6);
-				ctx_len = RTE_ALIGN_CEIL(ctx_len, 8);
-				lp->ctx_len = ctx_len >> 3;
-			} else if (ctl->auth_type ==
-					OTX2_IPSEC_PO_SA_AUTH_SHA2_256) {
-				template = &sa->sha2.template;
-				ctx_len = offsetof(struct otx2_ipsec_po_out_sa,
-						sha2.template) + sizeof(
-						sa->sha2.template.ip6);
-				ctx_len = RTE_ALIGN_CEIL(ctx_len, 8);
-				lp->ctx_len = ctx_len >> 3;
-			} else {
-				return -EINVAL;
-			}
-
-			ip6 = &template->ip6.ipv6_hdr;
-			if (ipsec->options.udp_encap) {
-				ip6->proto = IPPROTO_UDP;
-				template->ip6.udp_src = rte_be_to_cpu_16(4500);
-				template->ip6.udp_dst = rte_be_to_cpu_16(4500);
-			} else {
-				ip6->proto = (ipsec->proto ==
-					RTE_SECURITY_IPSEC_SA_PROTO_ESP) ?
-					IPPROTO_ESP : IPPROTO_AH;
-			}
-			ip6->vtc_flow = rte_cpu_to_be_32(0x60000000 |
-				((ipsec->tunnel.ipv6.dscp <<
-					RTE_IPV6_HDR_TC_SHIFT) &
-					RTE_IPV6_HDR_TC_MASK) |
-				((ipsec->tunnel.ipv6.flabel <<
-					RTE_IPV6_HDR_FL_SHIFT) &
-					RTE_IPV6_HDR_FL_MASK));
-			ip6->hop_limits = ipsec->tunnel.ipv6.hlimit;
-			memcpy(&ip6->src_addr, &ipsec->tunnel.ipv6.src_addr,
-				sizeof(struct in6_addr));
-			memcpy(&ip6->dst_addr, &ipsec->tunnel.ipv6.dst_addr,
-				sizeof(struct in6_addr));
-		}
-	}
-
-	cipher_xform = crypto_xform;
-	auth_xform = crypto_xform->next;
-
-	cipher_key_len = 0;
-	auth_key_len = 0;
-
-	if (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		if (crypto_xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM)
-			memcpy(sa->iv.gcm.nonce, &ipsec->salt, 4);
-		cipher_key = crypto_xform->aead.key.data;
-		cipher_key_len = crypto_xform->aead.key.length;
-	} else {
-		cipher_key = cipher_xform->cipher.key.data;
-		cipher_key_len = cipher_xform->cipher.key.length;
-		auth_key = auth_xform->auth.key.data;
-		auth_key_len = auth_xform->auth.key.length;
-
-		if (auth_xform->auth.algo == RTE_CRYPTO_AUTH_SHA1_HMAC)
-			memcpy(sa->sha1.hmac_key, auth_key, auth_key_len);
-		else if (auth_xform->auth.algo == RTE_CRYPTO_AUTH_SHA256_HMAC)
-			memcpy(sa->sha2.hmac_key, auth_key, auth_key_len);
-	}
-
-	if (cipher_key_len != 0)
-		memcpy(sa->cipher_key, cipher_key, cipher_key_len);
-	else
-		return -EINVAL;
-
-	inst.u64[7] = 0;
-	inst.egrp = OTX2_CPT_EGRP_SE;
-	inst.cptr = rte_mempool_virt2iova(sa);
-
-	lp->cpt_inst_w7 = inst.u64[7];
-	lp->ucmd_opcode = (lp->ctx_len << 8) |
-				(OTX2_IPSEC_PO_PROCESS_IPSEC_OUTB);
-
-	/* Set per packet IV and IKEv2 bits */
-	lp->ucmd_param1 = BIT(11) | BIT(9);
-	lp->ucmd_param2 = 0;
-
-	set_session_misc_attributes(lp, crypto_xform,
-				    auth_xform, cipher_xform);
-
-	return otx2_cpt_enq_sa_write(lp, crypto_dev->data->queue_pairs[0],
-				     OTX2_IPSEC_PO_WRITE_IPSEC_OUTB);
-}
-
-static int
-crypto_sec_ipsec_inb_session_create(struct rte_cryptodev *crypto_dev,
-				    struct rte_security_ipsec_xform *ipsec,
-				    struct rte_crypto_sym_xform *crypto_xform,
-				    struct rte_security_session *sec_sess)
-{
-	struct rte_crypto_sym_xform *auth_xform, *cipher_xform;
-	const uint8_t *cipher_key, *auth_key;
-	struct otx2_sec_session_ipsec_lp *lp;
-	struct otx2_ipsec_po_sa_ctl *ctl;
-	int cipher_key_len, auth_key_len;
-	struct otx2_ipsec_po_in_sa *sa;
-	struct otx2_sec_session *sess;
-	struct otx2_cpt_inst_s inst;
-	int ret;
-
-	sess = get_sec_session_private_data(sec_sess);
-	sess->ipsec.dir = RTE_SECURITY_IPSEC_SA_DIR_INGRESS;
-	lp = &sess->ipsec.lp;
-
-	sa = &lp->in_sa;
-	ctl = &sa->ctl;
-
-	if (ctl->valid) {
-		otx2_err("SA already registered");
-		return -EINVAL;
-	}
-
-	memset(sa, 0, sizeof(struct otx2_ipsec_po_in_sa));
-	sa->replay_win_sz = ipsec->replay_win_sz;
-
-	ret = ipsec_po_sa_ctl_set(ipsec, crypto_xform, ctl);
-	if (ret)
-		return ret;
-
-	auth_xform = crypto_xform;
-	cipher_xform = crypto_xform->next;
-
-	cipher_key_len = 0;
-	auth_key_len = 0;
-
-	if (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		if (crypto_xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM)
-			memcpy(sa->iv.gcm.nonce, &ipsec->salt, 4);
-		cipher_key = crypto_xform->aead.key.data;
-		cipher_key_len = crypto_xform->aead.key.length;
-
-		lp->ctx_len = offsetof(struct otx2_ipsec_po_in_sa,
-					    aes_gcm.hmac_key[0]) >> 3;
-		RTE_ASSERT(lp->ctx_len == OTX2_IPSEC_PO_AES_GCM_INB_CTX_LEN);
-	} else {
-		cipher_key = cipher_xform->cipher.key.data;
-		cipher_key_len = cipher_xform->cipher.key.length;
-		auth_key = auth_xform->auth.key.data;
-		auth_key_len = auth_xform->auth.key.length;
-
-		if (auth_xform->auth.algo == RTE_CRYPTO_AUTH_SHA1_HMAC) {
-			memcpy(sa->aes_gcm.hmac_key, auth_key, auth_key_len);
-			lp->ctx_len = offsetof(struct otx2_ipsec_po_in_sa,
-						    aes_gcm.selector) >> 3;
-		} else if (auth_xform->auth.algo ==
-				RTE_CRYPTO_AUTH_SHA256_HMAC) {
-			memcpy(sa->sha2.hmac_key, auth_key, auth_key_len);
-			lp->ctx_len = offsetof(struct otx2_ipsec_po_in_sa,
-						    sha2.selector) >> 3;
-		}
-	}
-
-	if (cipher_key_len != 0)
-		memcpy(sa->cipher_key, cipher_key, cipher_key_len);
-	else
-		return -EINVAL;
-
-	inst.u64[7] = 0;
-	inst.egrp = OTX2_CPT_EGRP_SE;
-	inst.cptr = rte_mempool_virt2iova(sa);
-
-	lp->cpt_inst_w7 = inst.u64[7];
-	lp->ucmd_opcode = (lp->ctx_len << 8) |
-				(OTX2_IPSEC_PO_PROCESS_IPSEC_INB);
-	lp->ucmd_param1 = 0;
-
-	/* Set IKEv2 bit */
-	lp->ucmd_param2 = BIT(12);
-
-	set_session_misc_attributes(lp, crypto_xform,
-				    auth_xform, cipher_xform);
-
-	if (sa->replay_win_sz) {
-		if (sa->replay_win_sz > OTX2_IPSEC_MAX_REPLAY_WIN_SZ) {
-			otx2_err("Replay window size is not supported");
-			return -ENOTSUP;
-		}
-		sa->replay = rte_zmalloc(NULL, sizeof(struct otx2_ipsec_replay),
-				0);
-		if (sa->replay == NULL)
-			return -ENOMEM;
-
-		/* Set window bottom to 1, base and top to size of window */
-		sa->replay->winb = 1;
-		sa->replay->wint = sa->replay_win_sz;
-		sa->replay->base = sa->replay_win_sz;
-		sa->esn_low = 0;
-		sa->esn_hi = 0;
-	}
-
-	return otx2_cpt_enq_sa_write(lp, crypto_dev->data->queue_pairs[0],
-				     OTX2_IPSEC_PO_WRITE_IPSEC_INB);
-}
-
-static int
-crypto_sec_ipsec_session_create(struct rte_cryptodev *crypto_dev,
-				struct rte_security_ipsec_xform *ipsec,
-				struct rte_crypto_sym_xform *crypto_xform,
-				struct rte_security_session *sess)
-{
-	int ret;
-
-	if (crypto_dev->data->queue_pairs[0] == NULL) {
-		otx2_err("Setup cpt queue pair before creating sec session");
-		return -EPERM;
-	}
-
-	ret = ipsec_po_xform_verify(ipsec, crypto_xform);
-	if (ret)
-		return ret;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS)
-		return crypto_sec_ipsec_inb_session_create(crypto_dev, ipsec,
-							   crypto_xform, sess);
-	else
-		return crypto_sec_ipsec_outb_session_create(crypto_dev, ipsec,
-							    crypto_xform, sess);
-}
-
-static int
-otx2_crypto_sec_session_create(void *device,
-			       struct rte_security_session_conf *conf,
-			       struct rte_security_session *sess,
-			       struct rte_mempool *mempool)
-{
-	struct otx2_sec_session *priv;
-	int ret;
-
-	if (conf->action_type != RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL)
-		return -ENOTSUP;
-
-	if (rte_security_dynfield_register() < 0)
-		return -rte_errno;
-
-	if (rte_mempool_get(mempool, (void **)&priv)) {
-		otx2_err("Could not allocate security session private data");
-		return -ENOMEM;
-	}
-
-	set_sec_session_private_data(sess, priv);
-
-	priv->userdata = conf->userdata;
-
-	if (conf->protocol == RTE_SECURITY_PROTOCOL_IPSEC)
-		ret = crypto_sec_ipsec_session_create(device, &conf->ipsec,
-						      conf->crypto_xform,
-						      sess);
-	else
-		ret = -ENOTSUP;
-
-	if (ret)
-		goto mempool_put;
-
-	return 0;
-
-mempool_put:
-	rte_mempool_put(mempool, priv);
-	set_sec_session_private_data(sess, NULL);
-	return ret;
-}
-
-static int
-otx2_crypto_sec_session_destroy(void *device __rte_unused,
-				struct rte_security_session *sess)
-{
-	struct otx2_sec_session *priv;
-	struct rte_mempool *sess_mp;
-
-	priv = get_sec_session_private_data(sess);
-
-	if (priv == NULL)
-		return 0;
-
-	sess_mp = rte_mempool_from_obj(priv);
-
-	memset(priv, 0, sizeof(*priv));
-
-	set_sec_session_private_data(sess, NULL);
-	rte_mempool_put(sess_mp, priv);
-
-	return 0;
-}
-
-static unsigned int
-otx2_crypto_sec_session_get_size(void *device __rte_unused)
-{
-	return sizeof(struct otx2_sec_session);
-}
-
-static int
-otx2_crypto_sec_set_pkt_mdata(void *device __rte_unused,
-			      struct rte_security_session *session,
-			      struct rte_mbuf *m, void *params __rte_unused)
-{
-	/* Set security session as the pkt metadata */
-	*rte_security_dynfield(m) = (rte_security_dynfield_t)session;
-
-	return 0;
-}
-
-static int
-otx2_crypto_sec_get_userdata(void *device __rte_unused, uint64_t md,
-			     void **userdata)
-{
-	/* Retrieve userdata  */
-	*userdata = (void *)md;
-
-	return 0;
-}
-
-static struct rte_security_ops otx2_crypto_sec_ops = {
-	.session_create		= otx2_crypto_sec_session_create,
-	.session_destroy	= otx2_crypto_sec_session_destroy,
-	.session_get_size	= otx2_crypto_sec_session_get_size,
-	.set_pkt_metadata	= otx2_crypto_sec_set_pkt_mdata,
-	.get_userdata		= otx2_crypto_sec_get_userdata,
-	.capabilities_get	= otx2_crypto_sec_capabilities_get
-};
-
-int
-otx2_crypto_sec_ctx_create(struct rte_cryptodev *cdev)
-{
-	struct rte_security_ctx *ctx;
-
-	ctx = rte_malloc("otx2_cpt_dev_sec_ctx",
-			 sizeof(struct rte_security_ctx), 0);
-
-	if (ctx == NULL)
-		return -ENOMEM;
-
-	/* Populate ctx */
-	ctx->device = cdev;
-	ctx->ops = &otx2_crypto_sec_ops;
-	ctx->sess_cnt = 0;
-
-	cdev->security_ctx = ctx;
-
-	return 0;
-}
-
-void
-otx2_crypto_sec_ctx_destroy(struct rte_cryptodev *cdev)
-{
-	rte_free(cdev->security_ctx);
-}
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_sec.h b/drivers/crypto/octeontx2/otx2_cryptodev_sec.h
deleted file mode 100644
index ff3329c9c1..0000000000
--- a/drivers/crypto/octeontx2/otx2_cryptodev_sec.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_CRYPTODEV_SEC_H__
-#define __OTX2_CRYPTODEV_SEC_H__
-
-#include <rte_cryptodev.h>
-
-#include "otx2_ipsec_po.h"
-
-struct otx2_sec_session_ipsec_lp {
-	RTE_STD_C11
-	union {
-		/* Inbound SA */
-		struct otx2_ipsec_po_in_sa in_sa;
-		/* Outbound SA */
-		struct otx2_ipsec_po_out_sa out_sa;
-	};
-
-	uint64_t cpt_inst_w7;
-	union {
-		uint64_t ucmd_w0;
-		struct {
-			uint16_t ucmd_dlen;
-			uint16_t ucmd_param2;
-			uint16_t ucmd_param1;
-			uint16_t ucmd_opcode;
-		};
-	};
-
-	uint8_t partial_len;
-	uint8_t roundup_len;
-	uint8_t roundup_byte;
-	uint16_t ip_id;
-	union {
-		uint64_t esn;
-		struct {
-			uint32_t seq_lo;
-			uint32_t seq_hi;
-		};
-	};
-
-	/** Context length in 8-byte words */
-	size_t ctx_len;
-	/** Auth IV offset in bytes */
-	uint16_t auth_iv_offset;
-	/** IV offset in bytes */
-	uint16_t iv_offset;
-	/** AAD length */
-	uint16_t aad_length;
-	/** MAC len in bytes */
-	uint8_t mac_len;
-	/** IV length in bytes */
-	uint8_t iv_length;
-	/** Auth IV length in bytes */
-	uint8_t auth_iv_length;
-};
-
-int otx2_crypto_sec_ctx_create(struct rte_cryptodev *crypto_dev);
-
-void otx2_crypto_sec_ctx_destroy(struct rte_cryptodev *crypto_dev);
-
-#endif /* __OTX2_CRYPTODEV_SEC_H__ */
diff --git a/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h b/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h
deleted file mode 100644
index 089a3d073a..0000000000
--- a/drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_IPSEC_ANTI_REPLAY_H__
-#define __OTX2_IPSEC_ANTI_REPLAY_H__
-
-#include <rte_mbuf.h>
-
-#include "otx2_ipsec_fp.h"
-
-#define WORD_SHIFT	6
-#define WORD_SIZE	(1 << WORD_SHIFT)
-#define WORD_MASK	(WORD_SIZE - 1)
-
-#define IPSEC_ANTI_REPLAY_FAILED	(-1)
-
-static inline int
-anti_replay_check(struct otx2_ipsec_replay *replay, uint64_t seq,
-			uint64_t winsz)
-{
-	uint64_t *window = &replay->window[0];
-	uint64_t ex_winsz = winsz + WORD_SIZE;
-	uint64_t winwords = ex_winsz >> WORD_SHIFT;
-	uint64_t base = replay->base;
-	uint32_t winb = replay->winb;
-	uint32_t wint = replay->wint;
-	uint64_t seqword, shiftwords;
-	uint64_t bit_pos;
-	uint64_t shift;
-	uint64_t *wptr;
-	uint64_t tmp;
-
-	if (winsz > 64)
-		goto slow_shift;
-	/* Check if the seq is the biggest one yet */
-	if (likely(seq > base)) {
-		shift = seq - base;
-		if (shift < winsz) {  /* In window */
-			/*
-			 * If more than 64-bit anti-replay window,
-			 * use slow shift routine
-			 */
-			wptr = window + (shift >> WORD_SHIFT);
-			*wptr <<= shift;
-			*wptr |= 1ull;
-		} else {
-			/* No special handling of window size > 64 */
-			wptr = window + ((winsz - 1) >> WORD_SHIFT);
-			/*
-			 * Zero out the whole window (especially for
-			 * bigger than 64b window) till the last 64b word
-			 * as the incoming sequence number minus
-			 * base sequence is more than the window size.
-			 */
-			while (window != wptr)
-				*window++ = 0ull;
-			/*
-			 * Set the last bit (of the window) to 1
-			 * as that corresponds to the base sequence number.
-			 * Now any incoming sequence number which is
-			 * (base - window size - 1) will pass anti-replay check
-			 */
-			*wptr = 1ull;
-		}
-		/*
-		 * Set the base to incoming sequence number as
-		 * that is the biggest sequence number seen yet
-		 */
-		replay->base = seq;
-		return 0;
-	}
-
-	bit_pos = base - seq;
-
-	/* If seq falls behind the window, return failure */
-	if (bit_pos >= winsz)
-		return IPSEC_ANTI_REPLAY_FAILED;
-
-	/* seq is within anti-replay window */
-	wptr = window + ((winsz - bit_pos - 1) >> WORD_SHIFT);
-	bit_pos &= WORD_MASK;
-
-	/* Check if this is a replayed packet */
-	if (*wptr & ((1ull) << bit_pos))
-		return IPSEC_ANTI_REPLAY_FAILED;
-
-	/* mark as seen */
-	*wptr |= ((1ull) << bit_pos);
-	return 0;
-
-slow_shift:
-	if (likely(seq > base)) {
-		uint32_t i;
-
-		shift = seq - base;
-		if (unlikely(shift >= winsz)) {
-			/*
-			 * shift is bigger than the window,
-			 * so just zero out everything
-			 */
-			for (i = 0; i < winwords; i++)
-				window[i] = 0;
-winupdate:
-			/* Find out the word */
-			seqword = ((seq - 1) % ex_winsz) >> WORD_SHIFT;
-
-			/* Find out the bit in the word */
-			bit_pos = (seq - 1) & WORD_MASK;
-
-			/*
-			 * Set the bit corresponding to sequence number
-			 * in window to mark it as received
-			 */
-			window[seqword] |= (1ull << (63 - bit_pos));
-
-			/* wint and winb range from 1 to ex_winsz */
-			replay->wint = ((wint + shift - 1) % ex_winsz) + 1;
-			replay->winb = ((winb + shift - 1) % ex_winsz) + 1;
-
-			replay->base = seq;
-			return 0;
-		}
-
-		/*
-		 * New sequence number is bigger than the base but
-		 * it's not bigger than base + window size
-		 */
-
-		shiftwords = ((wint + shift - 1) >> WORD_SHIFT) -
-			     ((wint - 1) >> WORD_SHIFT);
-		if (unlikely(shiftwords)) {
-			tmp = (wint + WORD_SIZE - 1) / WORD_SIZE;
-			for (i = 0; i < shiftwords; i++) {
-				tmp %= winwords;
-				window[tmp++] = 0;
-			}
-		}
-
-		goto winupdate;
-	}
-
-	/* Sequence number is before the window */
-	if (unlikely((seq + winsz) <= base))
-		return IPSEC_ANTI_REPLAY_FAILED;
-
-	/* Sequence number is within the window */
-
-	/* Find out the word */
-	seqword = ((seq - 1) % ex_winsz) >> WORD_SHIFT;
-
-	/* Find out the bit in the word */
-	bit_pos = (seq - 1) & WORD_MASK;
-
-	/* Check if this is a replayed packet */
-	if (window[seqword] & (1ull << (63 - bit_pos)))
-		return IPSEC_ANTI_REPLAY_FAILED;
-
-	/*
-	 * Set the bit corresponding to sequence number
-	 * in window to mark it as received
-	 */
-	window[seqword] |= (1ull << (63 - bit_pos));
-
-	return 0;
-}
-
-static inline int
-cpt_ipsec_ip_antireplay_check(struct otx2_ipsec_fp_in_sa *sa, void *l3_ptr)
-{
-	struct otx2_ipsec_fp_res_hdr *hdr = l3_ptr;
-	uint64_t seq_in_sa;
-	uint32_t seqh = 0;
-	uint32_t seql;
-	uint64_t seq;
-	uint8_t esn;
-	int ret;
-
-	esn = sa->ctl.esn_en;
-	seql = rte_be_to_cpu_32(hdr->seq_no_lo);
-
-	if (!esn)
-		seq = (uint64_t)seql;
-	else {
-		seqh = rte_be_to_cpu_32(hdr->seq_no_hi);
-		seq = ((uint64_t)seqh << 32) | seql;
-	}
-
-	if (unlikely(seq == 0))
-		return IPSEC_ANTI_REPLAY_FAILED;
-
-	rte_spinlock_lock(&sa->replay->lock);
-	ret = anti_replay_check(sa->replay, seq, sa->replay_win_sz);
-	if (esn && (ret == 0)) {
-		seq_in_sa = ((uint64_t)rte_be_to_cpu_32(sa->esn_hi) << 32) |
-				rte_be_to_cpu_32(sa->esn_low);
-		if (seq > seq_in_sa) {
-			sa->esn_low = rte_cpu_to_be_32(seql);
-			sa->esn_hi = rte_cpu_to_be_32(seqh);
-		}
-	}
-	rte_spinlock_unlock(&sa->replay->lock);
-
-	return ret;
-}
-
-static inline uint32_t
-anti_replay_get_seqh(uint32_t winsz, uint32_t seql,
-			uint32_t esn_hi, uint32_t esn_low)
-{
-	uint32_t win_low = esn_low - winsz + 1;
-
-	if (esn_low > winsz - 1) {
-		/* Window is in one sequence number subspace */
-		if (seql > win_low)
-			return esn_hi;
-		else
-			return esn_hi + 1;
-	} else {
-		/* Window is split across two sequence number subspaces */
-		if (seql > win_low)
-			return esn_hi - 1;
-		else
-			return esn_hi;
-	}
-}
-#endif /* __OTX2_IPSEC_ANTI_REPLAY_H__ */
diff --git a/drivers/crypto/octeontx2/otx2_ipsec_fp.h b/drivers/crypto/octeontx2/otx2_ipsec_fp.h
deleted file mode 100644
index 2461e7462b..0000000000
--- a/drivers/crypto/octeontx2/otx2_ipsec_fp.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_IPSEC_FP_H__
-#define __OTX2_IPSEC_FP_H__
-
-#include <rte_crypto_sym.h>
-#include <rte_security.h>
-
-/* Macros for anti replay and ESN */
-#define OTX2_IPSEC_MAX_REPLAY_WIN_SZ	1024
-
-struct otx2_ipsec_fp_res_hdr {
-	uint32_t spi;
-	uint32_t seq_no_lo;
-	uint32_t seq_no_hi;
-	uint32_t rsvd;
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_DIRECTION_INBOUND = 0,
-	OTX2_IPSEC_FP_SA_DIRECTION_OUTBOUND = 1,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_IP_VERSION_4 = 0,
-	OTX2_IPSEC_FP_SA_IP_VERSION_6 = 1,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_MODE_TRANSPORT = 0,
-	OTX2_IPSEC_FP_SA_MODE_TUNNEL = 1,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_PROTOCOL_AH = 0,
-	OTX2_IPSEC_FP_SA_PROTOCOL_ESP = 1,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_AES_KEY_LEN_128 = 1,
-	OTX2_IPSEC_FP_SA_AES_KEY_LEN_192 = 2,
-	OTX2_IPSEC_FP_SA_AES_KEY_LEN_256 = 3,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_ENC_NULL = 0,
-	OTX2_IPSEC_FP_SA_ENC_DES_CBC = 1,
-	OTX2_IPSEC_FP_SA_ENC_3DES_CBC = 2,
-	OTX2_IPSEC_FP_SA_ENC_AES_CBC = 3,
-	OTX2_IPSEC_FP_SA_ENC_AES_CTR = 4,
-	OTX2_IPSEC_FP_SA_ENC_AES_GCM = 5,
-	OTX2_IPSEC_FP_SA_ENC_AES_CCM = 6,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_AUTH_NULL = 0,
-	OTX2_IPSEC_FP_SA_AUTH_MD5 = 1,
-	OTX2_IPSEC_FP_SA_AUTH_SHA1 = 2,
-	OTX2_IPSEC_FP_SA_AUTH_SHA2_224 = 3,
-	OTX2_IPSEC_FP_SA_AUTH_SHA2_256 = 4,
-	OTX2_IPSEC_FP_SA_AUTH_SHA2_384 = 5,
-	OTX2_IPSEC_FP_SA_AUTH_SHA2_512 = 6,
-	OTX2_IPSEC_FP_SA_AUTH_AES_GMAC = 7,
-	OTX2_IPSEC_FP_SA_AUTH_AES_XCBC_128 = 8,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_FRAG_POST = 0,
-	OTX2_IPSEC_FP_SA_FRAG_PRE = 1,
-};
-
-enum {
-	OTX2_IPSEC_FP_SA_ENCAP_NONE = 0,
-	OTX2_IPSEC_FP_SA_ENCAP_UDP = 1,
-};
-
-struct otx2_ipsec_fp_sa_ctl {
-	rte_be32_t spi          : 32;
-	uint64_t exp_proto_inter_frag : 8;
-	uint64_t rsvd_42_40   : 3;
-	uint64_t esn_en       : 1;
-	uint64_t rsvd_45_44   : 2;
-	uint64_t encap_type   : 2;
-	uint64_t enc_type     : 3;
-	uint64_t rsvd_48      : 1;
-	uint64_t auth_type    : 4;
-	uint64_t valid        : 1;
-	uint64_t direction    : 1;
-	uint64_t outer_ip_ver : 1;
-	uint64_t inner_ip_ver : 1;
-	uint64_t ipsec_mode   : 1;
-	uint64_t ipsec_proto  : 1;
-	uint64_t aes_key_len  : 2;
-};
-
-struct otx2_ipsec_fp_out_sa {
-	/* w0 */
-	struct otx2_ipsec_fp_sa_ctl ctl;
-
-	/* w1 */
-	uint8_t nonce[4];
-	uint16_t udp_src;
-	uint16_t udp_dst;
-
-	/* w2 */
-	uint32_t ip_src;
-	uint32_t ip_dst;
-
-	/* w3-w6 */
-	uint8_t cipher_key[32];
-
-	/* w7-w12 */
-	uint8_t hmac_key[48];
-};
-
-struct otx2_ipsec_replay {
-	rte_spinlock_t lock;
-	uint32_t winb;
-	uint32_t wint;
-	uint64_t base; /**< base of the anti-replay window */
-	uint64_t window[17]; /**< anti-replay window */
-};
-
-struct otx2_ipsec_fp_in_sa {
-	/* w0 */
-	struct otx2_ipsec_fp_sa_ctl ctl;
-
-	/* w1 */
-	uint8_t nonce[4]; /* Only for AES-GCM */
-	uint32_t unused;
-
-	/* w2 */
-	uint32_t esn_hi;
-	uint32_t esn_low;
-
-	/* w3-w6 */
-	uint8_t cipher_key[32];
-
-	/* w7-w12 */
-	uint8_t hmac_key[48];
-
-	RTE_STD_C11
-	union {
-		void *userdata;
-		uint64_t udata64;
-	};
-	union {
-		struct otx2_ipsec_replay *replay;
-		uint64_t replay64;
-	};
-	uint32_t replay_win_sz;
-
-	uint32_t reserved1;
-};
-
-static inline int
-ipsec_fp_xform_cipher_verify(struct rte_crypto_sym_xform *xform)
-{
-	if (xform->cipher.algo == RTE_CRYPTO_CIPHER_AES_CBC) {
-		switch (xform->cipher.key.length) {
-		case 16:
-		case 24:
-		case 32:
-			break;
-		default:
-			return -ENOTSUP;
-		}
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static inline int
-ipsec_fp_xform_auth_verify(struct rte_crypto_sym_xform *xform)
-{
-	uint16_t keylen = xform->auth.key.length;
-
-	if (xform->auth.algo == RTE_CRYPTO_AUTH_SHA1_HMAC) {
-		if (keylen >= 20 && keylen <= 64)
-			return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static inline int
-ipsec_fp_xform_aead_verify(struct rte_security_ipsec_xform *ipsec,
-			   struct rte_crypto_sym_xform *xform)
-{
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS &&
-	    xform->aead.op != RTE_CRYPTO_AEAD_OP_ENCRYPT)
-		return -EINVAL;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS &&
-	    xform->aead.op != RTE_CRYPTO_AEAD_OP_DECRYPT)
-		return -EINVAL;
-
-	if (xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM) {
-		switch (xform->aead.key.length) {
-		case 16:
-		case 24:
-		case 32:
-			break;
-		default:
-			return -EINVAL;
-		}
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static inline int
-ipsec_fp_xform_verify(struct rte_security_ipsec_xform *ipsec,
-		      struct rte_crypto_sym_xform *xform)
-{
-	struct rte_crypto_sym_xform *auth_xform, *cipher_xform;
-	int ret;
-
-	if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD)
-		return ipsec_fp_xform_aead_verify(ipsec, xform);
-
-	if (xform->next == NULL)
-		return -EINVAL;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
-		/* Ingress */
-		if (xform->type != RTE_CRYPTO_SYM_XFORM_AUTH ||
-		    xform->next->type != RTE_CRYPTO_SYM_XFORM_CIPHER)
-			return -EINVAL;
-		auth_xform = xform;
-		cipher_xform = xform->next;
-	} else {
-		/* Egress */
-		if (xform->type != RTE_CRYPTO_SYM_XFORM_CIPHER ||
-		    xform->next->type != RTE_CRYPTO_SYM_XFORM_AUTH)
-			return -EINVAL;
-		cipher_xform = xform;
-		auth_xform = xform->next;
-	}
-
-	ret = ipsec_fp_xform_cipher_verify(cipher_xform);
-	if (ret)
-		return ret;
-
-	ret = ipsec_fp_xform_auth_verify(auth_xform);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static inline int
-ipsec_fp_sa_ctl_set(struct rte_security_ipsec_xform *ipsec,
-		    struct rte_crypto_sym_xform *xform,
-		    struct otx2_ipsec_fp_sa_ctl *ctl)
-{
-	struct rte_crypto_sym_xform *cipher_xform, *auth_xform;
-	int aes_key_len;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {
-		ctl->direction = OTX2_IPSEC_FP_SA_DIRECTION_OUTBOUND;
-		cipher_xform = xform;
-		auth_xform = xform->next;
-	} else if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
-		ctl->direction = OTX2_IPSEC_FP_SA_DIRECTION_INBOUND;
-		auth_xform = xform;
-		cipher_xform = xform->next;
-	} else {
-		return -EINVAL;
-	}
-
-	if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL) {
-		if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV4)
-			ctl->outer_ip_ver = OTX2_IPSEC_FP_SA_IP_VERSION_4;
-		else if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV6)
-			ctl->outer_ip_ver = OTX2_IPSEC_FP_SA_IP_VERSION_6;
-		else
-			return -EINVAL;
-	}
-
-	ctl->inner_ip_ver = OTX2_IPSEC_FP_SA_IP_VERSION_4;
-
-	if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT)
-		ctl->ipsec_mode = OTX2_IPSEC_FP_SA_MODE_TRANSPORT;
-	else if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL)
-		ctl->ipsec_mode = OTX2_IPSEC_FP_SA_MODE_TUNNEL;
-	else
-		return -EINVAL;
-
-	if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_AH)
-		ctl->ipsec_proto = OTX2_IPSEC_FP_SA_PROTOCOL_AH;
-	else if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_ESP)
-		ctl->ipsec_proto = OTX2_IPSEC_FP_SA_PROTOCOL_ESP;
-	else
-		return -EINVAL;
-
-	if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		if (xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM) {
-			ctl->enc_type = OTX2_IPSEC_FP_SA_ENC_AES_GCM;
-			aes_key_len = xform->aead.key.length;
-		} else {
-			return -ENOTSUP;
-		}
-	} else if (cipher_xform->cipher.algo == RTE_CRYPTO_CIPHER_AES_CBC) {
-		ctl->enc_type = OTX2_IPSEC_FP_SA_ENC_AES_CBC;
-		aes_key_len = cipher_xform->cipher.key.length;
-	} else {
-		return -ENOTSUP;
-	}
-
-	switch (aes_key_len) {
-	case 16:
-		ctl->aes_key_len = OTX2_IPSEC_FP_SA_AES_KEY_LEN_128;
-		break;
-	case 24:
-		ctl->aes_key_len = OTX2_IPSEC_FP_SA_AES_KEY_LEN_192;
-		break;
-	case 32:
-		ctl->aes_key_len = OTX2_IPSEC_FP_SA_AES_KEY_LEN_256;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if (xform->type != RTE_CRYPTO_SYM_XFORM_AEAD) {
-		switch (auth_xform->auth.algo) {
-		case RTE_CRYPTO_AUTH_NULL:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_NULL;
-			break;
-		case RTE_CRYPTO_AUTH_MD5_HMAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_MD5;
-			break;
-		case RTE_CRYPTO_AUTH_SHA1_HMAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_SHA1;
-			break;
-		case RTE_CRYPTO_AUTH_SHA224_HMAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_SHA2_224;
-			break;
-		case RTE_CRYPTO_AUTH_SHA256_HMAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_SHA2_256;
-			break;
-		case RTE_CRYPTO_AUTH_SHA384_HMAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_SHA2_384;
-			break;
-		case RTE_CRYPTO_AUTH_SHA512_HMAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_SHA2_512;
-			break;
-		case RTE_CRYPTO_AUTH_AES_GMAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_AES_GMAC;
-			break;
-		case RTE_CRYPTO_AUTH_AES_XCBC_MAC:
-			ctl->auth_type = OTX2_IPSEC_FP_SA_AUTH_AES_XCBC_128;
-			break;
-		default:
-			return -ENOTSUP;
-		}
-	}
-
-	if (ipsec->options.esn == 1)
-		ctl->esn_en = 1;
-
-	ctl->spi = rte_cpu_to_be_32(ipsec->spi);
-
-	return 0;
-}
-
-#endif /* __OTX2_IPSEC_FP_H__ */
diff --git a/drivers/crypto/octeontx2/otx2_ipsec_po.h b/drivers/crypto/octeontx2/otx2_ipsec_po.h
deleted file mode 100644
index 695f552644..0000000000
--- a/drivers/crypto/octeontx2/otx2_ipsec_po.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_IPSEC_PO_H__
-#define __OTX2_IPSEC_PO_H__
-
-#include <rte_crypto_sym.h>
-#include <rte_ip.h>
-#include <rte_security.h>
-
-#define OTX2_IPSEC_PO_AES_GCM_INB_CTX_LEN    0x09
-
-#define OTX2_IPSEC_PO_WRITE_IPSEC_OUTB     0x20
-#define OTX2_IPSEC_PO_WRITE_IPSEC_INB      0x21
-#define OTX2_IPSEC_PO_PROCESS_IPSEC_OUTB   0x23
-#define OTX2_IPSEC_PO_PROCESS_IPSEC_INB    0x24
-
-#define OTX2_IPSEC_PO_INB_RPTR_HDR         0x8
-
-enum otx2_ipsec_po_comp_e {
-	OTX2_IPSEC_PO_CC_SUCCESS = 0x00,
-	OTX2_IPSEC_PO_CC_AUTH_UNSUPPORTED = 0xB0,
-	OTX2_IPSEC_PO_CC_ENCRYPT_UNSUPPORTED = 0xB1,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_DIRECTION_INBOUND = 0,
-	OTX2_IPSEC_PO_SA_DIRECTION_OUTBOUND = 1,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_IP_VERSION_4 = 0,
-	OTX2_IPSEC_PO_SA_IP_VERSION_6 = 1,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_MODE_TRANSPORT = 0,
-	OTX2_IPSEC_PO_SA_MODE_TUNNEL = 1,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_PROTOCOL_AH = 0,
-	OTX2_IPSEC_PO_SA_PROTOCOL_ESP = 1,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_AES_KEY_LEN_128 = 1,
-	OTX2_IPSEC_PO_SA_AES_KEY_LEN_192 = 2,
-	OTX2_IPSEC_PO_SA_AES_KEY_LEN_256 = 3,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_ENC_NULL = 0,
-	OTX2_IPSEC_PO_SA_ENC_DES_CBC = 1,
-	OTX2_IPSEC_PO_SA_ENC_3DES_CBC = 2,
-	OTX2_IPSEC_PO_SA_ENC_AES_CBC = 3,
-	OTX2_IPSEC_PO_SA_ENC_AES_CTR = 4,
-	OTX2_IPSEC_PO_SA_ENC_AES_GCM = 5,
-	OTX2_IPSEC_PO_SA_ENC_AES_CCM = 6,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_AUTH_NULL = 0,
-	OTX2_IPSEC_PO_SA_AUTH_MD5 = 1,
-	OTX2_IPSEC_PO_SA_AUTH_SHA1 = 2,
-	OTX2_IPSEC_PO_SA_AUTH_SHA2_224 = 3,
-	OTX2_IPSEC_PO_SA_AUTH_SHA2_256 = 4,
-	OTX2_IPSEC_PO_SA_AUTH_SHA2_384 = 5,
-	OTX2_IPSEC_PO_SA_AUTH_SHA2_512 = 6,
-	OTX2_IPSEC_PO_SA_AUTH_AES_GMAC = 7,
-	OTX2_IPSEC_PO_SA_AUTH_AES_XCBC_128 = 8,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_FRAG_POST = 0,
-	OTX2_IPSEC_PO_SA_FRAG_PRE = 1,
-};
-
-enum {
-	OTX2_IPSEC_PO_SA_ENCAP_NONE = 0,
-	OTX2_IPSEC_PO_SA_ENCAP_UDP = 1,
-};
-
-struct otx2_ipsec_po_out_hdr {
-	uint32_t ip_id;
-	uint32_t seq;
-	uint8_t iv[16];
-};
-
-union otx2_ipsec_po_bit_perfect_iv {
-	uint8_t aes_iv[16];
-	uint8_t des_iv[8];
-	struct {
-		uint8_t nonce[4];
-		uint8_t iv[8];
-		uint8_t counter[4];
-	} gcm;
-};
-
-struct otx2_ipsec_po_traffic_selector {
-	rte_be16_t src_port[2];
-	rte_be16_t dst_port[2];
-	RTE_STD_C11
-	union {
-		struct {
-			rte_be32_t src_addr[2];
-			rte_be32_t dst_addr[2];
-		} ipv4;
-		struct {
-			uint8_t src_addr[32];
-			uint8_t dst_addr[32];
-		} ipv6;
-	};
-};
-
-struct otx2_ipsec_po_sa_ctl {
-	rte_be32_t spi          : 32;
-	uint64_t exp_proto_inter_frag : 8;
-	uint64_t rsvd_42_40   : 3;
-	uint64_t esn_en       : 1;
-	uint64_t rsvd_45_44   : 2;
-	uint64_t encap_type   : 2;
-	uint64_t enc_type     : 3;
-	uint64_t rsvd_48      : 1;
-	uint64_t auth_type    : 4;
-	uint64_t valid        : 1;
-	uint64_t direction    : 1;
-	uint64_t outer_ip_ver : 1;
-	uint64_t inner_ip_ver : 1;
-	uint64_t ipsec_mode   : 1;
-	uint64_t ipsec_proto  : 1;
-	uint64_t aes_key_len  : 2;
-};
-
-struct otx2_ipsec_po_in_sa {
-	/* w0 */
-	struct otx2_ipsec_po_sa_ctl ctl;
-
-	/* w1-w4 */
-	uint8_t cipher_key[32];
-
-	/* w5-w6 */
-	union otx2_ipsec_po_bit_perfect_iv iv;
-
-	/* w7 */
-	uint32_t esn_hi;
-	uint32_t esn_low;
-
-	/* w8 */
-	uint8_t udp_encap[8];
-
-	/* w9-w33 */
-	union {
-		struct {
-			uint8_t hmac_key[48];
-			struct otx2_ipsec_po_traffic_selector selector;
-		} aes_gcm;
-		struct {
-			uint8_t hmac_key[64];
-			uint8_t hmac_iv[64];
-			struct otx2_ipsec_po_traffic_selector selector;
-		} sha2;
-	};
-	union {
-		struct otx2_ipsec_replay *replay;
-		uint64_t replay64;
-	};
-	uint32_t replay_win_sz;
-};
-
-struct otx2_ipsec_po_ip_template {
-	RTE_STD_C11
-	union {
-		struct {
-			struct rte_ipv4_hdr ipv4_hdr;
-			uint16_t udp_src;
-			uint16_t udp_dst;
-		} ip4;
-		struct {
-			struct rte_ipv6_hdr ipv6_hdr;
-			uint16_t udp_src;
-			uint16_t udp_dst;
-		} ip6;
-	};
-};
-
-struct otx2_ipsec_po_out_sa {
-	/* w0 */
-	struct otx2_ipsec_po_sa_ctl ctl;
-
-	/* w1-w4 */
-	uint8_t cipher_key[32];
-
-	/* w5-w6 */
-	union otx2_ipsec_po_bit_perfect_iv iv;
-
-	/* w7 */
-	uint32_t esn_hi;
-	uint32_t esn_low;
-
-	/* w8-w55 */
-	union {
-		struct {
-			struct otx2_ipsec_po_ip_template template;
-		} aes_gcm;
-		struct {
-			uint8_t hmac_key[24];
-			uint8_t unused[24];
-			struct otx2_ipsec_po_ip_template template;
-		} sha1;
-		struct {
-			uint8_t hmac_key[64];
-			uint8_t hmac_iv[64];
-			struct otx2_ipsec_po_ip_template template;
-		} sha2;
-	};
-};
-
-static inline int
-ipsec_po_xform_cipher_verify(struct rte_crypto_sym_xform *xform)
-{
-	if (xform->cipher.algo == RTE_CRYPTO_CIPHER_AES_CBC) {
-		switch (xform->cipher.key.length) {
-		case 16:
-		case 24:
-		case 32:
-			break;
-		default:
-			return -ENOTSUP;
-		}
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static inline int
-ipsec_po_xform_auth_verify(struct rte_crypto_sym_xform *xform)
-{
-	uint16_t keylen = xform->auth.key.length;
-
-	if (xform->auth.algo == RTE_CRYPTO_AUTH_SHA1_HMAC) {
-		if (keylen >= 20 && keylen <= 64)
-			return 0;
-	} else if (xform->auth.algo == RTE_CRYPTO_AUTH_SHA256_HMAC) {
-		if (keylen >= 32 && keylen <= 64)
-			return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static inline int
-ipsec_po_xform_aead_verify(struct rte_security_ipsec_xform *ipsec,
-			   struct rte_crypto_sym_xform *xform)
-{
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS &&
-	    xform->aead.op != RTE_CRYPTO_AEAD_OP_ENCRYPT)
-		return -EINVAL;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS &&
-	    xform->aead.op != RTE_CRYPTO_AEAD_OP_DECRYPT)
-		return -EINVAL;
-
-	if (xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM) {
-		switch (xform->aead.key.length) {
-		case 16:
-		case 24:
-		case 32:
-			break;
-		default:
-			return -EINVAL;
-		}
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static inline int
-ipsec_po_xform_verify(struct rte_security_ipsec_xform *ipsec,
-		      struct rte_crypto_sym_xform *xform)
-{
-	struct rte_crypto_sym_xform *auth_xform, *cipher_xform;
-	int ret;
-
-	if (ipsec->life.bytes_hard_limit != 0 ||
-	    ipsec->life.bytes_soft_limit != 0 ||
-	    ipsec->life.packets_hard_limit != 0 ||
-	    ipsec->life.packets_soft_limit != 0)
-		return -ENOTSUP;
-
-	if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD)
-		return ipsec_po_xform_aead_verify(ipsec, xform);
-
-	if (xform->next == NULL)
-		return -EINVAL;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
-		/* Ingress */
-		if (xform->type != RTE_CRYPTO_SYM_XFORM_AUTH ||
-		    xform->next->type != RTE_CRYPTO_SYM_XFORM_CIPHER)
-			return -EINVAL;
-		auth_xform = xform;
-		cipher_xform = xform->next;
-	} else {
-		/* Egress */
-		if (xform->type != RTE_CRYPTO_SYM_XFORM_CIPHER ||
-		    xform->next->type != RTE_CRYPTO_SYM_XFORM_AUTH)
-			return -EINVAL;
-		cipher_xform = xform;
-		auth_xform = xform->next;
-	}
-
-	ret = ipsec_po_xform_cipher_verify(cipher_xform);
-	if (ret)
-		return ret;
-
-	ret = ipsec_po_xform_auth_verify(auth_xform);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static inline int
-ipsec_po_sa_ctl_set(struct rte_security_ipsec_xform *ipsec,
-		    struct rte_crypto_sym_xform *xform,
-		    struct otx2_ipsec_po_sa_ctl *ctl)
-{
-	struct rte_crypto_sym_xform *cipher_xform, *auth_xform;
-	int aes_key_len;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {
-		ctl->direction = OTX2_IPSEC_PO_SA_DIRECTION_OUTBOUND;
-		cipher_xform = xform;
-		auth_xform = xform->next;
-	} else if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
-		ctl->direction = OTX2_IPSEC_PO_SA_DIRECTION_INBOUND;
-		auth_xform = xform;
-		cipher_xform = xform->next;
-	} else {
-		return -EINVAL;
-	}
-
-	if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL) {
-		if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV4)
-			ctl->outer_ip_ver = OTX2_IPSEC_PO_SA_IP_VERSION_4;
-		else if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV6)
-			ctl->outer_ip_ver = OTX2_IPSEC_PO_SA_IP_VERSION_6;
-		else
-			return -EINVAL;
-	}
-
-	ctl->inner_ip_ver = ctl->outer_ip_ver;
-
-	if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TRANSPORT)
-		ctl->ipsec_mode = OTX2_IPSEC_PO_SA_MODE_TRANSPORT;
-	else if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL)
-		ctl->ipsec_mode = OTX2_IPSEC_PO_SA_MODE_TUNNEL;
-	else
-		return -EINVAL;
-
-	if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_AH)
-		ctl->ipsec_proto = OTX2_IPSEC_PO_SA_PROTOCOL_AH;
-	else if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_ESP)
-		ctl->ipsec_proto = OTX2_IPSEC_PO_SA_PROTOCOL_ESP;
-	else
-		return -EINVAL;
-
-	if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		if (xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM) {
-			ctl->enc_type = OTX2_IPSEC_PO_SA_ENC_AES_GCM;
-			aes_key_len = xform->aead.key.length;
-		} else {
-			return -ENOTSUP;
-		}
-	} else if (cipher_xform->cipher.algo == RTE_CRYPTO_CIPHER_AES_CBC) {
-		ctl->enc_type = OTX2_IPSEC_PO_SA_ENC_AES_CBC;
-		aes_key_len = cipher_xform->cipher.key.length;
-	} else {
-		return -ENOTSUP;
-	}
-
-
-	switch (aes_key_len) {
-	case 16:
-		ctl->aes_key_len = OTX2_IPSEC_PO_SA_AES_KEY_LEN_128;
-		break;
-	case 24:
-		ctl->aes_key_len = OTX2_IPSEC_PO_SA_AES_KEY_LEN_192;
-		break;
-	case 32:
-		ctl->aes_key_len = OTX2_IPSEC_PO_SA_AES_KEY_LEN_256;
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if (xform->type != RTE_CRYPTO_SYM_XFORM_AEAD) {
-		switch (auth_xform->auth.algo) {
-		case RTE_CRYPTO_AUTH_NULL:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_NULL;
-			break;
-		case RTE_CRYPTO_AUTH_MD5_HMAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_MD5;
-			break;
-		case RTE_CRYPTO_AUTH_SHA1_HMAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_SHA1;
-			break;
-		case RTE_CRYPTO_AUTH_SHA224_HMAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_SHA2_224;
-			break;
-		case RTE_CRYPTO_AUTH_SHA256_HMAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_SHA2_256;
-			break;
-		case RTE_CRYPTO_AUTH_SHA384_HMAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_SHA2_384;
-			break;
-		case RTE_CRYPTO_AUTH_SHA512_HMAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_SHA2_512;
-			break;
-		case RTE_CRYPTO_AUTH_AES_GMAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_AES_GMAC;
-			break;
-		case RTE_CRYPTO_AUTH_AES_XCBC_MAC:
-			ctl->auth_type = OTX2_IPSEC_PO_SA_AUTH_AES_XCBC_128;
-			break;
-		default:
-			return -ENOTSUP;
-		}
-	}
-
-	if (ipsec->options.esn)
-		ctl->esn_en = 1;
-
-	if (ipsec->options.udp_encap == 1)
-		ctl->encap_type = OTX2_IPSEC_PO_SA_ENCAP_UDP;
-
-	ctl->spi = rte_cpu_to_be_32(ipsec->spi);
-	ctl->valid = 1;
-
-	return 0;
-}
-
-#endif /* __OTX2_IPSEC_PO_H__ */
diff --git a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h b/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
deleted file mode 100644
index c3abf02187..0000000000
--- a/drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
+++ /dev/null
@@ -1,167 +0,0 @@
-
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_IPSEC_PO_OPS_H__
-#define __OTX2_IPSEC_PO_OPS_H__
-
-#include <rte_crypto_sym.h>
-#include <rte_security.h>
-
-#include "otx2_cryptodev.h"
-#include "otx2_security.h"
-
-static __rte_always_inline int32_t
-otx2_ipsec_po_out_rlen_get(struct otx2_sec_session_ipsec_lp *sess,
-			   uint32_t plen)
-{
-	uint32_t enc_payload_len;
-
-	enc_payload_len = RTE_ALIGN_CEIL(plen + sess->roundup_len,
-			sess->roundup_byte);
-
-	return sess->partial_len + enc_payload_len;
-}
-
-static __rte_always_inline struct cpt_request_info *
-alloc_request_struct(char *maddr, void *cop, int mdata_len)
-{
-	struct cpt_request_info *req;
-	struct cpt_meta_info *meta;
-	uint8_t *resp_addr;
-	uintptr_t *op;
-
-	meta = (void *)RTE_PTR_ALIGN((uint8_t *)maddr, 16);
-
-	op = (uintptr_t *)meta->deq_op_info;
-	req = &meta->cpt_req;
-	resp_addr = (uint8_t *)&meta->cpt_res;
-
-	req->completion_addr = (uint64_t *)((uint8_t *)resp_addr);
-	*req->completion_addr = COMPLETION_CODE_INIT;
-	req->comp_baddr = rte_mem_virt2iova(resp_addr);
-	req->op = op;
-
-	op[0] = (uintptr_t)((uint64_t)meta | 1ull);
-	op[1] = (uintptr_t)cop;
-	op[2] = (uintptr_t)req;
-	op[3] = mdata_len;
-
-	return req;
-}
-
-static __rte_always_inline int
-process_outb_sa(struct rte_crypto_op *cop,
-	       struct otx2_sec_session_ipsec_lp *sess,
-	       struct cpt_qp_meta_info *m_info, void **prep_req)
-{
-	uint32_t dlen, rlen, extend_head, extend_tail;
-	struct rte_crypto_sym_op *sym_op = cop->sym;
-	struct rte_mbuf *m_src = sym_op->m_src;
-	struct cpt_request_info *req = NULL;
-	struct otx2_ipsec_po_out_hdr *hdr;
-	struct otx2_ipsec_po_out_sa *sa;
-	int hdr_len, mdata_len, ret = 0;
-	vq_cmd_word0_t word0;
-	char *mdata, *data;
-
-	sa = &sess->out_sa;
-	hdr_len = sizeof(*hdr);
-
-	dlen = rte_pktmbuf_pkt_len(m_src) + hdr_len;
-	rlen = otx2_ipsec_po_out_rlen_get(sess, dlen - hdr_len);
-
-	extend_head = hdr_len + RTE_ETHER_HDR_LEN;
-	extend_tail = rlen - dlen;
-	mdata_len = m_info->lb_mlen + 8;
-
-	mdata = rte_pktmbuf_append(m_src, extend_tail + mdata_len);
-	if (unlikely(mdata == NULL)) {
-		otx2_err("Not enough tail room\n");
-		ret = -ENOMEM;
-		goto exit;
-	}
-
-	mdata += extend_tail; /* mdata follows encrypted data */
-	req = alloc_request_struct(mdata, (void *)cop, mdata_len);
-
-	data = rte_pktmbuf_prepend(m_src, extend_head);
-	if (unlikely(data == NULL)) {
-		otx2_err("Not enough head room\n");
-		ret = -ENOMEM;
-		goto exit;
-	}
-
-	/*
-	 * Move the Ethernet header, to insert otx2_ipsec_po_out_hdr prior
-	 * to the IP header
-	 */
-	memcpy(data, data + hdr_len, RTE_ETHER_HDR_LEN);
-
-	hdr = (struct otx2_ipsec_po_out_hdr *)rte_pktmbuf_adj(m_src,
-							RTE_ETHER_HDR_LEN);
-
-	memcpy(&hdr->iv[0], rte_crypto_op_ctod_offset(cop, uint8_t *,
-		sess->iv_offset), sess->iv_length);
-
-	/* Prepare CPT instruction */
-	word0.u64 = sess->ucmd_w0;
-	word0.s.dlen = dlen;
-
-	req->ist.ei0 = word0.u64;
-	req->ist.ei1 = rte_pktmbuf_iova(m_src);
-	req->ist.ei2 = req->ist.ei1;
-
-	sa->esn_hi = sess->seq_hi;
-
-	hdr->seq = rte_cpu_to_be_32(sess->seq_lo);
-	hdr->ip_id = rte_cpu_to_be_32(sess->ip_id);
-
-	sess->ip_id++;
-	sess->esn++;
-
-exit:
-	*prep_req = req;
-
-	return ret;
-}
-
-static __rte_always_inline int
-process_inb_sa(struct rte_crypto_op *cop,
-	      struct otx2_sec_session_ipsec_lp *sess,
-	      struct cpt_qp_meta_info *m_info, void **prep_req)
-{
-	struct rte_crypto_sym_op *sym_op = cop->sym;
-	struct rte_mbuf *m_src = sym_op->m_src;
-	struct cpt_request_info *req = NULL;
-	int mdata_len, ret = 0;
-	vq_cmd_word0_t word0;
-	uint32_t dlen;
-	char *mdata;
-
-	dlen = rte_pktmbuf_pkt_len(m_src);
-	mdata_len = m_info->lb_mlen + 8;
-
-	mdata = rte_pktmbuf_append(m_src, mdata_len);
-	if (unlikely(mdata == NULL)) {
-		otx2_err("Not enough tail room\n");
-		ret = -ENOMEM;
-		goto exit;
-	}
-
-	req = alloc_request_struct(mdata, (void *)cop, mdata_len);
-
-	/* Prepare CPT instruction */
-	word0.u64 = sess->ucmd_w0;
-	word0.s.dlen   = dlen;
-
-	req->ist.ei0 = word0.u64;
-	req->ist.ei1 = rte_pktmbuf_iova(m_src);
-	req->ist.ei2 = req->ist.ei1;
-
-exit:
-	*prep_req = req;
-	return ret;
-}
-#endif /* __OTX2_IPSEC_PO_OPS_H__ */
diff --git a/drivers/crypto/octeontx2/otx2_security.h b/drivers/crypto/octeontx2/otx2_security.h
deleted file mode 100644
index 29c8fc351b..0000000000
--- a/drivers/crypto/octeontx2/otx2_security.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_SECURITY_H__
-#define __OTX2_SECURITY_H__
-
-#include <rte_security.h>
-
-#include "otx2_cryptodev_sec.h"
-#include "otx2_ethdev_sec.h"
-
-#define OTX2_SEC_AH_HDR_LEN			12
-#define OTX2_SEC_AES_GCM_IV_LEN			8
-#define OTX2_SEC_AES_GCM_MAC_LEN		16
-#define OTX2_SEC_AES_CBC_IV_LEN			16
-#define OTX2_SEC_SHA1_HMAC_LEN			12
-#define OTX2_SEC_SHA2_HMAC_LEN			16
-
-#define OTX2_SEC_AES_GCM_ROUNDUP_BYTE_LEN	4
-#define OTX2_SEC_AES_CBC_ROUNDUP_BYTE_LEN	16
-
-struct otx2_sec_session_ipsec {
-	union {
-		struct otx2_sec_session_ipsec_ip ip;
-		struct otx2_sec_session_ipsec_lp lp;
-	};
-	enum rte_security_ipsec_sa_direction dir;
-};
-
-struct otx2_sec_session {
-	struct otx2_sec_session_ipsec ipsec;
-	void *userdata;
-	/**< Userdata registered by the application */
-} __rte_cache_aligned;
-
-#endif /* __OTX2_SECURITY_H__ */
diff --git a/drivers/crypto/octeontx2/version.map b/drivers/crypto/octeontx2/version.map
deleted file mode 100644
index d36663132a..0000000000
--- a/drivers/crypto/octeontx2/version.map
+++ /dev/null
@@ -1,13 +0,0 @@
-DPDK_22 {
-	local: *;
-};
-
-INTERNAL {
-	global:
-
-	otx2_cryptodev_driver_id;
-	otx2_cpt_af_reg_read;
-	otx2_cpt_af_reg_write;
-
-	local: *;
-};
diff --git a/drivers/event/cnxk/cn9k_eventdev.c b/drivers/event/cnxk/cn9k_eventdev.c
index b68ce6c0a4..8db9775d7b 100644
--- a/drivers/event/cnxk/cn9k_eventdev.c
+++ b/drivers/event/cnxk/cn9k_eventdev.c
@@ -1127,6 +1127,16 @@ cn9k_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 }
 
 static const struct rte_pci_id cn9k_pci_sso_map[] = {
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
 	{
 		.vendor_id = 0,
 	},
diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index 63d6b410b2..d6706b57f7 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -11,7 +11,6 @@ drivers = [
         'dpaa',
         'dpaa2',
         'dsw',
-        'octeontx2',
         'opdl',
         'skeleton',
         'sw',
diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build
deleted file mode 100644
index ce360af5f8..0000000000
--- a/drivers/event/octeontx2/meson.build
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-    build = false
-    reason = 'only supported on 64-bit Linux'
-    subdir_done()
-endif
-
-sources = files(
-        'otx2_worker.c',
-        'otx2_worker_dual.c',
-        'otx2_evdev.c',
-        'otx2_evdev_adptr.c',
-        'otx2_evdev_crypto_adptr.c',
-        'otx2_evdev_irq.c',
-        'otx2_evdev_selftest.c',
-        'otx2_tim_evdev.c',
-        'otx2_tim_worker.c',
-)
-
-deps += ['bus_pci', 'common_octeontx2', 'crypto_octeontx2', 'mempool_octeontx2', 'net_octeontx2']
-
-includes += include_directories('../../crypto/octeontx2')
-includes += include_directories('../../common/cpt')
diff --git a/drivers/event/octeontx2/otx2_evdev.c b/drivers/event/octeontx2/otx2_evdev.c
deleted file mode 100644
index ccf28b678b..0000000000
--- a/drivers/event/octeontx2/otx2_evdev.c
+++ /dev/null
@@ -1,1900 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <inttypes.h>
-
-#include <rte_bus_pci.h>
-#include <rte_common.h>
-#include <rte_eal.h>
-#include <eventdev_pmd_pci.h>
-#include <rte_kvargs.h>
-#include <rte_mbuf_pool_ops.h>
-#include <rte_pci.h>
-
-#include "otx2_evdev.h"
-#include "otx2_evdev_crypto_adptr_tx.h"
-#include "otx2_evdev_stats.h"
-#include "otx2_irq.h"
-#include "otx2_tim_evdev.h"
-
-static inline int
-sso_get_msix_offsets(const struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint8_t nb_ports = dev->nb_event_ports * (dev->dual_ws ? 2 : 1);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct msix_offset_rsp *msix_rsp;
-	int i, rc;
-
-	/* Get SSO and SSOW MSIX vector offsets */
-	otx2_mbox_alloc_msg_msix_offset(mbox);
-	rc = otx2_mbox_process_msg(mbox, (void *)&msix_rsp);
-
-	for (i = 0; i < nb_ports; i++)
-		dev->ssow_msixoff[i] = msix_rsp->ssow_msixoff[i];
-
-	for (i = 0; i < dev->nb_event_queues; i++)
-		dev->sso_msixoff[i] = msix_rsp->sso_msixoff[i];
-
-	return rc;
-}
-
-void
-sso_fastpath_fns_set(struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	/* Single WS modes */
-	const event_dequeue_t ssogws_deq[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t ssogws_deq_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_t ssogws_deq_timeout[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_timeout_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t
-		ssogws_deq_timeout_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_deq_timeout_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_t ssogws_deq_seg[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_seg_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t
-		ssogws_deq_seg_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_deq_seg_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_t ssogws_deq_seg_timeout[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_deq_seg_timeout_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t
-		ssogws_deq_seg_timeout_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-				otx2_ssogws_deq_seg_timeout_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-
-	/* Dual WS modes */
-	const event_dequeue_t ssogws_dual_deq[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t
-		ssogws_dual_deq_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_dual_deq_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_t ssogws_dual_deq_timeout[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_dual_deq_timeout_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t
-		ssogws_dual_deq_timeout_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-	[f6][f5][f4][f3][f2][f1][f0] =					\
-			otx2_ssogws_dual_deq_timeout_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_t ssogws_dual_deq_seg[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_seg_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t
-		ssogws_dual_deq_seg_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_dual_deq_seg_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_t
-		ssogws_dual_deq_seg_timeout[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_dual_deq_seg_timeout_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	const event_dequeue_burst_t
-		ssogws_dual_deq_seg_timeout_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_dual_deq_seg_timeout_burst_ ##name,
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-	};
-
-	/* Tx modes */
-	const event_tx_adapter_enqueue_t
-		ssogws_tx_adptr_enq[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_tx_adptr_enq_ ## name,
-			SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-		};
-
-	const event_tx_adapter_enqueue_t
-		ssogws_tx_adptr_enq_seg[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_tx_adptr_enq_seg_ ## name,
-			SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-		};
-
-	const event_tx_adapter_enqueue_t
-		ssogws_dual_tx_adptr_enq[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_dual_tx_adptr_enq_ ## name,
-			SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-		};
-
-	const event_tx_adapter_enqueue_t
-		ssogws_dual_tx_adptr_enq_seg[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-		[f6][f5][f4][f3][f2][f1][f0] =				\
-			otx2_ssogws_dual_tx_adptr_enq_seg_ ## name,
-			SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-		};
-
-	event_dev->enqueue			= otx2_ssogws_enq;
-	event_dev->enqueue_burst		= otx2_ssogws_enq_burst;
-	event_dev->enqueue_new_burst		= otx2_ssogws_enq_new_burst;
-	event_dev->enqueue_forward_burst	= otx2_ssogws_enq_fwd_burst;
-	if (dev->rx_offloads & NIX_RX_MULTI_SEG_F) {
-		event_dev->dequeue		= ssogws_deq_seg
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-		event_dev->dequeue_burst	= ssogws_deq_seg_burst
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-		if (dev->is_timeout_deq) {
-			event_dev->dequeue	= ssogws_deq_seg_timeout
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-			event_dev->dequeue_burst	=
-				ssogws_deq_seg_timeout_burst
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-		}
-	} else {
-		event_dev->dequeue			= ssogws_deq
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-		event_dev->dequeue_burst		= ssogws_deq_burst
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-		if (dev->is_timeout_deq) {
-			event_dev->dequeue		= ssogws_deq_timeout
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-			event_dev->dequeue_burst	=
-				ssogws_deq_timeout_burst
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_CHECKSUM_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-			[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-		}
-	}
-
-	if (dev->tx_offloads & NIX_TX_MULTI_SEG_F) {
-		/* [SEC] [TSMP] [MBUF_NOFF] [VLAN] [OL3_L4_CSUM] [L3_L4_CSUM] */
-		event_dev->txa_enqueue = ssogws_tx_adptr_enq_seg
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_SECURITY_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
-	} else {
-		event_dev->txa_enqueue = ssogws_tx_adptr_enq
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_SECURITY_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
-			[!!(dev->tx_offloads & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
-	}
-	event_dev->ca_enqueue = otx2_ssogws_ca_enq;
-
-	if (dev->dual_ws) {
-		event_dev->enqueue		= otx2_ssogws_dual_enq;
-		event_dev->enqueue_burst	= otx2_ssogws_dual_enq_burst;
-		event_dev->enqueue_new_burst	=
-					otx2_ssogws_dual_enq_new_burst;
-		event_dev->enqueue_forward_burst =
-					otx2_ssogws_dual_enq_fwd_burst;
-
-		if (dev->rx_offloads & NIX_RX_MULTI_SEG_F) {
-			event_dev->dequeue	= ssogws_dual_deq_seg
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_TSTAMP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-			event_dev->dequeue_burst = ssogws_dual_deq_seg_burst
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-			if (dev->is_timeout_deq) {
-				event_dev->dequeue	=
-					ssogws_dual_deq_seg_timeout
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_TSTAMP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_PTYPE_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_RSS_F)];
-				event_dev->dequeue_burst =
-					ssogws_dual_deq_seg_timeout_burst
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_TSTAMP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_PTYPE_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_RSS_F)];
-			}
-		} else {
-			event_dev->dequeue		= ssogws_dual_deq
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_TSTAMP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-			event_dev->dequeue_burst	= ssogws_dual_deq_burst
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_TSTAMP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-				[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
-				[!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
-			if (dev->is_timeout_deq) {
-				event_dev->dequeue	=
-					ssogws_dual_deq_timeout
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_TSTAMP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_PTYPE_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_RSS_F)];
-				event_dev->dequeue_burst =
-					ssogws_dual_deq_timeout_burst
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_SECURITY_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_TSTAMP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-					[!!(dev->rx_offloads &
-						NIX_RX_OFFLOAD_CHECKSUM_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_PTYPE_F)]
-					[!!(dev->rx_offloads &
-							NIX_RX_OFFLOAD_RSS_F)];
-			}
-		}
-
-		if (dev->tx_offloads & NIX_TX_MULTI_SEG_F) {
-		/* [SEC] [TSMP] [MBUF_NOFF] [VLAN] [OL3_L4_CSUM] [L3_L4_CSUM] */
-			event_dev->txa_enqueue = ssogws_dual_tx_adptr_enq_seg
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_SECURITY_F)]
-				[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]
-				[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_MBUF_NOFF_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_VLAN_QINQ_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
-		} else {
-			event_dev->txa_enqueue = ssogws_dual_tx_adptr_enq
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_SECURITY_F)]
-				[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]
-				[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_MBUF_NOFF_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_VLAN_QINQ_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
-				[!!(dev->tx_offloads &
-						NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
-		}
-		event_dev->ca_enqueue = otx2_ssogws_dual_ca_enq;
-	}
-
-	event_dev->txa_enqueue_same_dest = event_dev->txa_enqueue;
-	rte_mb();
-}
-
-static void
-otx2_sso_info_get(struct rte_eventdev *event_dev,
-		  struct rte_event_dev_info *dev_info)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-
-	dev_info->driver_name = RTE_STR(EVENTDEV_NAME_OCTEONTX2_PMD);
-	dev_info->min_dequeue_timeout_ns = dev->min_dequeue_timeout_ns;
-	dev_info->max_dequeue_timeout_ns = dev->max_dequeue_timeout_ns;
-	dev_info->max_event_queues = dev->max_event_queues;
-	dev_info->max_event_queue_flows = (1ULL << 20);
-	dev_info->max_event_queue_priority_levels = 8;
-	dev_info->max_event_priority_levels = 1;
-	dev_info->max_event_ports = dev->max_event_ports;
-	dev_info->max_event_port_dequeue_depth = 1;
-	dev_info->max_event_port_enqueue_depth = 1;
-	dev_info->max_num_events =  dev->max_num_events;
-	dev_info->event_dev_cap = RTE_EVENT_DEV_CAP_QUEUE_QOS |
-					RTE_EVENT_DEV_CAP_DISTRIBUTED_SCHED |
-					RTE_EVENT_DEV_CAP_QUEUE_ALL_TYPES |
-					RTE_EVENT_DEV_CAP_RUNTIME_PORT_LINK |
-					RTE_EVENT_DEV_CAP_MULTIPLE_QUEUE_PORT |
-					RTE_EVENT_DEV_CAP_NONSEQ_MODE |
-					RTE_EVENT_DEV_CAP_CARRY_FLOW_ID |
-					RTE_EVENT_DEV_CAP_MAINTENANCE_FREE;
-}
-
-static void
-sso_port_link_modify(struct otx2_ssogws *ws, uint8_t queue, uint8_t enable)
-{
-	uintptr_t base = OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op);
-	uint64_t val;
-
-	val = queue;
-	val |= 0ULL << 12; /* SET 0 */
-	val |= 0x8000800080000000; /* Dont modify rest of the masks */
-	val |= (uint64_t)enable << 14;   /* Enable/Disable Membership. */
-
-	otx2_write64(val, base + SSOW_LF_GWS_GRPMSK_CHG);
-}
-
-static int
-otx2_sso_port_link(struct rte_eventdev *event_dev, void *port,
-		   const uint8_t queues[], const uint8_t priorities[],
-		   uint16_t nb_links)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint8_t port_id = 0;
-	uint16_t link;
-
-	RTE_SET_USED(priorities);
-	for (link = 0; link < nb_links; link++) {
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *ws = port;
-
-			port_id = ws->port;
-			sso_port_link_modify((struct otx2_ssogws *)
-					&ws->ws_state[0], queues[link], true);
-			sso_port_link_modify((struct otx2_ssogws *)
-					&ws->ws_state[1], queues[link], true);
-		} else {
-			struct otx2_ssogws *ws = port;
-
-			port_id = ws->port;
-			sso_port_link_modify(ws, queues[link], true);
-		}
-	}
-	sso_func_trace("Port=%d nb_links=%d", port_id, nb_links);
-
-	return (int)nb_links;
-}
-
-static int
-otx2_sso_port_unlink(struct rte_eventdev *event_dev, void *port,
-		     uint8_t queues[], uint16_t nb_unlinks)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint8_t port_id = 0;
-	uint16_t unlink;
-
-	for (unlink = 0; unlink < nb_unlinks; unlink++) {
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *ws = port;
-
-			port_id = ws->port;
-			sso_port_link_modify((struct otx2_ssogws *)
-					&ws->ws_state[0], queues[unlink],
-					false);
-			sso_port_link_modify((struct otx2_ssogws *)
-					&ws->ws_state[1], queues[unlink],
-					false);
-		} else {
-			struct otx2_ssogws *ws = port;
-
-			port_id = ws->port;
-			sso_port_link_modify(ws, queues[unlink], false);
-		}
-	}
-	sso_func_trace("Port=%d nb_unlinks=%d", port_id, nb_unlinks);
-
-	return (int)nb_unlinks;
-}
-
-static int
-sso_hw_lf_cfg(struct otx2_mbox *mbox, enum otx2_sso_lf_type type,
-	      uint16_t nb_lf, uint8_t attach)
-{
-	if (attach) {
-		struct rsrc_attach_req *req;
-
-		req = otx2_mbox_alloc_msg_attach_resources(mbox);
-		switch (type) {
-		case SSO_LF_GGRP:
-			req->sso = nb_lf;
-			break;
-		case SSO_LF_GWS:
-			req->ssow = nb_lf;
-			break;
-		default:
-			return -EINVAL;
-		}
-		req->modify = true;
-		if (otx2_mbox_process(mbox) < 0)
-			return -EIO;
-	} else {
-		struct rsrc_detach_req *req;
-
-		req = otx2_mbox_alloc_msg_detach_resources(mbox);
-		switch (type) {
-		case SSO_LF_GGRP:
-			req->sso = true;
-			break;
-		case SSO_LF_GWS:
-			req->ssow = true;
-			break;
-		default:
-			return -EINVAL;
-		}
-		req->partial = true;
-		if (otx2_mbox_process(mbox) < 0)
-			return -EIO;
-	}
-
-	return 0;
-}
-
-static int
-sso_lf_cfg(struct otx2_sso_evdev *dev, struct otx2_mbox *mbox,
-	   enum otx2_sso_lf_type type, uint16_t nb_lf, uint8_t alloc)
-{
-	void *rsp;
-	int rc;
-
-	if (alloc) {
-		switch (type) {
-		case SSO_LF_GGRP:
-			{
-			struct sso_lf_alloc_req *req_ggrp;
-			req_ggrp = otx2_mbox_alloc_msg_sso_lf_alloc(mbox);
-			req_ggrp->hwgrps = nb_lf;
-			}
-			break;
-		case SSO_LF_GWS:
-			{
-			struct ssow_lf_alloc_req *req_hws;
-			req_hws = otx2_mbox_alloc_msg_ssow_lf_alloc(mbox);
-			req_hws->hws = nb_lf;
-			}
-			break;
-		default:
-			return -EINVAL;
-		}
-	} else {
-		switch (type) {
-		case SSO_LF_GGRP:
-			{
-			struct sso_lf_free_req *req_ggrp;
-			req_ggrp = otx2_mbox_alloc_msg_sso_lf_free(mbox);
-			req_ggrp->hwgrps = nb_lf;
-			}
-			break;
-		case SSO_LF_GWS:
-			{
-			struct ssow_lf_free_req *req_hws;
-			req_hws = otx2_mbox_alloc_msg_ssow_lf_free(mbox);
-			req_hws->hws = nb_lf;
-			}
-			break;
-		default:
-			return -EINVAL;
-		}
-	}
-
-	rc = otx2_mbox_process_msg_tmo(mbox, (void **)&rsp, ~0);
-	if (rc < 0)
-		return rc;
-
-	if (alloc && type == SSO_LF_GGRP) {
-		struct sso_lf_alloc_rsp *rsp_ggrp = rsp;
-
-		dev->xaq_buf_size = rsp_ggrp->xaq_buf_size;
-		dev->xae_waes = rsp_ggrp->xaq_wq_entries;
-		dev->iue = rsp_ggrp->in_unit_entries;
-	}
-
-	return 0;
-}
-
-static void
-otx2_sso_port_release(void *port)
-{
-	struct otx2_ssogws_cookie *gws_cookie = ssogws_get_cookie(port);
-	struct otx2_sso_evdev *dev;
-	int i;
-
-	if (!gws_cookie->configured)
-		goto free;
-
-	dev = sso_pmd_priv(gws_cookie->event_dev);
-	if (dev->dual_ws) {
-		struct otx2_ssogws_dual *ws = port;
-
-		for (i = 0; i < dev->nb_event_queues; i++) {
-			sso_port_link_modify((struct otx2_ssogws *)
-					     &ws->ws_state[0], i, false);
-			sso_port_link_modify((struct otx2_ssogws *)
-					     &ws->ws_state[1], i, false);
-		}
-		memset(ws, 0, sizeof(*ws));
-	} else {
-		struct otx2_ssogws *ws = port;
-
-		for (i = 0; i < dev->nb_event_queues; i++)
-			sso_port_link_modify(ws, i, false);
-		memset(ws, 0, sizeof(*ws));
-	}
-
-	memset(gws_cookie, 0, sizeof(*gws_cookie));
-
-free:
-	rte_free(gws_cookie);
-}
-
-static void
-otx2_sso_queue_release(struct rte_eventdev *event_dev, uint8_t queue_id)
-{
-	RTE_SET_USED(event_dev);
-	RTE_SET_USED(queue_id);
-}
-
-static void
-sso_restore_links(const struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint16_t *links_map;
-	int i, j;
-
-	for (i = 0; i < dev->nb_event_ports; i++) {
-		links_map = event_dev->data->links_map;
-		/* Point links_map to this port specific area */
-		links_map += (i * RTE_EVENT_MAX_QUEUES_PER_DEV);
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *ws;
-
-			ws = event_dev->data->ports[i];
-			for (j = 0; j < dev->nb_event_queues; j++) {
-				if (links_map[j] == 0xdead)
-					continue;
-				sso_port_link_modify((struct otx2_ssogws *)
-						&ws->ws_state[0], j, true);
-				sso_port_link_modify((struct otx2_ssogws *)
-						&ws->ws_state[1], j, true);
-				sso_func_trace("Restoring port %d queue %d "
-						"link", i, j);
-			}
-		} else {
-			struct otx2_ssogws *ws;
-
-			ws = event_dev->data->ports[i];
-			for (j = 0; j < dev->nb_event_queues; j++) {
-				if (links_map[j] == 0xdead)
-					continue;
-				sso_port_link_modify(ws, j, true);
-				sso_func_trace("Restoring port %d queue %d "
-						"link", i, j);
-			}
-		}
-	}
-}
-
-static void
-sso_set_port_ops(struct otx2_ssogws *ws, uintptr_t base)
-{
-	ws->tag_op		= base + SSOW_LF_GWS_TAG;
-	ws->wqp_op		= base + SSOW_LF_GWS_WQP;
-	ws->getwrk_op		= base + SSOW_LF_GWS_OP_GET_WORK;
-	ws->swtag_flush_op	= base + SSOW_LF_GWS_OP_SWTAG_FLUSH;
-	ws->swtag_norm_op	= base + SSOW_LF_GWS_OP_SWTAG_NORM;
-	ws->swtag_desched_op	= base + SSOW_LF_GWS_OP_SWTAG_DESCHED;
-}
-
-static int
-sso_configure_dual_ports(const struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	uint8_t vws = 0;
-	uint8_t nb_lf;
-	int i, rc;
-
-	otx2_sso_dbg("Configuring event ports %d", dev->nb_event_ports);
-
-	nb_lf = dev->nb_event_ports * 2;
-	/* Ask AF to attach required LFs. */
-	rc = sso_hw_lf_cfg(mbox, SSO_LF_GWS, nb_lf, true);
-	if (rc < 0) {
-		otx2_err("Failed to attach SSO GWS LF");
-		return -ENODEV;
-	}
-
-	if (sso_lf_cfg(dev, mbox, SSO_LF_GWS, nb_lf, true) < 0) {
-		sso_hw_lf_cfg(mbox, SSO_LF_GWS, nb_lf, false);
-		otx2_err("Failed to init SSO GWS LF");
-		return -ENODEV;
-	}
-
-	for (i = 0; i < dev->nb_event_ports; i++) {
-		struct otx2_ssogws_cookie *gws_cookie;
-		struct otx2_ssogws_dual *ws;
-		uintptr_t base;
-
-		if (event_dev->data->ports[i] != NULL) {
-			ws = event_dev->data->ports[i];
-		} else {
-			/* Allocate event port memory */
-			ws = rte_zmalloc_socket("otx2_sso_ws",
-					sizeof(struct otx2_ssogws_dual) +
-					RTE_CACHE_LINE_SIZE,
-					RTE_CACHE_LINE_SIZE,
-					event_dev->data->socket_id);
-			if (ws == NULL) {
-				otx2_err("Failed to alloc memory for port=%d",
-					 i);
-				rc = -ENOMEM;
-				break;
-			}
-
-			/* First cache line is reserved for cookie */
-			ws = (struct otx2_ssogws_dual *)
-				((uint8_t *)ws + RTE_CACHE_LINE_SIZE);
-		}
-
-		ws->port = i;
-		base = dev->bar2 + (RVU_BLOCK_ADDR_SSOW << 20 | vws << 12);
-		sso_set_port_ops((struct otx2_ssogws *)&ws->ws_state[0], base);
-		ws->base[0] = base;
-		vws++;
-
-		base = dev->bar2 + (RVU_BLOCK_ADDR_SSOW << 20 | vws << 12);
-		sso_set_port_ops((struct otx2_ssogws *)&ws->ws_state[1], base);
-		ws->base[1] = base;
-		vws++;
-
-		gws_cookie = ssogws_get_cookie(ws);
-		gws_cookie->event_dev = event_dev;
-		gws_cookie->configured = 1;
-
-		event_dev->data->ports[i] = ws;
-	}
-
-	if (rc < 0) {
-		sso_lf_cfg(dev, mbox, SSO_LF_GWS, nb_lf, false);
-		sso_hw_lf_cfg(mbox, SSO_LF_GWS, nb_lf, false);
-	}
-
-	return rc;
-}
-
-static int
-sso_configure_ports(const struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	uint8_t nb_lf;
-	int i, rc;
-
-	otx2_sso_dbg("Configuring event ports %d", dev->nb_event_ports);
-
-	nb_lf = dev->nb_event_ports;
-	/* Ask AF to attach required LFs. */
-	rc = sso_hw_lf_cfg(mbox, SSO_LF_GWS, nb_lf, true);
-	if (rc < 0) {
-		otx2_err("Failed to attach SSO GWS LF");
-		return -ENODEV;
-	}
-
-	if (sso_lf_cfg(dev, mbox, SSO_LF_GWS, nb_lf, true) < 0) {
-		sso_hw_lf_cfg(mbox, SSO_LF_GWS, nb_lf, false);
-		otx2_err("Failed to init SSO GWS LF");
-		return -ENODEV;
-	}
-
-	for (i = 0; i < nb_lf; i++) {
-		struct otx2_ssogws_cookie *gws_cookie;
-		struct otx2_ssogws *ws;
-		uintptr_t base;
-
-		if (event_dev->data->ports[i] != NULL) {
-			ws = event_dev->data->ports[i];
-		} else {
-			/* Allocate event port memory */
-			ws = rte_zmalloc_socket("otx2_sso_ws",
-						sizeof(struct otx2_ssogws) +
-						RTE_CACHE_LINE_SIZE,
-						RTE_CACHE_LINE_SIZE,
-						event_dev->data->socket_id);
-			if (ws == NULL) {
-				otx2_err("Failed to alloc memory for port=%d",
-					 i);
-				rc = -ENOMEM;
-				break;
-			}
-
-			/* First cache line is reserved for cookie */
-			ws = (struct otx2_ssogws *)
-				((uint8_t *)ws + RTE_CACHE_LINE_SIZE);
-		}
-
-		ws->port = i;
-		base = dev->bar2 + (RVU_BLOCK_ADDR_SSOW << 20 | i << 12);
-		sso_set_port_ops(ws, base);
-		ws->base = base;
-
-		gws_cookie = ssogws_get_cookie(ws);
-		gws_cookie->event_dev = event_dev;
-		gws_cookie->configured = 1;
-
-		event_dev->data->ports[i] = ws;
-	}
-
-	if (rc < 0) {
-		sso_lf_cfg(dev, mbox, SSO_LF_GWS, nb_lf, false);
-		sso_hw_lf_cfg(mbox, SSO_LF_GWS, nb_lf, false);
-	}
-
-	return rc;
-}
-
-static int
-sso_configure_queues(const struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	uint8_t nb_lf;
-	int rc;
-
-	otx2_sso_dbg("Configuring event queues %d", dev->nb_event_queues);
-
-	nb_lf = dev->nb_event_queues;
-	/* Ask AF to attach required LFs. */
-	rc = sso_hw_lf_cfg(mbox, SSO_LF_GGRP, nb_lf, true);
-	if (rc < 0) {
-		otx2_err("Failed to attach SSO GGRP LF");
-		return -ENODEV;
-	}
-
-	if (sso_lf_cfg(dev, mbox, SSO_LF_GGRP, nb_lf, true) < 0) {
-		sso_hw_lf_cfg(mbox, SSO_LF_GGRP, nb_lf, false);
-		otx2_err("Failed to init SSO GGRP LF");
-		return -ENODEV;
-	}
-
-	return rc;
-}
-
-static int
-sso_xaq_allocate(struct otx2_sso_evdev *dev)
-{
-	const struct rte_memzone *mz;
-	struct npa_aura_s *aura;
-	static int reconfig_cnt;
-	char pool_name[RTE_MEMZONE_NAMESIZE];
-	uint32_t xaq_cnt;
-	int rc;
-
-	if (dev->xaq_pool)
-		rte_mempool_free(dev->xaq_pool);
-
-	/*
-	 * Allocate memory for Add work backpressure.
-	 */
-	mz = rte_memzone_lookup(OTX2_SSO_FC_NAME);
-	if (mz == NULL)
-		mz = rte_memzone_reserve_aligned(OTX2_SSO_FC_NAME,
-						 OTX2_ALIGN +
-						 sizeof(struct npa_aura_s),
-						 rte_socket_id(),
-						 RTE_MEMZONE_IOVA_CONTIG,
-						 OTX2_ALIGN);
-	if (mz == NULL) {
-		otx2_err("Failed to allocate mem for fcmem");
-		return -ENOMEM;
-	}
-
-	dev->fc_iova = mz->iova;
-	dev->fc_mem = mz->addr;
-	*dev->fc_mem = 0;
-	aura = (struct npa_aura_s *)((uintptr_t)dev->fc_mem + OTX2_ALIGN);
-	memset(aura, 0, sizeof(struct npa_aura_s));
-
-	aura->fc_ena = 1;
-	aura->fc_addr = dev->fc_iova;
-	aura->fc_hyst_bits = 0; /* Store count on all updates */
-
-	/* Taken from HRM 14.3.3(4) */
-	xaq_cnt = dev->nb_event_queues * OTX2_SSO_XAQ_CACHE_CNT;
-	if (dev->xae_cnt)
-		xaq_cnt += dev->xae_cnt / dev->xae_waes;
-	else if (dev->adptr_xae_cnt)
-		xaq_cnt += (dev->adptr_xae_cnt / dev->xae_waes) +
-			(OTX2_SSO_XAQ_SLACK * dev->nb_event_queues);
-	else
-		xaq_cnt += (dev->iue / dev->xae_waes) +
-			(OTX2_SSO_XAQ_SLACK * dev->nb_event_queues);
-
-	otx2_sso_dbg("Configuring %d xaq buffers", xaq_cnt);
-	/* Setup XAQ based on number of nb queues. */
-	snprintf(pool_name, 30, "otx2_xaq_buf_pool_%d", reconfig_cnt);
-	dev->xaq_pool = (void *)rte_mempool_create_empty(pool_name,
-			xaq_cnt, dev->xaq_buf_size, 0, 0,
-			rte_socket_id(), 0);
-
-	if (dev->xaq_pool == NULL) {
-		otx2_err("Unable to create empty mempool.");
-		rte_memzone_free(mz);
-		return -ENOMEM;
-	}
-
-	rc = rte_mempool_set_ops_byname(dev->xaq_pool,
-					rte_mbuf_platform_mempool_ops(), aura);
-	if (rc != 0) {
-		otx2_err("Unable to set xaqpool ops.");
-		goto alloc_fail;
-	}
-
-	rc = rte_mempool_populate_default(dev->xaq_pool);
-	if (rc < 0) {
-		otx2_err("Unable to set populate xaqpool.");
-		goto alloc_fail;
-	}
-	reconfig_cnt++;
-	/* When SW does addwork (enqueue) check if there is space in XAQ by
-	 * comparing fc_addr above against the xaq_lmt calculated below.
-	 * There should be a minimum headroom (OTX2_SSO_XAQ_SLACK / 2) for SSO
-	 * to request XAQ to cache them even before enqueue is called.
-	 */
-	dev->xaq_lmt = xaq_cnt - (OTX2_SSO_XAQ_SLACK / 2 *
-				  dev->nb_event_queues);
-	dev->nb_xaq_cfg = xaq_cnt;
-
-	return 0;
-alloc_fail:
-	rte_mempool_free(dev->xaq_pool);
-	rte_memzone_free(mz);
-	return rc;
-}
-
-static int
-sso_ggrp_alloc_xaq(struct otx2_sso_evdev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct sso_hw_setconfig *req;
-
-	otx2_sso_dbg("Configuring XAQ for GGRPs");
-	req = otx2_mbox_alloc_msg_sso_hw_setconfig(mbox);
-	req->npa_pf_func = otx2_npa_pf_func_get();
-	req->npa_aura_id = npa_lf_aura_handle_to_aura(dev->xaq_pool->pool_id);
-	req->hwgrps = dev->nb_event_queues;
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-sso_ggrp_free_xaq(struct otx2_sso_evdev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct sso_release_xaq *req;
-
-	otx2_sso_dbg("Freeing XAQ for GGRPs");
-	req = otx2_mbox_alloc_msg_sso_hw_release_xaq_aura(mbox);
-	req->hwgrps = dev->nb_event_queues;
-
-	return otx2_mbox_process(mbox);
-}
-
-static void
-sso_lf_teardown(struct otx2_sso_evdev *dev,
-		enum otx2_sso_lf_type lf_type)
-{
-	uint8_t nb_lf;
-
-	switch (lf_type) {
-	case SSO_LF_GGRP:
-		nb_lf = dev->nb_event_queues;
-		break;
-	case SSO_LF_GWS:
-		nb_lf = dev->nb_event_ports;
-		nb_lf *= dev->dual_ws ? 2 : 1;
-		break;
-	default:
-		return;
-	}
-
-	sso_lf_cfg(dev, dev->mbox, lf_type, nb_lf, false);
-	sso_hw_lf_cfg(dev->mbox, lf_type, nb_lf, false);
-}
-
-static int
-otx2_sso_configure(const struct rte_eventdev *event_dev)
-{
-	struct rte_event_dev_config *conf = &event_dev->data->dev_conf;
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint32_t deq_tmo_ns;
-	int rc;
-
-	sso_func_trace();
-	deq_tmo_ns = conf->dequeue_timeout_ns;
-
-	if (deq_tmo_ns == 0)
-		deq_tmo_ns = dev->min_dequeue_timeout_ns;
-
-	if (deq_tmo_ns < dev->min_dequeue_timeout_ns ||
-	    deq_tmo_ns > dev->max_dequeue_timeout_ns) {
-		otx2_err("Unsupported dequeue timeout requested");
-		return -EINVAL;
-	}
-
-	if (conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT)
-		dev->is_timeout_deq = 1;
-
-	dev->deq_tmo_ns = deq_tmo_ns;
-
-	if (conf->nb_event_ports > dev->max_event_ports ||
-	    conf->nb_event_queues > dev->max_event_queues) {
-		otx2_err("Unsupported event queues/ports requested");
-		return -EINVAL;
-	}
-
-	if (conf->nb_event_port_dequeue_depth > 1) {
-		otx2_err("Unsupported event port deq depth requested");
-		return -EINVAL;
-	}
-
-	if (conf->nb_event_port_enqueue_depth > 1) {
-		otx2_err("Unsupported event port enq depth requested");
-		return -EINVAL;
-	}
-
-	if (dev->configured)
-		sso_unregister_irqs(event_dev);
-
-	if (dev->nb_event_queues) {
-		/* Finit any previous queues. */
-		sso_lf_teardown(dev, SSO_LF_GGRP);
-	}
-	if (dev->nb_event_ports) {
-		/* Finit any previous ports. */
-		sso_lf_teardown(dev, SSO_LF_GWS);
-	}
-
-	dev->nb_event_queues = conf->nb_event_queues;
-	dev->nb_event_ports = conf->nb_event_ports;
-
-	if (dev->dual_ws)
-		rc = sso_configure_dual_ports(event_dev);
-	else
-		rc = sso_configure_ports(event_dev);
-
-	if (rc < 0) {
-		otx2_err("Failed to configure event ports");
-		return -ENODEV;
-	}
-
-	if (sso_configure_queues(event_dev) < 0) {
-		otx2_err("Failed to configure event queues");
-		rc = -ENODEV;
-		goto teardown_hws;
-	}
-
-	if (sso_xaq_allocate(dev) < 0) {
-		rc = -ENOMEM;
-		goto teardown_hwggrp;
-	}
-
-	/* Restore any prior port-queue mapping. */
-	sso_restore_links(event_dev);
-	rc = sso_ggrp_alloc_xaq(dev);
-	if (rc < 0) {
-		otx2_err("Failed to alloc xaq to ggrp %d", rc);
-		goto teardown_hwggrp;
-	}
-
-	rc = sso_get_msix_offsets(event_dev);
-	if (rc < 0) {
-		otx2_err("Failed to get msix offsets %d", rc);
-		goto teardown_hwggrp;
-	}
-
-	rc = sso_register_irqs(event_dev);
-	if (rc < 0) {
-		otx2_err("Failed to register irq %d", rc);
-		goto teardown_hwggrp;
-	}
-
-	dev->configured = 1;
-	rte_mb();
-
-	return 0;
-teardown_hwggrp:
-	sso_lf_teardown(dev, SSO_LF_GGRP);
-teardown_hws:
-	sso_lf_teardown(dev, SSO_LF_GWS);
-	dev->nb_event_queues = 0;
-	dev->nb_event_ports = 0;
-	dev->configured = 0;
-	return rc;
-}
-
-static void
-otx2_sso_queue_def_conf(struct rte_eventdev *event_dev, uint8_t queue_id,
-			struct rte_event_queue_conf *queue_conf)
-{
-	RTE_SET_USED(event_dev);
-	RTE_SET_USED(queue_id);
-
-	queue_conf->nb_atomic_flows = (1ULL << 20);
-	queue_conf->nb_atomic_order_sequences = (1ULL << 20);
-	queue_conf->event_queue_cfg = RTE_EVENT_QUEUE_CFG_ALL_TYPES;
-	queue_conf->priority = RTE_EVENT_DEV_PRIORITY_NORMAL;
-}
-
-static int
-otx2_sso_queue_setup(struct rte_eventdev *event_dev, uint8_t queue_id,
-		     const struct rte_event_queue_conf *queue_conf)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct sso_grp_priority *req;
-	int rc;
-
-	sso_func_trace("Queue=%d prio=%d", queue_id, queue_conf->priority);
-
-	req = otx2_mbox_alloc_msg_sso_grp_set_priority(dev->mbox);
-	req->grp = queue_id;
-	req->weight = 0xFF;
-	req->affinity = 0xFF;
-	/* Normalize <0-255> to <0-7> */
-	req->priority = queue_conf->priority / 32;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to set priority queue=%d", queue_id);
-		return rc;
-	}
-
-	return 0;
-}
-
-static void
-otx2_sso_port_def_conf(struct rte_eventdev *event_dev, uint8_t port_id,
-		       struct rte_event_port_conf *port_conf)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-
-	RTE_SET_USED(port_id);
-	port_conf->new_event_threshold = dev->max_num_events;
-	port_conf->dequeue_depth = 1;
-	port_conf->enqueue_depth = 1;
-}
-
-static int
-otx2_sso_port_setup(struct rte_eventdev *event_dev, uint8_t port_id,
-		    const struct rte_event_port_conf *port_conf)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uintptr_t grps_base[OTX2_SSO_MAX_VHGRP] = {0};
-	uint64_t val;
-	uint16_t q;
-
-	sso_func_trace("Port=%d", port_id);
-	RTE_SET_USED(port_conf);
-
-	if (event_dev->data->ports[port_id] == NULL) {
-		otx2_err("Invalid port Id %d", port_id);
-		return -EINVAL;
-	}
-
-	for (q = 0; q < dev->nb_event_queues; q++) {
-		grps_base[q] = dev->bar2 + (RVU_BLOCK_ADDR_SSO << 20 | q << 12);
-		if (grps_base[q] == 0) {
-			otx2_err("Failed to get grp[%d] base addr", q);
-			return -EINVAL;
-		}
-	}
-
-	/* Set get_work timeout for HWS */
-	val = NSEC2USEC(dev->deq_tmo_ns) - 1;
-
-	if (dev->dual_ws) {
-		struct otx2_ssogws_dual *ws = event_dev->data->ports[port_id];
-
-		rte_memcpy(ws->grps_base, grps_base,
-			   sizeof(uintptr_t) * OTX2_SSO_MAX_VHGRP);
-		ws->fc_mem = dev->fc_mem;
-		ws->xaq_lmt = dev->xaq_lmt;
-		ws->tstamp = dev->tstamp;
-		otx2_write64(val, OTX2_SSOW_GET_BASE_ADDR(
-			     ws->ws_state[0].getwrk_op) + SSOW_LF_GWS_NW_TIM);
-		otx2_write64(val, OTX2_SSOW_GET_BASE_ADDR(
-			     ws->ws_state[1].getwrk_op) + SSOW_LF_GWS_NW_TIM);
-	} else {
-		struct otx2_ssogws *ws = event_dev->data->ports[port_id];
-		uintptr_t base = OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op);
-
-		rte_memcpy(ws->grps_base, grps_base,
-			   sizeof(uintptr_t) * OTX2_SSO_MAX_VHGRP);
-		ws->fc_mem = dev->fc_mem;
-		ws->xaq_lmt = dev->xaq_lmt;
-		ws->tstamp = dev->tstamp;
-		otx2_write64(val, base + SSOW_LF_GWS_NW_TIM);
-	}
-
-	otx2_sso_dbg("Port=%d ws=%p", port_id, event_dev->data->ports[port_id]);
-
-	return 0;
-}
-
-static int
-otx2_sso_timeout_ticks(struct rte_eventdev *event_dev, uint64_t ns,
-		       uint64_t *tmo_ticks)
-{
-	RTE_SET_USED(event_dev);
-	*tmo_ticks = NSEC2TICK(ns, rte_get_timer_hz());
-
-	return 0;
-}
-
-static void
-ssogws_dump(struct otx2_ssogws *ws, FILE *f)
-{
-	uintptr_t base = OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op);
-
-	fprintf(f, "SSOW_LF_GWS Base addr   0x%" PRIx64 "\n", (uint64_t)base);
-	fprintf(f, "SSOW_LF_GWS_LINKS       0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_LINKS));
-	fprintf(f, "SSOW_LF_GWS_PENDWQP     0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_PENDWQP));
-	fprintf(f, "SSOW_LF_GWS_PENDSTATE   0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_PENDSTATE));
-	fprintf(f, "SSOW_LF_GWS_NW_TIM      0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_NW_TIM));
-	fprintf(f, "SSOW_LF_GWS_TAG         0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_TAG));
-	fprintf(f, "SSOW_LF_GWS_WQP         0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_TAG));
-	fprintf(f, "SSOW_LF_GWS_SWTP        0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_SWTP));
-	fprintf(f, "SSOW_LF_GWS_PENDTAG     0x%" PRIx64 "\n",
-		otx2_read64(base + SSOW_LF_GWS_PENDTAG));
-}
-
-static void
-ssoggrp_dump(uintptr_t base, FILE *f)
-{
-	fprintf(f, "SSO_LF_GGRP Base addr   0x%" PRIx64 "\n", (uint64_t)base);
-	fprintf(f, "SSO_LF_GGRP_QCTL        0x%" PRIx64 "\n",
-		otx2_read64(base + SSO_LF_GGRP_QCTL));
-	fprintf(f, "SSO_LF_GGRP_XAQ_CNT     0x%" PRIx64 "\n",
-		otx2_read64(base + SSO_LF_GGRP_XAQ_CNT));
-	fprintf(f, "SSO_LF_GGRP_INT_THR     0x%" PRIx64 "\n",
-		otx2_read64(base + SSO_LF_GGRP_INT_THR));
-	fprintf(f, "SSO_LF_GGRP_INT_CNT     0x%" PRIX64 "\n",
-		otx2_read64(base + SSO_LF_GGRP_INT_CNT));
-	fprintf(f, "SSO_LF_GGRP_AQ_CNT      0x%" PRIX64 "\n",
-		otx2_read64(base + SSO_LF_GGRP_AQ_CNT));
-	fprintf(f, "SSO_LF_GGRP_AQ_THR      0x%" PRIX64 "\n",
-		otx2_read64(base + SSO_LF_GGRP_AQ_THR));
-	fprintf(f, "SSO_LF_GGRP_MISC_CNT    0x%" PRIx64 "\n",
-		otx2_read64(base + SSO_LF_GGRP_MISC_CNT));
-}
-
-static void
-otx2_sso_dump(struct rte_eventdev *event_dev, FILE *f)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint8_t queue;
-	uint8_t port;
-
-	fprintf(f, "[%s] SSO running in [%s] mode\n", __func__, dev->dual_ws ?
-		"dual_ws" : "single_ws");
-	/* Dump SSOW registers */
-	for (port = 0; port < dev->nb_event_ports; port++) {
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *ws =
-				event_dev->data->ports[port];
-
-			fprintf(f, "[%s] SSO dual workslot[%d] vws[%d] dump\n",
-				__func__, port, 0);
-			ssogws_dump((struct otx2_ssogws *)&ws->ws_state[0], f);
-			fprintf(f, "[%s]SSO dual workslot[%d] vws[%d] dump\n",
-				__func__, port, 1);
-			ssogws_dump((struct otx2_ssogws *)&ws->ws_state[1], f);
-		} else {
-			fprintf(f, "[%s]SSO single workslot[%d] dump\n",
-				__func__, port);
-			ssogws_dump(event_dev->data->ports[port], f);
-		}
-	}
-
-	/* Dump SSO registers */
-	for (queue = 0; queue < dev->nb_event_queues; queue++) {
-		fprintf(f, "[%s]SSO group[%d] dump\n", __func__, queue);
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *ws = event_dev->data->ports[0];
-			ssoggrp_dump(ws->grps_base[queue], f);
-		} else {
-			struct otx2_ssogws *ws = event_dev->data->ports[0];
-			ssoggrp_dump(ws->grps_base[queue], f);
-		}
-	}
-}
-
-static void
-otx2_handle_event(void *arg, struct rte_event event)
-{
-	struct rte_eventdev *event_dev = arg;
-
-	if (event_dev->dev_ops->dev_stop_flush != NULL)
-		event_dev->dev_ops->dev_stop_flush(event_dev->data->dev_id,
-				event, event_dev->data->dev_stop_flush_arg);
-}
-
-static void
-sso_qos_cfg(struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct sso_grp_qos_cfg *req;
-	uint16_t i;
-
-	for (i = 0; i < dev->qos_queue_cnt; i++) {
-		uint8_t xaq_prcnt = dev->qos_parse_data[i].xaq_prcnt;
-		uint8_t iaq_prcnt = dev->qos_parse_data[i].iaq_prcnt;
-		uint8_t taq_prcnt = dev->qos_parse_data[i].taq_prcnt;
-
-		if (dev->qos_parse_data[i].queue >= dev->nb_event_queues)
-			continue;
-
-		req = otx2_mbox_alloc_msg_sso_grp_qos_config(dev->mbox);
-		req->xaq_limit = (dev->nb_xaq_cfg *
-				  (xaq_prcnt ? xaq_prcnt : 100)) / 100;
-		req->taq_thr = (SSO_HWGRP_IAQ_MAX_THR_MASK *
-				(iaq_prcnt ? iaq_prcnt : 100)) / 100;
-		req->iaq_thr = (SSO_HWGRP_TAQ_MAX_THR_MASK *
-				(taq_prcnt ? taq_prcnt : 100)) / 100;
-	}
-
-	if (dev->qos_queue_cnt)
-		otx2_mbox_process(dev->mbox);
-}
-
-static void
-sso_cleanup(struct rte_eventdev *event_dev, uint8_t enable)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint16_t i;
-
-	for (i = 0; i < dev->nb_event_ports; i++) {
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *ws;
-
-			ws = event_dev->data->ports[i];
-			ssogws_reset((struct otx2_ssogws *)&ws->ws_state[0]);
-			ssogws_reset((struct otx2_ssogws *)&ws->ws_state[1]);
-			ws->swtag_req = 0;
-			ws->vws = 0;
-			ws->fc_mem = dev->fc_mem;
-			ws->xaq_lmt = dev->xaq_lmt;
-		} else {
-			struct otx2_ssogws *ws;
-
-			ws = event_dev->data->ports[i];
-			ssogws_reset(ws);
-			ws->swtag_req = 0;
-			ws->fc_mem = dev->fc_mem;
-			ws->xaq_lmt = dev->xaq_lmt;
-		}
-	}
-
-	rte_mb();
-	if (dev->dual_ws) {
-		struct otx2_ssogws_dual *ws = event_dev->data->ports[0];
-		struct otx2_ssogws temp_ws;
-
-		memcpy(&temp_ws, &ws->ws_state[0],
-		       sizeof(struct otx2_ssogws_state));
-		for (i = 0; i < dev->nb_event_queues; i++) {
-			/* Consume all the events through HWS0 */
-			ssogws_flush_events(&temp_ws, i, ws->grps_base[i],
-					    otx2_handle_event, event_dev);
-			/* Enable/Disable SSO GGRP */
-			otx2_write64(enable, ws->grps_base[i] +
-				     SSO_LF_GGRP_QCTL);
-		}
-	} else {
-		struct otx2_ssogws *ws = event_dev->data->ports[0];
-
-		for (i = 0; i < dev->nb_event_queues; i++) {
-			/* Consume all the events through HWS0 */
-			ssogws_flush_events(ws, i, ws->grps_base[i],
-					    otx2_handle_event, event_dev);
-			/* Enable/Disable SSO GGRP */
-			otx2_write64(enable, ws->grps_base[i] +
-				     SSO_LF_GGRP_QCTL);
-		}
-	}
-
-	/* reset SSO GWS cache */
-	otx2_mbox_alloc_msg_sso_ws_cache_inv(dev->mbox);
-	otx2_mbox_process(dev->mbox);
-}
-
-int
-sso_xae_reconfigure(struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	int rc = 0;
-
-	if (event_dev->data->dev_started)
-		sso_cleanup(event_dev, 0);
-
-	rc = sso_ggrp_free_xaq(dev);
-	if (rc < 0) {
-		otx2_err("Failed to free XAQ\n");
-		return rc;
-	}
-
-	rte_mempool_free(dev->xaq_pool);
-	dev->xaq_pool = NULL;
-	rc = sso_xaq_allocate(dev);
-	if (rc < 0) {
-		otx2_err("Failed to alloc xaq pool %d", rc);
-		return rc;
-	}
-	rc = sso_ggrp_alloc_xaq(dev);
-	if (rc < 0) {
-		otx2_err("Failed to alloc xaq to ggrp %d", rc);
-		return rc;
-	}
-
-	rte_mb();
-	if (event_dev->data->dev_started)
-		sso_cleanup(event_dev, 1);
-
-	return 0;
-}
-
-static int
-otx2_sso_start(struct rte_eventdev *event_dev)
-{
-	sso_func_trace();
-	sso_qos_cfg(event_dev);
-	sso_cleanup(event_dev, 1);
-	sso_fastpath_fns_set(event_dev);
-
-	return 0;
-}
-
-static void
-otx2_sso_stop(struct rte_eventdev *event_dev)
-{
-	sso_func_trace();
-	sso_cleanup(event_dev, 0);
-	rte_mb();
-}
-
-static int
-otx2_sso_close(struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint8_t all_queues[RTE_EVENT_MAX_QUEUES_PER_DEV];
-	uint16_t i;
-
-	if (!dev->configured)
-		return 0;
-
-	sso_unregister_irqs(event_dev);
-
-	for (i = 0; i < dev->nb_event_queues; i++)
-		all_queues[i] = i;
-
-	for (i = 0; i < dev->nb_event_ports; i++)
-		otx2_sso_port_unlink(event_dev, event_dev->data->ports[i],
-				     all_queues, dev->nb_event_queues);
-
-	sso_lf_teardown(dev, SSO_LF_GGRP);
-	sso_lf_teardown(dev, SSO_LF_GWS);
-	dev->nb_event_ports = 0;
-	dev->nb_event_queues = 0;
-	rte_mempool_free(dev->xaq_pool);
-	rte_memzone_free(rte_memzone_lookup(OTX2_SSO_FC_NAME));
-
-	return 0;
-}
-
-/* Initialize and register event driver with DPDK Application */
-static struct eventdev_ops otx2_sso_ops = {
-	.dev_infos_get    = otx2_sso_info_get,
-	.dev_configure    = otx2_sso_configure,
-	.queue_def_conf   = otx2_sso_queue_def_conf,
-	.queue_setup      = otx2_sso_queue_setup,
-	.queue_release    = otx2_sso_queue_release,
-	.port_def_conf    = otx2_sso_port_def_conf,
-	.port_setup       = otx2_sso_port_setup,
-	.port_release     = otx2_sso_port_release,
-	.port_link        = otx2_sso_port_link,
-	.port_unlink      = otx2_sso_port_unlink,
-	.timeout_ticks    = otx2_sso_timeout_ticks,
-
-	.eth_rx_adapter_caps_get  = otx2_sso_rx_adapter_caps_get,
-	.eth_rx_adapter_queue_add = otx2_sso_rx_adapter_queue_add,
-	.eth_rx_adapter_queue_del = otx2_sso_rx_adapter_queue_del,
-	.eth_rx_adapter_start = otx2_sso_rx_adapter_start,
-	.eth_rx_adapter_stop = otx2_sso_rx_adapter_stop,
-
-	.eth_tx_adapter_caps_get = otx2_sso_tx_adapter_caps_get,
-	.eth_tx_adapter_queue_add = otx2_sso_tx_adapter_queue_add,
-	.eth_tx_adapter_queue_del = otx2_sso_tx_adapter_queue_del,
-
-	.timer_adapter_caps_get = otx2_tim_caps_get,
-
-	.crypto_adapter_caps_get = otx2_ca_caps_get,
-	.crypto_adapter_queue_pair_add = otx2_ca_qp_add,
-	.crypto_adapter_queue_pair_del = otx2_ca_qp_del,
-
-	.xstats_get       = otx2_sso_xstats_get,
-	.xstats_reset     = otx2_sso_xstats_reset,
-	.xstats_get_names = otx2_sso_xstats_get_names,
-
-	.dump             = otx2_sso_dump,
-	.dev_start        = otx2_sso_start,
-	.dev_stop         = otx2_sso_stop,
-	.dev_close        = otx2_sso_close,
-	.dev_selftest     = otx2_sso_selftest,
-};
-
-#define OTX2_SSO_XAE_CNT	"xae_cnt"
-#define OTX2_SSO_SINGLE_WS	"single_ws"
-#define OTX2_SSO_GGRP_QOS	"qos"
-#define OTX2_SSO_FORCE_BP	"force_rx_bp"
-
-static void
-parse_queue_param(char *value, void *opaque)
-{
-	struct otx2_sso_qos queue_qos = {0};
-	uint8_t *val = (uint8_t *)&queue_qos;
-	struct otx2_sso_evdev *dev = opaque;
-	char *tok = strtok(value, "-");
-	struct otx2_sso_qos *old_ptr;
-
-	if (!strlen(value))
-		return;
-
-	while (tok != NULL) {
-		*val = atoi(tok);
-		tok = strtok(NULL, "-");
-		val++;
-	}
-
-	if (val != (&queue_qos.iaq_prcnt + 1)) {
-		otx2_err("Invalid QoS parameter expected [Qx-XAQ-TAQ-IAQ]");
-		return;
-	}
-
-	dev->qos_queue_cnt++;
-	old_ptr = dev->qos_parse_data;
-	dev->qos_parse_data = rte_realloc(dev->qos_parse_data,
-					  sizeof(struct otx2_sso_qos) *
-					  dev->qos_queue_cnt, 0);
-	if (dev->qos_parse_data == NULL) {
-		dev->qos_parse_data = old_ptr;
-		dev->qos_queue_cnt--;
-		return;
-	}
-	dev->qos_parse_data[dev->qos_queue_cnt - 1] = queue_qos;
-}
-
-static void
-parse_qos_list(const char *value, void *opaque)
-{
-	char *s = strdup(value);
-	char *start = NULL;
-	char *end = NULL;
-	char *f = s;
-
-	while (*s) {
-		if (*s == '[')
-			start = s;
-		else if (*s == ']')
-			end = s;
-
-		if (start && start < end) {
-			*end = 0;
-			parse_queue_param(start + 1, opaque);
-			s = end;
-			start = end;
-		}
-		s++;
-	}
-
-	free(f);
-}
-
-static int
-parse_sso_kvargs_dict(const char *key, const char *value, void *opaque)
-{
-	RTE_SET_USED(key);
-
-	/* Dict format [Qx-XAQ-TAQ-IAQ][Qz-XAQ-TAQ-IAQ] use '-' cause ','
-	 * isn't allowed. Everything is expressed in percentages, 0 represents
-	 * default.
-	 */
-	parse_qos_list(value, opaque);
-
-	return 0;
-}
-
-static void
-sso_parse_devargs(struct otx2_sso_evdev *dev, struct rte_devargs *devargs)
-{
-	struct rte_kvargs *kvlist;
-	uint8_t single_ws = 0;
-
-	if (devargs == NULL)
-		return;
-	kvlist = rte_kvargs_parse(devargs->args, NULL);
-	if (kvlist == NULL)
-		return;
-
-	rte_kvargs_process(kvlist, OTX2_SSO_XAE_CNT, &parse_kvargs_value,
-			   &dev->xae_cnt);
-	rte_kvargs_process(kvlist, OTX2_SSO_SINGLE_WS, &parse_kvargs_flag,
-			   &single_ws);
-	rte_kvargs_process(kvlist, OTX2_SSO_GGRP_QOS, &parse_sso_kvargs_dict,
-			   dev);
-	rte_kvargs_process(kvlist, OTX2_SSO_FORCE_BP, &parse_kvargs_flag,
-			   &dev->force_rx_bp);
-	otx2_parse_common_devargs(kvlist);
-	dev->dual_ws = !single_ws;
-	rte_kvargs_free(kvlist);
-}
-
-static int
-otx2_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
-{
-	return rte_event_pmd_pci_probe(pci_drv, pci_dev,
-				       sizeof(struct otx2_sso_evdev),
-				       otx2_sso_init);
-}
-
-static int
-otx2_sso_remove(struct rte_pci_device *pci_dev)
-{
-	return rte_event_pmd_pci_remove(pci_dev, otx2_sso_fini);
-}
-
-static const struct rte_pci_id pci_sso_map[] = {
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
-			       PCI_DEVID_OCTEONTX2_RVU_SSO_TIM_PF)
-	},
-	{
-		.vendor_id = 0,
-	},
-};
-
-static struct rte_pci_driver pci_sso = {
-	.id_table = pci_sso_map,
-	.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_NEED_IOVA_AS_VA,
-	.probe = otx2_sso_probe,
-	.remove = otx2_sso_remove,
-};
-
-int
-otx2_sso_init(struct rte_eventdev *event_dev)
-{
-	struct free_rsrcs_rsp *rsrc_cnt;
-	struct rte_pci_device *pci_dev;
-	struct otx2_sso_evdev *dev;
-	int rc;
-
-	event_dev->dev_ops = &otx2_sso_ops;
-	/* For secondary processes, the primary has done all the work */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-		sso_fastpath_fns_set(event_dev);
-		return 0;
-	}
-
-	dev = sso_pmd_priv(event_dev);
-
-	pci_dev = container_of(event_dev->dev, struct rte_pci_device, device);
-
-	/* Initialize the base otx2_dev object */
-	rc = otx2_dev_init(pci_dev, dev);
-	if (rc < 0) {
-		otx2_err("Failed to initialize otx2_dev rc=%d", rc);
-		goto error;
-	}
-
-	/* Get SSO and SSOW MSIX rsrc cnt */
-	otx2_mbox_alloc_msg_free_rsrc_cnt(dev->mbox);
-	rc = otx2_mbox_process_msg(dev->mbox, (void *)&rsrc_cnt);
-	if (rc < 0) {
-		otx2_err("Unable to get free rsrc count");
-		goto otx2_dev_uninit;
-	}
-	otx2_sso_dbg("SSO %d SSOW %d NPA %d provisioned", rsrc_cnt->sso,
-		     rsrc_cnt->ssow, rsrc_cnt->npa);
-
-	dev->max_event_ports = RTE_MIN(rsrc_cnt->ssow, OTX2_SSO_MAX_VHWS);
-	dev->max_event_queues = RTE_MIN(rsrc_cnt->sso, OTX2_SSO_MAX_VHGRP);
-	/* Grab the NPA LF if required */
-	rc = otx2_npa_lf_init(pci_dev, dev);
-	if (rc < 0) {
-		otx2_err("Unable to init NPA lf. It might not be provisioned");
-		goto otx2_dev_uninit;
-	}
-
-	dev->drv_inited = true;
-	dev->is_timeout_deq = 0;
-	dev->min_dequeue_timeout_ns = USEC2NSEC(1);
-	dev->max_dequeue_timeout_ns = USEC2NSEC(0x3FF);
-	dev->max_num_events = -1;
-	dev->nb_event_queues = 0;
-	dev->nb_event_ports = 0;
-
-	if (!dev->max_event_ports || !dev->max_event_queues) {
-		otx2_err("Not enough eventdev resource queues=%d ports=%d",
-			 dev->max_event_queues, dev->max_event_ports);
-		rc = -ENODEV;
-		goto otx2_npa_lf_uninit;
-	}
-
-	dev->dual_ws = 1;
-	sso_parse_devargs(dev, pci_dev->device.devargs);
-	if (dev->dual_ws) {
-		otx2_sso_dbg("Using dual workslot mode");
-		dev->max_event_ports = dev->max_event_ports / 2;
-	} else {
-		otx2_sso_dbg("Using single workslot mode");
-	}
-
-	otx2_sso_pf_func_set(dev->pf_func);
-	otx2_sso_dbg("Initializing %s max_queues=%d max_ports=%d",
-		     event_dev->data->name, dev->max_event_queues,
-		     dev->max_event_ports);
-
-	otx2_tim_init(pci_dev, (struct otx2_dev *)dev);
-
-	return 0;
-
-otx2_npa_lf_uninit:
-	otx2_npa_lf_fini();
-otx2_dev_uninit:
-	otx2_dev_fini(pci_dev, dev);
-error:
-	return rc;
-}
-
-int
-otx2_sso_fini(struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct rte_pci_device *pci_dev;
-
-	/* For secondary processes, nothing to be done */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	pci_dev = container_of(event_dev->dev, struct rte_pci_device, device);
-
-	if (!dev->drv_inited)
-		goto dev_fini;
-
-	dev->drv_inited = false;
-	otx2_npa_lf_fini();
-
-dev_fini:
-	if (otx2_npa_lf_active(dev)) {
-		otx2_info("Common resource in use by other devices");
-		return -EAGAIN;
-	}
-
-	otx2_tim_fini();
-	otx2_dev_fini(pci_dev, dev);
-
-	return 0;
-}
-
-RTE_PMD_REGISTER_PCI(event_octeontx2, pci_sso);
-RTE_PMD_REGISTER_PCI_TABLE(event_octeontx2, pci_sso_map);
-RTE_PMD_REGISTER_KMOD_DEP(event_octeontx2, "vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(event_octeontx2, OTX2_SSO_XAE_CNT "=<int>"
-			      OTX2_SSO_SINGLE_WS "=1"
-			      OTX2_SSO_GGRP_QOS "=<string>"
-			      OTX2_SSO_FORCE_BP "=1"
-			      OTX2_NPA_LOCK_MASK "=<1-65535>");
diff --git a/drivers/event/octeontx2/otx2_evdev.h b/drivers/event/octeontx2/otx2_evdev.h
deleted file mode 100644
index a5d34b7df7..0000000000
--- a/drivers/event/octeontx2/otx2_evdev.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_EVDEV_H__
-#define __OTX2_EVDEV_H__
-
-#include <rte_eventdev.h>
-#include <eventdev_pmd.h>
-#include <rte_event_eth_rx_adapter.h>
-#include <rte_event_eth_tx_adapter.h>
-
-#include "otx2_common.h"
-#include "otx2_dev.h"
-#include "otx2_ethdev.h"
-#include "otx2_mempool.h"
-#include "otx2_tim_evdev.h"
-
-#define EVENTDEV_NAME_OCTEONTX2_PMD event_octeontx2
-
-#define sso_func_trace otx2_sso_dbg
-
-#define OTX2_SSO_MAX_VHGRP                  RTE_EVENT_MAX_QUEUES_PER_DEV
-#define OTX2_SSO_MAX_VHWS                   (UINT8_MAX)
-#define OTX2_SSO_FC_NAME                    "otx2_evdev_xaq_fc"
-#define OTX2_SSO_SQB_LIMIT                  (0x180)
-#define OTX2_SSO_XAQ_SLACK                  (8)
-#define OTX2_SSO_XAQ_CACHE_CNT              (0x7)
-#define OTX2_SSO_WQE_SG_PTR                 (9)
-
-/* SSO LF register offsets (BAR2) */
-#define SSO_LF_GGRP_OP_ADD_WORK0            (0x0ull)
-#define SSO_LF_GGRP_OP_ADD_WORK1            (0x8ull)
-
-#define SSO_LF_GGRP_QCTL                    (0x20ull)
-#define SSO_LF_GGRP_EXE_DIS                 (0x80ull)
-#define SSO_LF_GGRP_INT                     (0x100ull)
-#define SSO_LF_GGRP_INT_W1S                 (0x108ull)
-#define SSO_LF_GGRP_INT_ENA_W1S             (0x110ull)
-#define SSO_LF_GGRP_INT_ENA_W1C             (0x118ull)
-#define SSO_LF_GGRP_INT_THR                 (0x140ull)
-#define SSO_LF_GGRP_INT_CNT                 (0x180ull)
-#define SSO_LF_GGRP_XAQ_CNT                 (0x1b0ull)
-#define SSO_LF_GGRP_AQ_CNT                  (0x1c0ull)
-#define SSO_LF_GGRP_AQ_THR                  (0x1e0ull)
-#define SSO_LF_GGRP_MISC_CNT                (0x200ull)
-
-/* SSOW LF register offsets (BAR2) */
-#define SSOW_LF_GWS_LINKS                   (0x10ull)
-#define SSOW_LF_GWS_PENDWQP                 (0x40ull)
-#define SSOW_LF_GWS_PENDSTATE               (0x50ull)
-#define SSOW_LF_GWS_NW_TIM                  (0x70ull)
-#define SSOW_LF_GWS_GRPMSK_CHG              (0x80ull)
-#define SSOW_LF_GWS_INT                     (0x100ull)
-#define SSOW_LF_GWS_INT_W1S                 (0x108ull)
-#define SSOW_LF_GWS_INT_ENA_W1S             (0x110ull)
-#define SSOW_LF_GWS_INT_ENA_W1C             (0x118ull)
-#define SSOW_LF_GWS_TAG                     (0x200ull)
-#define SSOW_LF_GWS_WQP                     (0x210ull)
-#define SSOW_LF_GWS_SWTP                    (0x220ull)
-#define SSOW_LF_GWS_PENDTAG                 (0x230ull)
-#define SSOW_LF_GWS_OP_ALLOC_WE             (0x400ull)
-#define SSOW_LF_GWS_OP_GET_WORK             (0x600ull)
-#define SSOW_LF_GWS_OP_SWTAG_FLUSH          (0x800ull)
-#define SSOW_LF_GWS_OP_SWTAG_UNTAG          (0x810ull)
-#define SSOW_LF_GWS_OP_SWTP_CLR             (0x820ull)
-#define SSOW_LF_GWS_OP_UPD_WQP_GRP0         (0x830ull)
-#define SSOW_LF_GWS_OP_UPD_WQP_GRP1         (0x838ull)
-#define SSOW_LF_GWS_OP_DESCHED              (0x880ull)
-#define SSOW_LF_GWS_OP_DESCHED_NOSCH        (0x8c0ull)
-#define SSOW_LF_GWS_OP_SWTAG_DESCHED        (0x980ull)
-#define SSOW_LF_GWS_OP_SWTAG_NOSCHED        (0x9c0ull)
-#define SSOW_LF_GWS_OP_CLR_NSCHED0          (0xa00ull)
-#define SSOW_LF_GWS_OP_CLR_NSCHED1          (0xa08ull)
-#define SSOW_LF_GWS_OP_SWTP_SET             (0xc00ull)
-#define SSOW_LF_GWS_OP_SWTAG_NORM           (0xc10ull)
-#define SSOW_LF_GWS_OP_SWTAG_FULL0          (0xc20ull)
-#define SSOW_LF_GWS_OP_SWTAG_FULL1          (0xc28ull)
-#define SSOW_LF_GWS_OP_GWC_INVAL            (0xe00ull)
-
-#define OTX2_SSOW_GET_BASE_ADDR(_GW)        ((_GW) - SSOW_LF_GWS_OP_GET_WORK)
-#define OTX2_SSOW_TT_FROM_TAG(x)	    (((x) >> 32) & SSO_TT_EMPTY)
-#define OTX2_SSOW_GRP_FROM_TAG(x)	    (((x) >> 36) & 0x3ff)
-
-#define NSEC2USEC(__ns)			((__ns) / 1E3)
-#define USEC2NSEC(__us)                 ((__us) * 1E3)
-#define NSEC2TICK(__ns, __freq)		(((__ns) * (__freq)) / 1E9)
-#define TICK2NSEC(__tck, __freq)	(((__tck) * 1E9) / (__freq))
-
-enum otx2_sso_lf_type {
-	SSO_LF_GGRP,
-	SSO_LF_GWS
-};
-
-union otx2_sso_event {
-	uint64_t get_work0;
-	struct {
-		uint32_t flow_id:20;
-		uint32_t sub_event_type:8;
-		uint32_t event_type:4;
-		uint8_t op:2;
-		uint8_t rsvd:4;
-		uint8_t sched_type:2;
-		uint8_t queue_id;
-		uint8_t priority;
-		uint8_t impl_opaque;
-	};
-} __rte_aligned(64);
-
-enum {
-	SSO_SYNC_ORDERED,
-	SSO_SYNC_ATOMIC,
-	SSO_SYNC_UNTAGGED,
-	SSO_SYNC_EMPTY
-};
-
-struct otx2_sso_qos {
-	uint8_t queue;
-	uint8_t xaq_prcnt;
-	uint8_t taq_prcnt;
-	uint8_t iaq_prcnt;
-};
-
-struct otx2_sso_evdev {
-	OTX2_DEV; /* Base class */
-	uint8_t max_event_queues;
-	uint8_t max_event_ports;
-	uint8_t is_timeout_deq;
-	uint8_t nb_event_queues;
-	uint8_t nb_event_ports;
-	uint8_t configured;
-	uint32_t deq_tmo_ns;
-	uint32_t min_dequeue_timeout_ns;
-	uint32_t max_dequeue_timeout_ns;
-	int32_t max_num_events;
-	uint64_t *fc_mem;
-	uint64_t xaq_lmt;
-	uint64_t nb_xaq_cfg;
-	rte_iova_t fc_iova;
-	struct rte_mempool *xaq_pool;
-	uint64_t rx_offloads;
-	uint64_t tx_offloads;
-	uint64_t adptr_xae_cnt;
-	uint16_t rx_adptr_pool_cnt;
-	uint64_t *rx_adptr_pools;
-	uint16_t max_port_id;
-	uint16_t tim_adptr_ring_cnt;
-	uint16_t *timer_adptr_rings;
-	uint64_t *timer_adptr_sz;
-	/* Dev args */
-	uint8_t dual_ws;
-	uint32_t xae_cnt;
-	uint8_t qos_queue_cnt;
-	uint8_t force_rx_bp;
-	struct otx2_sso_qos *qos_parse_data;
-	/* HW const */
-	uint32_t xae_waes;
-	uint32_t xaq_buf_size;
-	uint32_t iue;
-	/* MSIX offsets */
-	uint16_t sso_msixoff[OTX2_SSO_MAX_VHGRP];
-	uint16_t ssow_msixoff[OTX2_SSO_MAX_VHWS];
-	/* PTP timestamp */
-	struct otx2_timesync_info *tstamp;
-} __rte_cache_aligned;
-
-#define OTX2_SSOGWS_OPS                                                        \
-	/* WS ops */                                                           \
-	uintptr_t getwrk_op;                                                   \
-	uintptr_t tag_op;                                                      \
-	uintptr_t wqp_op;                                                      \
-	uintptr_t swtag_flush_op;                                              \
-	uintptr_t swtag_norm_op;                                               \
-	uintptr_t swtag_desched_op;
-
-/* Event port aka GWS */
-struct otx2_ssogws {
-	/* Get Work Fastpath data */
-	OTX2_SSOGWS_OPS;
-	/* PTP timestamp */
-	struct otx2_timesync_info *tstamp;
-	void *lookup_mem;
-	uint8_t swtag_req;
-	uint8_t port;
-	/* Add Work Fastpath data */
-	uint64_t xaq_lmt __rte_cache_aligned;
-	uint64_t *fc_mem;
-	uintptr_t grps_base[OTX2_SSO_MAX_VHGRP];
-	/* Tx Fastpath data */
-	uint64_t base __rte_cache_aligned;
-	uint8_t tx_adptr_data[];
-} __rte_cache_aligned;
-
-struct otx2_ssogws_state {
-	OTX2_SSOGWS_OPS;
-};
-
-struct otx2_ssogws_dual {
-	/* Get Work Fastpath data */
-	struct otx2_ssogws_state ws_state[2]; /* Ping and Pong */
-	/* PTP timestamp */
-	struct otx2_timesync_info *tstamp;
-	void *lookup_mem;
-	uint8_t swtag_req;
-	uint8_t vws; /* Ping pong bit */
-	uint8_t port;
-	/* Add Work Fastpath data */
-	uint64_t xaq_lmt __rte_cache_aligned;
-	uint64_t *fc_mem;
-	uintptr_t grps_base[OTX2_SSO_MAX_VHGRP];
-	/* Tx Fastpath data */
-	uint64_t base[2] __rte_cache_aligned;
-	uint8_t tx_adptr_data[];
-} __rte_cache_aligned;
-
-static inline struct otx2_sso_evdev *
-sso_pmd_priv(const struct rte_eventdev *event_dev)
-{
-	return event_dev->data->dev_private;
-}
-
-struct otx2_ssogws_cookie {
-	const struct rte_eventdev *event_dev;
-	bool configured;
-};
-
-static inline struct otx2_ssogws_cookie *
-ssogws_get_cookie(void *ws)
-{
-	return (struct otx2_ssogws_cookie *)
-		((uint8_t *)ws - RTE_CACHE_LINE_SIZE);
-}
-
-static const union mbuf_initializer mbuf_init = {
-	.fields = {
-		.data_off = RTE_PKTMBUF_HEADROOM,
-		.refcnt = 1,
-		.nb_segs = 1,
-		.port = 0
-	}
-};
-
-static __rte_always_inline void
-otx2_wqe_to_mbuf(uint64_t get_work1, const uint64_t mbuf, uint8_t port_id,
-		 const uint32_t tag, const uint32_t flags,
-		 const void * const lookup_mem)
-{
-	struct nix_wqe_hdr_s *wqe = (struct nix_wqe_hdr_s *)get_work1;
-	uint64_t val = mbuf_init.value | (uint64_t)port_id << 48;
-
-	if (flags & NIX_RX_OFFLOAD_TSTAMP_F)
-		val |= NIX_TIMESYNC_RX_OFFSET;
-
-	otx2_nix_cqe_to_mbuf((struct nix_cqe_hdr_s *)wqe, tag,
-			     (struct rte_mbuf *)mbuf, lookup_mem,
-			      val, flags);
-
-}
-
-static inline int
-parse_kvargs_flag(const char *key, const char *value, void *opaque)
-{
-	RTE_SET_USED(key);
-
-	*(uint8_t *)opaque = !!atoi(value);
-	return 0;
-}
-
-static inline int
-parse_kvargs_value(const char *key, const char *value, void *opaque)
-{
-	RTE_SET_USED(key);
-
-	*(uint32_t *)opaque = (uint32_t)atoi(value);
-	return 0;
-}
-
-#define SSO_RX_ADPTR_ENQ_FASTPATH_FUNC	NIX_RX_FASTPATH_MODES
-#define SSO_TX_ADPTR_ENQ_FASTPATH_FUNC	NIX_TX_FASTPATH_MODES
-
-/* Single WS API's */
-uint16_t otx2_ssogws_enq(void *port, const struct rte_event *ev);
-uint16_t otx2_ssogws_enq_burst(void *port, const struct rte_event ev[],
-			       uint16_t nb_events);
-uint16_t otx2_ssogws_enq_new_burst(void *port, const struct rte_event ev[],
-				   uint16_t nb_events);
-uint16_t otx2_ssogws_enq_fwd_burst(void *port, const struct rte_event ev[],
-				   uint16_t nb_events);
-
-/* Dual WS API's */
-uint16_t otx2_ssogws_dual_enq(void *port, const struct rte_event *ev);
-uint16_t otx2_ssogws_dual_enq_burst(void *port, const struct rte_event ev[],
-				    uint16_t nb_events);
-uint16_t otx2_ssogws_dual_enq_new_burst(void *port, const struct rte_event ev[],
-					uint16_t nb_events);
-uint16_t otx2_ssogws_dual_enq_fwd_burst(void *port, const struct rte_event ev[],
-					uint16_t nb_events);
-
-/* Auto generated API's */
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-uint16_t otx2_ssogws_deq_ ##name(void *port, struct rte_event *ev,	       \
-				 uint64_t timeout_ticks);		       \
-uint16_t otx2_ssogws_deq_burst_ ##name(void *port, struct rte_event ev[],      \
-				       uint16_t nb_events,		       \
-				       uint64_t timeout_ticks);		       \
-uint16_t otx2_ssogws_deq_timeout_ ##name(void *port,			       \
-					 struct rte_event *ev,		       \
-					 uint64_t timeout_ticks);	       \
-uint16_t otx2_ssogws_deq_timeout_burst_ ##name(void *port,		       \
-					       struct rte_event ev[],	       \
-					       uint16_t nb_events,	       \
-					       uint64_t timeout_ticks);	       \
-uint16_t otx2_ssogws_deq_seg_ ##name(void *port, struct rte_event *ev,	       \
-				     uint64_t timeout_ticks);		       \
-uint16_t otx2_ssogws_deq_seg_burst_ ##name(void *port,			       \
-					   struct rte_event ev[],	       \
-					   uint16_t nb_events,		       \
-					   uint64_t timeout_ticks);	       \
-uint16_t otx2_ssogws_deq_seg_timeout_ ##name(void *port,		       \
-					     struct rte_event *ev,	       \
-					     uint64_t timeout_ticks);	       \
-uint16_t otx2_ssogws_deq_seg_timeout_burst_ ##name(void *port,		       \
-						   struct rte_event ev[],      \
-						   uint16_t nb_events,	       \
-						   uint64_t timeout_ticks);    \
-									       \
-uint16_t otx2_ssogws_dual_deq_ ##name(void *port, struct rte_event *ev,	       \
-				      uint64_t timeout_ticks);		       \
-uint16_t otx2_ssogws_dual_deq_burst_ ##name(void *port,			       \
-					    struct rte_event ev[],	       \
-					    uint16_t nb_events,		       \
-					    uint64_t timeout_ticks);	       \
-uint16_t otx2_ssogws_dual_deq_timeout_ ##name(void *port,		       \
-					      struct rte_event *ev,	       \
-					      uint64_t timeout_ticks);	       \
-uint16_t otx2_ssogws_dual_deq_timeout_burst_ ##name(void *port,		       \
-						    struct rte_event ev[],     \
-						    uint16_t nb_events,	       \
-						    uint64_t timeout_ticks);   \
-uint16_t otx2_ssogws_dual_deq_seg_ ##name(void *port, struct rte_event *ev,    \
-					  uint64_t timeout_ticks);	       \
-uint16_t otx2_ssogws_dual_deq_seg_burst_ ##name(void *port,		       \
-						struct rte_event ev[],	       \
-						uint16_t nb_events,	       \
-						uint64_t timeout_ticks);       \
-uint16_t otx2_ssogws_dual_deq_seg_timeout_ ##name(void *port,		       \
-						  struct rte_event *ev,	       \
-						  uint64_t timeout_ticks);     \
-uint16_t otx2_ssogws_dual_deq_seg_timeout_burst_ ##name(void *port,	       \
-							struct rte_event ev[], \
-							uint16_t nb_events,    \
-						       uint64_t timeout_ticks);\
-
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			     \
-uint16_t otx2_ssogws_tx_adptr_enq_ ## name(void *port, struct rte_event ev[],\
-					   uint16_t nb_events);		     \
-uint16_t otx2_ssogws_tx_adptr_enq_seg_ ## name(void *port,		     \
-					       struct rte_event ev[],	     \
-					       uint16_t nb_events);	     \
-uint16_t otx2_ssogws_dual_tx_adptr_enq_ ## name(void *port,		     \
-						struct rte_event ev[],	     \
-						uint16_t nb_events);	     \
-uint16_t otx2_ssogws_dual_tx_adptr_enq_seg_ ## name(void *port,		     \
-						    struct rte_event ev[],   \
-						    uint16_t nb_events);     \
-
-SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-
-void sso_updt_xae_cnt(struct otx2_sso_evdev *dev, void *data,
-		      uint32_t event_type);
-int sso_xae_reconfigure(struct rte_eventdev *event_dev);
-void sso_fastpath_fns_set(struct rte_eventdev *event_dev);
-
-int otx2_sso_rx_adapter_caps_get(const struct rte_eventdev *event_dev,
-				 const struct rte_eth_dev *eth_dev,
-				 uint32_t *caps);
-int otx2_sso_rx_adapter_queue_add(const struct rte_eventdev *event_dev,
-				  const struct rte_eth_dev *eth_dev,
-				  int32_t rx_queue_id,
-		const struct rte_event_eth_rx_adapter_queue_conf *queue_conf);
-int otx2_sso_rx_adapter_queue_del(const struct rte_eventdev *event_dev,
-				  const struct rte_eth_dev *eth_dev,
-				  int32_t rx_queue_id);
-int otx2_sso_rx_adapter_start(const struct rte_eventdev *event_dev,
-			      const struct rte_eth_dev *eth_dev);
-int otx2_sso_rx_adapter_stop(const struct rte_eventdev *event_dev,
-			     const struct rte_eth_dev *eth_dev);
-int otx2_sso_tx_adapter_caps_get(const struct rte_eventdev *dev,
-				 const struct rte_eth_dev *eth_dev,
-				 uint32_t *caps);
-int otx2_sso_tx_adapter_queue_add(uint8_t id,
-				  const struct rte_eventdev *event_dev,
-				  const struct rte_eth_dev *eth_dev,
-				  int32_t tx_queue_id);
-
-int otx2_sso_tx_adapter_queue_del(uint8_t id,
-				  const struct rte_eventdev *event_dev,
-				  const struct rte_eth_dev *eth_dev,
-				  int32_t tx_queue_id);
-
-/* Event crypto adapter API's */
-int otx2_ca_caps_get(const struct rte_eventdev *dev,
-		     const struct rte_cryptodev *cdev, uint32_t *caps);
-
-int otx2_ca_qp_add(const struct rte_eventdev *dev,
-		   const struct rte_cryptodev *cdev, int32_t queue_pair_id,
-		   const struct rte_event *event);
-
-int otx2_ca_qp_del(const struct rte_eventdev *dev,
-		   const struct rte_cryptodev *cdev, int32_t queue_pair_id);
-
-/* Clean up API's */
-typedef void (*otx2_handle_event_t)(void *arg, struct rte_event ev);
-void ssogws_flush_events(struct otx2_ssogws *ws, uint8_t queue_id,
-			 uintptr_t base, otx2_handle_event_t fn, void *arg);
-void ssogws_reset(struct otx2_ssogws *ws);
-/* Selftest */
-int otx2_sso_selftest(void);
-/* Init and Fini API's */
-int otx2_sso_init(struct rte_eventdev *event_dev);
-int otx2_sso_fini(struct rte_eventdev *event_dev);
-/* IRQ handlers */
-int sso_register_irqs(const struct rte_eventdev *event_dev);
-void sso_unregister_irqs(const struct rte_eventdev *event_dev);
-
-#endif /* __OTX2_EVDEV_H__ */
diff --git a/drivers/event/octeontx2/otx2_evdev_adptr.c b/drivers/event/octeontx2/otx2_evdev_adptr.c
deleted file mode 100644
index a91f784b1e..0000000000
--- a/drivers/event/octeontx2/otx2_evdev_adptr.c
+++ /dev/null
@@ -1,656 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019-2021 Marvell.
- */
-
-#include "otx2_evdev.h"
-
-#define NIX_RQ_AURA_THRESH(x) (((x)*95) / 100)
-
-int
-otx2_sso_rx_adapter_caps_get(const struct rte_eventdev *event_dev,
-			     const struct rte_eth_dev *eth_dev, uint32_t *caps)
-{
-	int rc;
-
-	RTE_SET_USED(event_dev);
-	rc = strncmp(eth_dev->device->driver->name, "net_octeontx2", 13);
-	if (rc)
-		*caps = RTE_EVENT_ETH_RX_ADAPTER_SW_CAP;
-	else
-		*caps = RTE_EVENT_ETH_RX_ADAPTER_CAP_INTERNAL_PORT |
-			RTE_EVENT_ETH_RX_ADAPTER_CAP_MULTI_EVENTQ;
-
-	return 0;
-}
-
-static inline int
-sso_rxq_enable(struct otx2_eth_dev *dev, uint16_t qid, uint8_t tt, uint8_t ggrp,
-	       uint16_t eth_port_id)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_req *aq;
-	int rc;
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = qid;
-	aq->ctype = NIX_AQ_CTYPE_CQ;
-	aq->op = NIX_AQ_INSTOP_WRITE;
-
-	aq->cq.ena = 0;
-	aq->cq.caching = 0;
-
-	otx2_mbox_memset(&aq->cq_mask, 0, sizeof(struct nix_cq_ctx_s));
-	aq->cq_mask.ena = ~(aq->cq_mask.ena);
-	aq->cq_mask.caching = ~(aq->cq_mask.caching);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to disable cq context");
-		goto fail;
-	}
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = qid;
-	aq->ctype = NIX_AQ_CTYPE_RQ;
-	aq->op = NIX_AQ_INSTOP_WRITE;
-
-	aq->rq.sso_ena = 1;
-	aq->rq.sso_tt = tt;
-	aq->rq.sso_grp = ggrp;
-	aq->rq.ena_wqwd = 1;
-	/* Mbuf Header generation :
-	 * > FIRST_SKIP is a super set of WQE_SKIP, dont modify first skip as
-	 * it already has data related to mbuf size, headroom, private area.
-	 * > Using WQE_SKIP we can directly assign
-	 *		mbuf = wqe - sizeof(struct mbuf);
-	 * so that mbuf header will not have unpredicted values while headroom
-	 * and private data starts at the beginning of wqe_data.
-	 */
-	aq->rq.wqe_skip = 1;
-	aq->rq.wqe_caching = 1;
-	aq->rq.spb_ena = 0;
-	aq->rq.flow_tagw = 20; /* 20-bits */
-
-	/* Flow Tag calculation :
-	 *
-	 * rq_tag <31:24> = good/bad_tag<8:0>;
-	 * rq_tag  <23:0> = [ltag]
-	 *
-	 * flow_tag_mask<31:0> =  (1 << flow_tagw) - 1; <31:20>
-	 * tag<31:0> = (~flow_tag_mask & rq_tag) | (flow_tag_mask & flow_tag);
-	 *
-	 * Setup :
-	 * ltag<23:0> = (eth_port_id & 0xF) << 20;
-	 * good/bad_tag<8:0> =
-	 *	((eth_port_id >> 4) & 0xF) | (RTE_EVENT_TYPE_ETHDEV << 4);
-	 *
-	 * TAG<31:0> on getwork = <31:28>(RTE_EVENT_TYPE_ETHDEV) |
-	 *				<27:20> (eth_port_id) | <20:0> [TAG]
-	 */
-
-	aq->rq.ltag = (eth_port_id & 0xF) << 20;
-	aq->rq.good_utag = ((eth_port_id >> 4) & 0xF) |
-				(RTE_EVENT_TYPE_ETHDEV << 4);
-	aq->rq.bad_utag = aq->rq.good_utag;
-
-	aq->rq.ena = 0;		 /* Don't enable RQ yet */
-	aq->rq.pb_caching = 0x2; /* First cache aligned block to LLC */
-	aq->rq.xqe_imm_size = 0; /* No pkt data copy to CQE */
-
-	otx2_mbox_memset(&aq->rq_mask, 0, sizeof(struct nix_rq_ctx_s));
-	/* mask the bits to write. */
-	aq->rq_mask.sso_ena      = ~(aq->rq_mask.sso_ena);
-	aq->rq_mask.sso_tt       = ~(aq->rq_mask.sso_tt);
-	aq->rq_mask.sso_grp      = ~(aq->rq_mask.sso_grp);
-	aq->rq_mask.ena_wqwd     = ~(aq->rq_mask.ena_wqwd);
-	aq->rq_mask.wqe_skip     = ~(aq->rq_mask.wqe_skip);
-	aq->rq_mask.wqe_caching  = ~(aq->rq_mask.wqe_caching);
-	aq->rq_mask.spb_ena      = ~(aq->rq_mask.spb_ena);
-	aq->rq_mask.flow_tagw    = ~(aq->rq_mask.flow_tagw);
-	aq->rq_mask.ltag         = ~(aq->rq_mask.ltag);
-	aq->rq_mask.good_utag    = ~(aq->rq_mask.good_utag);
-	aq->rq_mask.bad_utag     = ~(aq->rq_mask.bad_utag);
-	aq->rq_mask.ena          = ~(aq->rq_mask.ena);
-	aq->rq_mask.pb_caching   = ~(aq->rq_mask.pb_caching);
-	aq->rq_mask.xqe_imm_size = ~(aq->rq_mask.xqe_imm_size);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to init rx adapter context");
-		goto fail;
-	}
-
-	return 0;
-fail:
-	return rc;
-}
-
-static inline int
-sso_rxq_disable(struct otx2_eth_dev *dev, uint16_t qid)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_req *aq;
-	int rc;
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = qid;
-	aq->ctype = NIX_AQ_CTYPE_CQ;
-	aq->op = NIX_AQ_INSTOP_WRITE;
-
-	aq->cq.ena = 1;
-	aq->cq.caching = 1;
-
-	otx2_mbox_memset(&aq->cq_mask, 0, sizeof(struct nix_cq_ctx_s));
-	aq->cq_mask.ena = ~(aq->cq_mask.ena);
-	aq->cq_mask.caching = ~(aq->cq_mask.caching);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to enable cq context");
-		goto fail;
-	}
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = qid;
-	aq->ctype = NIX_AQ_CTYPE_RQ;
-	aq->op = NIX_AQ_INSTOP_WRITE;
-
-	aq->rq.sso_ena = 0;
-	aq->rq.sso_tt = SSO_TT_UNTAGGED;
-	aq->rq.sso_grp = 0;
-	aq->rq.ena_wqwd = 0;
-	aq->rq.wqe_caching = 0;
-	aq->rq.wqe_skip = 0;
-	aq->rq.spb_ena = 0;
-	aq->rq.flow_tagw = 0x20;
-	aq->rq.ltag = 0;
-	aq->rq.good_utag = 0;
-	aq->rq.bad_utag = 0;
-	aq->rq.ena = 1;
-	aq->rq.pb_caching = 0x2; /* First cache aligned block to LLC */
-	aq->rq.xqe_imm_size = 0; /* No pkt data copy to CQE */
-
-	otx2_mbox_memset(&aq->rq_mask, 0, sizeof(struct nix_rq_ctx_s));
-	/* mask the bits to write. */
-	aq->rq_mask.sso_ena      = ~(aq->rq_mask.sso_ena);
-	aq->rq_mask.sso_tt       = ~(aq->rq_mask.sso_tt);
-	aq->rq_mask.sso_grp      = ~(aq->rq_mask.sso_grp);
-	aq->rq_mask.ena_wqwd     = ~(aq->rq_mask.ena_wqwd);
-	aq->rq_mask.wqe_caching  = ~(aq->rq_mask.wqe_caching);
-	aq->rq_mask.wqe_skip     = ~(aq->rq_mask.wqe_skip);
-	aq->rq_mask.spb_ena      = ~(aq->rq_mask.spb_ena);
-	aq->rq_mask.flow_tagw    = ~(aq->rq_mask.flow_tagw);
-	aq->rq_mask.ltag         = ~(aq->rq_mask.ltag);
-	aq->rq_mask.good_utag    = ~(aq->rq_mask.good_utag);
-	aq->rq_mask.bad_utag     = ~(aq->rq_mask.bad_utag);
-	aq->rq_mask.ena          = ~(aq->rq_mask.ena);
-	aq->rq_mask.pb_caching   = ~(aq->rq_mask.pb_caching);
-	aq->rq_mask.xqe_imm_size = ~(aq->rq_mask.xqe_imm_size);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to clear rx adapter context");
-		goto fail;
-	}
-
-	return 0;
-fail:
-	return rc;
-}
-
-void
-sso_updt_xae_cnt(struct otx2_sso_evdev *dev, void *data, uint32_t event_type)
-{
-	int i;
-
-	switch (event_type) {
-	case RTE_EVENT_TYPE_ETHDEV:
-	{
-		struct otx2_eth_rxq *rxq = data;
-		uint64_t *old_ptr;
-
-		for (i = 0; i < dev->rx_adptr_pool_cnt; i++) {
-			if ((uint64_t)rxq->pool == dev->rx_adptr_pools[i])
-				return;
-		}
-
-		dev->rx_adptr_pool_cnt++;
-		old_ptr = dev->rx_adptr_pools;
-		dev->rx_adptr_pools = rte_realloc(dev->rx_adptr_pools,
-						  sizeof(uint64_t) *
-						  dev->rx_adptr_pool_cnt, 0);
-		if (dev->rx_adptr_pools == NULL) {
-			dev->adptr_xae_cnt += rxq->pool->size;
-			dev->rx_adptr_pools = old_ptr;
-			dev->rx_adptr_pool_cnt--;
-			return;
-		}
-		dev->rx_adptr_pools[dev->rx_adptr_pool_cnt - 1] =
-			(uint64_t)rxq->pool;
-
-		dev->adptr_xae_cnt += rxq->pool->size;
-		break;
-	}
-	case RTE_EVENT_TYPE_TIMER:
-	{
-		struct otx2_tim_ring *timr = data;
-		uint16_t *old_ring_ptr;
-		uint64_t *old_sz_ptr;
-
-		for (i = 0; i < dev->tim_adptr_ring_cnt; i++) {
-			if (timr->ring_id != dev->timer_adptr_rings[i])
-				continue;
-			if (timr->nb_timers == dev->timer_adptr_sz[i])
-				return;
-			dev->adptr_xae_cnt -= dev->timer_adptr_sz[i];
-			dev->adptr_xae_cnt += timr->nb_timers;
-			dev->timer_adptr_sz[i] = timr->nb_timers;
-
-			return;
-		}
-
-		dev->tim_adptr_ring_cnt++;
-		old_ring_ptr = dev->timer_adptr_rings;
-		old_sz_ptr = dev->timer_adptr_sz;
-
-		dev->timer_adptr_rings = rte_realloc(dev->timer_adptr_rings,
-						     sizeof(uint16_t) *
-						     dev->tim_adptr_ring_cnt,
-						     0);
-		if (dev->timer_adptr_rings == NULL) {
-			dev->adptr_xae_cnt += timr->nb_timers;
-			dev->timer_adptr_rings = old_ring_ptr;
-			dev->tim_adptr_ring_cnt--;
-			return;
-		}
-
-		dev->timer_adptr_sz = rte_realloc(dev->timer_adptr_sz,
-						  sizeof(uint64_t) *
-						  dev->tim_adptr_ring_cnt,
-						  0);
-
-		if (dev->timer_adptr_sz == NULL) {
-			dev->adptr_xae_cnt += timr->nb_timers;
-			dev->timer_adptr_sz = old_sz_ptr;
-			dev->tim_adptr_ring_cnt--;
-			return;
-		}
-
-		dev->timer_adptr_rings[dev->tim_adptr_ring_cnt - 1] =
-			timr->ring_id;
-		dev->timer_adptr_sz[dev->tim_adptr_ring_cnt - 1] =
-			timr->nb_timers;
-
-		dev->adptr_xae_cnt += timr->nb_timers;
-		break;
-	}
-	default:
-		break;
-	}
-}
-
-static inline void
-sso_updt_lookup_mem(const struct rte_eventdev *event_dev, void *lookup_mem)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	int i;
-
-	for (i = 0; i < dev->nb_event_ports; i++) {
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *ws = event_dev->data->ports[i];
-
-			ws->lookup_mem = lookup_mem;
-		} else {
-			struct otx2_ssogws *ws = event_dev->data->ports[i];
-
-			ws->lookup_mem = lookup_mem;
-		}
-	}
-}
-
-static inline void
-sso_cfg_nix_mp_bpid(struct otx2_sso_evdev *dev,
-		    struct otx2_eth_dev *otx2_eth_dev, struct otx2_eth_rxq *rxq,
-		    uint8_t ena)
-{
-	struct otx2_fc_info *fc = &otx2_eth_dev->fc_info;
-	struct npa_aq_enq_req *req;
-	struct npa_aq_enq_rsp *rsp;
-	struct otx2_npa_lf *lf;
-	struct otx2_mbox *mbox;
-	uint32_t limit;
-	int rc;
-
-	if (otx2_dev_is_sdp(otx2_eth_dev))
-		return;
-
-	lf = otx2_npa_lf_obj_get();
-	if (!lf)
-		return;
-	mbox = lf->mbox;
-
-	req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	if (req == NULL)
-		return;
-
-	req->aura_id = npa_lf_aura_handle_to_aura(rxq->pool->pool_id);
-	req->ctype = NPA_AQ_CTYPE_AURA;
-	req->op = NPA_AQ_INSTOP_READ;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return;
-
-	limit = rsp->aura.limit;
-	/* BP is already enabled. */
-	if (rsp->aura.bp_ena) {
-		/* If BP ids don't match disable BP. */
-		if ((rsp->aura.nix0_bpid != fc->bpid[0]) && !dev->force_rx_bp) {
-			req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-			if (req == NULL)
-				return;
-
-			req->aura_id =
-				npa_lf_aura_handle_to_aura(rxq->pool->pool_id);
-			req->ctype = NPA_AQ_CTYPE_AURA;
-			req->op = NPA_AQ_INSTOP_WRITE;
-
-			req->aura.bp_ena = 0;
-			req->aura_mask.bp_ena = ~(req->aura_mask.bp_ena);
-
-			otx2_mbox_process(mbox);
-		}
-		return;
-	}
-
-	/* BP was previously enabled but now disabled skip. */
-	if (rsp->aura.bp)
-		return;
-
-	req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	if (req == NULL)
-		return;
-
-	req->aura_id = npa_lf_aura_handle_to_aura(rxq->pool->pool_id);
-	req->ctype = NPA_AQ_CTYPE_AURA;
-	req->op = NPA_AQ_INSTOP_WRITE;
-
-	if (ena) {
-		req->aura.nix0_bpid = fc->bpid[0];
-		req->aura_mask.nix0_bpid = ~(req->aura_mask.nix0_bpid);
-		req->aura.bp = NIX_RQ_AURA_THRESH(
-			limit > 128 ? 256 : limit); /* 95% of size*/
-		req->aura_mask.bp = ~(req->aura_mask.bp);
-	}
-
-	req->aura.bp_ena = !!ena;
-	req->aura_mask.bp_ena = ~(req->aura_mask.bp_ena);
-
-	otx2_mbox_process(mbox);
-}
-
-int
-otx2_sso_rx_adapter_queue_add(const struct rte_eventdev *event_dev,
-			      const struct rte_eth_dev *eth_dev,
-			      int32_t rx_queue_id,
-		const struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
-{
-	struct otx2_eth_dev *otx2_eth_dev = eth_dev->data->dev_private;
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint16_t port = eth_dev->data->port_id;
-	struct otx2_eth_rxq *rxq;
-	int i, rc;
-
-	rc = strncmp(eth_dev->device->driver->name, "net_octeontx2", 13);
-	if (rc)
-		return -EINVAL;
-
-	if (rx_queue_id < 0) {
-		for (i = 0 ; i < eth_dev->data->nb_rx_queues; i++) {
-			rxq = eth_dev->data->rx_queues[i];
-			sso_updt_xae_cnt(dev, rxq, RTE_EVENT_TYPE_ETHDEV);
-			sso_cfg_nix_mp_bpid(dev, otx2_eth_dev, rxq, true);
-			rc = sso_xae_reconfigure(
-				(struct rte_eventdev *)(uintptr_t)event_dev);
-			rc |= sso_rxq_enable(otx2_eth_dev, i,
-					     queue_conf->ev.sched_type,
-					     queue_conf->ev.queue_id, port);
-		}
-		rxq = eth_dev->data->rx_queues[0];
-		sso_updt_lookup_mem(event_dev, rxq->lookup_mem);
-	} else {
-		rxq = eth_dev->data->rx_queues[rx_queue_id];
-		sso_updt_xae_cnt(dev, rxq, RTE_EVENT_TYPE_ETHDEV);
-		sso_cfg_nix_mp_bpid(dev, otx2_eth_dev, rxq, true);
-		rc = sso_xae_reconfigure((struct rte_eventdev *)
-					 (uintptr_t)event_dev);
-		rc |= sso_rxq_enable(otx2_eth_dev, (uint16_t)rx_queue_id,
-				     queue_conf->ev.sched_type,
-				     queue_conf->ev.queue_id, port);
-		sso_updt_lookup_mem(event_dev, rxq->lookup_mem);
-	}
-
-	if (rc < 0) {
-		otx2_err("Failed to configure Rx adapter port=%d, q=%d", port,
-			 queue_conf->ev.queue_id);
-		return rc;
-	}
-
-	dev->rx_offloads |= otx2_eth_dev->rx_offload_flags;
-	dev->tstamp = &otx2_eth_dev->tstamp;
-	sso_fastpath_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
-
-	return 0;
-}
-
-int
-otx2_sso_rx_adapter_queue_del(const struct rte_eventdev *event_dev,
-			      const struct rte_eth_dev *eth_dev,
-			      int32_t rx_queue_id)
-{
-	struct otx2_eth_dev *otx2_eth_dev = eth_dev->data->dev_private;
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	int i, rc;
-
-	rc = strncmp(eth_dev->device->driver->name, "net_octeontx2", 13);
-	if (rc)
-		return -EINVAL;
-
-	if (rx_queue_id < 0) {
-		for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-			rc = sso_rxq_disable(otx2_eth_dev, i);
-			sso_cfg_nix_mp_bpid(dev, otx2_eth_dev,
-					    eth_dev->data->rx_queues[i], false);
-		}
-	} else {
-		rc = sso_rxq_disable(otx2_eth_dev, (uint16_t)rx_queue_id);
-		sso_cfg_nix_mp_bpid(dev, otx2_eth_dev,
-				    eth_dev->data->rx_queues[rx_queue_id],
-				    false);
-	}
-
-	if (rc < 0)
-		otx2_err("Failed to clear Rx adapter config port=%d, q=%d",
-			 eth_dev->data->port_id, rx_queue_id);
-
-	return rc;
-}
-
-int
-otx2_sso_rx_adapter_start(const struct rte_eventdev *event_dev,
-			  const struct rte_eth_dev *eth_dev)
-{
-	RTE_SET_USED(event_dev);
-	RTE_SET_USED(eth_dev);
-
-	return 0;
-}
-
-int
-otx2_sso_rx_adapter_stop(const struct rte_eventdev *event_dev,
-			 const struct rte_eth_dev *eth_dev)
-{
-	RTE_SET_USED(event_dev);
-	RTE_SET_USED(eth_dev);
-
-	return 0;
-}
-
-int
-otx2_sso_tx_adapter_caps_get(const struct rte_eventdev *dev,
-			     const struct rte_eth_dev *eth_dev, uint32_t *caps)
-{
-	int ret;
-
-	RTE_SET_USED(dev);
-	ret = strncmp(eth_dev->device->driver->name, "net_octeontx2,", 13);
-	if (ret)
-		*caps = 0;
-	else
-		*caps = RTE_EVENT_ETH_TX_ADAPTER_CAP_INTERNAL_PORT;
-
-	return 0;
-}
-
-static int
-sso_sqb_aura_limit_edit(struct rte_mempool *mp, uint16_t nb_sqb_bufs)
-{
-	struct otx2_npa_lf *npa_lf = otx2_intra_dev_get_cfg()->npa_lf;
-	struct npa_aq_enq_req *aura_req;
-
-	aura_req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-	aura_req->aura_id = npa_lf_aura_handle_to_aura(mp->pool_id);
-	aura_req->ctype = NPA_AQ_CTYPE_AURA;
-	aura_req->op = NPA_AQ_INSTOP_WRITE;
-
-	aura_req->aura.limit = nb_sqb_bufs;
-	aura_req->aura_mask.limit = ~(aura_req->aura_mask.limit);
-
-	return otx2_mbox_process(npa_lf->mbox);
-}
-
-static int
-sso_add_tx_queue_data(const struct rte_eventdev *event_dev,
-		      uint16_t eth_port_id, uint16_t tx_queue_id,
-		      struct otx2_eth_txq *txq)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	int i;
-
-	for (i = 0; i < event_dev->data->nb_ports; i++) {
-		dev->max_port_id = RTE_MAX(dev->max_port_id, eth_port_id);
-		if (dev->dual_ws) {
-			struct otx2_ssogws_dual *old_dws;
-			struct otx2_ssogws_dual *dws;
-
-			old_dws = event_dev->data->ports[i];
-			dws = rte_realloc_socket(ssogws_get_cookie(old_dws),
-						 sizeof(struct otx2_ssogws_dual)
-						 + RTE_CACHE_LINE_SIZE +
-						 (sizeof(uint64_t) *
-						    (dev->max_port_id + 1) *
-						    RTE_MAX_QUEUES_PER_PORT),
-						 RTE_CACHE_LINE_SIZE,
-						 event_dev->data->socket_id);
-			if (dws == NULL)
-				return -ENOMEM;
-
-			/* First cache line is reserved for cookie */
-			dws = (struct otx2_ssogws_dual *)
-				((uint8_t *)dws + RTE_CACHE_LINE_SIZE);
-
-			((uint64_t (*)[RTE_MAX_QUEUES_PER_PORT]
-			 )&dws->tx_adptr_data)[eth_port_id][tx_queue_id] =
-				(uint64_t)txq;
-			event_dev->data->ports[i] = dws;
-		} else {
-			struct otx2_ssogws *old_ws;
-			struct otx2_ssogws *ws;
-
-			old_ws = event_dev->data->ports[i];
-			ws = rte_realloc_socket(ssogws_get_cookie(old_ws),
-						sizeof(struct otx2_ssogws) +
-						RTE_CACHE_LINE_SIZE +
-						(sizeof(uint64_t) *
-						 (dev->max_port_id + 1) *
-						 RTE_MAX_QUEUES_PER_PORT),
-						RTE_CACHE_LINE_SIZE,
-						event_dev->data->socket_id);
-			if (ws == NULL)
-				return -ENOMEM;
-
-			/* First cache line is reserved for cookie */
-			ws = (struct otx2_ssogws *)
-				((uint8_t *)ws + RTE_CACHE_LINE_SIZE);
-
-			((uint64_t (*)[RTE_MAX_QUEUES_PER_PORT]
-			 )&ws->tx_adptr_data)[eth_port_id][tx_queue_id] =
-				(uint64_t)txq;
-			event_dev->data->ports[i] = ws;
-		}
-	}
-
-	return 0;
-}
-
-int
-otx2_sso_tx_adapter_queue_add(uint8_t id, const struct rte_eventdev *event_dev,
-			      const struct rte_eth_dev *eth_dev,
-			      int32_t tx_queue_id)
-{
-	struct otx2_eth_dev *otx2_eth_dev = eth_dev->data->dev_private;
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct otx2_eth_txq *txq;
-	int i, ret;
-
-	RTE_SET_USED(id);
-	if (tx_queue_id < 0) {
-		for (i = 0 ; i < eth_dev->data->nb_tx_queues; i++) {
-			txq = eth_dev->data->tx_queues[i];
-			sso_sqb_aura_limit_edit(txq->sqb_pool,
-					OTX2_SSO_SQB_LIMIT);
-			ret = sso_add_tx_queue_data(event_dev,
-						    eth_dev->data->port_id, i,
-						    txq);
-			if (ret < 0)
-				return ret;
-		}
-	} else {
-		txq = eth_dev->data->tx_queues[tx_queue_id];
-		sso_sqb_aura_limit_edit(txq->sqb_pool, OTX2_SSO_SQB_LIMIT);
-		ret = sso_add_tx_queue_data(event_dev, eth_dev->data->port_id,
-					    tx_queue_id, txq);
-		if (ret < 0)
-			return ret;
-	}
-
-	dev->tx_offloads |= otx2_eth_dev->tx_offload_flags;
-	sso_fastpath_fns_set((struct rte_eventdev *)(uintptr_t)event_dev);
-
-	return 0;
-}
-
-int
-otx2_sso_tx_adapter_queue_del(uint8_t id, const struct rte_eventdev *event_dev,
-			      const struct rte_eth_dev *eth_dev,
-			      int32_t tx_queue_id)
-{
-	struct otx2_eth_txq *txq;
-	int i;
-
-	RTE_SET_USED(id);
-	RTE_SET_USED(eth_dev);
-	RTE_SET_USED(event_dev);
-	if (tx_queue_id < 0) {
-		for (i = 0 ; i < eth_dev->data->nb_tx_queues; i++) {
-			txq = eth_dev->data->tx_queues[i];
-			sso_sqb_aura_limit_edit(txq->sqb_pool,
-						txq->nb_sqb_bufs);
-		}
-	} else {
-		txq = eth_dev->data->tx_queues[tx_queue_id];
-		sso_sqb_aura_limit_edit(txq->sqb_pool, txq->nb_sqb_bufs);
-	}
-
-	return 0;
-}
diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c b/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
deleted file mode 100644
index d59d6c53f6..0000000000
--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020-2021 Marvell.
- */
-
-#include <cryptodev_pmd.h>
-#include <rte_eventdev.h>
-
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_hw_access.h"
-#include "otx2_cryptodev_qp.h"
-#include "otx2_cryptodev_mbox.h"
-#include "otx2_evdev.h"
-
-int
-otx2_ca_caps_get(const struct rte_eventdev *dev,
-		const struct rte_cryptodev *cdev, uint32_t *caps)
-{
-	RTE_SET_USED(dev);
-	RTE_SET_USED(cdev);
-
-	*caps = RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_QP_EV_BIND |
-		RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_NEW |
-		RTE_EVENT_CRYPTO_ADAPTER_CAP_INTERNAL_PORT_OP_FWD;
-
-	return 0;
-}
-
-static int
-otx2_ca_qp_sso_link(const struct rte_cryptodev *cdev, struct otx2_cpt_qp *qp,
-		    uint16_t sso_pf_func)
-{
-	union otx2_cpt_af_lf_ctl2 af_lf_ctl2;
-	int ret;
-
-	ret = otx2_cpt_af_reg_read(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
-				   qp->blkaddr, &af_lf_ctl2.u);
-	if (ret)
-		return ret;
-
-	af_lf_ctl2.s.sso_pf_func = sso_pf_func;
-	ret = otx2_cpt_af_reg_write(cdev, OTX2_CPT_AF_LF_CTL2(qp->id),
-				    qp->blkaddr, af_lf_ctl2.u);
-	return ret;
-}
-
-static void
-otx2_ca_qp_init(struct otx2_cpt_qp *qp, const struct rte_event *event)
-{
-	if (event) {
-		qp->qp_ev_bind = 1;
-		rte_memcpy(&qp->ev, event, sizeof(struct rte_event));
-	} else {
-		qp->qp_ev_bind = 0;
-	}
-	qp->ca_enable = 1;
-}
-
-int
-otx2_ca_qp_add(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev,
-		int32_t queue_pair_id, const struct rte_event *event)
-{
-	struct otx2_sso_evdev *sso_evdev = sso_pmd_priv(dev);
-	struct otx2_cpt_vf *vf = cdev->data->dev_private;
-	uint16_t sso_pf_func = otx2_sso_pf_func_get();
-	struct otx2_cpt_qp *qp;
-	uint8_t qp_id;
-	int ret;
-
-	if (queue_pair_id == -1) {
-		for (qp_id = 0; qp_id < vf->nb_queues; qp_id++) {
-			qp = cdev->data->queue_pairs[qp_id];
-			ret = otx2_ca_qp_sso_link(cdev, qp, sso_pf_func);
-			if (ret) {
-				uint8_t qp_tmp;
-				for (qp_tmp = 0; qp_tmp < qp_id; qp_tmp++)
-					otx2_ca_qp_del(dev, cdev, qp_tmp);
-				return ret;
-			}
-			otx2_ca_qp_init(qp, event);
-		}
-	} else {
-		qp = cdev->data->queue_pairs[queue_pair_id];
-		ret = otx2_ca_qp_sso_link(cdev, qp, sso_pf_func);
-		if (ret)
-			return ret;
-		otx2_ca_qp_init(qp, event);
-	}
-
-	sso_evdev->rx_offloads |= NIX_RX_OFFLOAD_SECURITY_F;
-	sso_fastpath_fns_set((struct rte_eventdev *)(uintptr_t)dev);
-
-	/* Update crypto adapter xae count */
-	if (queue_pair_id == -1)
-		sso_evdev->adptr_xae_cnt +=
-			vf->nb_queues * OTX2_CPT_DEFAULT_CMD_QLEN;
-	else
-		sso_evdev->adptr_xae_cnt += OTX2_CPT_DEFAULT_CMD_QLEN;
-	sso_xae_reconfigure((struct rte_eventdev *)(uintptr_t)dev);
-
-	return 0;
-}
-
-int
-otx2_ca_qp_del(const struct rte_eventdev *dev, const struct rte_cryptodev *cdev,
-		int32_t queue_pair_id)
-{
-	struct otx2_cpt_vf *vf = cdev->data->dev_private;
-	struct otx2_cpt_qp *qp;
-	uint8_t qp_id;
-	int ret;
-
-	RTE_SET_USED(dev);
-
-	ret = 0;
-	if (queue_pair_id == -1) {
-		for (qp_id = 0; qp_id < vf->nb_queues; qp_id++) {
-			qp = cdev->data->queue_pairs[qp_id];
-			ret = otx2_ca_qp_sso_link(cdev, qp, 0);
-			if (ret)
-				return ret;
-			qp->ca_enable = 0;
-		}
-	} else {
-		qp = cdev->data->queue_pairs[queue_pair_id];
-		ret = otx2_ca_qp_sso_link(cdev, qp, 0);
-		if (ret)
-			return ret;
-		qp->ca_enable = 0;
-	}
-
-	return 0;
-}
diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h
deleted file mode 100644
index b33cb7e139..0000000000
--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#ifndef _OTX2_EVDEV_CRYPTO_ADPTR_RX_H_
-#define _OTX2_EVDEV_CRYPTO_ADPTR_RX_H_
-
-#include <rte_cryptodev.h>
-#include <cryptodev_pmd.h>
-#include <rte_eventdev.h>
-
-#include "cpt_pmd_logs.h"
-#include "cpt_ucode.h"
-
-#include "otx2_cryptodev.h"
-#include "otx2_cryptodev_hw_access.h"
-#include "otx2_cryptodev_ops_helper.h"
-#include "otx2_cryptodev_qp.h"
-
-static inline void
-otx2_ca_deq_post_process(const struct otx2_cpt_qp *qp,
-			 struct rte_crypto_op *cop, uintptr_t *rsp,
-			 uint8_t cc)
-{
-	if (cop->type == RTE_CRYPTO_OP_TYPE_SYMMETRIC) {
-		if (likely(cc == NO_ERR)) {
-			/* Verify authentication data if required */
-			if (unlikely(rsp[2]))
-				compl_auth_verify(cop, (uint8_t *)rsp[2],
-						 rsp[3]);
-			else
-				cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
-		} else {
-			if (cc == ERR_GC_ICV_MISCOMPARE)
-				cop->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
-			else
-				cop->status = RTE_CRYPTO_OP_STATUS_ERROR;
-		}
-
-		if (unlikely(cop->sess_type == RTE_CRYPTO_OP_SESSIONLESS)) {
-			sym_session_clear(otx2_cryptodev_driver_id,
-					  cop->sym->session);
-			memset(cop->sym->session, 0,
-			rte_cryptodev_sym_get_existing_header_session_size(
-				cop->sym->session));
-			rte_mempool_put(qp->sess_mp, cop->sym->session);
-			cop->sym->session = NULL;
-		}
-	}
-
-}
-
-static inline uint64_t
-otx2_handle_crypto_event(uint64_t get_work1)
-{
-	struct cpt_request_info *req;
-	const struct otx2_cpt_qp *qp;
-	struct rte_crypto_op *cop;
-	uintptr_t *rsp;
-	void *metabuf;
-	uint8_t cc;
-
-	req = (struct cpt_request_info *)(get_work1);
-	cc = otx2_cpt_compcode_get(req);
-	qp = req->qp;
-
-	rsp = req->op;
-	metabuf = (void *)rsp[0];
-	cop = (void *)rsp[1];
-
-	otx2_ca_deq_post_process(qp, cop, rsp, cc);
-
-	rte_mempool_put(qp->meta_info.pool, metabuf);
-
-	return (uint64_t)(cop);
-}
-#endif /* _OTX2_EVDEV_CRYPTO_ADPTR_RX_H_ */
diff --git a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h b/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h
deleted file mode 100644
index 1fc56f903b..0000000000
--- a/drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2021 Marvell International Ltd.
- */
-
-#ifndef _OTX2_EVDEV_CRYPTO_ADPTR_TX_H_
-#define _OTX2_EVDEV_CRYPTO_ADPTR_TX_H_
-
-#include <rte_cryptodev.h>
-#include <cryptodev_pmd.h>
-#include <rte_event_crypto_adapter.h>
-#include <rte_eventdev.h>
-
-#include <otx2_cryptodev_qp.h>
-#include <otx2_worker.h>
-
-static inline uint16_t
-otx2_ca_enq(uintptr_t tag_op, const struct rte_event *ev)
-{
-	union rte_event_crypto_metadata *m_data;
-	struct rte_crypto_op *crypto_op;
-	struct rte_cryptodev *cdev;
-	struct otx2_cpt_qp *qp;
-	uint8_t cdev_id;
-	uint16_t qp_id;
-
-	crypto_op = ev->event_ptr;
-	if (crypto_op == NULL)
-		return 0;
-
-	if (crypto_op->sess_type == RTE_CRYPTO_OP_WITH_SESSION) {
-		m_data = rte_cryptodev_sym_session_get_user_data(
-						crypto_op->sym->session);
-		if (m_data == NULL)
-			goto free_op;
-
-		cdev_id = m_data->request_info.cdev_id;
-		qp_id = m_data->request_info.queue_pair_id;
-	} else if (crypto_op->sess_type == RTE_CRYPTO_OP_SESSIONLESS &&
-		   crypto_op->private_data_offset) {
-		m_data = (union rte_event_crypto_metadata *)
-			 ((uint8_t *)crypto_op +
-			  crypto_op->private_data_offset);
-		cdev_id = m_data->request_info.cdev_id;
-		qp_id = m_data->request_info.queue_pair_id;
-	} else {
-		goto free_op;
-	}
-
-	cdev = &rte_cryptodevs[cdev_id];
-	qp = cdev->data->queue_pairs[qp_id];
-
-	if (!ev->sched_type)
-		otx2_ssogws_head_wait(tag_op);
-	if (qp->ca_enable)
-		return cdev->enqueue_burst(qp, &crypto_op, 1);
-
-free_op:
-	rte_pktmbuf_free(crypto_op->sym->m_src);
-	rte_crypto_op_free(crypto_op);
-	rte_errno = EINVAL;
-	return 0;
-}
-
-static uint16_t __rte_hot
-otx2_ssogws_ca_enq(void *port, struct rte_event ev[], uint16_t nb_events)
-{
-	struct otx2_ssogws *ws = port;
-
-	RTE_SET_USED(nb_events);
-
-	return otx2_ca_enq(ws->tag_op, ev);
-}
-
-static uint16_t __rte_hot
-otx2_ssogws_dual_ca_enq(void *port, struct rte_event ev[], uint16_t nb_events)
-{
-	struct otx2_ssogws_dual *ws = port;
-
-	RTE_SET_USED(nb_events);
-
-	return otx2_ca_enq(ws->ws_state[!ws->vws].tag_op, ev);
-}
-#endif /* _OTX2_EVDEV_CRYPTO_ADPTR_TX_H_ */
diff --git a/drivers/event/octeontx2/otx2_evdev_irq.c b/drivers/event/octeontx2/otx2_evdev_irq.c
deleted file mode 100644
index 9b7ad27b04..0000000000
--- a/drivers/event/octeontx2/otx2_evdev_irq.c
+++ /dev/null
@@ -1,272 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_evdev.h"
-#include "otx2_tim_evdev.h"
-
-static void
-sso_lf_irq(void *param)
-{
-	uintptr_t base = (uintptr_t)param;
-	uint64_t intr;
-	uint8_t ggrp;
-
-	ggrp = (base >> 12) & 0xFF;
-
-	intr = otx2_read64(base + SSO_LF_GGRP_INT);
-	if (intr == 0)
-		return;
-
-	otx2_err("GGRP %d GGRP_INT=0x%" PRIx64 "", ggrp, intr);
-
-	/* Clear interrupt */
-	otx2_write64(intr, base + SSO_LF_GGRP_INT);
-}
-
-static int
-sso_lf_register_irq(const struct rte_eventdev *event_dev, uint16_t ggrp_msixoff,
-		    uintptr_t base)
-{
-	struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(event_dev->dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int rc, vec;
-
-	vec = ggrp_msixoff + SSO_LF_INT_VEC_GRP;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + SSO_LF_GGRP_INT_ENA_W1C);
-	/* Set used interrupt vectors */
-	rc = otx2_register_irq(handle, sso_lf_irq, (void *)base, vec);
-	/* Enable hw interrupt */
-	otx2_write64(~0ull, base + SSO_LF_GGRP_INT_ENA_W1S);
-
-	return rc;
-}
-
-static void
-ssow_lf_irq(void *param)
-{
-	uintptr_t base = (uintptr_t)param;
-	uint8_t gws = (base >> 12) & 0xFF;
-	uint64_t intr;
-
-	intr = otx2_read64(base + SSOW_LF_GWS_INT);
-	if (intr == 0)
-		return;
-
-	otx2_err("GWS %d GWS_INT=0x%" PRIx64 "", gws, intr);
-
-	/* Clear interrupt */
-	otx2_write64(intr, base + SSOW_LF_GWS_INT);
-}
-
-static int
-ssow_lf_register_irq(const struct rte_eventdev *event_dev, uint16_t gws_msixoff,
-		     uintptr_t base)
-{
-	struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(event_dev->dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int rc, vec;
-
-	vec = gws_msixoff + SSOW_LF_INT_VEC_IOP;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + SSOW_LF_GWS_INT_ENA_W1C);
-	/* Set used interrupt vectors */
-	rc = otx2_register_irq(handle, ssow_lf_irq, (void *)base, vec);
-	/* Enable hw interrupt */
-	otx2_write64(~0ull, base + SSOW_LF_GWS_INT_ENA_W1S);
-
-	return rc;
-}
-
-static void
-sso_lf_unregister_irq(const struct rte_eventdev *event_dev,
-		      uint16_t ggrp_msixoff, uintptr_t base)
-{
-	struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(event_dev->dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int vec;
-
-	vec = ggrp_msixoff + SSO_LF_INT_VEC_GRP;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + SSO_LF_GGRP_INT_ENA_W1C);
-	otx2_unregister_irq(handle, sso_lf_irq, (void *)base, vec);
-}
-
-static void
-ssow_lf_unregister_irq(const struct rte_eventdev *event_dev,
-		       uint16_t gws_msixoff, uintptr_t base)
-{
-	struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(event_dev->dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int vec;
-
-	vec = gws_msixoff + SSOW_LF_INT_VEC_IOP;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + SSOW_LF_GWS_INT_ENA_W1C);
-	otx2_unregister_irq(handle, ssow_lf_irq, (void *)base, vec);
-}
-
-int
-sso_register_irqs(const struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	int i, rc = -EINVAL;
-	uint8_t nb_ports;
-
-	nb_ports = dev->nb_event_ports * (dev->dual_ws ? 2 : 1);
-
-	for (i = 0; i < dev->nb_event_queues; i++) {
-		if (dev->sso_msixoff[i] == MSIX_VECTOR_INVALID) {
-			otx2_err("Invalid SSOLF MSIX offset[%d] vector: 0x%x",
-				 i, dev->sso_msixoff[i]);
-			goto fail;
-		}
-	}
-
-	for (i = 0; i < nb_ports; i++) {
-		if (dev->ssow_msixoff[i] == MSIX_VECTOR_INVALID) {
-			otx2_err("Invalid SSOWLF MSIX offset[%d] vector: 0x%x",
-				 i, dev->ssow_msixoff[i]);
-			goto fail;
-		}
-	}
-
-	for (i = 0; i < dev->nb_event_queues; i++) {
-		uintptr_t base = dev->bar2 + (RVU_BLOCK_ADDR_SSO << 20 |
-					      i << 12);
-		rc = sso_lf_register_irq(event_dev, dev->sso_msixoff[i], base);
-	}
-
-	for (i = 0; i < nb_ports; i++) {
-		uintptr_t base = dev->bar2 + (RVU_BLOCK_ADDR_SSOW << 20 |
-					      i << 12);
-		rc = ssow_lf_register_irq(event_dev, dev->ssow_msixoff[i],
-					  base);
-	}
-
-fail:
-	return rc;
-}
-
-void
-sso_unregister_irqs(const struct rte_eventdev *event_dev)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint8_t nb_ports;
-	int i;
-
-	nb_ports = dev->nb_event_ports * (dev->dual_ws ? 2 : 1);
-
-	for (i = 0; i < dev->nb_event_queues; i++) {
-		uintptr_t base = dev->bar2 + (RVU_BLOCK_ADDR_SSO << 20 |
-					      i << 12);
-		sso_lf_unregister_irq(event_dev, dev->sso_msixoff[i], base);
-	}
-
-	for (i = 0; i < nb_ports; i++) {
-		uintptr_t base = dev->bar2 + (RVU_BLOCK_ADDR_SSOW << 20 |
-					      i << 12);
-		ssow_lf_unregister_irq(event_dev, dev->ssow_msixoff[i], base);
-	}
-}
-
-static void
-tim_lf_irq(void *param)
-{
-	uintptr_t base = (uintptr_t)param;
-	uint64_t intr;
-	uint8_t ring;
-
-	ring = (base >> 12) & 0xFF;
-
-	intr = otx2_read64(base + TIM_LF_NRSPERR_INT);
-	otx2_err("TIM RING %d TIM_LF_NRSPERR_INT=0x%" PRIx64 "", ring, intr);
-	intr = otx2_read64(base + TIM_LF_RAS_INT);
-	otx2_err("TIM RING %d TIM_LF_RAS_INT=0x%" PRIx64 "", ring, intr);
-
-	/* Clear interrupt */
-	otx2_write64(intr, base + TIM_LF_NRSPERR_INT);
-	otx2_write64(intr, base + TIM_LF_RAS_INT);
-}
-
-static int
-tim_lf_register_irq(struct rte_pci_device *pci_dev, uint16_t tim_msixoff,
-		    uintptr_t base)
-{
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int rc, vec;
-
-	vec = tim_msixoff + TIM_LF_INT_VEC_NRSPERR_INT;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + TIM_LF_NRSPERR_INT);
-	/* Set used interrupt vectors */
-	rc = otx2_register_irq(handle, tim_lf_irq, (void *)base, vec);
-	/* Enable hw interrupt */
-	otx2_write64(~0ull, base + TIM_LF_NRSPERR_INT_ENA_W1S);
-
-	vec = tim_msixoff + TIM_LF_INT_VEC_RAS_INT;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + TIM_LF_RAS_INT);
-	/* Set used interrupt vectors */
-	rc = otx2_register_irq(handle, tim_lf_irq, (void *)base, vec);
-	/* Enable hw interrupt */
-	otx2_write64(~0ull, base + TIM_LF_RAS_INT_ENA_W1S);
-
-	return rc;
-}
-
-static void
-tim_lf_unregister_irq(struct rte_pci_device *pci_dev, uint16_t tim_msixoff,
-		      uintptr_t base)
-{
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	int vec;
-
-	vec = tim_msixoff + TIM_LF_INT_VEC_NRSPERR_INT;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + TIM_LF_NRSPERR_INT_ENA_W1C);
-	otx2_unregister_irq(handle, tim_lf_irq, (void *)base, vec);
-
-	vec = tim_msixoff + TIM_LF_INT_VEC_RAS_INT;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, base + TIM_LF_RAS_INT_ENA_W1C);
-	otx2_unregister_irq(handle, tim_lf_irq, (void *)base, vec);
-}
-
-int
-tim_register_irq(uint16_t ring_id)
-{
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	int rc = -EINVAL;
-	uintptr_t base;
-
-	if (dev->tim_msixoff[ring_id] == MSIX_VECTOR_INVALID) {
-		otx2_err("Invalid TIMLF MSIX offset[%d] vector: 0x%x",
-			 ring_id, dev->tim_msixoff[ring_id]);
-		goto fail;
-	}
-
-	base = dev->bar2 + (RVU_BLOCK_ADDR_TIM << 20 | ring_id << 12);
-	rc = tim_lf_register_irq(dev->pci_dev, dev->tim_msixoff[ring_id], base);
-fail:
-	return rc;
-}
-
-void
-tim_unregister_irq(uint16_t ring_id)
-{
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	uintptr_t base;
-
-	base = dev->bar2 + (RVU_BLOCK_ADDR_TIM << 20 | ring_id << 12);
-	tim_lf_unregister_irq(dev->pci_dev, dev->tim_msixoff[ring_id], base);
-}
diff --git a/drivers/event/octeontx2/otx2_evdev_selftest.c b/drivers/event/octeontx2/otx2_evdev_selftest.c
deleted file mode 100644
index 48bfaf893d..0000000000
--- a/drivers/event/octeontx2/otx2_evdev_selftest.c
+++ /dev/null
@@ -1,1517 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_atomic.h>
-#include <rte_common.h>
-#include <rte_cycles.h>
-#include <rte_debug.h>
-#include <rte_eal.h>
-#include <rte_ethdev.h>
-#include <rte_eventdev.h>
-#include <rte_hexdump.h>
-#include <rte_launch.h>
-#include <rte_lcore.h>
-#include <rte_mbuf.h>
-#include <rte_malloc.h>
-#include <rte_memcpy.h>
-#include <rte_per_lcore.h>
-#include <rte_random.h>
-#include <rte_test.h>
-
-#include "otx2_evdev.h"
-
-#define NUM_PACKETS (1024)
-#define MAX_EVENTS  (1024)
-
-#define OCTEONTX2_TEST_RUN(setup, teardown, test) \
-	octeontx_test_run(setup, teardown, test, #test)
-
-static int total;
-static int passed;
-static int failed;
-static int unsupported;
-
-static int evdev;
-static struct rte_mempool *eventdev_test_mempool;
-
-struct event_attr {
-	uint32_t flow_id;
-	uint8_t event_type;
-	uint8_t sub_event_type;
-	uint8_t sched_type;
-	uint8_t queue;
-	uint8_t port;
-};
-
-static uint32_t seqn_list_index;
-static int seqn_list[NUM_PACKETS];
-
-static inline void
-seqn_list_init(void)
-{
-	RTE_BUILD_BUG_ON(NUM_PACKETS < MAX_EVENTS);
-	memset(seqn_list, 0, sizeof(seqn_list));
-	seqn_list_index = 0;
-}
-
-static inline int
-seqn_list_update(int val)
-{
-	if (seqn_list_index >= NUM_PACKETS)
-		return -1;
-
-	seqn_list[seqn_list_index++] = val;
-	rte_smp_wmb();
-	return 0;
-}
-
-static inline int
-seqn_list_check(int limit)
-{
-	int i;
-
-	for (i = 0; i < limit; i++) {
-		if (seqn_list[i] != i) {
-			otx2_err("Seqn mismatch %d %d", seqn_list[i], i);
-			return -1;
-		}
-	}
-	return 0;
-}
-
-struct test_core_param {
-	rte_atomic32_t *total_events;
-	uint64_t dequeue_tmo_ticks;
-	uint8_t port;
-	uint8_t sched_type;
-};
-
-static int
-testsuite_setup(void)
-{
-	const char *eventdev_name = "event_octeontx2";
-
-	evdev = rte_event_dev_get_dev_id(eventdev_name);
-	if (evdev < 0) {
-		otx2_err("%d: Eventdev %s not found", __LINE__, eventdev_name);
-		return -1;
-	}
-	return 0;
-}
-
-static void
-testsuite_teardown(void)
-{
-	rte_event_dev_close(evdev);
-}
-
-static inline void
-devconf_set_default_sane_values(struct rte_event_dev_config *dev_conf,
-				struct rte_event_dev_info *info)
-{
-	memset(dev_conf, 0, sizeof(struct rte_event_dev_config));
-	dev_conf->dequeue_timeout_ns = info->min_dequeue_timeout_ns;
-	dev_conf->nb_event_ports = info->max_event_ports;
-	dev_conf->nb_event_queues = info->max_event_queues;
-	dev_conf->nb_event_queue_flows = info->max_event_queue_flows;
-	dev_conf->nb_event_port_dequeue_depth =
-			info->max_event_port_dequeue_depth;
-	dev_conf->nb_event_port_enqueue_depth =
-			info->max_event_port_enqueue_depth;
-	dev_conf->nb_event_port_enqueue_depth =
-			info->max_event_port_enqueue_depth;
-	dev_conf->nb_events_limit =
-			info->max_num_events;
-}
-
-enum {
-	TEST_EVENTDEV_SETUP_DEFAULT,
-	TEST_EVENTDEV_SETUP_PRIORITY,
-	TEST_EVENTDEV_SETUP_DEQUEUE_TIMEOUT,
-};
-
-static inline int
-_eventdev_setup(int mode)
-{
-	const char *pool_name = "evdev_octeontx_test_pool";
-	struct rte_event_dev_config dev_conf;
-	struct rte_event_dev_info info;
-	int i, ret;
-
-	/* Create and destrory pool for each test case to make it standalone */
-	eventdev_test_mempool = rte_pktmbuf_pool_create(pool_name, MAX_EVENTS,
-							0, 0, 512,
-							rte_socket_id());
-	if (!eventdev_test_mempool) {
-		otx2_err("ERROR creating mempool");
-		return -1;
-	}
-
-	ret = rte_event_dev_info_get(evdev, &info);
-	RTE_TEST_ASSERT_SUCCESS(ret, "Failed to get event dev info");
-
-	devconf_set_default_sane_values(&dev_conf, &info);
-	if (mode == TEST_EVENTDEV_SETUP_DEQUEUE_TIMEOUT)
-		dev_conf.event_dev_cfg |= RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT;
-
-	ret = rte_event_dev_configure(evdev, &dev_conf);
-	RTE_TEST_ASSERT_SUCCESS(ret, "Failed to configure eventdev");
-
-	uint32_t queue_count;
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-
-	if (mode == TEST_EVENTDEV_SETUP_PRIORITY) {
-		if (queue_count > 8)
-			queue_count = 8;
-
-		/* Configure event queues(0 to n) with
-		 * RTE_EVENT_DEV_PRIORITY_HIGHEST to
-		 * RTE_EVENT_DEV_PRIORITY_LOWEST
-		 */
-		uint8_t step = (RTE_EVENT_DEV_PRIORITY_LOWEST + 1) /
-				queue_count;
-		for (i = 0; i < (int)queue_count; i++) {
-			struct rte_event_queue_conf queue_conf;
-
-			ret = rte_event_queue_default_conf_get(evdev, i,
-							       &queue_conf);
-			RTE_TEST_ASSERT_SUCCESS(ret, "Failed to get def_conf%d",
-						i);
-			queue_conf.priority = i * step;
-			ret = rte_event_queue_setup(evdev, i, &queue_conf);
-			RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup queue=%d",
-						i);
-		}
-
-	} else {
-		/* Configure event queues with default priority */
-		for (i = 0; i < (int)queue_count; i++) {
-			ret = rte_event_queue_setup(evdev, i, NULL);
-			RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup queue=%d",
-						i);
-		}
-	}
-	/* Configure event ports */
-	uint32_t port_count;
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &port_count),
-				"Port count get failed");
-	for (i = 0; i < (int)port_count; i++) {
-		ret = rte_event_port_setup(evdev, i, NULL);
-		RTE_TEST_ASSERT_SUCCESS(ret, "Failed to setup port=%d", i);
-		ret = rte_event_port_link(evdev, i, NULL, NULL, 0);
-		RTE_TEST_ASSERT(ret >= 0, "Failed to link all queues port=%d",
-				i);
-	}
-
-	ret = rte_event_dev_start(evdev);
-	RTE_TEST_ASSERT_SUCCESS(ret, "Failed to start device");
-
-	return 0;
-}
-
-static inline int
-eventdev_setup(void)
-{
-	return _eventdev_setup(TEST_EVENTDEV_SETUP_DEFAULT);
-}
-
-static inline int
-eventdev_setup_priority(void)
-{
-	return _eventdev_setup(TEST_EVENTDEV_SETUP_PRIORITY);
-}
-
-static inline int
-eventdev_setup_dequeue_timeout(void)
-{
-	return _eventdev_setup(TEST_EVENTDEV_SETUP_DEQUEUE_TIMEOUT);
-}
-
-static inline void
-eventdev_teardown(void)
-{
-	rte_event_dev_stop(evdev);
-	rte_mempool_free(eventdev_test_mempool);
-}
-
-static inline void
-update_event_and_validation_attr(struct rte_mbuf *m, struct rte_event *ev,
-				 uint32_t flow_id, uint8_t event_type,
-				 uint8_t sub_event_type, uint8_t sched_type,
-				 uint8_t queue, uint8_t port)
-{
-	struct event_attr *attr;
-
-	/* Store the event attributes in mbuf for future reference */
-	attr = rte_pktmbuf_mtod(m, struct event_attr *);
-	attr->flow_id = flow_id;
-	attr->event_type = event_type;
-	attr->sub_event_type = sub_event_type;
-	attr->sched_type = sched_type;
-	attr->queue = queue;
-	attr->port = port;
-
-	ev->flow_id = flow_id;
-	ev->sub_event_type = sub_event_type;
-	ev->event_type = event_type;
-	/* Inject the new event */
-	ev->op = RTE_EVENT_OP_NEW;
-	ev->sched_type = sched_type;
-	ev->queue_id = queue;
-	ev->mbuf = m;
-}
-
-static inline int
-inject_events(uint32_t flow_id, uint8_t event_type, uint8_t sub_event_type,
-	      uint8_t sched_type, uint8_t queue, uint8_t port,
-	      unsigned int events)
-{
-	struct rte_mbuf *m;
-	unsigned int i;
-
-	for (i = 0; i < events; i++) {
-		struct rte_event ev = {.event = 0, .u64 = 0};
-
-		m = rte_pktmbuf_alloc(eventdev_test_mempool);
-		RTE_TEST_ASSERT_NOT_NULL(m, "mempool alloc failed");
-
-		*rte_event_pmd_selftest_seqn(m) = i;
-		update_event_and_validation_attr(m, &ev, flow_id, event_type,
-						 sub_event_type, sched_type,
-						 queue, port);
-		rte_event_enqueue_burst(evdev, port, &ev, 1);
-	}
-	return 0;
-}
-
-static inline int
-check_excess_events(uint8_t port)
-{
-	uint16_t valid_event;
-	struct rte_event ev;
-	int i;
-
-	/* Check for excess events, try for a few times and exit */
-	for (i = 0; i < 32; i++) {
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1, 0);
-
-		RTE_TEST_ASSERT_SUCCESS(valid_event,
-					"Unexpected valid event=%d",
-					*rte_event_pmd_selftest_seqn(ev.mbuf));
-	}
-	return 0;
-}
-
-static inline int
-generate_random_events(const unsigned int total_events)
-{
-	struct rte_event_dev_info info;
-	uint32_t queue_count;
-	unsigned int i;
-	int ret;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-
-	ret = rte_event_dev_info_get(evdev, &info);
-	RTE_TEST_ASSERT_SUCCESS(ret, "Failed to get event dev info");
-	for (i = 0; i < total_events; i++) {
-		ret = inject_events(
-			rte_rand() % info.max_event_queue_flows /*flow_id */,
-			RTE_EVENT_TYPE_CPU /* event_type */,
-			rte_rand() % 256 /* sub_event_type */,
-			rte_rand() % (RTE_SCHED_TYPE_PARALLEL + 1),
-			rte_rand() % queue_count /* queue */,
-			0 /* port */,
-			1 /* events */);
-		if (ret)
-			return -1;
-	}
-	return ret;
-}
-
-
-static inline int
-validate_event(struct rte_event *ev)
-{
-	struct event_attr *attr;
-
-	attr = rte_pktmbuf_mtod(ev->mbuf, struct event_attr *);
-	RTE_TEST_ASSERT_EQUAL(attr->flow_id, ev->flow_id,
-			      "flow_id mismatch enq=%d deq =%d",
-			      attr->flow_id, ev->flow_id);
-	RTE_TEST_ASSERT_EQUAL(attr->event_type, ev->event_type,
-			      "event_type mismatch enq=%d deq =%d",
-			      attr->event_type, ev->event_type);
-	RTE_TEST_ASSERT_EQUAL(attr->sub_event_type, ev->sub_event_type,
-			      "sub_event_type mismatch enq=%d deq =%d",
-			      attr->sub_event_type, ev->sub_event_type);
-	RTE_TEST_ASSERT_EQUAL(attr->sched_type, ev->sched_type,
-			      "sched_type mismatch enq=%d deq =%d",
-			      attr->sched_type, ev->sched_type);
-	RTE_TEST_ASSERT_EQUAL(attr->queue, ev->queue_id,
-			      "queue mismatch enq=%d deq =%d",
-			      attr->queue, ev->queue_id);
-	return 0;
-}
-
-typedef int (*validate_event_cb)(uint32_t index, uint8_t port,
-				 struct rte_event *ev);
-
-static inline int
-consume_events(uint8_t port, const uint32_t total_events, validate_event_cb fn)
-{
-	uint32_t events = 0, forward_progress_cnt = 0, index = 0;
-	uint16_t valid_event;
-	struct rte_event ev;
-	int ret;
-
-	while (1) {
-		if (++forward_progress_cnt > UINT16_MAX) {
-			otx2_err("Detected deadlock");
-			return -1;
-		}
-
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1, 0);
-		if (!valid_event)
-			continue;
-
-		forward_progress_cnt = 0;
-		ret = validate_event(&ev);
-		if (ret)
-			return -1;
-
-		if (fn != NULL) {
-			ret = fn(index, port, &ev);
-			RTE_TEST_ASSERT_SUCCESS(ret,
-				"Failed to validate test specific event");
-		}
-
-		++index;
-
-		rte_pktmbuf_free(ev.mbuf);
-		if (++events >= total_events)
-			break;
-	}
-
-	return check_excess_events(port);
-}
-
-static int
-validate_simple_enqdeq(uint32_t index, uint8_t port, struct rte_event *ev)
-{
-	RTE_SET_USED(port);
-	RTE_TEST_ASSERT_EQUAL(index, *rte_event_pmd_selftest_seqn(ev->mbuf),
-		"index=%d != seqn=%d",
-		index, *rte_event_pmd_selftest_seqn(ev->mbuf));
-	return 0;
-}
-
-static inline int
-test_simple_enqdeq(uint8_t sched_type)
-{
-	int ret;
-
-	ret = inject_events(0 /*flow_id */,
-			    RTE_EVENT_TYPE_CPU /* event_type */,
-			    0 /* sub_event_type */,
-			    sched_type,
-			    0 /* queue */,
-			    0 /* port */,
-			    MAX_EVENTS);
-	if (ret)
-		return -1;
-
-	return consume_events(0 /* port */, MAX_EVENTS,	validate_simple_enqdeq);
-}
-
-static int
-test_simple_enqdeq_ordered(void)
-{
-	return test_simple_enqdeq(RTE_SCHED_TYPE_ORDERED);
-}
-
-static int
-test_simple_enqdeq_atomic(void)
-{
-	return test_simple_enqdeq(RTE_SCHED_TYPE_ATOMIC);
-}
-
-static int
-test_simple_enqdeq_parallel(void)
-{
-	return test_simple_enqdeq(RTE_SCHED_TYPE_PARALLEL);
-}
-
-/*
- * Generate a prescribed number of events and spread them across available
- * queues. On dequeue, using single event port(port 0) verify the enqueued
- * event attributes
- */
-static int
-test_multi_queue_enq_single_port_deq(void)
-{
-	int ret;
-
-	ret = generate_random_events(MAX_EVENTS);
-	if (ret)
-		return -1;
-
-	return consume_events(0 /* port */, MAX_EVENTS, NULL);
-}
-
-/*
- * Inject 0..MAX_EVENTS events over 0..queue_count with modulus
- * operation
- *
- * For example, Inject 32 events over 0..7 queues
- * enqueue events 0, 8, 16, 24 in queue 0
- * enqueue events 1, 9, 17, 25 in queue 1
- * ..
- * ..
- * enqueue events 7, 15, 23, 31 in queue 7
- *
- * On dequeue, Validate the events comes in 0,8,16,24,1,9,17,25..,7,15,23,31
- * order from queue0(highest priority) to queue7(lowest_priority)
- */
-static int
-validate_queue_priority(uint32_t index, uint8_t port, struct rte_event *ev)
-{
-	uint32_t queue_count;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-	if (queue_count > 8)
-		queue_count = 8;
-	uint32_t range = MAX_EVENTS / queue_count;
-	uint32_t expected_val = (index % range) * queue_count;
-
-	expected_val += ev->queue_id;
-	RTE_SET_USED(port);
-	RTE_TEST_ASSERT_EQUAL(
-		*rte_event_pmd_selftest_seqn(ev->mbuf), expected_val,
-		"seqn=%d index=%d expected=%d range=%d nb_queues=%d max_event=%d",
-		*rte_event_pmd_selftest_seqn(ev->mbuf), index, expected_val,
-		range, queue_count, MAX_EVENTS);
-	return 0;
-}
-
-static int
-test_multi_queue_priority(void)
-{
-	int i, max_evts_roundoff;
-	/* See validate_queue_priority() comments for priority validate logic */
-	uint32_t queue_count;
-	struct rte_mbuf *m;
-	uint8_t queue;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-	if (queue_count > 8)
-		queue_count = 8;
-	max_evts_roundoff  = MAX_EVENTS / queue_count;
-	max_evts_roundoff *= queue_count;
-
-	for (i = 0; i < max_evts_roundoff; i++) {
-		struct rte_event ev = {.event = 0, .u64 = 0};
-
-		m = rte_pktmbuf_alloc(eventdev_test_mempool);
-		RTE_TEST_ASSERT_NOT_NULL(m, "mempool alloc failed");
-
-		*rte_event_pmd_selftest_seqn(m) = i;
-		queue = i % queue_count;
-		update_event_and_validation_attr(m, &ev, 0, RTE_EVENT_TYPE_CPU,
-						 0, RTE_SCHED_TYPE_PARALLEL,
-						 queue, 0);
-		rte_event_enqueue_burst(evdev, 0, &ev, 1);
-	}
-
-	return consume_events(0, max_evts_roundoff, validate_queue_priority);
-}
-
-static int
-worker_multi_port_fn(void *arg)
-{
-	struct test_core_param *param = arg;
-	rte_atomic32_t *total_events = param->total_events;
-	uint8_t port = param->port;
-	uint16_t valid_event;
-	struct rte_event ev;
-	int ret;
-
-	while (rte_atomic32_read(total_events) > 0) {
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1, 0);
-		if (!valid_event)
-			continue;
-
-		ret = validate_event(&ev);
-		RTE_TEST_ASSERT_SUCCESS(ret, "Failed to validate event");
-		rte_pktmbuf_free(ev.mbuf);
-		rte_atomic32_sub(total_events, 1);
-	}
-
-	return 0;
-}
-
-static inline int
-wait_workers_to_join(const rte_atomic32_t *count)
-{
-	uint64_t cycles, print_cycles;
-
-	cycles = rte_get_timer_cycles();
-	print_cycles = cycles;
-	while (rte_atomic32_read(count)) {
-		uint64_t new_cycles = rte_get_timer_cycles();
-
-		if (new_cycles - print_cycles > rte_get_timer_hz()) {
-			otx2_err("Events %d", rte_atomic32_read(count));
-			print_cycles = new_cycles;
-		}
-		if (new_cycles - cycles > rte_get_timer_hz() * 10000000000) {
-			otx2_err("No schedules for seconds, deadlock (%d)",
-				 rte_atomic32_read(count));
-			rte_event_dev_dump(evdev, stdout);
-			cycles = new_cycles;
-			return -1;
-		}
-	}
-	rte_eal_mp_wait_lcore();
-
-	return 0;
-}
-
-static inline int
-launch_workers_and_wait(int (*main_thread)(void *),
-			int (*worker_thread)(void *), uint32_t total_events,
-			uint8_t nb_workers, uint8_t sched_type)
-{
-	rte_atomic32_t atomic_total_events;
-	struct test_core_param *param;
-	uint64_t dequeue_tmo_ticks;
-	uint8_t port = 0;
-	int w_lcore;
-	int ret;
-
-	if (!nb_workers)
-		return 0;
-
-	rte_atomic32_set(&atomic_total_events, total_events);
-	seqn_list_init();
-
-	param = malloc(sizeof(struct test_core_param) * nb_workers);
-	if (!param)
-		return -1;
-
-	ret = rte_event_dequeue_timeout_ticks(evdev,
-					      rte_rand() % 10000000/* 10ms */,
-					      &dequeue_tmo_ticks);
-	if (ret) {
-		free(param);
-		return -1;
-	}
-
-	param[0].total_events = &atomic_total_events;
-	param[0].sched_type = sched_type;
-	param[0].port = 0;
-	param[0].dequeue_tmo_ticks = dequeue_tmo_ticks;
-	rte_wmb();
-
-	w_lcore = rte_get_next_lcore(
-			/* start core */ -1,
-			/* skip main */ 1,
-			/* wrap */ 0);
-	rte_eal_remote_launch(main_thread, &param[0], w_lcore);
-
-	for (port = 1; port < nb_workers; port++) {
-		param[port].total_events = &atomic_total_events;
-		param[port].sched_type = sched_type;
-		param[port].port = port;
-		param[port].dequeue_tmo_ticks = dequeue_tmo_ticks;
-		rte_smp_wmb();
-		w_lcore = rte_get_next_lcore(w_lcore, 1, 0);
-		rte_eal_remote_launch(worker_thread, &param[port], w_lcore);
-	}
-
-	rte_smp_wmb();
-	ret = wait_workers_to_join(&atomic_total_events);
-	free(param);
-
-	return ret;
-}
-
-/*
- * Generate a prescribed number of events and spread them across available
- * queues. Dequeue the events through multiple ports and verify the enqueued
- * event attributes
- */
-static int
-test_multi_queue_enq_multi_port_deq(void)
-{
-	const unsigned int total_events = MAX_EVENTS;
-	uint32_t nr_ports;
-	int ret;
-
-	ret = generate_random_events(total_events);
-	if (ret)
-		return -1;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &nr_ports),
-				"Port count get failed");
-	nr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);
-
-	if (!nr_ports) {
-		otx2_err("Not enough ports=%d or workers=%d", nr_ports,
-			 rte_lcore_count() - 1);
-		return 0;
-	}
-
-	return launch_workers_and_wait(worker_multi_port_fn,
-				       worker_multi_port_fn, total_events,
-				       nr_ports, 0xff /* invalid */);
-}
-
-static
-void flush(uint8_t dev_id, struct rte_event event, void *arg)
-{
-	unsigned int *count = arg;
-
-	RTE_SET_USED(dev_id);
-	if (event.event_type == RTE_EVENT_TYPE_CPU)
-		*count = *count + 1;
-}
-
-static int
-test_dev_stop_flush(void)
-{
-	unsigned int total_events = MAX_EVENTS, count = 0;
-	int ret;
-
-	ret = generate_random_events(total_events);
-	if (ret)
-		return -1;
-
-	ret = rte_event_dev_stop_flush_callback_register(evdev, flush, &count);
-	if (ret)
-		return -2;
-	rte_event_dev_stop(evdev);
-	ret = rte_event_dev_stop_flush_callback_register(evdev, NULL, NULL);
-	if (ret)
-		return -3;
-	RTE_TEST_ASSERT_EQUAL(total_events, count,
-			      "count mismatch total_events=%d count=%d",
-			      total_events, count);
-
-	return 0;
-}
-
-static int
-validate_queue_to_port_single_link(uint32_t index, uint8_t port,
-				   struct rte_event *ev)
-{
-	RTE_SET_USED(index);
-	RTE_TEST_ASSERT_EQUAL(port, ev->queue_id,
-			      "queue mismatch enq=%d deq =%d",
-			      port, ev->queue_id);
-
-	return 0;
-}
-
-/*
- * Link queue x to port x and check correctness of link by checking
- * queue_id == x on dequeue on the specific port x
- */
-static int
-test_queue_to_port_single_link(void)
-{
-	int i, nr_links, ret;
-	uint32_t queue_count;
-	uint32_t port_count;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &port_count),
-				"Port count get failed");
-
-	/* Unlink all connections that created in eventdev_setup */
-	for (i = 0; i < (int)port_count; i++) {
-		ret = rte_event_port_unlink(evdev, i, NULL, 0);
-		RTE_TEST_ASSERT(ret >= 0,
-				"Failed to unlink all queues port=%d", i);
-	}
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-
-	nr_links = RTE_MIN(port_count, queue_count);
-	const unsigned int total_events = MAX_EVENTS / nr_links;
-
-	/* Link queue x to port x and inject events to queue x through port x */
-	for (i = 0; i < nr_links; i++) {
-		uint8_t queue = (uint8_t)i;
-
-		ret = rte_event_port_link(evdev, i, &queue, NULL, 1);
-		RTE_TEST_ASSERT(ret == 1, "Failed to link queue to port %d", i);
-
-		ret = inject_events(0x100 /*flow_id */,
-				    RTE_EVENT_TYPE_CPU /* event_type */,
-				    rte_rand() % 256 /* sub_event_type */,
-				    rte_rand() % (RTE_SCHED_TYPE_PARALLEL + 1),
-				    queue /* queue */, i /* port */,
-				    total_events /* events */);
-		if (ret)
-			return -1;
-	}
-
-	/* Verify the events generated from correct queue */
-	for (i = 0; i < nr_links; i++) {
-		ret = consume_events(i /* port */, total_events,
-				     validate_queue_to_port_single_link);
-		if (ret)
-			return -1;
-	}
-
-	return 0;
-}
-
-static int
-validate_queue_to_port_multi_link(uint32_t index, uint8_t port,
-				  struct rte_event *ev)
-{
-	RTE_SET_USED(index);
-	RTE_TEST_ASSERT_EQUAL(port, (ev->queue_id & 0x1),
-			      "queue mismatch enq=%d deq =%d",
-			      port, ev->queue_id);
-
-	return 0;
-}
-
-/*
- * Link all even number of queues to port 0 and all odd number of queues to
- * port 1 and verify the link connection on dequeue
- */
-static int
-test_queue_to_port_multi_link(void)
-{
-	int ret, port0_events = 0, port1_events = 0;
-	uint32_t nr_queues = 0;
-	uint32_t nr_ports = 0;
-	uint8_t queue, port;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &nr_queues),
-				"Queue count get failed");
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &nr_queues),
-				"Queue count get failed");
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &nr_ports),
-				"Port count get failed");
-
-	if (nr_ports < 2) {
-		otx2_err("Not enough ports to test ports=%d", nr_ports);
-		return 0;
-	}
-
-	/* Unlink all connections that created in eventdev_setup */
-	for (port = 0; port < nr_ports; port++) {
-		ret = rte_event_port_unlink(evdev, port, NULL, 0);
-		RTE_TEST_ASSERT(ret >= 0, "Failed to unlink all queues port=%d",
-				port);
-	}
-
-	const unsigned int total_events = MAX_EVENTS / nr_queues;
-
-	/* Link all even number of queues to port0 and odd numbers to port 1*/
-	for (queue = 0; queue < nr_queues; queue++) {
-		port = queue & 0x1;
-		ret = rte_event_port_link(evdev, port, &queue, NULL, 1);
-		RTE_TEST_ASSERT(ret == 1, "Failed to link queue=%d to port=%d",
-				queue, port);
-
-		ret = inject_events(0x100 /*flow_id */,
-				    RTE_EVENT_TYPE_CPU /* event_type */,
-				    rte_rand() % 256 /* sub_event_type */,
-				    rte_rand() % (RTE_SCHED_TYPE_PARALLEL + 1),
-				    queue /* queue */, port /* port */,
-				    total_events /* events */);
-		if (ret)
-			return -1;
-
-		if (port == 0)
-			port0_events += total_events;
-		else
-			port1_events += total_events;
-	}
-
-	ret = consume_events(0 /* port */, port0_events,
-			     validate_queue_to_port_multi_link);
-	if (ret)
-		return -1;
-	ret = consume_events(1 /* port */, port1_events,
-			     validate_queue_to_port_multi_link);
-	if (ret)
-		return -1;
-
-	return 0;
-}
-
-static int
-worker_flow_based_pipeline(void *arg)
-{
-	struct test_core_param *param = arg;
-	uint64_t dequeue_tmo_ticks = param->dequeue_tmo_ticks;
-	rte_atomic32_t *total_events = param->total_events;
-	uint8_t new_sched_type = param->sched_type;
-	uint8_t port = param->port;
-	uint16_t valid_event;
-	struct rte_event ev;
-
-	while (rte_atomic32_read(total_events) > 0) {
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1,
-						      dequeue_tmo_ticks);
-		if (!valid_event)
-			continue;
-
-		/* Events from stage 0 */
-		if (ev.sub_event_type == 0) {
-			/* Move to atomic flow to maintain the ordering */
-			ev.flow_id = 0x2;
-			ev.event_type = RTE_EVENT_TYPE_CPU;
-			ev.sub_event_type = 1; /* stage 1 */
-			ev.sched_type = new_sched_type;
-			ev.op = RTE_EVENT_OP_FORWARD;
-			rte_event_enqueue_burst(evdev, port, &ev, 1);
-		} else if (ev.sub_event_type == 1) { /* Events from stage 1*/
-			uint32_t seqn = *rte_event_pmd_selftest_seqn(ev.mbuf);
-
-			if (seqn_list_update(seqn) == 0) {
-				rte_pktmbuf_free(ev.mbuf);
-				rte_atomic32_sub(total_events, 1);
-			} else {
-				otx2_err("Failed to update seqn_list");
-				return -1;
-			}
-		} else {
-			otx2_err("Invalid ev.sub_event_type = %d",
-				 ev.sub_event_type);
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static int
-test_multiport_flow_sched_type_test(uint8_t in_sched_type,
-				    uint8_t out_sched_type)
-{
-	const unsigned int total_events = MAX_EVENTS;
-	uint32_t nr_ports;
-	int ret;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &nr_ports),
-				"Port count get failed");
-	nr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);
-
-	if (!nr_ports) {
-		otx2_err("Not enough ports=%d or workers=%d", nr_ports,
-			 rte_lcore_count() - 1);
-		return 0;
-	}
-
-	/* Injects events with a 0 sequence number to total_events */
-	ret = inject_events(0x1 /*flow_id */,
-			    RTE_EVENT_TYPE_CPU /* event_type */,
-			    0 /* sub_event_type (stage 0) */,
-			    in_sched_type,
-			    0 /* queue */,
-			    0 /* port */,
-			    total_events /* events */);
-	if (ret)
-		return -1;
-
-	rte_mb();
-	ret = launch_workers_and_wait(worker_flow_based_pipeline,
-				      worker_flow_based_pipeline, total_events,
-				      nr_ports, out_sched_type);
-	if (ret)
-		return -1;
-
-	if (in_sched_type != RTE_SCHED_TYPE_PARALLEL &&
-	    out_sched_type == RTE_SCHED_TYPE_ATOMIC) {
-		/* Check the events order maintained or not */
-		return seqn_list_check(total_events);
-	}
-
-	return 0;
-}
-
-/* Multi port ordered to atomic transaction */
-static int
-test_multi_port_flow_ordered_to_atomic(void)
-{
-	/* Ingress event order test */
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_ORDERED,
-						   RTE_SCHED_TYPE_ATOMIC);
-}
-
-static int
-test_multi_port_flow_ordered_to_ordered(void)
-{
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_ORDERED,
-						   RTE_SCHED_TYPE_ORDERED);
-}
-
-static int
-test_multi_port_flow_ordered_to_parallel(void)
-{
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_ORDERED,
-						   RTE_SCHED_TYPE_PARALLEL);
-}
-
-static int
-test_multi_port_flow_atomic_to_atomic(void)
-{
-	/* Ingress event order test */
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_ATOMIC,
-						   RTE_SCHED_TYPE_ATOMIC);
-}
-
-static int
-test_multi_port_flow_atomic_to_ordered(void)
-{
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_ATOMIC,
-						   RTE_SCHED_TYPE_ORDERED);
-}
-
-static int
-test_multi_port_flow_atomic_to_parallel(void)
-{
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_ATOMIC,
-						   RTE_SCHED_TYPE_PARALLEL);
-}
-
-static int
-test_multi_port_flow_parallel_to_atomic(void)
-{
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_PARALLEL,
-						   RTE_SCHED_TYPE_ATOMIC);
-}
-
-static int
-test_multi_port_flow_parallel_to_ordered(void)
-{
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_PARALLEL,
-						   RTE_SCHED_TYPE_ORDERED);
-}
-
-static int
-test_multi_port_flow_parallel_to_parallel(void)
-{
-	return test_multiport_flow_sched_type_test(RTE_SCHED_TYPE_PARALLEL,
-						   RTE_SCHED_TYPE_PARALLEL);
-}
-
-static int
-worker_group_based_pipeline(void *arg)
-{
-	struct test_core_param *param = arg;
-	uint64_t dequeue_tmo_ticks = param->dequeue_tmo_ticks;
-	rte_atomic32_t *total_events = param->total_events;
-	uint8_t new_sched_type = param->sched_type;
-	uint8_t port = param->port;
-	uint16_t valid_event;
-	struct rte_event ev;
-
-	while (rte_atomic32_read(total_events) > 0) {
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1,
-						      dequeue_tmo_ticks);
-		if (!valid_event)
-			continue;
-
-		/* Events from stage 0(group 0) */
-		if (ev.queue_id == 0) {
-			/* Move to atomic flow to maintain the ordering */
-			ev.flow_id = 0x2;
-			ev.event_type = RTE_EVENT_TYPE_CPU;
-			ev.sched_type = new_sched_type;
-			ev.queue_id = 1; /* Stage 1*/
-			ev.op = RTE_EVENT_OP_FORWARD;
-			rte_event_enqueue_burst(evdev, port, &ev, 1);
-		} else if (ev.queue_id == 1) { /* Events from stage 1(group 1)*/
-			uint32_t seqn = *rte_event_pmd_selftest_seqn(ev.mbuf);
-
-			if (seqn_list_update(seqn) == 0) {
-				rte_pktmbuf_free(ev.mbuf);
-				rte_atomic32_sub(total_events, 1);
-			} else {
-				otx2_err("Failed to update seqn_list");
-				return -1;
-			}
-		} else {
-			otx2_err("Invalid ev.queue_id = %d", ev.queue_id);
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-static int
-test_multiport_queue_sched_type_test(uint8_t in_sched_type,
-				     uint8_t out_sched_type)
-{
-	const unsigned int total_events = MAX_EVENTS;
-	uint32_t queue_count;
-	uint32_t nr_ports;
-	int ret;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &nr_ports),
-				"Port count get failed");
-
-	nr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-	if (queue_count < 2 ||  !nr_ports) {
-		otx2_err("Not enough queues=%d ports=%d or workers=%d",
-			 queue_count, nr_ports,
-			 rte_lcore_count() - 1);
-		return 0;
-	}
-
-	/* Injects events with a 0 sequence number to total_events */
-	ret = inject_events(0x1 /*flow_id */,
-			    RTE_EVENT_TYPE_CPU /* event_type */,
-			    0 /* sub_event_type (stage 0) */,
-			    in_sched_type,
-			    0 /* queue */,
-			    0 /* port */,
-			    total_events /* events */);
-	if (ret)
-		return -1;
-
-	ret = launch_workers_and_wait(worker_group_based_pipeline,
-				      worker_group_based_pipeline, total_events,
-				      nr_ports, out_sched_type);
-	if (ret)
-		return -1;
-
-	if (in_sched_type != RTE_SCHED_TYPE_PARALLEL &&
-	    out_sched_type == RTE_SCHED_TYPE_ATOMIC) {
-		/* Check the events order maintained or not */
-		return seqn_list_check(total_events);
-	}
-
-	return 0;
-}
-
-static int
-test_multi_port_queue_ordered_to_atomic(void)
-{
-	/* Ingress event order test */
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_ORDERED,
-						    RTE_SCHED_TYPE_ATOMIC);
-}
-
-static int
-test_multi_port_queue_ordered_to_ordered(void)
-{
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_ORDERED,
-						    RTE_SCHED_TYPE_ORDERED);
-}
-
-static int
-test_multi_port_queue_ordered_to_parallel(void)
-{
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_ORDERED,
-						    RTE_SCHED_TYPE_PARALLEL);
-}
-
-static int
-test_multi_port_queue_atomic_to_atomic(void)
-{
-	/* Ingress event order test */
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_ATOMIC,
-						    RTE_SCHED_TYPE_ATOMIC);
-}
-
-static int
-test_multi_port_queue_atomic_to_ordered(void)
-{
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_ATOMIC,
-						    RTE_SCHED_TYPE_ORDERED);
-}
-
-static int
-test_multi_port_queue_atomic_to_parallel(void)
-{
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_ATOMIC,
-						    RTE_SCHED_TYPE_PARALLEL);
-}
-
-static int
-test_multi_port_queue_parallel_to_atomic(void)
-{
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_PARALLEL,
-						    RTE_SCHED_TYPE_ATOMIC);
-}
-
-static int
-test_multi_port_queue_parallel_to_ordered(void)
-{
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_PARALLEL,
-						    RTE_SCHED_TYPE_ORDERED);
-}
-
-static int
-test_multi_port_queue_parallel_to_parallel(void)
-{
-	return test_multiport_queue_sched_type_test(RTE_SCHED_TYPE_PARALLEL,
-						    RTE_SCHED_TYPE_PARALLEL);
-}
-
-static int
-worker_flow_based_pipeline_max_stages_rand_sched_type(void *arg)
-{
-	struct test_core_param *param = arg;
-	rte_atomic32_t *total_events = param->total_events;
-	uint8_t port = param->port;
-	uint16_t valid_event;
-	struct rte_event ev;
-
-	while (rte_atomic32_read(total_events) > 0) {
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1, 0);
-		if (!valid_event)
-			continue;
-
-		if (ev.sub_event_type == 255) { /* last stage */
-			rte_pktmbuf_free(ev.mbuf);
-			rte_atomic32_sub(total_events, 1);
-		} else {
-			ev.event_type = RTE_EVENT_TYPE_CPU;
-			ev.sub_event_type++;
-			ev.sched_type =
-				rte_rand() % (RTE_SCHED_TYPE_PARALLEL + 1);
-			ev.op = RTE_EVENT_OP_FORWARD;
-			rte_event_enqueue_burst(evdev, port, &ev, 1);
-		}
-	}
-
-	return 0;
-}
-
-static int
-launch_multi_port_max_stages_random_sched_type(int (*fn)(void *))
-{
-	uint32_t nr_ports;
-	int ret;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &nr_ports),
-				"Port count get failed");
-	nr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);
-
-	if (!nr_ports) {
-		otx2_err("Not enough ports=%d or workers=%d",
-			 nr_ports, rte_lcore_count() - 1);
-		return 0;
-	}
-
-	/* Injects events with a 0 sequence number to total_events */
-	ret = inject_events(0x1 /*flow_id */,
-			    RTE_EVENT_TYPE_CPU /* event_type */,
-			    0 /* sub_event_type (stage 0) */,
-			    rte_rand() %
-				(RTE_SCHED_TYPE_PARALLEL + 1) /* sched_type */,
-			    0 /* queue */,
-			    0 /* port */,
-			    MAX_EVENTS /* events */);
-	if (ret)
-		return -1;
-
-	return launch_workers_and_wait(fn, fn, MAX_EVENTS, nr_ports,
-				       0xff /* invalid */);
-}
-
-/* Flow based pipeline with maximum stages with random sched type */
-static int
-test_multi_port_flow_max_stages_random_sched_type(void)
-{
-	return launch_multi_port_max_stages_random_sched_type(
-		worker_flow_based_pipeline_max_stages_rand_sched_type);
-}
-
-static int
-worker_queue_based_pipeline_max_stages_rand_sched_type(void *arg)
-{
-	struct test_core_param *param = arg;
-	uint8_t port = param->port;
-	uint32_t queue_count;
-	uint16_t valid_event;
-	struct rte_event ev;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-	uint8_t nr_queues = queue_count;
-	rte_atomic32_t *total_events = param->total_events;
-
-	while (rte_atomic32_read(total_events) > 0) {
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1, 0);
-		if (!valid_event)
-			continue;
-
-		if (ev.queue_id == nr_queues - 1) { /* last stage */
-			rte_pktmbuf_free(ev.mbuf);
-			rte_atomic32_sub(total_events, 1);
-		} else {
-			ev.event_type = RTE_EVENT_TYPE_CPU;
-			ev.queue_id++;
-			ev.sched_type =
-				rte_rand() % (RTE_SCHED_TYPE_PARALLEL + 1);
-			ev.op = RTE_EVENT_OP_FORWARD;
-			rte_event_enqueue_burst(evdev, port, &ev, 1);
-		}
-	}
-
-	return 0;
-}
-
-/* Queue based pipeline with maximum stages with random sched type */
-static int
-test_multi_port_queue_max_stages_random_sched_type(void)
-{
-	return launch_multi_port_max_stages_random_sched_type(
-		worker_queue_based_pipeline_max_stages_rand_sched_type);
-}
-
-static int
-worker_mixed_pipeline_max_stages_rand_sched_type(void *arg)
-{
-	struct test_core_param *param = arg;
-	uint8_t port = param->port;
-	uint32_t queue_count;
-	uint16_t valid_event;
-	struct rte_event ev;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_QUEUE_COUNT, &queue_count),
-				"Queue count get failed");
-	uint8_t nr_queues = queue_count;
-	rte_atomic32_t *total_events = param->total_events;
-
-	while (rte_atomic32_read(total_events) > 0) {
-		valid_event = rte_event_dequeue_burst(evdev, port, &ev, 1, 0);
-		if (!valid_event)
-			continue;
-
-		if (ev.queue_id == nr_queues - 1) { /* Last stage */
-			rte_pktmbuf_free(ev.mbuf);
-			rte_atomic32_sub(total_events, 1);
-		} else {
-			ev.event_type = RTE_EVENT_TYPE_CPU;
-			ev.queue_id++;
-			ev.sub_event_type = rte_rand() % 256;
-			ev.sched_type =
-				rte_rand() % (RTE_SCHED_TYPE_PARALLEL + 1);
-			ev.op = RTE_EVENT_OP_FORWARD;
-			rte_event_enqueue_burst(evdev, port, &ev, 1);
-		}
-	}
-
-	return 0;
-}
-
-/* Queue and flow based pipeline with maximum stages with random sched type */
-static int
-test_multi_port_mixed_max_stages_random_sched_type(void)
-{
-	return launch_multi_port_max_stages_random_sched_type(
-		worker_mixed_pipeline_max_stages_rand_sched_type);
-}
-
-static int
-worker_ordered_flow_producer(void *arg)
-{
-	struct test_core_param *param = arg;
-	uint8_t port = param->port;
-	struct rte_mbuf *m;
-	int counter = 0;
-
-	while (counter < NUM_PACKETS) {
-		m = rte_pktmbuf_alloc(eventdev_test_mempool);
-		if (m == NULL)
-			continue;
-
-		*rte_event_pmd_selftest_seqn(m) = counter++;
-
-		struct rte_event ev = {.event = 0, .u64 = 0};
-
-		ev.flow_id = 0x1; /* Generate a fat flow */
-		ev.sub_event_type = 0;
-		/* Inject the new event */
-		ev.op = RTE_EVENT_OP_NEW;
-		ev.event_type = RTE_EVENT_TYPE_CPU;
-		ev.sched_type = RTE_SCHED_TYPE_ORDERED;
-		ev.queue_id = 0;
-		ev.mbuf = m;
-		rte_event_enqueue_burst(evdev, port, &ev, 1);
-	}
-
-	return 0;
-}
-
-static inline int
-test_producer_consumer_ingress_order_test(int (*fn)(void *))
-{
-	uint32_t nr_ports;
-
-	RTE_TEST_ASSERT_SUCCESS(rte_event_dev_attr_get(evdev,
-				RTE_EVENT_DEV_ATTR_PORT_COUNT, &nr_ports),
-				"Port count get failed");
-	nr_ports = RTE_MIN(nr_ports, rte_lcore_count() - 1);
-
-	if (rte_lcore_count() < 3 || nr_ports < 2) {
-		otx2_err("### Not enough cores for test.");
-		return 0;
-	}
-
-	launch_workers_and_wait(worker_ordered_flow_producer, fn,
-				NUM_PACKETS, nr_ports, RTE_SCHED_TYPE_ATOMIC);
-	/* Check the events order maintained or not */
-	return seqn_list_check(NUM_PACKETS);
-}
-
-/* Flow based producer consumer ingress order test */
-static int
-test_flow_producer_consumer_ingress_order_test(void)
-{
-	return test_producer_consumer_ingress_order_test(
-				worker_flow_based_pipeline);
-}
-
-/* Queue based producer consumer ingress order test */
-static int
-test_queue_producer_consumer_ingress_order_test(void)
-{
-	return test_producer_consumer_ingress_order_test(
-				worker_group_based_pipeline);
-}
-
-static void octeontx_test_run(int (*setup)(void), void (*tdown)(void),
-			      int (*test)(void), const char *name)
-{
-	if (setup() < 0) {
-		printf("Error setting up test %s", name);
-		unsupported++;
-	} else {
-		if (test() < 0) {
-			failed++;
-			printf("+ TestCase [%2d] : %s failed\n", total, name);
-		} else {
-			passed++;
-			printf("+ TestCase [%2d] : %s succeeded\n", total,
-			       name);
-		}
-	}
-
-	total++;
-	tdown();
-}
-
-int
-otx2_sso_selftest(void)
-{
-	testsuite_setup();
-
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_simple_enqdeq_ordered);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_simple_enqdeq_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_simple_enqdeq_parallel);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_queue_enq_single_port_deq);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_dev_stop_flush);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_queue_enq_multi_port_deq);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_queue_to_port_single_link);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_queue_to_port_multi_link);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_ordered_to_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_ordered_to_ordered);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_ordered_to_parallel);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_atomic_to_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_atomic_to_ordered);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_atomic_to_parallel);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_parallel_to_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_parallel_to_ordered);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_parallel_to_parallel);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_ordered_to_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_ordered_to_ordered);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_ordered_to_parallel);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_atomic_to_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_atomic_to_ordered);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_atomic_to_parallel);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_parallel_to_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_parallel_to_ordered);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_parallel_to_parallel);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_flow_max_stages_random_sched_type);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_queue_max_stages_random_sched_type);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_multi_port_mixed_max_stages_random_sched_type);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_flow_producer_consumer_ingress_order_test);
-	OCTEONTX2_TEST_RUN(eventdev_setup, eventdev_teardown,
-			   test_queue_producer_consumer_ingress_order_test);
-	OCTEONTX2_TEST_RUN(eventdev_setup_priority, eventdev_teardown,
-			   test_multi_queue_priority);
-	OCTEONTX2_TEST_RUN(eventdev_setup_dequeue_timeout, eventdev_teardown,
-			   test_multi_port_flow_ordered_to_atomic);
-	OCTEONTX2_TEST_RUN(eventdev_setup_dequeue_timeout, eventdev_teardown,
-			   test_multi_port_queue_ordered_to_atomic);
-	printf("Total tests   : %d\n", total);
-	printf("Passed        : %d\n", passed);
-	printf("Failed        : %d\n", failed);
-	printf("Not supported : %d\n", unsupported);
-
-	testsuite_teardown();
-
-	if (failed)
-		return -1;
-
-	return 0;
-}
diff --git a/drivers/event/octeontx2/otx2_evdev_stats.h b/drivers/event/octeontx2/otx2_evdev_stats.h
deleted file mode 100644
index 74fcec8a07..0000000000
--- a/drivers/event/octeontx2/otx2_evdev_stats.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_EVDEV_STATS_H__
-#define __OTX2_EVDEV_STATS_H__
-
-#include "otx2_evdev.h"
-
-struct otx2_sso_xstats_name {
-	const char name[RTE_EVENT_DEV_XSTATS_NAME_SIZE];
-	const size_t offset;
-	const uint64_t mask;
-	const uint8_t shift;
-	uint64_t reset_snap[OTX2_SSO_MAX_VHGRP];
-};
-
-static struct otx2_sso_xstats_name sso_hws_xstats[] = {
-	{"last_grp_serviced",	offsetof(struct sso_hws_stats, arbitration),
-				0x3FF, 0, {0} },
-	{"affinity_arbitration_credits",
-				offsetof(struct sso_hws_stats, arbitration),
-				0xF, 16, {0} },
-};
-
-static struct otx2_sso_xstats_name sso_grp_xstats[] = {
-	{"wrk_sched",		offsetof(struct sso_grp_stats, ws_pc), ~0x0, 0,
-				{0} },
-	{"xaq_dram",		offsetof(struct sso_grp_stats, ext_pc), ~0x0,
-				0, {0} },
-	{"add_wrk",		offsetof(struct sso_grp_stats, wa_pc), ~0x0, 0,
-				{0} },
-	{"tag_switch_req",	offsetof(struct sso_grp_stats, ts_pc), ~0x0, 0,
-				{0} },
-	{"desched_req",		offsetof(struct sso_grp_stats, ds_pc), ~0x0, 0,
-				{0} },
-	{"desched_wrk",		offsetof(struct sso_grp_stats, dq_pc), ~0x0, 0,
-				{0} },
-	{"xaq_cached",		offsetof(struct sso_grp_stats, aw_status), 0x3,
-				0, {0} },
-	{"work_inflight",	offsetof(struct sso_grp_stats, aw_status), 0x3F,
-				16, {0} },
-	{"inuse_pages",		offsetof(struct sso_grp_stats, page_cnt),
-				0xFFFFFFFF, 0, {0} },
-};
-
-#define OTX2_SSO_NUM_HWS_XSTATS RTE_DIM(sso_hws_xstats)
-#define OTX2_SSO_NUM_GRP_XSTATS RTE_DIM(sso_grp_xstats)
-
-#define OTX2_SSO_NUM_XSTATS (OTX2_SSO_NUM_HWS_XSTATS + OTX2_SSO_NUM_GRP_XSTATS)
-
-static int
-otx2_sso_xstats_get(const struct rte_eventdev *event_dev,
-		    enum rte_event_dev_xstats_mode mode, uint8_t queue_port_id,
-		    const unsigned int ids[], uint64_t values[], unsigned int n)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct otx2_sso_xstats_name *xstats;
-	struct otx2_sso_xstats_name *xstat;
-	struct otx2_mbox *mbox = dev->mbox;
-	uint32_t xstats_mode_count = 0;
-	uint32_t start_offset = 0;
-	unsigned int i;
-	uint64_t value;
-	void *req_rsp;
-	int rc;
-
-	switch (mode) {
-	case RTE_EVENT_DEV_XSTATS_DEVICE:
-		return 0;
-	case RTE_EVENT_DEV_XSTATS_PORT:
-		if (queue_port_id >= (signed int)dev->nb_event_ports)
-			goto invalid_value;
-
-		xstats_mode_count = OTX2_SSO_NUM_HWS_XSTATS;
-		xstats = sso_hws_xstats;
-
-		req_rsp = otx2_mbox_alloc_msg_sso_hws_get_stats(mbox);
-			((struct sso_info_req *)req_rsp)->hws = dev->dual_ws ?
-					2 * queue_port_id : queue_port_id;
-		rc = otx2_mbox_process_msg(mbox, (void **)&req_rsp);
-		if (rc < 0)
-			goto invalid_value;
-
-		if (dev->dual_ws) {
-			for (i = 0; i < n && i < xstats_mode_count; i++) {
-				xstat = &xstats[ids[i] - start_offset];
-				values[i] = *(uint64_t *)
-					((char *)req_rsp + xstat->offset);
-				values[i] = (values[i] >> xstat->shift) &
-					xstat->mask;
-			}
-
-			req_rsp = otx2_mbox_alloc_msg_sso_hws_get_stats(mbox);
-			((struct sso_info_req *)req_rsp)->hws =
-					(2 * queue_port_id) + 1;
-			rc = otx2_mbox_process_msg(mbox, (void **)&req_rsp);
-			if (rc < 0)
-				goto invalid_value;
-		}
-
-		break;
-	case RTE_EVENT_DEV_XSTATS_QUEUE:
-		if (queue_port_id >= (signed int)dev->nb_event_queues)
-			goto invalid_value;
-
-		xstats_mode_count = OTX2_SSO_NUM_GRP_XSTATS;
-		start_offset = OTX2_SSO_NUM_HWS_XSTATS;
-		xstats = sso_grp_xstats;
-
-		req_rsp = otx2_mbox_alloc_msg_sso_grp_get_stats(mbox);
-			((struct sso_info_req *)req_rsp)->grp = queue_port_id;
-		rc = otx2_mbox_process_msg(mbox, (void **)&req_rsp);
-		if (rc < 0)
-			goto invalid_value;
-
-		break;
-	default:
-		otx2_err("Invalid mode received");
-		goto invalid_value;
-	};
-
-	for (i = 0; i < n && i < xstats_mode_count; i++) {
-		xstat = &xstats[ids[i] - start_offset];
-		value = *(uint64_t *)((char *)req_rsp + xstat->offset);
-		value = (value >> xstat->shift) & xstat->mask;
-
-		if ((mode == RTE_EVENT_DEV_XSTATS_PORT) && dev->dual_ws)
-			values[i] += value;
-		else
-			values[i] = value;
-
-		values[i] -= xstat->reset_snap[queue_port_id];
-	}
-
-	return i;
-invalid_value:
-	return -EINVAL;
-}
-
-static int
-otx2_sso_xstats_reset(struct rte_eventdev *event_dev,
-		      enum rte_event_dev_xstats_mode mode,
-		      int16_t queue_port_id, const uint32_t ids[], uint32_t n)
-{
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	struct otx2_sso_xstats_name *xstats;
-	struct otx2_sso_xstats_name *xstat;
-	struct otx2_mbox *mbox = dev->mbox;
-	uint32_t xstats_mode_count = 0;
-	uint32_t start_offset = 0;
-	unsigned int i;
-	uint64_t value;
-	void *req_rsp;
-	int rc;
-
-	switch (mode) {
-	case RTE_EVENT_DEV_XSTATS_DEVICE:
-		return 0;
-	case RTE_EVENT_DEV_XSTATS_PORT:
-		if (queue_port_id >= (signed int)dev->nb_event_ports)
-			goto invalid_value;
-
-		xstats_mode_count = OTX2_SSO_NUM_HWS_XSTATS;
-		xstats = sso_hws_xstats;
-
-		req_rsp = otx2_mbox_alloc_msg_sso_hws_get_stats(mbox);
-		((struct sso_info_req *)req_rsp)->hws = dev->dual_ws ?
-			2 * queue_port_id : queue_port_id;
-		rc = otx2_mbox_process_msg(mbox, (void **)&req_rsp);
-		if (rc < 0)
-			goto invalid_value;
-
-		if (dev->dual_ws) {
-			for (i = 0; i < n && i < xstats_mode_count; i++) {
-				xstat = &xstats[ids[i] - start_offset];
-				xstat->reset_snap[queue_port_id] = *(uint64_t *)
-					((char *)req_rsp + xstat->offset);
-				xstat->reset_snap[queue_port_id] =
-					(xstat->reset_snap[queue_port_id] >>
-						xstat->shift) & xstat->mask;
-			}
-
-			req_rsp = otx2_mbox_alloc_msg_sso_hws_get_stats(mbox);
-			((struct sso_info_req *)req_rsp)->hws =
-					(2 * queue_port_id) + 1;
-			rc = otx2_mbox_process_msg(mbox, (void **)&req_rsp);
-			if (rc < 0)
-				goto invalid_value;
-		}
-
-		break;
-	case RTE_EVENT_DEV_XSTATS_QUEUE:
-		if (queue_port_id >= (signed int)dev->nb_event_queues)
-			goto invalid_value;
-
-		xstats_mode_count = OTX2_SSO_NUM_GRP_XSTATS;
-		start_offset = OTX2_SSO_NUM_HWS_XSTATS;
-		xstats = sso_grp_xstats;
-
-		req_rsp = otx2_mbox_alloc_msg_sso_grp_get_stats(mbox);
-			((struct sso_info_req *)req_rsp)->grp = queue_port_id;
-		rc = otx2_mbox_process_msg(mbox, (void *)&req_rsp);
-		if (rc < 0)
-			goto invalid_value;
-
-		break;
-	default:
-		otx2_err("Invalid mode received");
-		goto invalid_value;
-	};
-
-	for (i = 0; i < n && i < xstats_mode_count; i++) {
-		xstat = &xstats[ids[i] - start_offset];
-		value = *(uint64_t *)((char *)req_rsp + xstat->offset);
-		value = (value >> xstat->shift) & xstat->mask;
-
-		if ((mode == RTE_EVENT_DEV_XSTATS_PORT) && dev->dual_ws)
-			xstat->reset_snap[queue_port_id] += value;
-		else
-			xstat->reset_snap[queue_port_id] =  value;
-	}
-	return i;
-invalid_value:
-	return -EINVAL;
-}
-
-static int
-otx2_sso_xstats_get_names(const struct rte_eventdev *event_dev,
-			  enum rte_event_dev_xstats_mode mode,
-			  uint8_t queue_port_id,
-			  struct rte_event_dev_xstats_name *xstats_names,
-			  unsigned int *ids, unsigned int size)
-{
-	struct rte_event_dev_xstats_name xstats_names_copy[OTX2_SSO_NUM_XSTATS];
-	struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
-	uint32_t xstats_mode_count = 0;
-	uint32_t start_offset = 0;
-	unsigned int xidx = 0;
-	unsigned int i;
-
-	for (i = 0; i < OTX2_SSO_NUM_HWS_XSTATS; i++) {
-		snprintf(xstats_names_copy[i].name,
-			 sizeof(xstats_names_copy[i].name), "%s",
-			 sso_hws_xstats[i].name);
-	}
-
-	for (; i < OTX2_SSO_NUM_XSTATS; i++) {
-		snprintf(xstats_names_copy[i].name,
-			 sizeof(xstats_names_copy[i].name), "%s",
-			 sso_grp_xstats[i - OTX2_SSO_NUM_HWS_XSTATS].name);
-	}
-
-	switch (mode) {
-	case RTE_EVENT_DEV_XSTATS_DEVICE:
-		break;
-	case RTE_EVENT_DEV_XSTATS_PORT:
-		if (queue_port_id >= (signed int)dev->nb_event_ports)
-			break;
-		xstats_mode_count = OTX2_SSO_NUM_HWS_XSTATS;
-		break;
-	case RTE_EVENT_DEV_XSTATS_QUEUE:
-		if (queue_port_id >= (signed int)dev->nb_event_queues)
-			break;
-		xstats_mode_count = OTX2_SSO_NUM_GRP_XSTATS;
-		start_offset = OTX2_SSO_NUM_HWS_XSTATS;
-		break;
-	default:
-		otx2_err("Invalid mode received");
-		return -EINVAL;
-	};
-
-	if (xstats_mode_count > size || !ids || !xstats_names)
-		return xstats_mode_count;
-
-	for (i = 0; i < xstats_mode_count; i++) {
-		xidx = i + start_offset;
-		strncpy(xstats_names[i].name, xstats_names_copy[xidx].name,
-			sizeof(xstats_names[i].name));
-		ids[i] = xidx;
-	}
-
-	return i;
-}
-
-#endif
diff --git a/drivers/event/octeontx2/otx2_tim_evdev.c b/drivers/event/octeontx2/otx2_tim_evdev.c
deleted file mode 100644
index 6da8b14b78..0000000000
--- a/drivers/event/octeontx2/otx2_tim_evdev.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_kvargs.h>
-#include <rte_malloc.h>
-#include <rte_mbuf_pool_ops.h>
-
-#include "otx2_evdev.h"
-#include "otx2_tim_evdev.h"
-
-static struct event_timer_adapter_ops otx2_tim_ops;
-
-static inline int
-tim_get_msix_offsets(void)
-{
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	struct otx2_mbox *mbox = dev->mbox;
-	struct msix_offset_rsp *msix_rsp;
-	int i, rc;
-
-	/* Get TIM MSIX vector offsets */
-	otx2_mbox_alloc_msg_msix_offset(mbox);
-	rc = otx2_mbox_process_msg(mbox, (void *)&msix_rsp);
-
-	for (i = 0; i < dev->nb_rings; i++)
-		dev->tim_msixoff[i] = msix_rsp->timlf_msixoff[i];
-
-	return rc;
-}
-
-static void
-tim_set_fp_ops(struct otx2_tim_ring *tim_ring)
-{
-	uint8_t prod_flag = !tim_ring->prod_type_sp;
-
-	/* [DFB/FB] [SP][MP]*/
-	const rte_event_timer_arm_burst_t arm_burst[2][2][2] = {
-#define FP(_name, _f3, _f2, _f1, flags)                                        \
-	[_f3][_f2][_f1] = otx2_tim_arm_burst_##_name,
-		TIM_ARM_FASTPATH_MODES
-#undef FP
-	};
-
-	const rte_event_timer_arm_tmo_tick_burst_t arm_tmo_burst[2][2] = {
-#define FP(_name, _f2, _f1, flags)                                             \
-	[_f2][_f1] = otx2_tim_arm_tmo_tick_burst_##_name,
-		TIM_ARM_TMO_FASTPATH_MODES
-#undef FP
-	};
-
-	otx2_tim_ops.arm_burst =
-		arm_burst[tim_ring->enable_stats][tim_ring->ena_dfb][prod_flag];
-	otx2_tim_ops.arm_tmo_tick_burst =
-		arm_tmo_burst[tim_ring->enable_stats][tim_ring->ena_dfb];
-	otx2_tim_ops.cancel_burst = otx2_tim_timer_cancel_burst;
-}
-
-static void
-otx2_tim_ring_info_get(const struct rte_event_timer_adapter *adptr,
-		       struct rte_event_timer_adapter_info *adptr_info)
-{
-	struct otx2_tim_ring *tim_ring = adptr->data->adapter_priv;
-
-	adptr_info->max_tmo_ns = tim_ring->max_tout;
-	adptr_info->min_resolution_ns = tim_ring->ena_periodic ?
-		tim_ring->max_tout : tim_ring->tck_nsec;
-	rte_memcpy(&adptr_info->conf, &adptr->data->conf,
-		   sizeof(struct rte_event_timer_adapter_conf));
-}
-
-static int
-tim_chnk_pool_create(struct otx2_tim_ring *tim_ring,
-		     struct rte_event_timer_adapter_conf *rcfg)
-{
-	unsigned int cache_sz = (tim_ring->nb_chunks / 1.5);
-	unsigned int mp_flags = 0;
-	char pool_name[25];
-	int rc;
-
-	cache_sz /= rte_lcore_count();
-	/* Create chunk pool. */
-	if (rcfg->flags & RTE_EVENT_TIMER_ADAPTER_F_SP_PUT) {
-		mp_flags = RTE_MEMPOOL_F_SP_PUT | RTE_MEMPOOL_F_SC_GET;
-		otx2_tim_dbg("Using single producer mode");
-		tim_ring->prod_type_sp = true;
-	}
-
-	snprintf(pool_name, sizeof(pool_name), "otx2_tim_chunk_pool%d",
-		 tim_ring->ring_id);
-
-	if (cache_sz > RTE_MEMPOOL_CACHE_MAX_SIZE)
-		cache_sz = RTE_MEMPOOL_CACHE_MAX_SIZE;
-
-	cache_sz = cache_sz != 0 ? cache_sz : 2;
-	tim_ring->nb_chunks += (cache_sz * rte_lcore_count());
-	if (!tim_ring->disable_npa) {
-		tim_ring->chunk_pool = rte_mempool_create_empty(pool_name,
-				tim_ring->nb_chunks, tim_ring->chunk_sz,
-				cache_sz, 0, rte_socket_id(), mp_flags);
-
-		if (tim_ring->chunk_pool == NULL) {
-			otx2_err("Unable to create chunkpool.");
-			return -ENOMEM;
-		}
-
-		rc = rte_mempool_set_ops_byname(tim_ring->chunk_pool,
-						rte_mbuf_platform_mempool_ops(),
-						NULL);
-		if (rc < 0) {
-			otx2_err("Unable to set chunkpool ops");
-			goto free;
-		}
-
-		rc = rte_mempool_populate_default(tim_ring->chunk_pool);
-		if (rc < 0) {
-			otx2_err("Unable to set populate chunkpool.");
-			goto free;
-		}
-		tim_ring->aura = npa_lf_aura_handle_to_aura(
-				tim_ring->chunk_pool->pool_id);
-		tim_ring->ena_dfb = tim_ring->ena_periodic ? 1 : 0;
-	} else {
-		tim_ring->chunk_pool = rte_mempool_create(pool_name,
-				tim_ring->nb_chunks, tim_ring->chunk_sz,
-				cache_sz, 0, NULL, NULL, NULL, NULL,
-				rte_socket_id(),
-				mp_flags);
-		if (tim_ring->chunk_pool == NULL) {
-			otx2_err("Unable to create chunkpool.");
-			return -ENOMEM;
-		}
-		tim_ring->ena_dfb = 1;
-	}
-
-	return 0;
-
-free:
-	rte_mempool_free(tim_ring->chunk_pool);
-	return rc;
-}
-
-static void
-tim_err_desc(int rc)
-{
-	switch (rc) {
-	case TIM_AF_NO_RINGS_LEFT:
-		otx2_err("Unable to allocat new TIM ring.");
-		break;
-	case TIM_AF_INVALID_NPA_PF_FUNC:
-		otx2_err("Invalid NPA pf func.");
-		break;
-	case TIM_AF_INVALID_SSO_PF_FUNC:
-		otx2_err("Invalid SSO pf func.");
-		break;
-	case TIM_AF_RING_STILL_RUNNING:
-		otx2_tim_dbg("Ring busy.");
-		break;
-	case TIM_AF_LF_INVALID:
-		otx2_err("Invalid Ring id.");
-		break;
-	case TIM_AF_CSIZE_NOT_ALIGNED:
-		otx2_err("Chunk size specified needs to be multiple of 16.");
-		break;
-	case TIM_AF_CSIZE_TOO_SMALL:
-		otx2_err("Chunk size too small.");
-		break;
-	case TIM_AF_CSIZE_TOO_BIG:
-		otx2_err("Chunk size too big.");
-		break;
-	case TIM_AF_INTERVAL_TOO_SMALL:
-		otx2_err("Bucket traversal interval too small.");
-		break;
-	case TIM_AF_INVALID_BIG_ENDIAN_VALUE:
-		otx2_err("Invalid Big endian value.");
-		break;
-	case TIM_AF_INVALID_CLOCK_SOURCE:
-		otx2_err("Invalid Clock source specified.");
-		break;
-	case TIM_AF_GPIO_CLK_SRC_NOT_ENABLED:
-		otx2_err("GPIO clock source not enabled.");
-		break;
-	case TIM_AF_INVALID_BSIZE:
-		otx2_err("Invalid bucket size.");
-		break;
-	case TIM_AF_INVALID_ENABLE_PERIODIC:
-		otx2_err("Invalid bucket size.");
-		break;
-	case TIM_AF_INVALID_ENABLE_DONTFREE:
-		otx2_err("Invalid Don't free value.");
-		break;
-	case TIM_AF_ENA_DONTFRE_NSET_PERIODIC:
-		otx2_err("Don't free bit not set when periodic is enabled.");
-		break;
-	case TIM_AF_RING_ALREADY_DISABLED:
-		otx2_err("Ring already stopped");
-		break;
-	default:
-		otx2_err("Unknown Error.");
-	}
-}
-
-static int
-otx2_tim_ring_create(struct rte_event_timer_adapter *adptr)
-{
-	struct rte_event_timer_adapter_conf *rcfg = &adptr->data->conf;
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	struct otx2_tim_ring *tim_ring;
-	struct tim_config_req *cfg_req;
-	struct tim_ring_req *free_req;
-	struct tim_lf_alloc_req *req;
-	struct tim_lf_alloc_rsp *rsp;
-	uint8_t is_periodic;
-	int i, rc;
-
-	if (dev == NULL)
-		return -ENODEV;
-
-	if (adptr->data->id >= dev->nb_rings)
-		return -ENODEV;
-
-	req = otx2_mbox_alloc_msg_tim_lf_alloc(dev->mbox);
-	req->npa_pf_func = otx2_npa_pf_func_get();
-	req->sso_pf_func = otx2_sso_pf_func_get();
-	req->ring = adptr->data->id;
-
-	rc = otx2_mbox_process_msg(dev->mbox, (void **)&rsp);
-	if (rc < 0) {
-		tim_err_desc(rc);
-		return -ENODEV;
-	}
-
-	if (NSEC2TICK(RTE_ALIGN_MUL_CEIL(rcfg->timer_tick_ns, 10),
-		      rsp->tenns_clk) < OTX2_TIM_MIN_TMO_TKS) {
-		if (rcfg->flags & RTE_EVENT_TIMER_ADAPTER_F_ADJUST_RES)
-			rcfg->timer_tick_ns = TICK2NSEC(OTX2_TIM_MIN_TMO_TKS,
-					rsp->tenns_clk);
-		else {
-			rc = -ERANGE;
-			goto rng_mem_err;
-		}
-	}
-
-	is_periodic = 0;
-	if (rcfg->flags & RTE_EVENT_TIMER_ADAPTER_F_PERIODIC) {
-		if (rcfg->max_tmo_ns &&
-		    rcfg->max_tmo_ns != rcfg->timer_tick_ns) {
-			rc = -ERANGE;
-			goto rng_mem_err;
-		}
-
-		/* Use 2 buckets to avoid contention */
-		rcfg->max_tmo_ns = rcfg->timer_tick_ns;
-		rcfg->timer_tick_ns /= 2;
-		is_periodic = 1;
-	}
-
-	tim_ring = rte_zmalloc("otx2_tim_prv", sizeof(struct otx2_tim_ring), 0);
-	if (tim_ring == NULL) {
-		rc =  -ENOMEM;
-		goto rng_mem_err;
-	}
-
-	adptr->data->adapter_priv = tim_ring;
-
-	tim_ring->tenns_clk_freq = rsp->tenns_clk;
-	tim_ring->clk_src = (int)rcfg->clk_src;
-	tim_ring->ring_id = adptr->data->id;
-	tim_ring->tck_nsec = RTE_ALIGN_MUL_CEIL(rcfg->timer_tick_ns, 10);
-	tim_ring->max_tout = is_periodic ?
-		rcfg->timer_tick_ns * 2 : rcfg->max_tmo_ns;
-	tim_ring->nb_bkts = (tim_ring->max_tout / tim_ring->tck_nsec);
-	tim_ring->chunk_sz = dev->chunk_sz;
-	tim_ring->nb_timers = rcfg->nb_timers;
-	tim_ring->disable_npa = dev->disable_npa;
-	tim_ring->ena_periodic = is_periodic;
-	tim_ring->enable_stats = dev->enable_stats;
-
-	for (i = 0; i < dev->ring_ctl_cnt ; i++) {
-		struct otx2_tim_ctl *ring_ctl = &dev->ring_ctl_data[i];
-
-		if (ring_ctl->ring == tim_ring->ring_id) {
-			tim_ring->chunk_sz = ring_ctl->chunk_slots ?
-				((uint32_t)(ring_ctl->chunk_slots + 1) *
-				 OTX2_TIM_CHUNK_ALIGNMENT) : tim_ring->chunk_sz;
-			tim_ring->enable_stats = ring_ctl->enable_stats;
-			tim_ring->disable_npa = ring_ctl->disable_npa;
-		}
-	}
-
-	if (tim_ring->disable_npa) {
-		tim_ring->nb_chunks =
-			tim_ring->nb_timers /
-			OTX2_TIM_NB_CHUNK_SLOTS(tim_ring->chunk_sz);
-		tim_ring->nb_chunks = tim_ring->nb_chunks * tim_ring->nb_bkts;
-	} else {
-		tim_ring->nb_chunks = tim_ring->nb_timers;
-	}
-	tim_ring->nb_chunk_slots = OTX2_TIM_NB_CHUNK_SLOTS(tim_ring->chunk_sz);
-	tim_ring->bkt = rte_zmalloc("otx2_tim_bucket", (tim_ring->nb_bkts) *
-				    sizeof(struct otx2_tim_bkt),
-				    RTE_CACHE_LINE_SIZE);
-	if (tim_ring->bkt == NULL)
-		goto bkt_mem_err;
-
-	rc = tim_chnk_pool_create(tim_ring, rcfg);
-	if (rc < 0)
-		goto chnk_mem_err;
-
-	cfg_req = otx2_mbox_alloc_msg_tim_config_ring(dev->mbox);
-
-	cfg_req->ring = tim_ring->ring_id;
-	cfg_req->bigendian = false;
-	cfg_req->clocksource = tim_ring->clk_src;
-	cfg_req->enableperiodic = tim_ring->ena_periodic;
-	cfg_req->enabledontfreebuffer = tim_ring->ena_dfb;
-	cfg_req->bucketsize = tim_ring->nb_bkts;
-	cfg_req->chunksize = tim_ring->chunk_sz;
-	cfg_req->interval = NSEC2TICK(tim_ring->tck_nsec,
-				      tim_ring->tenns_clk_freq);
-
-	rc = otx2_mbox_process(dev->mbox);
-	if (rc < 0) {
-		tim_err_desc(rc);
-		goto chnk_mem_err;
-	}
-
-	tim_ring->base = dev->bar2 +
-		(RVU_BLOCK_ADDR_TIM << 20 | tim_ring->ring_id << 12);
-
-	rc = tim_register_irq(tim_ring->ring_id);
-	if (rc < 0)
-		goto chnk_mem_err;
-
-	otx2_write64((uint64_t)tim_ring->bkt,
-		     tim_ring->base + TIM_LF_RING_BASE);
-	otx2_write64(tim_ring->aura, tim_ring->base + TIM_LF_RING_AURA);
-
-	/* Set fastpath ops. */
-	tim_set_fp_ops(tim_ring);
-
-	/* Update SSO xae count. */
-	sso_updt_xae_cnt(sso_pmd_priv(dev->event_dev), (void *)tim_ring,
-			 RTE_EVENT_TYPE_TIMER);
-	sso_xae_reconfigure(dev->event_dev);
-
-	otx2_tim_dbg("Total memory used %"PRIu64"MB\n",
-			(uint64_t)(((tim_ring->nb_chunks * tim_ring->chunk_sz)
-			+ (tim_ring->nb_bkts * sizeof(struct otx2_tim_bkt))) /
-			BIT_ULL(20)));
-
-	return rc;
-
-chnk_mem_err:
-	rte_free(tim_ring->bkt);
-bkt_mem_err:
-	rte_free(tim_ring);
-rng_mem_err:
-	free_req = otx2_mbox_alloc_msg_tim_lf_free(dev->mbox);
-	free_req->ring = adptr->data->id;
-	otx2_mbox_process(dev->mbox);
-	return rc;
-}
-
-static void
-otx2_tim_calibrate_start_tsc(struct otx2_tim_ring *tim_ring)
-{
-#define OTX2_TIM_CALIB_ITER	1E6
-	uint32_t real_bkt, bucket;
-	int icount, ecount = 0;
-	uint64_t bkt_cyc;
-
-	for (icount = 0; icount < OTX2_TIM_CALIB_ITER; icount++) {
-		real_bkt = otx2_read64(tim_ring->base + TIM_LF_RING_REL) >> 44;
-		bkt_cyc = tim_cntvct();
-		bucket = (bkt_cyc - tim_ring->ring_start_cyc) /
-							tim_ring->tck_int;
-		bucket = bucket % (tim_ring->nb_bkts);
-		tim_ring->ring_start_cyc = bkt_cyc - (real_bkt *
-							tim_ring->tck_int);
-		if (bucket != real_bkt)
-			ecount++;
-	}
-	tim_ring->last_updt_cyc = bkt_cyc;
-	otx2_tim_dbg("Bucket mispredict %3.2f distance %d\n",
-		     100 - (((double)(icount - ecount) / (double)icount) * 100),
-		     bucket - real_bkt);
-}
-
-static int
-otx2_tim_ring_start(const struct rte_event_timer_adapter *adptr)
-{
-	struct otx2_tim_ring *tim_ring = adptr->data->adapter_priv;
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	struct tim_enable_rsp *rsp;
-	struct tim_ring_req *req;
-	int rc;
-
-	if (dev == NULL)
-		return -ENODEV;
-
-	req = otx2_mbox_alloc_msg_tim_enable_ring(dev->mbox);
-	req->ring = tim_ring->ring_id;
-
-	rc = otx2_mbox_process_msg(dev->mbox, (void **)&rsp);
-	if (rc < 0) {
-		tim_err_desc(rc);
-		goto fail;
-	}
-	tim_ring->ring_start_cyc = rsp->timestarted;
-	tim_ring->tck_int = NSEC2TICK(tim_ring->tck_nsec, tim_cntfrq());
-	tim_ring->tot_int = tim_ring->tck_int * tim_ring->nb_bkts;
-	tim_ring->fast_div = rte_reciprocal_value_u64(tim_ring->tck_int);
-	tim_ring->fast_bkt = rte_reciprocal_value_u64(tim_ring->nb_bkts);
-
-	otx2_tim_calibrate_start_tsc(tim_ring);
-
-fail:
-	return rc;
-}
-
-static int
-otx2_tim_ring_stop(const struct rte_event_timer_adapter *adptr)
-{
-	struct otx2_tim_ring *tim_ring = adptr->data->adapter_priv;
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	struct tim_ring_req *req;
-	int rc;
-
-	if (dev == NULL)
-		return -ENODEV;
-
-	req = otx2_mbox_alloc_msg_tim_disable_ring(dev->mbox);
-	req->ring = tim_ring->ring_id;
-
-	rc = otx2_mbox_process(dev->mbox);
-	if (rc < 0) {
-		tim_err_desc(rc);
-		rc = -EBUSY;
-	}
-
-	return rc;
-}
-
-static int
-otx2_tim_ring_free(struct rte_event_timer_adapter *adptr)
-{
-	struct otx2_tim_ring *tim_ring = adptr->data->adapter_priv;
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	struct tim_ring_req *req;
-	int rc;
-
-	if (dev == NULL)
-		return -ENODEV;
-
-	tim_unregister_irq(tim_ring->ring_id);
-
-	req = otx2_mbox_alloc_msg_tim_lf_free(dev->mbox);
-	req->ring = tim_ring->ring_id;
-
-	rc = otx2_mbox_process(dev->mbox);
-	if (rc < 0) {
-		tim_err_desc(rc);
-		return -EBUSY;
-	}
-
-	rte_free(tim_ring->bkt);
-	rte_mempool_free(tim_ring->chunk_pool);
-	rte_free(adptr->data->adapter_priv);
-
-	return 0;
-}
-
-static int
-otx2_tim_stats_get(const struct rte_event_timer_adapter *adapter,
-		   struct rte_event_timer_adapter_stats *stats)
-{
-	struct otx2_tim_ring *tim_ring = adapter->data->adapter_priv;
-	uint64_t bkt_cyc = tim_cntvct() - tim_ring->ring_start_cyc;
-
-	stats->evtim_exp_count = __atomic_load_n(&tim_ring->arm_cnt,
-						 __ATOMIC_RELAXED);
-	stats->ev_enq_count = stats->evtim_exp_count;
-	stats->adapter_tick_count = rte_reciprocal_divide_u64(bkt_cyc,
-				&tim_ring->fast_div);
-	return 0;
-}
-
-static int
-otx2_tim_stats_reset(const struct rte_event_timer_adapter *adapter)
-{
-	struct otx2_tim_ring *tim_ring = adapter->data->adapter_priv;
-
-	__atomic_store_n(&tim_ring->arm_cnt, 0, __ATOMIC_RELAXED);
-	return 0;
-}
-
-int
-otx2_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags,
-		  uint32_t *caps, const struct event_timer_adapter_ops **ops)
-{
-	struct otx2_tim_evdev *dev = tim_priv_get();
-
-	RTE_SET_USED(flags);
-
-	if (dev == NULL)
-		return -ENODEV;
-
-	otx2_tim_ops.init = otx2_tim_ring_create;
-	otx2_tim_ops.uninit = otx2_tim_ring_free;
-	otx2_tim_ops.start = otx2_tim_ring_start;
-	otx2_tim_ops.stop = otx2_tim_ring_stop;
-	otx2_tim_ops.get_info	= otx2_tim_ring_info_get;
-
-	if (dev->enable_stats) {
-		otx2_tim_ops.stats_get   = otx2_tim_stats_get;
-		otx2_tim_ops.stats_reset = otx2_tim_stats_reset;
-	}
-
-	/* Store evdev pointer for later use. */
-	dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev;
-	*caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT |
-		RTE_EVENT_TIMER_ADAPTER_CAP_PERIODIC;
-	*ops = &otx2_tim_ops;
-
-	return 0;
-}
-
-#define OTX2_TIM_DISABLE_NPA	"tim_disable_npa"
-#define OTX2_TIM_CHNK_SLOTS	"tim_chnk_slots"
-#define OTX2_TIM_STATS_ENA	"tim_stats_ena"
-#define OTX2_TIM_RINGS_LMT	"tim_rings_lmt"
-#define OTX2_TIM_RING_CTL	"tim_ring_ctl"
-
-static void
-tim_parse_ring_param(char *value, void *opaque)
-{
-	struct otx2_tim_evdev *dev = opaque;
-	struct otx2_tim_ctl ring_ctl = {0};
-	char *tok = strtok(value, "-");
-	struct otx2_tim_ctl *old_ptr;
-	uint16_t *val;
-
-	val = (uint16_t *)&ring_ctl;
-
-	if (!strlen(value))
-		return;
-
-	while (tok != NULL) {
-		*val = atoi(tok);
-		tok = strtok(NULL, "-");
-		val++;
-	}
-
-	if (val != (&ring_ctl.enable_stats + 1)) {
-		otx2_err(
-		"Invalid ring param expected [ring-chunk_sz-disable_npa-enable_stats]");
-		return;
-	}
-
-	dev->ring_ctl_cnt++;
-	old_ptr = dev->ring_ctl_data;
-	dev->ring_ctl_data = rte_realloc(dev->ring_ctl_data,
-					 sizeof(struct otx2_tim_ctl) *
-					 dev->ring_ctl_cnt, 0);
-	if (dev->ring_ctl_data == NULL) {
-		dev->ring_ctl_data = old_ptr;
-		dev->ring_ctl_cnt--;
-		return;
-	}
-
-	dev->ring_ctl_data[dev->ring_ctl_cnt - 1] = ring_ctl;
-}
-
-static void
-tim_parse_ring_ctl_list(const char *value, void *opaque)
-{
-	char *s = strdup(value);
-	char *start = NULL;
-	char *end = NULL;
-	char *f = s;
-
-	while (*s) {
-		if (*s == '[')
-			start = s;
-		else if (*s == ']')
-			end = s;
-
-		if (start && start < end) {
-			*end = 0;
-			tim_parse_ring_param(start + 1, opaque);
-			start = end;
-			s = end;
-		}
-		s++;
-	}
-
-	free(f);
-}
-
-static int
-tim_parse_kvargs_dict(const char *key, const char *value, void *opaque)
-{
-	RTE_SET_USED(key);
-
-	/* Dict format [ring-chunk_sz-disable_npa-enable_stats] use '-' as ','
-	 * isn't allowed. 0 represents default.
-	 */
-	tim_parse_ring_ctl_list(value, opaque);
-
-	return 0;
-}
-
-static void
-tim_parse_devargs(struct rte_devargs *devargs, struct otx2_tim_evdev *dev)
-{
-	struct rte_kvargs *kvlist;
-
-	if (devargs == NULL)
-		return;
-
-	kvlist = rte_kvargs_parse(devargs->args, NULL);
-	if (kvlist == NULL)
-		return;
-
-	rte_kvargs_process(kvlist, OTX2_TIM_DISABLE_NPA,
-			   &parse_kvargs_flag, &dev->disable_npa);
-	rte_kvargs_process(kvlist, OTX2_TIM_CHNK_SLOTS,
-			   &parse_kvargs_value, &dev->chunk_slots);
-	rte_kvargs_process(kvlist, OTX2_TIM_STATS_ENA, &parse_kvargs_flag,
-			   &dev->enable_stats);
-	rte_kvargs_process(kvlist, OTX2_TIM_RINGS_LMT, &parse_kvargs_value,
-			   &dev->min_ring_cnt);
-	rte_kvargs_process(kvlist, OTX2_TIM_RING_CTL,
-			   &tim_parse_kvargs_dict, &dev);
-
-	rte_kvargs_free(kvlist);
-}
-
-void
-otx2_tim_init(struct rte_pci_device *pci_dev, struct otx2_dev *cmn_dev)
-{
-	struct rsrc_attach_req *atch_req;
-	struct rsrc_detach_req *dtch_req;
-	struct free_rsrcs_rsp *rsrc_cnt;
-	const struct rte_memzone *mz;
-	struct otx2_tim_evdev *dev;
-	int rc;
-
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return;
-
-	mz = rte_memzone_reserve(RTE_STR(OTX2_TIM_EVDEV_NAME),
-				 sizeof(struct otx2_tim_evdev),
-				 rte_socket_id(), 0);
-	if (mz == NULL) {
-		otx2_tim_dbg("Unable to allocate memory for TIM Event device");
-		return;
-	}
-
-	dev = mz->addr;
-	dev->pci_dev = pci_dev;
-	dev->mbox = cmn_dev->mbox;
-	dev->bar2 = cmn_dev->bar2;
-
-	tim_parse_devargs(pci_dev->device.devargs, dev);
-
-	otx2_mbox_alloc_msg_free_rsrc_cnt(dev->mbox);
-	rc = otx2_mbox_process_msg(dev->mbox, (void *)&rsrc_cnt);
-	if (rc < 0) {
-		otx2_err("Unable to get free rsrc count.");
-		goto mz_free;
-	}
-
-	dev->nb_rings = dev->min_ring_cnt ?
-		RTE_MIN(dev->min_ring_cnt, rsrc_cnt->tim) : rsrc_cnt->tim;
-
-	if (!dev->nb_rings) {
-		otx2_tim_dbg("No TIM Logical functions provisioned.");
-		goto mz_free;
-	}
-
-	atch_req = otx2_mbox_alloc_msg_attach_resources(dev->mbox);
-	atch_req->modify = true;
-	atch_req->timlfs = dev->nb_rings;
-
-	rc = otx2_mbox_process(dev->mbox);
-	if (rc < 0) {
-		otx2_err("Unable to attach TIM rings.");
-		goto mz_free;
-	}
-
-	rc = tim_get_msix_offsets();
-	if (rc < 0) {
-		otx2_err("Unable to get MSIX offsets for TIM.");
-		goto detach;
-	}
-
-	if (dev->chunk_slots &&
-	    dev->chunk_slots <= OTX2_TIM_MAX_CHUNK_SLOTS &&
-	    dev->chunk_slots >= OTX2_TIM_MIN_CHUNK_SLOTS) {
-		dev->chunk_sz = (dev->chunk_slots + 1) *
-			OTX2_TIM_CHUNK_ALIGNMENT;
-	} else {
-		dev->chunk_sz = OTX2_TIM_RING_DEF_CHUNK_SZ;
-	}
-
-	return;
-
-detach:
-	dtch_req = otx2_mbox_alloc_msg_detach_resources(dev->mbox);
-	dtch_req->partial = true;
-	dtch_req->timlfs = true;
-
-	otx2_mbox_process(dev->mbox);
-mz_free:
-	rte_memzone_free(mz);
-}
-
-void
-otx2_tim_fini(void)
-{
-	struct otx2_tim_evdev *dev = tim_priv_get();
-	struct rsrc_detach_req *dtch_req;
-
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return;
-
-	dtch_req = otx2_mbox_alloc_msg_detach_resources(dev->mbox);
-	dtch_req->partial = true;
-	dtch_req->timlfs = true;
-
-	otx2_mbox_process(dev->mbox);
-	rte_memzone_free(rte_memzone_lookup(RTE_STR(OTX2_TIM_EVDEV_NAME)));
-}
diff --git a/drivers/event/octeontx2/otx2_tim_evdev.h b/drivers/event/octeontx2/otx2_tim_evdev.h
deleted file mode 100644
index dac642e0e1..0000000000
--- a/drivers/event/octeontx2/otx2_tim_evdev.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_TIM_EVDEV_H__
-#define __OTX2_TIM_EVDEV_H__
-
-#include <event_timer_adapter_pmd.h>
-#include <rte_event_timer_adapter.h>
-#include <rte_reciprocal.h>
-
-#include "otx2_dev.h"
-
-#define OTX2_TIM_EVDEV_NAME otx2_tim_eventdev
-
-#define otx2_tim_func_trace otx2_tim_dbg
-
-#define TIM_LF_RING_AURA		(0x0)
-#define TIM_LF_RING_BASE		(0x130)
-#define TIM_LF_NRSPERR_INT		(0x200)
-#define TIM_LF_NRSPERR_INT_W1S		(0x208)
-#define TIM_LF_NRSPERR_INT_ENA_W1S	(0x210)
-#define TIM_LF_NRSPERR_INT_ENA_W1C	(0x218)
-#define TIM_LF_RAS_INT			(0x300)
-#define TIM_LF_RAS_INT_W1S		(0x308)
-#define TIM_LF_RAS_INT_ENA_W1S		(0x310)
-#define TIM_LF_RAS_INT_ENA_W1C		(0x318)
-#define TIM_LF_RING_REL			(0x400)
-
-#define TIM_BUCKET_W1_S_CHUNK_REMAINDER	(48)
-#define TIM_BUCKET_W1_M_CHUNK_REMAINDER	((1ULL << (64 - \
-					 TIM_BUCKET_W1_S_CHUNK_REMAINDER)) - 1)
-#define TIM_BUCKET_W1_S_LOCK		(40)
-#define TIM_BUCKET_W1_M_LOCK		((1ULL <<	\
-					 (TIM_BUCKET_W1_S_CHUNK_REMAINDER - \
-					  TIM_BUCKET_W1_S_LOCK)) - 1)
-#define TIM_BUCKET_W1_S_RSVD		(35)
-#define TIM_BUCKET_W1_S_BSK		(34)
-#define TIM_BUCKET_W1_M_BSK		((1ULL <<	\
-					 (TIM_BUCKET_W1_S_RSVD -	    \
-					  TIM_BUCKET_W1_S_BSK)) - 1)
-#define TIM_BUCKET_W1_S_HBT		(33)
-#define TIM_BUCKET_W1_M_HBT		((1ULL <<	\
-					 (TIM_BUCKET_W1_S_BSK -		    \
-					  TIM_BUCKET_W1_S_HBT)) - 1)
-#define TIM_BUCKET_W1_S_SBT		(32)
-#define TIM_BUCKET_W1_M_SBT		((1ULL <<	\
-					 (TIM_BUCKET_W1_S_HBT -		    \
-					  TIM_BUCKET_W1_S_SBT)) - 1)
-#define TIM_BUCKET_W1_S_NUM_ENTRIES	(0)
-#define TIM_BUCKET_W1_M_NUM_ENTRIES	((1ULL <<	\
-					 (TIM_BUCKET_W1_S_SBT -		    \
-					  TIM_BUCKET_W1_S_NUM_ENTRIES)) - 1)
-
-#define TIM_BUCKET_SEMA			(TIM_BUCKET_CHUNK_REMAIN)
-
-#define TIM_BUCKET_CHUNK_REMAIN \
-	(TIM_BUCKET_W1_M_CHUNK_REMAINDER << TIM_BUCKET_W1_S_CHUNK_REMAINDER)
-
-#define TIM_BUCKET_LOCK \
-	(TIM_BUCKET_W1_M_LOCK << TIM_BUCKET_W1_S_LOCK)
-
-#define TIM_BUCKET_SEMA_WLOCK \
-	(TIM_BUCKET_CHUNK_REMAIN | (1ull << TIM_BUCKET_W1_S_LOCK))
-
-#define OTX2_MAX_TIM_RINGS		(256)
-#define OTX2_TIM_MAX_BUCKETS		(0xFFFFF)
-#define OTX2_TIM_RING_DEF_CHUNK_SZ	(4096)
-#define OTX2_TIM_CHUNK_ALIGNMENT	(16)
-#define OTX2_TIM_MAX_BURST		(RTE_CACHE_LINE_SIZE / \
-						OTX2_TIM_CHUNK_ALIGNMENT)
-#define OTX2_TIM_NB_CHUNK_SLOTS(sz)	(((sz) / OTX2_TIM_CHUNK_ALIGNMENT) - 1)
-#define OTX2_TIM_MIN_CHUNK_SLOTS	(0x8)
-#define OTX2_TIM_MAX_CHUNK_SLOTS	(0x1FFE)
-#define OTX2_TIM_MIN_TMO_TKS		(256)
-
-#define OTX2_TIM_SP             0x1
-#define OTX2_TIM_MP             0x2
-#define OTX2_TIM_ENA_FB         0x10
-#define OTX2_TIM_ENA_DFB        0x20
-#define OTX2_TIM_ENA_STATS      0x40
-
-enum otx2_tim_clk_src {
-	OTX2_TIM_CLK_SRC_10NS = RTE_EVENT_TIMER_ADAPTER_CPU_CLK,
-	OTX2_TIM_CLK_SRC_GPIO = RTE_EVENT_TIMER_ADAPTER_EXT_CLK0,
-	OTX2_TIM_CLK_SRC_GTI  = RTE_EVENT_TIMER_ADAPTER_EXT_CLK1,
-	OTX2_TIM_CLK_SRC_PTP  = RTE_EVENT_TIMER_ADAPTER_EXT_CLK2,
-};
-
-struct otx2_tim_bkt {
-	uint64_t first_chunk;
-	union {
-		uint64_t w1;
-		struct {
-			uint32_t nb_entry;
-			uint8_t sbt:1;
-			uint8_t hbt:1;
-			uint8_t bsk:1;
-			uint8_t rsvd:5;
-			uint8_t lock;
-			int16_t chunk_remainder;
-		};
-	};
-	uint64_t current_chunk;
-	uint64_t pad;
-} __rte_packed __rte_aligned(32);
-
-struct otx2_tim_ent {
-	uint64_t w0;
-	uint64_t wqe;
-} __rte_packed;
-
-struct otx2_tim_ctl {
-	uint16_t ring;
-	uint16_t chunk_slots;
-	uint16_t disable_npa;
-	uint16_t enable_stats;
-};
-
-struct otx2_tim_evdev {
-	struct rte_pci_device *pci_dev;
-	struct rte_eventdev *event_dev;
-	struct otx2_mbox *mbox;
-	uint16_t nb_rings;
-	uint32_t chunk_sz;
-	uintptr_t bar2;
-	/* Dev args */
-	uint8_t disable_npa;
-	uint16_t chunk_slots;
-	uint16_t min_ring_cnt;
-	uint8_t enable_stats;
-	uint16_t ring_ctl_cnt;
-	struct otx2_tim_ctl *ring_ctl_data;
-	/* HW const */
-	/* MSIX offsets */
-	uint16_t tim_msixoff[OTX2_MAX_TIM_RINGS];
-};
-
-struct otx2_tim_ring {
-	uintptr_t base;
-	uint16_t nb_chunk_slots;
-	uint32_t nb_bkts;
-	uint64_t last_updt_cyc;
-	uint64_t ring_start_cyc;
-	uint64_t tck_int;
-	uint64_t tot_int;
-	struct otx2_tim_bkt *bkt;
-	struct rte_mempool *chunk_pool;
-	struct rte_reciprocal_u64 fast_div;
-	struct rte_reciprocal_u64 fast_bkt;
-	uint64_t arm_cnt;
-	uint8_t prod_type_sp;
-	uint8_t enable_stats;
-	uint8_t disable_npa;
-	uint8_t ena_dfb;
-	uint8_t ena_periodic;
-	uint16_t ring_id;
-	uint32_t aura;
-	uint64_t nb_timers;
-	uint64_t tck_nsec;
-	uint64_t max_tout;
-	uint64_t nb_chunks;
-	uint64_t chunk_sz;
-	uint64_t tenns_clk_freq;
-	enum otx2_tim_clk_src clk_src;
-} __rte_cache_aligned;
-
-static inline struct otx2_tim_evdev *
-tim_priv_get(void)
-{
-	const struct rte_memzone *mz;
-
-	mz = rte_memzone_lookup(RTE_STR(OTX2_TIM_EVDEV_NAME));
-	if (mz == NULL)
-		return NULL;
-
-	return mz->addr;
-}
-
-#ifdef RTE_ARCH_ARM64
-static inline uint64_t
-tim_cntvct(void)
-{
-	return __rte_arm64_cntvct();
-}
-
-static inline uint64_t
-tim_cntfrq(void)
-{
-	return __rte_arm64_cntfrq();
-}
-#else
-static inline uint64_t
-tim_cntvct(void)
-{
-	return 0;
-}
-
-static inline uint64_t
-tim_cntfrq(void)
-{
-	return 0;
-}
-#endif
-
-#define TIM_ARM_FASTPATH_MODES                                                 \
-	FP(sp, 0, 0, 0, OTX2_TIM_ENA_DFB | OTX2_TIM_SP)                        \
-	FP(mp, 0, 0, 1, OTX2_TIM_ENA_DFB | OTX2_TIM_MP)                        \
-	FP(fb_sp, 0, 1, 0, OTX2_TIM_ENA_FB | OTX2_TIM_SP)                      \
-	FP(fb_mp, 0, 1, 1, OTX2_TIM_ENA_FB | OTX2_TIM_MP)                      \
-	FP(stats_mod_sp, 1, 0, 0,                                              \
-	   OTX2_TIM_ENA_STATS | OTX2_TIM_ENA_DFB | OTX2_TIM_SP)                \
-	FP(stats_mod_mp, 1, 0, 1,                                              \
-	   OTX2_TIM_ENA_STATS | OTX2_TIM_ENA_DFB | OTX2_TIM_MP)                \
-	FP(stats_mod_fb_sp, 1, 1, 0,                                           \
-	   OTX2_TIM_ENA_STATS | OTX2_TIM_ENA_FB | OTX2_TIM_SP)                 \
-	FP(stats_mod_fb_mp, 1, 1, 1,                                           \
-	   OTX2_TIM_ENA_STATS | OTX2_TIM_ENA_FB | OTX2_TIM_MP)
-
-#define TIM_ARM_TMO_FASTPATH_MODES                                             \
-	FP(dfb, 0, 0, OTX2_TIM_ENA_DFB)                                        \
-	FP(fb, 0, 1, OTX2_TIM_ENA_FB)                                          \
-	FP(stats_dfb, 1, 0, OTX2_TIM_ENA_STATS | OTX2_TIM_ENA_DFB)             \
-	FP(stats_fb, 1, 1, OTX2_TIM_ENA_STATS | OTX2_TIM_ENA_FB)
-
-#define FP(_name, _f3, _f2, _f1, flags)                                        \
-	uint16_t otx2_tim_arm_burst_##_name(                                   \
-		const struct rte_event_timer_adapter *adptr,                   \
-		struct rte_event_timer **tim, const uint16_t nb_timers);
-TIM_ARM_FASTPATH_MODES
-#undef FP
-
-#define FP(_name, _f2, _f1, flags)                                             \
-	uint16_t otx2_tim_arm_tmo_tick_burst_##_name(                          \
-		const struct rte_event_timer_adapter *adptr,                   \
-		struct rte_event_timer **tim, const uint64_t timeout_tick,     \
-		const uint16_t nb_timers);
-TIM_ARM_TMO_FASTPATH_MODES
-#undef FP
-
-uint16_t otx2_tim_timer_cancel_burst(
-		const struct rte_event_timer_adapter *adptr,
-		struct rte_event_timer **tim, const uint16_t nb_timers);
-
-int otx2_tim_caps_get(const struct rte_eventdev *dev, uint64_t flags,
-		      uint32_t *caps,
-		      const struct event_timer_adapter_ops **ops);
-
-void otx2_tim_init(struct rte_pci_device *pci_dev, struct otx2_dev *cmn_dev);
-void otx2_tim_fini(void);
-
-/* TIM IRQ */
-int tim_register_irq(uint16_t ring_id);
-void tim_unregister_irq(uint16_t ring_id);
-
-#endif /* __OTX2_TIM_EVDEV_H__ */
diff --git a/drivers/event/octeontx2/otx2_tim_worker.c b/drivers/event/octeontx2/otx2_tim_worker.c
deleted file mode 100644
index 9ee07958fd..0000000000
--- a/drivers/event/octeontx2/otx2_tim_worker.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_tim_evdev.h"
-#include "otx2_tim_worker.h"
-
-static inline int
-tim_arm_checks(const struct otx2_tim_ring * const tim_ring,
-	       struct rte_event_timer * const tim)
-{
-	if (unlikely(tim->state)) {
-		tim->state = RTE_EVENT_TIMER_ERROR;
-		rte_errno = EALREADY;
-		goto fail;
-	}
-
-	if (unlikely(!tim->timeout_ticks ||
-		     tim->timeout_ticks >= tim_ring->nb_bkts)) {
-		tim->state = tim->timeout_ticks ? RTE_EVENT_TIMER_ERROR_TOOLATE
-			: RTE_EVENT_TIMER_ERROR_TOOEARLY;
-		rte_errno = EINVAL;
-		goto fail;
-	}
-
-	return 0;
-
-fail:
-	return -EINVAL;
-}
-
-static inline void
-tim_format_event(const struct rte_event_timer * const tim,
-		 struct otx2_tim_ent * const entry)
-{
-	entry->w0 = (tim->ev.event & 0xFFC000000000) >> 6 |
-		(tim->ev.event & 0xFFFFFFFFF);
-	entry->wqe = tim->ev.u64;
-}
-
-static inline void
-tim_sync_start_cyc(struct otx2_tim_ring *tim_ring)
-{
-	uint64_t cur_cyc = tim_cntvct();
-	uint32_t real_bkt;
-
-	if (cur_cyc - tim_ring->last_updt_cyc > tim_ring->tot_int) {
-		real_bkt = otx2_read64(tim_ring->base + TIM_LF_RING_REL) >> 44;
-		cur_cyc = tim_cntvct();
-
-		tim_ring->ring_start_cyc = cur_cyc -
-						(real_bkt * tim_ring->tck_int);
-		tim_ring->last_updt_cyc = cur_cyc;
-	}
-
-}
-
-static __rte_always_inline uint16_t
-tim_timer_arm_burst(const struct rte_event_timer_adapter *adptr,
-		    struct rte_event_timer **tim,
-		    const uint16_t nb_timers,
-		    const uint8_t flags)
-{
-	struct otx2_tim_ring *tim_ring = adptr->data->adapter_priv;
-	struct otx2_tim_ent entry;
-	uint16_t index;
-	int ret;
-
-	tim_sync_start_cyc(tim_ring);
-	for (index = 0; index < nb_timers; index++) {
-		if (tim_arm_checks(tim_ring, tim[index]))
-			break;
-
-		tim_format_event(tim[index], &entry);
-		if (flags & OTX2_TIM_SP)
-			ret = tim_add_entry_sp(tim_ring,
-					       tim[index]->timeout_ticks,
-					       tim[index], &entry, flags);
-		if (flags & OTX2_TIM_MP)
-			ret = tim_add_entry_mp(tim_ring,
-					       tim[index]->timeout_ticks,
-					       tim[index], &entry, flags);
-
-		if (unlikely(ret)) {
-			rte_errno = -ret;
-			break;
-		}
-	}
-
-	if (flags & OTX2_TIM_ENA_STATS)
-		__atomic_fetch_add(&tim_ring->arm_cnt, index, __ATOMIC_RELAXED);
-
-	return index;
-}
-
-static __rte_always_inline uint16_t
-tim_timer_arm_tmo_brst(const struct rte_event_timer_adapter *adptr,
-		       struct rte_event_timer **tim,
-		       const uint64_t timeout_tick,
-		       const uint16_t nb_timers, const uint8_t flags)
-{
-	struct otx2_tim_ent entry[OTX2_TIM_MAX_BURST] __rte_cache_aligned;
-	struct otx2_tim_ring *tim_ring = adptr->data->adapter_priv;
-	uint16_t set_timers = 0;
-	uint16_t arr_idx = 0;
-	uint16_t idx;
-	int ret;
-
-	if (unlikely(!timeout_tick || timeout_tick >= tim_ring->nb_bkts)) {
-		const enum rte_event_timer_state state = timeout_tick ?
-			RTE_EVENT_TIMER_ERROR_TOOLATE :
-			RTE_EVENT_TIMER_ERROR_TOOEARLY;
-		for (idx = 0; idx < nb_timers; idx++)
-			tim[idx]->state = state;
-
-		rte_errno = EINVAL;
-		return 0;
-	}
-
-	tim_sync_start_cyc(tim_ring);
-	while (arr_idx < nb_timers) {
-		for (idx = 0; idx < OTX2_TIM_MAX_BURST && (arr_idx < nb_timers);
-		     idx++, arr_idx++) {
-			tim_format_event(tim[arr_idx], &entry[idx]);
-		}
-		ret = tim_add_entry_brst(tim_ring, timeout_tick,
-					 &tim[set_timers], entry, idx, flags);
-		set_timers += ret;
-		if (ret != idx)
-			break;
-	}
-	if (flags & OTX2_TIM_ENA_STATS)
-		__atomic_fetch_add(&tim_ring->arm_cnt, set_timers,
-				   __ATOMIC_RELAXED);
-
-	return set_timers;
-}
-
-#define FP(_name, _f3, _f2, _f1, _flags)				\
-uint16_t __rte_noinline							  \
-otx2_tim_arm_burst_ ## _name(const struct rte_event_timer_adapter *adptr, \
-			     struct rte_event_timer **tim,		  \
-			     const uint16_t nb_timers)			  \
-{									  \
-	return tim_timer_arm_burst(adptr, tim, nb_timers, _flags);	  \
-}
-TIM_ARM_FASTPATH_MODES
-#undef FP
-
-#define FP(_name, _f2, _f1, _flags)				\
-uint16_t __rte_noinline							\
-otx2_tim_arm_tmo_tick_burst_ ## _name(					\
-			const struct rte_event_timer_adapter *adptr,	\
-				      struct rte_event_timer **tim,	\
-				      const uint64_t timeout_tick,	\
-				      const uint16_t nb_timers)		\
-{									\
-	return tim_timer_arm_tmo_brst(adptr, tim, timeout_tick,		\
-			nb_timers, _flags);				\
-}
-TIM_ARM_TMO_FASTPATH_MODES
-#undef FP
-
-uint16_t
-otx2_tim_timer_cancel_burst(const struct rte_event_timer_adapter *adptr,
-			    struct rte_event_timer **tim,
-			    const uint16_t nb_timers)
-{
-	uint16_t index;
-	int ret;
-
-	RTE_SET_USED(adptr);
-	rte_atomic_thread_fence(__ATOMIC_ACQUIRE);
-	for (index = 0; index < nb_timers; index++) {
-		if (tim[index]->state == RTE_EVENT_TIMER_CANCELED) {
-			rte_errno = EALREADY;
-			break;
-		}
-
-		if (tim[index]->state != RTE_EVENT_TIMER_ARMED) {
-			rte_errno = EINVAL;
-			break;
-		}
-		ret = tim_rm_entry(tim[index]);
-		if (ret) {
-			rte_errno = -ret;
-			break;
-		}
-	}
-
-	return index;
-}
diff --git a/drivers/event/octeontx2/otx2_tim_worker.h b/drivers/event/octeontx2/otx2_tim_worker.h
deleted file mode 100644
index efe88a8692..0000000000
--- a/drivers/event/octeontx2/otx2_tim_worker.h
+++ /dev/null
@@ -1,598 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_TIM_WORKER_H__
-#define __OTX2_TIM_WORKER_H__
-
-#include "otx2_tim_evdev.h"
-
-static inline uint8_t
-tim_bkt_fetch_lock(uint64_t w1)
-{
-	return (w1 >> TIM_BUCKET_W1_S_LOCK) &
-		TIM_BUCKET_W1_M_LOCK;
-}
-
-static inline int16_t
-tim_bkt_fetch_rem(uint64_t w1)
-{
-	return (w1 >> TIM_BUCKET_W1_S_CHUNK_REMAINDER) &
-		TIM_BUCKET_W1_M_CHUNK_REMAINDER;
-}
-
-static inline int16_t
-tim_bkt_get_rem(struct otx2_tim_bkt *bktp)
-{
-	return __atomic_load_n(&bktp->chunk_remainder, __ATOMIC_ACQUIRE);
-}
-
-static inline void
-tim_bkt_set_rem(struct otx2_tim_bkt *bktp, uint16_t v)
-{
-	__atomic_store_n(&bktp->chunk_remainder, v, __ATOMIC_RELAXED);
-}
-
-static inline void
-tim_bkt_sub_rem(struct otx2_tim_bkt *bktp, uint16_t v)
-{
-	__atomic_fetch_sub(&bktp->chunk_remainder, v, __ATOMIC_RELAXED);
-}
-
-static inline uint8_t
-tim_bkt_get_hbt(uint64_t w1)
-{
-	return (w1 >> TIM_BUCKET_W1_S_HBT) & TIM_BUCKET_W1_M_HBT;
-}
-
-static inline uint8_t
-tim_bkt_get_bsk(uint64_t w1)
-{
-	return (w1 >> TIM_BUCKET_W1_S_BSK) & TIM_BUCKET_W1_M_BSK;
-}
-
-static inline uint64_t
-tim_bkt_clr_bsk(struct otx2_tim_bkt *bktp)
-{
-	/* Clear everything except lock. */
-	const uint64_t v = TIM_BUCKET_W1_M_LOCK << TIM_BUCKET_W1_S_LOCK;
-
-	return __atomic_fetch_and(&bktp->w1, v, __ATOMIC_ACQ_REL);
-}
-
-static inline uint64_t
-tim_bkt_fetch_sema_lock(struct otx2_tim_bkt *bktp)
-{
-	return __atomic_fetch_add(&bktp->w1, TIM_BUCKET_SEMA_WLOCK,
-			__ATOMIC_ACQUIRE);
-}
-
-static inline uint64_t
-tim_bkt_fetch_sema(struct otx2_tim_bkt *bktp)
-{
-	return __atomic_fetch_add(&bktp->w1, TIM_BUCKET_SEMA, __ATOMIC_RELAXED);
-}
-
-static inline uint64_t
-tim_bkt_inc_lock(struct otx2_tim_bkt *bktp)
-{
-	const uint64_t v = 1ull << TIM_BUCKET_W1_S_LOCK;
-
-	return __atomic_fetch_add(&bktp->w1, v, __ATOMIC_ACQUIRE);
-}
-
-static inline void
-tim_bkt_dec_lock(struct otx2_tim_bkt *bktp)
-{
-	__atomic_fetch_sub(&bktp->lock, 1, __ATOMIC_RELEASE);
-}
-
-static inline void
-tim_bkt_dec_lock_relaxed(struct otx2_tim_bkt *bktp)
-{
-	__atomic_fetch_sub(&bktp->lock, 1, __ATOMIC_RELAXED);
-}
-
-static inline uint32_t
-tim_bkt_get_nent(uint64_t w1)
-{
-	return (w1 >> TIM_BUCKET_W1_S_NUM_ENTRIES) &
-		TIM_BUCKET_W1_M_NUM_ENTRIES;
-}
-
-static inline void
-tim_bkt_inc_nent(struct otx2_tim_bkt *bktp)
-{
-	__atomic_add_fetch(&bktp->nb_entry, 1, __ATOMIC_RELAXED);
-}
-
-static inline void
-tim_bkt_add_nent(struct otx2_tim_bkt *bktp, uint32_t v)
-{
-	__atomic_add_fetch(&bktp->nb_entry, v, __ATOMIC_RELAXED);
-}
-
-static inline uint64_t
-tim_bkt_clr_nent(struct otx2_tim_bkt *bktp)
-{
-	const uint64_t v = ~(TIM_BUCKET_W1_M_NUM_ENTRIES <<
-			TIM_BUCKET_W1_S_NUM_ENTRIES);
-
-	return __atomic_and_fetch(&bktp->w1, v, __ATOMIC_ACQ_REL);
-}
-
-static inline uint64_t
-tim_bkt_fast_mod(uint64_t n, uint64_t d, struct rte_reciprocal_u64 R)
-{
-	return (n - (d * rte_reciprocal_divide_u64(n, &R)));
-}
-
-static __rte_always_inline void
-tim_get_target_bucket(struct otx2_tim_ring *const tim_ring,
-		      const uint32_t rel_bkt, struct otx2_tim_bkt **bkt,
-		      struct otx2_tim_bkt **mirr_bkt)
-{
-	const uint64_t bkt_cyc = tim_cntvct() - tim_ring->ring_start_cyc;
-	uint64_t bucket =
-		rte_reciprocal_divide_u64(bkt_cyc, &tim_ring->fast_div) +
-		rel_bkt;
-	uint64_t mirr_bucket = 0;
-
-	bucket =
-		tim_bkt_fast_mod(bucket, tim_ring->nb_bkts, tim_ring->fast_bkt);
-	mirr_bucket = tim_bkt_fast_mod(bucket + (tim_ring->nb_bkts >> 1),
-				       tim_ring->nb_bkts, tim_ring->fast_bkt);
-	*bkt = &tim_ring->bkt[bucket];
-	*mirr_bkt = &tim_ring->bkt[mirr_bucket];
-}
-
-static struct otx2_tim_ent *
-tim_clr_bkt(struct otx2_tim_ring * const tim_ring,
-	    struct otx2_tim_bkt * const bkt)
-{
-#define TIM_MAX_OUTSTANDING_OBJ		64
-	void *pend_chunks[TIM_MAX_OUTSTANDING_OBJ];
-	struct otx2_tim_ent *chunk;
-	struct otx2_tim_ent *pnext;
-	uint8_t objs = 0;
-
-
-	chunk = ((struct otx2_tim_ent *)(uintptr_t)bkt->first_chunk);
-	chunk = (struct otx2_tim_ent *)(uintptr_t)(chunk +
-			tim_ring->nb_chunk_slots)->w0;
-	while (chunk) {
-		pnext = (struct otx2_tim_ent *)(uintptr_t)
-			((chunk + tim_ring->nb_chunk_slots)->w0);
-		if (objs == TIM_MAX_OUTSTANDING_OBJ) {
-			rte_mempool_put_bulk(tim_ring->chunk_pool, pend_chunks,
-					     objs);
-			objs = 0;
-		}
-		pend_chunks[objs++] = chunk;
-		chunk = pnext;
-	}
-
-	if (objs)
-		rte_mempool_put_bulk(tim_ring->chunk_pool, pend_chunks,
-				objs);
-
-	return (struct otx2_tim_ent *)(uintptr_t)bkt->first_chunk;
-}
-
-static struct otx2_tim_ent *
-tim_refill_chunk(struct otx2_tim_bkt * const bkt,
-		 struct otx2_tim_bkt * const mirr_bkt,
-		 struct otx2_tim_ring * const tim_ring)
-{
-	struct otx2_tim_ent *chunk;
-
-	if (bkt->nb_entry || !bkt->first_chunk) {
-		if (unlikely(rte_mempool_get(tim_ring->chunk_pool,
-					     (void **)&chunk)))
-			return NULL;
-		if (bkt->nb_entry) {
-			*(uint64_t *)(((struct otx2_tim_ent *)
-						mirr_bkt->current_chunk) +
-					tim_ring->nb_chunk_slots) =
-				(uintptr_t)chunk;
-		} else {
-			bkt->first_chunk = (uintptr_t)chunk;
-		}
-	} else {
-		chunk = tim_clr_bkt(tim_ring, bkt);
-		bkt->first_chunk = (uintptr_t)chunk;
-	}
-	*(uint64_t *)(chunk + tim_ring->nb_chunk_slots) = 0;
-
-	return chunk;
-}
-
-static struct otx2_tim_ent *
-tim_insert_chunk(struct otx2_tim_bkt * const bkt,
-		 struct otx2_tim_bkt * const mirr_bkt,
-		 struct otx2_tim_ring * const tim_ring)
-{
-	struct otx2_tim_ent *chunk;
-
-	if (unlikely(rte_mempool_get(tim_ring->chunk_pool, (void **)&chunk)))
-		return NULL;
-
-	*(uint64_t *)(chunk + tim_ring->nb_chunk_slots) = 0;
-	if (bkt->nb_entry) {
-		*(uint64_t *)(((struct otx2_tim_ent *)(uintptr_t)
-					mirr_bkt->current_chunk) +
-				tim_ring->nb_chunk_slots) = (uintptr_t)chunk;
-	} else {
-		bkt->first_chunk = (uintptr_t)chunk;
-	}
-	return chunk;
-}
-
-static __rte_always_inline int
-tim_add_entry_sp(struct otx2_tim_ring * const tim_ring,
-		 const uint32_t rel_bkt,
-		 struct rte_event_timer * const tim,
-		 const struct otx2_tim_ent * const pent,
-		 const uint8_t flags)
-{
-	struct otx2_tim_bkt *mirr_bkt;
-	struct otx2_tim_ent *chunk;
-	struct otx2_tim_bkt *bkt;
-	uint64_t lock_sema;
-	int16_t rem;
-
-__retry:
-	tim_get_target_bucket(tim_ring, rel_bkt, &bkt, &mirr_bkt);
-
-	/* Get Bucket sema*/
-	lock_sema = tim_bkt_fetch_sema_lock(bkt);
-
-	/* Bucket related checks. */
-	if (unlikely(tim_bkt_get_hbt(lock_sema))) {
-		if (tim_bkt_get_nent(lock_sema) != 0) {
-			uint64_t hbt_state;
-#ifdef RTE_ARCH_ARM64
-			asm volatile("		ldxr %[hbt], [%[w1]]	\n"
-				     "		tbz %[hbt], 33, dne%=	\n"
-				     "		sevl			\n"
-				     "rty%=:	wfe			\n"
-				     "		ldxr %[hbt], [%[w1]]	\n"
-				     "		tbnz %[hbt], 33, rty%=	\n"
-				     "dne%=:				\n"
-				     : [hbt] "=&r"(hbt_state)
-				     : [w1] "r"((&bkt->w1))
-				     : "memory");
-#else
-			do {
-				hbt_state = __atomic_load_n(&bkt->w1,
-							    __ATOMIC_RELAXED);
-			} while (hbt_state & BIT_ULL(33));
-#endif
-
-			if (!(hbt_state & BIT_ULL(34))) {
-				tim_bkt_dec_lock(bkt);
-				goto __retry;
-			}
-		}
-	}
-	/* Insert the work. */
-	rem = tim_bkt_fetch_rem(lock_sema);
-
-	if (!rem) {
-		if (flags & OTX2_TIM_ENA_FB)
-			chunk = tim_refill_chunk(bkt, mirr_bkt, tim_ring);
-		if (flags & OTX2_TIM_ENA_DFB)
-			chunk = tim_insert_chunk(bkt, mirr_bkt, tim_ring);
-
-		if (unlikely(chunk == NULL)) {
-			bkt->chunk_remainder = 0;
-			tim->impl_opaque[0] = 0;
-			tim->impl_opaque[1] = 0;
-			tim->state = RTE_EVENT_TIMER_ERROR;
-			tim_bkt_dec_lock(bkt);
-			return -ENOMEM;
-		}
-		mirr_bkt->current_chunk = (uintptr_t)chunk;
-		bkt->chunk_remainder = tim_ring->nb_chunk_slots - 1;
-	} else {
-		chunk = (struct otx2_tim_ent *)mirr_bkt->current_chunk;
-		chunk += tim_ring->nb_chunk_slots - rem;
-	}
-
-	/* Copy work entry. */
-	*chunk = *pent;
-
-	tim->impl_opaque[0] = (uintptr_t)chunk;
-	tim->impl_opaque[1] = (uintptr_t)bkt;
-	__atomic_store_n(&tim->state, RTE_EVENT_TIMER_ARMED, __ATOMIC_RELEASE);
-	tim_bkt_inc_nent(bkt);
-	tim_bkt_dec_lock_relaxed(bkt);
-
-	return 0;
-}
-
-static __rte_always_inline int
-tim_add_entry_mp(struct otx2_tim_ring * const tim_ring,
-		 const uint32_t rel_bkt,
-		 struct rte_event_timer * const tim,
-		 const struct otx2_tim_ent * const pent,
-		 const uint8_t flags)
-{
-	struct otx2_tim_bkt *mirr_bkt;
-	struct otx2_tim_ent *chunk;
-	struct otx2_tim_bkt *bkt;
-	uint64_t lock_sema;
-	int16_t rem;
-
-__retry:
-	tim_get_target_bucket(tim_ring, rel_bkt, &bkt, &mirr_bkt);
-	/* Get Bucket sema*/
-	lock_sema = tim_bkt_fetch_sema_lock(bkt);
-
-	/* Bucket related checks. */
-	if (unlikely(tim_bkt_get_hbt(lock_sema))) {
-		if (tim_bkt_get_nent(lock_sema) != 0) {
-			uint64_t hbt_state;
-#ifdef RTE_ARCH_ARM64
-			asm volatile("		ldxr %[hbt], [%[w1]]	\n"
-				     "		tbz %[hbt], 33, dne%=	\n"
-				     "		sevl			\n"
-				     "rty%=:	wfe			\n"
-				     "		ldxr %[hbt], [%[w1]]	\n"
-				     "		tbnz %[hbt], 33, rty%=	\n"
-				     "dne%=:				\n"
-				     : [hbt] "=&r"(hbt_state)
-				     : [w1] "r"((&bkt->w1))
-				     : "memory");
-#else
-			do {
-				hbt_state = __atomic_load_n(&bkt->w1,
-							    __ATOMIC_RELAXED);
-			} while (hbt_state & BIT_ULL(33));
-#endif
-
-			if (!(hbt_state & BIT_ULL(34))) {
-				tim_bkt_dec_lock(bkt);
-				goto __retry;
-			}
-		}
-	}
-
-	rem = tim_bkt_fetch_rem(lock_sema);
-	if (rem < 0) {
-		tim_bkt_dec_lock(bkt);
-#ifdef RTE_ARCH_ARM64
-		uint64_t w1;
-		asm volatile("		ldxr %[w1], [%[crem]]	\n"
-			     "		tbz %[w1], 63, dne%=		\n"
-			     "		sevl				\n"
-			     "rty%=:	wfe				\n"
-			     "		ldxr %[w1], [%[crem]]	\n"
-			     "		tbnz %[w1], 63, rty%=		\n"
-			     "dne%=:					\n"
-			     : [w1] "=&r"(w1)
-			     : [crem] "r"(&bkt->w1)
-			     : "memory");
-#else
-		while (__atomic_load_n((int64_t *)&bkt->w1, __ATOMIC_RELAXED) <
-		       0)
-			;
-#endif
-		goto __retry;
-	} else if (!rem) {
-		/* Only one thread can be here*/
-		if (flags & OTX2_TIM_ENA_FB)
-			chunk = tim_refill_chunk(bkt, mirr_bkt, tim_ring);
-		if (flags & OTX2_TIM_ENA_DFB)
-			chunk = tim_insert_chunk(bkt, mirr_bkt, tim_ring);
-
-		if (unlikely(chunk == NULL)) {
-			tim->impl_opaque[0] = 0;
-			tim->impl_opaque[1] = 0;
-			tim->state = RTE_EVENT_TIMER_ERROR;
-			tim_bkt_set_rem(bkt, 0);
-			tim_bkt_dec_lock(bkt);
-			return -ENOMEM;
-		}
-		*chunk = *pent;
-		if (tim_bkt_fetch_lock(lock_sema)) {
-			do {
-				lock_sema = __atomic_load_n(&bkt->w1,
-							    __ATOMIC_RELAXED);
-			} while (tim_bkt_fetch_lock(lock_sema) - 1);
-			rte_atomic_thread_fence(__ATOMIC_ACQUIRE);
-		}
-		mirr_bkt->current_chunk = (uintptr_t)chunk;
-		__atomic_store_n(&bkt->chunk_remainder,
-				tim_ring->nb_chunk_slots - 1, __ATOMIC_RELEASE);
-	} else {
-		chunk = (struct otx2_tim_ent *)mirr_bkt->current_chunk;
-		chunk += tim_ring->nb_chunk_slots - rem;
-		*chunk = *pent;
-	}
-
-	tim->impl_opaque[0] = (uintptr_t)chunk;
-	tim->impl_opaque[1] = (uintptr_t)bkt;
-	__atomic_store_n(&tim->state, RTE_EVENT_TIMER_ARMED, __ATOMIC_RELEASE);
-	tim_bkt_inc_nent(bkt);
-	tim_bkt_dec_lock_relaxed(bkt);
-
-	return 0;
-}
-
-static inline uint16_t
-tim_cpy_wrk(uint16_t index, uint16_t cpy_lmt,
-	    struct otx2_tim_ent *chunk,
-	    struct rte_event_timer ** const tim,
-	    const struct otx2_tim_ent * const ents,
-	    const struct otx2_tim_bkt * const bkt)
-{
-	for (; index < cpy_lmt; index++) {
-		*chunk = *(ents + index);
-		tim[index]->impl_opaque[0] = (uintptr_t)chunk++;
-		tim[index]->impl_opaque[1] = (uintptr_t)bkt;
-		tim[index]->state = RTE_EVENT_TIMER_ARMED;
-	}
-
-	return index;
-}
-
-/* Burst mode functions */
-static inline int
-tim_add_entry_brst(struct otx2_tim_ring * const tim_ring,
-		   const uint16_t rel_bkt,
-		   struct rte_event_timer ** const tim,
-		   const struct otx2_tim_ent *ents,
-		   const uint16_t nb_timers, const uint8_t flags)
-{
-	struct otx2_tim_ent *chunk = NULL;
-	struct otx2_tim_bkt *mirr_bkt;
-	struct otx2_tim_bkt *bkt;
-	uint16_t chunk_remainder;
-	uint16_t index = 0;
-	uint64_t lock_sema;
-	int16_t rem, crem;
-	uint8_t lock_cnt;
-
-__retry:
-	tim_get_target_bucket(tim_ring, rel_bkt, &bkt, &mirr_bkt);
-
-	/* Only one thread beyond this. */
-	lock_sema = tim_bkt_inc_lock(bkt);
-	lock_cnt = (uint8_t)
-		((lock_sema >> TIM_BUCKET_W1_S_LOCK) & TIM_BUCKET_W1_M_LOCK);
-
-	if (lock_cnt) {
-		tim_bkt_dec_lock(bkt);
-#ifdef RTE_ARCH_ARM64
-		asm volatile("		ldxrb %w[lock_cnt], [%[lock]]	\n"
-			     "		tst %w[lock_cnt], 255		\n"
-			     "		beq dne%=			\n"
-			     "		sevl				\n"
-			     "rty%=:	wfe				\n"
-			     "		ldxrb %w[lock_cnt], [%[lock]]	\n"
-			     "		tst %w[lock_cnt], 255		\n"
-			     "		bne rty%=			\n"
-			     "dne%=:					\n"
-			     : [lock_cnt] "=&r"(lock_cnt)
-			     : [lock] "r"(&bkt->lock)
-			     : "memory");
-#else
-		while (__atomic_load_n(&bkt->lock, __ATOMIC_RELAXED))
-			;
-#endif
-		goto __retry;
-	}
-
-	/* Bucket related checks. */
-	if (unlikely(tim_bkt_get_hbt(lock_sema))) {
-		if (tim_bkt_get_nent(lock_sema) != 0) {
-			uint64_t hbt_state;
-#ifdef RTE_ARCH_ARM64
-			asm volatile("		ldxr %[hbt], [%[w1]]	\n"
-				     "		tbz %[hbt], 33, dne%=	\n"
-				     "		sevl			\n"
-				     "rty%=:	wfe			\n"
-				     "		ldxr %[hbt], [%[w1]]	\n"
-				     "		tbnz %[hbt], 33, rty%=	\n"
-				     "dne%=:				\n"
-				     : [hbt] "=&r"(hbt_state)
-				     : [w1] "r"((&bkt->w1))
-				     : "memory");
-#else
-			do {
-				hbt_state = __atomic_load_n(&bkt->w1,
-							    __ATOMIC_RELAXED);
-			} while (hbt_state & BIT_ULL(33));
-#endif
-
-			if (!(hbt_state & BIT_ULL(34))) {
-				tim_bkt_dec_lock(bkt);
-				goto __retry;
-			}
-		}
-	}
-
-	chunk_remainder = tim_bkt_fetch_rem(lock_sema);
-	rem = chunk_remainder - nb_timers;
-	if (rem < 0) {
-		crem = tim_ring->nb_chunk_slots - chunk_remainder;
-		if (chunk_remainder && crem) {
-			chunk = ((struct otx2_tim_ent *)
-					mirr_bkt->current_chunk) + crem;
-
-			index = tim_cpy_wrk(index, chunk_remainder, chunk, tim,
-					    ents, bkt);
-			tim_bkt_sub_rem(bkt, chunk_remainder);
-			tim_bkt_add_nent(bkt, chunk_remainder);
-		}
-
-		if (flags & OTX2_TIM_ENA_FB)
-			chunk = tim_refill_chunk(bkt, mirr_bkt, tim_ring);
-		if (flags & OTX2_TIM_ENA_DFB)
-			chunk = tim_insert_chunk(bkt, mirr_bkt, tim_ring);
-
-		if (unlikely(chunk == NULL)) {
-			tim_bkt_dec_lock(bkt);
-			rte_errno = ENOMEM;
-			tim[index]->state = RTE_EVENT_TIMER_ERROR;
-			return crem;
-		}
-		*(uint64_t *)(chunk + tim_ring->nb_chunk_slots) = 0;
-		mirr_bkt->current_chunk = (uintptr_t)chunk;
-		tim_cpy_wrk(index, nb_timers, chunk, tim, ents, bkt);
-
-		rem = nb_timers - chunk_remainder;
-		tim_bkt_set_rem(bkt, tim_ring->nb_chunk_slots - rem);
-		tim_bkt_add_nent(bkt, rem);
-	} else {
-		chunk = (struct otx2_tim_ent *)mirr_bkt->current_chunk;
-		chunk += (tim_ring->nb_chunk_slots - chunk_remainder);
-
-		tim_cpy_wrk(index, nb_timers, chunk, tim, ents, bkt);
-		tim_bkt_sub_rem(bkt, nb_timers);
-		tim_bkt_add_nent(bkt, nb_timers);
-	}
-
-	tim_bkt_dec_lock(bkt);
-
-	return nb_timers;
-}
-
-static int
-tim_rm_entry(struct rte_event_timer *tim)
-{
-	struct otx2_tim_ent *entry;
-	struct otx2_tim_bkt *bkt;
-	uint64_t lock_sema;
-
-	if (tim->impl_opaque[1] == 0 || tim->impl_opaque[0] == 0)
-		return -ENOENT;
-
-	entry = (struct otx2_tim_ent *)(uintptr_t)tim->impl_opaque[0];
-	if (entry->wqe != tim->ev.u64) {
-		tim->impl_opaque[0] = 0;
-		tim->impl_opaque[1] = 0;
-		return -ENOENT;
-	}
-
-	bkt = (struct otx2_tim_bkt *)(uintptr_t)tim->impl_opaque[1];
-	lock_sema = tim_bkt_inc_lock(bkt);
-	if (tim_bkt_get_hbt(lock_sema) || !tim_bkt_get_nent(lock_sema)) {
-		tim->impl_opaque[0] = 0;
-		tim->impl_opaque[1] = 0;
-		tim_bkt_dec_lock(bkt);
-		return -ENOENT;
-	}
-
-	entry->w0 = 0;
-	entry->wqe = 0;
-	tim->state = RTE_EVENT_TIMER_CANCELED;
-	tim->impl_opaque[0] = 0;
-	tim->impl_opaque[1] = 0;
-	tim_bkt_dec_lock(bkt);
-
-	return 0;
-}
-
-#endif /* __OTX2_TIM_WORKER_H__ */
diff --git a/drivers/event/octeontx2/otx2_worker.c b/drivers/event/octeontx2/otx2_worker.c
deleted file mode 100644
index 95139d27a3..0000000000
--- a/drivers/event/octeontx2/otx2_worker.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_worker.h"
-
-static __rte_noinline uint8_t
-otx2_ssogws_new_event(struct otx2_ssogws *ws, const struct rte_event *ev)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-	const uint64_t event_ptr = ev->u64;
-	const uint16_t grp = ev->queue_id;
-
-	if (ws->xaq_lmt <= *ws->fc_mem)
-		return 0;
-
-	otx2_ssogws_add_work(ws, event_ptr, tag, new_tt, grp);
-
-	return 1;
-}
-
-static __rte_always_inline void
-otx2_ssogws_fwd_swtag(struct otx2_ssogws *ws, const struct rte_event *ev)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-	const uint8_t cur_tt = OTX2_SSOW_TT_FROM_TAG(otx2_read64(ws->tag_op));
-
-	/* 96XX model
-	 * cur_tt/new_tt     SSO_SYNC_ORDERED SSO_SYNC_ATOMIC SSO_SYNC_UNTAGGED
-	 *
-	 * SSO_SYNC_ORDERED        norm           norm             untag
-	 * SSO_SYNC_ATOMIC         norm           norm		   untag
-	 * SSO_SYNC_UNTAGGED       norm           norm             NOOP
-	 */
-
-	if (new_tt == SSO_SYNC_UNTAGGED) {
-		if (cur_tt != SSO_SYNC_UNTAGGED)
-			otx2_ssogws_swtag_untag(ws);
-	} else {
-		otx2_ssogws_swtag_norm(ws, tag, new_tt);
-	}
-
-	ws->swtag_req = 1;
-}
-
-static __rte_always_inline void
-otx2_ssogws_fwd_group(struct otx2_ssogws *ws, const struct rte_event *ev,
-		      const uint16_t grp)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-
-	otx2_write64(ev->u64, OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op) +
-		     SSOW_LF_GWS_OP_UPD_WQP_GRP1);
-	rte_smp_wmb();
-	otx2_ssogws_swtag_desched(ws, tag, new_tt, grp);
-}
-
-static __rte_always_inline void
-otx2_ssogws_forward_event(struct otx2_ssogws *ws, const struct rte_event *ev)
-{
-	const uint8_t grp = ev->queue_id;
-
-	/* Group hasn't changed, Use SWTAG to forward the event */
-	if (OTX2_SSOW_GRP_FROM_TAG(otx2_read64(ws->tag_op)) == grp)
-		otx2_ssogws_fwd_swtag(ws, ev);
-	else
-	/*
-	 * Group has been changed for group based work pipelining,
-	 * Use deschedule/add_work operation to transfer the event to
-	 * new group/core
-	 */
-		otx2_ssogws_fwd_group(ws, ev, grp);
-}
-
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_ ##name(void *port, struct rte_event *ev,		\
-			uint64_t timeout_ticks)				\
-{									\
-	struct otx2_ssogws *ws = port;					\
-									\
-	RTE_SET_USED(timeout_ticks);					\
-									\
-	if (ws->swtag_req) {						\
-		ws->swtag_req = 0;					\
-		otx2_ssogws_swtag_wait(ws);				\
-		return 1;						\
-	}								\
-									\
-	return otx2_ssogws_get_work(ws, ev, flags, ws->lookup_mem);	\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_burst_ ##name(void *port, struct rte_event ev[],	\
-			      uint16_t nb_events,			\
-			      uint64_t timeout_ticks)			\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_deq_ ##name(port, ev, timeout_ticks);	\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_timeout_ ##name(void *port, struct rte_event *ev,	\
-				uint64_t timeout_ticks)			\
-{									\
-	struct otx2_ssogws *ws = port;					\
-	uint16_t ret = 1;						\
-	uint64_t iter;							\
-									\
-	if (ws->swtag_req) {						\
-		ws->swtag_req = 0;					\
-		otx2_ssogws_swtag_wait(ws);				\
-		return ret;						\
-	}								\
-									\
-	ret = otx2_ssogws_get_work(ws, ev, flags, ws->lookup_mem);	\
-	for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)	\
-		ret = otx2_ssogws_get_work(ws, ev, flags,		\
-					   ws->lookup_mem);		\
-									\
-	return ret;							\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_timeout_burst_ ##name(void *port, struct rte_event ev[],\
-				      uint16_t nb_events,		\
-				      uint64_t timeout_ticks)		\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_deq_timeout_ ##name(port, ev, timeout_ticks);\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_seg_ ##name(void *port, struct rte_event *ev,		\
-			    uint64_t timeout_ticks)			\
-{									\
-	struct otx2_ssogws *ws = port;					\
-									\
-	RTE_SET_USED(timeout_ticks);					\
-									\
-	if (ws->swtag_req) {						\
-		ws->swtag_req = 0;					\
-		otx2_ssogws_swtag_wait(ws);				\
-		return 1;						\
-	}								\
-									\
-	return otx2_ssogws_get_work(ws, ev, flags | NIX_RX_MULTI_SEG_F,	\
-				    ws->lookup_mem);			\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_seg_burst_ ##name(void *port, struct rte_event ev[],	\
-				  uint16_t nb_events,			\
-				  uint64_t timeout_ticks)		\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_deq_seg_ ##name(port, ev, timeout_ticks);	\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_seg_timeout_ ##name(void *port, struct rte_event *ev,	\
-				    uint64_t timeout_ticks)		\
-{									\
-	struct otx2_ssogws *ws = port;					\
-	uint16_t ret = 1;						\
-	uint64_t iter;							\
-									\
-	if (ws->swtag_req) {						\
-		ws->swtag_req = 0;					\
-		otx2_ssogws_swtag_wait(ws);				\
-		return ret;						\
-	}								\
-									\
-	ret = otx2_ssogws_get_work(ws, ev, flags | NIX_RX_MULTI_SEG_F,	\
-				   ws->lookup_mem);			\
-	for (iter = 1; iter < timeout_ticks && (ret == 0); iter++)	\
-		ret = otx2_ssogws_get_work(ws, ev,			\
-					   flags | NIX_RX_MULTI_SEG_F,	\
-					   ws->lookup_mem);		\
-									\
-	return ret;							\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_deq_seg_timeout_burst_ ##name(void *port,			\
-					  struct rte_event ev[],	\
-					  uint16_t nb_events,		\
-					  uint64_t timeout_ticks)	\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_deq_seg_timeout_ ##name(port, ev,		\
-						   timeout_ticks);	\
-}
-
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-
-uint16_t __rte_hot
-otx2_ssogws_enq(void *port, const struct rte_event *ev)
-{
-	struct otx2_ssogws *ws = port;
-
-	switch (ev->op) {
-	case RTE_EVENT_OP_NEW:
-		rte_smp_mb();
-		return otx2_ssogws_new_event(ws, ev);
-	case RTE_EVENT_OP_FORWARD:
-		otx2_ssogws_forward_event(ws, ev);
-		break;
-	case RTE_EVENT_OP_RELEASE:
-		otx2_ssogws_swtag_flush(ws->tag_op, ws->swtag_flush_op);
-		break;
-	default:
-		return 0;
-	}
-
-	return 1;
-}
-
-uint16_t __rte_hot
-otx2_ssogws_enq_burst(void *port, const struct rte_event ev[],
-		      uint16_t nb_events)
-{
-	RTE_SET_USED(nb_events);
-	return otx2_ssogws_enq(port, ev);
-}
-
-uint16_t __rte_hot
-otx2_ssogws_enq_new_burst(void *port, const struct rte_event ev[],
-			  uint16_t nb_events)
-{
-	struct otx2_ssogws *ws = port;
-	uint16_t i, rc = 1;
-
-	rte_smp_mb();
-	if (ws->xaq_lmt <= *ws->fc_mem)
-		return 0;
-
-	for (i = 0; i < nb_events && rc; i++)
-		rc = otx2_ssogws_new_event(ws,  &ev[i]);
-
-	return nb_events;
-}
-
-uint16_t __rte_hot
-otx2_ssogws_enq_fwd_burst(void *port, const struct rte_event ev[],
-			  uint16_t nb_events)
-{
-	struct otx2_ssogws *ws = port;
-
-	RTE_SET_USED(nb_events);
-	otx2_ssogws_forward_event(ws,  ev);
-
-	return 1;
-}
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-uint16_t __rte_hot							\
-otx2_ssogws_tx_adptr_enq_ ## name(void *port, struct rte_event ev[],	\
-				  uint16_t nb_events)			\
-{									\
-	struct otx2_ssogws *ws = port;					\
-	uint64_t cmd[sz];						\
-									\
-	RTE_SET_USED(nb_events);					\
-	return otx2_ssogws_event_tx(ws->base, &ev[0], cmd,		\
-				    (const uint64_t			\
-				    (*)[RTE_MAX_QUEUES_PER_PORT])	\
-				    &ws->tx_adptr_data,			\
-				    flags);				\
-}
-SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-uint16_t __rte_hot							\
-otx2_ssogws_tx_adptr_enq_seg_ ## name(void *port, struct rte_event ev[],\
-				      uint16_t nb_events)		\
-{									\
-	uint64_t cmd[(sz) + NIX_TX_MSEG_SG_DWORDS - 2];			\
-	struct otx2_ssogws *ws = port;					\
-									\
-	RTE_SET_USED(nb_events);					\
-	return otx2_ssogws_event_tx(ws->base, &ev[0], cmd,		\
-				    (const uint64_t			\
-				    (*)[RTE_MAX_QUEUES_PER_PORT])	\
-				    &ws->tx_adptr_data,			\
-				    (flags) | NIX_TX_MULTI_SEG_F);	\
-}
-SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-
-void
-ssogws_flush_events(struct otx2_ssogws *ws, uint8_t queue_id, uintptr_t base,
-		    otx2_handle_event_t fn, void *arg)
-{
-	uint64_t cq_ds_cnt = 1;
-	uint64_t aq_cnt = 1;
-	uint64_t ds_cnt = 1;
-	struct rte_event ev;
-	uint64_t enable;
-	uint64_t val;
-
-	enable = otx2_read64(base + SSO_LF_GGRP_QCTL);
-	if (!enable)
-		return;
-
-	val  = queue_id;	/* GGRP ID */
-	val |= BIT_ULL(18);	/* Grouped */
-	val |= BIT_ULL(16);	/* WAIT */
-
-	aq_cnt = otx2_read64(base + SSO_LF_GGRP_AQ_CNT);
-	ds_cnt = otx2_read64(base + SSO_LF_GGRP_MISC_CNT);
-	cq_ds_cnt = otx2_read64(base + SSO_LF_GGRP_INT_CNT);
-	cq_ds_cnt &= 0x3FFF3FFF0000;
-
-	while (aq_cnt || cq_ds_cnt || ds_cnt) {
-		otx2_write64(val, ws->getwrk_op);
-		otx2_ssogws_get_work_empty(ws, &ev, 0);
-		if (fn != NULL && ev.u64 != 0)
-			fn(arg, ev);
-		if (ev.sched_type != SSO_TT_EMPTY)
-			otx2_ssogws_swtag_flush(ws->tag_op, ws->swtag_flush_op);
-		rte_mb();
-		aq_cnt = otx2_read64(base + SSO_LF_GGRP_AQ_CNT);
-		ds_cnt = otx2_read64(base + SSO_LF_GGRP_MISC_CNT);
-		cq_ds_cnt = otx2_read64(base + SSO_LF_GGRP_INT_CNT);
-		/* Extract cq and ds count */
-		cq_ds_cnt &= 0x3FFF3FFF0000;
-	}
-
-	otx2_write64(0, OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op) +
-		     SSOW_LF_GWS_OP_GWC_INVAL);
-	rte_mb();
-}
-
-void
-ssogws_reset(struct otx2_ssogws *ws)
-{
-	uintptr_t base = OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op);
-	uint64_t pend_state;
-	uint8_t pend_tt;
-	uint64_t tag;
-
-	/* Wait till getwork/swtp/waitw/desched completes. */
-	do {
-		pend_state = otx2_read64(base + SSOW_LF_GWS_PENDSTATE);
-		rte_mb();
-	} while (pend_state & (BIT_ULL(63) | BIT_ULL(62) | BIT_ULL(58)));
-
-	tag = otx2_read64(base + SSOW_LF_GWS_TAG);
-	pend_tt = (tag >> 32) & 0x3;
-	if (pend_tt != SSO_TT_EMPTY) { /* Work was pending */
-		if (pend_tt == SSO_SYNC_ATOMIC || pend_tt == SSO_SYNC_ORDERED)
-			otx2_ssogws_swtag_untag(ws);
-		otx2_ssogws_desched(ws);
-	}
-	rte_mb();
-
-	/* Wait for desched to complete. */
-	do {
-		pend_state = otx2_read64(base + SSOW_LF_GWS_PENDSTATE);
-		rte_mb();
-	} while (pend_state & BIT_ULL(58));
-}
diff --git a/drivers/event/octeontx2/otx2_worker.h b/drivers/event/octeontx2/otx2_worker.h
deleted file mode 100644
index aa766c6602..0000000000
--- a/drivers/event/octeontx2/otx2_worker.h
+++ /dev/null
@@ -1,339 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_WORKER_H__
-#define __OTX2_WORKER_H__
-
-#include <rte_common.h>
-#include <rte_branch_prediction.h>
-
-#include <otx2_common.h>
-#include "otx2_evdev.h"
-#include "otx2_evdev_crypto_adptr_rx.h"
-#include "otx2_ethdev_sec_tx.h"
-
-/* SSO Operations */
-
-static __rte_always_inline uint16_t
-otx2_ssogws_get_work(struct otx2_ssogws *ws, struct rte_event *ev,
-		     const uint32_t flags, const void * const lookup_mem)
-{
-	union otx2_sso_event event;
-	uint64_t tstamp_ptr;
-	uint64_t get_work1;
-	uint64_t mbuf;
-
-	otx2_write64(BIT_ULL(16) | /* wait for work. */
-		     1, /* Use Mask set 0. */
-		     ws->getwrk_op);
-
-	if (flags & NIX_RX_OFFLOAD_PTYPE_F)
-		rte_prefetch_non_temporal(lookup_mem);
-#ifdef RTE_ARCH_ARM64
-	asm volatile(
-			"		ldr %[tag], [%[tag_loc]]	\n"
-			"		ldr %[wqp], [%[wqp_loc]]	\n"
-			"		tbz %[tag], 63, done%=		\n"
-			"		sevl				\n"
-			"rty%=:		wfe				\n"
-			"		ldr %[tag], [%[tag_loc]]	\n"
-			"		ldr %[wqp], [%[wqp_loc]]	\n"
-			"		tbnz %[tag], 63, rty%=		\n"
-			"done%=:	dmb ld				\n"
-			"		prfm pldl1keep, [%[wqp], #8]	\n"
-			"		sub %[mbuf], %[wqp], #0x80	\n"
-			"		prfm pldl1keep, [%[mbuf]]	\n"
-			: [tag] "=&r" (event.get_work0),
-			  [wqp] "=&r" (get_work1),
-			  [mbuf] "=&r" (mbuf)
-			: [tag_loc] "r" (ws->tag_op),
-			  [wqp_loc] "r" (ws->wqp_op)
-			);
-#else
-	event.get_work0 = otx2_read64(ws->tag_op);
-	while ((BIT_ULL(63)) & event.get_work0)
-		event.get_work0 = otx2_read64(ws->tag_op);
-
-	get_work1 = otx2_read64(ws->wqp_op);
-	rte_prefetch0((const void *)get_work1);
-	mbuf = (uint64_t)((char *)get_work1 - sizeof(struct rte_mbuf));
-	rte_prefetch0((const void *)mbuf);
-#endif
-
-	event.get_work0 = (event.get_work0 & (0x3ull << 32)) << 6 |
-		(event.get_work0 & (0x3FFull << 36)) << 4 |
-		(event.get_work0 & 0xffffffff);
-
-	if (event.sched_type != SSO_TT_EMPTY) {
-		if ((flags & NIX_RX_OFFLOAD_SECURITY_F) &&
-		    (event.event_type == RTE_EVENT_TYPE_CRYPTODEV)) {
-			get_work1 = otx2_handle_crypto_event(get_work1);
-		} else if (event.event_type == RTE_EVENT_TYPE_ETHDEV) {
-			otx2_wqe_to_mbuf(get_work1, mbuf, event.sub_event_type,
-					 (uint32_t) event.get_work0, flags,
-					 lookup_mem);
-			/* Extracting tstamp, if PTP enabled*/
-			tstamp_ptr = *(uint64_t *)(((struct nix_wqe_hdr_s *)
-						     get_work1) +
-						     OTX2_SSO_WQE_SG_PTR);
-			otx2_nix_mbuf_to_tstamp((struct rte_mbuf *)mbuf,
-						ws->tstamp, flags,
-						(uint64_t *)tstamp_ptr);
-			get_work1 = mbuf;
-		}
-	}
-
-	ev->event = event.get_work0;
-	ev->u64 = get_work1;
-
-	return !!get_work1;
-}
-
-/* Used in cleaning up workslot. */
-static __rte_always_inline uint16_t
-otx2_ssogws_get_work_empty(struct otx2_ssogws *ws, struct rte_event *ev,
-			   const uint32_t flags)
-{
-	union otx2_sso_event event;
-	uint64_t tstamp_ptr;
-	uint64_t get_work1;
-	uint64_t mbuf;
-
-#ifdef RTE_ARCH_ARM64
-	asm volatile(
-			"		ldr %[tag], [%[tag_loc]]	\n"
-			"		ldr %[wqp], [%[wqp_loc]]	\n"
-			"		tbz %[tag], 63, done%=		\n"
-			"		sevl				\n"
-			"rty%=:		wfe				\n"
-			"		ldr %[tag], [%[tag_loc]]	\n"
-			"		ldr %[wqp], [%[wqp_loc]]	\n"
-			"		tbnz %[tag], 63, rty%=		\n"
-			"done%=:	dmb ld				\n"
-			"		prfm pldl1keep, [%[wqp], #8]	\n"
-			"		sub %[mbuf], %[wqp], #0x80	\n"
-			"		prfm pldl1keep, [%[mbuf]]	\n"
-			: [tag] "=&r" (event.get_work0),
-			  [wqp] "=&r" (get_work1),
-			  [mbuf] "=&r" (mbuf)
-			: [tag_loc] "r" (ws->tag_op),
-			  [wqp_loc] "r" (ws->wqp_op)
-			);
-#else
-	event.get_work0 = otx2_read64(ws->tag_op);
-	while ((BIT_ULL(63)) & event.get_work0)
-		event.get_work0 = otx2_read64(ws->tag_op);
-
-	get_work1 = otx2_read64(ws->wqp_op);
-	rte_prefetch_non_temporal((const void *)get_work1);
-	mbuf = (uint64_t)((char *)get_work1 - sizeof(struct rte_mbuf));
-	rte_prefetch_non_temporal((const void *)mbuf);
-#endif
-
-	event.get_work0 = (event.get_work0 & (0x3ull << 32)) << 6 |
-		(event.get_work0 & (0x3FFull << 36)) << 4 |
-		(event.get_work0 & 0xffffffff);
-
-	if (event.sched_type != SSO_TT_EMPTY &&
-	    event.event_type == RTE_EVENT_TYPE_ETHDEV) {
-		otx2_wqe_to_mbuf(get_work1, mbuf, event.sub_event_type,
-				 (uint32_t) event.get_work0, flags, NULL);
-		/* Extracting tstamp, if PTP enabled*/
-		tstamp_ptr = *(uint64_t *)(((struct nix_wqe_hdr_s *)get_work1)
-					     + OTX2_SSO_WQE_SG_PTR);
-		otx2_nix_mbuf_to_tstamp((struct rte_mbuf *)mbuf, ws->tstamp,
-					flags, (uint64_t *)tstamp_ptr);
-		get_work1 = mbuf;
-	}
-
-	ev->event = event.get_work0;
-	ev->u64 = get_work1;
-
-	return !!get_work1;
-}
-
-static __rte_always_inline void
-otx2_ssogws_add_work(struct otx2_ssogws *ws, const uint64_t event_ptr,
-		     const uint32_t tag, const uint8_t new_tt,
-		     const uint16_t grp)
-{
-	uint64_t add_work0;
-
-	add_work0 = tag | ((uint64_t)(new_tt) << 32);
-	otx2_store_pair(add_work0, event_ptr, ws->grps_base[grp]);
-}
-
-static __rte_always_inline void
-otx2_ssogws_swtag_desched(struct otx2_ssogws *ws, uint32_t tag, uint8_t new_tt,
-			  uint16_t grp)
-{
-	uint64_t val;
-
-	val = tag | ((uint64_t)(new_tt & 0x3) << 32) | ((uint64_t)grp << 34);
-	otx2_write64(val, ws->swtag_desched_op);
-}
-
-static __rte_always_inline void
-otx2_ssogws_swtag_norm(struct otx2_ssogws *ws, uint32_t tag, uint8_t new_tt)
-{
-	uint64_t val;
-
-	val = tag | ((uint64_t)(new_tt & 0x3) << 32);
-	otx2_write64(val, ws->swtag_norm_op);
-}
-
-static __rte_always_inline void
-otx2_ssogws_swtag_untag(struct otx2_ssogws *ws)
-{
-	otx2_write64(0, OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op) +
-		     SSOW_LF_GWS_OP_SWTAG_UNTAG);
-}
-
-static __rte_always_inline void
-otx2_ssogws_swtag_flush(uint64_t tag_op, uint64_t flush_op)
-{
-	if (OTX2_SSOW_TT_FROM_TAG(otx2_read64(tag_op)) == SSO_TT_EMPTY)
-		return;
-	otx2_write64(0, flush_op);
-}
-
-static __rte_always_inline void
-otx2_ssogws_desched(struct otx2_ssogws *ws)
-{
-	otx2_write64(0, OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op) +
-		     SSOW_LF_GWS_OP_DESCHED);
-}
-
-static __rte_always_inline void
-otx2_ssogws_swtag_wait(struct otx2_ssogws *ws)
-{
-#ifdef RTE_ARCH_ARM64
-	uint64_t swtp;
-
-	asm volatile("		ldr %[swtb], [%[swtp_loc]]	\n"
-		     "		tbz %[swtb], 62, done%=		\n"
-		     "		sevl				\n"
-		     "rty%=:	wfe				\n"
-		     "		ldr %[swtb], [%[swtp_loc]]	\n"
-		     "		tbnz %[swtb], 62, rty%=		\n"
-		     "done%=:					\n"
-		     : [swtb] "=&r" (swtp)
-		     : [swtp_loc] "r" (ws->tag_op));
-#else
-	/* Wait for the SWTAG/SWTAG_FULL operation */
-	while (otx2_read64(ws->tag_op) & BIT_ULL(62))
-		;
-#endif
-}
-
-static __rte_always_inline void
-otx2_ssogws_head_wait(uint64_t tag_op)
-{
-#ifdef RTE_ARCH_ARM64
-	uint64_t tag;
-
-	asm volatile (
-			"	ldr %[tag], [%[tag_op]]		\n"
-			"	tbnz %[tag], 35, done%=		\n"
-			"	sevl				\n"
-			"rty%=:	wfe				\n"
-			"	ldr %[tag], [%[tag_op]]		\n"
-			"	tbz %[tag], 35, rty%=		\n"
-			"done%=:				\n"
-			: [tag] "=&r" (tag)
-			: [tag_op] "r" (tag_op)
-			);
-#else
-	/* Wait for the HEAD to be set */
-	while (!(otx2_read64(tag_op) & BIT_ULL(35)))
-		;
-#endif
-}
-
-static __rte_always_inline const struct otx2_eth_txq *
-otx2_ssogws_xtract_meta(struct rte_mbuf *m,
-			const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT])
-{
-	return (const struct otx2_eth_txq *)txq_data[m->port][
-					rte_event_eth_tx_adapter_txq_get(m)];
-}
-
-static __rte_always_inline void
-otx2_ssogws_prepare_pkt(const struct otx2_eth_txq *txq, struct rte_mbuf *m,
-			uint64_t *cmd, const uint32_t flags)
-{
-	otx2_lmt_mov(cmd, txq->cmd, otx2_nix_tx_ext_subs(flags));
-	otx2_nix_xmit_prepare(m, cmd, flags, txq->lso_tun_fmt);
-}
-
-static __rte_always_inline uint16_t
-otx2_ssogws_event_tx(uint64_t base, struct rte_event *ev, uint64_t *cmd,
-		     const uint64_t txq_data[][RTE_MAX_QUEUES_PER_PORT],
-		     const uint32_t flags)
-{
-	struct rte_mbuf *m = ev->mbuf;
-	const struct otx2_eth_txq *txq;
-	uint16_t ref_cnt = m->refcnt;
-
-	if ((flags & NIX_TX_OFFLOAD_SECURITY_F) &&
-	    (m->ol_flags & RTE_MBUF_F_TX_SEC_OFFLOAD)) {
-		txq = otx2_ssogws_xtract_meta(m, txq_data);
-		return otx2_sec_event_tx(base, ev, m, txq, flags);
-	}
-
-	/* Perform header writes before barrier for TSO */
-	otx2_nix_xmit_prepare_tso(m, flags);
-	/* Lets commit any changes in the packet here in case when
-	 * fast free is set as no further changes will be made to mbuf.
-	 * In case of fast free is not set, both otx2_nix_prepare_mseg()
-	 * and otx2_nix_xmit_prepare() has a barrier after refcnt update.
-	 */
-	if (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F))
-		rte_io_wmb();
-	txq = otx2_ssogws_xtract_meta(m, txq_data);
-	otx2_ssogws_prepare_pkt(txq, m, cmd, flags);
-
-	if (flags & NIX_TX_MULTI_SEG_F) {
-		const uint16_t segdw = otx2_nix_prepare_mseg(m, cmd, flags);
-		otx2_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0],
-					     m->ol_flags, segdw, flags);
-		if (!ev->sched_type) {
-			otx2_nix_xmit_mseg_prep_lmt(cmd, txq->lmt_addr, segdw);
-			otx2_ssogws_head_wait(base + SSOW_LF_GWS_TAG);
-			if (otx2_nix_xmit_submit_lmt(txq->io_addr) == 0)
-				otx2_nix_xmit_mseg_one(cmd, txq->lmt_addr,
-						       txq->io_addr, segdw);
-		} else {
-			otx2_nix_xmit_mseg_one(cmd, txq->lmt_addr,
-					       txq->io_addr, segdw);
-		}
-	} else {
-		/* Passing no of segdw as 4: HDR + EXT + SG + SMEM */
-		otx2_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0],
-					     m->ol_flags, 4, flags);
-
-		if (!ev->sched_type) {
-			otx2_nix_xmit_prep_lmt(cmd, txq->lmt_addr, flags);
-			otx2_ssogws_head_wait(base + SSOW_LF_GWS_TAG);
-			if (otx2_nix_xmit_submit_lmt(txq->io_addr) == 0)
-				otx2_nix_xmit_one(cmd, txq->lmt_addr,
-						  txq->io_addr, flags);
-		} else {
-			otx2_nix_xmit_one(cmd, txq->lmt_addr, txq->io_addr,
-					  flags);
-		}
-	}
-
-	if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
-		if (ref_cnt > 1)
-			return 1;
-	}
-
-	otx2_ssogws_swtag_flush(base + SSOW_LF_GWS_TAG,
-				base + SSOW_LF_GWS_OP_SWTAG_FLUSH);
-
-	return 1;
-}
-
-#endif
diff --git a/drivers/event/octeontx2/otx2_worker_dual.c b/drivers/event/octeontx2/otx2_worker_dual.c
deleted file mode 100644
index 81af4ca904..0000000000
--- a/drivers/event/octeontx2/otx2_worker_dual.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_worker_dual.h"
-#include "otx2_worker.h"
-
-static __rte_noinline uint8_t
-otx2_ssogws_dual_new_event(struct otx2_ssogws_dual *ws,
-			   const struct rte_event *ev)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-	const uint64_t event_ptr = ev->u64;
-	const uint16_t grp = ev->queue_id;
-
-	if (ws->xaq_lmt <= *ws->fc_mem)
-		return 0;
-
-	otx2_ssogws_dual_add_work(ws, event_ptr, tag, new_tt, grp);
-
-	return 1;
-}
-
-static __rte_always_inline void
-otx2_ssogws_dual_fwd_swtag(struct otx2_ssogws_state *ws,
-			   const struct rte_event *ev)
-{
-	const uint8_t cur_tt = OTX2_SSOW_TT_FROM_TAG(otx2_read64(ws->tag_op));
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-
-	/* 96XX model
-	 * cur_tt/new_tt     SSO_SYNC_ORDERED SSO_SYNC_ATOMIC SSO_SYNC_UNTAGGED
-	 *
-	 * SSO_SYNC_ORDERED        norm           norm             untag
-	 * SSO_SYNC_ATOMIC         norm           norm		   untag
-	 * SSO_SYNC_UNTAGGED       norm           norm             NOOP
-	 */
-	if (new_tt == SSO_SYNC_UNTAGGED) {
-		if (cur_tt != SSO_SYNC_UNTAGGED)
-			otx2_ssogws_swtag_untag((struct otx2_ssogws *)ws);
-	} else {
-		otx2_ssogws_swtag_norm((struct otx2_ssogws *)ws, tag, new_tt);
-	}
-}
-
-static __rte_always_inline void
-otx2_ssogws_dual_fwd_group(struct otx2_ssogws_state *ws,
-			   const struct rte_event *ev, const uint16_t grp)
-{
-	const uint32_t tag = (uint32_t)ev->event;
-	const uint8_t new_tt = ev->sched_type;
-
-	otx2_write64(ev->u64, OTX2_SSOW_GET_BASE_ADDR(ws->getwrk_op) +
-		     SSOW_LF_GWS_OP_UPD_WQP_GRP1);
-	rte_smp_wmb();
-	otx2_ssogws_swtag_desched((struct otx2_ssogws *)ws, tag, new_tt, grp);
-}
-
-static __rte_always_inline void
-otx2_ssogws_dual_forward_event(struct otx2_ssogws_dual *ws,
-			       struct otx2_ssogws_state *vws,
-			       const struct rte_event *ev)
-{
-	const uint8_t grp = ev->queue_id;
-
-	/* Group hasn't changed, Use SWTAG to forward the event */
-	if (OTX2_SSOW_GRP_FROM_TAG(otx2_read64(vws->tag_op)) == grp) {
-		otx2_ssogws_dual_fwd_swtag(vws, ev);
-		ws->swtag_req = 1;
-	} else {
-		/*
-		 * Group has been changed for group based work pipelining,
-		 * Use deschedule/add_work operation to transfer the event to
-		 * new group/core
-		 */
-		otx2_ssogws_dual_fwd_group(vws, ev, grp);
-	}
-}
-
-uint16_t __rte_hot
-otx2_ssogws_dual_enq(void *port, const struct rte_event *ev)
-{
-	struct otx2_ssogws_dual *ws = port;
-	struct otx2_ssogws_state *vws = &ws->ws_state[!ws->vws];
-
-	switch (ev->op) {
-	case RTE_EVENT_OP_NEW:
-		rte_smp_mb();
-		return otx2_ssogws_dual_new_event(ws, ev);
-	case RTE_EVENT_OP_FORWARD:
-		otx2_ssogws_dual_forward_event(ws, vws, ev);
-		break;
-	case RTE_EVENT_OP_RELEASE:
-		otx2_ssogws_swtag_flush(vws->tag_op, vws->swtag_flush_op);
-		break;
-	default:
-		return 0;
-	}
-
-	return 1;
-}
-
-uint16_t __rte_hot
-otx2_ssogws_dual_enq_burst(void *port, const struct rte_event ev[],
-			   uint16_t nb_events)
-{
-	RTE_SET_USED(nb_events);
-	return otx2_ssogws_dual_enq(port, ev);
-}
-
-uint16_t __rte_hot
-otx2_ssogws_dual_enq_new_burst(void *port, const struct rte_event ev[],
-			       uint16_t nb_events)
-{
-	struct otx2_ssogws_dual *ws = port;
-	uint16_t i, rc = 1;
-
-	rte_smp_mb();
-	if (ws->xaq_lmt <= *ws->fc_mem)
-		return 0;
-
-	for (i = 0; i < nb_events && rc; i++)
-		rc = otx2_ssogws_dual_new_event(ws, &ev[i]);
-
-	return nb_events;
-}
-
-uint16_t __rte_hot
-otx2_ssogws_dual_enq_fwd_burst(void *port, const struct rte_event ev[],
-			       uint16_t nb_events)
-{
-	struct otx2_ssogws_dual *ws = port;
-	struct otx2_ssogws_state *vws = &ws->ws_state[!ws->vws];
-
-	RTE_SET_USED(nb_events);
-	otx2_ssogws_dual_forward_event(ws, vws, ev);
-
-	return 1;
-}
-
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_ ##name(void *port, struct rte_event *ev,		\
-			     uint64_t timeout_ticks)			\
-{									\
-	struct otx2_ssogws_dual *ws = port;				\
-	uint8_t gw;							\
-									\
-	rte_prefetch_non_temporal(ws);					\
-	RTE_SET_USED(timeout_ticks);					\
-	if (ws->swtag_req) {						\
-		otx2_ssogws_swtag_wait((struct otx2_ssogws *)		\
-				       &ws->ws_state[!ws->vws]);	\
-		ws->swtag_req = 0;					\
-		return 1;						\
-	}								\
-									\
-	gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws],		\
-				       &ws->ws_state[!ws->vws], ev,	\
-				       flags, ws->lookup_mem,		\
-				       ws->tstamp);			\
-	ws->vws = !ws->vws;						\
-									\
-	return gw;							\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_burst_ ##name(void *port, struct rte_event ev[],	\
-				   uint16_t nb_events,			\
-				   uint64_t timeout_ticks)		\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_dual_deq_ ##name(port, ev, timeout_ticks);	\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_timeout_ ##name(void *port, struct rte_event *ev,	\
-				     uint64_t timeout_ticks)		\
-{									\
-	struct otx2_ssogws_dual *ws = port;				\
-	uint64_t iter;							\
-	uint8_t gw;							\
-									\
-	if (ws->swtag_req) {						\
-		otx2_ssogws_swtag_wait((struct otx2_ssogws *)		\
-				       &ws->ws_state[!ws->vws]);	\
-		ws->swtag_req = 0;					\
-		return 1;						\
-	}								\
-									\
-	gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws],		\
-				       &ws->ws_state[!ws->vws], ev,	\
-				       flags, ws->lookup_mem,		\
-				       ws->tstamp);			\
-	ws->vws = !ws->vws;						\
-	for (iter = 1; iter < timeout_ticks && (gw == 0); iter++) {	\
-		gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws],	\
-					       &ws->ws_state[!ws->vws],	\
-					       ev, flags,		\
-					       ws->lookup_mem,		\
-					       ws->tstamp);		\
-		ws->vws = !ws->vws;					\
-	}								\
-									\
-	return gw;							\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_timeout_burst_ ##name(void *port,			\
-					   struct rte_event ev[],	\
-					   uint16_t nb_events,		\
-					   uint64_t timeout_ticks)	\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_dual_deq_timeout_ ##name(port, ev,		\
-						    timeout_ticks);	\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_seg_ ##name(void *port, struct rte_event *ev,	\
-				 uint64_t timeout_ticks)		\
-{									\
-	struct otx2_ssogws_dual *ws = port;				\
-	uint8_t gw;							\
-									\
-	RTE_SET_USED(timeout_ticks);					\
-	if (ws->swtag_req) {						\
-		otx2_ssogws_swtag_wait((struct otx2_ssogws *)		\
-				       &ws->ws_state[!ws->vws]);	\
-		ws->swtag_req = 0;					\
-		return 1;						\
-	}								\
-									\
-	gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws],		\
-				       &ws->ws_state[!ws->vws], ev,	\
-				       flags | NIX_RX_MULTI_SEG_F,	\
-				       ws->lookup_mem,			\
-				       ws->tstamp);			\
-	ws->vws = !ws->vws;						\
-									\
-	return gw;							\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_seg_burst_ ##name(void *port,			\
-				       struct rte_event ev[],		\
-				       uint16_t nb_events,		\
-				       uint64_t timeout_ticks)		\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_dual_deq_seg_ ##name(port, ev,		\
-						timeout_ticks);		\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_seg_timeout_ ##name(void *port,			\
-					 struct rte_event *ev,		\
-					 uint64_t timeout_ticks)	\
-{									\
-	struct otx2_ssogws_dual *ws = port;				\
-	uint64_t iter;							\
-	uint8_t gw;							\
-									\
-	if (ws->swtag_req) {						\
-		otx2_ssogws_swtag_wait((struct otx2_ssogws *)		\
-				       &ws->ws_state[!ws->vws]);	\
-		ws->swtag_req = 0;					\
-		return 1;						\
-	}								\
-									\
-	gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws],		\
-				       &ws->ws_state[!ws->vws], ev,	\
-				       flags | NIX_RX_MULTI_SEG_F,	\
-				       ws->lookup_mem,			\
-				       ws->tstamp);			\
-	ws->vws = !ws->vws;						\
-	for (iter = 1; iter < timeout_ticks && (gw == 0); iter++) {	\
-		gw = otx2_ssogws_dual_get_work(&ws->ws_state[ws->vws],	\
-					       &ws->ws_state[!ws->vws],	\
-					       ev, flags |		\
-					       NIX_RX_MULTI_SEG_F,	\
-					       ws->lookup_mem,		\
-					       ws->tstamp);		\
-		ws->vws = !ws->vws;					\
-	}								\
-									\
-	return gw;							\
-}									\
-									\
-uint16_t __rte_hot								\
-otx2_ssogws_dual_deq_seg_timeout_burst_ ##name(void *port,		\
-					       struct rte_event ev[],	\
-					       uint16_t nb_events,	\
-					       uint64_t timeout_ticks)	\
-{									\
-	RTE_SET_USED(nb_events);					\
-									\
-	return otx2_ssogws_dual_deq_seg_timeout_ ##name(port, ev,	\
-							timeout_ticks);	\
-}
-
-SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
-#undef R
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-uint16_t __rte_hot							\
-otx2_ssogws_dual_tx_adptr_enq_ ## name(void *port,			\
-				       struct rte_event ev[],		\
-				       uint16_t nb_events)		\
-{									\
-	struct otx2_ssogws_dual *ws = port;				\
-	uint64_t cmd[sz];						\
-									\
-	RTE_SET_USED(nb_events);					\
-	return otx2_ssogws_event_tx(ws->base[!ws->vws], &ev[0],		\
-					  cmd, (const uint64_t		\
-					  (*)[RTE_MAX_QUEUES_PER_PORT])	\
-					  &ws->tx_adptr_data, flags);	\
-}
-SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-uint16_t __rte_hot							\
-otx2_ssogws_dual_tx_adptr_enq_seg_ ## name(void *port,			\
-					   struct rte_event ev[],	\
-					   uint16_t nb_events)		\
-{									\
-	uint64_t cmd[(sz) + NIX_TX_MSEG_SG_DWORDS - 2];			\
-	struct otx2_ssogws_dual *ws = port;				\
-									\
-	RTE_SET_USED(nb_events);					\
-	return otx2_ssogws_event_tx(ws->base[!ws->vws], &ev[0],		\
-					  cmd, (const uint64_t		\
-					  (*)[RTE_MAX_QUEUES_PER_PORT])	\
-					  &ws->tx_adptr_data,		\
-					  (flags) | NIX_TX_MULTI_SEG_F);\
-}
-SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
-#undef T
diff --git a/drivers/event/octeontx2/otx2_worker_dual.h b/drivers/event/octeontx2/otx2_worker_dual.h
deleted file mode 100644
index 36ae4dd88f..0000000000
--- a/drivers/event/octeontx2/otx2_worker_dual.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_WORKER_DUAL_H__
-#define __OTX2_WORKER_DUAL_H__
-
-#include <rte_branch_prediction.h>
-#include <rte_common.h>
-
-#include <otx2_common.h>
-#include "otx2_evdev.h"
-#include "otx2_evdev_crypto_adptr_rx.h"
-
-/* SSO Operations */
-static __rte_always_inline uint16_t
-otx2_ssogws_dual_get_work(struct otx2_ssogws_state *ws,
-			  struct otx2_ssogws_state *ws_pair,
-			  struct rte_event *ev, const uint32_t flags,
-			  const void * const lookup_mem,
-			  struct otx2_timesync_info * const tstamp)
-{
-	const uint64_t set_gw = BIT_ULL(16) | 1;
-	union otx2_sso_event event;
-	uint64_t tstamp_ptr;
-	uint64_t get_work1;
-	uint64_t mbuf;
-
-	if (flags & NIX_RX_OFFLOAD_PTYPE_F)
-		rte_prefetch_non_temporal(lookup_mem);
-#ifdef RTE_ARCH_ARM64
-	asm volatile(
-			"rty%=:	                             \n"
-			"        ldr %[tag], [%[tag_loc]]    \n"
-			"        ldr %[wqp], [%[wqp_loc]]    \n"
-			"        tbnz %[tag], 63, rty%=      \n"
-			"done%=: str %[gw], [%[pong]]        \n"
-			"        dmb ld                      \n"
-			"        prfm pldl1keep, [%[wqp], #8]\n"
-			"        sub %[mbuf], %[wqp], #0x80  \n"
-			"        prfm pldl1keep, [%[mbuf]]   \n"
-			: [tag] "=&r" (event.get_work0),
-			  [wqp] "=&r" (get_work1),
-			  [mbuf] "=&r" (mbuf)
-			: [tag_loc] "r" (ws->tag_op),
-			  [wqp_loc] "r" (ws->wqp_op),
-			  [gw] "r" (set_gw),
-			  [pong] "r" (ws_pair->getwrk_op)
-			);
-#else
-	event.get_work0 = otx2_read64(ws->tag_op);
-	while ((BIT_ULL(63)) & event.get_work0)
-		event.get_work0 = otx2_read64(ws->tag_op);
-	get_work1 = otx2_read64(ws->wqp_op);
-	otx2_write64(set_gw, ws_pair->getwrk_op);
-
-	rte_prefetch0((const void *)get_work1);
-	mbuf = (uint64_t)((char *)get_work1 - sizeof(struct rte_mbuf));
-	rte_prefetch0((const void *)mbuf);
-#endif
-	event.get_work0 = (event.get_work0 & (0x3ull << 32)) << 6 |
-		(event.get_work0 & (0x3FFull << 36)) << 4 |
-		(event.get_work0 & 0xffffffff);
-
-	if (event.sched_type != SSO_TT_EMPTY) {
-		if ((flags & NIX_RX_OFFLOAD_SECURITY_F) &&
-		    (event.event_type == RTE_EVENT_TYPE_CRYPTODEV)) {
-			get_work1 = otx2_handle_crypto_event(get_work1);
-		} else if (event.event_type == RTE_EVENT_TYPE_ETHDEV) {
-			uint8_t port = event.sub_event_type;
-
-			event.sub_event_type = 0;
-			otx2_wqe_to_mbuf(get_work1, mbuf, port,
-					 event.flow_id, flags, lookup_mem);
-			/* Extracting tstamp, if PTP enabled. CGX will prepend
-			 * the timestamp at starting of packet data and it can
-			 * be derieved from WQE 9 dword which corresponds to SG
-			 * iova.
-			 * rte_pktmbuf_mtod_offset can be used for this purpose
-			 * but it brings down the performance as it reads
-			 * mbuf->buf_addr which is not part of cache in general
-			 * fast path.
-			 */
-			tstamp_ptr = *(uint64_t *)(((struct nix_wqe_hdr_s *)
-						     get_work1) +
-						     OTX2_SSO_WQE_SG_PTR);
-			otx2_nix_mbuf_to_tstamp((struct rte_mbuf *)mbuf, tstamp,
-						flags, (uint64_t *)tstamp_ptr);
-			get_work1 = mbuf;
-		}
-	}
-
-	ev->event = event.get_work0;
-	ev->u64 = get_work1;
-
-	return !!get_work1;
-}
-
-static __rte_always_inline void
-otx2_ssogws_dual_add_work(struct otx2_ssogws_dual *ws, const uint64_t event_ptr,
-			  const uint32_t tag, const uint8_t new_tt,
-			  const uint16_t grp)
-{
-	uint64_t add_work0;
-
-	add_work0 = tag | ((uint64_t)(new_tt) << 32);
-	otx2_store_pair(add_work0, event_ptr, ws->grps_base[grp]);
-}
-
-#endif
diff --git a/drivers/event/octeontx2/version.map b/drivers/event/octeontx2/version.map
deleted file mode 100644
index c2e0723b4c..0000000000
--- a/drivers/event/octeontx2/version.map
+++ /dev/null
@@ -1,3 +0,0 @@
-DPDK_22 {
-	local: *;
-};
diff --git a/drivers/mempool/cnxk/cnxk_mempool.c b/drivers/mempool/cnxk/cnxk_mempool.c
index 57be33b862..ea473552dd 100644
--- a/drivers/mempool/cnxk/cnxk_mempool.c
+++ b/drivers/mempool/cnxk/cnxk_mempool.c
@@ -161,48 +161,20 @@ npa_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 }
 
 static const struct rte_pci_id npa_pci_map[] = {
-	{
-		.class_id = RTE_CLASS_ANY_ID,
-		.vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.device_id = PCI_DEVID_CNXK_RVU_NPA_PF,
-		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KA,
-	},
-	{
-		.class_id = RTE_CLASS_ANY_ID,
-		.vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.device_id = PCI_DEVID_CNXK_RVU_NPA_PF,
-		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KAS,
-	},
-	{
-		.class_id = RTE_CLASS_ANY_ID,
-		.vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.device_id = PCI_DEVID_CNXK_RVU_NPA_PF,
-		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CNF10KA,
-	},
-	{
-		.class_id = RTE_CLASS_ANY_ID,
-		.vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.device_id = PCI_DEVID_CNXK_RVU_NPA_VF,
-		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KA,
-	},
-	{
-		.class_id = RTE_CLASS_ANY_ID,
-		.vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.device_id = PCI_DEVID_CNXK_RVU_NPA_VF,
-		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CN10KAS,
-	},
-	{
-		.class_id = RTE_CLASS_ANY_ID,
-		.vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.device_id = PCI_DEVID_CNXK_RVU_NPA_VF,
-		.subsystem_vendor_id = PCI_VENDOR_ID_CAVIUM,
-		.subsystem_device_id = PCI_SUBSYSTEM_DEVID_CNF10KA,
-	},
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_NPA_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_NPA_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_NPA_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_NPA_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_NPA_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_NPA_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_NPA_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_NPA_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_NPA_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_NPA_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_NPA_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_NPA_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_NPA_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_NPA_VF),
 	{
 		.vendor_id = 0,
 	},
diff --git a/drivers/mempool/meson.build b/drivers/mempool/meson.build
index d295263b87..dc88812585 100644
--- a/drivers/mempool/meson.build
+++ b/drivers/mempool/meson.build
@@ -7,7 +7,6 @@ drivers = [
         'dpaa',
         'dpaa2',
         'octeontx',
-        'octeontx2',
         'ring',
         'stack',
 ]
diff --git a/drivers/mempool/octeontx2/meson.build b/drivers/mempool/octeontx2/meson.build
deleted file mode 100644
index a4bea6d364..0000000000
--- a/drivers/mempool/octeontx2/meson.build
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-    build = false
-    reason = 'only supported on 64-bit Linux'
-    subdir_done()
-endif
-
-sources = files(
-        'otx2_mempool.c',
-        'otx2_mempool_debug.c',
-        'otx2_mempool_irq.c',
-        'otx2_mempool_ops.c',
-)
-
-deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_octeontx2', 'mempool']
diff --git a/drivers/mempool/octeontx2/otx2_mempool.c b/drivers/mempool/octeontx2/otx2_mempool.c
deleted file mode 100644
index f63dc06ef2..0000000000
--- a/drivers/mempool/octeontx2/otx2_mempool.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_atomic.h>
-#include <rte_bus_pci.h>
-#include <rte_common.h>
-#include <rte_eal.h>
-#include <rte_io.h>
-#include <rte_kvargs.h>
-#include <rte_malloc.h>
-#include <rte_mbuf_pool_ops.h>
-#include <rte_pci.h>
-
-#include "otx2_common.h"
-#include "otx2_dev.h"
-#include "otx2_mempool.h"
-
-#define OTX2_NPA_DEV_NAME	RTE_STR(otx2_npa_dev_)
-#define OTX2_NPA_DEV_NAME_LEN	(sizeof(OTX2_NPA_DEV_NAME) + PCI_PRI_STR_SIZE)
-
-static inline int
-npa_lf_alloc(struct otx2_npa_lf *lf)
-{
-	struct otx2_mbox *mbox = lf->mbox;
-	struct npa_lf_alloc_req *req;
-	struct npa_lf_alloc_rsp *rsp;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npa_lf_alloc(mbox);
-	req->aura_sz = lf->aura_sz;
-	req->nr_pools = lf->nr_pools;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return NPA_LF_ERR_ALLOC;
-
-	lf->stack_pg_ptrs = rsp->stack_pg_ptrs;
-	lf->stack_pg_bytes = rsp->stack_pg_bytes;
-	lf->qints = rsp->qints;
-
-	return 0;
-}
-
-static int
-npa_lf_free(struct otx2_mbox *mbox)
-{
-	otx2_mbox_alloc_msg_npa_lf_free(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-npa_lf_init(struct otx2_npa_lf *lf, uintptr_t base, uint8_t aura_sz,
-	    uint32_t nr_pools, struct otx2_mbox *mbox)
-{
-	uint32_t i, bmp_sz;
-	int rc;
-
-	/* Sanity checks */
-	if (!lf || !base || !mbox || !nr_pools)
-		return NPA_LF_ERR_PARAM;
-
-	if (base & AURA_ID_MASK)
-		return NPA_LF_ERR_BASE_INVALID;
-
-	if (aura_sz == NPA_AURA_SZ_0 || aura_sz >= NPA_AURA_SZ_MAX)
-		return NPA_LF_ERR_PARAM;
-
-	memset(lf, 0x0, sizeof(*lf));
-	lf->base = base;
-	lf->aura_sz = aura_sz;
-	lf->nr_pools = nr_pools;
-	lf->mbox = mbox;
-
-	rc = npa_lf_alloc(lf);
-	if (rc)
-		goto exit;
-
-	bmp_sz = rte_bitmap_get_memory_footprint(nr_pools);
-
-	/* Allocate memory for bitmap */
-	lf->npa_bmp_mem = rte_zmalloc("npa_bmp_mem", bmp_sz,
-					RTE_CACHE_LINE_SIZE);
-	if (lf->npa_bmp_mem == NULL) {
-		rc = -ENOMEM;
-		goto lf_free;
-	}
-
-	/* Initialize pool resource bitmap array */
-	lf->npa_bmp = rte_bitmap_init(nr_pools, lf->npa_bmp_mem, bmp_sz);
-	if (lf->npa_bmp == NULL) {
-		rc = -EINVAL;
-		goto bmap_mem_free;
-	}
-
-	/* Mark all pools available */
-	for (i = 0; i < nr_pools; i++)
-		rte_bitmap_set(lf->npa_bmp, i);
-
-	/* Allocate memory for qint context */
-	lf->npa_qint_mem = rte_zmalloc("npa_qint_mem",
-			sizeof(struct otx2_npa_qint) * nr_pools, 0);
-	if (lf->npa_qint_mem == NULL) {
-		rc = -ENOMEM;
-		goto bmap_free;
-	}
-
-	/* Allocate memory for nap_aura_lim memory */
-	lf->aura_lim = rte_zmalloc("npa_aura_lim_mem",
-			sizeof(struct npa_aura_lim) * nr_pools, 0);
-	if (lf->aura_lim == NULL) {
-		rc = -ENOMEM;
-		goto qint_free;
-	}
-
-	/* Init aura start & end limits */
-	for (i = 0; i < nr_pools; i++) {
-		lf->aura_lim[i].ptr_start = UINT64_MAX;
-		lf->aura_lim[i].ptr_end = 0x0ull;
-	}
-
-	return 0;
-
-qint_free:
-	rte_free(lf->npa_qint_mem);
-bmap_free:
-	rte_bitmap_free(lf->npa_bmp);
-bmap_mem_free:
-	rte_free(lf->npa_bmp_mem);
-lf_free:
-	npa_lf_free(lf->mbox);
-exit:
-	return rc;
-}
-
-static int
-npa_lf_fini(struct otx2_npa_lf *lf)
-{
-	if (!lf)
-		return NPA_LF_ERR_PARAM;
-
-	rte_free(lf->aura_lim);
-	rte_free(lf->npa_qint_mem);
-	rte_bitmap_free(lf->npa_bmp);
-	rte_free(lf->npa_bmp_mem);
-
-	return npa_lf_free(lf->mbox);
-
-}
-
-static inline uint32_t
-otx2_aura_size_to_u32(uint8_t val)
-{
-	if (val == NPA_AURA_SZ_0)
-		return 128;
-	if (val >= NPA_AURA_SZ_MAX)
-		return BIT_ULL(20);
-
-	return 1 << (val + 6);
-}
-
-static int
-parse_max_pools(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-	uint32_t val;
-
-	val = atoi(value);
-	if (val < otx2_aura_size_to_u32(NPA_AURA_SZ_128))
-		val = 128;
-	if (val > otx2_aura_size_to_u32(NPA_AURA_SZ_1M))
-		val = BIT_ULL(20);
-
-	*(uint8_t *)extra_args = rte_log2_u32(val) - 6;
-	return 0;
-}
-
-#define OTX2_MAX_POOLS "max_pools"
-
-static uint8_t
-otx2_parse_aura_size(struct rte_devargs *devargs)
-{
-	uint8_t aura_sz = NPA_AURA_SZ_128;
-	struct rte_kvargs *kvlist;
-
-	if (devargs == NULL)
-		goto exit;
-	kvlist = rte_kvargs_parse(devargs->args, NULL);
-	if (kvlist == NULL)
-		goto exit;
-
-	rte_kvargs_process(kvlist, OTX2_MAX_POOLS, &parse_max_pools, &aura_sz);
-	otx2_parse_common_devargs(kvlist);
-	rte_kvargs_free(kvlist);
-exit:
-	return aura_sz;
-}
-
-static inline int
-npa_lf_attach(struct otx2_mbox *mbox)
-{
-	struct rsrc_attach_req *req;
-
-	req = otx2_mbox_alloc_msg_attach_resources(mbox);
-	req->npalf = true;
-
-	return otx2_mbox_process(mbox);
-}
-
-static inline int
-npa_lf_detach(struct otx2_mbox *mbox)
-{
-	struct rsrc_detach_req *req;
-
-	req = otx2_mbox_alloc_msg_detach_resources(mbox);
-	req->npalf = true;
-
-	return otx2_mbox_process(mbox);
-}
-
-static inline int
-npa_lf_get_msix_offset(struct otx2_mbox *mbox, uint16_t *npa_msixoff)
-{
-	struct msix_offset_rsp *msix_rsp;
-	int rc;
-
-	/* Get NPA and NIX MSIX vector offsets */
-	otx2_mbox_alloc_msg_msix_offset(mbox);
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&msix_rsp);
-
-	*npa_msixoff = msix_rsp->npa_msixoff;
-
-	return rc;
-}
-
-/**
- * @internal
- * Finalize NPA LF.
- */
-int
-otx2_npa_lf_fini(void)
-{
-	struct otx2_idev_cfg *idev;
-	int rc = 0;
-
-	idev = otx2_intra_dev_get_cfg();
-	if (idev == NULL)
-		return -ENOMEM;
-
-	if (rte_atomic16_add_return(&idev->npa_refcnt, -1) == 0) {
-		otx2_npa_unregister_irqs(idev->npa_lf);
-		rc |= npa_lf_fini(idev->npa_lf);
-		rc |= npa_lf_detach(idev->npa_lf->mbox);
-		otx2_npa_set_defaults(idev);
-	}
-
-	return rc;
-}
-
-/**
- * @internal
- * Initialize NPA LF.
- */
-int
-otx2_npa_lf_init(struct rte_pci_device *pci_dev, void *otx2_dev)
-{
-	struct otx2_dev *dev = otx2_dev;
-	struct otx2_idev_cfg *idev;
-	struct otx2_npa_lf *lf;
-	uint16_t npa_msixoff;
-	uint32_t nr_pools;
-	uint8_t aura_sz;
-	int rc;
-
-	idev = otx2_intra_dev_get_cfg();
-	if (idev == NULL)
-		return -ENOMEM;
-
-	/* Is NPA LF initialized by any another driver? */
-	if (rte_atomic16_add_return(&idev->npa_refcnt, 1) == 1) {
-
-		rc = npa_lf_attach(dev->mbox);
-		if (rc)
-			goto fail;
-
-		rc = npa_lf_get_msix_offset(dev->mbox, &npa_msixoff);
-		if (rc)
-			goto npa_detach;
-
-		aura_sz = otx2_parse_aura_size(pci_dev->device.devargs);
-		nr_pools = otx2_aura_size_to_u32(aura_sz);
-
-		lf = &dev->npalf;
-		rc = npa_lf_init(lf, dev->bar2 + (RVU_BLOCK_ADDR_NPA << 20),
-					aura_sz, nr_pools, dev->mbox);
-
-		if (rc)
-			goto npa_detach;
-
-		lf->pf_func = dev->pf_func;
-		lf->npa_msixoff = npa_msixoff;
-		lf->intr_handle = pci_dev->intr_handle;
-		lf->pci_dev = pci_dev;
-
-		idev->npa_pf_func = dev->pf_func;
-		idev->npa_lf = lf;
-		rte_smp_wmb();
-		rc = otx2_npa_register_irqs(lf);
-		if (rc)
-			goto npa_fini;
-
-		rte_mbuf_set_platform_mempool_ops("octeontx2_npa");
-		otx2_npa_dbg("npa_lf=%p pools=%d sz=%d pf_func=0x%x msix=0x%x",
-			     lf, nr_pools, aura_sz, lf->pf_func, npa_msixoff);
-	}
-
-	return 0;
-
-npa_fini:
-	npa_lf_fini(idev->npa_lf);
-npa_detach:
-	npa_lf_detach(dev->mbox);
-fail:
-	rte_atomic16_dec(&idev->npa_refcnt);
-	return rc;
-}
-
-static inline char*
-otx2_npa_dev_to_name(struct rte_pci_device *pci_dev, char *name)
-{
-	snprintf(name, OTX2_NPA_DEV_NAME_LEN,
-		 OTX2_NPA_DEV_NAME  PCI_PRI_FMT,
-		 pci_dev->addr.domain, pci_dev->addr.bus,
-		 pci_dev->addr.devid, pci_dev->addr.function);
-
-	return name;
-}
-
-static int
-otx2_npa_init(struct rte_pci_device *pci_dev)
-{
-	char name[OTX2_NPA_DEV_NAME_LEN];
-	const struct rte_memzone *mz;
-	struct otx2_dev *dev;
-	int rc = -ENOMEM;
-
-	mz = rte_memzone_reserve_aligned(otx2_npa_dev_to_name(pci_dev, name),
-					 sizeof(*dev), SOCKET_ID_ANY,
-					 0, OTX2_ALIGN);
-	if (mz == NULL)
-		goto error;
-
-	dev = mz->addr;
-
-	/* Initialize the base otx2_dev object */
-	rc = otx2_dev_init(pci_dev, dev);
-	if (rc)
-		goto malloc_fail;
-
-	/* Grab the NPA LF if required */
-	rc = otx2_npa_lf_init(pci_dev, dev);
-	if (rc)
-		goto dev_uninit;
-
-	dev->drv_inited = true;
-	return 0;
-
-dev_uninit:
-	otx2_npa_lf_fini();
-	otx2_dev_fini(pci_dev, dev);
-malloc_fail:
-	rte_memzone_free(mz);
-error:
-	otx2_err("Failed to initialize npa device rc=%d", rc);
-	return rc;
-}
-
-static int
-otx2_npa_fini(struct rte_pci_device *pci_dev)
-{
-	char name[OTX2_NPA_DEV_NAME_LEN];
-	const struct rte_memzone *mz;
-	struct otx2_dev *dev;
-
-	mz = rte_memzone_lookup(otx2_npa_dev_to_name(pci_dev, name));
-	if (mz == NULL)
-		return -EINVAL;
-
-	dev = mz->addr;
-	if (!dev->drv_inited)
-		goto dev_fini;
-
-	dev->drv_inited = false;
-	otx2_npa_lf_fini();
-
-dev_fini:
-	if (otx2_npa_lf_active(dev)) {
-		otx2_info("%s: common resource in use by other devices",
-			  pci_dev->name);
-		return -EAGAIN;
-	}
-
-	otx2_dev_fini(pci_dev, dev);
-	rte_memzone_free(mz);
-
-	return 0;
-}
-
-static int
-npa_remove(struct rte_pci_device *pci_dev)
-{
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	return otx2_npa_fini(pci_dev);
-}
-
-static int
-npa_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
-{
-	RTE_SET_USED(pci_drv);
-
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	return otx2_npa_init(pci_dev);
-}
-
-static const struct rte_pci_id pci_npa_map[] = {
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
-					PCI_DEVID_OCTEONTX2_RVU_NPA_PF)
-	},
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
-					PCI_DEVID_OCTEONTX2_RVU_NPA_VF)
-	},
-	{
-		.vendor_id = 0,
-	},
-};
-
-static struct rte_pci_driver pci_npa = {
-	.id_table = pci_npa_map,
-	.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_NEED_IOVA_AS_VA,
-	.probe = npa_probe,
-	.remove = npa_remove,
-};
-
-RTE_PMD_REGISTER_PCI(mempool_octeontx2, pci_npa);
-RTE_PMD_REGISTER_PCI_TABLE(mempool_octeontx2, pci_npa_map);
-RTE_PMD_REGISTER_KMOD_DEP(mempool_octeontx2, "vfio-pci");
-RTE_PMD_REGISTER_PARAM_STRING(mempool_octeontx2,
-			      OTX2_MAX_POOLS "=<128-1048576>"
-			      OTX2_NPA_LOCK_MASK "=<1-65535>");
diff --git a/drivers/mempool/octeontx2/otx2_mempool.h b/drivers/mempool/octeontx2/otx2_mempool.h
deleted file mode 100644
index 8aa548248d..0000000000
--- a/drivers/mempool/octeontx2/otx2_mempool.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_MEMPOOL_H__
-#define __OTX2_MEMPOOL_H__
-
-#include <rte_bitmap.h>
-#include <rte_bus_pci.h>
-#include <rte_devargs.h>
-#include <rte_mempool.h>
-
-#include "otx2_common.h"
-#include "otx2_mbox.h"
-
-enum npa_lf_status {
-	NPA_LF_ERR_PARAM	    = -512,
-	NPA_LF_ERR_ALLOC	    = -513,
-	NPA_LF_ERR_INVALID_BLOCK_SZ = -514,
-	NPA_LF_ERR_AURA_ID_ALLOC    = -515,
-	NPA_LF_ERR_AURA_POOL_INIT   = -516,
-	NPA_LF_ERR_AURA_POOL_FINI   = -517,
-	NPA_LF_ERR_BASE_INVALID     = -518,
-};
-
-struct otx2_npa_lf;
-struct otx2_npa_qint {
-	struct otx2_npa_lf *lf;
-	uint8_t qintx;
-};
-
-struct npa_aura_lim {
-	uint64_t ptr_start;
-	uint64_t ptr_end;
-};
-
-struct otx2_npa_lf {
-	uint16_t qints;
-	uintptr_t base;
-	uint8_t aura_sz;
-	uint16_t pf_func;
-	uint32_t nr_pools;
-	void *npa_bmp_mem;
-	void *npa_qint_mem;
-	uint16_t npa_msixoff;
-	struct otx2_mbox *mbox;
-	uint32_t stack_pg_ptrs;
-	uint32_t stack_pg_bytes;
-	struct rte_bitmap *npa_bmp;
-	struct npa_aura_lim *aura_lim;
-	struct rte_pci_device *pci_dev;
-	struct rte_intr_handle *intr_handle;
-};
-
-#define AURA_ID_MASK  (BIT_ULL(16) - 1)
-
-/*
- * Generate 64bit handle to have optimized alloc and free aura operation.
- * 0 - AURA_ID_MASK for storing the aura_id.
- * AURA_ID_MASK+1 - (2^64 - 1) for storing the lf base address.
- * This scheme is valid when OS can give AURA_ID_MASK
- * aligned address for lf base address.
- */
-static inline uint64_t
-npa_lf_aura_handle_gen(uint32_t aura_id, uintptr_t addr)
-{
-	uint64_t val;
-
-	val = aura_id & AURA_ID_MASK;
-	return (uint64_t)addr | val;
-}
-
-static inline uint64_t
-npa_lf_aura_handle_to_aura(uint64_t aura_handle)
-{
-	return aura_handle & AURA_ID_MASK;
-}
-
-static inline uintptr_t
-npa_lf_aura_handle_to_base(uint64_t aura_handle)
-{
-	return (uintptr_t)(aura_handle & ~AURA_ID_MASK);
-}
-
-static inline uint64_t
-npa_lf_aura_op_alloc(uint64_t aura_handle, const int drop)
-{
-	uint64_t wdata = npa_lf_aura_handle_to_aura(aura_handle);
-
-	if (drop)
-		wdata |= BIT_ULL(63); /* DROP */
-
-	return otx2_atomic64_add_nosync(wdata,
-		(int64_t *)(npa_lf_aura_handle_to_base(aura_handle) +
-		NPA_LF_AURA_OP_ALLOCX(0)));
-}
-
-static inline void
-npa_lf_aura_op_free(uint64_t aura_handle, const int fabs, uint64_t iova)
-{
-	uint64_t reg = npa_lf_aura_handle_to_aura(aura_handle);
-
-	if (fabs)
-		reg |= BIT_ULL(63); /* FABS */
-
-	otx2_store_pair(iova, reg,
-		npa_lf_aura_handle_to_base(aura_handle) + NPA_LF_AURA_OP_FREE0);
-}
-
-static inline uint64_t
-npa_lf_aura_op_cnt_get(uint64_t aura_handle)
-{
-	uint64_t wdata;
-	uint64_t reg;
-
-	wdata = npa_lf_aura_handle_to_aura(aura_handle) << 44;
-
-	reg = otx2_atomic64_add_nosync(wdata,
-			(int64_t *)(npa_lf_aura_handle_to_base(aura_handle) +
-			 NPA_LF_AURA_OP_CNT));
-
-	if (reg & BIT_ULL(42) /* OP_ERR */)
-		return 0;
-	else
-		return reg & 0xFFFFFFFFF;
-}
-
-static inline void
-npa_lf_aura_op_cnt_set(uint64_t aura_handle, const int sign, uint64_t count)
-{
-	uint64_t reg = count & (BIT_ULL(36) - 1);
-
-	if (sign)
-		reg |= BIT_ULL(43); /* CNT_ADD */
-
-	reg |= (npa_lf_aura_handle_to_aura(aura_handle) << 44);
-
-	otx2_write64(reg,
-		npa_lf_aura_handle_to_base(aura_handle) + NPA_LF_AURA_OP_CNT);
-}
-
-static inline uint64_t
-npa_lf_aura_op_limit_get(uint64_t aura_handle)
-{
-	uint64_t wdata;
-	uint64_t reg;
-
-	wdata = npa_lf_aura_handle_to_aura(aura_handle) << 44;
-
-	reg = otx2_atomic64_add_nosync(wdata,
-			(int64_t *)(npa_lf_aura_handle_to_base(aura_handle) +
-			 NPA_LF_AURA_OP_LIMIT));
-
-	if (reg & BIT_ULL(42) /* OP_ERR */)
-		return 0;
-	else
-		return reg & 0xFFFFFFFFF;
-}
-
-static inline void
-npa_lf_aura_op_limit_set(uint64_t aura_handle, uint64_t limit)
-{
-	uint64_t reg = limit & (BIT_ULL(36) - 1);
-
-	reg |= (npa_lf_aura_handle_to_aura(aura_handle) << 44);
-
-	otx2_write64(reg,
-		npa_lf_aura_handle_to_base(aura_handle) + NPA_LF_AURA_OP_LIMIT);
-}
-
-static inline uint64_t
-npa_lf_aura_op_available(uint64_t aura_handle)
-{
-	uint64_t wdata;
-	uint64_t reg;
-
-	wdata = npa_lf_aura_handle_to_aura(aura_handle) << 44;
-
-	reg = otx2_atomic64_add_nosync(wdata,
-			    (int64_t *)(npa_lf_aura_handle_to_base(
-			     aura_handle) + NPA_LF_POOL_OP_AVAILABLE));
-
-	if (reg & BIT_ULL(42) /* OP_ERR */)
-		return 0;
-	else
-		return reg & 0xFFFFFFFFF;
-}
-
-static inline void
-npa_lf_aura_op_range_set(uint64_t aura_handle, uint64_t start_iova,
-				uint64_t end_iova)
-{
-	uint64_t reg = npa_lf_aura_handle_to_aura(aura_handle);
-	struct otx2_npa_lf *lf = otx2_npa_lf_obj_get();
-	struct npa_aura_lim *lim = lf->aura_lim;
-
-	lim[reg].ptr_start = RTE_MIN(lim[reg].ptr_start, start_iova);
-	lim[reg].ptr_end = RTE_MAX(lim[reg].ptr_end, end_iova);
-
-	otx2_store_pair(lim[reg].ptr_start, reg,
-			npa_lf_aura_handle_to_base(aura_handle) +
-			NPA_LF_POOL_OP_PTR_START0);
-	otx2_store_pair(lim[reg].ptr_end, reg,
-			npa_lf_aura_handle_to_base(aura_handle) +
-			NPA_LF_POOL_OP_PTR_END0);
-}
-
-/* NPA LF */
-__rte_internal
-int otx2_npa_lf_init(struct rte_pci_device *pci_dev, void *otx2_dev);
-__rte_internal
-int otx2_npa_lf_fini(void);
-
-/* IRQ */
-int otx2_npa_register_irqs(struct otx2_npa_lf *lf);
-void otx2_npa_unregister_irqs(struct otx2_npa_lf *lf);
-
-/* Debug */
-int otx2_mempool_ctx_dump(struct otx2_npa_lf *lf);
-
-#endif /* __OTX2_MEMPOOL_H__ */
diff --git a/drivers/mempool/octeontx2/otx2_mempool_debug.c b/drivers/mempool/octeontx2/otx2_mempool_debug.c
deleted file mode 100644
index 279ea2e25f..0000000000
--- a/drivers/mempool/octeontx2/otx2_mempool_debug.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_mempool.h"
-
-#define npa_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__)
-
-static inline void
-npa_lf_pool_dump(__otx2_io struct npa_pool_s *pool)
-{
-	npa_dump("W0: Stack base\t\t0x%"PRIx64"", pool->stack_base);
-	npa_dump("W1: ena \t\t%d\nW1: nat_align \t\t%d\nW1: stack_caching \t%d",
-		pool->ena, pool->nat_align, pool->stack_caching);
-	npa_dump("W1: stack_way_mask\t%d\nW1: buf_offset\t\t%d",
-		pool->stack_way_mask, pool->buf_offset);
-	npa_dump("W1: buf_size \t\t%d", pool->buf_size);
-
-	npa_dump("W2: stack_max_pages \t%d\nW2: stack_pages\t\t%d",
-		pool->stack_max_pages, pool->stack_pages);
-
-	npa_dump("W3: op_pc \t\t0x%"PRIx64"", (uint64_t)pool->op_pc);
-
-	npa_dump("W4: stack_offset\t%d\nW4: shift\t\t%d\nW4: avg_level\t\t%d",
-		pool->stack_offset, pool->shift, pool->avg_level);
-	npa_dump("W4: avg_con \t\t%d\nW4: fc_ena\t\t%d\nW4: fc_stype\t\t%d",
-		pool->avg_con, pool->fc_ena, pool->fc_stype);
-	npa_dump("W4: fc_hyst_bits\t%d\nW4: fc_up_crossing\t%d",
-		pool->fc_hyst_bits, pool->fc_up_crossing);
-	npa_dump("W4: update_time\t\t%d\n", pool->update_time);
-
-	npa_dump("W5: fc_addr\t\t0x%"PRIx64"\n", pool->fc_addr);
-
-	npa_dump("W6: ptr_start\t\t0x%"PRIx64"\n", pool->ptr_start);
-
-	npa_dump("W7: ptr_end\t\t0x%"PRIx64"\n", pool->ptr_end);
-	npa_dump("W8: err_int\t\t%d\nW8: err_int_ena\t\t%d",
-		pool->err_int, pool->err_int_ena);
-	npa_dump("W8: thresh_int\t\t%d", pool->thresh_int);
-
-	npa_dump("W8: thresh_int_ena\t%d\nW8: thresh_up\t\t%d",
-		pool->thresh_int_ena, pool->thresh_up);
-	npa_dump("W8: thresh_qint_idx\t%d\nW8: err_qint_idx\t%d",
-		pool->thresh_qint_idx, pool->err_qint_idx);
-}
-
-static inline void
-npa_lf_aura_dump(__otx2_io struct npa_aura_s *aura)
-{
-	npa_dump("W0: Pool addr\t\t0x%"PRIx64"\n", aura->pool_addr);
-
-	npa_dump("W1: ena\t\t\t%d\nW1: pool caching\t%d\nW1: pool way mask\t%d",
-		aura->ena, aura->pool_caching, aura->pool_way_mask);
-	npa_dump("W1: avg con\t\t%d\nW1: pool drop ena\t%d",
-		aura->avg_con, aura->pool_drop_ena);
-	npa_dump("W1: aura drop ena\t%d", aura->aura_drop_ena);
-	npa_dump("W1: bp_ena\t\t%d\nW1: aura drop\t\t%d\nW1: aura shift\t\t%d",
-		aura->bp_ena, aura->aura_drop, aura->shift);
-	npa_dump("W1: avg_level\t\t%d\n", aura->avg_level);
-
-	npa_dump("W2: count\t\t%"PRIx64"\nW2: nix0_bpid\t\t%d",
-		(uint64_t)aura->count, aura->nix0_bpid);
-	npa_dump("W2: nix1_bpid\t\t%d", aura->nix1_bpid);
-
-	npa_dump("W3: limit\t\t%"PRIx64"\nW3: bp\t\t\t%d\nW3: fc_ena\t\t%d\n",
-		(uint64_t)aura->limit, aura->bp, aura->fc_ena);
-	npa_dump("W3: fc_up_crossing\t%d\nW3: fc_stype\t\t%d",
-		aura->fc_up_crossing, aura->fc_stype);
-
-	npa_dump("W3: fc_hyst_bits\t%d", aura->fc_hyst_bits);
-
-	npa_dump("W4: fc_addr\t\t0x%"PRIx64"\n", aura->fc_addr);
-
-	npa_dump("W5: pool_drop\t\t%d\nW5: update_time\t\t%d",
-		aura->pool_drop, aura->update_time);
-	npa_dump("W5: err_int\t\t%d",  aura->err_int);
-	npa_dump("W5: err_int_ena\t\t%d\nW5: thresh_int\t\t%d",
-		aura->err_int_ena, aura->thresh_int);
-	npa_dump("W5: thresh_int_ena\t%d", aura->thresh_int_ena);
-
-	npa_dump("W5: thresh_up\t\t%d\nW5: thresh_qint_idx\t%d",
-		aura->thresh_up, aura->thresh_qint_idx);
-	npa_dump("W5: err_qint_idx\t%d", aura->err_qint_idx);
-
-	npa_dump("W6: thresh\t\t%"PRIx64"\n", (uint64_t)aura->thresh);
-}
-
-int
-otx2_mempool_ctx_dump(struct otx2_npa_lf *lf)
-{
-	struct npa_aq_enq_req *aq;
-	struct npa_aq_enq_rsp *rsp;
-	uint32_t q;
-	int rc = 0;
-
-	for (q = 0; q < lf->nr_pools; q++) {
-		/* Skip disabled POOL */
-		if (rte_bitmap_get(lf->npa_bmp, q))
-			continue;
-
-		aq = otx2_mbox_alloc_msg_npa_aq_enq(lf->mbox);
-		aq->aura_id = q;
-		aq->ctype = NPA_AQ_CTYPE_POOL;
-		aq->op = NPA_AQ_INSTOP_READ;
-
-		rc = otx2_mbox_process_msg(lf->mbox, (void *)&rsp);
-		if (rc) {
-			otx2_err("Failed to get pool(%d) context", q);
-			return rc;
-		}
-		npa_dump("============== pool=%d ===============\n", q);
-		npa_lf_pool_dump(&rsp->pool);
-	}
-
-	for (q = 0; q < lf->nr_pools; q++) {
-		/* Skip disabled AURA */
-		if (rte_bitmap_get(lf->npa_bmp, q))
-			continue;
-
-		aq = otx2_mbox_alloc_msg_npa_aq_enq(lf->mbox);
-		aq->aura_id = q;
-		aq->ctype = NPA_AQ_CTYPE_AURA;
-		aq->op = NPA_AQ_INSTOP_READ;
-
-		rc = otx2_mbox_process_msg(lf->mbox, (void *)&rsp);
-		if (rc) {
-			otx2_err("Failed to get aura(%d) context", q);
-			return rc;
-		}
-		npa_dump("============== aura=%d ===============\n", q);
-		npa_lf_aura_dump(&rsp->aura);
-	}
-
-	return rc;
-}
diff --git a/drivers/mempool/octeontx2/otx2_mempool_irq.c b/drivers/mempool/octeontx2/otx2_mempool_irq.c
deleted file mode 100644
index 5fa22b9612..0000000000
--- a/drivers/mempool/octeontx2/otx2_mempool_irq.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <inttypes.h>
-
-#include <rte_common.h>
-#include <rte_bus_pci.h>
-
-#include "otx2_common.h"
-#include "otx2_irq.h"
-#include "otx2_mempool.h"
-
-static void
-npa_lf_err_irq(void *param)
-{
-	struct otx2_npa_lf *lf = (struct otx2_npa_lf *)param;
-	uint64_t intr;
-
-	intr = otx2_read64(lf->base + NPA_LF_ERR_INT);
-	if (intr == 0)
-		return;
-
-	otx2_err("Err_intr=0x%" PRIx64 "", intr);
-
-	/* Clear interrupt */
-	otx2_write64(intr, lf->base + NPA_LF_ERR_INT);
-}
-
-static int
-npa_lf_register_err_irq(struct otx2_npa_lf *lf)
-{
-	struct rte_intr_handle *handle = lf->intr_handle;
-	int rc, vec;
-
-	vec = lf->npa_msixoff + NPA_LF_INT_VEC_ERR_INT;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, lf->base + NPA_LF_ERR_INT_ENA_W1C);
-	/* Register err interrupt vector */
-	rc = otx2_register_irq(handle, npa_lf_err_irq, lf, vec);
-
-	/* Enable hw interrupt */
-	otx2_write64(~0ull, lf->base + NPA_LF_ERR_INT_ENA_W1S);
-
-	return rc;
-}
-
-static void
-npa_lf_unregister_err_irq(struct otx2_npa_lf *lf)
-{
-	struct rte_intr_handle *handle = lf->intr_handle;
-	int vec;
-
-	vec = lf->npa_msixoff + NPA_LF_INT_VEC_ERR_INT;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, lf->base + NPA_LF_ERR_INT_ENA_W1C);
-	otx2_unregister_irq(handle, npa_lf_err_irq, lf, vec);
-}
-
-static void
-npa_lf_ras_irq(void *param)
-{
-	struct otx2_npa_lf *lf = (struct otx2_npa_lf *)param;
-	uint64_t intr;
-
-	intr = otx2_read64(lf->base + NPA_LF_RAS);
-	if (intr == 0)
-		return;
-
-	otx2_err("Ras_intr=0x%" PRIx64 "", intr);
-
-	/* Clear interrupt */
-	otx2_write64(intr, lf->base + NPA_LF_RAS);
-}
-
-static int
-npa_lf_register_ras_irq(struct otx2_npa_lf *lf)
-{
-	struct rte_intr_handle *handle = lf->intr_handle;
-	int rc, vec;
-
-	vec = lf->npa_msixoff + NPA_LF_INT_VEC_POISON;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, lf->base + NPA_LF_RAS_ENA_W1C);
-	/* Set used interrupt vectors */
-	rc = otx2_register_irq(handle, npa_lf_ras_irq, lf, vec);
-	/* Enable hw interrupt */
-	otx2_write64(~0ull, lf->base + NPA_LF_RAS_ENA_W1S);
-
-	return rc;
-}
-
-static void
-npa_lf_unregister_ras_irq(struct otx2_npa_lf *lf)
-{
-	int vec;
-	struct rte_intr_handle *handle = lf->intr_handle;
-
-	vec = lf->npa_msixoff + NPA_LF_INT_VEC_POISON;
-
-	/* Clear err interrupt */
-	otx2_write64(~0ull, lf->base + NPA_LF_RAS_ENA_W1C);
-	otx2_unregister_irq(handle, npa_lf_ras_irq, lf, vec);
-}
-
-static inline uint8_t
-npa_lf_q_irq_get_and_clear(struct otx2_npa_lf *lf, uint32_t q,
-			uint32_t off, uint64_t mask)
-{
-	uint64_t reg, wdata;
-	uint8_t qint;
-
-	wdata = (uint64_t)q << 44;
-	reg = otx2_atomic64_add_nosync(wdata, (int64_t *)(lf->base + off));
-
-	if (reg & BIT_ULL(42) /* OP_ERR */) {
-		otx2_err("Failed execute irq get off=0x%x", off);
-		return 0;
-	}
-
-	qint = reg & 0xff;
-	wdata &= mask;
-	otx2_write64(wdata | qint, lf->base + off);
-
-	return qint;
-}
-
-static inline uint8_t
-npa_lf_pool_irq_get_and_clear(struct otx2_npa_lf *lf, uint32_t p)
-{
-	return npa_lf_q_irq_get_and_clear(lf, p, NPA_LF_POOL_OP_INT, ~0xff00);
-}
-
-static inline uint8_t
-npa_lf_aura_irq_get_and_clear(struct otx2_npa_lf *lf, uint32_t a)
-{
-	return npa_lf_q_irq_get_and_clear(lf, a, NPA_LF_AURA_OP_INT, ~0xff00);
-}
-
-static void
-npa_lf_q_irq(void *param)
-{
-	struct otx2_npa_qint *qint = (struct otx2_npa_qint *)param;
-	struct otx2_npa_lf *lf = qint->lf;
-	uint8_t irq, qintx = qint->qintx;
-	uint32_t q, pool, aura;
-	uint64_t intr;
-
-	intr = otx2_read64(lf->base + NPA_LF_QINTX_INT(qintx));
-	if (intr == 0)
-		return;
-
-	otx2_err("queue_intr=0x%" PRIx64 " qintx=%d", intr, qintx);
-
-	/* Handle pool queue interrupts */
-	for (q = 0; q < lf->nr_pools; q++) {
-		/* Skip disabled POOL */
-		if (rte_bitmap_get(lf->npa_bmp, q))
-			continue;
-
-		pool = q % lf->qints;
-		irq = npa_lf_pool_irq_get_and_clear(lf, pool);
-
-		if (irq & BIT_ULL(NPA_POOL_ERR_INT_OVFLS))
-			otx2_err("Pool=%d NPA_POOL_ERR_INT_OVFLS", pool);
-
-		if (irq & BIT_ULL(NPA_POOL_ERR_INT_RANGE))
-			otx2_err("Pool=%d NPA_POOL_ERR_INT_RANGE", pool);
-
-		if (irq & BIT_ULL(NPA_POOL_ERR_INT_PERR))
-			otx2_err("Pool=%d NPA_POOL_ERR_INT_PERR", pool);
-	}
-
-	/* Handle aura queue interrupts */
-	for (q = 0; q < lf->nr_pools; q++) {
-
-		/* Skip disabled AURA */
-		if (rte_bitmap_get(lf->npa_bmp, q))
-			continue;
-
-		aura = q % lf->qints;
-		irq = npa_lf_aura_irq_get_and_clear(lf, aura);
-
-		if (irq & BIT_ULL(NPA_AURA_ERR_INT_AURA_ADD_OVER))
-			otx2_err("Aura=%d NPA_AURA_ERR_INT_ADD_OVER", aura);
-
-		if (irq & BIT_ULL(NPA_AURA_ERR_INT_AURA_ADD_UNDER))
-			otx2_err("Aura=%d NPA_AURA_ERR_INT_ADD_UNDER", aura);
-
-		if (irq & BIT_ULL(NPA_AURA_ERR_INT_AURA_FREE_UNDER))
-			otx2_err("Aura=%d NPA_AURA_ERR_INT_FREE_UNDER", aura);
-
-		if (irq & BIT_ULL(NPA_AURA_ERR_INT_POOL_DIS))
-			otx2_err("Aura=%d NPA_AURA_ERR_POOL_DIS", aura);
-	}
-
-	/* Clear interrupt */
-	otx2_write64(intr, lf->base + NPA_LF_QINTX_INT(qintx));
-	otx2_mempool_ctx_dump(lf);
-}
-
-static int
-npa_lf_register_queue_irqs(struct otx2_npa_lf *lf)
-{
-	struct rte_intr_handle *handle = lf->intr_handle;
-	int vec, q, qs, rc = 0;
-
-	/* Figure out max qintx required */
-	qs = RTE_MIN(lf->qints, lf->nr_pools);
-
-	for (q = 0; q < qs; q++) {
-		vec = lf->npa_msixoff + NPA_LF_INT_VEC_QINT_START + q;
-
-		/* Clear QINT CNT */
-		otx2_write64(0, lf->base + NPA_LF_QINTX_CNT(q));
-
-		/* Clear interrupt */
-		otx2_write64(~0ull, lf->base + NPA_LF_QINTX_ENA_W1C(q));
-
-		struct otx2_npa_qint *qintmem = lf->npa_qint_mem;
-		qintmem += q;
-
-		qintmem->lf = lf;
-		qintmem->qintx = q;
-
-		/* Sync qints_mem update */
-		rte_smp_wmb();
-
-		/* Register queue irq vector */
-		rc = otx2_register_irq(handle, npa_lf_q_irq, qintmem, vec);
-		if (rc)
-			break;
-
-		otx2_write64(0, lf->base + NPA_LF_QINTX_CNT(q));
-		otx2_write64(0, lf->base + NPA_LF_QINTX_INT(q));
-		/* Enable QINT interrupt */
-		otx2_write64(~0ull, lf->base + NPA_LF_QINTX_ENA_W1S(q));
-	}
-
-	return rc;
-}
-
-static void
-npa_lf_unregister_queue_irqs(struct otx2_npa_lf *lf)
-{
-	struct rte_intr_handle *handle = lf->intr_handle;
-	int vec, q, qs;
-
-	/* Figure out max qintx required */
-	qs = RTE_MIN(lf->qints, lf->nr_pools);
-
-	for (q = 0; q < qs; q++) {
-		vec = lf->npa_msixoff + NPA_LF_INT_VEC_QINT_START + q;
-
-		/* Clear QINT CNT */
-		otx2_write64(0, lf->base + NPA_LF_QINTX_CNT(q));
-		otx2_write64(0, lf->base + NPA_LF_QINTX_INT(q));
-
-		/* Clear interrupt */
-		otx2_write64(~0ull, lf->base + NPA_LF_QINTX_ENA_W1C(q));
-
-		struct otx2_npa_qint *qintmem = lf->npa_qint_mem;
-		qintmem += q;
-
-		/* Unregister queue irq vector */
-		otx2_unregister_irq(handle, npa_lf_q_irq, qintmem, vec);
-
-		qintmem->lf = NULL;
-		qintmem->qintx = 0;
-	}
-}
-
-int
-otx2_npa_register_irqs(struct otx2_npa_lf *lf)
-{
-	int rc;
-
-	if (lf->npa_msixoff == MSIX_VECTOR_INVALID) {
-		otx2_err("Invalid NPALF MSIX vector offset vector: 0x%x",
-			lf->npa_msixoff);
-		return -EINVAL;
-	}
-
-	/* Register lf err interrupt */
-	rc = npa_lf_register_err_irq(lf);
-	/* Register RAS interrupt */
-	rc |= npa_lf_register_ras_irq(lf);
-	/* Register queue interrupts */
-	rc |= npa_lf_register_queue_irqs(lf);
-
-	return rc;
-}
-
-void
-otx2_npa_unregister_irqs(struct otx2_npa_lf *lf)
-{
-	npa_lf_unregister_err_irq(lf);
-	npa_lf_unregister_ras_irq(lf);
-	npa_lf_unregister_queue_irqs(lf);
-}
diff --git a/drivers/mempool/octeontx2/otx2_mempool_ops.c b/drivers/mempool/octeontx2/otx2_mempool_ops.c
deleted file mode 100644
index 332e4f1cb2..0000000000
--- a/drivers/mempool/octeontx2/otx2_mempool_ops.c
+++ /dev/null
@@ -1,901 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_mempool.h>
-#include <rte_vect.h>
-
-#include "otx2_mempool.h"
-
-static int __rte_hot
-otx2_npa_enq(struct rte_mempool *mp, void * const *obj_table, unsigned int n)
-{
-	unsigned int index; const uint64_t aura_handle = mp->pool_id;
-	const uint64_t reg = npa_lf_aura_handle_to_aura(aura_handle);
-	const uint64_t addr = npa_lf_aura_handle_to_base(aura_handle) +
-				 NPA_LF_AURA_OP_FREE0;
-
-	/* Ensure mbuf init changes are written before the free pointers
-	 * are enqueued to the stack.
-	 */
-	rte_io_wmb();
-	for (index = 0; index < n; index++)
-		otx2_store_pair((uint64_t)obj_table[index], reg, addr);
-
-	return 0;
-}
-
-static __rte_noinline int
-npa_lf_aura_op_alloc_one(const int64_t wdata, int64_t * const addr,
-			 void **obj_table, uint8_t i)
-{
-	uint8_t retry = 4;
-
-	do {
-		obj_table[i] = (void *)otx2_atomic64_add_nosync(wdata, addr);
-		if (obj_table[i] != NULL)
-			return 0;
-
-	} while (retry--);
-
-	return -ENOENT;
-}
-
-#if defined(RTE_ARCH_ARM64)
-static __rte_noinline int
-npa_lf_aura_op_search_alloc(const int64_t wdata, int64_t * const addr,
-		void **obj_table, unsigned int n)
-{
-	uint8_t i;
-
-	for (i = 0; i < n; i++) {
-		if (obj_table[i] != NULL)
-			continue;
-		if (npa_lf_aura_op_alloc_one(wdata, addr, obj_table, i))
-			return -ENOENT;
-	}
-
-	return 0;
-}
-
-static __rte_noinline int
-npa_lf_aura_op_alloc_bulk(const int64_t wdata, int64_t * const addr,
-			  unsigned int n, void **obj_table)
-{
-	register const uint64_t wdata64 __asm("x26") = wdata;
-	register const uint64_t wdata128 __asm("x27") = wdata;
-	uint64x2_t failed = vdupq_n_u64(~0);
-
-	switch (n) {
-	case 32:
-	{
-		asm volatile (
-		".cpu  generic+lse\n"
-		"casp x0, x1, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x2, x3, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x4, x5, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x6, x7, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x8, x9, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x10, x11, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x12, x13, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x14, x15, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x16, x17, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x18, x19, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x20, x21, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x22, x23, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d16, x0\n"
-		"fmov v16.D[1], x1\n"
-		"casp x0, x1, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d17, x2\n"
-		"fmov v17.D[1], x3\n"
-		"casp x2, x3, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d18, x4\n"
-		"fmov v18.D[1], x5\n"
-		"casp x4, x5, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d19, x6\n"
-		"fmov v19.D[1], x7\n"
-		"casp x6, x7, %[wdata64], %[wdata128], [%[loc]]\n"
-		"and %[failed].16B, %[failed].16B, v16.16B\n"
-		"and %[failed].16B, %[failed].16B, v17.16B\n"
-		"and %[failed].16B, %[failed].16B, v18.16B\n"
-		"and %[failed].16B, %[failed].16B, v19.16B\n"
-		"fmov d20, x8\n"
-		"fmov v20.D[1], x9\n"
-		"fmov d21, x10\n"
-		"fmov v21.D[1], x11\n"
-		"fmov d22, x12\n"
-		"fmov v22.D[1], x13\n"
-		"fmov d23, x14\n"
-		"fmov v23.D[1], x15\n"
-		"and %[failed].16B, %[failed].16B, v20.16B\n"
-		"and %[failed].16B, %[failed].16B, v21.16B\n"
-		"and %[failed].16B, %[failed].16B, v22.16B\n"
-		"and %[failed].16B, %[failed].16B, v23.16B\n"
-		"st1 { v16.2d, v17.2d, v18.2d, v19.2d}, [%[dst]], 64\n"
-		"st1 { v20.2d, v21.2d, v22.2d, v23.2d}, [%[dst]], 64\n"
-		"fmov d16, x16\n"
-		"fmov v16.D[1], x17\n"
-		"fmov d17, x18\n"
-		"fmov v17.D[1], x19\n"
-		"fmov d18, x20\n"
-		"fmov v18.D[1], x21\n"
-		"fmov d19, x22\n"
-		"fmov v19.D[1], x23\n"
-		"and %[failed].16B, %[failed].16B, v16.16B\n"
-		"and %[failed].16B, %[failed].16B, v17.16B\n"
-		"and %[failed].16B, %[failed].16B, v18.16B\n"
-		"and %[failed].16B, %[failed].16B, v19.16B\n"
-		"fmov d20, x0\n"
-		"fmov v20.D[1], x1\n"
-		"fmov d21, x2\n"
-		"fmov v21.D[1], x3\n"
-		"fmov d22, x4\n"
-		"fmov v22.D[1], x5\n"
-		"fmov d23, x6\n"
-		"fmov v23.D[1], x7\n"
-		"and %[failed].16B, %[failed].16B, v20.16B\n"
-		"and %[failed].16B, %[failed].16B, v21.16B\n"
-		"and %[failed].16B, %[failed].16B, v22.16B\n"
-		"and %[failed].16B, %[failed].16B, v23.16B\n"
-		"st1 { v16.2d, v17.2d, v18.2d, v19.2d}, [%[dst]], 64\n"
-		"st1 { v20.2d, v21.2d, v22.2d, v23.2d}, [%[dst]], 64\n"
-		: "+Q" (*addr), [failed] "=&w" (failed)
-		: [wdata64] "r" (wdata64), [wdata128] "r" (wdata128),
-		[dst] "r" (obj_table), [loc] "r" (addr)
-		: "memory", "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7",
-		"x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16",
-		"x17", "x18", "x19", "x20", "x21", "x22", "x23", "v16", "v17",
-		"v18", "v19", "v20", "v21", "v22", "v23"
-		);
-		break;
-	}
-	case 16:
-	{
-		asm volatile (
-		".cpu  generic+lse\n"
-		"casp x0, x1, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x2, x3, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x4, x5, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x6, x7, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x8, x9, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x10, x11, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x12, x13, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x14, x15, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d16, x0\n"
-		"fmov v16.D[1], x1\n"
-		"fmov d17, x2\n"
-		"fmov v17.D[1], x3\n"
-		"fmov d18, x4\n"
-		"fmov v18.D[1], x5\n"
-		"fmov d19, x6\n"
-		"fmov v19.D[1], x7\n"
-		"and %[failed].16B, %[failed].16B, v16.16B\n"
-		"and %[failed].16B, %[failed].16B, v17.16B\n"
-		"and %[failed].16B, %[failed].16B, v18.16B\n"
-		"and %[failed].16B, %[failed].16B, v19.16B\n"
-		"fmov d20, x8\n"
-		"fmov v20.D[1], x9\n"
-		"fmov d21, x10\n"
-		"fmov v21.D[1], x11\n"
-		"fmov d22, x12\n"
-		"fmov v22.D[1], x13\n"
-		"fmov d23, x14\n"
-		"fmov v23.D[1], x15\n"
-		"and %[failed].16B, %[failed].16B, v20.16B\n"
-		"and %[failed].16B, %[failed].16B, v21.16B\n"
-		"and %[failed].16B, %[failed].16B, v22.16B\n"
-		"and %[failed].16B, %[failed].16B, v23.16B\n"
-		"st1 { v16.2d, v17.2d, v18.2d, v19.2d}, [%[dst]], 64\n"
-		"st1 { v20.2d, v21.2d, v22.2d, v23.2d}, [%[dst]], 64\n"
-		: "+Q" (*addr), [failed] "=&w" (failed)
-		: [wdata64] "r" (wdata64), [wdata128] "r" (wdata128),
-		[dst] "r" (obj_table), [loc] "r" (addr)
-		: "memory", "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7",
-		"x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "v16",
-		"v17", "v18", "v19", "v20", "v21", "v22", "v23"
-		);
-		break;
-	}
-	case 8:
-	{
-		asm volatile (
-		".cpu  generic+lse\n"
-		"casp x0, x1, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x2, x3, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x4, x5, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x6, x7, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d16, x0\n"
-		"fmov v16.D[1], x1\n"
-		"fmov d17, x2\n"
-		"fmov v17.D[1], x3\n"
-		"fmov d18, x4\n"
-		"fmov v18.D[1], x5\n"
-		"fmov d19, x6\n"
-		"fmov v19.D[1], x7\n"
-		"and %[failed].16B, %[failed].16B, v16.16B\n"
-		"and %[failed].16B, %[failed].16B, v17.16B\n"
-		"and %[failed].16B, %[failed].16B, v18.16B\n"
-		"and %[failed].16B, %[failed].16B, v19.16B\n"
-		"st1 { v16.2d, v17.2d, v18.2d, v19.2d}, [%[dst]], 64\n"
-		: "+Q" (*addr), [failed] "=&w" (failed)
-		: [wdata64] "r" (wdata64), [wdata128] "r" (wdata128),
-		[dst] "r" (obj_table), [loc] "r" (addr)
-		: "memory", "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7",
-		"v16", "v17", "v18", "v19"
-		);
-		break;
-	}
-	case 4:
-	{
-		asm volatile (
-		".cpu  generic+lse\n"
-		"casp x0, x1, %[wdata64], %[wdata128], [%[loc]]\n"
-		"casp x2, x3, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d16, x0\n"
-		"fmov v16.D[1], x1\n"
-		"fmov d17, x2\n"
-		"fmov v17.D[1], x3\n"
-		"and %[failed].16B, %[failed].16B, v16.16B\n"
-		"and %[failed].16B, %[failed].16B, v17.16B\n"
-		"st1 { v16.2d, v17.2d}, [%[dst]], 32\n"
-		: "+Q" (*addr), [failed] "=&w" (failed)
-		: [wdata64] "r" (wdata64), [wdata128] "r" (wdata128),
-		[dst] "r" (obj_table), [loc] "r" (addr)
-		: "memory", "x0", "x1", "x2", "x3", "v16", "v17"
-		);
-		break;
-	}
-	case 2:
-	{
-		asm volatile (
-		".cpu  generic+lse\n"
-		"casp x0, x1, %[wdata64], %[wdata128], [%[loc]]\n"
-		"fmov d16, x0\n"
-		"fmov v16.D[1], x1\n"
-		"and %[failed].16B, %[failed].16B, v16.16B\n"
-		"st1 { v16.2d}, [%[dst]], 16\n"
-		: "+Q" (*addr), [failed] "=&w" (failed)
-		: [wdata64] "r" (wdata64), [wdata128] "r" (wdata128),
-		[dst] "r" (obj_table), [loc] "r" (addr)
-		: "memory", "x0", "x1", "v16"
-		);
-		break;
-	}
-	case 1:
-		return npa_lf_aura_op_alloc_one(wdata, addr, obj_table, 0);
-	}
-
-	if (unlikely(!(vgetq_lane_u64(failed, 0) & vgetq_lane_u64(failed, 1))))
-		return npa_lf_aura_op_search_alloc(wdata, addr, (void **)
-			((char *)obj_table - (sizeof(uint64_t) * n)), n);
-
-	return 0;
-}
-
-static __rte_noinline void
-otx2_npa_clear_alloc(struct rte_mempool *mp, void **obj_table, unsigned int n)
-{
-	unsigned int i;
-
-	for (i = 0; i < n; i++) {
-		if (obj_table[i] != NULL) {
-			otx2_npa_enq(mp, &obj_table[i], 1);
-			obj_table[i] = NULL;
-		}
-	}
-}
-
-static __rte_noinline int __rte_hot
-otx2_npa_deq_arm64(struct rte_mempool *mp, void **obj_table, unsigned int n)
-{
-	const int64_t wdata = npa_lf_aura_handle_to_aura(mp->pool_id);
-	void **obj_table_bak = obj_table;
-	const unsigned int nfree = n;
-	unsigned int parts;
-
-	int64_t * const addr = (int64_t * const)
-			(npa_lf_aura_handle_to_base(mp->pool_id) +
-				NPA_LF_AURA_OP_ALLOCX(0));
-	while (n) {
-		parts = n > 31 ? 32 : rte_align32prevpow2(n);
-		n -= parts;
-		if (unlikely(npa_lf_aura_op_alloc_bulk(wdata, addr,
-				parts, obj_table))) {
-			otx2_npa_clear_alloc(mp, obj_table_bak, nfree - n);
-			return -ENOENT;
-		}
-		obj_table += parts;
-	}
-
-	return 0;
-}
-
-#else
-
-static inline int __rte_hot
-otx2_npa_deq(struct rte_mempool *mp, void **obj_table, unsigned int n)
-{
-	const int64_t wdata = npa_lf_aura_handle_to_aura(mp->pool_id);
-	unsigned int index;
-	uint64_t obj;
-
-	int64_t * const addr = (int64_t *)
-			(npa_lf_aura_handle_to_base(mp->pool_id) +
-				NPA_LF_AURA_OP_ALLOCX(0));
-	for (index = 0; index < n; index++, obj_table++) {
-		obj = npa_lf_aura_op_alloc_one(wdata, addr, obj_table, 0);
-		if (obj == 0) {
-			for (; index > 0; index--) {
-				obj_table--;
-				otx2_npa_enq(mp, obj_table, 1);
-			}
-			return -ENOENT;
-		}
-		*obj_table = (void *)obj;
-	}
-
-	return 0;
-}
-
-#endif
-
-static unsigned int
-otx2_npa_get_count(const struct rte_mempool *mp)
-{
-	return (unsigned int)npa_lf_aura_op_available(mp->pool_id);
-}
-
-static int
-npa_lf_aura_pool_init(struct otx2_mbox *mbox, uint32_t aura_id,
-		      struct npa_aura_s *aura, struct npa_pool_s *pool)
-{
-	struct npa_aq_enq_req *aura_init_req, *pool_init_req;
-	struct npa_aq_enq_rsp *aura_init_rsp, *pool_init_rsp;
-	struct otx2_mbox_dev *mdev = &mbox->dev[0];
-	struct otx2_idev_cfg *idev;
-	int rc, off;
-
-	idev = otx2_intra_dev_get_cfg();
-	if (idev == NULL)
-		return -ENOMEM;
-
-	aura_init_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-
-	aura_init_req->aura_id = aura_id;
-	aura_init_req->ctype = NPA_AQ_CTYPE_AURA;
-	aura_init_req->op = NPA_AQ_INSTOP_INIT;
-	otx2_mbox_memcpy(&aura_init_req->aura, aura, sizeof(*aura));
-
-	pool_init_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-
-	pool_init_req->aura_id = aura_id;
-	pool_init_req->ctype = NPA_AQ_CTYPE_POOL;
-	pool_init_req->op = NPA_AQ_INSTOP_INIT;
-	otx2_mbox_memcpy(&pool_init_req->pool, pool, sizeof(*pool));
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_wait_for_rsp(mbox, 0);
-	if (rc < 0)
-		return rc;
-
-	off = mbox->rx_start +
-			RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-	aura_init_rsp = (struct npa_aq_enq_rsp *)((uintptr_t)mdev->mbase + off);
-	off = mbox->rx_start + aura_init_rsp->hdr.next_msgoff;
-	pool_init_rsp = (struct npa_aq_enq_rsp *)((uintptr_t)mdev->mbase + off);
-
-	if (rc == 2 && aura_init_rsp->hdr.rc == 0 && pool_init_rsp->hdr.rc == 0)
-		return 0;
-	else
-		return NPA_LF_ERR_AURA_POOL_INIT;
-
-	if (!(idev->npa_lock_mask & BIT_ULL(aura_id)))
-		return 0;
-
-	aura_init_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	aura_init_req->aura_id = aura_id;
-	aura_init_req->ctype = NPA_AQ_CTYPE_AURA;
-	aura_init_req->op = NPA_AQ_INSTOP_LOCK;
-
-	pool_init_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	if (!pool_init_req) {
-		/* The shared memory buffer can be full.
-		 * Flush it and retry
-		 */
-		otx2_mbox_msg_send(mbox, 0);
-		rc = otx2_mbox_wait_for_rsp(mbox, 0);
-		if (rc < 0) {
-			otx2_err("Failed to LOCK AURA context");
-			return -ENOMEM;
-		}
-
-		pool_init_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-		if (!pool_init_req) {
-			otx2_err("Failed to LOCK POOL context");
-			return -ENOMEM;
-		}
-	}
-	pool_init_req->aura_id = aura_id;
-	pool_init_req->ctype = NPA_AQ_CTYPE_POOL;
-	pool_init_req->op = NPA_AQ_INSTOP_LOCK;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to lock POOL ctx to NDC");
-		return -ENOMEM;
-	}
-
-	return 0;
-}
-
-static int
-npa_lf_aura_pool_fini(struct otx2_mbox *mbox,
-		      uint32_t aura_id,
-		      uint64_t aura_handle)
-{
-	struct npa_aq_enq_req *aura_req, *pool_req;
-	struct npa_aq_enq_rsp *aura_rsp, *pool_rsp;
-	struct otx2_mbox_dev *mdev = &mbox->dev[0];
-	struct ndc_sync_op *ndc_req;
-	struct otx2_idev_cfg *idev;
-	int rc, off;
-
-	idev = otx2_intra_dev_get_cfg();
-	if (idev == NULL)
-		return -EINVAL;
-
-	/* Procedure for disabling an aura/pool */
-	rte_delay_us(10);
-	npa_lf_aura_op_alloc(aura_handle, 0);
-
-	pool_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	pool_req->aura_id = aura_id;
-	pool_req->ctype = NPA_AQ_CTYPE_POOL;
-	pool_req->op = NPA_AQ_INSTOP_WRITE;
-	pool_req->pool.ena = 0;
-	pool_req->pool_mask.ena = ~pool_req->pool_mask.ena;
-
-	aura_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	aura_req->aura_id = aura_id;
-	aura_req->ctype = NPA_AQ_CTYPE_AURA;
-	aura_req->op = NPA_AQ_INSTOP_WRITE;
-	aura_req->aura.ena = 0;
-	aura_req->aura_mask.ena = ~aura_req->aura_mask.ena;
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_wait_for_rsp(mbox, 0);
-	if (rc < 0)
-		return rc;
-
-	off = mbox->rx_start +
-			RTE_ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
-	pool_rsp = (struct npa_aq_enq_rsp *)((uintptr_t)mdev->mbase + off);
-
-	off = mbox->rx_start + pool_rsp->hdr.next_msgoff;
-	aura_rsp = (struct npa_aq_enq_rsp *)((uintptr_t)mdev->mbase + off);
-
-	if (rc != 2 || aura_rsp->hdr.rc != 0 || pool_rsp->hdr.rc != 0)
-		return NPA_LF_ERR_AURA_POOL_FINI;
-
-	/* Sync NDC-NPA for LF */
-	ndc_req = otx2_mbox_alloc_msg_ndc_sync_op(mbox);
-	ndc_req->npa_lf_sync = 1;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc) {
-		otx2_err("Error on NDC-NPA LF sync, rc %d", rc);
-		return NPA_LF_ERR_AURA_POOL_FINI;
-	}
-
-	if (!(idev->npa_lock_mask & BIT_ULL(aura_id)))
-		return 0;
-
-	aura_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	aura_req->aura_id = aura_id;
-	aura_req->ctype = NPA_AQ_CTYPE_AURA;
-	aura_req->op = NPA_AQ_INSTOP_UNLOCK;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to unlock AURA ctx to NDC");
-		return -EINVAL;
-	}
-
-	pool_req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-	pool_req->aura_id = aura_id;
-	pool_req->ctype = NPA_AQ_CTYPE_POOL;
-	pool_req->op = NPA_AQ_INSTOP_UNLOCK;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to unlock POOL ctx to NDC");
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static inline char*
-npa_lf_stack_memzone_name(struct otx2_npa_lf *lf, int pool_id, char *name)
-{
-	snprintf(name, RTE_MEMZONE_NAMESIZE, "otx2_npa_stack_%x_%d",
-			lf->pf_func, pool_id);
-
-	return name;
-}
-
-static inline const struct rte_memzone *
-npa_lf_stack_dma_alloc(struct otx2_npa_lf *lf, char *name,
-		       int pool_id, size_t size)
-{
-	return rte_memzone_reserve_aligned(
-		npa_lf_stack_memzone_name(lf, pool_id, name), size, 0,
-			RTE_MEMZONE_IOVA_CONTIG, OTX2_ALIGN);
-}
-
-static inline int
-npa_lf_stack_dma_free(struct otx2_npa_lf *lf, char *name, int pool_id)
-{
-	const struct rte_memzone *mz;
-
-	mz = rte_memzone_lookup(npa_lf_stack_memzone_name(lf, pool_id, name));
-	if (mz == NULL)
-		return -EINVAL;
-
-	return rte_memzone_free(mz);
-}
-
-static inline int
-bitmap_ctzll(uint64_t slab)
-{
-	if (slab == 0)
-		return 0;
-
-	return __builtin_ctzll(slab);
-}
-
-static int
-npa_lf_aura_pool_pair_alloc(struct otx2_npa_lf *lf, const uint32_t block_size,
-			    const uint32_t block_count, struct npa_aura_s *aura,
-			    struct npa_pool_s *pool, uint64_t *aura_handle)
-{
-	int rc, aura_id, pool_id, stack_size, alloc_size;
-	char name[RTE_MEMZONE_NAMESIZE];
-	const struct rte_memzone *mz;
-	uint64_t slab;
-	uint32_t pos;
-
-	/* Sanity check */
-	if (!lf || !block_size || !block_count ||
-	    !pool || !aura || !aura_handle)
-		return NPA_LF_ERR_PARAM;
-
-	/* Block size should be cache line aligned and in range of 128B-128KB */
-	if (block_size % OTX2_ALIGN || block_size < 128 ||
-	    block_size > 128 * 1024)
-		return NPA_LF_ERR_INVALID_BLOCK_SZ;
-
-	pos = slab = 0;
-	/* Scan from the beginning */
-	__rte_bitmap_scan_init(lf->npa_bmp);
-	/* Scan bitmap to get the free pool */
-	rc = rte_bitmap_scan(lf->npa_bmp, &pos, &slab);
-	/* Empty bitmap */
-	if (rc == 0) {
-		otx2_err("Mempools exhausted, 'max_pools' devargs to increase");
-		return -ERANGE;
-	}
-
-	/* Get aura_id from resource bitmap */
-	aura_id = pos + bitmap_ctzll(slab);
-	/* Mark pool as reserved */
-	rte_bitmap_clear(lf->npa_bmp, aura_id);
-
-	/* Configuration based on each aura has separate pool(aura-pool pair) */
-	pool_id = aura_id;
-	rc = (aura_id < 0 || pool_id >= (int)lf->nr_pools || aura_id >=
-	      (int)BIT_ULL(6 + lf->aura_sz)) ? NPA_LF_ERR_AURA_ID_ALLOC : 0;
-	if (rc)
-		goto exit;
-
-	/* Allocate stack memory */
-	stack_size = (block_count + lf->stack_pg_ptrs - 1) / lf->stack_pg_ptrs;
-	alloc_size = stack_size * lf->stack_pg_bytes;
-
-	mz = npa_lf_stack_dma_alloc(lf, name, pool_id, alloc_size);
-	if (mz == NULL) {
-		rc = -ENOMEM;
-		goto aura_res_put;
-	}
-
-	/* Update aura fields */
-	aura->pool_addr = pool_id;/* AF will translate to associated poolctx */
-	aura->ena = 1;
-	aura->shift = rte_log2_u32(block_count);
-	aura->shift = aura->shift < 8 ? 0 : aura->shift - 8;
-	aura->limit = block_count;
-	aura->pool_caching = 1;
-	aura->err_int_ena = BIT(NPA_AURA_ERR_INT_AURA_ADD_OVER);
-	aura->err_int_ena |= BIT(NPA_AURA_ERR_INT_AURA_ADD_UNDER);
-	aura->err_int_ena |= BIT(NPA_AURA_ERR_INT_AURA_FREE_UNDER);
-	aura->err_int_ena |= BIT(NPA_AURA_ERR_INT_POOL_DIS);
-	/* Many to one reduction */
-	aura->err_qint_idx = aura_id % lf->qints;
-
-	/* Update pool fields */
-	pool->stack_base = mz->iova;
-	pool->ena = 1;
-	pool->buf_size = block_size / OTX2_ALIGN;
-	pool->stack_max_pages = stack_size;
-	pool->shift = rte_log2_u32(block_count);
-	pool->shift = pool->shift < 8 ? 0 : pool->shift - 8;
-	pool->ptr_start = 0;
-	pool->ptr_end = ~0;
-	pool->stack_caching = 1;
-	pool->err_int_ena = BIT(NPA_POOL_ERR_INT_OVFLS);
-	pool->err_int_ena |= BIT(NPA_POOL_ERR_INT_RANGE);
-	pool->err_int_ena |= BIT(NPA_POOL_ERR_INT_PERR);
-
-	/* Many to one reduction */
-	pool->err_qint_idx = pool_id % lf->qints;
-
-	/* Issue AURA_INIT and POOL_INIT op */
-	rc = npa_lf_aura_pool_init(lf->mbox, aura_id, aura, pool);
-	if (rc)
-		goto stack_mem_free;
-
-	*aura_handle = npa_lf_aura_handle_gen(aura_id, lf->base);
-
-	/* Update aura count */
-	npa_lf_aura_op_cnt_set(*aura_handle, 0, block_count);
-	/* Read it back to make sure aura count is updated */
-	npa_lf_aura_op_cnt_get(*aura_handle);
-
-	return 0;
-
-stack_mem_free:
-	rte_memzone_free(mz);
-aura_res_put:
-	rte_bitmap_set(lf->npa_bmp, aura_id);
-exit:
-	return rc;
-}
-
-static int
-npa_lf_aura_pool_pair_free(struct otx2_npa_lf *lf, uint64_t aura_handle)
-{
-	char name[RTE_MEMZONE_NAMESIZE];
-	int aura_id, pool_id, rc;
-
-	if (!lf || !aura_handle)
-		return NPA_LF_ERR_PARAM;
-
-	aura_id = pool_id = npa_lf_aura_handle_to_aura(aura_handle);
-	rc = npa_lf_aura_pool_fini(lf->mbox, aura_id, aura_handle);
-	rc |= npa_lf_stack_dma_free(lf, name, pool_id);
-
-	rte_bitmap_set(lf->npa_bmp, aura_id);
-
-	return rc;
-}
-
-static int
-npa_lf_aura_range_update_check(uint64_t aura_handle)
-{
-	uint64_t aura_id = npa_lf_aura_handle_to_aura(aura_handle);
-	struct otx2_npa_lf *lf = otx2_npa_lf_obj_get();
-	struct npa_aura_lim *lim = lf->aura_lim;
-	__otx2_io struct npa_pool_s *pool;
-	struct npa_aq_enq_req *req;
-	struct npa_aq_enq_rsp *rsp;
-	int rc;
-
-	req  = otx2_mbox_alloc_msg_npa_aq_enq(lf->mbox);
-
-	req->aura_id = aura_id;
-	req->ctype = NPA_AQ_CTYPE_POOL;
-	req->op = NPA_AQ_INSTOP_READ;
-
-	rc = otx2_mbox_process_msg(lf->mbox, (void *)&rsp);
-	if (rc) {
-		otx2_err("Failed to get pool(0x%"PRIx64") context", aura_id);
-		return rc;
-	}
-
-	pool = &rsp->pool;
-
-	if (lim[aura_id].ptr_start != pool->ptr_start ||
-		lim[aura_id].ptr_end != pool->ptr_end) {
-		otx2_err("Range update failed on pool(0x%"PRIx64")", aura_id);
-		return -ERANGE;
-	}
-
-	return 0;
-}
-
-static int
-otx2_npa_alloc(struct rte_mempool *mp)
-{
-	uint32_t block_size, block_count;
-	uint64_t aura_handle = 0;
-	struct otx2_npa_lf *lf;
-	struct npa_aura_s aura;
-	struct npa_pool_s pool;
-	size_t padding;
-	int rc;
-
-	lf = otx2_npa_lf_obj_get();
-	if (lf == NULL) {
-		rc = -EINVAL;
-		goto error;
-	}
-
-	block_size = mp->elt_size + mp->header_size + mp->trailer_size;
-	/*
-	 * OCTEON TX2 has 8 sets, 41 ways L1D cache, VA<9:7> bits dictate
-	 * the set selection.
-	 * Add additional padding to ensure that the element size always
-	 * occupies odd number of cachelines to ensure even distribution
-	 * of elements among L1D cache sets.
-	 */
-	padding = ((block_size / RTE_CACHE_LINE_SIZE) % 2) ? 0 :
-				RTE_CACHE_LINE_SIZE;
-	mp->trailer_size += padding;
-	block_size += padding;
-
-	block_count = mp->size;
-
-	if (block_size % OTX2_ALIGN != 0) {
-		otx2_err("Block size should be multiple of 128B");
-		rc = -ERANGE;
-		goto error;
-	}
-
-	memset(&aura, 0, sizeof(struct npa_aura_s));
-	memset(&pool, 0, sizeof(struct npa_pool_s));
-	pool.nat_align = 1;
-	pool.buf_offset = 1;
-
-	if ((uint32_t)pool.buf_offset * OTX2_ALIGN != mp->header_size) {
-		otx2_err("Unsupported mp->header_size=%d", mp->header_size);
-		rc = -EINVAL;
-		goto error;
-	}
-
-	/* Use driver specific mp->pool_config to override aura config */
-	if (mp->pool_config != NULL)
-		memcpy(&aura, mp->pool_config, sizeof(struct npa_aura_s));
-
-	rc = npa_lf_aura_pool_pair_alloc(lf, block_size, block_count,
-			 &aura, &pool, &aura_handle);
-	if (rc) {
-		otx2_err("Failed to alloc pool or aura rc=%d", rc);
-		goto error;
-	}
-
-	/* Store aura_handle for future queue operations */
-	mp->pool_id = aura_handle;
-	otx2_npa_dbg("lf=%p block_sz=%d block_count=%d aura_handle=0x%"PRIx64,
-		     lf, block_size, block_count, aura_handle);
-
-	/* Just hold the reference of the object */
-	otx2_npa_lf_obj_ref();
-	return 0;
-error:
-	return rc;
-}
-
-static void
-otx2_npa_free(struct rte_mempool *mp)
-{
-	struct otx2_npa_lf *lf = otx2_npa_lf_obj_get();
-	int rc = 0;
-
-	otx2_npa_dbg("lf=%p aura_handle=0x%"PRIx64, lf, mp->pool_id);
-	if (lf != NULL)
-		rc = npa_lf_aura_pool_pair_free(lf, mp->pool_id);
-
-	if (rc)
-		otx2_err("Failed to free pool or aura rc=%d", rc);
-
-	/* Release the reference of npalf */
-	otx2_npa_lf_fini();
-}
-
-static ssize_t
-otx2_npa_calc_mem_size(const struct rte_mempool *mp, uint32_t obj_num,
-		       uint32_t pg_shift, size_t *min_chunk_size, size_t *align)
-{
-	size_t total_elt_sz;
-
-	/* Need space for one more obj on each chunk to fulfill
-	 * alignment requirements.
-	 */
-	total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size;
-	return rte_mempool_op_calc_mem_size_helper(mp, obj_num, pg_shift,
-						total_elt_sz, min_chunk_size,
-						align);
-}
-
-static uint8_t
-otx2_npa_l1d_way_set_get(uint64_t iova)
-{
-	return (iova >> rte_log2_u32(RTE_CACHE_LINE_SIZE)) & 0x7;
-}
-
-static int
-otx2_npa_populate(struct rte_mempool *mp, unsigned int max_objs, void *vaddr,
-		  rte_iova_t iova, size_t len,
-		  rte_mempool_populate_obj_cb_t *obj_cb, void *obj_cb_arg)
-{
-#define OTX2_L1D_NB_SETS	8
-	uint64_t distribution[OTX2_L1D_NB_SETS];
-	rte_iova_t start_iova;
-	size_t total_elt_sz;
-	uint8_t set;
-	size_t off;
-	int i;
-
-	if (iova == RTE_BAD_IOVA)
-		return -EINVAL;
-
-	total_elt_sz = mp->header_size + mp->elt_size + mp->trailer_size;
-
-	/* Align object start address to a multiple of total_elt_sz */
-	off = total_elt_sz - ((((uintptr_t)vaddr - 1) % total_elt_sz) + 1);
-
-	if (len < off)
-		return -EINVAL;
-
-
-	vaddr = (char *)vaddr + off;
-	iova += off;
-	len -= off;
-
-	memset(distribution, 0, sizeof(uint64_t) * OTX2_L1D_NB_SETS);
-	start_iova = iova;
-	while (start_iova < iova + len) {
-		set = otx2_npa_l1d_way_set_get(start_iova + mp->header_size);
-		distribution[set]++;
-		start_iova += total_elt_sz;
-	}
-
-	otx2_npa_dbg("iova %"PRIx64", aligned iova %"PRIx64"", iova - off,
-		     iova);
-	otx2_npa_dbg("length %"PRIu64", aligned length %"PRIu64"",
-		     (uint64_t)(len + off), (uint64_t)len);
-	otx2_npa_dbg("element size %"PRIu64"", (uint64_t)total_elt_sz);
-	otx2_npa_dbg("requested objects %"PRIu64", possible objects %"PRIu64"",
-		     (uint64_t)max_objs, (uint64_t)(len / total_elt_sz));
-	otx2_npa_dbg("L1D set distribution :");
-	for (i = 0; i < OTX2_L1D_NB_SETS; i++)
-		otx2_npa_dbg("set[%d] : objects : %"PRIu64"", i,
-			     distribution[i]);
-
-	npa_lf_aura_op_range_set(mp->pool_id, iova, iova + len);
-
-	if (npa_lf_aura_range_update_check(mp->pool_id) < 0)
-		return -EBUSY;
-
-	return rte_mempool_op_populate_helper(mp,
-					RTE_MEMPOOL_POPULATE_F_ALIGN_OBJ,
-					max_objs, vaddr, iova, len,
-					obj_cb, obj_cb_arg);
-}
-
-static struct rte_mempool_ops otx2_npa_ops = {
-	.name = "octeontx2_npa",
-	.alloc = otx2_npa_alloc,
-	.free = otx2_npa_free,
-	.enqueue = otx2_npa_enq,
-	.get_count = otx2_npa_get_count,
-	.calc_mem_size = otx2_npa_calc_mem_size,
-	.populate = otx2_npa_populate,
-#if defined(RTE_ARCH_ARM64)
-	.dequeue = otx2_npa_deq_arm64,
-#else
-	.dequeue = otx2_npa_deq,
-#endif
-};
-
-RTE_MEMPOOL_REGISTER_OPS(otx2_npa_ops);
diff --git a/drivers/mempool/octeontx2/version.map b/drivers/mempool/octeontx2/version.map
deleted file mode 100644
index e6887ceb8f..0000000000
--- a/drivers/mempool/octeontx2/version.map
+++ /dev/null
@@ -1,8 +0,0 @@
-INTERNAL {
-	global:
-
-	otx2_npa_lf_fini;
-	otx2_npa_lf_init;
-
-	local: *;
-};
diff --git a/drivers/net/cnxk/cn9k_ethdev.c b/drivers/net/cnxk/cn9k_ethdev.c
index f8f3d3895e..d34bc6898f 100644
--- a/drivers/net/cnxk/cn9k_ethdev.c
+++ b/drivers/net/cnxk/cn9k_ethdev.c
@@ -579,6 +579,21 @@ cn9k_nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 }
 
 static const struct rte_pci_id cn9k_pci_nix_map[] = {
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_PF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KA, PCI_DEVID_CNXK_RVU_AF_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KB, PCI_DEVID_CNXK_RVU_AF_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KC, PCI_DEVID_CNXK_RVU_AF_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KD, PCI_DEVID_CNXK_RVU_AF_VF),
+	CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN9KE, PCI_DEVID_CNXK_RVU_AF_VF),
 	{
 		.vendor_id = 0,
 	},
diff --git a/drivers/net/meson.build b/drivers/net/meson.build
index 2355d1cde8..e35652fe63 100644
--- a/drivers/net/meson.build
+++ b/drivers/net/meson.build
@@ -45,7 +45,6 @@ drivers = [
         'ngbe',
         'null',
         'octeontx',
-        'octeontx2',
         'octeontx_ep',
         'pcap',
         'pfe',
diff --git a/drivers/net/octeontx2/meson.build b/drivers/net/octeontx2/meson.build
deleted file mode 100644
index ab15844cbc..0000000000
--- a/drivers/net/octeontx2/meson.build
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(C) 2019 Marvell International Ltd.
-#
-
-if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-    build = false
-    reason = 'only supported on 64-bit Linux'
-    subdir_done()
-endif
-
-sources = files(
-        'otx2_rx.c',
-        'otx2_tx.c',
-        'otx2_tm.c',
-        'otx2_rss.c',
-        'otx2_mac.c',
-        'otx2_ptp.c',
-        'otx2_flow.c',
-        'otx2_link.c',
-        'otx2_vlan.c',
-        'otx2_stats.c',
-        'otx2_mcast.c',
-        'otx2_lookup.c',
-        'otx2_ethdev.c',
-        'otx2_flow_ctrl.c',
-        'otx2_flow_dump.c',
-        'otx2_flow_parse.c',
-        'otx2_flow_utils.c',
-        'otx2_ethdev_irq.c',
-        'otx2_ethdev_ops.c',
-        'otx2_ethdev_sec.c',
-        'otx2_ethdev_debug.c',
-        'otx2_ethdev_devargs.c',
-)
-
-deps += ['bus_pci', 'cryptodev', 'eventdev', 'security']
-deps += ['common_octeontx2', 'mempool_octeontx2']
-
-extra_flags = ['-flax-vector-conversions']
-foreach flag: extra_flags
-    if cc.has_argument(flag)
-        cflags += flag
-    endif
-endforeach
-
-includes += include_directories('../../common/cpt')
-includes += include_directories('../../crypto/octeontx2')
diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
deleted file mode 100644
index 4f1c0b98de..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ /dev/null
@@ -1,2814 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <inttypes.h>
-
-#include <ethdev_pci.h>
-#include <rte_io.h>
-#include <rte_malloc.h>
-#include <rte_mbuf.h>
-#include <rte_mbuf_pool_ops.h>
-#include <rte_mempool.h>
-
-#include "otx2_ethdev.h"
-#include "otx2_ethdev_sec.h"
-
-static inline uint64_t
-nix_get_rx_offload_capa(struct otx2_eth_dev *dev)
-{
-	uint64_t capa = NIX_RX_OFFLOAD_CAPA;
-
-	if (otx2_dev_is_vf(dev) ||
-	    dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG)
-		capa &= ~RTE_ETH_RX_OFFLOAD_TIMESTAMP;
-
-	return capa;
-}
-
-static inline uint64_t
-nix_get_tx_offload_capa(struct otx2_eth_dev *dev)
-{
-	uint64_t capa = NIX_TX_OFFLOAD_CAPA;
-
-	/* TSO not supported for earlier chip revisions */
-	if (otx2_dev_is_96xx_A0(dev) || otx2_dev_is_95xx_Ax(dev))
-		capa &= ~(RTE_ETH_TX_OFFLOAD_TCP_TSO |
-			  RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
-			  RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |
-			  RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO);
-	return capa;
-}
-
-static const struct otx2_dev_ops otx2_dev_ops = {
-	.link_status_update = otx2_eth_dev_link_status_update,
-	.ptp_info_update = otx2_eth_dev_ptp_info_update,
-	.link_status_get = otx2_eth_dev_link_status_get,
-};
-
-static int
-nix_lf_alloc(struct otx2_eth_dev *dev, uint32_t nb_rxq, uint32_t nb_txq)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_lf_alloc_req *req;
-	struct nix_lf_alloc_rsp *rsp;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_nix_lf_alloc(mbox);
-	req->rq_cnt = nb_rxq;
-	req->sq_cnt = nb_txq;
-	req->cq_cnt = nb_rxq;
-	/* XQE_SZ should be in Sync with NIX_CQ_ENTRY_SZ */
-	RTE_BUILD_BUG_ON(NIX_CQ_ENTRY_SZ != 128);
-	req->xqe_sz = NIX_XQESZ_W16;
-	req->rss_sz = dev->rss_info.rss_size;
-	req->rss_grps = NIX_RSS_GRPS;
-	req->npa_func = otx2_npa_pf_func_get();
-	req->sso_func = otx2_sso_pf_func_get();
-	req->rx_cfg = BIT_ULL(35 /* DIS_APAD */);
-	if (dev->rx_offloads & (RTE_ETH_RX_OFFLOAD_TCP_CKSUM |
-			 RTE_ETH_RX_OFFLOAD_UDP_CKSUM)) {
-		req->rx_cfg |= BIT_ULL(37 /* CSUM_OL4 */);
-		req->rx_cfg |= BIT_ULL(36 /* CSUM_IL4 */);
-	}
-	req->rx_cfg |= (BIT_ULL(32 /* DROP_RE */)             |
-			BIT_ULL(33 /* Outer L2 Length */)     |
-			BIT_ULL(38 /* Inner L4 UDP Length */) |
-			BIT_ULL(39 /* Inner L3 Length */)     |
-			BIT_ULL(40 /* Outer L4 UDP Length */) |
-			BIT_ULL(41 /* Outer L3 Length */));
-
-	if (dev->rss_tag_as_xor == 0)
-		req->flags = NIX_LF_RSS_TAG_LSB_AS_ADDER;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->sqb_size = rsp->sqb_size;
-	dev->tx_chan_base = rsp->tx_chan_base;
-	dev->rx_chan_base = rsp->rx_chan_base;
-	dev->rx_chan_cnt = rsp->rx_chan_cnt;
-	dev->tx_chan_cnt = rsp->tx_chan_cnt;
-	dev->lso_tsov4_idx = rsp->lso_tsov4_idx;
-	dev->lso_tsov6_idx = rsp->lso_tsov6_idx;
-	dev->lf_tx_stats = rsp->lf_tx_stats;
-	dev->lf_rx_stats = rsp->lf_rx_stats;
-	dev->cints = rsp->cints;
-	dev->qints = rsp->qints;
-	dev->npc_flow.channel = dev->rx_chan_base;
-	dev->ptp_en = rsp->hw_rx_tstamp_en;
-
-	return 0;
-}
-
-static int
-nix_lf_switch_header_type_enable(struct otx2_eth_dev *dev, bool enable)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct npc_set_pkind *req;
-	struct msg_resp *rsp;
-	int rc;
-
-	if (dev->npc_flow.switch_header_type == 0)
-		return 0;
-
-	/* Notify AF about higig2 config */
-	req = otx2_mbox_alloc_msg_npc_set_pkind(mbox);
-	req->mode = dev->npc_flow.switch_header_type;
-	if (dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_CH_LEN_90B) {
-		req->mode = OTX2_PRIV_FLAGS_CUSTOM;
-		req->pkind = NPC_RX_CHLEN90B_PKIND;
-	} else if (dev->npc_flow.switch_header_type ==
-		   OTX2_PRIV_FLAGS_CH_LEN_24B) {
-		req->mode = OTX2_PRIV_FLAGS_CUSTOM;
-		req->pkind = NPC_RX_CHLEN24B_PKIND;
-	} else if (dev->npc_flow.switch_header_type ==
-		   OTX2_PRIV_FLAGS_EXDSA) {
-		req->mode = OTX2_PRIV_FLAGS_CUSTOM;
-		req->pkind = NPC_RX_EXDSA_PKIND;
-	} else if (dev->npc_flow.switch_header_type ==
-		   OTX2_PRIV_FLAGS_VLAN_EXDSA) {
-		req->mode = OTX2_PRIV_FLAGS_CUSTOM;
-		req->pkind = NPC_RX_VLAN_EXDSA_PKIND;
-	}
-
-	if (enable == 0)
-		req->mode = OTX2_PRIV_FLAGS_DEFAULT;
-	req->dir = PKIND_RX;
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-	req = otx2_mbox_alloc_msg_npc_set_pkind(mbox);
-	req->mode = dev->npc_flow.switch_header_type;
-	if (dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_CH_LEN_90B ||
-	    dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_CH_LEN_24B)
-		req->mode = OTX2_PRIV_FLAGS_DEFAULT;
-
-	if (enable == 0)
-		req->mode = OTX2_PRIV_FLAGS_DEFAULT;
-	req->dir = PKIND_TX;
-	return otx2_mbox_process_msg(mbox, (void *)&rsp);
-}
-
-static int
-nix_lf_free(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_lf_free_req *req;
-	struct ndc_sync_op *ndc_req;
-	int rc;
-
-	/* Sync NDC-NIX for LF */
-	ndc_req = otx2_mbox_alloc_msg_ndc_sync_op(mbox);
-	ndc_req->nix_lf_tx_sync = 1;
-	ndc_req->nix_lf_rx_sync = 1;
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		otx2_err("Error on NDC-NIX-[TX, RX] LF sync, rc %d", rc);
-
-	req = otx2_mbox_alloc_msg_nix_lf_free(mbox);
-	/* Let AF driver free all this nix lf's
-	 * NPC entries allocated using NPC MBOX.
-	 */
-	req->flags = 0;
-
-	return otx2_mbox_process(mbox);
-}
-
-int
-otx2_cgx_rxtx_start(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return 0;
-
-	otx2_mbox_alloc_msg_cgx_start_rxtx(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-int
-otx2_cgx_rxtx_stop(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return 0;
-
-	otx2_mbox_alloc_msg_cgx_stop_rxtx(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-npc_rx_enable(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-
-	otx2_mbox_alloc_msg_nix_lf_start_rx(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-npc_rx_disable(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-
-	otx2_mbox_alloc_msg_nix_lf_stop_rx(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-nix_cgx_start_link_event(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return 0;
-
-	otx2_mbox_alloc_msg_cgx_start_linkevents(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-cgx_intlbk_enable(struct otx2_eth_dev *dev, bool en)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-
-	if (en && otx2_dev_is_vf_or_sdp(dev))
-		return -ENOTSUP;
-
-	if (en)
-		otx2_mbox_alloc_msg_cgx_intlbk_enable(mbox);
-	else
-		otx2_mbox_alloc_msg_cgx_intlbk_disable(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-nix_cgx_stop_link_event(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return 0;
-
-	otx2_mbox_alloc_msg_cgx_stop_linkevents(mbox);
-
-	return otx2_mbox_process(mbox);
-}
-
-static inline void
-nix_rx_queue_reset(struct otx2_eth_rxq *rxq)
-{
-	rxq->head = 0;
-	rxq->available = 0;
-}
-
-static inline uint32_t
-nix_qsize_to_val(enum nix_q_size_e qsize)
-{
-	return (16UL << (qsize * 2));
-}
-
-static inline enum nix_q_size_e
-nix_qsize_clampup_get(struct otx2_eth_dev *dev, uint32_t val)
-{
-	int i;
-
-	if (otx2_ethdev_fixup_is_min_4k_q(dev))
-		i = nix_q_size_4K;
-	else
-		i = nix_q_size_16;
-
-	for (; i < nix_q_size_max; i++)
-		if (val <= nix_qsize_to_val(i))
-			break;
-
-	if (i >= nix_q_size_max)
-		i = nix_q_size_max - 1;
-
-	return i;
-}
-
-static int
-nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct otx2_eth_dev *dev,
-	       uint16_t qid, struct otx2_eth_rxq *rxq, struct rte_mempool *mp)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	const struct rte_memzone *rz;
-	uint32_t ring_size, cq_size;
-	struct nix_aq_enq_req *aq;
-	uint16_t first_skip;
-	int rc;
-
-	cq_size = rxq->qlen;
-	ring_size = cq_size * NIX_CQ_ENTRY_SZ;
-	rz = rte_eth_dma_zone_reserve(eth_dev, "cq", qid, ring_size,
-				      NIX_CQ_ALIGN, dev->node);
-	if (rz == NULL) {
-		otx2_err("Failed to allocate mem for cq hw ring");
-		return -ENOMEM;
-	}
-	memset(rz->addr, 0, rz->len);
-	rxq->desc = (uintptr_t)rz->addr;
-	rxq->qmask = cq_size - 1;
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = qid;
-	aq->ctype = NIX_AQ_CTYPE_CQ;
-	aq->op = NIX_AQ_INSTOP_INIT;
-
-	aq->cq.ena = 1;
-	aq->cq.caching = 1;
-	aq->cq.qsize = rxq->qsize;
-	aq->cq.base = rz->iova;
-	aq->cq.avg_level = 0xff;
-	aq->cq.cq_err_int_ena = BIT(NIX_CQERRINT_CQE_FAULT);
-	aq->cq.cq_err_int_ena |= BIT(NIX_CQERRINT_DOOR_ERR);
-
-	/* Many to one reduction */
-	aq->cq.qint_idx = qid % dev->qints;
-	/* Map CQ0 [RQ0] to CINT0 and so on till max 64 irqs */
-	aq->cq.cint_idx = qid;
-
-	if (otx2_ethdev_fixup_is_limit_cq_full(dev)) {
-		const float rx_cq_skid = NIX_CQ_FULL_ERRATA_SKID;
-		uint16_t min_rx_drop;
-
-		min_rx_drop = ceil(rx_cq_skid / (float)cq_size);
-		aq->cq.drop = min_rx_drop;
-		aq->cq.drop_ena = 1;
-		rxq->cq_drop = min_rx_drop;
-	} else {
-		rxq->cq_drop = NIX_CQ_THRESH_LEVEL;
-		aq->cq.drop = rxq->cq_drop;
-		aq->cq.drop_ena = 1;
-	}
-
-	/* TX pause frames enable flowctrl on RX side */
-	if (dev->fc_info.tx_pause) {
-		/* Single bpid is allocated for all rx channels for now */
-		aq->cq.bpid = dev->fc_info.bpid[0];
-		aq->cq.bp = rxq->cq_drop;
-		aq->cq.bp_ena = 1;
-	}
-
-	rc = otx2_mbox_process(mbox);
-	if (rc) {
-		otx2_err("Failed to init cq context");
-		return rc;
-	}
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = qid;
-	aq->ctype = NIX_AQ_CTYPE_RQ;
-	aq->op = NIX_AQ_INSTOP_INIT;
-
-	aq->rq.sso_ena = 0;
-
-	if (rxq->offloads & RTE_ETH_RX_OFFLOAD_SECURITY)
-		aq->rq.ipsech_ena = 1;
-
-	aq->rq.cq = qid; /* RQ to CQ 1:1 mapped */
-	aq->rq.spb_ena = 0;
-	aq->rq.lpb_aura = npa_lf_aura_handle_to_aura(mp->pool_id);
-	first_skip = (sizeof(struct rte_mbuf));
-	first_skip += RTE_PKTMBUF_HEADROOM;
-	first_skip += rte_pktmbuf_priv_size(mp);
-	rxq->data_off = first_skip;
-
-	first_skip /= 8; /* Expressed in number of dwords */
-	aq->rq.first_skip = first_skip;
-	aq->rq.later_skip = (sizeof(struct rte_mbuf) / 8);
-	aq->rq.flow_tagw = 32; /* 32-bits */
-	aq->rq.lpb_sizem1 = mp->elt_size / 8;
-	aq->rq.lpb_sizem1 -= 1; /* Expressed in size minus one */
-	aq->rq.ena = 1;
-	aq->rq.pb_caching = 0x2; /* First cache aligned block to LLC */
-	aq->rq.xqe_imm_size = 0; /* No pkt data copy to CQE */
-	aq->rq.rq_int_ena = 0;
-	/* Many to one reduction */
-	aq->rq.qint_idx = qid % dev->qints;
-
-	aq->rq.xqe_drop_ena = 1;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc) {
-		otx2_err("Failed to init rq context");
-		return rc;
-	}
-
-	if (dev->lock_rx_ctx) {
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = qid;
-		aq->ctype = NIX_AQ_CTYPE_CQ;
-		aq->op = NIX_AQ_INSTOP_LOCK;
-
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		if (!aq) {
-			/* The shared memory buffer can be full.
-			 * Flush it and retry
-			 */
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0) {
-				otx2_err("Failed to LOCK cq context");
-				return rc;
-			}
-
-			aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-			if (!aq) {
-				otx2_err("Failed to LOCK rq context");
-				return -ENOMEM;
-			}
-		}
-		aq->qidx = qid;
-		aq->ctype = NIX_AQ_CTYPE_RQ;
-		aq->op = NIX_AQ_INSTOP_LOCK;
-		rc = otx2_mbox_process(mbox);
-		if (rc < 0) {
-			otx2_err("Failed to LOCK rq context");
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-static int
-nix_rq_enb_dis(struct rte_eth_dev *eth_dev,
-	       struct otx2_eth_rxq *rxq, const bool enb)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_req *aq;
-
-	/* Pkts will be dropped silently if RQ is disabled */
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = rxq->rq;
-	aq->ctype = NIX_AQ_CTYPE_RQ;
-	aq->op = NIX_AQ_INSTOP_WRITE;
-
-	aq->rq.ena = enb;
-	aq->rq_mask.ena = ~(aq->rq_mask.ena);
-
-	return otx2_mbox_process(mbox);
-}
-
-static int
-nix_cq_rq_uninit(struct rte_eth_dev *eth_dev, struct otx2_eth_rxq *rxq)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_req *aq;
-	int rc;
-
-	/* RQ is already disabled */
-	/* Disable CQ */
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = rxq->rq;
-	aq->ctype = NIX_AQ_CTYPE_CQ;
-	aq->op = NIX_AQ_INSTOP_WRITE;
-
-	aq->cq.ena = 0;
-	aq->cq_mask.ena = ~(aq->cq_mask.ena);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0) {
-		otx2_err("Failed to disable cq context");
-		return rc;
-	}
-
-	if (dev->lock_rx_ctx) {
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = rxq->rq;
-		aq->ctype = NIX_AQ_CTYPE_CQ;
-		aq->op = NIX_AQ_INSTOP_UNLOCK;
-
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		if (!aq) {
-			/* The shared memory buffer can be full.
-			 * Flush it and retry
-			 */
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0) {
-				otx2_err("Failed to UNLOCK cq context");
-				return rc;
-			}
-
-			aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-			if (!aq) {
-				otx2_err("Failed to UNLOCK rq context");
-				return -ENOMEM;
-			}
-		}
-		aq->qidx = rxq->rq;
-		aq->ctype = NIX_AQ_CTYPE_RQ;
-		aq->op = NIX_AQ_INSTOP_UNLOCK;
-		rc = otx2_mbox_process(mbox);
-		if (rc < 0) {
-			otx2_err("Failed to UNLOCK rq context");
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-static inline int
-nix_get_data_off(struct otx2_eth_dev *dev)
-{
-	return otx2_ethdev_is_ptp_en(dev) ? NIX_TIMESYNC_RX_OFFSET : 0;
-}
-
-uint64_t
-otx2_nix_rxq_mbuf_setup(struct otx2_eth_dev *dev, uint16_t port_id)
-{
-	struct rte_mbuf mb_def;
-	uint64_t *tmp;
-
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) % 8 != 0);
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, refcnt) -
-				offsetof(struct rte_mbuf, data_off) != 2);
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, nb_segs) -
-				offsetof(struct rte_mbuf, data_off) != 4);
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, port) -
-				offsetof(struct rte_mbuf, data_off) != 6);
-	mb_def.nb_segs = 1;
-	mb_def.data_off = RTE_PKTMBUF_HEADROOM + nix_get_data_off(dev);
-	mb_def.port = port_id;
-	rte_mbuf_refcnt_set(&mb_def, 1);
-
-	/* Prevent compiler reordering: rearm_data covers previous fields */
-	rte_compiler_barrier();
-	tmp = (uint64_t *)&mb_def.rearm_data;
-
-	return *tmp;
-}
-
-static void
-otx2_nix_rx_queue_release(struct rte_eth_dev *dev, uint16_t qid)
-{
-	struct otx2_eth_rxq *rxq = dev->data->rx_queues[qid];
-
-	if (!rxq)
-		return;
-
-	otx2_nix_dbg("Releasing rxq %u", rxq->rq);
-	nix_cq_rq_uninit(rxq->eth_dev, rxq);
-	rte_free(rxq);
-	dev->data->rx_queues[qid] = NULL;
-}
-
-static int
-otx2_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t rq,
-			uint16_t nb_desc, unsigned int socket,
-			const struct rte_eth_rxconf *rx_conf,
-			struct rte_mempool *mp)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_mempool_ops *ops;
-	struct otx2_eth_rxq *rxq;
-	const char *platform_ops;
-	enum nix_q_size_e qsize;
-	uint64_t offloads;
-	int rc;
-
-	rc = -EINVAL;
-
-	/* Compile time check to make sure all fast path elements in a CL */
-	RTE_BUILD_BUG_ON(offsetof(struct otx2_eth_rxq, slow_path_start) >= 128);
-
-	/* Sanity checks */
-	if (rx_conf->rx_deferred_start == 1) {
-		otx2_err("Deferred Rx start is not supported");
-		goto fail;
-	}
-
-	platform_ops = rte_mbuf_platform_mempool_ops();
-	/* This driver needs octeontx2_npa mempool ops to work */
-	ops = rte_mempool_get_ops(mp->ops_index);
-	if (strncmp(ops->name, platform_ops, RTE_MEMPOOL_OPS_NAMESIZE)) {
-		otx2_err("mempool ops should be of octeontx2_npa type");
-		goto fail;
-	}
-
-	if (mp->pool_id == 0) {
-		otx2_err("Invalid pool_id");
-		goto fail;
-	}
-
-	/* Free memory prior to re-allocation if needed */
-	if (eth_dev->data->rx_queues[rq] != NULL) {
-		otx2_nix_dbg("Freeing memory prior to re-allocation %d", rq);
-		otx2_nix_rx_queue_release(eth_dev, rq);
-		rte_eth_dma_zone_free(eth_dev, "cq", rq);
-	}
-
-	offloads = rx_conf->offloads | eth_dev->data->dev_conf.rxmode.offloads;
-	dev->rx_offloads |= offloads;
-
-	/* Find the CQ queue size */
-	qsize = nix_qsize_clampup_get(dev, nb_desc);
-	/* Allocate rxq memory */
-	rxq = rte_zmalloc_socket("otx2 rxq", sizeof(*rxq), OTX2_ALIGN, socket);
-	if (rxq == NULL) {
-		otx2_err("Failed to allocate rq=%d", rq);
-		rc = -ENOMEM;
-		goto fail;
-	}
-
-	rxq->eth_dev = eth_dev;
-	rxq->rq = rq;
-	rxq->cq_door = dev->base + NIX_LF_CQ_OP_DOOR;
-	rxq->cq_status = (int64_t *)(dev->base + NIX_LF_CQ_OP_STATUS);
-	rxq->wdata = (uint64_t)rq << 32;
-	rxq->aura = npa_lf_aura_handle_to_aura(mp->pool_id);
-	rxq->mbuf_initializer = otx2_nix_rxq_mbuf_setup(dev,
-							eth_dev->data->port_id);
-	rxq->offloads = offloads;
-	rxq->pool = mp;
-	rxq->qlen = nix_qsize_to_val(qsize);
-	rxq->qsize = qsize;
-	rxq->lookup_mem = otx2_nix_fastpath_lookup_mem_get();
-	rxq->tstamp = &dev->tstamp;
-
-	eth_dev->data->rx_queues[rq] = rxq;
-
-	/* Alloc completion queue */
-	rc = nix_cq_rq_init(eth_dev, dev, rq, rxq, mp);
-	if (rc) {
-		otx2_err("Failed to allocate rxq=%u", rq);
-		goto free_rxq;
-	}
-
-	rxq->qconf.socket_id = socket;
-	rxq->qconf.nb_desc = nb_desc;
-	rxq->qconf.mempool = mp;
-	memcpy(&rxq->qconf.conf.rx, rx_conf, sizeof(struct rte_eth_rxconf));
-
-	nix_rx_queue_reset(rxq);
-	otx2_nix_dbg("rq=%d pool=%s qsize=%d nb_desc=%d->%d",
-		     rq, mp->name, qsize, nb_desc, rxq->qlen);
-
-	eth_dev->data->rx_queue_state[rq] = RTE_ETH_QUEUE_STATE_STOPPED;
-
-	/* Calculating delta and freq mult between PTP HI clock and tsc.
-	 * These are needed in deriving raw clock value from tsc counter.
-	 * read_clock eth op returns raw clock value.
-	 */
-	if ((dev->rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) ||
-	    otx2_ethdev_is_ptp_en(dev)) {
-		rc = otx2_nix_raw_clock_tsc_conv(dev);
-		if (rc) {
-			otx2_err("Failed to calculate delta and freq mult");
-			goto fail;
-		}
-	}
-
-	/* Setup scatter mode if needed by jumbo */
-	otx2_nix_enable_mseg_on_jumbo(rxq);
-
-	return 0;
-
-free_rxq:
-	otx2_nix_rx_queue_release(eth_dev, rq);
-fail:
-	return rc;
-}
-
-static inline uint8_t
-nix_sq_max_sqe_sz(struct otx2_eth_txq *txq)
-{
-	/*
-	 * Maximum three segments can be supported with W8, Choose
-	 * NIX_MAXSQESZ_W16 for multi segment offload.
-	 */
-	if (txq->offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
-		return NIX_MAXSQESZ_W16;
-	else
-		return NIX_MAXSQESZ_W8;
-}
-
-static uint16_t
-nix_rx_offload_flags(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_eth_dev_data *data = eth_dev->data;
-	struct rte_eth_conf *conf = &data->dev_conf;
-	struct rte_eth_rxmode *rxmode = &conf->rxmode;
-	uint16_t flags = 0;
-
-	if (rxmode->mq_mode == RTE_ETH_MQ_RX_RSS &&
-			(dev->rx_offloads & RTE_ETH_RX_OFFLOAD_RSS_HASH))
-		flags |= NIX_RX_OFFLOAD_RSS_F;
-
-	if (dev->rx_offloads & (RTE_ETH_RX_OFFLOAD_TCP_CKSUM |
-			 RTE_ETH_RX_OFFLOAD_UDP_CKSUM))
-		flags |= NIX_RX_OFFLOAD_CHECKSUM_F;
-
-	if (dev->rx_offloads & (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM |
-				RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM))
-		flags |= NIX_RX_OFFLOAD_CHECKSUM_F;
-
-	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)
-		flags |= NIX_RX_MULTI_SEG_F;
-
-	if (dev->rx_offloads & (RTE_ETH_RX_OFFLOAD_VLAN_STRIP |
-				RTE_ETH_RX_OFFLOAD_QINQ_STRIP))
-		flags |= NIX_RX_OFFLOAD_VLAN_STRIP_F;
-
-	if ((dev->rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP))
-		flags |= NIX_RX_OFFLOAD_TSTAMP_F;
-
-	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY)
-		flags |= NIX_RX_OFFLOAD_SECURITY_F;
-
-	if (!dev->ptype_disable)
-		flags |= NIX_RX_OFFLOAD_PTYPE_F;
-
-	return flags;
-}
-
-static uint16_t
-nix_tx_offload_flags(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t conf = dev->tx_offloads;
-	uint16_t flags = 0;
-
-	/* Fastpath is dependent on these enums */
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_TCP_CKSUM != (1ULL << 52));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_SCTP_CKSUM != (2ULL << 52));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_UDP_CKSUM != (3ULL << 52));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_IP_CKSUM != (1ULL << 54));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_IPV4 != (1ULL << 55));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_IP_CKSUM != (1ULL << 58));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_IPV4 != (1ULL << 59));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_IPV6 != (1ULL << 60));
-	RTE_BUILD_BUG_ON(RTE_MBUF_F_TX_OUTER_UDP_CKSUM != (1ULL << 41));
-	RTE_BUILD_BUG_ON(RTE_MBUF_L2_LEN_BITS != 7);
-	RTE_BUILD_BUG_ON(RTE_MBUF_L3_LEN_BITS != 9);
-	RTE_BUILD_BUG_ON(RTE_MBUF_OUTL2_LEN_BITS != 7);
-	RTE_BUILD_BUG_ON(RTE_MBUF_OUTL3_LEN_BITS != 9);
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, data_off) !=
-			 offsetof(struct rte_mbuf, buf_iova) + 8);
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, ol_flags) !=
-			 offsetof(struct rte_mbuf, buf_iova) + 16);
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) !=
-			 offsetof(struct rte_mbuf, ol_flags) + 12);
-	RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, tx_offload) !=
-			 offsetof(struct rte_mbuf, pool) + 2 * sizeof(void *));
-
-	if (conf & RTE_ETH_TX_OFFLOAD_VLAN_INSERT ||
-	    conf & RTE_ETH_TX_OFFLOAD_QINQ_INSERT)
-		flags |= NIX_TX_OFFLOAD_VLAN_QINQ_F;
-
-	if (conf & RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM ||
-	    conf & RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM)
-		flags |= NIX_TX_OFFLOAD_OL3_OL4_CSUM_F;
-
-	if (conf & RTE_ETH_TX_OFFLOAD_IPV4_CKSUM ||
-	    conf & RTE_ETH_TX_OFFLOAD_TCP_CKSUM ||
-	    conf & RTE_ETH_TX_OFFLOAD_UDP_CKSUM ||
-	    conf & RTE_ETH_TX_OFFLOAD_SCTP_CKSUM)
-		flags |= NIX_TX_OFFLOAD_L3_L4_CSUM_F;
-
-	if (!(conf & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE))
-		flags |= NIX_TX_OFFLOAD_MBUF_NOFF_F;
-
-	if (conf & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
-		flags |= NIX_TX_MULTI_SEG_F;
-
-	/* Enable Inner checksum for TSO */
-	if (conf & RTE_ETH_TX_OFFLOAD_TCP_TSO)
-		flags |= (NIX_TX_OFFLOAD_TSO_F |
-			  NIX_TX_OFFLOAD_L3_L4_CSUM_F);
-
-	/* Enable Inner and Outer checksum for Tunnel TSO */
-	if (conf & (RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
-		    RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO |
-		    RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO))
-		flags |= (NIX_TX_OFFLOAD_TSO_F |
-			  NIX_TX_OFFLOAD_OL3_OL4_CSUM_F |
-			  NIX_TX_OFFLOAD_L3_L4_CSUM_F);
-
-	if (conf & RTE_ETH_TX_OFFLOAD_SECURITY)
-		flags |= NIX_TX_OFFLOAD_SECURITY_F;
-
-	if ((dev->rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP))
-		flags |= NIX_TX_OFFLOAD_TSTAMP_F;
-
-	return flags;
-}
-
-static int
-nix_sqb_lock(struct rte_mempool *mp)
-{
-	struct otx2_npa_lf *npa_lf = otx2_intra_dev_get_cfg()->npa_lf;
-	struct npa_aq_enq_req *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-	req->aura_id = npa_lf_aura_handle_to_aura(mp->pool_id);
-	req->ctype = NPA_AQ_CTYPE_AURA;
-	req->op = NPA_AQ_INSTOP_LOCK;
-
-	req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-	if (!req) {
-		/* The shared memory buffer can be full.
-		 * Flush it and retry
-		 */
-		otx2_mbox_msg_send(npa_lf->mbox, 0);
-		rc = otx2_mbox_wait_for_rsp(npa_lf->mbox, 0);
-		if (rc < 0) {
-			otx2_err("Failed to LOCK AURA context");
-			return rc;
-		}
-
-		req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-		if (!req) {
-			otx2_err("Failed to LOCK POOL context");
-			return -ENOMEM;
-		}
-	}
-
-	req->aura_id = npa_lf_aura_handle_to_aura(mp->pool_id);
-	req->ctype = NPA_AQ_CTYPE_POOL;
-	req->op = NPA_AQ_INSTOP_LOCK;
-
-	rc = otx2_mbox_process(npa_lf->mbox);
-	if (rc < 0) {
-		otx2_err("Unable to lock POOL in NDC");
-		return rc;
-	}
-
-	return 0;
-}
-
-static int
-nix_sqb_unlock(struct rte_mempool *mp)
-{
-	struct otx2_npa_lf *npa_lf = otx2_intra_dev_get_cfg()->npa_lf;
-	struct npa_aq_enq_req *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-	req->aura_id = npa_lf_aura_handle_to_aura(mp->pool_id);
-	req->ctype = NPA_AQ_CTYPE_AURA;
-	req->op = NPA_AQ_INSTOP_UNLOCK;
-
-	req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-	if (!req) {
-		/* The shared memory buffer can be full.
-		 * Flush it and retry
-		 */
-		otx2_mbox_msg_send(npa_lf->mbox, 0);
-		rc = otx2_mbox_wait_for_rsp(npa_lf->mbox, 0);
-		if (rc < 0) {
-			otx2_err("Failed to UNLOCK AURA context");
-			return rc;
-		}
-
-		req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-		if (!req) {
-			otx2_err("Failed to UNLOCK POOL context");
-			return -ENOMEM;
-		}
-	}
-	req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-	req->aura_id = npa_lf_aura_handle_to_aura(mp->pool_id);
-	req->ctype = NPA_AQ_CTYPE_POOL;
-	req->op = NPA_AQ_INSTOP_UNLOCK;
-
-	rc = otx2_mbox_process(npa_lf->mbox);
-	if (rc < 0) {
-		otx2_err("Unable to UNLOCK AURA in NDC");
-		return rc;
-	}
-
-	return 0;
-}
-
-void
-otx2_nix_enable_mseg_on_jumbo(struct otx2_eth_rxq *rxq)
-{
-	struct rte_pktmbuf_pool_private *mbp_priv;
-	struct rte_eth_dev *eth_dev;
-	struct otx2_eth_dev *dev;
-	uint32_t buffsz;
-
-	eth_dev = rxq->eth_dev;
-	dev = otx2_eth_pmd_priv(eth_dev);
-
-	/* Get rx buffer size */
-	mbp_priv = rte_mempool_get_priv(rxq->pool);
-	buffsz = mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM;
-
-	if (eth_dev->data->mtu + (uint32_t)NIX_L2_OVERHEAD > buffsz) {
-		dev->rx_offloads |= RTE_ETH_RX_OFFLOAD_SCATTER;
-		dev->tx_offloads |= RTE_ETH_TX_OFFLOAD_MULTI_SEGS;
-
-		/* Setting up the rx[tx]_offload_flags due to change
-		 * in rx[tx]_offloads.
-		 */
-		dev->rx_offload_flags |= nix_rx_offload_flags(eth_dev);
-		dev->tx_offload_flags |= nix_tx_offload_flags(eth_dev);
-	}
-}
-
-static int
-nix_sq_init(struct otx2_eth_txq *txq)
-{
-	struct otx2_eth_dev *dev = txq->dev;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_req *sq;
-	uint32_t rr_quantum;
-	uint16_t smq;
-	int rc;
-
-	if (txq->sqb_pool->pool_id == 0)
-		return -EINVAL;
-
-	rc = otx2_nix_tm_get_leaf_data(dev, txq->sq, &rr_quantum, &smq);
-	if (rc) {
-		otx2_err("Failed to get sq->smq(leaf node), rc=%d", rc);
-		return rc;
-	}
-
-	sq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	sq->qidx = txq->sq;
-	sq->ctype = NIX_AQ_CTYPE_SQ;
-	sq->op = NIX_AQ_INSTOP_INIT;
-	sq->sq.max_sqe_size = nix_sq_max_sqe_sz(txq);
-
-	sq->sq.smq = smq;
-	sq->sq.smq_rr_quantum = rr_quantum;
-	sq->sq.default_chan = dev->tx_chan_base;
-	sq->sq.sqe_stype = NIX_STYPE_STF;
-	sq->sq.ena = 1;
-	if (sq->sq.max_sqe_size == NIX_MAXSQESZ_W8)
-		sq->sq.sqe_stype = NIX_STYPE_STP;
-	sq->sq.sqb_aura =
-		npa_lf_aura_handle_to_aura(txq->sqb_pool->pool_id);
-	sq->sq.sq_int_ena = BIT(NIX_SQINT_LMT_ERR);
-	sq->sq.sq_int_ena |= BIT(NIX_SQINT_SQB_ALLOC_FAIL);
-	sq->sq.sq_int_ena |= BIT(NIX_SQINT_SEND_ERR);
-	sq->sq.sq_int_ena |= BIT(NIX_SQINT_MNQ_ERR);
-
-	/* Many to one reduction */
-	sq->sq.qint_idx = txq->sq % dev->qints;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc < 0)
-		return rc;
-
-	if (dev->lock_tx_ctx) {
-		sq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		sq->qidx = txq->sq;
-		sq->ctype = NIX_AQ_CTYPE_SQ;
-		sq->op = NIX_AQ_INSTOP_LOCK;
-
-		rc = otx2_mbox_process(mbox);
-	}
-
-	return rc;
-}
-
-static int
-nix_sq_uninit(struct otx2_eth_txq *txq)
-{
-	struct otx2_eth_dev *dev = txq->dev;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct ndc_sync_op *ndc_req;
-	struct nix_aq_enq_rsp *rsp;
-	struct nix_aq_enq_req *aq;
-	uint16_t sqes_per_sqb;
-	void *sqb_buf;
-	int rc, count;
-
-	otx2_nix_dbg("Cleaning up sq %u", txq->sq);
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = txq->sq;
-	aq->ctype = NIX_AQ_CTYPE_SQ;
-	aq->op = NIX_AQ_INSTOP_READ;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	/* Check if sq is already cleaned up */
-	if (!rsp->sq.ena)
-		return 0;
-
-	/* Disable sq */
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = txq->sq;
-	aq->ctype = NIX_AQ_CTYPE_SQ;
-	aq->op = NIX_AQ_INSTOP_WRITE;
-
-	aq->sq_mask.ena = ~aq->sq_mask.ena;
-	aq->sq.ena = 0;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	if (dev->lock_tx_ctx) {
-		/* Unlock sq */
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = txq->sq;
-		aq->ctype = NIX_AQ_CTYPE_SQ;
-		aq->op = NIX_AQ_INSTOP_UNLOCK;
-
-		rc = otx2_mbox_process(mbox);
-		if (rc < 0)
-			return rc;
-
-		nix_sqb_unlock(txq->sqb_pool);
-	}
-
-	/* Read SQ and free sqb's */
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = txq->sq;
-	aq->ctype = NIX_AQ_CTYPE_SQ;
-	aq->op = NIX_AQ_INSTOP_READ;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	if (aq->sq.smq_pend)
-		otx2_err("SQ has pending sqe's");
-
-	count = aq->sq.sqb_count;
-	sqes_per_sqb = 1 << txq->sqes_per_sqb_log2;
-	/* Free SQB's that are used */
-	sqb_buf = (void *)rsp->sq.head_sqb;
-	while (count) {
-		void *next_sqb;
-
-		next_sqb = *(void **)((uintptr_t)sqb_buf + (uint32_t)
-				      ((sqes_per_sqb - 1) *
-				      nix_sq_max_sqe_sz(txq)));
-		npa_lf_aura_op_free(txq->sqb_pool->pool_id, 1,
-				    (uint64_t)sqb_buf);
-		sqb_buf = next_sqb;
-		count--;
-	}
-
-	/* Free next to use sqb */
-	if (rsp->sq.next_sqb)
-		npa_lf_aura_op_free(txq->sqb_pool->pool_id, 1,
-				    rsp->sq.next_sqb);
-
-	/* Sync NDC-NIX-TX for LF */
-	ndc_req = otx2_mbox_alloc_msg_ndc_sync_op(mbox);
-	ndc_req->nix_lf_tx_sync = 1;
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		otx2_err("Error on NDC-NIX-TX LF sync, rc %d", rc);
-
-	return rc;
-}
-
-static int
-nix_sqb_aura_limit_cfg(struct rte_mempool *mp, uint16_t nb_sqb_bufs)
-{
-	struct otx2_npa_lf *npa_lf = otx2_intra_dev_get_cfg()->npa_lf;
-	struct npa_aq_enq_req *aura_req;
-
-	aura_req = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-	aura_req->aura_id = npa_lf_aura_handle_to_aura(mp->pool_id);
-	aura_req->ctype = NPA_AQ_CTYPE_AURA;
-	aura_req->op = NPA_AQ_INSTOP_WRITE;
-
-	aura_req->aura.limit = nb_sqb_bufs;
-	aura_req->aura_mask.limit = ~(aura_req->aura_mask.limit);
-
-	return otx2_mbox_process(npa_lf->mbox);
-}
-
-static int
-nix_alloc_sqb_pool(int port, struct otx2_eth_txq *txq, uint16_t nb_desc)
-{
-	struct otx2_eth_dev *dev = txq->dev;
-	uint16_t sqes_per_sqb, nb_sqb_bufs;
-	char name[RTE_MEMPOOL_NAMESIZE];
-	struct rte_mempool_objsz sz;
-	struct npa_aura_s *aura;
-	uint32_t tmp, blk_sz;
-
-	aura = (struct npa_aura_s *)((uintptr_t)txq->fc_mem + OTX2_ALIGN);
-	snprintf(name, sizeof(name), "otx2_sqb_pool_%d_%d", port, txq->sq);
-	blk_sz = dev->sqb_size;
-
-	if (nix_sq_max_sqe_sz(txq) == NIX_MAXSQESZ_W16)
-		sqes_per_sqb = (dev->sqb_size / 8) / 16;
-	else
-		sqes_per_sqb = (dev->sqb_size / 8) / 8;
-
-	nb_sqb_bufs = nb_desc / sqes_per_sqb;
-	/* Clamp up to devarg passed SQB count */
-	nb_sqb_bufs =  RTE_MIN(dev->max_sqb_count, RTE_MAX(NIX_DEF_SQB,
-			      nb_sqb_bufs + NIX_SQB_LIST_SPACE));
-
-	txq->sqb_pool = rte_mempool_create_empty(name, NIX_MAX_SQB, blk_sz,
-						 0, 0, dev->node,
-						 RTE_MEMPOOL_F_NO_SPREAD);
-	txq->nb_sqb_bufs = nb_sqb_bufs;
-	txq->sqes_per_sqb_log2 = (uint16_t)rte_log2_u32(sqes_per_sqb);
-	txq->nb_sqb_bufs_adj = nb_sqb_bufs -
-		RTE_ALIGN_MUL_CEIL(nb_sqb_bufs, sqes_per_sqb) / sqes_per_sqb;
-	txq->nb_sqb_bufs_adj =
-		(NIX_SQB_LOWER_THRESH * txq->nb_sqb_bufs_adj) / 100;
-
-	if (txq->sqb_pool == NULL) {
-		otx2_err("Failed to allocate sqe mempool");
-		goto fail;
-	}
-
-	memset(aura, 0, sizeof(*aura));
-	aura->fc_ena = 1;
-	aura->fc_addr = txq->fc_iova;
-	aura->fc_hyst_bits = 0; /* Store count on all updates */
-	if (rte_mempool_set_ops_byname(txq->sqb_pool, "octeontx2_npa", aura)) {
-		otx2_err("Failed to set ops for sqe mempool");
-		goto fail;
-	}
-	if (rte_mempool_populate_default(txq->sqb_pool) < 0) {
-		otx2_err("Failed to populate sqe mempool");
-		goto fail;
-	}
-
-	tmp = rte_mempool_calc_obj_size(blk_sz, RTE_MEMPOOL_F_NO_SPREAD, &sz);
-	if (dev->sqb_size != sz.elt_size) {
-		otx2_err("sqe pool block size is not expected %d != %d",
-			 dev->sqb_size, tmp);
-		goto fail;
-	}
-
-	nix_sqb_aura_limit_cfg(txq->sqb_pool, txq->nb_sqb_bufs);
-	if (dev->lock_tx_ctx)
-		nix_sqb_lock(txq->sqb_pool);
-
-	return 0;
-fail:
-	return -ENOMEM;
-}
-
-void
-otx2_nix_form_default_desc(struct otx2_eth_txq *txq)
-{
-	struct nix_send_ext_s *send_hdr_ext;
-	struct nix_send_hdr_s *send_hdr;
-	struct nix_send_mem_s *send_mem;
-	union nix_send_sg_s *sg;
-
-	/* Initialize the fields based on basic single segment packet */
-	memset(&txq->cmd, 0, sizeof(txq->cmd));
-
-	if (txq->dev->tx_offload_flags & NIX_TX_NEED_EXT_HDR) {
-		send_hdr = (struct nix_send_hdr_s *)&txq->cmd[0];
-		/* 2(HDR) + 2(EXT_HDR) + 1(SG) + 1(IOVA) = 6/2 - 1 = 2 */
-		send_hdr->w0.sizem1 = 2;
-
-		send_hdr_ext = (struct nix_send_ext_s *)&txq->cmd[2];
-		send_hdr_ext->w0.subdc = NIX_SUBDC_EXT;
-		if (txq->dev->tx_offload_flags & NIX_TX_OFFLOAD_TSTAMP_F) {
-			/* Default: one seg packet would have:
-			 * 2(HDR) + 2(EXT) + 1(SG) + 1(IOVA) + 2(MEM)
-			 * => 8/2 - 1 = 3
-			 */
-			send_hdr->w0.sizem1 = 3;
-			send_hdr_ext->w0.tstmp = 1;
-
-			/* To calculate the offset for send_mem,
-			 * send_hdr->w0.sizem1 * 2
-			 */
-			send_mem = (struct nix_send_mem_s *)(txq->cmd +
-						(send_hdr->w0.sizem1 << 1));
-			send_mem->subdc = NIX_SUBDC_MEM;
-			send_mem->alg = NIX_SENDMEMALG_SETTSTMP;
-			send_mem->addr = txq->dev->tstamp.tx_tstamp_iova;
-		}
-		sg = (union nix_send_sg_s *)&txq->cmd[4];
-	} else {
-		send_hdr = (struct nix_send_hdr_s *)&txq->cmd[0];
-		/* 2(HDR) + 1(SG) + 1(IOVA) = 4/2 - 1 = 1 */
-		send_hdr->w0.sizem1 = 1;
-		sg = (union nix_send_sg_s *)&txq->cmd[2];
-	}
-
-	send_hdr->w0.sq = txq->sq;
-	sg->subdc = NIX_SUBDC_SG;
-	sg->segs = 1;
-	sg->ld_type = NIX_SENDLDTYPE_LDD;
-
-	rte_smp_wmb();
-}
-
-static void
-otx2_nix_tx_queue_release(struct rte_eth_dev *eth_dev, uint16_t qid)
-{
-	struct otx2_eth_txq *txq = eth_dev->data->tx_queues[qid];
-
-	if (!txq)
-		return;
-
-	otx2_nix_dbg("Releasing txq %u", txq->sq);
-
-	/* Flush and disable tm */
-	otx2_nix_sq_flush_pre(txq, eth_dev->data->dev_started);
-
-	/* Free sqb's and disable sq */
-	nix_sq_uninit(txq);
-
-	if (txq->sqb_pool) {
-		rte_mempool_free(txq->sqb_pool);
-		txq->sqb_pool = NULL;
-	}
-	otx2_nix_sq_flush_post(txq);
-	rte_free(txq);
-	eth_dev->data->tx_queues[qid] = NULL;
-}
-
-
-static int
-otx2_nix_tx_queue_setup(struct rte_eth_dev *eth_dev, uint16_t sq,
-			uint16_t nb_desc, unsigned int socket_id,
-			const struct rte_eth_txconf *tx_conf)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	const struct rte_memzone *fc;
-	struct otx2_eth_txq *txq;
-	uint64_t offloads;
-	int rc;
-
-	rc = -EINVAL;
-
-	/* Compile time check to make sure all fast path elements in a CL */
-	RTE_BUILD_BUG_ON(offsetof(struct otx2_eth_txq, slow_path_start) >= 128);
-
-	if (tx_conf->tx_deferred_start) {
-		otx2_err("Tx deferred start is not supported");
-		goto fail;
-	}
-
-	/* Free memory prior to re-allocation if needed. */
-	if (eth_dev->data->tx_queues[sq] != NULL) {
-		otx2_nix_dbg("Freeing memory prior to re-allocation %d", sq);
-		otx2_nix_tx_queue_release(eth_dev, sq);
-	}
-
-	/* Find the expected offloads for this queue */
-	offloads = tx_conf->offloads | eth_dev->data->dev_conf.txmode.offloads;
-
-	/* Allocating tx queue data structure */
-	txq = rte_zmalloc_socket("otx2_ethdev TX queue", sizeof(*txq),
-				 OTX2_ALIGN, socket_id);
-	if (txq == NULL) {
-		otx2_err("Failed to alloc txq=%d", sq);
-		rc = -ENOMEM;
-		goto fail;
-	}
-	txq->sq = sq;
-	txq->dev = dev;
-	txq->sqb_pool = NULL;
-	txq->offloads = offloads;
-	dev->tx_offloads |= offloads;
-	eth_dev->data->tx_queues[sq] = txq;
-
-	/*
-	 * Allocate memory for flow control updates from HW.
-	 * Alloc one cache line, so that fits all FC_STYPE modes.
-	 */
-	fc = rte_eth_dma_zone_reserve(eth_dev, "fcmem", sq,
-				      OTX2_ALIGN + sizeof(struct npa_aura_s),
-				      OTX2_ALIGN, dev->node);
-	if (fc == NULL) {
-		otx2_err("Failed to allocate mem for fcmem");
-		rc = -ENOMEM;
-		goto free_txq;
-	}
-	txq->fc_iova = fc->iova;
-	txq->fc_mem = fc->addr;
-
-	/* Initialize the aura sqb pool */
-	rc = nix_alloc_sqb_pool(eth_dev->data->port_id, txq, nb_desc);
-	if (rc) {
-		otx2_err("Failed to alloc sqe pool rc=%d", rc);
-		goto free_txq;
-	}
-
-	/* Initialize the SQ */
-	rc = nix_sq_init(txq);
-	if (rc) {
-		otx2_err("Failed to init sq=%d context", sq);
-		goto free_txq;
-	}
-
-	txq->fc_cache_pkts = 0;
-	txq->io_addr = dev->base + NIX_LF_OP_SENDX(0);
-	/* Evenly distribute LMT slot for each sq */
-	txq->lmt_addr = (void *)(dev->lmt_addr + ((sq & LMT_SLOT_MASK) << 12));
-
-	txq->qconf.socket_id = socket_id;
-	txq->qconf.nb_desc = nb_desc;
-	memcpy(&txq->qconf.conf.tx, tx_conf, sizeof(struct rte_eth_txconf));
-
-	txq->lso_tun_fmt = dev->lso_tun_fmt;
-	otx2_nix_form_default_desc(txq);
-
-	otx2_nix_dbg("sq=%d fc=%p offload=0x%" PRIx64 " sqb=0x%" PRIx64 ""
-		     " lmt_addr=%p nb_sqb_bufs=%d sqes_per_sqb_log2=%d", sq,
-		     fc->addr, offloads, txq->sqb_pool->pool_id, txq->lmt_addr,
-		     txq->nb_sqb_bufs, txq->sqes_per_sqb_log2);
-	eth_dev->data->tx_queue_state[sq] = RTE_ETH_QUEUE_STATE_STOPPED;
-	return 0;
-
-free_txq:
-	otx2_nix_tx_queue_release(eth_dev, sq);
-fail:
-	return rc;
-}
-
-static int
-nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_eth_qconf *tx_qconf = NULL;
-	struct otx2_eth_qconf *rx_qconf = NULL;
-	struct otx2_eth_txq **txq;
-	struct otx2_eth_rxq **rxq;
-	int i, nb_rxq, nb_txq;
-
-	nb_rxq = RTE_MIN(dev->configured_nb_rx_qs, eth_dev->data->nb_rx_queues);
-	nb_txq = RTE_MIN(dev->configured_nb_tx_qs, eth_dev->data->nb_tx_queues);
-
-	tx_qconf = malloc(nb_txq * sizeof(*tx_qconf));
-	if (tx_qconf == NULL) {
-		otx2_err("Failed to allocate memory for tx_qconf");
-		goto fail;
-	}
-
-	rx_qconf = malloc(nb_rxq * sizeof(*rx_qconf));
-	if (rx_qconf == NULL) {
-		otx2_err("Failed to allocate memory for rx_qconf");
-		goto fail;
-	}
-
-	txq = (struct otx2_eth_txq **)eth_dev->data->tx_queues;
-	for (i = 0; i < nb_txq; i++) {
-		if (txq[i] == NULL) {
-			tx_qconf[i].valid = false;
-			otx2_info("txq[%d] is already released", i);
-			continue;
-		}
-		memcpy(&tx_qconf[i], &txq[i]->qconf, sizeof(*tx_qconf));
-		tx_qconf[i].valid = true;
-		otx2_nix_tx_queue_release(eth_dev, i);
-	}
-
-	rxq = (struct otx2_eth_rxq **)eth_dev->data->rx_queues;
-	for (i = 0; i < nb_rxq; i++) {
-		if (rxq[i] == NULL) {
-			rx_qconf[i].valid = false;
-			otx2_info("rxq[%d] is already released", i);
-			continue;
-		}
-		memcpy(&rx_qconf[i], &rxq[i]->qconf, sizeof(*rx_qconf));
-		rx_qconf[i].valid = true;
-		otx2_nix_rx_queue_release(eth_dev, i);
-	}
-
-	dev->tx_qconf = tx_qconf;
-	dev->rx_qconf = rx_qconf;
-	return 0;
-
-fail:
-	free(tx_qconf);
-	free(rx_qconf);
-
-	return -ENOMEM;
-}
-
-static int
-nix_restore_queue_cfg(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_eth_qconf *tx_qconf = dev->tx_qconf;
-	struct otx2_eth_qconf *rx_qconf = dev->rx_qconf;
-	int rc, i, nb_rxq, nb_txq;
-
-	nb_rxq = RTE_MIN(dev->configured_nb_rx_qs, eth_dev->data->nb_rx_queues);
-	nb_txq = RTE_MIN(dev->configured_nb_tx_qs, eth_dev->data->nb_tx_queues);
-
-	rc = -ENOMEM;
-	/* Setup tx & rx queues with previous configuration so
-	 * that the queues can be functional in cases like ports
-	 * are started without re configuring queues.
-	 *
-	 * Usual re config sequence is like below:
-	 * port_configure() {
-	 *      if(reconfigure) {
-	 *              queue_release()
-	 *              queue_setup()
-	 *      }
-	 *      queue_configure() {
-	 *              queue_release()
-	 *              queue_setup()
-	 *      }
-	 * }
-	 * port_start()
-	 *
-	 * In some application's control path, queue_configure() would
-	 * NOT be invoked for TXQs/RXQs in port_configure().
-	 * In such cases, queues can be functional after start as the
-	 * queues are already setup in port_configure().
-	 */
-	for (i = 0; i < nb_txq; i++) {
-		if (!tx_qconf[i].valid)
-			continue;
-		rc = otx2_nix_tx_queue_setup(eth_dev, i, tx_qconf[i].nb_desc,
-					     tx_qconf[i].socket_id,
-					     &tx_qconf[i].conf.tx);
-		if (rc) {
-			otx2_err("Failed to setup tx queue rc=%d", rc);
-			for (i -= 1; i >= 0; i--)
-				otx2_nix_tx_queue_release(eth_dev, i);
-			goto fail;
-		}
-	}
-
-	free(tx_qconf); tx_qconf = NULL;
-
-	for (i = 0; i < nb_rxq; i++) {
-		if (!rx_qconf[i].valid)
-			continue;
-		rc = otx2_nix_rx_queue_setup(eth_dev, i, rx_qconf[i].nb_desc,
-					     rx_qconf[i].socket_id,
-					     &rx_qconf[i].conf.rx,
-					     rx_qconf[i].mempool);
-		if (rc) {
-			otx2_err("Failed to setup rx queue rc=%d", rc);
-			for (i -= 1; i >= 0; i--)
-				otx2_nix_rx_queue_release(eth_dev, i);
-			goto release_tx_queues;
-		}
-	}
-
-	free(rx_qconf); rx_qconf = NULL;
-
-	return 0;
-
-release_tx_queues:
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
-		otx2_nix_tx_queue_release(eth_dev, i);
-fail:
-	if (tx_qconf)
-		free(tx_qconf);
-	if (rx_qconf)
-		free(rx_qconf);
-
-	return rc;
-}
-
-static uint16_t
-nix_eth_nop_burst(void *queue, struct rte_mbuf **mbufs, uint16_t pkts)
-{
-	RTE_SET_USED(queue);
-	RTE_SET_USED(mbufs);
-	RTE_SET_USED(pkts);
-
-	return 0;
-}
-
-static void
-nix_set_nop_rxtx_function(struct rte_eth_dev *eth_dev)
-{
-	/* These dummy functions are required for supporting
-	 * some applications which reconfigure queues without
-	 * stopping tx burst and rx burst threads(eg kni app)
-	 * When the queues context is saved, txq/rxqs are released
-	 * which caused app crash since rx/tx burst is still
-	 * on different lcores
-	 */
-	eth_dev->tx_pkt_burst = nix_eth_nop_burst;
-	eth_dev->rx_pkt_burst = nix_eth_nop_burst;
-	rte_mb();
-}
-
-static void
-nix_lso_tcp(struct nix_lso_format_cfg *req, bool v4)
-{
-	volatile struct nix_lso_format *field;
-
-	/* Format works only with TCP packet marked by OL3/OL4 */
-	field = (volatile struct nix_lso_format *)&req->fields[0];
-	req->field_mask = NIX_LSO_FIELD_MASK;
-	/* Outer IPv4/IPv6 */
-	field->layer = NIX_TXLAYER_OL3;
-	field->offset = v4 ? 2 : 4;
-	field->sizem1 = 1; /* 2B */
-	field->alg = NIX_LSOALG_ADD_PAYLEN;
-	field++;
-	if (v4) {
-		/* IPID field */
-		field->layer = NIX_TXLAYER_OL3;
-		field->offset = 4;
-		field->sizem1 = 1;
-		/* Incremented linearly per segment */
-		field->alg = NIX_LSOALG_ADD_SEGNUM;
-		field++;
-	}
-
-	/* TCP sequence number update */
-	field->layer = NIX_TXLAYER_OL4;
-	field->offset = 4;
-	field->sizem1 = 3; /* 4 bytes */
-	field->alg = NIX_LSOALG_ADD_OFFSET;
-	field++;
-	/* TCP flags field */
-	field->layer = NIX_TXLAYER_OL4;
-	field->offset = 12;
-	field->sizem1 = 1;
-	field->alg = NIX_LSOALG_TCP_FLAGS;
-	field++;
-}
-
-static void
-nix_lso_udp_tun_tcp(struct nix_lso_format_cfg *req,
-		    bool outer_v4, bool inner_v4)
-{
-	volatile struct nix_lso_format *field;
-
-	field = (volatile struct nix_lso_format *)&req->fields[0];
-	req->field_mask = NIX_LSO_FIELD_MASK;
-	/* Outer IPv4/IPv6 len */
-	field->layer = NIX_TXLAYER_OL3;
-	field->offset = outer_v4 ? 2 : 4;
-	field->sizem1 = 1; /* 2B */
-	field->alg = NIX_LSOALG_ADD_PAYLEN;
-	field++;
-	if (outer_v4) {
-		/* IPID */
-		field->layer = NIX_TXLAYER_OL3;
-		field->offset = 4;
-		field->sizem1 = 1;
-		/* Incremented linearly per segment */
-		field->alg = NIX_LSOALG_ADD_SEGNUM;
-		field++;
-	}
-
-	/* Outer UDP length */
-	field->layer = NIX_TXLAYER_OL4;
-	field->offset = 4;
-	field->sizem1 = 1;
-	field->alg = NIX_LSOALG_ADD_PAYLEN;
-	field++;
-
-	/* Inner IPv4/IPv6 */
-	field->layer = NIX_TXLAYER_IL3;
-	field->offset = inner_v4 ? 2 : 4;
-	field->sizem1 = 1; /* 2B */
-	field->alg = NIX_LSOALG_ADD_PAYLEN;
-	field++;
-	if (inner_v4) {
-		/* IPID field */
-		field->layer = NIX_TXLAYER_IL3;
-		field->offset = 4;
-		field->sizem1 = 1;
-		/* Incremented linearly per segment */
-		field->alg = NIX_LSOALG_ADD_SEGNUM;
-		field++;
-	}
-
-	/* TCP sequence number update */
-	field->layer = NIX_TXLAYER_IL4;
-	field->offset = 4;
-	field->sizem1 = 3; /* 4 bytes */
-	field->alg = NIX_LSOALG_ADD_OFFSET;
-	field++;
-
-	/* TCP flags field */
-	field->layer = NIX_TXLAYER_IL4;
-	field->offset = 12;
-	field->sizem1 = 1;
-	field->alg = NIX_LSOALG_TCP_FLAGS;
-	field++;
-}
-
-static void
-nix_lso_tun_tcp(struct nix_lso_format_cfg *req,
-		bool outer_v4, bool inner_v4)
-{
-	volatile struct nix_lso_format *field;
-
-	field = (volatile struct nix_lso_format *)&req->fields[0];
-	req->field_mask = NIX_LSO_FIELD_MASK;
-	/* Outer IPv4/IPv6 len */
-	field->layer = NIX_TXLAYER_OL3;
-	field->offset = outer_v4 ? 2 : 4;
-	field->sizem1 = 1; /* 2B */
-	field->alg = NIX_LSOALG_ADD_PAYLEN;
-	field++;
-	if (outer_v4) {
-		/* IPID */
-		field->layer = NIX_TXLAYER_OL3;
-		field->offset = 4;
-		field->sizem1 = 1;
-		/* Incremented linearly per segment */
-		field->alg = NIX_LSOALG_ADD_SEGNUM;
-		field++;
-	}
-
-	/* Inner IPv4/IPv6 */
-	field->layer = NIX_TXLAYER_IL3;
-	field->offset = inner_v4 ? 2 : 4;
-	field->sizem1 = 1; /* 2B */
-	field->alg = NIX_LSOALG_ADD_PAYLEN;
-	field++;
-	if (inner_v4) {
-		/* IPID field */
-		field->layer = NIX_TXLAYER_IL3;
-		field->offset = 4;
-		field->sizem1 = 1;
-		/* Incremented linearly per segment */
-		field->alg = NIX_LSOALG_ADD_SEGNUM;
-		field++;
-	}
-
-	/* TCP sequence number update */
-	field->layer = NIX_TXLAYER_IL4;
-	field->offset = 4;
-	field->sizem1 = 3; /* 4 bytes */
-	field->alg = NIX_LSOALG_ADD_OFFSET;
-	field++;
-
-	/* TCP flags field */
-	field->layer = NIX_TXLAYER_IL4;
-	field->offset = 12;
-	field->sizem1 = 1;
-	field->alg = NIX_LSOALG_TCP_FLAGS;
-	field++;
-}
-
-static int
-nix_setup_lso_formats(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_lso_format_cfg_rsp *rsp;
-	struct nix_lso_format_cfg *req;
-	uint8_t *fmt;
-	int rc;
-
-	/* Skip if TSO was not requested */
-	if (!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSO_F))
-		return 0;
-	/*
-	 * IPv4/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_tcp(req, true);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	if (rsp->lso_format_idx != NIX_LSO_FORMAT_IDX_TSOV4)
-		return -EFAULT;
-	otx2_nix_dbg("tcpv4 lso fmt=%u", rsp->lso_format_idx);
-
-
-	/*
-	 * IPv6/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_tcp(req, false);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	if (rsp->lso_format_idx != NIX_LSO_FORMAT_IDX_TSOV6)
-		return -EFAULT;
-	otx2_nix_dbg("tcpv6 lso fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv4/UDP/TUN HDR/IPv4/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_udp_tun_tcp(req, true, true);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_udp_tun_idx[NIX_LSO_TUN_V4V4] = rsp->lso_format_idx;
-	otx2_nix_dbg("udp tun v4v4 fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv4/UDP/TUN HDR/IPv6/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_udp_tun_tcp(req, true, false);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_udp_tun_idx[NIX_LSO_TUN_V4V6] = rsp->lso_format_idx;
-	otx2_nix_dbg("udp tun v4v6 fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv6/UDP/TUN HDR/IPv4/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_udp_tun_tcp(req, false, true);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_udp_tun_idx[NIX_LSO_TUN_V6V4] = rsp->lso_format_idx;
-	otx2_nix_dbg("udp tun v6v4 fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv6/UDP/TUN HDR/IPv6/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_udp_tun_tcp(req, false, false);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_udp_tun_idx[NIX_LSO_TUN_V6V6] = rsp->lso_format_idx;
-	otx2_nix_dbg("udp tun v6v6 fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv4/TUN HDR/IPv4/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_tun_tcp(req, true, true);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_tun_idx[NIX_LSO_TUN_V4V4] = rsp->lso_format_idx;
-	otx2_nix_dbg("tun v4v4 fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv4/TUN HDR/IPv6/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_tun_tcp(req, true, false);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_tun_idx[NIX_LSO_TUN_V4V6] = rsp->lso_format_idx;
-	otx2_nix_dbg("tun v4v6 fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv6/TUN HDR/IPv4/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_tun_tcp(req, false, true);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_tun_idx[NIX_LSO_TUN_V6V4] = rsp->lso_format_idx;
-	otx2_nix_dbg("tun v6v4 fmt=%u\n", rsp->lso_format_idx);
-
-	/*
-	 * IPv6/TUN HDR/IPv6/TCP LSO
-	 */
-	req = otx2_mbox_alloc_msg_nix_lso_format_cfg(mbox);
-	nix_lso_tun_tcp(req, false, false);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	dev->lso_tun_idx[NIX_LSO_TUN_V6V6] = rsp->lso_format_idx;
-	otx2_nix_dbg("tun v6v6 fmt=%u\n", rsp->lso_format_idx);
-
-	/* Save all tun formats into u64 for fast path.
-	 * Lower 32bit has non-udp tunnel formats.
-	 * Upper 32bit has udp tunnel formats.
-	 */
-	fmt = dev->lso_tun_idx;
-	dev->lso_tun_fmt = ((uint64_t)fmt[NIX_LSO_TUN_V4V4] |
-			    (uint64_t)fmt[NIX_LSO_TUN_V4V6] << 8 |
-			    (uint64_t)fmt[NIX_LSO_TUN_V6V4] << 16 |
-			    (uint64_t)fmt[NIX_LSO_TUN_V6V6] << 24);
-
-	fmt = dev->lso_udp_tun_idx;
-	dev->lso_tun_fmt |= ((uint64_t)fmt[NIX_LSO_TUN_V4V4] << 32 |
-			     (uint64_t)fmt[NIX_LSO_TUN_V4V6] << 40 |
-			     (uint64_t)fmt[NIX_LSO_TUN_V6V4] << 48 |
-			     (uint64_t)fmt[NIX_LSO_TUN_V6V6] << 56);
-
-	return 0;
-}
-
-static int
-otx2_nix_configure(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_eth_dev_data *data = eth_dev->data;
-	struct rte_eth_conf *conf = &data->dev_conf;
-	struct rte_eth_rxmode *rxmode = &conf->rxmode;
-	struct rte_eth_txmode *txmode = &conf->txmode;
-	char ea_fmt[RTE_ETHER_ADDR_FMT_SIZE];
-	struct rte_ether_addr *ea;
-	uint8_t nb_rxq, nb_txq;
-	int rc;
-
-	rc = -EINVAL;
-
-	/* Sanity checks */
-	if (rte_eal_has_hugepages() == 0) {
-		otx2_err("Huge page is not configured");
-		goto fail_configure;
-	}
-
-	if (conf->dcb_capability_en == 1) {
-		otx2_err("dcb enable is not supported");
-		goto fail_configure;
-	}
-
-	if (conf->fdir_conf.mode != RTE_FDIR_MODE_NONE) {
-		otx2_err("Flow director is not supported");
-		goto fail_configure;
-	}
-
-	if (rxmode->mq_mode != RTE_ETH_MQ_RX_NONE &&
-	    rxmode->mq_mode != RTE_ETH_MQ_RX_RSS) {
-		otx2_err("Unsupported mq rx mode %d", rxmode->mq_mode);
-		goto fail_configure;
-	}
-
-	if (txmode->mq_mode != RTE_ETH_MQ_TX_NONE) {
-		otx2_err("Unsupported mq tx mode %d", txmode->mq_mode);
-		goto fail_configure;
-	}
-
-	if (otx2_dev_is_Ax(dev) &&
-	    (txmode->offloads & RTE_ETH_TX_OFFLOAD_SCTP_CKSUM) &&
-	    ((txmode->offloads & RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
-	    (txmode->offloads & RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM))) {
-		otx2_err("Outer IP and SCTP checksum unsupported");
-		goto fail_configure;
-	}
-
-	/* Free the resources allocated from the previous configure */
-	if (dev->configured == 1) {
-		otx2_eth_sec_fini(eth_dev);
-		otx2_nix_rxchan_bpid_cfg(eth_dev, false);
-		otx2_nix_vlan_fini(eth_dev);
-		otx2_nix_mc_addr_list_uninstall(eth_dev);
-		otx2_flow_free_all_resources(dev);
-		oxt2_nix_unregister_queue_irqs(eth_dev);
-		if (eth_dev->data->dev_conf.intr_conf.rxq)
-			oxt2_nix_unregister_cq_irqs(eth_dev);
-		nix_set_nop_rxtx_function(eth_dev);
-		rc = nix_store_queue_cfg_and_then_release(eth_dev);
-		if (rc)
-			goto fail_configure;
-		otx2_nix_tm_fini(eth_dev);
-		nix_lf_free(dev);
-	}
-
-	dev->rx_offloads = rxmode->offloads;
-	dev->tx_offloads = txmode->offloads;
-	dev->rx_offload_flags |= nix_rx_offload_flags(eth_dev);
-	dev->tx_offload_flags |= nix_tx_offload_flags(eth_dev);
-	dev->rss_info.rss_grps = NIX_RSS_GRPS;
-
-	nb_rxq = RTE_MAX(data->nb_rx_queues, 1);
-	nb_txq = RTE_MAX(data->nb_tx_queues, 1);
-
-	/* Alloc a nix lf */
-	rc = nix_lf_alloc(dev, nb_rxq, nb_txq);
-	if (rc) {
-		otx2_err("Failed to init nix_lf rc=%d", rc);
-		goto fail_offloads;
-	}
-
-	otx2_nix_err_intr_enb_dis(eth_dev, true);
-	otx2_nix_ras_intr_enb_dis(eth_dev, true);
-
-	if (dev->ptp_en &&
-	    dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
-		otx2_err("Both PTP and switch header enabled");
-		goto free_nix_lf;
-	}
-
-	rc = nix_lf_switch_header_type_enable(dev, true);
-	if (rc) {
-		otx2_err("Failed to enable switch type nix_lf rc=%d", rc);
-		goto free_nix_lf;
-	}
-
-	rc = nix_setup_lso_formats(dev);
-	if (rc) {
-		otx2_err("failed to setup nix lso format fields, rc=%d", rc);
-		goto free_nix_lf;
-	}
-
-	/* Configure RSS */
-	rc = otx2_nix_rss_config(eth_dev);
-	if (rc) {
-		otx2_err("Failed to configure rss rc=%d", rc);
-		goto free_nix_lf;
-	}
-
-	/* Init the default TM scheduler hierarchy */
-	rc = otx2_nix_tm_init_default(eth_dev);
-	if (rc) {
-		otx2_err("Failed to init traffic manager rc=%d", rc);
-		goto free_nix_lf;
-	}
-
-	rc = otx2_nix_vlan_offload_init(eth_dev);
-	if (rc) {
-		otx2_err("Failed to init vlan offload rc=%d", rc);
-		goto tm_fini;
-	}
-
-	/* Register queue IRQs */
-	rc = oxt2_nix_register_queue_irqs(eth_dev);
-	if (rc) {
-		otx2_err("Failed to register queue interrupts rc=%d", rc);
-		goto vlan_fini;
-	}
-
-	/* Register cq IRQs */
-	if (eth_dev->data->dev_conf.intr_conf.rxq) {
-		if (eth_dev->data->nb_rx_queues > dev->cints) {
-			otx2_err("Rx interrupt cannot be enabled, rxq > %d",
-				 dev->cints);
-			goto q_irq_fini;
-		}
-		/* Rx interrupt feature cannot work with vector mode because,
-		 * vector mode doesn't process packets unless min 4 pkts are
-		 * received, while cq interrupts are generated even for 1 pkt
-		 * in the CQ.
-		 */
-		dev->scalar_ena = true;
-
-		rc = oxt2_nix_register_cq_irqs(eth_dev);
-		if (rc) {
-			otx2_err("Failed to register CQ interrupts rc=%d", rc);
-			goto q_irq_fini;
-		}
-	}
-
-	/* Configure loop back mode */
-	rc = cgx_intlbk_enable(dev, eth_dev->data->dev_conf.lpbk_mode);
-	if (rc) {
-		otx2_err("Failed to configure cgx loop back mode rc=%d", rc);
-		goto cq_fini;
-	}
-
-	rc = otx2_nix_rxchan_bpid_cfg(eth_dev, true);
-	if (rc) {
-		otx2_err("Failed to configure nix rx chan bpid cfg rc=%d", rc);
-		goto cq_fini;
-	}
-
-	/* Enable security */
-	rc = otx2_eth_sec_init(eth_dev);
-	if (rc)
-		goto cq_fini;
-
-	rc = otx2_nix_flow_ctrl_init(eth_dev);
-	if (rc) {
-		otx2_err("Failed to init flow ctrl mode %d", rc);
-		goto cq_fini;
-	}
-
-	rc = otx2_nix_mc_addr_list_install(eth_dev);
-	if (rc < 0) {
-		otx2_err("Failed to install mc address list rc=%d", rc);
-		goto sec_fini;
-	}
-
-	/*
-	 * Restore queue config when reconfigure followed by
-	 * reconfigure and no queue configure invoked from application case.
-	 */
-	if (dev->configured == 1) {
-		rc = nix_restore_queue_cfg(eth_dev);
-		if (rc)
-			goto uninstall_mc_list;
-	}
-
-	/* Update the mac address */
-	ea = eth_dev->data->mac_addrs;
-	memcpy(ea, dev->mac_addr, RTE_ETHER_ADDR_LEN);
-	if (rte_is_zero_ether_addr(ea))
-		rte_eth_random_addr((uint8_t *)ea);
-
-	rte_ether_format_addr(ea_fmt, RTE_ETHER_ADDR_FMT_SIZE, ea);
-
-	/* Apply new link configurations if changed */
-	rc = otx2_apply_link_speed(eth_dev);
-	if (rc) {
-		otx2_err("Failed to set link configuration");
-		goto uninstall_mc_list;
-	}
-
-	otx2_nix_dbg("Configured port%d mac=%s nb_rxq=%d nb_txq=%d"
-		" rx_offloads=0x%" PRIx64 " tx_offloads=0x%" PRIx64 ""
-		" rx_flags=0x%x tx_flags=0x%x",
-		eth_dev->data->port_id, ea_fmt, nb_rxq,
-		nb_txq, dev->rx_offloads, dev->tx_offloads,
-		dev->rx_offload_flags, dev->tx_offload_flags);
-
-	/* All good */
-	dev->configured = 1;
-	dev->configured_nb_rx_qs = data->nb_rx_queues;
-	dev->configured_nb_tx_qs = data->nb_tx_queues;
-	return 0;
-
-uninstall_mc_list:
-	otx2_nix_mc_addr_list_uninstall(eth_dev);
-sec_fini:
-	otx2_eth_sec_fini(eth_dev);
-cq_fini:
-	oxt2_nix_unregister_cq_irqs(eth_dev);
-q_irq_fini:
-	oxt2_nix_unregister_queue_irqs(eth_dev);
-vlan_fini:
-	otx2_nix_vlan_fini(eth_dev);
-tm_fini:
-	otx2_nix_tm_fini(eth_dev);
-free_nix_lf:
-	nix_lf_free(dev);
-fail_offloads:
-	dev->rx_offload_flags &= ~nix_rx_offload_flags(eth_dev);
-	dev->tx_offload_flags &= ~nix_tx_offload_flags(eth_dev);
-fail_configure:
-	dev->configured = 0;
-	return rc;
-}
-
-int
-otx2_nix_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx)
-{
-	struct rte_eth_dev_data *data = eth_dev->data;
-	struct otx2_eth_txq *txq;
-	int rc = -EINVAL;
-
-	txq = eth_dev->data->tx_queues[qidx];
-
-	if (data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)
-		return 0;
-
-	rc = otx2_nix_sq_sqb_aura_fc(txq, true);
-	if (rc) {
-		otx2_err("Failed to enable sqb aura fc, txq=%u, rc=%d",
-			 qidx, rc);
-		goto done;
-	}
-
-	data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;
-
-done:
-	return rc;
-}
-
-int
-otx2_nix_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx)
-{
-	struct rte_eth_dev_data *data = eth_dev->data;
-	struct otx2_eth_txq *txq;
-	int rc;
-
-	txq = eth_dev->data->tx_queues[qidx];
-
-	if (data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STOPPED)
-		return 0;
-
-	txq->fc_cache_pkts = 0;
-
-	rc = otx2_nix_sq_sqb_aura_fc(txq, false);
-	if (rc) {
-		otx2_err("Failed to disable sqb aura fc, txq=%u, rc=%d",
-			 qidx, rc);
-		goto done;
-	}
-
-	data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
-
-done:
-	return rc;
-}
-
-static int
-otx2_nix_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx)
-{
-	struct otx2_eth_rxq *rxq = eth_dev->data->rx_queues[qidx];
-	struct rte_eth_dev_data *data = eth_dev->data;
-	int rc;
-
-	if (data->rx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)
-		return 0;
-
-	rc = nix_rq_enb_dis(rxq->eth_dev, rxq, true);
-	if (rc) {
-		otx2_err("Failed to enable rxq=%u, rc=%d", qidx, rc);
-		goto done;
-	}
-
-	data->rx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;
-
-done:
-	return rc;
-}
-
-static int
-otx2_nix_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx)
-{
-	struct otx2_eth_rxq *rxq = eth_dev->data->rx_queues[qidx];
-	struct rte_eth_dev_data *data = eth_dev->data;
-	int rc;
-
-	if (data->rx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STOPPED)
-		return 0;
-
-	rc = nix_rq_enb_dis(rxq->eth_dev, rxq, false);
-	if (rc) {
-		otx2_err("Failed to disable rxq=%u, rc=%d", qidx, rc);
-		goto done;
-	}
-
-	data->rx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
-
-done:
-	return rc;
-}
-
-static int
-otx2_nix_dev_stop(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_mbuf *rx_pkts[32];
-	struct otx2_eth_rxq *rxq;
-	struct rte_eth_link link;
-	int count, i, j, rc;
-
-	nix_lf_switch_header_type_enable(dev, false);
-	nix_cgx_stop_link_event(dev);
-	npc_rx_disable(dev);
-
-	/* Stop rx queues and free up pkts pending */
-	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-		rc = otx2_nix_rx_queue_stop(eth_dev, i);
-		if (rc)
-			continue;
-
-		rxq = eth_dev->data->rx_queues[i];
-		count = dev->rx_pkt_burst_no_offload(rxq, rx_pkts, 32);
-		while (count) {
-			for (j = 0; j < count; j++)
-				rte_pktmbuf_free(rx_pkts[j]);
-			count = dev->rx_pkt_burst_no_offload(rxq, rx_pkts, 32);
-		}
-	}
-
-	/* Stop tx queues  */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
-		otx2_nix_tx_queue_stop(eth_dev, i);
-
-	/* Bring down link status internally */
-	memset(&link, 0, sizeof(link));
-	rte_eth_linkstatus_set(eth_dev, &link);
-
-	return 0;
-}
-
-static int
-otx2_nix_dev_start(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc, i;
-
-	/* MTU recalculate should be avoided here if PTP is enabled by PF, as
-	 * otx2_nix_recalc_mtu would be invoked during otx2_nix_ptp_enable_vf
-	 * call below.
-	 */
-	if (eth_dev->data->nb_rx_queues != 0 && !otx2_ethdev_is_ptp_en(dev)) {
-		rc = otx2_nix_recalc_mtu(eth_dev);
-		if (rc)
-			return rc;
-	}
-
-	/* Start rx queues */
-	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-		rc = otx2_nix_rx_queue_start(eth_dev, i);
-		if (rc)
-			return rc;
-	}
-
-	/* Start tx queues  */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-		rc = otx2_nix_tx_queue_start(eth_dev, i);
-		if (rc)
-			return rc;
-	}
-
-	rc = otx2_nix_update_flow_ctrl_mode(eth_dev);
-	if (rc) {
-		otx2_err("Failed to update flow ctrl mode %d", rc);
-		return rc;
-	}
-
-	/* Enable PTP if it was requested by the app or if it is already
-	 * enabled in PF owning this VF
-	 */
-	memset(&dev->tstamp, 0, sizeof(struct otx2_timesync_info));
-	if ((dev->rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) ||
-	    otx2_ethdev_is_ptp_en(dev))
-		otx2_nix_timesync_enable(eth_dev);
-	else
-		otx2_nix_timesync_disable(eth_dev);
-
-	/* Update VF about data off shifted by 8 bytes if PTP already
-	 * enabled in PF owning this VF
-	 */
-	if (otx2_ethdev_is_ptp_en(dev) && otx2_dev_is_vf(dev))
-		otx2_nix_ptp_enable_vf(eth_dev);
-
-	if (dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F) {
-		rc = rte_mbuf_dyn_rx_timestamp_register(
-				&dev->tstamp.tstamp_dynfield_offset,
-				&dev->tstamp.rx_tstamp_dynflag);
-		if (rc != 0) {
-			otx2_err("Failed to register Rx timestamp field/flag");
-			return -rte_errno;
-		}
-	}
-
-	rc = npc_rx_enable(dev);
-	if (rc) {
-		otx2_err("Failed to enable NPC rx %d", rc);
-		return rc;
-	}
-
-	otx2_nix_toggle_flag_link_cfg(dev, true);
-
-	rc = nix_cgx_start_link_event(dev);
-	if (rc) {
-		otx2_err("Failed to start cgx link event %d", rc);
-		goto rx_disable;
-	}
-
-	otx2_nix_toggle_flag_link_cfg(dev, false);
-	otx2_eth_set_tx_function(eth_dev);
-	otx2_eth_set_rx_function(eth_dev);
-
-	return 0;
-
-rx_disable:
-	npc_rx_disable(dev);
-	otx2_nix_toggle_flag_link_cfg(dev, false);
-	return rc;
-}
-
-static int otx2_nix_dev_reset(struct rte_eth_dev *eth_dev);
-static int otx2_nix_dev_close(struct rte_eth_dev *eth_dev);
-
-/* Initialize and register driver with DPDK Application */
-static const struct eth_dev_ops otx2_eth_dev_ops = {
-	.dev_infos_get            = otx2_nix_info_get,
-	.dev_configure            = otx2_nix_configure,
-	.link_update              = otx2_nix_link_update,
-	.tx_queue_setup           = otx2_nix_tx_queue_setup,
-	.tx_queue_release         = otx2_nix_tx_queue_release,
-	.tm_ops_get               = otx2_nix_tm_ops_get,
-	.rx_queue_setup           = otx2_nix_rx_queue_setup,
-	.rx_queue_release         = otx2_nix_rx_queue_release,
-	.dev_start                = otx2_nix_dev_start,
-	.dev_stop                 = otx2_nix_dev_stop,
-	.dev_close                = otx2_nix_dev_close,
-	.tx_queue_start           = otx2_nix_tx_queue_start,
-	.tx_queue_stop            = otx2_nix_tx_queue_stop,
-	.rx_queue_start           = otx2_nix_rx_queue_start,
-	.rx_queue_stop            = otx2_nix_rx_queue_stop,
-	.dev_set_link_up          = otx2_nix_dev_set_link_up,
-	.dev_set_link_down        = otx2_nix_dev_set_link_down,
-	.dev_supported_ptypes_get = otx2_nix_supported_ptypes_get,
-	.dev_ptypes_set           = otx2_nix_ptypes_set,
-	.dev_reset                = otx2_nix_dev_reset,
-	.stats_get                = otx2_nix_dev_stats_get,
-	.stats_reset              = otx2_nix_dev_stats_reset,
-	.get_reg                  = otx2_nix_dev_get_reg,
-	.mtu_set                  = otx2_nix_mtu_set,
-	.mac_addr_add             = otx2_nix_mac_addr_add,
-	.mac_addr_remove          = otx2_nix_mac_addr_del,
-	.mac_addr_set             = otx2_nix_mac_addr_set,
-	.set_mc_addr_list         = otx2_nix_set_mc_addr_list,
-	.promiscuous_enable       = otx2_nix_promisc_enable,
-	.promiscuous_disable      = otx2_nix_promisc_disable,
-	.allmulticast_enable      = otx2_nix_allmulticast_enable,
-	.allmulticast_disable     = otx2_nix_allmulticast_disable,
-	.queue_stats_mapping_set  = otx2_nix_queue_stats_mapping,
-	.reta_update              = otx2_nix_dev_reta_update,
-	.reta_query               = otx2_nix_dev_reta_query,
-	.rss_hash_update          = otx2_nix_rss_hash_update,
-	.rss_hash_conf_get        = otx2_nix_rss_hash_conf_get,
-	.xstats_get               = otx2_nix_xstats_get,
-	.xstats_get_names         = otx2_nix_xstats_get_names,
-	.xstats_reset             = otx2_nix_xstats_reset,
-	.xstats_get_by_id         = otx2_nix_xstats_get_by_id,
-	.xstats_get_names_by_id   = otx2_nix_xstats_get_names_by_id,
-	.rxq_info_get             = otx2_nix_rxq_info_get,
-	.txq_info_get             = otx2_nix_txq_info_get,
-	.rx_burst_mode_get        = otx2_rx_burst_mode_get,
-	.tx_burst_mode_get        = otx2_tx_burst_mode_get,
-	.tx_done_cleanup          = otx2_nix_tx_done_cleanup,
-	.set_queue_rate_limit     = otx2_nix_tm_set_queue_rate_limit,
-	.pool_ops_supported       = otx2_nix_pool_ops_supported,
-	.flow_ops_get             = otx2_nix_dev_flow_ops_get,
-	.get_module_info          = otx2_nix_get_module_info,
-	.get_module_eeprom        = otx2_nix_get_module_eeprom,
-	.fw_version_get           = otx2_nix_fw_version_get,
-	.flow_ctrl_get            = otx2_nix_flow_ctrl_get,
-	.flow_ctrl_set            = otx2_nix_flow_ctrl_set,
-	.timesync_enable          = otx2_nix_timesync_enable,
-	.timesync_disable         = otx2_nix_timesync_disable,
-	.timesync_read_rx_timestamp = otx2_nix_timesync_read_rx_timestamp,
-	.timesync_read_tx_timestamp = otx2_nix_timesync_read_tx_timestamp,
-	.timesync_adjust_time     = otx2_nix_timesync_adjust_time,
-	.timesync_read_time       = otx2_nix_timesync_read_time,
-	.timesync_write_time      = otx2_nix_timesync_write_time,
-	.vlan_offload_set         = otx2_nix_vlan_offload_set,
-	.vlan_filter_set	  = otx2_nix_vlan_filter_set,
-	.vlan_strip_queue_set	  = otx2_nix_vlan_strip_queue_set,
-	.vlan_tpid_set		  = otx2_nix_vlan_tpid_set,
-	.vlan_pvid_set		  = otx2_nix_vlan_pvid_set,
-	.rx_queue_intr_enable	  = otx2_nix_rx_queue_intr_enable,
-	.rx_queue_intr_disable	  = otx2_nix_rx_queue_intr_disable,
-	.read_clock		  = otx2_nix_read_clock,
-};
-
-static inline int
-nix_lf_attach(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct rsrc_attach_req *req;
-
-	/* Attach NIX(lf) */
-	req = otx2_mbox_alloc_msg_attach_resources(mbox);
-	req->modify = true;
-	req->nixlf = true;
-
-	return otx2_mbox_process(mbox);
-}
-
-static inline int
-nix_lf_get_msix_offset(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct msix_offset_rsp *msix_rsp;
-	int rc;
-
-	/* Get NPA and NIX MSIX vector offsets */
-	otx2_mbox_alloc_msg_msix_offset(mbox);
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&msix_rsp);
-
-	dev->nix_msixoff = msix_rsp->nix_msixoff;
-
-	return rc;
-}
-
-static inline int
-otx2_eth_dev_lf_detach(struct otx2_mbox *mbox)
-{
-	struct rsrc_detach_req *req;
-
-	req = otx2_mbox_alloc_msg_detach_resources(mbox);
-
-	/* Detach all except npa lf */
-	req->partial = true;
-	req->nixlf = true;
-	req->sso = true;
-	req->ssow = true;
-	req->timlfs = true;
-	req->cptlfs = true;
-
-	return otx2_mbox_process(mbox);
-}
-
-static bool
-otx2_eth_dev_is_sdp(struct rte_pci_device *pci_dev)
-{
-	if (pci_dev->id.device_id == PCI_DEVID_OCTEONTX2_RVU_SDP_PF ||
-	    pci_dev->id.device_id == PCI_DEVID_OCTEONTX2_RVU_SDP_VF)
-		return true;
-	return false;
-}
-
-static inline uint64_t
-nix_get_blkaddr(struct otx2_eth_dev *dev)
-{
-	uint64_t reg;
-
-	/* Reading the discovery register to know which NIX is the LF
-	 * attached to.
-	 */
-	reg = otx2_read64(dev->bar2 +
-			  RVU_PF_BLOCK_ADDRX_DISC(RVU_BLOCK_ADDR_NIX0));
-
-	return reg & 0x1FFULL ? RVU_BLOCK_ADDR_NIX0 : RVU_BLOCK_ADDR_NIX1;
-}
-
-static int
-otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_pci_device *pci_dev;
-	int rc, max_entries;
-
-	eth_dev->dev_ops = &otx2_eth_dev_ops;
-	eth_dev->rx_queue_count = otx2_nix_rx_queue_count;
-	eth_dev->rx_descriptor_status = otx2_nix_rx_descriptor_status;
-	eth_dev->tx_descriptor_status = otx2_nix_tx_descriptor_status;
-
-	/* For secondary processes, the primary has done all the work */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
-		/* Setup callbacks for secondary process */
-		otx2_eth_set_tx_function(eth_dev);
-		otx2_eth_set_rx_function(eth_dev);
-		return 0;
-	}
-
-	pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-
-	rte_eth_copy_pci_info(eth_dev, pci_dev);
-	eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
-
-	/* Zero out everything after OTX2_DEV to allow proper dev_reset() */
-	memset(&dev->otx2_eth_dev_data_start, 0, sizeof(*dev) -
-		offsetof(struct otx2_eth_dev, otx2_eth_dev_data_start));
-
-	/* Parse devargs string */
-	rc = otx2_ethdev_parse_devargs(eth_dev->device->devargs, dev);
-	if (rc) {
-		otx2_err("Failed to parse devargs rc=%d", rc);
-		goto error;
-	}
-
-	if (!dev->mbox_active) {
-		/* Initialize the base otx2_dev object
-		 * only if already present
-		 */
-		rc = otx2_dev_init(pci_dev, dev);
-		if (rc) {
-			otx2_err("Failed to initialize otx2_dev rc=%d", rc);
-			goto error;
-		}
-	}
-	if (otx2_eth_dev_is_sdp(pci_dev))
-		dev->sdp_link = true;
-	else
-		dev->sdp_link = false;
-	/* Device generic callbacks */
-	dev->ops = &otx2_dev_ops;
-	dev->eth_dev = eth_dev;
-
-	/* Grab the NPA LF if required */
-	rc = otx2_npa_lf_init(pci_dev, dev);
-	if (rc)
-		goto otx2_dev_uninit;
-
-	dev->configured = 0;
-	dev->drv_inited = true;
-	dev->ptype_disable = 0;
-	dev->lmt_addr = dev->bar2 + (RVU_BLOCK_ADDR_LMT << 20);
-
-	/* Attach NIX LF */
-	rc = nix_lf_attach(dev);
-	if (rc)
-		goto otx2_npa_uninit;
-
-	dev->base = dev->bar2 + (nix_get_blkaddr(dev) << 20);
-
-	/* Get NIX MSIX offset */
-	rc = nix_lf_get_msix_offset(dev);
-	if (rc)
-		goto otx2_npa_uninit;
-
-	/* Register LF irq handlers */
-	rc = otx2_nix_register_irqs(eth_dev);
-	if (rc)
-		goto mbox_detach;
-
-	/* Get maximum number of supported MAC entries */
-	max_entries = otx2_cgx_mac_max_entries_get(dev);
-	if (max_entries < 0) {
-		otx2_err("Failed to get max entries for mac addr");
-		rc = -ENOTSUP;
-		goto unregister_irq;
-	}
-
-	/* For VFs, returned max_entries will be 0. But to keep default MAC
-	 * address, one entry must be allocated. So setting up to 1.
-	 */
-	if (max_entries == 0)
-		max_entries = 1;
-
-	eth_dev->data->mac_addrs = rte_zmalloc("mac_addr", max_entries *
-					       RTE_ETHER_ADDR_LEN, 0);
-	if (eth_dev->data->mac_addrs == NULL) {
-		otx2_err("Failed to allocate memory for mac addr");
-		rc = -ENOMEM;
-		goto unregister_irq;
-	}
-
-	dev->max_mac_entries = max_entries;
-
-	rc = otx2_nix_mac_addr_get(eth_dev, dev->mac_addr);
-	if (rc)
-		goto free_mac_addrs;
-
-	/* Update the mac address */
-	memcpy(eth_dev->data->mac_addrs, dev->mac_addr, RTE_ETHER_ADDR_LEN);
-
-	/* Also sync same MAC address to CGX table */
-	otx2_cgx_mac_addr_set(eth_dev, &eth_dev->data->mac_addrs[0]);
-
-	/* Initialize the tm data structures */
-	otx2_nix_tm_conf_init(eth_dev);
-
-	dev->tx_offload_capa = nix_get_tx_offload_capa(dev);
-	dev->rx_offload_capa = nix_get_rx_offload_capa(dev);
-
-	if (otx2_dev_is_96xx_A0(dev) ||
-	    otx2_dev_is_95xx_Ax(dev)) {
-		dev->hwcap |= OTX2_FIXUP_F_MIN_4K_Q;
-		dev->hwcap |= OTX2_FIXUP_F_LIMIT_CQ_FULL;
-	}
-
-	/* Create security ctx */
-	rc = otx2_eth_sec_ctx_create(eth_dev);
-	if (rc)
-		goto free_mac_addrs;
-	dev->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_SECURITY;
-	dev->rx_offload_capa |= RTE_ETH_RX_OFFLOAD_SECURITY;
-
-	/* Initialize rte-flow */
-	rc = otx2_flow_init(dev);
-	if (rc)
-		goto sec_ctx_destroy;
-
-	otx2_nix_mc_filter_init(dev);
-
-	otx2_nix_dbg("Port=%d pf=%d vf=%d ver=%s msix_off=%d hwcap=0x%" PRIx64
-		     " rxoffload_capa=0x%" PRIx64 " txoffload_capa=0x%" PRIx64,
-		     eth_dev->data->port_id, dev->pf, dev->vf,
-		     OTX2_ETH_DEV_PMD_VERSION, dev->nix_msixoff, dev->hwcap,
-		     dev->rx_offload_capa, dev->tx_offload_capa);
-	return 0;
-
-sec_ctx_destroy:
-	otx2_eth_sec_ctx_destroy(eth_dev);
-free_mac_addrs:
-	rte_free(eth_dev->data->mac_addrs);
-unregister_irq:
-	otx2_nix_unregister_irqs(eth_dev);
-mbox_detach:
-	otx2_eth_dev_lf_detach(dev->mbox);
-otx2_npa_uninit:
-	otx2_npa_lf_fini();
-otx2_dev_uninit:
-	otx2_dev_fini(pci_dev, dev);
-error:
-	otx2_err("Failed to init nix eth_dev rc=%d", rc);
-	return rc;
-}
-
-static int
-otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool mbox_close)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_pci_device *pci_dev;
-	int rc, i;
-
-	/* Nothing to be done for secondary processes */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	/* Clear the flag since we are closing down */
-	dev->configured = 0;
-
-	/* Disable nix bpid config */
-	otx2_nix_rxchan_bpid_cfg(eth_dev, false);
-
-	npc_rx_disable(dev);
-
-	/* Disable vlan offloads */
-	otx2_nix_vlan_fini(eth_dev);
-
-	/* Disable other rte_flow entries */
-	otx2_flow_fini(dev);
-
-	/* Free multicast filter list */
-	otx2_nix_mc_filter_fini(dev);
-
-	/* Disable PTP if already enabled */
-	if (otx2_ethdev_is_ptp_en(dev))
-		otx2_nix_timesync_disable(eth_dev);
-
-	nix_cgx_stop_link_event(dev);
-
-	/* Unregister the dev ops, this is required to stop VFs from
-	 * receiving link status updates on exit path.
-	 */
-	dev->ops = NULL;
-
-	/* Free up SQs */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
-		otx2_nix_tx_queue_release(eth_dev, i);
-	eth_dev->data->nb_tx_queues = 0;
-
-	/* Free up RQ's and CQ's */
-	for (i = 0; i < eth_dev->data->nb_rx_queues; i++)
-		otx2_nix_rx_queue_release(eth_dev, i);
-	eth_dev->data->nb_rx_queues = 0;
-
-	/* Free tm resources */
-	rc = otx2_nix_tm_fini(eth_dev);
-	if (rc)
-		otx2_err("Failed to cleanup tm, rc=%d", rc);
-
-	/* Unregister queue irqs */
-	oxt2_nix_unregister_queue_irqs(eth_dev);
-
-	/* Unregister cq irqs */
-	if (eth_dev->data->dev_conf.intr_conf.rxq)
-		oxt2_nix_unregister_cq_irqs(eth_dev);
-
-	rc = nix_lf_free(dev);
-	if (rc)
-		otx2_err("Failed to free nix lf, rc=%d", rc);
-
-	rc = otx2_npa_lf_fini();
-	if (rc)
-		otx2_err("Failed to cleanup npa lf, rc=%d", rc);
-
-	/* Disable security */
-	otx2_eth_sec_fini(eth_dev);
-
-	/* Destroy security ctx */
-	otx2_eth_sec_ctx_destroy(eth_dev);
-
-	rte_free(eth_dev->data->mac_addrs);
-	eth_dev->data->mac_addrs = NULL;
-	dev->drv_inited = false;
-
-	pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	otx2_nix_unregister_irqs(eth_dev);
-
-	rc = otx2_eth_dev_lf_detach(dev->mbox);
-	if (rc)
-		otx2_err("Failed to detach resources, rc=%d", rc);
-
-	/* Check if mbox close is needed */
-	if (!mbox_close)
-		return 0;
-
-	if (otx2_npa_lf_active(dev) || otx2_dev_active_vfs(dev)) {
-		/* Will be freed later by PMD */
-		eth_dev->data->dev_private = NULL;
-		return 0;
-	}
-
-	otx2_dev_fini(pci_dev, dev);
-	return 0;
-}
-
-static int
-otx2_nix_dev_close(struct rte_eth_dev *eth_dev)
-{
-	otx2_eth_dev_uninit(eth_dev, true);
-	return 0;
-}
-
-static int
-otx2_nix_dev_reset(struct rte_eth_dev *eth_dev)
-{
-	int rc;
-
-	rc = otx2_eth_dev_uninit(eth_dev, false);
-	if (rc)
-		return rc;
-
-	return otx2_eth_dev_init(eth_dev);
-}
-
-static int
-nix_remove(struct rte_pci_device *pci_dev)
-{
-	struct rte_eth_dev *eth_dev;
-	struct otx2_idev_cfg *idev;
-	struct otx2_dev *otx2_dev;
-	int rc;
-
-	eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
-	if (eth_dev) {
-		/* Cleanup eth dev */
-		rc = otx2_eth_dev_uninit(eth_dev, true);
-		if (rc)
-			return rc;
-
-		rte_eth_dev_release_port(eth_dev);
-	}
-
-	/* Nothing to be done for secondary processes */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY)
-		return 0;
-
-	/* Check for common resources */
-	idev = otx2_intra_dev_get_cfg();
-	if (!idev || !idev->npa_lf || idev->npa_lf->pci_dev != pci_dev)
-		return 0;
-
-	otx2_dev = container_of(idev->npa_lf, struct otx2_dev, npalf);
-
-	if (otx2_npa_lf_active(otx2_dev) || otx2_dev_active_vfs(otx2_dev))
-		goto exit;
-
-	/* Safe to cleanup mbox as no more users */
-	otx2_dev_fini(pci_dev, otx2_dev);
-	rte_free(otx2_dev);
-	return 0;
-
-exit:
-	otx2_info("%s: common resource in use by other devices", pci_dev->name);
-	return -EAGAIN;
-}
-
-static int
-nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
-{
-	int rc;
-
-	RTE_SET_USED(pci_drv);
-
-	rc = rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct otx2_eth_dev),
-					   otx2_eth_dev_init);
-
-	/* On error on secondary, recheck if port exists in primary or
-	 * in mid of detach state.
-	 */
-	if (rte_eal_process_type() != RTE_PROC_PRIMARY && rc)
-		if (!rte_eth_dev_allocated(pci_dev->device.name))
-			return 0;
-	return rc;
-}
-
-static const struct rte_pci_id pci_nix_map[] = {
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX2_RVU_PF)
-	},
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX2_RVU_VF)
-	},
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
-			       PCI_DEVID_OCTEONTX2_RVU_AF_VF)
-	},
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
-			       PCI_DEVID_OCTEONTX2_RVU_SDP_PF)
-	},
-	{
-		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
-			       PCI_DEVID_OCTEONTX2_RVU_SDP_VF)
-	},
-	{
-		.vendor_id = 0,
-	},
-};
-
-static struct rte_pci_driver pci_nix = {
-	.id_table = pci_nix_map,
-	.drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_NEED_IOVA_AS_VA |
-			RTE_PCI_DRV_INTR_LSC,
-	.probe = nix_probe,
-	.remove = nix_remove,
-};
-
-RTE_PMD_REGISTER_PCI(OCTEONTX2_PMD, pci_nix);
-RTE_PMD_REGISTER_PCI_TABLE(OCTEONTX2_PMD, pci_nix_map);
-RTE_PMD_REGISTER_KMOD_DEP(OCTEONTX2_PMD, "vfio-pci");
diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
deleted file mode 100644
index a5282c6c12..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ /dev/null
@@ -1,619 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_ETHDEV_H__
-#define __OTX2_ETHDEV_H__
-
-#include <math.h>
-#include <stdint.h>
-
-#include <rte_common.h>
-#include <rte_ethdev.h>
-#include <rte_kvargs.h>
-#include <rte_mbuf.h>
-#include <rte_mempool.h>
-#include <rte_security_driver.h>
-#include <rte_spinlock.h>
-#include <rte_string_fns.h>
-#include <rte_time.h>
-
-#include "otx2_common.h"
-#include "otx2_dev.h"
-#include "otx2_flow.h"
-#include "otx2_irq.h"
-#include "otx2_mempool.h"
-#include "otx2_rx.h"
-#include "otx2_tm.h"
-#include "otx2_tx.h"
-
-#define OTX2_ETH_DEV_PMD_VERSION	"1.0"
-
-/* Ethdev HWCAP and Fixup flags. Use from MSB bits to avoid conflict with dev */
-
-/* Minimum CQ size should be 4K */
-#define OTX2_FIXUP_F_MIN_4K_Q		BIT_ULL(63)
-#define otx2_ethdev_fixup_is_min_4k_q(dev)	\
-				((dev)->hwcap & OTX2_FIXUP_F_MIN_4K_Q)
-/* Limit CQ being full */
-#define OTX2_FIXUP_F_LIMIT_CQ_FULL	BIT_ULL(62)
-#define otx2_ethdev_fixup_is_limit_cq_full(dev) \
-				((dev)->hwcap & OTX2_FIXUP_F_LIMIT_CQ_FULL)
-
-/* Used for struct otx2_eth_dev::flags */
-#define OTX2_LINK_CFG_IN_PROGRESS_F	BIT_ULL(0)
-
-/* VLAN tag inserted by NIX_TX_VTAG_ACTION.
- * In Tx space is always reserved for this in FRS.
- */
-#define NIX_MAX_VTAG_INS		2
-#define NIX_MAX_VTAG_ACT_SIZE		(4 * NIX_MAX_VTAG_INS)
-
-/* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */
-#define NIX_L2_OVERHEAD \
-	(RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 8)
-#define NIX_L2_MAX_LEN \
-	(RTE_ETHER_MTU + NIX_L2_OVERHEAD)
-
-/* HW config of frame size doesn't include FCS */
-#define NIX_MAX_HW_FRS			9212
-#define NIX_MIN_HW_FRS			60
-
-/* Since HW FRS includes NPC VTAG insertion space, user has reduced FRS */
-#define NIX_MAX_FRS	\
-	(NIX_MAX_HW_FRS + RTE_ETHER_CRC_LEN - NIX_MAX_VTAG_ACT_SIZE)
-
-#define NIX_MIN_FRS	\
-	(NIX_MIN_HW_FRS + RTE_ETHER_CRC_LEN)
-
-#define NIX_MAX_MTU	\
-	(NIX_MAX_FRS - NIX_L2_OVERHEAD)
-
-#define NIX_MAX_SQB			512
-#define NIX_DEF_SQB			16
-#define NIX_MIN_SQB			8
-#define NIX_SQB_LIST_SPACE		2
-#define NIX_RSS_RETA_SIZE_MAX		256
-/* Group 0 will be used for RSS, 1 -7 will be used for rte_flow RSS action*/
-#define NIX_RSS_GRPS			8
-#define NIX_HASH_KEY_SIZE		48 /* 352 Bits */
-#define NIX_RSS_RETA_SIZE		64
-#define	NIX_RX_MIN_DESC			16
-#define NIX_RX_MIN_DESC_ALIGN		16
-#define NIX_RX_NB_SEG_MAX		6
-#define NIX_CQ_ENTRY_SZ			128
-#define NIX_CQ_ALIGN			512
-#define NIX_SQB_LOWER_THRESH		70
-#define LMT_SLOT_MASK			0x7f
-#define NIX_RX_DEFAULT_RING_SZ		4096
-
-/* If PTP is enabled additional SEND MEM DESC is required which
- * takes 2 words, hence max 7 iova address are possible
- */
-#if defined(RTE_LIBRTE_IEEE1588)
-#define NIX_TX_NB_SEG_MAX		7
-#else
-#define NIX_TX_NB_SEG_MAX		9
-#endif
-
-#define NIX_TX_MSEG_SG_DWORDS				\
-	((RTE_ALIGN_MUL_CEIL(NIX_TX_NB_SEG_MAX, 3) / 3)	\
-	 + NIX_TX_NB_SEG_MAX)
-
-/* Apply BP/DROP when CQ is 95% full */
-#define NIX_CQ_THRESH_LEVEL	(5 * 256 / 100)
-#define NIX_CQ_FULL_ERRATA_SKID	(1024ull * 256)
-
-#define CQ_OP_STAT_OP_ERR	63
-#define CQ_OP_STAT_CQ_ERR	46
-
-#define OP_ERR			BIT_ULL(CQ_OP_STAT_OP_ERR)
-#define CQ_ERR			BIT_ULL(CQ_OP_STAT_CQ_ERR)
-
-#define CQ_CQE_THRESH_DEFAULT	0x1ULL /* IRQ triggered when
-					* NIX_LF_CINTX_CNT[QCOUNT]
-					* crosses this value
-					*/
-#define CQ_TIMER_THRESH_DEFAULT	0xAULL /* ~1usec i.e (0xA * 100nsec) */
-#define CQ_TIMER_THRESH_MAX     255
-
-#define NIX_RSS_L3_L4_SRC_DST  (RTE_ETH_RSS_L3_SRC_ONLY | RTE_ETH_RSS_L3_DST_ONLY \
-				| RTE_ETH_RSS_L4_SRC_ONLY | RTE_ETH_RSS_L4_DST_ONLY)
-
-#define NIX_RSS_OFFLOAD		(RTE_ETH_RSS_PORT | RTE_ETH_RSS_IP | RTE_ETH_RSS_UDP |\
-				 RTE_ETH_RSS_TCP | RTE_ETH_RSS_SCTP | \
-				 RTE_ETH_RSS_TUNNEL | RTE_ETH_RSS_L2_PAYLOAD | \
-				 NIX_RSS_L3_L4_SRC_DST | RTE_ETH_RSS_LEVEL_MASK | \
-				 RTE_ETH_RSS_C_VLAN)
-
-#define NIX_TX_OFFLOAD_CAPA ( \
-	RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE	| \
-	RTE_ETH_TX_OFFLOAD_MT_LOCKFREE	| \
-	RTE_ETH_TX_OFFLOAD_VLAN_INSERT	| \
-	RTE_ETH_TX_OFFLOAD_QINQ_INSERT	| \
-	RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM	| \
-	RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM	| \
-	RTE_ETH_TX_OFFLOAD_TCP_CKSUM	| \
-	RTE_ETH_TX_OFFLOAD_UDP_CKSUM	| \
-	RTE_ETH_TX_OFFLOAD_SCTP_CKSUM	| \
-	RTE_ETH_TX_OFFLOAD_TCP_TSO		| \
-	RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO    | \
-	RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO   | \
-	RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO	| \
-	RTE_ETH_TX_OFFLOAD_MULTI_SEGS	| \
-	RTE_ETH_TX_OFFLOAD_IPV4_CKSUM)
-
-#define NIX_RX_OFFLOAD_CAPA ( \
-	RTE_ETH_RX_OFFLOAD_CHECKSUM		| \
-	RTE_ETH_RX_OFFLOAD_SCTP_CKSUM	| \
-	RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM | \
-	RTE_ETH_RX_OFFLOAD_SCATTER		| \
-	RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM	| \
-	RTE_ETH_RX_OFFLOAD_VLAN_STRIP	| \
-	RTE_ETH_RX_OFFLOAD_VLAN_FILTER	| \
-	RTE_ETH_RX_OFFLOAD_QINQ_STRIP	| \
-	RTE_ETH_RX_OFFLOAD_TIMESTAMP	| \
-	RTE_ETH_RX_OFFLOAD_RSS_HASH)
-
-#define NIX_DEFAULT_RSS_CTX_GROUP  0
-#define NIX_DEFAULT_RSS_MCAM_IDX  -1
-
-#define otx2_ethdev_is_ptp_en(dev)	((dev)->ptp_en)
-
-#define NIX_TIMESYNC_TX_CMD_LEN		8
-/* Additional timesync values. */
-#define OTX2_CYCLECOUNTER_MASK   0xffffffffffffffffULL
-
-#define OCTEONTX2_PMD			net_octeontx2
-
-#define otx2_ethdev_is_same_driver(dev) \
-	(strcmp((dev)->device->driver->name, RTE_STR(OCTEONTX2_PMD)) == 0)
-
-enum nix_q_size_e {
-	nix_q_size_16,	/* 16 entries */
-	nix_q_size_64,	/* 64 entries */
-	nix_q_size_256,
-	nix_q_size_1K,
-	nix_q_size_4K,
-	nix_q_size_16K,
-	nix_q_size_64K,
-	nix_q_size_256K,
-	nix_q_size_1M,	/* Million entries */
-	nix_q_size_max
-};
-
-enum nix_lso_tun_type {
-	NIX_LSO_TUN_V4V4,
-	NIX_LSO_TUN_V4V6,
-	NIX_LSO_TUN_V6V4,
-	NIX_LSO_TUN_V6V6,
-	NIX_LSO_TUN_MAX,
-};
-
-struct otx2_qint {
-	struct rte_eth_dev *eth_dev;
-	uint8_t qintx;
-};
-
-struct otx2_rss_info {
-	uint64_t nix_rss;
-	uint32_t flowkey_cfg;
-	uint16_t rss_size;
-	uint8_t rss_grps;
-	uint8_t alg_idx; /* Selected algo index */
-	uint16_t ind_tbl[NIX_RSS_RETA_SIZE_MAX];
-	uint8_t key[NIX_HASH_KEY_SIZE];
-};
-
-struct otx2_eth_qconf {
-	union {
-		struct rte_eth_txconf tx;
-		struct rte_eth_rxconf rx;
-	} conf;
-	void *mempool;
-	uint32_t socket_id;
-	uint16_t nb_desc;
-	uint8_t valid;
-};
-
-struct otx2_fc_info {
-	enum rte_eth_fc_mode mode;  /**< Link flow control mode */
-	uint8_t rx_pause;
-	uint8_t tx_pause;
-	uint8_t chan_cnt;
-	uint16_t bpid[NIX_MAX_CHAN];
-};
-
-struct vlan_mkex_info {
-	struct npc_xtract_info la_xtract;
-	struct npc_xtract_info lb_xtract;
-	uint64_t lb_lt_offset;
-};
-
-struct mcast_entry {
-	struct rte_ether_addr mcast_mac;
-	uint16_t mcam_index;
-	TAILQ_ENTRY(mcast_entry) next;
-};
-
-TAILQ_HEAD(otx2_nix_mc_filter_tbl, mcast_entry);
-
-struct vlan_entry {
-	uint32_t mcam_idx;
-	uint16_t vlan_id;
-	TAILQ_ENTRY(vlan_entry) next;
-};
-
-TAILQ_HEAD(otx2_vlan_filter_tbl, vlan_entry);
-
-struct otx2_vlan_info {
-	struct otx2_vlan_filter_tbl fltr_tbl;
-	/* MKEX layer info */
-	struct mcam_entry def_tx_mcam_ent;
-	struct mcam_entry def_rx_mcam_ent;
-	struct vlan_mkex_info mkex;
-	/* Default mcam entry that matches vlan packets */
-	uint32_t def_rx_mcam_idx;
-	uint32_t def_tx_mcam_idx;
-	/* MCAM entry that matches double vlan packets */
-	uint32_t qinq_mcam_idx;
-	/* Indices of tx_vtag def registers */
-	uint32_t outer_vlan_idx;
-	uint32_t inner_vlan_idx;
-	uint16_t outer_vlan_tpid;
-	uint16_t inner_vlan_tpid;
-	uint16_t pvid;
-	/* QinQ entry allocated before default one */
-	uint8_t qinq_before_def;
-	uint8_t pvid_insert_on;
-	/* Rx vtag action type */
-	uint8_t vtag_type_idx;
-	uint8_t filter_on;
-	uint8_t strip_on;
-	uint8_t qinq_on;
-	uint8_t promisc_on;
-};
-
-struct otx2_eth_dev {
-	OTX2_DEV; /* Base class */
-	RTE_MARKER otx2_eth_dev_data_start;
-	uint16_t sqb_size;
-	uint16_t rx_chan_base;
-	uint16_t tx_chan_base;
-	uint8_t rx_chan_cnt;
-	uint8_t tx_chan_cnt;
-	uint8_t lso_tsov4_idx;
-	uint8_t lso_tsov6_idx;
-	uint8_t lso_udp_tun_idx[NIX_LSO_TUN_MAX];
-	uint8_t lso_tun_idx[NIX_LSO_TUN_MAX];
-	uint64_t lso_tun_fmt;
-	uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
-	uint8_t mkex_pfl_name[MKEX_NAME_LEN];
-	uint8_t max_mac_entries;
-	bool dmac_filter_enable;
-	uint8_t lf_tx_stats;
-	uint8_t lf_rx_stats;
-	uint8_t lock_rx_ctx;
-	uint8_t lock_tx_ctx;
-	uint16_t flags;
-	uint16_t cints;
-	uint16_t qints;
-	uint8_t configured;
-	uint8_t configured_qints;
-	uint8_t configured_cints;
-	uint8_t configured_nb_rx_qs;
-	uint8_t configured_nb_tx_qs;
-	uint8_t ptype_disable;
-	uint16_t nix_msixoff;
-	uintptr_t base;
-	uintptr_t lmt_addr;
-	uint16_t scalar_ena;
-	uint16_t rss_tag_as_xor;
-	uint16_t max_sqb_count;
-	uint16_t rx_offload_flags; /* Selected Rx offload flags(NIX_RX_*_F) */
-	uint64_t rx_offloads;
-	uint16_t tx_offload_flags; /* Selected Tx offload flags(NIX_TX_*_F) */
-	uint64_t tx_offloads;
-	uint64_t rx_offload_capa;
-	uint64_t tx_offload_capa;
-	struct otx2_qint qints_mem[RTE_MAX_QUEUES_PER_PORT];
-	struct otx2_qint cints_mem[RTE_MAX_QUEUES_PER_PORT];
-	uint16_t txschq[NIX_TXSCH_LVL_CNT];
-	uint16_t txschq_contig[NIX_TXSCH_LVL_CNT];
-	uint16_t txschq_index[NIX_TXSCH_LVL_CNT];
-	uint16_t txschq_contig_index[NIX_TXSCH_LVL_CNT];
-	/* Dis-contiguous queues */
-	uint16_t txschq_list[NIX_TXSCH_LVL_CNT][MAX_TXSCHQ_PER_FUNC];
-	/* Contiguous queues */
-	uint16_t txschq_contig_list[NIX_TXSCH_LVL_CNT][MAX_TXSCHQ_PER_FUNC];
-	uint16_t otx2_tm_root_lvl;
-	uint16_t link_cfg_lvl;
-	uint16_t tm_flags;
-	uint16_t tm_leaf_cnt;
-	uint64_t tm_rate_min;
-	struct otx2_nix_tm_node_list node_list;
-	struct otx2_nix_tm_shaper_profile_list shaper_profile_list;
-	struct otx2_rss_info rss_info;
-	struct otx2_fc_info fc_info;
-	uint32_t txmap[RTE_ETHDEV_QUEUE_STAT_CNTRS];
-	uint32_t rxmap[RTE_ETHDEV_QUEUE_STAT_CNTRS];
-	struct otx2_npc_flow_info npc_flow;
-	struct otx2_vlan_info vlan_info;
-	struct otx2_eth_qconf *tx_qconf;
-	struct otx2_eth_qconf *rx_qconf;
-	struct rte_eth_dev *eth_dev;
-	eth_rx_burst_t rx_pkt_burst_no_offload;
-	/* PTP counters */
-	bool ptp_en;
-	struct otx2_timesync_info tstamp;
-	struct rte_timecounter  systime_tc;
-	struct rte_timecounter  rx_tstamp_tc;
-	struct rte_timecounter  tx_tstamp_tc;
-	double clk_freq_mult;
-	uint64_t clk_delta;
-	bool mc_tbl_set;
-	struct otx2_nix_mc_filter_tbl mc_fltr_tbl;
-	bool sdp_link; /* SDP flag */
-	/* Inline IPsec params */
-	uint16_t ipsec_in_max_spi;
-	rte_spinlock_t ipsec_tbl_lock;
-	uint8_t duplex;
-	uint32_t speed;
-} __rte_cache_aligned;
-
-struct otx2_eth_txq {
-	uint64_t cmd[8];
-	int64_t fc_cache_pkts;
-	uint64_t *fc_mem;
-	void *lmt_addr;
-	rte_iova_t io_addr;
-	rte_iova_t fc_iova;
-	uint16_t sqes_per_sqb_log2;
-	int16_t nb_sqb_bufs_adj;
-	uint64_t lso_tun_fmt;
-	RTE_MARKER slow_path_start;
-	uint16_t nb_sqb_bufs;
-	uint16_t sq;
-	uint64_t offloads;
-	struct otx2_eth_dev *dev;
-	struct rte_mempool *sqb_pool;
-	struct otx2_eth_qconf qconf;
-} __rte_cache_aligned;
-
-struct otx2_eth_rxq {
-	uint64_t mbuf_initializer;
-	uint64_t data_off;
-	uintptr_t desc;
-	void *lookup_mem;
-	uintptr_t cq_door;
-	uint64_t wdata;
-	int64_t *cq_status;
-	uint32_t head;
-	uint32_t qmask;
-	uint32_t available;
-	uint16_t rq;
-	struct otx2_timesync_info *tstamp;
-	RTE_MARKER slow_path_start;
-	uint64_t aura;
-	uint64_t offloads;
-	uint32_t qlen;
-	struct rte_mempool *pool;
-	enum nix_q_size_e qsize;
-	struct rte_eth_dev *eth_dev;
-	struct otx2_eth_qconf qconf;
-	uint16_t cq_drop;
-} __rte_cache_aligned;
-
-static inline struct otx2_eth_dev *
-otx2_eth_pmd_priv(struct rte_eth_dev *eth_dev)
-{
-	return eth_dev->data->dev_private;
-}
-
-/* Ops */
-int otx2_nix_info_get(struct rte_eth_dev *eth_dev,
-		      struct rte_eth_dev_info *dev_info);
-int otx2_nix_dev_flow_ops_get(struct rte_eth_dev *eth_dev,
-			      const struct rte_flow_ops **ops);
-int otx2_nix_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
-			    size_t fw_size);
-int otx2_nix_get_module_info(struct rte_eth_dev *eth_dev,
-			     struct rte_eth_dev_module_info *modinfo);
-int otx2_nix_get_module_eeprom(struct rte_eth_dev *eth_dev,
-			       struct rte_dev_eeprom_info *info);
-int otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool);
-void otx2_nix_rxq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
-			   struct rte_eth_rxq_info *qinfo);
-void otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
-			   struct rte_eth_txq_info *qinfo);
-int otx2_rx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
-			   struct rte_eth_burst_mode *mode);
-int otx2_tx_burst_mode_get(struct rte_eth_dev *dev, uint16_t queue_id,
-			   struct rte_eth_burst_mode *mode);
-uint32_t otx2_nix_rx_queue_count(void *rx_queue);
-int otx2_nix_tx_done_cleanup(void *txq, uint32_t free_cnt);
-int otx2_nix_rx_descriptor_status(void *rx_queue, uint16_t offset);
-int otx2_nix_tx_descriptor_status(void *tx_queue, uint16_t offset);
-
-void otx2_nix_promisc_config(struct rte_eth_dev *eth_dev, int en);
-int otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev);
-int otx2_nix_promisc_disable(struct rte_eth_dev *eth_dev);
-int otx2_nix_allmulticast_enable(struct rte_eth_dev *eth_dev);
-int otx2_nix_allmulticast_disable(struct rte_eth_dev *eth_dev);
-int otx2_nix_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx);
-int otx2_nix_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx);
-uint64_t otx2_nix_rxq_mbuf_setup(struct otx2_eth_dev *dev, uint16_t port_id);
-
-/* Multicast filter APIs */
-void otx2_nix_mc_filter_init(struct otx2_eth_dev *dev);
-void otx2_nix_mc_filter_fini(struct otx2_eth_dev *dev);
-int otx2_nix_mc_addr_list_install(struct rte_eth_dev *eth_dev);
-int otx2_nix_mc_addr_list_uninstall(struct rte_eth_dev *eth_dev);
-int otx2_nix_set_mc_addr_list(struct rte_eth_dev *eth_dev,
-			      struct rte_ether_addr *mc_addr_set,
-			      uint32_t nb_mc_addr);
-
-/* MTU */
-int otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu);
-int otx2_nix_recalc_mtu(struct rte_eth_dev *eth_dev);
-void otx2_nix_enable_mseg_on_jumbo(struct otx2_eth_rxq *rxq);
-
-
-/* Link */
-void otx2_nix_toggle_flag_link_cfg(struct otx2_eth_dev *dev, bool set);
-int otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete);
-void otx2_eth_dev_link_status_update(struct otx2_dev *dev,
-				     struct cgx_link_user_info *link);
-void otx2_eth_dev_link_status_get(struct otx2_dev *dev,
-				  struct cgx_link_user_info *link);
-int otx2_nix_dev_set_link_up(struct rte_eth_dev *eth_dev);
-int otx2_nix_dev_set_link_down(struct rte_eth_dev *eth_dev);
-int otx2_apply_link_speed(struct rte_eth_dev *eth_dev);
-
-/* IRQ */
-int otx2_nix_register_irqs(struct rte_eth_dev *eth_dev);
-int oxt2_nix_register_queue_irqs(struct rte_eth_dev *eth_dev);
-int oxt2_nix_register_cq_irqs(struct rte_eth_dev *eth_dev);
-void otx2_nix_unregister_irqs(struct rte_eth_dev *eth_dev);
-void oxt2_nix_unregister_queue_irqs(struct rte_eth_dev *eth_dev);
-void oxt2_nix_unregister_cq_irqs(struct rte_eth_dev *eth_dev);
-void otx2_nix_err_intr_enb_dis(struct rte_eth_dev *eth_dev, bool enb);
-void otx2_nix_ras_intr_enb_dis(struct rte_eth_dev *eth_dev, bool enb);
-
-int otx2_nix_rx_queue_intr_enable(struct rte_eth_dev *eth_dev,
-				  uint16_t rx_queue_id);
-int otx2_nix_rx_queue_intr_disable(struct rte_eth_dev *eth_dev,
-				   uint16_t rx_queue_id);
-
-/* Debug */
-int otx2_nix_reg_dump(struct otx2_eth_dev *dev, uint64_t *data);
-int otx2_nix_dev_get_reg(struct rte_eth_dev *eth_dev,
-			 struct rte_dev_reg_info *regs);
-int otx2_nix_queues_ctx_dump(struct rte_eth_dev *eth_dev);
-void otx2_nix_cqe_dump(const struct nix_cqe_hdr_s *cq);
-void otx2_nix_tm_dump(struct otx2_eth_dev *dev);
-
-/* Stats */
-int otx2_nix_dev_stats_get(struct rte_eth_dev *eth_dev,
-			   struct rte_eth_stats *stats);
-int otx2_nix_dev_stats_reset(struct rte_eth_dev *eth_dev);
-
-int otx2_nix_queue_stats_mapping(struct rte_eth_dev *dev,
-				 uint16_t queue_id, uint8_t stat_idx,
-				 uint8_t is_rx);
-int otx2_nix_xstats_get(struct rte_eth_dev *eth_dev,
-			struct rte_eth_xstat *xstats, unsigned int n);
-int otx2_nix_xstats_get_names(struct rte_eth_dev *eth_dev,
-			      struct rte_eth_xstat_name *xstats_names,
-			      unsigned int limit);
-int otx2_nix_xstats_reset(struct rte_eth_dev *eth_dev);
-
-int otx2_nix_xstats_get_by_id(struct rte_eth_dev *eth_dev,
-			      const uint64_t *ids,
-			      uint64_t *values, unsigned int n);
-int otx2_nix_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,
-				    const uint64_t *ids,
-				    struct rte_eth_xstat_name *xstats_names,
-				    unsigned int limit);
-
-/* RSS */
-void otx2_nix_rss_set_key(struct otx2_eth_dev *dev,
-			  uint8_t *key, uint32_t key_len);
-uint32_t otx2_rss_ethdev_to_nix(struct otx2_eth_dev *dev,
-				uint64_t ethdev_rss, uint8_t rss_level);
-int otx2_rss_set_hf(struct otx2_eth_dev *dev,
-		    uint32_t flowkey_cfg, uint8_t *alg_idx,
-		    uint8_t group, int mcam_index);
-int otx2_nix_rss_tbl_init(struct otx2_eth_dev *dev, uint8_t group,
-			  uint16_t *ind_tbl);
-int otx2_nix_rss_config(struct rte_eth_dev *eth_dev);
-
-int otx2_nix_dev_reta_update(struct rte_eth_dev *eth_dev,
-			     struct rte_eth_rss_reta_entry64 *reta_conf,
-			     uint16_t reta_size);
-int otx2_nix_dev_reta_query(struct rte_eth_dev *eth_dev,
-			    struct rte_eth_rss_reta_entry64 *reta_conf,
-			    uint16_t reta_size);
-int otx2_nix_rss_hash_update(struct rte_eth_dev *eth_dev,
-			     struct rte_eth_rss_conf *rss_conf);
-
-int otx2_nix_rss_hash_conf_get(struct rte_eth_dev *eth_dev,
-			       struct rte_eth_rss_conf *rss_conf);
-
-/* CGX */
-int otx2_cgx_rxtx_start(struct otx2_eth_dev *dev);
-int otx2_cgx_rxtx_stop(struct otx2_eth_dev *dev);
-int otx2_cgx_mac_addr_set(struct rte_eth_dev *eth_dev,
-			  struct rte_ether_addr *addr);
-
-/* Flow Control */
-int otx2_nix_flow_ctrl_init(struct rte_eth_dev *eth_dev);
-
-int otx2_nix_flow_ctrl_get(struct rte_eth_dev *eth_dev,
-			   struct rte_eth_fc_conf *fc_conf);
-
-int otx2_nix_flow_ctrl_set(struct rte_eth_dev *eth_dev,
-			   struct rte_eth_fc_conf *fc_conf);
-
-int otx2_nix_rxchan_bpid_cfg(struct rte_eth_dev *eth_dev, bool enb);
-
-int otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev);
-
-/* VLAN */
-int otx2_nix_vlan_offload_init(struct rte_eth_dev *eth_dev);
-int otx2_nix_vlan_fini(struct rte_eth_dev *eth_dev);
-int otx2_nix_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask);
-void otx2_nix_vlan_update_promisc(struct rte_eth_dev *eth_dev, int enable);
-int otx2_nix_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id,
-			     int on);
-void otx2_nix_vlan_strip_queue_set(struct rte_eth_dev *dev,
-				   uint16_t queue, int on);
-int otx2_nix_vlan_tpid_set(struct rte_eth_dev *eth_dev,
-			   enum rte_vlan_type type, uint16_t tpid);
-int otx2_nix_vlan_pvid_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on);
-
-/* Lookup configuration */
-void *otx2_nix_fastpath_lookup_mem_get(void);
-
-/* PTYPES */
-const uint32_t *otx2_nix_supported_ptypes_get(struct rte_eth_dev *dev);
-int otx2_nix_ptypes_set(struct rte_eth_dev *eth_dev, uint32_t ptype_mask);
-
-/* Mac address handling */
-int otx2_nix_mac_addr_set(struct rte_eth_dev *eth_dev,
-			  struct rte_ether_addr *addr);
-int otx2_nix_mac_addr_get(struct rte_eth_dev *eth_dev, uint8_t *addr);
-int otx2_nix_mac_addr_add(struct rte_eth_dev *eth_dev,
-			  struct rte_ether_addr *addr,
-			  uint32_t index, uint32_t pool);
-void otx2_nix_mac_addr_del(struct rte_eth_dev *eth_dev, uint32_t index);
-int otx2_cgx_mac_max_entries_get(struct otx2_eth_dev *dev);
-
-/* Devargs */
-int otx2_ethdev_parse_devargs(struct rte_devargs *devargs,
-			      struct otx2_eth_dev *dev);
-
-/* Rx and Tx routines */
-void otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev);
-void otx2_eth_set_tx_function(struct rte_eth_dev *eth_dev);
-void otx2_nix_form_default_desc(struct otx2_eth_txq *txq);
-
-/* Timesync - PTP routines */
-int otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev);
-int otx2_nix_timesync_disable(struct rte_eth_dev *eth_dev);
-int otx2_nix_timesync_read_rx_timestamp(struct rte_eth_dev *eth_dev,
-					struct timespec *timestamp,
-					uint32_t flags);
-int otx2_nix_timesync_read_tx_timestamp(struct rte_eth_dev *eth_dev,
-					struct timespec *timestamp);
-int otx2_nix_timesync_adjust_time(struct rte_eth_dev *eth_dev, int64_t delta);
-int otx2_nix_timesync_write_time(struct rte_eth_dev *eth_dev,
-				 const struct timespec *ts);
-int otx2_nix_timesync_read_time(struct rte_eth_dev *eth_dev,
-				struct timespec *ts);
-int otx2_eth_dev_ptp_info_update(struct otx2_dev *dev, bool ptp_en);
-int otx2_nix_read_clock(struct rte_eth_dev *eth_dev, uint64_t *time);
-int otx2_nix_raw_clock_tsc_conv(struct otx2_eth_dev *dev);
-void otx2_nix_ptp_enable_vf(struct rte_eth_dev *eth_dev);
-
-#endif /* __OTX2_ETHDEV_H__ */
diff --git a/drivers/net/octeontx2/otx2_ethdev_debug.c b/drivers/net/octeontx2/otx2_ethdev_debug.c
deleted file mode 100644
index 6d951bc7e2..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev_debug.c
+++ /dev/null
@@ -1,811 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-
-#define nix_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__)
-#define NIX_REG_INFO(reg) {reg, #reg}
-#define NIX_REG_NAME_SZ 48
-
-struct nix_lf_reg_info {
-	uint32_t offset;
-	const char *name;
-};
-
-static const struct
-nix_lf_reg_info nix_lf_reg[] = {
-	NIX_REG_INFO(NIX_LF_RX_SECRETX(0)),
-	NIX_REG_INFO(NIX_LF_RX_SECRETX(1)),
-	NIX_REG_INFO(NIX_LF_RX_SECRETX(2)),
-	NIX_REG_INFO(NIX_LF_RX_SECRETX(3)),
-	NIX_REG_INFO(NIX_LF_RX_SECRETX(4)),
-	NIX_REG_INFO(NIX_LF_RX_SECRETX(5)),
-	NIX_REG_INFO(NIX_LF_CFG),
-	NIX_REG_INFO(NIX_LF_GINT),
-	NIX_REG_INFO(NIX_LF_GINT_W1S),
-	NIX_REG_INFO(NIX_LF_GINT_ENA_W1C),
-	NIX_REG_INFO(NIX_LF_GINT_ENA_W1S),
-	NIX_REG_INFO(NIX_LF_ERR_INT),
-	NIX_REG_INFO(NIX_LF_ERR_INT_W1S),
-	NIX_REG_INFO(NIX_LF_ERR_INT_ENA_W1C),
-	NIX_REG_INFO(NIX_LF_ERR_INT_ENA_W1S),
-	NIX_REG_INFO(NIX_LF_RAS),
-	NIX_REG_INFO(NIX_LF_RAS_W1S),
-	NIX_REG_INFO(NIX_LF_RAS_ENA_W1C),
-	NIX_REG_INFO(NIX_LF_RAS_ENA_W1S),
-	NIX_REG_INFO(NIX_LF_SQ_OP_ERR_DBG),
-	NIX_REG_INFO(NIX_LF_MNQ_ERR_DBG),
-	NIX_REG_INFO(NIX_LF_SEND_ERR_DBG),
-};
-
-static int
-nix_lf_get_reg_count(struct otx2_eth_dev *dev)
-{
-	int reg_count = 0;
-
-	reg_count = RTE_DIM(nix_lf_reg);
-	/* NIX_LF_TX_STATX */
-	reg_count += dev->lf_tx_stats;
-	/* NIX_LF_RX_STATX */
-	reg_count += dev->lf_rx_stats;
-	/* NIX_LF_QINTX_CNT*/
-	reg_count += dev->qints;
-	/* NIX_LF_QINTX_INT */
-	reg_count += dev->qints;
-	/* NIX_LF_QINTX_ENA_W1S */
-	reg_count += dev->qints;
-	/* NIX_LF_QINTX_ENA_W1C */
-	reg_count += dev->qints;
-	/* NIX_LF_CINTX_CNT */
-	reg_count += dev->cints;
-	/* NIX_LF_CINTX_WAIT */
-	reg_count += dev->cints;
-	/* NIX_LF_CINTX_INT */
-	reg_count += dev->cints;
-	/* NIX_LF_CINTX_INT_W1S */
-	reg_count += dev->cints;
-	/* NIX_LF_CINTX_ENA_W1S */
-	reg_count += dev->cints;
-	/* NIX_LF_CINTX_ENA_W1C */
-	reg_count += dev->cints;
-
-	return reg_count;
-}
-
-int
-otx2_nix_reg_dump(struct otx2_eth_dev *dev, uint64_t *data)
-{
-	uintptr_t nix_lf_base = dev->base;
-	bool dump_stdout;
-	uint64_t reg;
-	uint32_t i;
-
-	dump_stdout = data ? 0 : 1;
-
-	for (i = 0; i < RTE_DIM(nix_lf_reg); i++) {
-		reg = otx2_read64(nix_lf_base + nix_lf_reg[i].offset);
-		if (dump_stdout && reg)
-			nix_dump("%32s = 0x%" PRIx64,
-				 nix_lf_reg[i].name, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_TX_STATX */
-	for (i = 0; i < dev->lf_tx_stats; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_TX_STATX(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_TX_STATX", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_RX_STATX */
-	for (i = 0; i < dev->lf_rx_stats; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_RX_STATX(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_RX_STATX", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_QINTX_CNT*/
-	for (i = 0; i < dev->qints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_QINTX_CNT(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_QINTX_CNT", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_QINTX_INT */
-	for (i = 0; i < dev->qints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_QINTX_INT(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_QINTX_INT", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_QINTX_ENA_W1S */
-	for (i = 0; i < dev->qints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_QINTX_ENA_W1S(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_QINTX_ENA_W1S", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_QINTX_ENA_W1C */
-	for (i = 0; i < dev->qints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_QINTX_ENA_W1C(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_QINTX_ENA_W1C", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_CINTX_CNT */
-	for (i = 0; i < dev->cints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_CINTX_CNT(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_CINTX_CNT", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_CINTX_WAIT */
-	for (i = 0; i < dev->cints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_CINTX_WAIT(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_CINTX_WAIT", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_CINTX_INT */
-	for (i = 0; i < dev->cints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_CINTX_INT(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_CINTX_INT", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_CINTX_INT_W1S */
-	for (i = 0; i < dev->cints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_CINTX_INT_W1S(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_CINTX_INT_W1S", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_CINTX_ENA_W1S */
-	for (i = 0; i < dev->cints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_CINTX_ENA_W1S(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_CINTX_ENA_W1S", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-
-	/* NIX_LF_CINTX_ENA_W1C */
-	for (i = 0; i < dev->cints; i++) {
-		reg = otx2_read64(nix_lf_base + NIX_LF_CINTX_ENA_W1C(i));
-		if (dump_stdout && reg)
-			nix_dump("%32s_%d = 0x%" PRIx64,
-				 "NIX_LF_CINTX_ENA_W1C", i, reg);
-		if (data)
-			*data++ = reg;
-	}
-	return 0;
-}
-
-int
-otx2_nix_dev_get_reg(struct rte_eth_dev *eth_dev, struct rte_dev_reg_info *regs)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t *data = regs->data;
-
-	if (data == NULL) {
-		regs->length = nix_lf_get_reg_count(dev);
-		regs->width = 8;
-		return 0;
-	}
-
-	if (!regs->length ||
-	    regs->length == (uint32_t)nix_lf_get_reg_count(dev)) {
-		otx2_nix_reg_dump(dev, data);
-		return 0;
-	}
-
-	return -ENOTSUP;
-}
-
-static inline void
-nix_lf_sq_dump(__otx2_io struct nix_sq_ctx_s *ctx)
-{
-	nix_dump("W0: sqe_way_mask \t\t%d\nW0: cq \t\t\t\t%d",
-		 ctx->sqe_way_mask, ctx->cq);
-	nix_dump("W0: sdp_mcast \t\t\t%d\nW0: substream \t\t\t0x%03x",
-		 ctx->sdp_mcast, ctx->substream);
-	nix_dump("W0: qint_idx \t\t\t%d\nW0: ena \t\t\t%d\n",
-		 ctx->qint_idx, ctx->ena);
-
-	nix_dump("W1: sqb_count \t\t\t%d\nW1: default_chan \t\t%d",
-		 ctx->sqb_count, ctx->default_chan);
-	nix_dump("W1: smq_rr_quantum \t\t%d\nW1: sso_ena \t\t\t%d",
-		 ctx->smq_rr_quantum, ctx->sso_ena);
-	nix_dump("W1: xoff \t\t\t%d\nW1: cq_ena \t\t\t%d\nW1: smq\t\t\t\t%d\n",
-		 ctx->xoff, ctx->cq_ena, ctx->smq);
-
-	nix_dump("W2: sqe_stype \t\t\t%d\nW2: sq_int_ena \t\t\t%d",
-		 ctx->sqe_stype, ctx->sq_int_ena);
-	nix_dump("W2: sq_int  \t\t\t%d\nW2: sqb_aura \t\t\t%d",
-		 ctx->sq_int, ctx->sqb_aura);
-	nix_dump("W2: smq_rr_count \t\t%d\n",  ctx->smq_rr_count);
-
-	nix_dump("W3: smq_next_sq_vld\t\t%d\nW3: smq_pend\t\t\t%d",
-		 ctx->smq_next_sq_vld, ctx->smq_pend);
-	nix_dump("W3: smenq_next_sqb_vld  \t%d\nW3: head_offset\t\t\t%d",
-		 ctx->smenq_next_sqb_vld, ctx->head_offset);
-	nix_dump("W3: smenq_offset\t\t%d\nW3: tail_offset \t\t%d",
-		 ctx->smenq_offset, ctx->tail_offset);
-	nix_dump("W3: smq_lso_segnum \t\t%d\nW3: smq_next_sq \t\t%d",
-		 ctx->smq_lso_segnum, ctx->smq_next_sq);
-	nix_dump("W3: mnq_dis \t\t\t%d\nW3: lmt_dis \t\t\t%d",
-		 ctx->mnq_dis, ctx->lmt_dis);
-	nix_dump("W3: cq_limit\t\t\t%d\nW3: max_sqe_size\t\t%d\n",
-		 ctx->cq_limit, ctx->max_sqe_size);
-
-	nix_dump("W4: next_sqb \t\t\t0x%" PRIx64 "", ctx->next_sqb);
-	nix_dump("W5: tail_sqb \t\t\t0x%" PRIx64 "", ctx->tail_sqb);
-	nix_dump("W6: smenq_sqb \t\t\t0x%" PRIx64 "", ctx->smenq_sqb);
-	nix_dump("W7: smenq_next_sqb \t\t0x%" PRIx64 "", ctx->smenq_next_sqb);
-	nix_dump("W8: head_sqb \t\t\t0x%" PRIx64 "", ctx->head_sqb);
-
-	nix_dump("W9: vfi_lso_vld \t\t%d\nW9: vfi_lso_vlan1_ins_ena\t%d",
-		 ctx->vfi_lso_vld, ctx->vfi_lso_vlan1_ins_ena);
-	nix_dump("W9: vfi_lso_vlan0_ins_ena\t%d\nW9: vfi_lso_mps\t\t\t%d",
-		 ctx->vfi_lso_vlan0_ins_ena, ctx->vfi_lso_mps);
-	nix_dump("W9: vfi_lso_sb \t\t\t%d\nW9: vfi_lso_sizem1\t\t%d",
-		 ctx->vfi_lso_sb, ctx->vfi_lso_sizem1);
-	nix_dump("W9: vfi_lso_total\t\t%d", ctx->vfi_lso_total);
-
-	nix_dump("W10: scm_lso_rem \t\t0x%" PRIx64 "",
-		 (uint64_t)ctx->scm_lso_rem);
-	nix_dump("W11: octs \t\t\t0x%" PRIx64 "", (uint64_t)ctx->octs);
-	nix_dump("W12: pkts \t\t\t0x%" PRIx64 "", (uint64_t)ctx->pkts);
-	nix_dump("W14: dropped_octs \t\t0x%" PRIx64 "",
-		 (uint64_t)ctx->drop_octs);
-	nix_dump("W15: dropped_pkts \t\t0x%" PRIx64 "",
-		 (uint64_t)ctx->drop_pkts);
-}
-
-static inline void
-nix_lf_rq_dump(__otx2_io struct nix_rq_ctx_s *ctx)
-{
-	nix_dump("W0: wqe_aura \t\t\t%d\nW0: substream \t\t\t0x%03x",
-		 ctx->wqe_aura, ctx->substream);
-	nix_dump("W0: cq \t\t\t\t%d\nW0: ena_wqwd \t\t\t%d",
-		 ctx->cq, ctx->ena_wqwd);
-	nix_dump("W0: ipsech_ena \t\t\t%d\nW0: sso_ena \t\t\t%d",
-		 ctx->ipsech_ena, ctx->sso_ena);
-	nix_dump("W0: ena \t\t\t%d\n", ctx->ena);
-
-	nix_dump("W1: lpb_drop_ena \t\t%d\nW1: spb_drop_ena \t\t%d",
-		 ctx->lpb_drop_ena, ctx->spb_drop_ena);
-	nix_dump("W1: xqe_drop_ena \t\t%d\nW1: wqe_caching \t\t%d",
-		 ctx->xqe_drop_ena, ctx->wqe_caching);
-	nix_dump("W1: pb_caching \t\t\t%d\nW1: sso_tt \t\t\t%d",
-		 ctx->pb_caching, ctx->sso_tt);
-	nix_dump("W1: sso_grp \t\t\t%d\nW1: lpb_aura \t\t\t%d",
-		 ctx->sso_grp, ctx->lpb_aura);
-	nix_dump("W1: spb_aura \t\t\t%d\n", ctx->spb_aura);
-
-	nix_dump("W2: xqe_hdr_split \t\t%d\nW2: xqe_imm_copy \t\t%d",
-		 ctx->xqe_hdr_split, ctx->xqe_imm_copy);
-	nix_dump("W2: xqe_imm_size \t\t%d\nW2: later_skip \t\t\t%d",
-		 ctx->xqe_imm_size, ctx->later_skip);
-	nix_dump("W2: first_skip \t\t\t%d\nW2: lpb_sizem1 \t\t\t%d",
-		 ctx->first_skip, ctx->lpb_sizem1);
-	nix_dump("W2: spb_ena \t\t\t%d\nW2: wqe_skip \t\t\t%d",
-		 ctx->spb_ena, ctx->wqe_skip);
-	nix_dump("W2: spb_sizem1 \t\t\t%d\n", ctx->spb_sizem1);
-
-	nix_dump("W3: spb_pool_pass \t\t%d\nW3: spb_pool_drop \t\t%d",
-		 ctx->spb_pool_pass, ctx->spb_pool_drop);
-	nix_dump("W3: spb_aura_pass \t\t%d\nW3: spb_aura_drop \t\t%d",
-		 ctx->spb_aura_pass, ctx->spb_aura_drop);
-	nix_dump("W3: wqe_pool_pass \t\t%d\nW3: wqe_pool_drop \t\t%d",
-		 ctx->wqe_pool_pass, ctx->wqe_pool_drop);
-	nix_dump("W3: xqe_pass \t\t\t%d\nW3: xqe_drop \t\t\t%d\n",
-		 ctx->xqe_pass, ctx->xqe_drop);
-
-	nix_dump("W4: qint_idx \t\t\t%d\nW4: rq_int_ena \t\t\t%d",
-		 ctx->qint_idx, ctx->rq_int_ena);
-	nix_dump("W4: rq_int \t\t\t%d\nW4: lpb_pool_pass \t\t%d",
-		 ctx->rq_int, ctx->lpb_pool_pass);
-	nix_dump("W4: lpb_pool_drop \t\t%d\nW4: lpb_aura_pass \t\t%d",
-		 ctx->lpb_pool_drop, ctx->lpb_aura_pass);
-	nix_dump("W4: lpb_aura_drop \t\t%d\n", ctx->lpb_aura_drop);
-
-	nix_dump("W5: flow_tagw \t\t\t%d\nW5: bad_utag \t\t\t%d",
-		 ctx->flow_tagw, ctx->bad_utag);
-	nix_dump("W5: good_utag \t\t\t%d\nW5: ltag \t\t\t%d\n",
-		 ctx->good_utag, ctx->ltag);
-
-	nix_dump("W6: octs \t\t\t0x%" PRIx64 "", (uint64_t)ctx->octs);
-	nix_dump("W7: pkts \t\t\t0x%" PRIx64 "", (uint64_t)ctx->pkts);
-	nix_dump("W8: drop_octs \t\t\t0x%" PRIx64 "", (uint64_t)ctx->drop_octs);
-	nix_dump("W9: drop_pkts \t\t\t0x%" PRIx64 "", (uint64_t)ctx->drop_pkts);
-	nix_dump("W10: re_pkts \t\t\t0x%" PRIx64 "\n", (uint64_t)ctx->re_pkts);
-}
-
-static inline void
-nix_lf_cq_dump(__otx2_io struct nix_cq_ctx_s *ctx)
-{
-	nix_dump("W0: base \t\t\t0x%" PRIx64 "\n", ctx->base);
-
-	nix_dump("W1: wrptr \t\t\t%" PRIx64 "", (uint64_t)ctx->wrptr);
-	nix_dump("W1: avg_con \t\t\t%d\nW1: cint_idx \t\t\t%d",
-		 ctx->avg_con, ctx->cint_idx);
-	nix_dump("W1: cq_err \t\t\t%d\nW1: qint_idx \t\t\t%d",
-		 ctx->cq_err, ctx->qint_idx);
-	nix_dump("W1: bpid  \t\t\t%d\nW1: bp_ena \t\t\t%d\n",
-		 ctx->bpid, ctx->bp_ena);
-
-	nix_dump("W2: update_time \t\t%d\nW2: avg_level \t\t\t%d",
-		 ctx->update_time, ctx->avg_level);
-	nix_dump("W2: head \t\t\t%d\nW2: tail \t\t\t%d\n",
-		 ctx->head, ctx->tail);
-
-	nix_dump("W3: cq_err_int_ena \t\t%d\nW3: cq_err_int \t\t\t%d",
-		 ctx->cq_err_int_ena, ctx->cq_err_int);
-	nix_dump("W3: qsize \t\t\t%d\nW3: caching \t\t\t%d",
-		 ctx->qsize, ctx->caching);
-	nix_dump("W3: substream \t\t\t0x%03x\nW3: ena \t\t\t%d",
-		 ctx->substream, ctx->ena);
-	nix_dump("W3: drop_ena \t\t\t%d\nW3: drop \t\t\t%d",
-		 ctx->drop_ena, ctx->drop);
-	nix_dump("W3: bp \t\t\t\t%d\n", ctx->bp);
-}
-
-int
-otx2_nix_queues_ctx_dump(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc, q, rq = eth_dev->data->nb_rx_queues;
-	int sq = eth_dev->data->nb_tx_queues;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct npa_aq_enq_rsp *npa_rsp;
-	struct npa_aq_enq_req *npa_aq;
-	struct otx2_npa_lf *npa_lf;
-	struct nix_aq_enq_rsp *rsp;
-	struct nix_aq_enq_req *aq;
-
-	npa_lf = otx2_npa_lf_obj_get();
-
-	for (q = 0; q < rq; q++) {
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = q;
-		aq->ctype = NIX_AQ_CTYPE_CQ;
-		aq->op = NIX_AQ_INSTOP_READ;
-
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc) {
-			otx2_err("Failed to get cq context");
-			goto fail;
-		}
-		nix_dump("============== port=%d cq=%d ===============",
-			 eth_dev->data->port_id, q);
-		nix_lf_cq_dump(&rsp->cq);
-	}
-
-	for (q = 0; q < rq; q++) {
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = q;
-		aq->ctype = NIX_AQ_CTYPE_RQ;
-		aq->op = NIX_AQ_INSTOP_READ;
-
-		rc = otx2_mbox_process_msg(mbox, (void **)&rsp);
-		if (rc) {
-			otx2_err("Failed to get rq context");
-			goto fail;
-		}
-		nix_dump("============== port=%d rq=%d ===============",
-			 eth_dev->data->port_id, q);
-		nix_lf_rq_dump(&rsp->rq);
-	}
-	for (q = 0; q < sq; q++) {
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = q;
-		aq->ctype = NIX_AQ_CTYPE_SQ;
-		aq->op = NIX_AQ_INSTOP_READ;
-
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc) {
-			otx2_err("Failed to get sq context");
-			goto fail;
-		}
-		nix_dump("============== port=%d sq=%d ===============",
-			 eth_dev->data->port_id, q);
-		nix_lf_sq_dump(&rsp->sq);
-
-		if (!npa_lf) {
-			otx2_err("NPA LF doesn't exist");
-			continue;
-		}
-
-		/* Dump SQB Aura minimal info */
-		npa_aq = otx2_mbox_alloc_msg_npa_aq_enq(npa_lf->mbox);
-		npa_aq->aura_id = rsp->sq.sqb_aura;
-		npa_aq->ctype = NPA_AQ_CTYPE_AURA;
-		npa_aq->op = NPA_AQ_INSTOP_READ;
-
-		rc = otx2_mbox_process_msg(npa_lf->mbox, (void *)&npa_rsp);
-		if (rc) {
-			otx2_err("Failed to get sq's sqb_aura context");
-			continue;
-		}
-
-		nix_dump("\nSQB Aura W0: Pool addr\t\t0x%"PRIx64"",
-			 npa_rsp->aura.pool_addr);
-		nix_dump("SQB Aura W1: ena\t\t\t%d",
-			 npa_rsp->aura.ena);
-		nix_dump("SQB Aura W2: count\t\t%"PRIx64"",
-			 (uint64_t)npa_rsp->aura.count);
-		nix_dump("SQB Aura W3: limit\t\t%"PRIx64"",
-			 (uint64_t)npa_rsp->aura.limit);
-		nix_dump("SQB Aura W3: fc_ena\t\t%d",
-			 npa_rsp->aura.fc_ena);
-		nix_dump("SQB Aura W4: fc_addr\t\t0x%"PRIx64"\n",
-			 npa_rsp->aura.fc_addr);
-	}
-
-fail:
-	return rc;
-}
-
-/* Dumps struct nix_cqe_hdr_s and struct nix_rx_parse_s */
-void
-otx2_nix_cqe_dump(const struct nix_cqe_hdr_s *cq)
-{
-	const struct nix_rx_parse_s *rx =
-		 (const struct nix_rx_parse_s *)((const uint64_t *)cq + 1);
-
-	nix_dump("tag \t\t0x%x\tq \t\t%d\t\tnode \t\t%d\tcqe_type \t%d",
-		 cq->tag, cq->q, cq->node, cq->cqe_type);
-
-	nix_dump("W0: chan \t%d\t\tdesc_sizem1 \t%d",
-		 rx->chan, rx->desc_sizem1);
-	nix_dump("W0: imm_copy \t%d\t\texpress \t%d",
-		 rx->imm_copy, rx->express);
-	nix_dump("W0: wqwd \t%d\t\terrlev \t\t%d\t\terrcode \t%d",
-		 rx->wqwd, rx->errlev, rx->errcode);
-	nix_dump("W0: latype \t%d\t\tlbtype \t\t%d\t\tlctype \t\t%d",
-		 rx->latype, rx->lbtype, rx->lctype);
-	nix_dump("W0: ldtype \t%d\t\tletype \t\t%d\t\tlftype \t\t%d",
-		 rx->ldtype, rx->letype, rx->lftype);
-	nix_dump("W0: lgtype \t%d \t\tlhtype \t\t%d",
-		 rx->lgtype, rx->lhtype);
-
-	nix_dump("W1: pkt_lenm1 \t%d", rx->pkt_lenm1);
-	nix_dump("W1: l2m \t%d\t\tl2b \t\t%d\t\tl3m \t\t%d\tl3b \t\t%d",
-		 rx->l2m, rx->l2b, rx->l3m, rx->l3b);
-	nix_dump("W1: vtag0_valid %d\t\tvtag0_gone \t%d",
-		 rx->vtag0_valid, rx->vtag0_gone);
-	nix_dump("W1: vtag1_valid %d\t\tvtag1_gone \t%d",
-		 rx->vtag1_valid, rx->vtag1_gone);
-	nix_dump("W1: pkind \t%d", rx->pkind);
-	nix_dump("W1: vtag0_tci \t%d\t\tvtag1_tci \t%d",
-		 rx->vtag0_tci, rx->vtag1_tci);
-
-	nix_dump("W2: laflags \t%d\t\tlbflags\t\t%d\t\tlcflags \t%d",
-		 rx->laflags, rx->lbflags, rx->lcflags);
-	nix_dump("W2: ldflags \t%d\t\tleflags\t\t%d\t\tlfflags \t%d",
-		 rx->ldflags, rx->leflags, rx->lfflags);
-	nix_dump("W2: lgflags \t%d\t\tlhflags \t%d",
-		 rx->lgflags, rx->lhflags);
-
-	nix_dump("W3: eoh_ptr \t%d\t\twqe_aura \t%d\t\tpb_aura \t%d",
-		 rx->eoh_ptr, rx->wqe_aura, rx->pb_aura);
-	nix_dump("W3: match_id \t%d", rx->match_id);
-
-	nix_dump("W4: laptr \t%d\t\tlbptr \t\t%d\t\tlcptr \t\t%d",
-		 rx->laptr, rx->lbptr, rx->lcptr);
-	nix_dump("W4: ldptr \t%d\t\tleptr \t\t%d\t\tlfptr \t\t%d",
-		 rx->ldptr, rx->leptr, rx->lfptr);
-	nix_dump("W4: lgptr \t%d\t\tlhptr \t\t%d", rx->lgptr, rx->lhptr);
-
-	nix_dump("W5: vtag0_ptr \t%d\t\tvtag1_ptr \t%d\t\tflow_key_alg \t%d",
-		 rx->vtag0_ptr, rx->vtag1_ptr, rx->flow_key_alg);
-}
-
-static uint8_t
-prepare_nix_tm_reg_dump(uint16_t hw_lvl, uint16_t schq, uint16_t link,
-			uint64_t *reg, char regstr[][NIX_REG_NAME_SZ])
-{
-	uint8_t k = 0;
-
-	switch (hw_lvl) {
-	case NIX_TXSCH_LVL_SMQ:
-		reg[k] = NIX_AF_SMQX_CFG(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_SMQ[%u]_CFG", schq);
-
-		reg[k] = NIX_AF_MDQX_PARENT(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_MDQ[%u]_PARENT", schq);
-
-		reg[k] = NIX_AF_MDQX_SCHEDULE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_MDQ[%u]_SCHEDULE", schq);
-
-		reg[k] = NIX_AF_MDQX_PIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_MDQ[%u]_PIR", schq);
-
-		reg[k] = NIX_AF_MDQX_CIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_MDQ[%u]_CIR", schq);
-
-		reg[k] = NIX_AF_MDQX_SHAPE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_MDQ[%u]_SHAPE", schq);
-
-		reg[k] = NIX_AF_MDQX_SW_XOFF(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_MDQ[%u]_SW_XOFF", schq);
-		break;
-	case NIX_TXSCH_LVL_TL4:
-		reg[k] = NIX_AF_TL4X_PARENT(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_PARENT", schq);
-
-		reg[k] = NIX_AF_TL4X_TOPOLOGY(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_TOPOLOGY", schq);
-
-		reg[k] = NIX_AF_TL4X_SDP_LINK_CFG(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_SDP_LINK_CFG", schq);
-
-		reg[k] = NIX_AF_TL4X_SCHEDULE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_SCHEDULE", schq);
-
-		reg[k] = NIX_AF_TL4X_PIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_PIR", schq);
-
-		reg[k] = NIX_AF_TL4X_CIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_CIR", schq);
-
-		reg[k] = NIX_AF_TL4X_SHAPE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_SHAPE", schq);
-
-		reg[k] = NIX_AF_TL4X_SW_XOFF(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL4[%u]_SW_XOFF", schq);
-		break;
-	case NIX_TXSCH_LVL_TL3:
-		reg[k] = NIX_AF_TL3X_PARENT(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3[%u]_PARENT", schq);
-
-		reg[k] = NIX_AF_TL3X_TOPOLOGY(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3[%u]_TOPOLOGY", schq);
-
-		reg[k] = NIX_AF_TL3_TL2X_LINKX_CFG(schq, link);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3_TL2[%u]_LINK[%u]_CFG", schq, link);
-
-		reg[k] = NIX_AF_TL3X_SCHEDULE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3[%u]_SCHEDULE", schq);
-
-		reg[k] = NIX_AF_TL3X_PIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3[%u]_PIR", schq);
-
-		reg[k] = NIX_AF_TL3X_CIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3[%u]_CIR", schq);
-
-		reg[k] = NIX_AF_TL3X_SHAPE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3[%u]_SHAPE", schq);
-
-		reg[k] = NIX_AF_TL3X_SW_XOFF(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3[%u]_SW_XOFF", schq);
-		break;
-	case NIX_TXSCH_LVL_TL2:
-		reg[k] = NIX_AF_TL2X_PARENT(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL2[%u]_PARENT", schq);
-
-		reg[k] = NIX_AF_TL2X_TOPOLOGY(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL2[%u]_TOPOLOGY", schq);
-
-		reg[k] = NIX_AF_TL3_TL2X_LINKX_CFG(schq, link);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL3_TL2[%u]_LINK[%u]_CFG", schq, link);
-
-		reg[k] = NIX_AF_TL2X_SCHEDULE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL2[%u]_SCHEDULE", schq);
-
-		reg[k] = NIX_AF_TL2X_PIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL2[%u]_PIR", schq);
-
-		reg[k] = NIX_AF_TL2X_CIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL2[%u]_CIR", schq);
-
-		reg[k] = NIX_AF_TL2X_SHAPE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL2[%u]_SHAPE", schq);
-
-		reg[k] = NIX_AF_TL2X_SW_XOFF(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL2[%u]_SW_XOFF", schq);
-		break;
-	case NIX_TXSCH_LVL_TL1:
-
-		reg[k] = NIX_AF_TL1X_TOPOLOGY(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL1[%u]_TOPOLOGY", schq);
-
-		reg[k] = NIX_AF_TL1X_SCHEDULE(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL1[%u]_SCHEDULE", schq);
-
-		reg[k] = NIX_AF_TL1X_CIR(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL1[%u]_CIR", schq);
-
-		reg[k] = NIX_AF_TL1X_SW_XOFF(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL1[%u]_SW_XOFF", schq);
-
-		reg[k] = NIX_AF_TL1X_DROPPED_PACKETS(schq);
-		snprintf(regstr[k++], NIX_REG_NAME_SZ,
-			 "NIX_AF_TL1[%u]_DROPPED_PACKETS", schq);
-		break;
-	default:
-		break;
-	}
-
-	if (k > MAX_REGS_PER_MBOX_MSG) {
-		nix_dump("\t!!!NIX TM Registers request overflow!!!");
-		return 0;
-	}
-	return k;
-}
-
-/* Dump TM hierarchy and registers */
-void
-otx2_nix_tm_dump(struct otx2_eth_dev *dev)
-{
-	char regstr[MAX_REGS_PER_MBOX_MSG * 2][NIX_REG_NAME_SZ];
-	struct otx2_nix_tm_node *tm_node, *root_node, *parent;
-	uint64_t reg[MAX_REGS_PER_MBOX_MSG * 2];
-	struct nix_txschq_config *req;
-	const char *lvlstr, *parent_lvlstr;
-	struct nix_txschq_config *rsp;
-	uint32_t schq, parent_schq;
-	int hw_lvl, j, k, rc;
-
-	nix_dump("===TM hierarchy and registers dump of %s===",
-		 dev->eth_dev->data->name);
-
-	root_node = NULL;
-
-	for (hw_lvl = 0; hw_lvl <= NIX_TXSCH_LVL_CNT; hw_lvl++) {
-		TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-			if (tm_node->hw_lvl != hw_lvl)
-				continue;
-
-			parent = tm_node->parent;
-			if (hw_lvl == NIX_TXSCH_LVL_CNT) {
-				lvlstr = "SQ";
-				schq = tm_node->id;
-			} else {
-				lvlstr = nix_hwlvl2str(tm_node->hw_lvl);
-				schq = tm_node->hw_id;
-			}
-
-			if (parent) {
-				parent_schq = parent->hw_id;
-				parent_lvlstr =
-					nix_hwlvl2str(parent->hw_lvl);
-			} else if (tm_node->hw_lvl == NIX_TXSCH_LVL_TL1) {
-				parent_schq = otx2_nix_get_link(dev);
-				parent_lvlstr = "LINK";
-			} else {
-				parent_schq = tm_node->parent_hw_id;
-				parent_lvlstr =
-					nix_hwlvl2str(tm_node->hw_lvl + 1);
-			}
-
-			nix_dump("%s_%d->%s_%d", lvlstr, schq,
-				 parent_lvlstr, parent_schq);
-
-			if (!(tm_node->flags & NIX_TM_NODE_HWRES))
-				continue;
-
-			/* Need to dump TL1 when root is TL2 */
-			if (tm_node->hw_lvl == dev->otx2_tm_root_lvl)
-				root_node = tm_node;
-
-			/* Dump registers only when HWRES is present */
-			k = prepare_nix_tm_reg_dump(tm_node->hw_lvl, schq,
-						    otx2_nix_get_link(dev), reg,
-						    regstr);
-			if (!k)
-				continue;
-
-			req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-			req->read = 1;
-			req->lvl = tm_node->hw_lvl;
-			req->num_regs = k;
-			otx2_mbox_memcpy(req->reg, reg, sizeof(uint64_t) * k);
-			rc = otx2_mbox_process_msg(dev->mbox, (void **)&rsp);
-			if (!rc) {
-				for (j = 0; j < k; j++)
-					nix_dump("\t%s=0x%016"PRIx64,
-						 regstr[j], rsp->regval[j]);
-			} else {
-				nix_dump("\t!!!Failed to dump registers!!!");
-			}
-		}
-		nix_dump("\n");
-	}
-
-	/* Dump TL1 node data when root level is TL2 */
-	if (root_node && root_node->hw_lvl == NIX_TXSCH_LVL_TL2) {
-		k = prepare_nix_tm_reg_dump(NIX_TXSCH_LVL_TL1,
-					    root_node->parent_hw_id,
-					    otx2_nix_get_link(dev),
-					    reg, regstr);
-		if (!k)
-			return;
-
-
-		req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-		req->read = 1;
-		req->lvl = NIX_TXSCH_LVL_TL1;
-		req->num_regs = k;
-		otx2_mbox_memcpy(req->reg, reg, sizeof(uint64_t) * k);
-		rc = otx2_mbox_process_msg(dev->mbox, (void **)&rsp);
-		if (!rc) {
-			for (j = 0; j < k; j++)
-				nix_dump("\t%s=0x%016"PRIx64,
-					 regstr[j], rsp->regval[j]);
-		} else {
-			nix_dump("\t!!!Failed to dump registers!!!");
-		}
-	}
-
-	otx2_nix_queues_ctx_dump(dev->eth_dev);
-}
diff --git a/drivers/net/octeontx2/otx2_ethdev_devargs.c b/drivers/net/octeontx2/otx2_ethdev_devargs.c
deleted file mode 100644
index 60bf6c3f5f..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev_devargs.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <inttypes.h>
-#include <math.h>
-
-#include "otx2_ethdev.h"
-
-static int
-parse_flow_max_priority(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-	uint16_t val;
-
-	val = atoi(value);
-
-	/* Limit the max priority to 32 */
-	if (val < 1 || val > 32)
-		return -EINVAL;
-
-	*(uint16_t *)extra_args = val;
-
-	return 0;
-}
-
-static int
-parse_flow_prealloc_size(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-	uint16_t val;
-
-	val = atoi(value);
-
-	/* Limit the prealloc size to 32 */
-	if (val < 1 || val > 32)
-		return -EINVAL;
-
-	*(uint16_t *)extra_args = val;
-
-	return 0;
-}
-
-static int
-parse_reta_size(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-	uint32_t val;
-
-	val = atoi(value);
-
-	if (val <= RTE_ETH_RSS_RETA_SIZE_64)
-		val = RTE_ETH_RSS_RETA_SIZE_64;
-	else if (val > RTE_ETH_RSS_RETA_SIZE_64 && val <= RTE_ETH_RSS_RETA_SIZE_128)
-		val = RTE_ETH_RSS_RETA_SIZE_128;
-	else if (val > RTE_ETH_RSS_RETA_SIZE_128 && val <= RTE_ETH_RSS_RETA_SIZE_256)
-		val = RTE_ETH_RSS_RETA_SIZE_256;
-	else
-		val = NIX_RSS_RETA_SIZE;
-
-	*(uint16_t *)extra_args = val;
-
-	return 0;
-}
-
-static int
-parse_ipsec_in_max_spi(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-	uint32_t val;
-
-	val = atoi(value);
-
-	*(uint16_t *)extra_args = val;
-
-	return 0;
-}
-
-static int
-parse_flag(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-
-	*(uint16_t *)extra_args = atoi(value);
-
-	return 0;
-}
-
-static int
-parse_sqb_count(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-	uint32_t val;
-
-	val = atoi(value);
-
-	if (val < NIX_MIN_SQB || val > NIX_MAX_SQB)
-		return -EINVAL;
-
-	*(uint16_t *)extra_args = val;
-
-	return 0;
-}
-
-static int
-parse_switch_header_type(const char *key, const char *value, void *extra_args)
-{
-	RTE_SET_USED(key);
-
-	if (strcmp(value, "higig2") == 0)
-		*(uint16_t *)extra_args = OTX2_PRIV_FLAGS_HIGIG;
-
-	if (strcmp(value, "dsa") == 0)
-		*(uint16_t *)extra_args = OTX2_PRIV_FLAGS_EDSA;
-
-	if (strcmp(value, "chlen90b") == 0)
-		*(uint16_t *)extra_args = OTX2_PRIV_FLAGS_CH_LEN_90B;
-
-	if (strcmp(value, "chlen24b") == 0)
-		*(uint16_t *)extra_args = OTX2_PRIV_FLAGS_CH_LEN_24B;
-
-	if (strcmp(value, "exdsa") == 0)
-		*(uint16_t *)extra_args = OTX2_PRIV_FLAGS_EXDSA;
-
-	if (strcmp(value, "vlan_exdsa") == 0)
-		*(uint16_t *)extra_args = OTX2_PRIV_FLAGS_VLAN_EXDSA;
-
-	return 0;
-}
-
-#define OTX2_RSS_RETA_SIZE "reta_size"
-#define OTX2_IPSEC_IN_MAX_SPI "ipsec_in_max_spi"
-#define OTX2_SCL_ENABLE "scalar_enable"
-#define OTX2_MAX_SQB_COUNT "max_sqb_count"
-#define OTX2_FLOW_PREALLOC_SIZE "flow_prealloc_size"
-#define OTX2_FLOW_MAX_PRIORITY "flow_max_priority"
-#define OTX2_SWITCH_HEADER_TYPE "switch_header"
-#define OTX2_RSS_TAG_AS_XOR "tag_as_xor"
-#define OTX2_LOCK_RX_CTX "lock_rx_ctx"
-#define OTX2_LOCK_TX_CTX "lock_tx_ctx"
-
-int
-otx2_ethdev_parse_devargs(struct rte_devargs *devargs, struct otx2_eth_dev *dev)
-{
-	uint16_t rss_size = NIX_RSS_RETA_SIZE;
-	uint16_t sqb_count = NIX_MAX_SQB;
-	uint16_t flow_prealloc_size = 8;
-	uint16_t switch_header_type = 0;
-	uint16_t flow_max_priority = 3;
-	uint16_t ipsec_in_max_spi = 1;
-	uint16_t rss_tag_as_xor = 0;
-	uint16_t scalar_enable = 0;
-	struct rte_kvargs *kvlist;
-	uint16_t lock_rx_ctx = 0;
-	uint16_t lock_tx_ctx = 0;
-
-	if (devargs == NULL)
-		goto null_devargs;
-
-	kvlist = rte_kvargs_parse(devargs->args, NULL);
-	if (kvlist == NULL)
-		goto exit;
-
-	rte_kvargs_process(kvlist, OTX2_RSS_RETA_SIZE,
-			   &parse_reta_size, &rss_size);
-	rte_kvargs_process(kvlist, OTX2_IPSEC_IN_MAX_SPI,
-			   &parse_ipsec_in_max_spi, &ipsec_in_max_spi);
-	rte_kvargs_process(kvlist, OTX2_SCL_ENABLE,
-			   &parse_flag, &scalar_enable);
-	rte_kvargs_process(kvlist, OTX2_MAX_SQB_COUNT,
-			   &parse_sqb_count, &sqb_count);
-	rte_kvargs_process(kvlist, OTX2_FLOW_PREALLOC_SIZE,
-			   &parse_flow_prealloc_size, &flow_prealloc_size);
-	rte_kvargs_process(kvlist, OTX2_FLOW_MAX_PRIORITY,
-			   &parse_flow_max_priority, &flow_max_priority);
-	rte_kvargs_process(kvlist, OTX2_SWITCH_HEADER_TYPE,
-			   &parse_switch_header_type, &switch_header_type);
-	rte_kvargs_process(kvlist, OTX2_RSS_TAG_AS_XOR,
-			   &parse_flag, &rss_tag_as_xor);
-	rte_kvargs_process(kvlist, OTX2_LOCK_RX_CTX,
-			   &parse_flag, &lock_rx_ctx);
-	rte_kvargs_process(kvlist, OTX2_LOCK_TX_CTX,
-			   &parse_flag, &lock_tx_ctx);
-	otx2_parse_common_devargs(kvlist);
-	rte_kvargs_free(kvlist);
-
-null_devargs:
-	dev->ipsec_in_max_spi = ipsec_in_max_spi;
-	dev->scalar_ena = scalar_enable;
-	dev->rss_tag_as_xor = rss_tag_as_xor;
-	dev->max_sqb_count = sqb_count;
-	dev->lock_rx_ctx = lock_rx_ctx;
-	dev->lock_tx_ctx = lock_tx_ctx;
-	dev->rss_info.rss_size = rss_size;
-	dev->npc_flow.flow_prealloc_size = flow_prealloc_size;
-	dev->npc_flow.flow_max_priority = flow_max_priority;
-	dev->npc_flow.switch_header_type = switch_header_type;
-	return 0;
-
-exit:
-	return -EINVAL;
-}
-
-RTE_PMD_REGISTER_PARAM_STRING(OCTEONTX2_PMD,
-			      OTX2_RSS_RETA_SIZE "=<64|128|256>"
-			      OTX2_IPSEC_IN_MAX_SPI "=<1-65535>"
-			      OTX2_SCL_ENABLE "=1"
-			      OTX2_MAX_SQB_COUNT "=<8-512>"
-			      OTX2_FLOW_PREALLOC_SIZE "=<1-32>"
-			      OTX2_FLOW_MAX_PRIORITY "=<1-32>"
-			      OTX2_SWITCH_HEADER_TYPE "=<higig2|dsa|chlen90b|chlen24b>"
-			      OTX2_RSS_TAG_AS_XOR "=1"
-			      OTX2_NPA_LOCK_MASK "=<1-65535>"
-			      OTX2_LOCK_RX_CTX "=1"
-			      OTX2_LOCK_TX_CTX "=1");
diff --git a/drivers/net/octeontx2/otx2_ethdev_irq.c b/drivers/net/octeontx2/otx2_ethdev_irq.c
deleted file mode 100644
index cc573bb2e8..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev_irq.c
+++ /dev/null
@@ -1,493 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <inttypes.h>
-
-#include <rte_bus_pci.h>
-#include <rte_malloc.h>
-
-#include "otx2_ethdev.h"
-
-static void
-nix_lf_err_irq(void *param)
-{
-	struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)param;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t intr;
-
-	intr = otx2_read64(dev->base + NIX_LF_ERR_INT);
-	if (intr == 0)
-		return;
-
-	otx2_err("Err_intr=0x%" PRIx64 " pf=%d, vf=%d", intr, dev->pf, dev->vf);
-
-	/* Clear interrupt */
-	otx2_write64(intr, dev->base + NIX_LF_ERR_INT);
-
-	/* Dump registers to std out */
-	otx2_nix_reg_dump(dev, NULL);
-	otx2_nix_queues_ctx_dump(eth_dev);
-}
-
-static int
-nix_lf_register_err_irq(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc, vec;
-
-	vec = dev->nix_msixoff + NIX_LF_INT_VEC_ERR_INT;
-
-	/* Clear err interrupt */
-	otx2_nix_err_intr_enb_dis(eth_dev, false);
-	/* Set used interrupt vectors */
-	rc = otx2_register_irq(handle, nix_lf_err_irq, eth_dev, vec);
-	/* Enable all dev interrupt except for RQ_DISABLED */
-	otx2_nix_err_intr_enb_dis(eth_dev, true);
-
-	return rc;
-}
-
-static void
-nix_lf_unregister_err_irq(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int vec;
-
-	vec = dev->nix_msixoff + NIX_LF_INT_VEC_ERR_INT;
-
-	/* Clear err interrupt */
-	otx2_nix_err_intr_enb_dis(eth_dev, false);
-	otx2_unregister_irq(handle, nix_lf_err_irq, eth_dev, vec);
-}
-
-static void
-nix_lf_ras_irq(void *param)
-{
-	struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)param;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t intr;
-
-	intr = otx2_read64(dev->base + NIX_LF_RAS);
-	if (intr == 0)
-		return;
-
-	otx2_err("Ras_intr=0x%" PRIx64 " pf=%d, vf=%d", intr, dev->pf, dev->vf);
-
-	/* Clear interrupt */
-	otx2_write64(intr, dev->base + NIX_LF_RAS);
-
-	/* Dump registers to std out */
-	otx2_nix_reg_dump(dev, NULL);
-	otx2_nix_queues_ctx_dump(eth_dev);
-}
-
-static int
-nix_lf_register_ras_irq(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc, vec;
-
-	vec = dev->nix_msixoff + NIX_LF_INT_VEC_POISON;
-
-	/* Clear err interrupt */
-	otx2_nix_ras_intr_enb_dis(eth_dev, false);
-	/* Set used interrupt vectors */
-	rc = otx2_register_irq(handle, nix_lf_ras_irq, eth_dev, vec);
-	/* Enable dev interrupt */
-	otx2_nix_ras_intr_enb_dis(eth_dev, true);
-
-	return rc;
-}
-
-static void
-nix_lf_unregister_ras_irq(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int vec;
-
-	vec = dev->nix_msixoff + NIX_LF_INT_VEC_POISON;
-
-	/* Clear err interrupt */
-	otx2_nix_ras_intr_enb_dis(eth_dev, false);
-	otx2_unregister_irq(handle, nix_lf_ras_irq, eth_dev, vec);
-}
-
-static inline uint8_t
-nix_lf_q_irq_get_and_clear(struct otx2_eth_dev *dev, uint16_t q,
-			   uint32_t off, uint64_t mask)
-{
-	uint64_t reg, wdata;
-	uint8_t qint;
-
-	wdata = (uint64_t)q << 44;
-	reg = otx2_atomic64_add_nosync(wdata, (int64_t *)(dev->base + off));
-
-	if (reg & BIT_ULL(42) /* OP_ERR */) {
-		otx2_err("Failed execute irq get off=0x%x", off);
-		return 0;
-	}
-
-	qint = reg & 0xff;
-	wdata &= mask;
-	otx2_write64(wdata | qint, dev->base + off);
-
-	return qint;
-}
-
-static inline uint8_t
-nix_lf_rq_irq_get_and_clear(struct otx2_eth_dev *dev, uint16_t rq)
-{
-	return nix_lf_q_irq_get_and_clear(dev, rq, NIX_LF_RQ_OP_INT, ~0xff00);
-}
-
-static inline uint8_t
-nix_lf_cq_irq_get_and_clear(struct otx2_eth_dev *dev, uint16_t cq)
-{
-	return nix_lf_q_irq_get_and_clear(dev, cq, NIX_LF_CQ_OP_INT, ~0xff00);
-}
-
-static inline uint8_t
-nix_lf_sq_irq_get_and_clear(struct otx2_eth_dev *dev, uint16_t sq)
-{
-	return nix_lf_q_irq_get_and_clear(dev, sq, NIX_LF_SQ_OP_INT, ~0x1ff00);
-}
-
-static inline void
-nix_lf_sq_debug_reg(struct otx2_eth_dev *dev, uint32_t off)
-{
-	uint64_t reg;
-
-	reg = otx2_read64(dev->base + off);
-	if (reg & BIT_ULL(44))
-		otx2_err("SQ=%d err_code=0x%x",
-			 (int)((reg >> 8) & 0xfffff), (uint8_t)(reg & 0xff));
-}
-
-static void
-nix_lf_cq_irq(void *param)
-{
-	struct otx2_qint *cint = (struct otx2_qint *)param;
-	struct rte_eth_dev *eth_dev = cint->eth_dev;
-	struct otx2_eth_dev *dev;
-
-	dev = otx2_eth_pmd_priv(eth_dev);
-	/* Clear interrupt */
-	otx2_write64(BIT_ULL(0), dev->base + NIX_LF_CINTX_INT(cint->qintx));
-}
-
-static void
-nix_lf_q_irq(void *param)
-{
-	struct otx2_qint *qint = (struct otx2_qint *)param;
-	struct rte_eth_dev *eth_dev = qint->eth_dev;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint8_t irq, qintx = qint->qintx;
-	int q, cq, rq, sq;
-	uint64_t intr;
-
-	intr = otx2_read64(dev->base + NIX_LF_QINTX_INT(qintx));
-	if (intr == 0)
-		return;
-
-	otx2_err("Queue_intr=0x%" PRIx64 " qintx=%d pf=%d, vf=%d",
-		 intr, qintx, dev->pf, dev->vf);
-
-	/* Handle RQ interrupts */
-	for (q = 0; q < eth_dev->data->nb_rx_queues; q++) {
-		rq = q % dev->qints;
-		irq = nix_lf_rq_irq_get_and_clear(dev, rq);
-
-		if (irq & BIT_ULL(NIX_RQINT_DROP))
-			otx2_err("RQ=%d NIX_RQINT_DROP", rq);
-
-		if (irq & BIT_ULL(NIX_RQINT_RED))
-			otx2_err("RQ=%d NIX_RQINT_RED",	rq);
-	}
-
-	/* Handle CQ interrupts */
-	for (q = 0; q < eth_dev->data->nb_rx_queues; q++) {
-		cq = q % dev->qints;
-		irq = nix_lf_cq_irq_get_and_clear(dev, cq);
-
-		if (irq & BIT_ULL(NIX_CQERRINT_DOOR_ERR))
-			otx2_err("CQ=%d NIX_CQERRINT_DOOR_ERR", cq);
-
-		if (irq & BIT_ULL(NIX_CQERRINT_WR_FULL))
-			otx2_err("CQ=%d NIX_CQERRINT_WR_FULL", cq);
-
-		if (irq & BIT_ULL(NIX_CQERRINT_CQE_FAULT))
-			otx2_err("CQ=%d NIX_CQERRINT_CQE_FAULT", cq);
-	}
-
-	/* Handle SQ interrupts */
-	for (q = 0; q < eth_dev->data->nb_tx_queues; q++) {
-		sq = q % dev->qints;
-		irq = nix_lf_sq_irq_get_and_clear(dev, sq);
-
-		if (irq & BIT_ULL(NIX_SQINT_LMT_ERR)) {
-			otx2_err("SQ=%d NIX_SQINT_LMT_ERR", sq);
-			nix_lf_sq_debug_reg(dev, NIX_LF_SQ_OP_ERR_DBG);
-		}
-		if (irq & BIT_ULL(NIX_SQINT_MNQ_ERR)) {
-			otx2_err("SQ=%d NIX_SQINT_MNQ_ERR", sq);
-			nix_lf_sq_debug_reg(dev, NIX_LF_MNQ_ERR_DBG);
-		}
-		if (irq & BIT_ULL(NIX_SQINT_SEND_ERR)) {
-			otx2_err("SQ=%d NIX_SQINT_SEND_ERR", sq);
-			nix_lf_sq_debug_reg(dev, NIX_LF_SEND_ERR_DBG);
-		}
-		if (irq & BIT_ULL(NIX_SQINT_SQB_ALLOC_FAIL)) {
-			otx2_err("SQ=%d NIX_SQINT_SQB_ALLOC_FAIL", sq);
-			nix_lf_sq_debug_reg(dev, NIX_LF_SEND_ERR_DBG);
-		}
-	}
-
-	/* Clear interrupt */
-	otx2_write64(intr, dev->base + NIX_LF_QINTX_INT(qintx));
-
-	/* Dump registers to std out */
-	otx2_nix_reg_dump(dev, NULL);
-	otx2_nix_queues_ctx_dump(eth_dev);
-}
-
-int
-oxt2_nix_register_queue_irqs(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int vec, q, sqs, rqs, qs, rc = 0;
-
-	/* Figure out max qintx required */
-	rqs = RTE_MIN(dev->qints, eth_dev->data->nb_rx_queues);
-	sqs = RTE_MIN(dev->qints, eth_dev->data->nb_tx_queues);
-	qs  = RTE_MAX(rqs, sqs);
-
-	dev->configured_qints = qs;
-
-	for (q = 0; q < qs; q++) {
-		vec = dev->nix_msixoff + NIX_LF_INT_VEC_QINT_START + q;
-
-		/* Clear QINT CNT */
-		otx2_write64(0, dev->base + NIX_LF_QINTX_CNT(q));
-
-		/* Clear interrupt */
-		otx2_write64(~0ull, dev->base + NIX_LF_QINTX_ENA_W1C(q));
-
-		dev->qints_mem[q].eth_dev = eth_dev;
-		dev->qints_mem[q].qintx = q;
-
-		/* Sync qints_mem update */
-		rte_smp_wmb();
-
-		/* Register queue irq vector */
-		rc = otx2_register_irq(handle, nix_lf_q_irq,
-				       &dev->qints_mem[q], vec);
-		if (rc)
-			break;
-
-		otx2_write64(0, dev->base + NIX_LF_QINTX_CNT(q));
-		otx2_write64(0, dev->base + NIX_LF_QINTX_INT(q));
-		/* Enable QINT interrupt */
-		otx2_write64(~0ull, dev->base + NIX_LF_QINTX_ENA_W1S(q));
-	}
-
-	return rc;
-}
-
-void
-oxt2_nix_unregister_queue_irqs(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int vec, q;
-
-	for (q = 0; q < dev->configured_qints; q++) {
-		vec = dev->nix_msixoff + NIX_LF_INT_VEC_QINT_START + q;
-
-		/* Clear QINT CNT */
-		otx2_write64(0, dev->base + NIX_LF_QINTX_CNT(q));
-		otx2_write64(0, dev->base + NIX_LF_QINTX_INT(q));
-
-		/* Clear interrupt */
-		otx2_write64(~0ull, dev->base + NIX_LF_QINTX_ENA_W1C(q));
-
-		/* Unregister queue irq vector */
-		otx2_unregister_irq(handle, nix_lf_q_irq,
-				    &dev->qints_mem[q], vec);
-	}
-}
-
-int
-oxt2_nix_register_cq_irqs(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint8_t rc = 0, vec, q;
-
-	dev->configured_cints = RTE_MIN(dev->cints,
-					eth_dev->data->nb_rx_queues);
-
-	for (q = 0; q < dev->configured_cints; q++) {
-		vec = dev->nix_msixoff + NIX_LF_INT_VEC_CINT_START + q;
-
-		/* Clear CINT CNT */
-		otx2_write64(0, dev->base + NIX_LF_CINTX_CNT(q));
-
-		/* Clear interrupt */
-		otx2_write64(BIT_ULL(0), dev->base + NIX_LF_CINTX_ENA_W1C(q));
-
-		dev->cints_mem[q].eth_dev = eth_dev;
-		dev->cints_mem[q].qintx = q;
-
-		/* Sync cints_mem update */
-		rte_smp_wmb();
-
-		/* Register queue irq vector */
-		rc = otx2_register_irq(handle, nix_lf_cq_irq,
-				       &dev->cints_mem[q], vec);
-		if (rc) {
-			otx2_err("Fail to register CQ irq, rc=%d", rc);
-			return rc;
-		}
-
-		rc = rte_intr_vec_list_alloc(handle, "intr_vec",
-						dev->configured_cints);
-		if (rc) {
-			otx2_err("Fail to allocate intr vec list, "
-				 "rc=%d", rc);
-			return rc;
-		}
-		/* VFIO vector zero is resereved for misc interrupt so
-		 * doing required adjustment. (b13bfab4cd)
-		 */
-		if (rte_intr_vec_list_index_set(handle, q,
-						RTE_INTR_VEC_RXTX_OFFSET + vec))
-			return -1;
-
-		/* Configure CQE interrupt coalescing parameters */
-		otx2_write64(((CQ_CQE_THRESH_DEFAULT) |
-			      (CQ_CQE_THRESH_DEFAULT << 32) |
-			      (CQ_TIMER_THRESH_DEFAULT << 48)),
-			     dev->base + NIX_LF_CINTX_WAIT((q)));
-
-		/* Keeping the CQ interrupt disabled as the rx interrupt
-		 * feature needs to be enabled/disabled on demand.
-		 */
-	}
-
-	return rc;
-}
-
-void
-oxt2_nix_unregister_cq_irqs(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct rte_intr_handle *handle = pci_dev->intr_handle;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int vec, q;
-
-	for (q = 0; q < dev->configured_cints; q++) {
-		vec = dev->nix_msixoff + NIX_LF_INT_VEC_CINT_START + q;
-
-		/* Clear CINT CNT */
-		otx2_write64(0, dev->base + NIX_LF_CINTX_CNT(q));
-
-		/* Clear interrupt */
-		otx2_write64(BIT_ULL(0), dev->base + NIX_LF_CINTX_ENA_W1C(q));
-
-		/* Unregister queue irq vector */
-		otx2_unregister_irq(handle, nix_lf_cq_irq,
-				    &dev->cints_mem[q], vec);
-	}
-}
-
-int
-otx2_nix_register_irqs(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc;
-
-	if (dev->nix_msixoff == MSIX_VECTOR_INVALID) {
-		otx2_err("Invalid NIXLF MSIX vector offset vector: 0x%x",
-			 dev->nix_msixoff);
-		return -EINVAL;
-	}
-
-	/* Register lf err interrupt */
-	rc = nix_lf_register_err_irq(eth_dev);
-	/* Register RAS interrupt */
-	rc |= nix_lf_register_ras_irq(eth_dev);
-
-	return rc;
-}
-
-void
-otx2_nix_unregister_irqs(struct rte_eth_dev *eth_dev)
-{
-	nix_lf_unregister_err_irq(eth_dev);
-	nix_lf_unregister_ras_irq(eth_dev);
-}
-
-int
-otx2_nix_rx_queue_intr_enable(struct rte_eth_dev *eth_dev,
-			      uint16_t rx_queue_id)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	/* Enable CINT interrupt */
-	otx2_write64(BIT_ULL(0), dev->base +
-		     NIX_LF_CINTX_ENA_W1S(rx_queue_id));
-
-	return 0;
-}
-
-int
-otx2_nix_rx_queue_intr_disable(struct rte_eth_dev *eth_dev,
-			       uint16_t rx_queue_id)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	/* Clear and disable CINT interrupt */
-	otx2_write64(BIT_ULL(0), dev->base +
-		     NIX_LF_CINTX_ENA_W1C(rx_queue_id));
-
-	return 0;
-}
-
-void
-otx2_nix_err_intr_enb_dis(struct rte_eth_dev *eth_dev, bool enb)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	/* Enable all nix lf error interrupts except
-	 * RQ_DISABLED and CQ_DISABLED.
-	 */
-	if (enb)
-		otx2_write64(~(BIT_ULL(11) | BIT_ULL(24)),
-			     dev->base + NIX_LF_ERR_INT_ENA_W1S);
-	else
-		otx2_write64(~0ull, dev->base + NIX_LF_ERR_INT_ENA_W1C);
-}
-
-void
-otx2_nix_ras_intr_enb_dis(struct rte_eth_dev *eth_dev, bool enb)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	if (enb)
-		otx2_write64(~0ull, dev->base + NIX_LF_RAS_ENA_W1S);
-	else
-		otx2_write64(~0ull, dev->base + NIX_LF_RAS_ENA_W1C);
-}
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c
deleted file mode 100644
index 48781514c3..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_ethdev.h>
-#include <rte_mbuf_pool_ops.h>
-
-#include "otx2_ethdev.h"
-
-int
-otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
-{
-	uint32_t buffsz, frame_size = mtu + NIX_L2_OVERHEAD;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_eth_dev_data *data = eth_dev->data;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_frs_cfg *req;
-	int rc;
-
-	if (dev->configured && otx2_ethdev_is_ptp_en(dev))
-		frame_size += NIX_TIMESYNC_RX_OFFSET;
-
-	buffsz = data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
-
-	/* Refuse MTU that requires the support of scattered packets
-	 * when this feature has not been enabled before.
-	 */
-	if (data->dev_started && frame_size > buffsz &&
-	    !(dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER))
-		return -EINVAL;
-
-	/* Check <seg size> * <max_seg>  >= max_frame */
-	if ((dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)	&&
-	    (frame_size > buffsz * NIX_RX_NB_SEG_MAX))
-		return -EINVAL;
-
-	req = otx2_mbox_alloc_msg_nix_set_hw_frs(mbox);
-	req->update_smq = true;
-	if (otx2_dev_is_sdp(dev))
-		req->sdp_link = true;
-	/* FRS HW config should exclude FCS but include NPC VTAG insert size */
-	req->maxlen = frame_size - RTE_ETHER_CRC_LEN + NIX_MAX_VTAG_ACT_SIZE;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	/* Now just update Rx MAXLEN */
-	req = otx2_mbox_alloc_msg_nix_set_hw_frs(mbox);
-	req->maxlen = frame_size - RTE_ETHER_CRC_LEN;
-	if (otx2_dev_is_sdp(dev))
-		req->sdp_link = true;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	return rc;
-}
-
-int
-otx2_nix_recalc_mtu(struct rte_eth_dev *eth_dev)
-{
-	struct rte_eth_dev_data *data = eth_dev->data;
-	struct otx2_eth_rxq *rxq;
-	int rc;
-
-	rxq = data->rx_queues[0];
-
-	/* Setup scatter mode if needed by jumbo */
-	otx2_nix_enable_mseg_on_jumbo(rxq);
-
-	rc = otx2_nix_mtu_set(eth_dev, data->mtu);
-	if (rc)
-		otx2_err("Failed to set default MTU size %d", rc);
-
-	return rc;
-}
-
-static void
-nix_cgx_promisc_config(struct rte_eth_dev *eth_dev, int en)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return;
-
-	if (en)
-		otx2_mbox_alloc_msg_cgx_promisc_enable(mbox);
-	else
-		otx2_mbox_alloc_msg_cgx_promisc_disable(mbox);
-
-	otx2_mbox_process(mbox);
-}
-
-void
-otx2_nix_promisc_config(struct rte_eth_dev *eth_dev, int en)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_rx_mode *req;
-
-	if (otx2_dev_is_vf(dev))
-		return;
-
-	req = otx2_mbox_alloc_msg_nix_set_rx_mode(mbox);
-
-	if (en)
-		req->mode = NIX_RX_MODE_UCAST | NIX_RX_MODE_PROMISC;
-
-	otx2_mbox_process(mbox);
-	eth_dev->data->promiscuous = en;
-	otx2_nix_vlan_update_promisc(eth_dev, en);
-}
-
-int
-otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev)
-{
-	otx2_nix_promisc_config(eth_dev, 1);
-	nix_cgx_promisc_config(eth_dev, 1);
-
-	return 0;
-}
-
-int
-otx2_nix_promisc_disable(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	otx2_nix_promisc_config(eth_dev, dev->dmac_filter_enable);
-	nix_cgx_promisc_config(eth_dev, 0);
-	dev->dmac_filter_enable = false;
-
-	return 0;
-}
-
-static void
-nix_allmulticast_config(struct rte_eth_dev *eth_dev, int en)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_rx_mode *req;
-
-	if (otx2_dev_is_vf(dev))
-		return;
-
-	req = otx2_mbox_alloc_msg_nix_set_rx_mode(mbox);
-
-	if (en)
-		req->mode = NIX_RX_MODE_UCAST | NIX_RX_MODE_ALLMULTI;
-	else if (eth_dev->data->promiscuous)
-		req->mode = NIX_RX_MODE_UCAST | NIX_RX_MODE_PROMISC;
-
-	otx2_mbox_process(mbox);
-}
-
-int
-otx2_nix_allmulticast_enable(struct rte_eth_dev *eth_dev)
-{
-	nix_allmulticast_config(eth_dev, 1);
-
-	return 0;
-}
-
-int
-otx2_nix_allmulticast_disable(struct rte_eth_dev *eth_dev)
-{
-	nix_allmulticast_config(eth_dev, 0);
-
-	return 0;
-}
-
-void
-otx2_nix_rxq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
-		      struct rte_eth_rxq_info *qinfo)
-{
-	struct otx2_eth_rxq *rxq;
-
-	rxq = eth_dev->data->rx_queues[queue_id];
-
-	qinfo->mp = rxq->pool;
-	qinfo->scattered_rx = eth_dev->data->scattered_rx;
-	qinfo->nb_desc = rxq->qconf.nb_desc;
-
-	qinfo->conf.rx_free_thresh = 0;
-	qinfo->conf.rx_drop_en = 0;
-	qinfo->conf.rx_deferred_start = 0;
-	qinfo->conf.offloads = rxq->offloads;
-}
-
-void
-otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
-		      struct rte_eth_txq_info *qinfo)
-{
-	struct otx2_eth_txq *txq;
-
-	txq = eth_dev->data->tx_queues[queue_id];
-
-	qinfo->nb_desc = txq->qconf.nb_desc;
-
-	qinfo->conf.tx_thresh.pthresh = 0;
-	qinfo->conf.tx_thresh.hthresh = 0;
-	qinfo->conf.tx_thresh.wthresh = 0;
-
-	qinfo->conf.tx_free_thresh = 0;
-	qinfo->conf.tx_rs_thresh = 0;
-	qinfo->conf.offloads = txq->offloads;
-	qinfo->conf.tx_deferred_start = 0;
-}
-
-int
-otx2_rx_burst_mode_get(struct rte_eth_dev *eth_dev,
-		       __rte_unused uint16_t queue_id,
-		       struct rte_eth_burst_mode *mode)
-{
-	ssize_t bytes = 0, str_size = RTE_ETH_BURST_MODE_INFO_SIZE, rc;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	const struct burst_info {
-		uint16_t flags;
-		const char *output;
-	} rx_offload_map[] = {
-			{NIX_RX_OFFLOAD_RSS_F, "RSS,"},
-			{NIX_RX_OFFLOAD_PTYPE_F, " Ptype,"},
-			{NIX_RX_OFFLOAD_CHECKSUM_F, " Checksum,"},
-			{NIX_RX_OFFLOAD_VLAN_STRIP_F, " VLAN Strip,"},
-			{NIX_RX_OFFLOAD_MARK_UPDATE_F, " Mark Update,"},
-			{NIX_RX_OFFLOAD_TSTAMP_F, " Timestamp,"},
-			{NIX_RX_MULTI_SEG_F, " Scattered,"}
-	};
-	static const char *const burst_mode[] = {"Vector Neon, Rx Offloads:",
-						 "Scalar, Rx Offloads:"
-	};
-	uint32_t i;
-
-	/* Update burst mode info */
-	rc = rte_strscpy(mode->info + bytes, burst_mode[dev->scalar_ena],
-			 str_size - bytes);
-	if (rc < 0)
-		goto done;
-
-	bytes += rc;
-
-	/* Update Rx offload info */
-	for (i = 0; i < RTE_DIM(rx_offload_map); i++) {
-		if (dev->rx_offload_flags & rx_offload_map[i].flags) {
-			rc = rte_strscpy(mode->info + bytes,
-					 rx_offload_map[i].output,
-					 str_size - bytes);
-			if (rc < 0)
-				goto done;
-
-			bytes += rc;
-		}
-	}
-
-done:
-	return 0;
-}
-
-int
-otx2_tx_burst_mode_get(struct rte_eth_dev *eth_dev,
-		       __rte_unused uint16_t queue_id,
-		       struct rte_eth_burst_mode *mode)
-{
-	ssize_t bytes = 0, str_size = RTE_ETH_BURST_MODE_INFO_SIZE, rc;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	const struct burst_info {
-		uint16_t flags;
-		const char *output;
-	} tx_offload_map[] = {
-			{NIX_TX_OFFLOAD_L3_L4_CSUM_F, " Inner L3/L4 csum,"},
-			{NIX_TX_OFFLOAD_OL3_OL4_CSUM_F, " Outer L3/L4 csum,"},
-			{NIX_TX_OFFLOAD_VLAN_QINQ_F, " VLAN Insertion,"},
-			{NIX_TX_OFFLOAD_MBUF_NOFF_F, " MBUF free disable,"},
-			{NIX_TX_OFFLOAD_TSTAMP_F, " Timestamp,"},
-			{NIX_TX_OFFLOAD_TSO_F, " TSO,"},
-			{NIX_TX_MULTI_SEG_F, " Scattered,"}
-	};
-	static const char *const burst_mode[] = {"Vector Neon, Tx Offloads:",
-						 "Scalar, Tx Offloads:"
-	};
-	uint32_t i;
-
-	/* Update burst mode info */
-	rc = rte_strscpy(mode->info + bytes, burst_mode[dev->scalar_ena],
-			 str_size - bytes);
-	if (rc < 0)
-		goto done;
-
-	bytes += rc;
-
-	/* Update Tx offload info */
-	for (i = 0; i < RTE_DIM(tx_offload_map); i++) {
-		if (dev->tx_offload_flags & tx_offload_map[i].flags) {
-			rc = rte_strscpy(mode->info + bytes,
-					 tx_offload_map[i].output,
-					 str_size - bytes);
-			if (rc < 0)
-				goto done;
-
-			bytes += rc;
-		}
-	}
-
-done:
-	return 0;
-}
-
-static void
-nix_rx_head_tail_get(struct otx2_eth_dev *dev,
-		     uint32_t *head, uint32_t *tail, uint16_t queue_idx)
-{
-	uint64_t reg, val;
-
-	if (head == NULL || tail == NULL)
-		return;
-
-	reg = (((uint64_t)queue_idx) << 32);
-	val = otx2_atomic64_add_nosync(reg, (int64_t *)
-				       (dev->base + NIX_LF_CQ_OP_STATUS));
-	if (val & (OP_ERR | CQ_ERR))
-		val = 0;
-
-	*tail = (uint32_t)(val & 0xFFFFF);
-	*head = (uint32_t)((val >> 20) & 0xFFFFF);
-}
-
-uint32_t
-otx2_nix_rx_queue_count(void *rx_queue)
-{
-	struct otx2_eth_rxq *rxq = rx_queue;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(rxq->eth_dev);
-	uint32_t head, tail;
-
-	nix_rx_head_tail_get(dev, &head, &tail, rxq->rq);
-	return (tail - head) % rxq->qlen;
-}
-
-static inline int
-nix_offset_has_packet(uint32_t head, uint32_t tail, uint16_t offset)
-{
-	/* Check given offset(queue index) has packet filled by HW */
-	if (tail > head && offset <= tail && offset >= head)
-		return 1;
-	/* Wrap around case */
-	if (head > tail && (offset >= head || offset <= tail))
-		return 1;
-
-	return 0;
-}
-
-int
-otx2_nix_rx_descriptor_status(void *rx_queue, uint16_t offset)
-{
-	struct otx2_eth_rxq *rxq = rx_queue;
-	uint32_t head, tail;
-
-	if (rxq->qlen <= offset)
-		return -EINVAL;
-
-	nix_rx_head_tail_get(otx2_eth_pmd_priv(rxq->eth_dev),
-			     &head, &tail, rxq->rq);
-
-	if (nix_offset_has_packet(head, tail, offset))
-		return RTE_ETH_RX_DESC_DONE;
-	else
-		return RTE_ETH_RX_DESC_AVAIL;
-}
-
-static void
-nix_tx_head_tail_get(struct otx2_eth_dev *dev,
-		     uint32_t *head, uint32_t *tail, uint16_t queue_idx)
-{
-	uint64_t reg, val;
-
-	if (head == NULL || tail == NULL)
-		return;
-
-	reg = (((uint64_t)queue_idx) << 32);
-	val = otx2_atomic64_add_nosync(reg, (int64_t *)
-				       (dev->base + NIX_LF_SQ_OP_STATUS));
-	if (val & OP_ERR)
-		val = 0;
-
-	*tail = (uint32_t)((val >> 28) & 0x3F);
-	*head = (uint32_t)((val >> 20) & 0x3F);
-}
-
-int
-otx2_nix_tx_descriptor_status(void *tx_queue, uint16_t offset)
-{
-	struct otx2_eth_txq *txq = tx_queue;
-	uint32_t head, tail;
-
-	if (txq->qconf.nb_desc <= offset)
-		return -EINVAL;
-
-	nix_tx_head_tail_get(txq->dev, &head, &tail, txq->sq);
-
-	if (nix_offset_has_packet(head, tail, offset))
-		return RTE_ETH_TX_DESC_DONE;
-	else
-		return RTE_ETH_TX_DESC_FULL;
-}
-
-/* It is a NOP for octeontx2 as HW frees the buffer on xmit */
-int
-otx2_nix_tx_done_cleanup(void *txq, uint32_t free_cnt)
-{
-	RTE_SET_USED(txq);
-	RTE_SET_USED(free_cnt);
-
-	return 0;
-}
-
-int
-otx2_nix_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
-			size_t fw_size)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc = (int)fw_size;
-
-	if (fw_size > sizeof(dev->mkex_pfl_name))
-		rc = sizeof(dev->mkex_pfl_name);
-
-	rc = strlcpy(fw_version, (char *)dev->mkex_pfl_name, rc);
-
-	rc += 1; /* Add the size of '\0' */
-	if (fw_size < (size_t)rc)
-		return rc;
-
-	return 0;
-}
-
-int
-otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool)
-{
-	RTE_SET_USED(eth_dev);
-
-	if (!strcmp(pool, rte_mbuf_platform_mempool_ops()))
-		return 0;
-
-	return -ENOTSUP;
-}
-
-int
-otx2_nix_dev_flow_ops_get(struct rte_eth_dev *eth_dev __rte_unused,
-			  const struct rte_flow_ops **ops)
-{
-	*ops = &otx2_flow_ops;
-	return 0;
-}
-
-static struct cgx_fw_data *
-nix_get_fwdata(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct cgx_fw_data *rsp = NULL;
-	int rc;
-
-	otx2_mbox_alloc_msg_cgx_get_aux_link_info(mbox);
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc) {
-		otx2_err("Failed to get fw data: %d", rc);
-		return NULL;
-	}
-
-	return rsp;
-}
-
-int
-otx2_nix_get_module_info(struct rte_eth_dev *eth_dev,
-			 struct rte_eth_dev_module_info *modinfo)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct cgx_fw_data *rsp;
-
-	rsp = nix_get_fwdata(dev);
-	if (rsp == NULL)
-		return -EIO;
-
-	modinfo->type = rsp->fwdata.sfp_eeprom.sff_id;
-	modinfo->eeprom_len = SFP_EEPROM_SIZE;
-
-	return 0;
-}
-
-int
-otx2_nix_get_module_eeprom(struct rte_eth_dev *eth_dev,
-			   struct rte_dev_eeprom_info *info)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct cgx_fw_data *rsp;
-
-	if (info->offset + info->length > SFP_EEPROM_SIZE)
-		return -EINVAL;
-
-	rsp = nix_get_fwdata(dev);
-	if (rsp == NULL)
-		return -EIO;
-
-	otx2_mbox_memcpy(info->data, rsp->fwdata.sfp_eeprom.buf + info->offset,
-			 info->length);
-
-	return 0;
-}
-
-int
-otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	devinfo->min_rx_bufsize = NIX_MIN_FRS;
-	devinfo->max_rx_pktlen = NIX_MAX_FRS;
-	devinfo->max_rx_queues = RTE_MAX_QUEUES_PER_PORT;
-	devinfo->max_tx_queues = RTE_MAX_QUEUES_PER_PORT;
-	devinfo->max_mac_addrs = dev->max_mac_entries;
-	devinfo->max_vfs = pci_dev->max_vfs;
-	devinfo->max_mtu = devinfo->max_rx_pktlen - NIX_L2_OVERHEAD;
-	devinfo->min_mtu = devinfo->min_rx_bufsize - NIX_L2_OVERHEAD;
-	if (dev->configured && otx2_ethdev_is_ptp_en(dev)) {
-		devinfo->max_mtu -=  NIX_TIMESYNC_RX_OFFSET;
-		devinfo->min_mtu -=  NIX_TIMESYNC_RX_OFFSET;
-		devinfo->max_rx_pktlen -= NIX_TIMESYNC_RX_OFFSET;
-	}
-
-	devinfo->rx_offload_capa = dev->rx_offload_capa;
-	devinfo->tx_offload_capa = dev->tx_offload_capa;
-	devinfo->rx_queue_offload_capa = 0;
-	devinfo->tx_queue_offload_capa = 0;
-
-	devinfo->reta_size = dev->rss_info.rss_size;
-	devinfo->hash_key_size = NIX_HASH_KEY_SIZE;
-	devinfo->flow_type_rss_offloads = NIX_RSS_OFFLOAD;
-
-	devinfo->default_rxconf = (struct rte_eth_rxconf) {
-		.rx_drop_en = 0,
-		.offloads = 0,
-	};
-
-	devinfo->default_txconf = (struct rte_eth_txconf) {
-		.offloads = 0,
-	};
-
-	devinfo->default_rxportconf = (struct rte_eth_dev_portconf) {
-		.ring_size = NIX_RX_DEFAULT_RING_SZ,
-	};
-
-	devinfo->rx_desc_lim = (struct rte_eth_desc_lim) {
-		.nb_max = UINT16_MAX,
-		.nb_min = NIX_RX_MIN_DESC,
-		.nb_align = NIX_RX_MIN_DESC_ALIGN,
-		.nb_seg_max = NIX_RX_NB_SEG_MAX,
-		.nb_mtu_seg_max = NIX_RX_NB_SEG_MAX,
-	};
-	devinfo->rx_desc_lim.nb_max =
-		RTE_ALIGN_MUL_FLOOR(devinfo->rx_desc_lim.nb_max,
-				    NIX_RX_MIN_DESC_ALIGN);
-
-	devinfo->tx_desc_lim = (struct rte_eth_desc_lim) {
-		.nb_max = UINT16_MAX,
-		.nb_min = 1,
-		.nb_align = 1,
-		.nb_seg_max = NIX_TX_NB_SEG_MAX,
-		.nb_mtu_seg_max = NIX_TX_NB_SEG_MAX,
-	};
-
-	/* Auto negotiation disabled */
-	devinfo->speed_capa = RTE_ETH_LINK_SPEED_FIXED;
-	if (!otx2_dev_is_vf_or_sdp(dev) && !otx2_dev_is_lbk(dev)) {
-		devinfo->speed_capa |= RTE_ETH_LINK_SPEED_1G | RTE_ETH_LINK_SPEED_10G |
-			RTE_ETH_LINK_SPEED_25G | RTE_ETH_LINK_SPEED_40G;
-
-		/* 50G and 100G to be supported for board version C0
-		 * and above.
-		 */
-		if (!otx2_dev_is_Ax(dev))
-			devinfo->speed_capa |= RTE_ETH_LINK_SPEED_50G |
-					       RTE_ETH_LINK_SPEED_100G;
-	}
-
-	devinfo->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
-				RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
-	devinfo->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;
-
-	return 0;
-}
diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.c b/drivers/net/octeontx2/otx2_ethdev_sec.c
deleted file mode 100644
index 4d40184de4..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev_sec.c
+++ /dev/null
@@ -1,923 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#include <rte_cryptodev.h>
-#include <rte_esp.h>
-#include <rte_ethdev.h>
-#include <rte_eventdev.h>
-#include <rte_ip.h>
-#include <rte_malloc.h>
-#include <rte_memzone.h>
-#include <rte_security.h>
-#include <rte_security_driver.h>
-#include <rte_udp.h>
-
-#include "otx2_common.h"
-#include "otx2_cryptodev_qp.h"
-#include "otx2_ethdev.h"
-#include "otx2_ethdev_sec.h"
-#include "otx2_ipsec_fp.h"
-#include "otx2_sec_idev.h"
-#include "otx2_security.h"
-
-#define ERR_STR_SZ 256
-
-struct eth_sec_tag_const {
-	RTE_STD_C11
-	union {
-		struct {
-			uint32_t rsvd_11_0  : 12;
-			uint32_t port       : 8;
-			uint32_t event_type : 4;
-			uint32_t rsvd_31_24 : 8;
-		};
-		uint32_t u32;
-	};
-};
-
-static struct rte_cryptodev_capabilities otx2_eth_sec_crypto_caps[] = {
-	{	/* AES GCM */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AEAD,
-			{.aead = {
-				.algo = RTE_CRYPTO_AEAD_AES_GCM,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.digest_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				},
-				.aad_size = {
-					.min = 8,
-					.max = 12,
-					.increment = 4
-				},
-				.iv_size = {
-					.min = 12,
-					.max = 12,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* AES CBC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
-			{.cipher = {
-				.algo = RTE_CRYPTO_CIPHER_AES_CBC,
-				.block_size = 16,
-				.key_size = {
-					.min = 16,
-					.max = 32,
-					.increment = 8
-				},
-				.iv_size = {
-					.min = 16,
-					.max = 16,
-					.increment = 0
-				}
-			}, }
-		}, }
-	},
-	{	/* SHA1 HMAC */
-		.op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
-		{.sym = {
-			.xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
-			{.auth = {
-				.algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
-				.block_size = 64,
-				.key_size = {
-					.min = 20,
-					.max = 64,
-					.increment = 1
-				},
-				.digest_size = {
-					.min = 12,
-					.max = 12,
-					.increment = 0
-				},
-			}, }
-		}, }
-	},
-	RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
-};
-
-static const struct rte_security_capability otx2_eth_sec_capabilities[] = {
-	{	/* IPsec Inline Protocol ESP Tunnel Ingress */
-		.action = RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL,
-		.protocol = RTE_SECURITY_PROTOCOL_IPSEC,
-		.ipsec = {
-			.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
-			.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
-			.direction = RTE_SECURITY_IPSEC_SA_DIR_INGRESS,
-			.options = { 0 }
-		},
-		.crypto_capabilities = otx2_eth_sec_crypto_caps,
-		.ol_flags = RTE_SECURITY_TX_OLOAD_NEED_MDATA
-	},
-	{	/* IPsec Inline Protocol ESP Tunnel Egress */
-		.action = RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL,
-		.protocol = RTE_SECURITY_PROTOCOL_IPSEC,
-		.ipsec = {
-			.proto = RTE_SECURITY_IPSEC_SA_PROTO_ESP,
-			.mode = RTE_SECURITY_IPSEC_SA_MODE_TUNNEL,
-			.direction = RTE_SECURITY_IPSEC_SA_DIR_EGRESS,
-			.options = { 0 }
-		},
-		.crypto_capabilities = otx2_eth_sec_crypto_caps,
-		.ol_flags = RTE_SECURITY_TX_OLOAD_NEED_MDATA
-	},
-	{
-		.action = RTE_SECURITY_ACTION_TYPE_NONE
-	}
-};
-
-static void
-lookup_mem_sa_tbl_clear(struct rte_eth_dev *eth_dev)
-{
-	static const char name[] = OTX2_NIX_FASTPATH_LOOKUP_MEM;
-	uint16_t port = eth_dev->data->port_id;
-	const struct rte_memzone *mz;
-	uint64_t **sa_tbl;
-	uint8_t *mem;
-
-	mz = rte_memzone_lookup(name);
-	if (mz == NULL)
-		return;
-
-	mem = mz->addr;
-
-	sa_tbl  = (uint64_t **)RTE_PTR_ADD(mem, OTX2_NIX_SA_TBL_START);
-	if (sa_tbl[port] == NULL)
-		return;
-
-	rte_free(sa_tbl[port]);
-	sa_tbl[port] = NULL;
-}
-
-static int
-lookup_mem_sa_index_update(struct rte_eth_dev *eth_dev, int spi, void *sa,
-			   char *err_str)
-{
-	static const char name[] = OTX2_NIX_FASTPATH_LOOKUP_MEM;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint16_t port = eth_dev->data->port_id;
-	const struct rte_memzone *mz;
-	uint64_t **sa_tbl;
-	uint8_t *mem;
-
-	mz = rte_memzone_lookup(name);
-	if (mz == NULL) {
-		snprintf(err_str, ERR_STR_SZ,
-			 "Could not find fastpath lookup table");
-		return -EINVAL;
-	}
-
-	mem = mz->addr;
-
-	sa_tbl = (uint64_t **)RTE_PTR_ADD(mem, OTX2_NIX_SA_TBL_START);
-
-	if (sa_tbl[port] == NULL) {
-		sa_tbl[port] = rte_malloc(NULL, dev->ipsec_in_max_spi *
-					  sizeof(uint64_t), 0);
-	}
-
-	sa_tbl[port][spi] = (uint64_t)sa;
-
-	return 0;
-}
-
-static inline void
-in_sa_mz_name_get(char *name, int size, uint16_t port)
-{
-	snprintf(name, size, "otx2_ipsec_in_sadb_%u", port);
-}
-
-static struct otx2_ipsec_fp_in_sa *
-in_sa_get(uint16_t port, int sa_index)
-{
-	char name[RTE_MEMZONE_NAMESIZE];
-	struct otx2_ipsec_fp_in_sa *sa;
-	const struct rte_memzone *mz;
-
-	in_sa_mz_name_get(name, RTE_MEMZONE_NAMESIZE, port);
-	mz = rte_memzone_lookup(name);
-	if (mz == NULL) {
-		otx2_err("Could not get the memzone reserved for IN SA DB");
-		return NULL;
-	}
-
-	sa = mz->addr;
-
-	return sa + sa_index;
-}
-
-static int
-ipsec_sa_const_set(struct rte_security_ipsec_xform *ipsec,
-		   struct rte_crypto_sym_xform *xform,
-		   struct otx2_sec_session_ipsec_ip *sess)
-{
-	struct rte_crypto_sym_xform *cipher_xform, *auth_xform;
-
-	sess->partial_len = sizeof(struct rte_ipv4_hdr);
-
-	if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_ESP) {
-		sess->partial_len += sizeof(struct rte_esp_hdr);
-		sess->roundup_len = sizeof(struct rte_esp_tail);
-	} else if (ipsec->proto == RTE_SECURITY_IPSEC_SA_PROTO_AH) {
-		sess->partial_len += OTX2_SEC_AH_HDR_LEN;
-	} else {
-		return -EINVAL;
-	}
-
-	if (ipsec->options.udp_encap)
-		sess->partial_len += sizeof(struct rte_udp_hdr);
-
-	if (xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		if (xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM) {
-			sess->partial_len += OTX2_SEC_AES_GCM_IV_LEN;
-			sess->partial_len += OTX2_SEC_AES_GCM_MAC_LEN;
-			sess->roundup_byte = OTX2_SEC_AES_GCM_ROUNDUP_BYTE_LEN;
-		}
-		return 0;
-	}
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_EGRESS) {
-		cipher_xform = xform;
-		auth_xform = xform->next;
-	} else if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
-		auth_xform = xform;
-		cipher_xform = xform->next;
-	} else {
-		return -EINVAL;
-	}
-	if (cipher_xform->cipher.algo == RTE_CRYPTO_CIPHER_AES_CBC) {
-		sess->partial_len += OTX2_SEC_AES_CBC_IV_LEN;
-		sess->roundup_byte = OTX2_SEC_AES_CBC_ROUNDUP_BYTE_LEN;
-	} else {
-		return -EINVAL;
-	}
-
-	if (auth_xform->auth.algo == RTE_CRYPTO_AUTH_SHA1_HMAC)
-		sess->partial_len += OTX2_SEC_SHA1_HMAC_LEN;
-	else
-		return -EINVAL;
-
-	return 0;
-}
-
-static int
-hmac_init(struct otx2_ipsec_fp_sa_ctl *ctl, struct otx2_cpt_qp *qp,
-	  const uint8_t *auth_key, int len, uint8_t *hmac_key)
-{
-	struct inst_data {
-		struct otx2_cpt_res cpt_res;
-		uint8_t buffer[64];
-	} *md;
-
-	volatile struct otx2_cpt_res *res;
-	uint64_t timeout, lmt_status;
-	struct otx2_cpt_inst_s inst;
-	rte_iova_t md_iova;
-	int ret;
-
-	memset(&inst, 0, sizeof(struct otx2_cpt_inst_s));
-
-	md = rte_zmalloc(NULL, sizeof(struct inst_data), OTX2_CPT_RES_ALIGN);
-	if (md == NULL)
-		return -ENOMEM;
-
-	memcpy(md->buffer, auth_key, len);
-
-	md_iova = rte_malloc_virt2iova(md);
-	if (md_iova == RTE_BAD_IOVA) {
-		ret = -EINVAL;
-		goto free_md;
-	}
-
-	inst.res_addr = md_iova + offsetof(struct inst_data, cpt_res);
-	inst.opcode = OTX2_CPT_OP_WRITE_HMAC_IPAD_OPAD;
-	inst.param2 = ctl->auth_type;
-	inst.dlen = len;
-	inst.dptr = md_iova + offsetof(struct inst_data, buffer);
-	inst.rptr = inst.dptr;
-	inst.egrp = OTX2_CPT_EGRP_INLINE_IPSEC;
-
-	md->cpt_res.compcode = 0;
-	md->cpt_res.uc_compcode = 0xff;
-
-	timeout = rte_get_timer_cycles() + 5 * rte_get_timer_hz();
-
-	rte_io_wmb();
-
-	do {
-		otx2_lmt_mov(qp->lmtline, &inst, 2);
-		lmt_status = otx2_lmt_submit(qp->lf_nq_reg);
-	} while (lmt_status == 0);
-
-	res = (volatile struct otx2_cpt_res *)&md->cpt_res;
-
-	/* Wait until instruction completes or times out */
-	while (res->uc_compcode == 0xff) {
-		if (rte_get_timer_cycles() > timeout)
-			break;
-	}
-
-	if (res->u16[0] != OTX2_SEC_COMP_GOOD) {
-		ret = -EIO;
-		goto free_md;
-	}
-
-	/* Retrieve the ipad and opad from rptr */
-	memcpy(hmac_key, md->buffer, 48);
-
-	ret = 0;
-
-free_md:
-	rte_free(md);
-	return ret;
-}
-
-static int
-eth_sec_ipsec_out_sess_create(struct rte_eth_dev *eth_dev,
-			      struct rte_security_ipsec_xform *ipsec,
-			      struct rte_crypto_sym_xform *crypto_xform,
-			      struct rte_security_session *sec_sess)
-{
-	struct rte_crypto_sym_xform *auth_xform, *cipher_xform;
-	struct otx2_sec_session_ipsec_ip *sess;
-	uint16_t port = eth_dev->data->port_id;
-	int cipher_key_len, auth_key_len, ret;
-	const uint8_t *cipher_key, *auth_key;
-	struct otx2_ipsec_fp_sa_ctl *ctl;
-	struct otx2_ipsec_fp_out_sa *sa;
-	struct otx2_sec_session *priv;
-	struct otx2_cpt_inst_s inst;
-	struct otx2_cpt_qp *qp;
-
-	priv = get_sec_session_private_data(sec_sess);
-	priv->ipsec.dir = RTE_SECURITY_IPSEC_SA_DIR_EGRESS;
-	sess = &priv->ipsec.ip;
-
-	sa = &sess->out_sa;
-	ctl = &sa->ctl;
-	if (ctl->valid) {
-		otx2_err("SA already registered");
-		return -EINVAL;
-	}
-
-	memset(sess, 0, sizeof(struct otx2_sec_session_ipsec_ip));
-
-	sess->seq = 1;
-
-	ret = ipsec_sa_const_set(ipsec, crypto_xform, sess);
-	if (ret < 0)
-		return ret;
-
-	if (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD)
-		memcpy(sa->nonce, &ipsec->salt, 4);
-
-	if (ipsec->options.udp_encap == 1) {
-		sa->udp_src = 4500;
-		sa->udp_dst = 4500;
-	}
-
-	if (ipsec->mode == RTE_SECURITY_IPSEC_SA_MODE_TUNNEL) {
-		/* Start ip id from 1 */
-		sess->ip_id = 1;
-
-		if (ipsec->tunnel.type == RTE_SECURITY_IPSEC_TUNNEL_IPV4) {
-			memcpy(&sa->ip_src, &ipsec->tunnel.ipv4.src_ip,
-			       sizeof(struct in_addr));
-			memcpy(&sa->ip_dst, &ipsec->tunnel.ipv4.dst_ip,
-			       sizeof(struct in_addr));
-		} else {
-			return -EINVAL;
-		}
-	} else {
-		return -EINVAL;
-	}
-
-	cipher_xform = crypto_xform;
-	auth_xform = crypto_xform->next;
-
-	cipher_key_len = 0;
-	auth_key_len = 0;
-	auth_key = NULL;
-
-	if (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		cipher_key = crypto_xform->aead.key.data;
-		cipher_key_len = crypto_xform->aead.key.length;
-	} else {
-		cipher_key = cipher_xform->cipher.key.data;
-		cipher_key_len = cipher_xform->cipher.key.length;
-		auth_key = auth_xform->auth.key.data;
-		auth_key_len = auth_xform->auth.key.length;
-	}
-
-	if (cipher_key_len != 0)
-		memcpy(sa->cipher_key, cipher_key, cipher_key_len);
-	else
-		return -EINVAL;
-
-	/* Determine word 7 of CPT instruction */
-	inst.u64[7] = 0;
-	inst.egrp = OTX2_CPT_EGRP_INLINE_IPSEC;
-	inst.cptr = rte_mempool_virt2iova(sa);
-	sess->inst_w7 = inst.u64[7];
-
-	/* Get CPT QP to be used for this SA */
-	ret = otx2_sec_idev_tx_cpt_qp_get(port, &qp);
-	if (ret)
-		return ret;
-
-	sess->qp = qp;
-
-	sess->cpt_lmtline = qp->lmtline;
-	sess->cpt_nq_reg = qp->lf_nq_reg;
-
-	/* Populate control word */
-	ret = ipsec_fp_sa_ctl_set(ipsec, crypto_xform, ctl);
-	if (ret)
-		goto cpt_put;
-
-	if (auth_key_len && auth_key) {
-		ret = hmac_init(ctl, qp, auth_key, auth_key_len, sa->hmac_key);
-		if (ret)
-			goto cpt_put;
-	}
-
-	rte_io_wmb();
-	ctl->valid = 1;
-
-	return 0;
-cpt_put:
-	otx2_sec_idev_tx_cpt_qp_put(sess->qp);
-	return ret;
-}
-
-static int
-eth_sec_ipsec_in_sess_create(struct rte_eth_dev *eth_dev,
-			     struct rte_security_ipsec_xform *ipsec,
-			     struct rte_crypto_sym_xform *crypto_xform,
-			     struct rte_security_session *sec_sess)
-{
-	struct rte_crypto_sym_xform *auth_xform, *cipher_xform;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_sec_session_ipsec_ip *sess;
-	uint16_t port = eth_dev->data->port_id;
-	int cipher_key_len, auth_key_len, ret;
-	const uint8_t *cipher_key, *auth_key;
-	struct otx2_ipsec_fp_sa_ctl *ctl;
-	struct otx2_ipsec_fp_in_sa *sa;
-	struct otx2_sec_session *priv;
-	char err_str[ERR_STR_SZ];
-	struct otx2_cpt_qp *qp;
-
-	memset(err_str, 0, ERR_STR_SZ);
-
-	if (ipsec->spi >= dev->ipsec_in_max_spi) {
-		otx2_err("SPI exceeds max supported");
-		return -EINVAL;
-	}
-
-	sa = in_sa_get(port, ipsec->spi);
-	if (sa == NULL)
-		return -ENOMEM;
-
-	ctl = &sa->ctl;
-
-	priv = get_sec_session_private_data(sec_sess);
-	priv->ipsec.dir = RTE_SECURITY_IPSEC_SA_DIR_INGRESS;
-	sess = &priv->ipsec.ip;
-
-	rte_spinlock_lock(&dev->ipsec_tbl_lock);
-
-	if (ctl->valid) {
-		snprintf(err_str, ERR_STR_SZ, "SA already registered");
-		ret = -EEXIST;
-		goto tbl_unlock;
-	}
-
-	memset(sa, 0, sizeof(struct otx2_ipsec_fp_in_sa));
-
-	auth_xform = crypto_xform;
-	cipher_xform = crypto_xform->next;
-
-	cipher_key_len = 0;
-	auth_key_len = 0;
-	auth_key = NULL;
-
-	if (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) {
-		if (crypto_xform->aead.algo == RTE_CRYPTO_AEAD_AES_GCM)
-			memcpy(sa->nonce, &ipsec->salt, 4);
-		cipher_key = crypto_xform->aead.key.data;
-		cipher_key_len = crypto_xform->aead.key.length;
-	} else {
-		cipher_key = cipher_xform->cipher.key.data;
-		cipher_key_len = cipher_xform->cipher.key.length;
-		auth_key = auth_xform->auth.key.data;
-		auth_key_len = auth_xform->auth.key.length;
-	}
-
-	if (cipher_key_len != 0) {
-		memcpy(sa->cipher_key, cipher_key, cipher_key_len);
-	} else {
-		snprintf(err_str, ERR_STR_SZ, "Invalid cipher key len");
-		ret = -EINVAL;
-		goto sa_clear;
-	}
-
-	sess->in_sa = sa;
-
-	sa->userdata = priv->userdata;
-
-	sa->replay_win_sz = ipsec->replay_win_sz;
-
-	if (lookup_mem_sa_index_update(eth_dev, ipsec->spi, sa, err_str)) {
-		ret = -EINVAL;
-		goto sa_clear;
-	}
-
-	ret = ipsec_fp_sa_ctl_set(ipsec, crypto_xform, ctl);
-	if (ret) {
-		snprintf(err_str, ERR_STR_SZ,
-			"Could not set SA CTL word (err: %d)", ret);
-		goto sa_clear;
-	}
-
-	if (auth_key_len && auth_key) {
-		/* Get a queue pair for HMAC init */
-		ret = otx2_sec_idev_tx_cpt_qp_get(port, &qp);
-		if (ret) {
-			snprintf(err_str, ERR_STR_SZ, "Could not get CPT QP");
-			goto sa_clear;
-		}
-
-		ret = hmac_init(ctl, qp, auth_key, auth_key_len, sa->hmac_key);
-		otx2_sec_idev_tx_cpt_qp_put(qp);
-		if (ret) {
-			snprintf(err_str, ERR_STR_SZ, "Could not put CPT QP");
-			goto sa_clear;
-		}
-	}
-
-	if (sa->replay_win_sz) {
-		if (sa->replay_win_sz > OTX2_IPSEC_MAX_REPLAY_WIN_SZ) {
-			snprintf(err_str, ERR_STR_SZ,
-				 "Replay window size is not supported");
-			ret = -ENOTSUP;
-			goto sa_clear;
-		}
-		sa->replay = rte_zmalloc(NULL, sizeof(struct otx2_ipsec_replay),
-				0);
-		if (sa->replay == NULL) {
-			snprintf(err_str, ERR_STR_SZ,
-				"Could not allocate memory");
-			ret = -ENOMEM;
-			goto sa_clear;
-		}
-
-		rte_spinlock_init(&sa->replay->lock);
-		/*
-		 * Set window bottom to 1, base and top to size of
-		 * window
-		 */
-		sa->replay->winb = 1;
-		sa->replay->wint = sa->replay_win_sz;
-		sa->replay->base = sa->replay_win_sz;
-		sa->esn_low = 0;
-		sa->esn_hi = 0;
-	}
-
-	rte_io_wmb();
-	ctl->valid = 1;
-
-	rte_spinlock_unlock(&dev->ipsec_tbl_lock);
-	return 0;
-
-sa_clear:
-	memset(sa, 0, sizeof(struct otx2_ipsec_fp_in_sa));
-
-tbl_unlock:
-	rte_spinlock_unlock(&dev->ipsec_tbl_lock);
-
-	otx2_err("%s", err_str);
-
-	return ret;
-}
-
-static int
-eth_sec_ipsec_sess_create(struct rte_eth_dev *eth_dev,
-			  struct rte_security_ipsec_xform *ipsec,
-			  struct rte_crypto_sym_xform *crypto_xform,
-			  struct rte_security_session *sess)
-{
-	int ret;
-
-	ret = ipsec_fp_xform_verify(ipsec, crypto_xform);
-	if (ret)
-		return ret;
-
-	if (ipsec->direction == RTE_SECURITY_IPSEC_SA_DIR_INGRESS)
-		return eth_sec_ipsec_in_sess_create(eth_dev, ipsec,
-						    crypto_xform, sess);
-	else
-		return eth_sec_ipsec_out_sess_create(eth_dev, ipsec,
-						     crypto_xform, sess);
-}
-
-static int
-otx2_eth_sec_session_create(void *device,
-			    struct rte_security_session_conf *conf,
-			    struct rte_security_session *sess,
-			    struct rte_mempool *mempool)
-{
-	struct otx2_sec_session *priv;
-	int ret;
-
-	if (conf->action_type != RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL)
-		return -ENOTSUP;
-
-	if (rte_mempool_get(mempool, (void **)&priv)) {
-		otx2_err("Could not allocate security session private data");
-		return -ENOMEM;
-	}
-
-	set_sec_session_private_data(sess, priv);
-
-	/*
-	 * Save userdata provided by the application. For ingress packets, this
-	 * could be used to identify the SA.
-	 */
-	priv->userdata = conf->userdata;
-
-	if (conf->protocol == RTE_SECURITY_PROTOCOL_IPSEC)
-		ret = eth_sec_ipsec_sess_create(device, &conf->ipsec,
-						conf->crypto_xform,
-						sess);
-	else
-		ret = -ENOTSUP;
-
-	if (ret)
-		goto mempool_put;
-
-	return 0;
-
-mempool_put:
-	rte_mempool_put(mempool, priv);
-	set_sec_session_private_data(sess, NULL);
-	return ret;
-}
-
-static void
-otx2_eth_sec_free_anti_replay(struct otx2_ipsec_fp_in_sa *sa)
-{
-	if (sa != NULL) {
-		if (sa->replay_win_sz && sa->replay)
-			rte_free(sa->replay);
-	}
-}
-
-static int
-otx2_eth_sec_session_destroy(void *device,
-			     struct rte_security_session *sess)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(device);
-	struct otx2_sec_session_ipsec_ip *sess_ip;
-	struct otx2_ipsec_fp_in_sa *sa;
-	struct otx2_sec_session *priv;
-	struct rte_mempool *sess_mp;
-	int ret;
-
-	priv = get_sec_session_private_data(sess);
-	if (priv == NULL)
-		return -EINVAL;
-
-	sess_ip = &priv->ipsec.ip;
-
-	if (priv->ipsec.dir == RTE_SECURITY_IPSEC_SA_DIR_INGRESS) {
-		rte_spinlock_lock(&dev->ipsec_tbl_lock);
-		sa = sess_ip->in_sa;
-
-		/* Release the anti replay window */
-		otx2_eth_sec_free_anti_replay(sa);
-
-		/* Clear SA table entry */
-		if (sa != NULL) {
-			sa->ctl.valid = 0;
-			rte_io_wmb();
-		}
-
-		rte_spinlock_unlock(&dev->ipsec_tbl_lock);
-	}
-
-	/* Release CPT LF used for this session */
-	if (sess_ip->qp != NULL) {
-		ret = otx2_sec_idev_tx_cpt_qp_put(sess_ip->qp);
-		if (ret)
-			return ret;
-	}
-
-	sess_mp = rte_mempool_from_obj(priv);
-
-	set_sec_session_private_data(sess, NULL);
-	rte_mempool_put(sess_mp, priv);
-
-	return 0;
-}
-
-static unsigned int
-otx2_eth_sec_session_get_size(void *device __rte_unused)
-{
-	return sizeof(struct otx2_sec_session);
-}
-
-static const struct rte_security_capability *
-otx2_eth_sec_capabilities_get(void *device __rte_unused)
-{
-	return otx2_eth_sec_capabilities;
-}
-
-static struct rte_security_ops otx2_eth_sec_ops = {
-	.session_create		= otx2_eth_sec_session_create,
-	.session_destroy	= otx2_eth_sec_session_destroy,
-	.session_get_size	= otx2_eth_sec_session_get_size,
-	.capabilities_get	= otx2_eth_sec_capabilities_get
-};
-
-int
-otx2_eth_sec_ctx_create(struct rte_eth_dev *eth_dev)
-{
-	struct rte_security_ctx *ctx;
-	int ret;
-
-	ctx = rte_malloc("otx2_eth_sec_ctx",
-			 sizeof(struct rte_security_ctx), 0);
-	if (ctx == NULL)
-		return -ENOMEM;
-
-	ret = otx2_sec_idev_cfg_init(eth_dev->data->port_id);
-	if (ret) {
-		rte_free(ctx);
-		return ret;
-	}
-
-	/* Populate ctx */
-
-	ctx->device = eth_dev;
-	ctx->ops = &otx2_eth_sec_ops;
-	ctx->sess_cnt = 0;
-	ctx->flags =
-		(RTE_SEC_CTX_F_FAST_SET_MDATA | RTE_SEC_CTX_F_FAST_GET_UDATA);
-
-	eth_dev->security_ctx = ctx;
-
-	return 0;
-}
-
-void
-otx2_eth_sec_ctx_destroy(struct rte_eth_dev *eth_dev)
-{
-	rte_free(eth_dev->security_ctx);
-}
-
-static int
-eth_sec_ipsec_cfg(struct rte_eth_dev *eth_dev, uint8_t tt)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint16_t port = eth_dev->data->port_id;
-	struct nix_inline_ipsec_lf_cfg *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct eth_sec_tag_const tag_const;
-	char name[RTE_MEMZONE_NAMESIZE];
-	const struct rte_memzone *mz;
-
-	in_sa_mz_name_get(name, RTE_MEMZONE_NAMESIZE, port);
-	mz = rte_memzone_lookup(name);
-	if (mz == NULL)
-		return -EINVAL;
-
-	req = otx2_mbox_alloc_msg_nix_inline_ipsec_lf_cfg(mbox);
-	req->enable = 1;
-	req->sa_base_addr = mz->iova;
-
-	req->ipsec_cfg0.tt = tt;
-
-	tag_const.u32 = 0;
-	tag_const.event_type = RTE_EVENT_TYPE_ETHDEV;
-	tag_const.port = port;
-	req->ipsec_cfg0.tag_const = tag_const.u32;
-
-	req->ipsec_cfg0.sa_pow2_size =
-			rte_log2_u32(sizeof(struct otx2_ipsec_fp_in_sa));
-	req->ipsec_cfg0.lenm1_max = NIX_MAX_FRS - 1;
-
-	req->ipsec_cfg1.sa_idx_w = rte_log2_u32(dev->ipsec_in_max_spi);
-	req->ipsec_cfg1.sa_idx_max = dev->ipsec_in_max_spi - 1;
-
-	return otx2_mbox_process(mbox);
-}
-
-int
-otx2_eth_sec_update_tag_type(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_rsp *rsp;
-	struct nix_aq_enq_req *aq;
-	int ret;
-
-	aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	aq->qidx = 0; /* Read RQ:0 context */
-	aq->ctype = NIX_AQ_CTYPE_RQ;
-	aq->op = NIX_AQ_INSTOP_READ;
-
-	ret = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (ret < 0) {
-		otx2_err("Could not read RQ context");
-		return ret;
-	}
-
-	/* Update tag type */
-	ret = eth_sec_ipsec_cfg(eth_dev, rsp->rq.sso_tt);
-	if (ret < 0)
-		otx2_err("Could not update sec eth tag type");
-
-	return ret;
-}
-
-int
-otx2_eth_sec_init(struct rte_eth_dev *eth_dev)
-{
-	const size_t sa_width = sizeof(struct otx2_ipsec_fp_in_sa);
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint16_t port = eth_dev->data->port_id;
-	char name[RTE_MEMZONE_NAMESIZE];
-	const struct rte_memzone *mz;
-	int mz_sz, ret;
-	uint16_t nb_sa;
-
-	RTE_BUILD_BUG_ON(sa_width < 32 || sa_width > 512 ||
-			 !RTE_IS_POWER_OF_2(sa_width));
-
-	if (!(dev->tx_offloads & RTE_ETH_TX_OFFLOAD_SECURITY) &&
-	    !(dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY))
-		return 0;
-
-	if (rte_security_dynfield_register() < 0)
-		return -rte_errno;
-
-	nb_sa = dev->ipsec_in_max_spi;
-	mz_sz = nb_sa * sa_width;
-	in_sa_mz_name_get(name, RTE_MEMZONE_NAMESIZE, port);
-	mz = rte_memzone_reserve_aligned(name, mz_sz, rte_socket_id(),
-					 RTE_MEMZONE_IOVA_CONTIG, OTX2_ALIGN);
-
-	if (mz == NULL) {
-		otx2_err("Could not allocate inbound SA DB");
-		return -ENOMEM;
-	}
-
-	memset(mz->addr, 0, mz_sz);
-
-	ret = eth_sec_ipsec_cfg(eth_dev, SSO_TT_ORDERED);
-	if (ret < 0) {
-		otx2_err("Could not configure inline IPsec");
-		goto sec_fini;
-	}
-
-	rte_spinlock_init(&dev->ipsec_tbl_lock);
-
-	return 0;
-
-sec_fini:
-	otx2_err("Could not configure device for security");
-	otx2_eth_sec_fini(eth_dev);
-	return ret;
-}
-
-void
-otx2_eth_sec_fini(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint16_t port = eth_dev->data->port_id;
-	char name[RTE_MEMZONE_NAMESIZE];
-
-	if (!(dev->tx_offloads & RTE_ETH_TX_OFFLOAD_SECURITY) &&
-	    !(dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY))
-		return;
-
-	lookup_mem_sa_tbl_clear(eth_dev);
-
-	in_sa_mz_name_get(name, RTE_MEMZONE_NAMESIZE, port);
-	rte_memzone_free(rte_memzone_lookup(name));
-}
diff --git a/drivers/net/octeontx2/otx2_ethdev_sec.h b/drivers/net/octeontx2/otx2_ethdev_sec.h
deleted file mode 100644
index 298b00bf89..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev_sec.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright (C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_ETHDEV_SEC_H__
-#define __OTX2_ETHDEV_SEC_H__
-
-#include <rte_ethdev.h>
-
-#include "otx2_ipsec_fp.h"
-#include "otx2_ipsec_po.h"
-
-#define OTX2_CPT_RES_ALIGN		16
-#define OTX2_NIX_SEND_DESC_ALIGN	16
-#define OTX2_CPT_INST_SIZE		64
-
-#define OTX2_CPT_EGRP_INLINE_IPSEC	1
-
-#define OTX2_CPT_OP_INLINE_IPSEC_OUTB		(0x40 | 0x25)
-#define OTX2_CPT_OP_INLINE_IPSEC_INB		(0x40 | 0x26)
-#define OTX2_CPT_OP_WRITE_HMAC_IPAD_OPAD	(0x40 | 0x27)
-
-#define OTX2_SEC_CPT_COMP_GOOD	0x1
-#define OTX2_SEC_UC_COMP_GOOD	0x0
-#define OTX2_SEC_COMP_GOOD	(OTX2_SEC_UC_COMP_GOOD << 8 | \
-				 OTX2_SEC_CPT_COMP_GOOD)
-
-/* CPT Result */
-struct otx2_cpt_res {
-	union {
-		struct {
-			uint64_t compcode:8;
-			uint64_t uc_compcode:8;
-			uint64_t doneint:1;
-			uint64_t reserved_17_63:47;
-			uint64_t reserved_64_127;
-		};
-		uint16_t u16[8];
-	};
-};
-
-struct otx2_cpt_inst_s {
-	union {
-		struct {
-			/* W0 */
-			uint64_t nixtxl : 3;
-			uint64_t doneint : 1;
-			uint64_t nixtx_addr : 60;
-			/* W1 */
-			uint64_t res_addr : 64;
-			/* W2 */
-			uint64_t tag : 32;
-			uint64_t tt : 2;
-			uint64_t grp : 10;
-			uint64_t rsvd_175_172 : 4;
-			uint64_t rvu_pf_func : 16;
-			/* W3 */
-			uint64_t qord : 1;
-			uint64_t rsvd_194_193 : 2;
-			uint64_t wqe_ptr : 61;
-			/* W4 */
-			uint64_t dlen : 16;
-			uint64_t param2 : 16;
-			uint64_t param1 : 16;
-			uint64_t opcode : 16;
-			/* W5 */
-			uint64_t dptr : 64;
-			/* W6 */
-			uint64_t rptr : 64;
-			/* W7 */
-			uint64_t cptr : 61;
-			uint64_t egrp : 3;
-		};
-		uint64_t u64[8];
-	};
-};
-
-/*
- * Security session for inline IPsec protocol offload. This is private data of
- * inline capable PMD.
- */
-struct otx2_sec_session_ipsec_ip {
-	RTE_STD_C11
-	union {
-		/*
-		 * Inbound SA would accessed by crypto block. And so the memory
-		 * is allocated differently and shared with the h/w. Only
-		 * holding a pointer to this memory in the session private
-		 * space.
-		 */
-		void *in_sa;
-		/* Outbound SA */
-		struct otx2_ipsec_fp_out_sa out_sa;
-	};
-
-	/* Address of CPT LMTLINE */
-	void *cpt_lmtline;
-	/* CPT LF enqueue register address */
-	rte_iova_t cpt_nq_reg;
-
-	/* Pre calculated lengths and data for a session */
-	uint8_t partial_len;
-	uint8_t roundup_len;
-	uint8_t roundup_byte;
-	uint16_t ip_id;
-	union {
-		uint64_t esn;
-		struct {
-			uint32_t seq;
-			uint32_t esn_hi;
-		};
-	};
-
-	uint64_t inst_w7;
-
-	/* CPT QP used by SA */
-	struct otx2_cpt_qp *qp;
-};
-
-int otx2_eth_sec_ctx_create(struct rte_eth_dev *eth_dev);
-
-void otx2_eth_sec_ctx_destroy(struct rte_eth_dev *eth_dev);
-
-int otx2_eth_sec_update_tag_type(struct rte_eth_dev *eth_dev);
-
-int otx2_eth_sec_init(struct rte_eth_dev *eth_dev);
-
-void otx2_eth_sec_fini(struct rte_eth_dev *eth_dev);
-
-#endif /* __OTX2_ETHDEV_SEC_H__ */
diff --git a/drivers/net/octeontx2/otx2_ethdev_sec_tx.h b/drivers/net/octeontx2/otx2_ethdev_sec_tx.h
deleted file mode 100644
index 021782009f..0000000000
--- a/drivers/net/octeontx2/otx2_ethdev_sec_tx.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2020 Marvell International Ltd.
- */
-
-#ifndef __OTX2_ETHDEV_SEC_TX_H__
-#define __OTX2_ETHDEV_SEC_TX_H__
-
-#include <rte_security.h>
-#include <rte_mbuf.h>
-
-#include "otx2_ethdev_sec.h"
-#include "otx2_security.h"
-
-struct otx2_ipsec_fp_out_hdr {
-	uint32_t ip_id;
-	uint32_t seq;
-	uint8_t iv[16];
-};
-
-static __rte_always_inline int32_t
-otx2_ipsec_fp_out_rlen_get(struct otx2_sec_session_ipsec_ip *sess,
-			   uint32_t plen)
-{
-	uint32_t enc_payload_len;
-
-	enc_payload_len = RTE_ALIGN_CEIL(plen + sess->roundup_len,
-			sess->roundup_byte);
-
-	return sess->partial_len + enc_payload_len;
-}
-
-static __rte_always_inline void
-otx2_ssogws_head_wait(uint64_t base);
-
-static __rte_always_inline int
-otx2_sec_event_tx(uint64_t base, struct rte_event *ev, struct rte_mbuf *m,
-		  const struct otx2_eth_txq *txq, const uint32_t offload_flags)
-{
-	uint32_t dlen, rlen, desc_headroom, extend_head, extend_tail;
-	struct otx2_sec_session_ipsec_ip *sess;
-	struct otx2_ipsec_fp_out_hdr *hdr;
-	struct otx2_ipsec_fp_out_sa *sa;
-	uint64_t data_addr, desc_addr;
-	struct otx2_sec_session *priv;
-	struct otx2_cpt_inst_s inst;
-	uint64_t lmt_status;
-	char *data;
-
-	struct desc {
-		struct otx2_cpt_res cpt_res __rte_aligned(OTX2_CPT_RES_ALIGN);
-		struct nix_send_hdr_s nix_hdr
-				__rte_aligned(OTX2_NIX_SEND_DESC_ALIGN);
-		union nix_send_sg_s nix_sg;
-		struct nix_iova_s nix_iova;
-	} *sd;
-
-	priv = (struct otx2_sec_session *)(*rte_security_dynfield(m));
-	sess = &priv->ipsec.ip;
-	sa = &sess->out_sa;
-
-	RTE_ASSERT(sess->cpt_lmtline != NULL);
-	RTE_ASSERT(!(offload_flags & NIX_TX_OFFLOAD_VLAN_QINQ_F));
-
-	dlen = rte_pktmbuf_pkt_len(m) + sizeof(*hdr) - RTE_ETHER_HDR_LEN;
-	rlen = otx2_ipsec_fp_out_rlen_get(sess, dlen - sizeof(*hdr));
-
-	RTE_BUILD_BUG_ON(OTX2_CPT_RES_ALIGN % OTX2_NIX_SEND_DESC_ALIGN);
-	RTE_BUILD_BUG_ON(sizeof(sd->cpt_res) % OTX2_NIX_SEND_DESC_ALIGN);
-
-	extend_head = sizeof(*hdr);
-	extend_tail = rlen - dlen;
-
-	desc_headroom = (OTX2_CPT_RES_ALIGN - 1) + sizeof(*sd);
-
-	if (unlikely(!rte_pktmbuf_is_contiguous(m)) ||
-	    unlikely(rte_pktmbuf_headroom(m) < extend_head + desc_headroom) ||
-	    unlikely(rte_pktmbuf_tailroom(m) < extend_tail)) {
-		goto drop;
-	}
-
-	/*
-	 * Extend mbuf data to point to the expected packet buffer for NIX.
-	 * This includes the Ethernet header followed by the encrypted IPsec
-	 * payload
-	 */
-	rte_pktmbuf_append(m, extend_tail);
-	data = rte_pktmbuf_prepend(m, extend_head);
-	data_addr = rte_pktmbuf_iova(m);
-
-	/*
-	 * Move the Ethernet header, to insert otx2_ipsec_fp_out_hdr prior
-	 * to the IP header
-	 */
-	memcpy(data, data + sizeof(*hdr), RTE_ETHER_HDR_LEN);
-
-	hdr = (struct otx2_ipsec_fp_out_hdr *)(data + RTE_ETHER_HDR_LEN);
-
-	if (sa->ctl.enc_type == OTX2_IPSEC_FP_SA_ENC_AES_GCM) {
-		/* AES-128-GCM */
-		memcpy(hdr->iv, &sa->nonce, 4);
-		memset(hdr->iv + 4, 0, 12); //TODO: make it random
-	} else {
-		/* AES-128-[CBC] + [SHA1] */
-		memset(hdr->iv, 0, 16); //TODO: make it random
-	}
-
-	/* Keep CPT result and NIX send descriptors in headroom */
-	sd = (void *)RTE_PTR_ALIGN(data - desc_headroom, OTX2_CPT_RES_ALIGN);
-	desc_addr = data_addr - RTE_PTR_DIFF(data, sd);
-
-	/* Prepare CPT instruction */
-
-	inst.nixtx_addr = (desc_addr + offsetof(struct desc, nix_hdr)) >> 4;
-	inst.doneint = 0;
-	inst.nixtxl = 1;
-	inst.res_addr = desc_addr + offsetof(struct desc, cpt_res);
-	inst.u64[2] = 0;
-	inst.u64[3] = 0;
-	inst.wqe_ptr = desc_addr >> 3;	/* FIXME: Handle errors */
-	inst.qord = 1;
-	inst.opcode = OTX2_CPT_OP_INLINE_IPSEC_OUTB;
-	inst.dlen = dlen;
-	inst.dptr = data_addr + RTE_ETHER_HDR_LEN;
-	inst.u64[7] = sess->inst_w7;
-
-	/* First word contains 8 bit completion code & 8 bit uc comp code */
-	sd->cpt_res.u16[0] = 0;
-
-	/* Prepare NIX send descriptors for output expected from CPT */
-
-	sd->nix_hdr.w0.u = 0;
-	sd->nix_hdr.w1.u = 0;
-	sd->nix_hdr.w0.sq = txq->sq;
-	sd->nix_hdr.w0.sizem1 = 1;
-	sd->nix_hdr.w0.total = rte_pktmbuf_data_len(m);
-	sd->nix_hdr.w0.aura = npa_lf_aura_handle_to_aura(m->pool->pool_id);
-	if (offload_flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)
-		sd->nix_hdr.w0.df = otx2_nix_prefree_seg(m);
-
-	sd->nix_sg.u = 0;
-	sd->nix_sg.subdc = NIX_SUBDC_SG;
-	sd->nix_sg.ld_type = NIX_SENDLDTYPE_LDD;
-	sd->nix_sg.segs = 1;
-	sd->nix_sg.seg1_size = rte_pktmbuf_data_len(m);
-
-	sd->nix_iova.addr = rte_mbuf_data_iova(m);
-
-	/* Mark mempool object as "put" since it is freed by NIX */
-	RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
-
-	if (!ev->sched_type)
-		otx2_ssogws_head_wait(base + SSOW_LF_GWS_TAG);
-
-	inst.param1 = sess->esn_hi >> 16;
-	inst.param2 = sess->esn_hi & 0xffff;
-
-	hdr->seq = rte_cpu_to_be_32(sess->seq);
-	hdr->ip_id = rte_cpu_to_be_32(sess->ip_id);
-
-	sess->ip_id++;
-	sess->esn++;
-
-	rte_io_wmb();
-
-	do {
-		otx2_lmt_mov(sess->cpt_lmtline, &inst, 2);
-		lmt_status = otx2_lmt_submit(sess->cpt_nq_reg);
-	} while (lmt_status == 0);
-
-	return 1;
-
-drop:
-	if (offload_flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
-		/* Don't free if reference count > 1 */
-		if (rte_pktmbuf_prefree_seg(m) == NULL)
-			return 0;
-	}
-	rte_pktmbuf_free(m);
-	return 0;
-}
-
-#endif /* __OTX2_ETHDEV_SEC_TX_H__ */
diff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c
deleted file mode 100644
index 1d0fe4e950..0000000000
--- a/drivers/net/octeontx2/otx2_flow.c
+++ /dev/null
@@ -1,1189 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-#include "otx2_ethdev_sec.h"
-#include "otx2_flow.h"
-
-enum flow_vtag_cfg_dir { VTAG_TX, VTAG_RX };
-
-int
-otx2_flow_free_all_resources(struct otx2_eth_dev *hw)
-{
-	struct otx2_npc_flow_info *npc = &hw->npc_flow;
-	struct otx2_mbox *mbox = hw->mbox;
-	struct otx2_mcam_ents_info *info;
-	struct rte_bitmap *bmap;
-	struct rte_flow *flow;
-	int entry_count = 0;
-	int rc, idx;
-
-	for (idx = 0; idx < npc->flow_max_priority; idx++) {
-		info = &npc->flow_entry_info[idx];
-		entry_count += info->live_ent;
-	}
-
-	if (entry_count == 0)
-		return 0;
-
-	/* Free all MCAM entries allocated */
-	rc = otx2_flow_mcam_free_all_entries(mbox);
-
-	/* Free any MCAM counters and delete flow list */
-	for (idx = 0; idx < npc->flow_max_priority; idx++) {
-		while ((flow = TAILQ_FIRST(&npc->flow_list[idx])) != NULL) {
-			if (flow->ctr_id != NPC_COUNTER_NONE)
-				rc |= otx2_flow_mcam_free_counter(mbox,
-							     flow->ctr_id);
-
-			TAILQ_REMOVE(&npc->flow_list[idx], flow, next);
-			rte_free(flow);
-			bmap = npc->live_entries[flow->priority];
-			rte_bitmap_clear(bmap, flow->mcam_id);
-		}
-		info = &npc->flow_entry_info[idx];
-		info->free_ent = 0;
-		info->live_ent = 0;
-	}
-	return rc;
-}
-
-
-static int
-flow_program_npc(struct otx2_parse_state *pst, struct otx2_mbox *mbox,
-		 struct otx2_npc_flow_info *flow_info)
-{
-	/* This is non-LDATA part in search key */
-	uint64_t key_data[2] = {0ULL, 0ULL};
-	uint64_t key_mask[2] = {0ULL, 0ULL};
-	int intf = pst->flow->nix_intf;
-	int key_len, bit = 0, index;
-	int off, idx, data_off = 0;
-	uint8_t lid, mask, data;
-	uint16_t layer_info;
-	uint64_t lt, flags;
-
-
-	/* Skip till Layer A data start */
-	while (bit < NPC_PARSE_KEX_S_LA_OFFSET) {
-		if (flow_info->keyx_supp_nmask[intf] & (1 << bit))
-			data_off++;
-		bit++;
-	}
-
-	/* Each bit represents 1 nibble */
-	data_off *= 4;
-
-	index = 0;
-	for (lid = 0; lid < NPC_MAX_LID; lid++) {
-		/* Offset in key */
-		off = NPC_PARSE_KEX_S_LID_OFFSET(lid);
-		lt = pst->lt[lid] & 0xf;
-		flags = pst->flags[lid] & 0xff;
-
-		/* NPC_LAYER_KEX_S */
-		layer_info = ((flow_info->keyx_supp_nmask[intf] >> off) & 0x7);
-
-		if (layer_info) {
-			for (idx = 0; idx <= 2 ; idx++) {
-				if (layer_info & (1 << idx)) {
-					if (idx == 2)
-						data = lt;
-					else if (idx == 1)
-						data = ((flags >> 4) & 0xf);
-					else
-						data = (flags & 0xf);
-
-					if (data_off >= 64) {
-						data_off = 0;
-						index++;
-					}
-					key_data[index] |= ((uint64_t)data <<
-							    data_off);
-					mask = 0xf;
-					if (lt == 0)
-						mask = 0;
-					key_mask[index] |= ((uint64_t)mask <<
-							    data_off);
-					data_off += 4;
-				}
-			}
-		}
-	}
-
-	otx2_npc_dbg("Npc prog key data0: 0x%" PRIx64 ", data1: 0x%" PRIx64,
-		     key_data[0], key_data[1]);
-
-	/* Copy this into mcam string */
-	key_len = (pst->npc->keyx_len[intf] + 7) / 8;
-	otx2_npc_dbg("Key_len  = %d", key_len);
-	memcpy(pst->flow->mcam_data, key_data, key_len);
-	memcpy(pst->flow->mcam_mask, key_mask, key_len);
-
-	otx2_npc_dbg("Final flow data");
-	for (idx = 0; idx < OTX2_MAX_MCAM_WIDTH_DWORDS; idx++) {
-		otx2_npc_dbg("data[%d]: 0x%" PRIx64 ", mask[%d]: 0x%" PRIx64,
-			     idx, pst->flow->mcam_data[idx],
-			     idx, pst->flow->mcam_mask[idx]);
-	}
-
-	/*
-	 * Now we have mcam data and mask formatted as
-	 * [Key_len/4 nibbles][0 or 1 nibble hole][data]
-	 * hole is present if key_len is odd number of nibbles.
-	 * mcam data must be split into 64 bits + 48 bits segments
-	 * for each back W0, W1.
-	 */
-
-	return otx2_flow_mcam_alloc_and_write(pst->flow, mbox, pst, flow_info);
-}
-
-static int
-flow_parse_attr(struct rte_eth_dev *eth_dev,
-		const struct rte_flow_attr *attr,
-		struct rte_flow_error *error,
-		struct rte_flow *flow)
-{
-	struct otx2_eth_dev *dev = eth_dev->data->dev_private;
-	const char *errmsg = NULL;
-
-	if (attr == NULL)
-		errmsg = "Attribute can't be empty";
-	else if (attr->group)
-		errmsg = "Groups are not supported";
-	else if (attr->priority >= dev->npc_flow.flow_max_priority)
-		errmsg = "Priority should be with in specified range";
-	else if ((!attr->egress && !attr->ingress) ||
-		 (attr->egress && attr->ingress))
-		errmsg = "Exactly one of ingress or egress must be set";
-
-	if (errmsg != NULL) {
-		rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ATTR,
-				   attr, errmsg);
-		return -ENOTSUP;
-	}
-
-	if (attr->ingress)
-		flow->nix_intf = OTX2_INTF_RX;
-	else
-		flow->nix_intf = OTX2_INTF_TX;
-
-	flow->priority = attr->priority;
-	return 0;
-}
-
-static inline int
-flow_get_free_rss_grp(struct rte_bitmap *bmap,
-		      uint32_t size, uint32_t *pos)
-{
-	for (*pos = 0; *pos < size; ++*pos) {
-		if (!rte_bitmap_get(bmap, *pos))
-			break;
-	}
-
-	return *pos < size ? 0 : -1;
-}
-
-static int
-flow_configure_rss_action(struct otx2_eth_dev *dev,
-			  const struct rte_flow_action_rss *rss,
-			  uint8_t *alg_idx, uint32_t *rss_grp,
-			  int mcam_index)
-{
-	struct otx2_npc_flow_info *flow_info = &dev->npc_flow;
-	uint16_t reta[NIX_RSS_RETA_SIZE_MAX];
-	uint32_t flowkey_cfg, grp_aval, i;
-	uint16_t *ind_tbl = NULL;
-	uint8_t flowkey_algx;
-	int rc;
-
-	rc = flow_get_free_rss_grp(flow_info->rss_grp_entries,
-				   flow_info->rss_grps, &grp_aval);
-	/* RSS group :0 is not usable for flow rss action */
-	if (rc < 0 || grp_aval == 0)
-		return -ENOSPC;
-
-	*rss_grp = grp_aval;
-
-	otx2_nix_rss_set_key(dev, (uint8_t *)(uintptr_t)rss->key,
-			     rss->key_len);
-
-	/* If queue count passed in the rss action is less than
-	 * HW configured reta size, replicate rss action reta
-	 * across HW reta table.
-	 */
-	if (dev->rss_info.rss_size > rss->queue_num) {
-		ind_tbl = reta;
-
-		for (i = 0; i < (dev->rss_info.rss_size / rss->queue_num); i++)
-			memcpy(reta + i * rss->queue_num, rss->queue,
-			       sizeof(uint16_t) * rss->queue_num);
-
-		i = dev->rss_info.rss_size % rss->queue_num;
-		if (i)
-			memcpy(&reta[dev->rss_info.rss_size] - i,
-			       rss->queue, i * sizeof(uint16_t));
-	} else {
-		ind_tbl = (uint16_t *)(uintptr_t)rss->queue;
-	}
-
-	rc = otx2_nix_rss_tbl_init(dev, *rss_grp, ind_tbl);
-	if (rc) {
-		otx2_err("Failed to init rss table rc = %d", rc);
-		return rc;
-	}
-
-	flowkey_cfg = otx2_rss_ethdev_to_nix(dev, rss->types, rss->level);
-
-	rc = otx2_rss_set_hf(dev, flowkey_cfg, &flowkey_algx,
-			     *rss_grp, mcam_index);
-	if (rc) {
-		otx2_err("Failed to set rss hash function rc = %d", rc);
-		return rc;
-	}
-
-	*alg_idx = flowkey_algx;
-
-	rte_bitmap_set(flow_info->rss_grp_entries, *rss_grp);
-
-	return 0;
-}
-
-
-static int
-flow_program_rss_action(struct rte_eth_dev *eth_dev,
-			const struct rte_flow_action actions[],
-			struct rte_flow *flow)
-{
-	struct otx2_eth_dev *dev = eth_dev->data->dev_private;
-	const struct rte_flow_action_rss *rss;
-	uint32_t rss_grp;
-	uint8_t alg_idx;
-	int rc;
-
-	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
-		if (actions->type == RTE_FLOW_ACTION_TYPE_RSS) {
-			rss = (const struct rte_flow_action_rss *)actions->conf;
-
-			rc = flow_configure_rss_action(dev,
-						       rss, &alg_idx, &rss_grp,
-						       flow->mcam_id);
-			if (rc)
-				return rc;
-
-			flow->npc_action &= (~(0xfULL));
-			flow->npc_action |= NIX_RX_ACTIONOP_RSS;
-			flow->npc_action |=
-				((uint64_t)(alg_idx & NIX_RSS_ACT_ALG_MASK) <<
-				 NIX_RSS_ACT_ALG_OFFSET) |
-				((uint64_t)(rss_grp & NIX_RSS_ACT_GRP_MASK) <<
-				 NIX_RSS_ACT_GRP_OFFSET);
-		}
-	}
-	return 0;
-}
-
-static int
-flow_free_rss_action(struct rte_eth_dev *eth_dev,
-		     struct rte_flow *flow)
-{
-	struct otx2_eth_dev *dev = eth_dev->data->dev_private;
-	struct otx2_npc_flow_info *npc = &dev->npc_flow;
-	uint32_t rss_grp;
-
-	if (flow->npc_action & NIX_RX_ACTIONOP_RSS) {
-		rss_grp = (flow->npc_action >> NIX_RSS_ACT_GRP_OFFSET) &
-			NIX_RSS_ACT_GRP_MASK;
-		if (rss_grp == 0 || rss_grp >= npc->rss_grps)
-			return -EINVAL;
-
-		rte_bitmap_clear(npc->rss_grp_entries, rss_grp);
-	}
-
-	return 0;
-}
-
-static int
-flow_update_sec_tt(struct rte_eth_dev *eth_dev,
-		   const struct rte_flow_action actions[])
-{
-	int rc = 0;
-
-	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
-		if (actions->type == RTE_FLOW_ACTION_TYPE_SECURITY) {
-			rc = otx2_eth_sec_update_tag_type(eth_dev);
-			break;
-		}
-	}
-
-	return rc;
-}
-
-static int
-flow_parse_meta_items(__rte_unused struct otx2_parse_state *pst)
-{
-	otx2_npc_dbg("Meta Item");
-	return 0;
-}
-
-/*
- * Parse function of each layer:
- *  - Consume one or more patterns that are relevant.
- *  - Update parse_state
- *  - Set parse_state.pattern = last item consumed
- *  - Set appropriate error code/message when returning error.
- */
-typedef int (*flow_parse_stage_func_t)(struct otx2_parse_state *pst);
-
-static int
-flow_parse_pattern(struct rte_eth_dev *dev,
-		   const struct rte_flow_item pattern[],
-		   struct rte_flow_error *error,
-		   struct rte_flow *flow,
-		   struct otx2_parse_state *pst)
-{
-	flow_parse_stage_func_t parse_stage_funcs[] = {
-		flow_parse_meta_items,
-		otx2_flow_parse_higig2_hdr,
-		otx2_flow_parse_la,
-		otx2_flow_parse_lb,
-		otx2_flow_parse_lc,
-		otx2_flow_parse_ld,
-		otx2_flow_parse_le,
-		otx2_flow_parse_lf,
-		otx2_flow_parse_lg,
-		otx2_flow_parse_lh,
-	};
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	uint8_t layer = 0;
-	int key_offset;
-	int rc;
-
-	if (pattern == NULL) {
-		rte_flow_error_set(error, EINVAL,
-				   RTE_FLOW_ERROR_TYPE_ITEM_NUM, NULL,
-				   "pattern is NULL");
-		return -EINVAL;
-	}
-
-	memset(pst, 0, sizeof(*pst));
-	pst->npc = &hw->npc_flow;
-	pst->error = error;
-	pst->flow = flow;
-
-	/* Use integral byte offset */
-	key_offset = pst->npc->keyx_len[flow->nix_intf];
-	key_offset = (key_offset + 7) / 8;
-
-	/* Location where LDATA would begin */
-	pst->mcam_data = (uint8_t *)flow->mcam_data;
-	pst->mcam_mask = (uint8_t *)flow->mcam_mask;
-
-	while (pattern->type != RTE_FLOW_ITEM_TYPE_END &&
-	       layer < RTE_DIM(parse_stage_funcs)) {
-		otx2_npc_dbg("Pattern type = %d", pattern->type);
-
-		/* Skip place-holders */
-		pattern = otx2_flow_skip_void_and_any_items(pattern);
-
-		pst->pattern = pattern;
-		otx2_npc_dbg("Is tunnel = %d, layer = %d", pst->tunnel, layer);
-		rc = parse_stage_funcs[layer](pst);
-		if (rc != 0)
-			return -rte_errno;
-
-		layer++;
-
-		/*
-		 * Parse stage function sets pst->pattern to
-		 * 1 past the last item it consumed.
-		 */
-		pattern = pst->pattern;
-
-		if (pst->terminate)
-			break;
-	}
-
-	/* Skip trailing place-holders */
-	pattern = otx2_flow_skip_void_and_any_items(pattern);
-
-	/* Are there more items than what we can handle? */
-	if (pattern->type != RTE_FLOW_ITEM_TYPE_END) {
-		rte_flow_error_set(error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_ITEM, pattern,
-				   "unsupported item in the sequence");
-		return -ENOTSUP;
-	}
-
-	return 0;
-}
-
-static int
-flow_parse_rule(struct rte_eth_dev *dev,
-		const struct rte_flow_attr *attr,
-		const struct rte_flow_item pattern[],
-		const struct rte_flow_action actions[],
-		struct rte_flow_error *error,
-		struct rte_flow *flow,
-		struct otx2_parse_state *pst)
-{
-	int err;
-
-	/* Check attributes */
-	err = flow_parse_attr(dev, attr, error, flow);
-	if (err)
-		return err;
-
-	/* Check actions */
-	err = otx2_flow_parse_actions(dev, attr, actions, error, flow);
-	if (err)
-		return err;
-
-	/* Check pattern */
-	err = flow_parse_pattern(dev, pattern, error, flow, pst);
-	if (err)
-		return err;
-
-	/* Check for overlaps? */
-	return 0;
-}
-
-static int
-otx2_flow_validate(struct rte_eth_dev *dev,
-		   const struct rte_flow_attr *attr,
-		   const struct rte_flow_item pattern[],
-		   const struct rte_flow_action actions[],
-		   struct rte_flow_error *error)
-{
-	struct otx2_parse_state parse_state;
-	struct rte_flow flow;
-
-	memset(&flow, 0, sizeof(flow));
-	return flow_parse_rule(dev, attr, pattern, actions, error, &flow,
-			       &parse_state);
-}
-
-static int
-flow_program_vtag_action(struct rte_eth_dev *eth_dev,
-			 const struct rte_flow_action actions[],
-			 struct rte_flow *flow)
-{
-	uint16_t vlan_id = 0, vlan_ethtype = RTE_ETHER_TYPE_VLAN;
-	struct otx2_eth_dev *dev = eth_dev->data->dev_private;
-	union {
-		uint64_t reg;
-		struct nix_tx_vtag_action_s act;
-	} tx_vtag_action;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_vtag_config *vtag_cfg;
-	struct nix_vtag_config_rsp *rsp;
-	bool vlan_insert_action = false;
-	uint64_t rx_vtag_action = 0;
-	uint8_t vlan_pcp = 0;
-	int rc;
-
-	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
-		if (actions->type == RTE_FLOW_ACTION_TYPE_OF_POP_VLAN) {
-			if (dev->npc_flow.vtag_actions == 1) {
-				vtag_cfg =
-					otx2_mbox_alloc_msg_nix_vtag_cfg(mbox);
-				vtag_cfg->cfg_type = VTAG_RX;
-				vtag_cfg->rx.strip_vtag = 1;
-				/* Always capture */
-				vtag_cfg->rx.capture_vtag = 1;
-				vtag_cfg->vtag_size = NIX_VTAGSIZE_T4;
-				vtag_cfg->rx.vtag_type = 0;
-
-				rc = otx2_mbox_process(mbox);
-				if (rc)
-					return rc;
-			}
-
-			rx_vtag_action |= (NIX_RX_VTAGACTION_VTAG_VALID << 15);
-			rx_vtag_action |= (NPC_LID_LB << 8);
-			rx_vtag_action |= NIX_RX_VTAGACTION_VTAG0_RELPTR;
-			flow->vtag_action = rx_vtag_action;
-		} else if (actions->type ==
-			   RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID) {
-			const struct rte_flow_action_of_set_vlan_vid *vtag =
-				(const struct rte_flow_action_of_set_vlan_vid *)
-					actions->conf;
-			vlan_id = rte_be_to_cpu_16(vtag->vlan_vid);
-			if (vlan_id > 0xfff) {
-				otx2_err("Invalid vlan_id for set vlan action");
-				return -EINVAL;
-			}
-			vlan_insert_action = true;
-		} else if (actions->type == RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN) {
-			const struct rte_flow_action_of_push_vlan *ethtype =
-				(const struct rte_flow_action_of_push_vlan *)
-					actions->conf;
-			vlan_ethtype = rte_be_to_cpu_16(ethtype->ethertype);
-			if (vlan_ethtype != RTE_ETHER_TYPE_VLAN &&
-			    vlan_ethtype != RTE_ETHER_TYPE_QINQ) {
-				otx2_err("Invalid ethtype specified for push"
-					 " vlan action");
-				return -EINVAL;
-			}
-			vlan_insert_action = true;
-		} else if (actions->type ==
-			   RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP) {
-			const struct rte_flow_action_of_set_vlan_pcp *pcp =
-				(const struct rte_flow_action_of_set_vlan_pcp *)
-					actions->conf;
-			vlan_pcp = pcp->vlan_pcp;
-			if (vlan_pcp > 0x7) {
-				otx2_err("Invalid PCP value for pcp action");
-				return -EINVAL;
-			}
-			vlan_insert_action = true;
-		}
-	}
-
-	if (vlan_insert_action) {
-		vtag_cfg = otx2_mbox_alloc_msg_nix_vtag_cfg(mbox);
-		vtag_cfg->cfg_type = VTAG_TX;
-		vtag_cfg->vtag_size = NIX_VTAGSIZE_T4;
-		vtag_cfg->tx.vtag0 =
-			((vlan_ethtype << 16) | (vlan_pcp << 13) | vlan_id);
-		vtag_cfg->tx.cfg_vtag0 = 1;
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc)
-			return rc;
-
-		tx_vtag_action.reg = 0;
-		tx_vtag_action.act.vtag0_def = rsp->vtag0_idx;
-		if (tx_vtag_action.act.vtag0_def < 0) {
-			otx2_err("Failed to config TX VTAG action");
-			return -EINVAL;
-		}
-		tx_vtag_action.act.vtag0_lid = NPC_LID_LA;
-		tx_vtag_action.act.vtag0_op = NIX_TX_VTAGOP_INSERT;
-		tx_vtag_action.act.vtag0_relptr =
-			NIX_TX_VTAGACTION_VTAG0_RELPTR;
-		flow->vtag_action = tx_vtag_action.reg;
-	}
-	return 0;
-}
-
-static struct rte_flow *
-otx2_flow_create(struct rte_eth_dev *dev,
-		 const struct rte_flow_attr *attr,
-		 const struct rte_flow_item pattern[],
-		 const struct rte_flow_action actions[],
-		 struct rte_flow_error *error)
-{
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	struct otx2_parse_state parse_state;
-	struct otx2_mbox *mbox = hw->mbox;
-	struct rte_flow *flow, *flow_iter;
-	struct otx2_flow_list *list;
-	int rc;
-
-	flow = rte_zmalloc("otx2_rte_flow", sizeof(*flow), 0);
-	if (flow == NULL) {
-		rte_flow_error_set(error, ENOMEM,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Memory allocation failed");
-		return NULL;
-	}
-	memset(flow, 0, sizeof(*flow));
-
-	rc = flow_parse_rule(dev, attr, pattern, actions, error, flow,
-			     &parse_state);
-	if (rc != 0)
-		goto err_exit;
-
-	rc = flow_program_vtag_action(dev, actions, flow);
-	if (rc != 0) {
-		rte_flow_error_set(error, EIO,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Failed to program vlan action");
-		goto err_exit;
-	}
-
-	parse_state.is_vf = otx2_dev_is_vf(hw);
-
-	rc = flow_program_npc(&parse_state, mbox, &hw->npc_flow);
-	if (rc != 0) {
-		rte_flow_error_set(error, EIO,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Failed to insert filter");
-		goto err_exit;
-	}
-
-	rc = flow_program_rss_action(dev, actions, flow);
-	if (rc != 0) {
-		rte_flow_error_set(error, EIO,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Failed to program rss action");
-		goto err_exit;
-	}
-
-	if (hw->rx_offloads & RTE_ETH_RX_OFFLOAD_SECURITY) {
-		rc = flow_update_sec_tt(dev, actions);
-		if (rc != 0) {
-			rte_flow_error_set(error, EIO,
-					   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-					   NULL,
-					   "Failed to update tt with sec act");
-			goto err_exit;
-		}
-	}
-
-	list = &hw->npc_flow.flow_list[flow->priority];
-	/* List in ascending order of mcam entries */
-	TAILQ_FOREACH(flow_iter, list, next) {
-		if (flow_iter->mcam_id > flow->mcam_id) {
-			TAILQ_INSERT_BEFORE(flow_iter, flow, next);
-			return flow;
-		}
-	}
-
-	TAILQ_INSERT_TAIL(list, flow, next);
-	return flow;
-
-err_exit:
-	rte_free(flow);
-	return NULL;
-}
-
-static int
-otx2_flow_destroy(struct rte_eth_dev *dev,
-		  struct rte_flow *flow,
-		  struct rte_flow_error *error)
-{
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	struct otx2_npc_flow_info *npc = &hw->npc_flow;
-	struct otx2_mbox *mbox = hw->mbox;
-	struct rte_bitmap *bmap;
-	uint16_t match_id;
-	int rc;
-
-	match_id = (flow->npc_action >> NIX_RX_ACT_MATCH_OFFSET) &
-		NIX_RX_ACT_MATCH_MASK;
-
-	if (match_id && match_id < OTX2_FLOW_ACTION_FLAG_DEFAULT) {
-		if (rte_atomic32_read(&npc->mark_actions) == 0)
-			return -EINVAL;
-
-		/* Clear mark offload flag if there are no more mark actions */
-		if (rte_atomic32_sub_return(&npc->mark_actions, 1) == 0) {
-			hw->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;
-			otx2_eth_set_rx_function(dev);
-		}
-	}
-
-	if (flow->nix_intf == OTX2_INTF_RX && flow->vtag_action) {
-		npc->vtag_actions--;
-		if (npc->vtag_actions == 0) {
-			if (hw->vlan_info.strip_on == 0) {
-				hw->rx_offload_flags &=
-					~NIX_RX_OFFLOAD_VLAN_STRIP_F;
-				otx2_eth_set_rx_function(dev);
-			}
-		}
-	}
-
-	rc = flow_free_rss_action(dev, flow);
-	if (rc != 0) {
-		rte_flow_error_set(error, EIO,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Failed to free rss action");
-	}
-
-	rc = otx2_flow_mcam_free_entry(mbox, flow->mcam_id);
-	if (rc != 0) {
-		rte_flow_error_set(error, EIO,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Failed to destroy filter");
-	}
-
-	TAILQ_REMOVE(&npc->flow_list[flow->priority], flow, next);
-
-	bmap = npc->live_entries[flow->priority];
-	rte_bitmap_clear(bmap, flow->mcam_id);
-
-	rte_free(flow);
-	return 0;
-}
-
-static int
-otx2_flow_flush(struct rte_eth_dev *dev,
-		struct rte_flow_error *error)
-{
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	int rc;
-
-	rc = otx2_flow_free_all_resources(hw);
-	if (rc) {
-		otx2_err("Error when deleting NPC MCAM entries "
-				", counters");
-		rte_flow_error_set(error, EIO,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Failed to flush filter");
-		return -rte_errno;
-	}
-
-	return 0;
-}
-
-static int
-otx2_flow_isolate(struct rte_eth_dev *dev __rte_unused,
-		  int enable __rte_unused,
-		  struct rte_flow_error *error)
-{
-	/*
-	 * If we support, we need to un-install the default mcam
-	 * entry for this port.
-	 */
-
-	rte_flow_error_set(error, ENOTSUP,
-			   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-			   NULL,
-			   "Flow isolation not supported");
-
-	return -rte_errno;
-}
-
-static int
-otx2_flow_query(struct rte_eth_dev *dev,
-		struct rte_flow *flow,
-		const struct rte_flow_action *action,
-		void *data,
-		struct rte_flow_error *error)
-{
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	struct rte_flow_query_count *query = data;
-	struct otx2_mbox *mbox = hw->mbox;
-	const char *errmsg = NULL;
-	int errcode = ENOTSUP;
-	int rc;
-
-	if (action->type != RTE_FLOW_ACTION_TYPE_COUNT) {
-		errmsg = "Only COUNT is supported in query";
-		goto err_exit;
-	}
-
-	if (flow->ctr_id == NPC_COUNTER_NONE) {
-		errmsg = "Counter is not available";
-		goto err_exit;
-	}
-
-	rc = otx2_flow_mcam_read_counter(mbox, flow->ctr_id, &query->hits);
-	if (rc != 0) {
-		errcode = EIO;
-		errmsg = "Error reading flow counter";
-		goto err_exit;
-	}
-	query->hits_set = 1;
-	query->bytes_set = 0;
-
-	if (query->reset)
-		rc = otx2_flow_mcam_clear_counter(mbox, flow->ctr_id);
-	if (rc != 0) {
-		errcode = EIO;
-		errmsg = "Error clearing flow counter";
-		goto err_exit;
-	}
-
-	return 0;
-
-err_exit:
-	rte_flow_error_set(error, errcode,
-			   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-			   NULL,
-			   errmsg);
-	return -rte_errno;
-}
-
-static int
-otx2_flow_dev_dump(struct rte_eth_dev *dev,
-		  struct rte_flow *flow, FILE *file,
-		  struct rte_flow_error *error)
-{
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	struct otx2_flow_list *list;
-	struct rte_flow *flow_iter;
-	uint32_t max_prio, i;
-
-	if (file == NULL) {
-		rte_flow_error_set(error, EINVAL,
-				   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
-				   NULL,
-				   "Invalid file");
-		return -EINVAL;
-	}
-	if (flow != NULL) {
-		rte_flow_error_set(error, EINVAL,
-				   RTE_FLOW_ERROR_TYPE_HANDLE,
-				   NULL,
-				   "Invalid argument");
-		return -EINVAL;
-	}
-
-	max_prio = hw->npc_flow.flow_max_priority;
-
-	for (i = 0; i < max_prio; i++) {
-		list = &hw->npc_flow.flow_list[i];
-
-		/* List in ascending order of mcam entries */
-		TAILQ_FOREACH(flow_iter, list, next) {
-			otx2_flow_dump(file, hw, flow_iter);
-		}
-	}
-
-	return 0;
-}
-
-const struct rte_flow_ops otx2_flow_ops = {
-	.validate = otx2_flow_validate,
-	.create = otx2_flow_create,
-	.destroy = otx2_flow_destroy,
-	.flush = otx2_flow_flush,
-	.query = otx2_flow_query,
-	.isolate = otx2_flow_isolate,
-	.dev_dump = otx2_flow_dev_dump,
-};
-
-static int
-flow_supp_key_len(uint32_t supp_mask)
-{
-	int nib_count = 0;
-	while (supp_mask) {
-		nib_count++;
-		supp_mask &= (supp_mask - 1);
-	}
-	return nib_count * 4;
-}
-
-/* Refer HRM register:
- * NPC_AF_INTF(0..1)_LID(0..7)_LT(0..15)_LD(0..1)_CFG
- * and
- * NPC_AF_INTF(0..1)_LDATA(0..1)_FLAGS(0..15)_CFG
- **/
-#define BYTESM1_SHIFT	16
-#define HDR_OFF_SHIFT	8
-static void
-flow_update_kex_info(struct npc_xtract_info *xtract_info,
-		     uint64_t val)
-{
-	xtract_info->len = ((val >> BYTESM1_SHIFT) & 0xf) + 1;
-	xtract_info->hdr_off = (val >> HDR_OFF_SHIFT) & 0xff;
-	xtract_info->key_off = val & 0x3f;
-	xtract_info->enable = ((val >> 7) & 0x1);
-	xtract_info->flags_enable = ((val >> 6) & 0x1);
-}
-
-static void
-flow_process_mkex_cfg(struct otx2_npc_flow_info *npc,
-		      struct npc_get_kex_cfg_rsp *kex_rsp)
-{
-	volatile uint64_t (*q)[NPC_MAX_INTF][NPC_MAX_LID][NPC_MAX_LT]
-		[NPC_MAX_LD];
-	struct npc_xtract_info *x_info = NULL;
-	int lid, lt, ld, fl, ix;
-	otx2_dxcfg_t *p;
-	uint64_t keyw;
-	uint64_t val;
-
-	npc->keyx_supp_nmask[NPC_MCAM_RX] =
-		kex_rsp->rx_keyx_cfg & 0x7fffffffULL;
-	npc->keyx_supp_nmask[NPC_MCAM_TX] =
-		kex_rsp->tx_keyx_cfg & 0x7fffffffULL;
-	npc->keyx_len[NPC_MCAM_RX] =
-		flow_supp_key_len(npc->keyx_supp_nmask[NPC_MCAM_RX]);
-	npc->keyx_len[NPC_MCAM_TX] =
-		flow_supp_key_len(npc->keyx_supp_nmask[NPC_MCAM_TX]);
-
-	keyw = (kex_rsp->rx_keyx_cfg >> 32) & 0x7ULL;
-	npc->keyw[NPC_MCAM_RX] = keyw;
-	keyw = (kex_rsp->tx_keyx_cfg >> 32) & 0x7ULL;
-	npc->keyw[NPC_MCAM_TX] = keyw;
-
-	/* Update KEX_LD_FLAG */
-	for (ix = 0; ix < NPC_MAX_INTF; ix++) {
-		for (ld = 0; ld < NPC_MAX_LD; ld++) {
-			for (fl = 0; fl < NPC_MAX_LFL; fl++) {
-				x_info =
-				    &npc->prx_fxcfg[ix][ld][fl].xtract[0];
-				val = kex_rsp->intf_ld_flags[ix][ld][fl];
-				flow_update_kex_info(x_info, val);
-			}
-		}
-	}
-
-	/* Update LID, LT and LDATA cfg */
-	p = &npc->prx_dxcfg;
-	q = (volatile uint64_t (*)[][NPC_MAX_LID][NPC_MAX_LT][NPC_MAX_LD])
-			(&kex_rsp->intf_lid_lt_ld);
-	for (ix = 0; ix < NPC_MAX_INTF; ix++) {
-		for (lid = 0; lid < NPC_MAX_LID; lid++) {
-			for (lt = 0; lt < NPC_MAX_LT; lt++) {
-				for (ld = 0; ld < NPC_MAX_LD; ld++) {
-					x_info = &(*p)[ix][lid][lt].xtract[ld];
-					val = (*q)[ix][lid][lt][ld];
-					flow_update_kex_info(x_info, val);
-				}
-			}
-		}
-	}
-	/* Update LDATA Flags cfg */
-	npc->prx_lfcfg[0].i = kex_rsp->kex_ld_flags[0];
-	npc->prx_lfcfg[1].i = kex_rsp->kex_ld_flags[1];
-}
-
-static struct otx2_idev_kex_cfg *
-flow_intra_dev_kex_cfg(void)
-{
-	static const char name[] = "octeontx2_intra_device_kex_conf";
-	struct otx2_idev_kex_cfg *idev;
-	const struct rte_memzone *mz;
-
-	mz = rte_memzone_lookup(name);
-	if (mz)
-		return mz->addr;
-
-	/* Request for the first time */
-	mz = rte_memzone_reserve_aligned(name, sizeof(struct otx2_idev_kex_cfg),
-					 SOCKET_ID_ANY, 0, OTX2_ALIGN);
-	if (mz) {
-		idev = mz->addr;
-		rte_atomic16_set(&idev->kex_refcnt, 0);
-		return idev;
-	}
-	return NULL;
-}
-
-static int
-flow_fetch_kex_cfg(struct otx2_eth_dev *dev)
-{
-	struct otx2_npc_flow_info *npc = &dev->npc_flow;
-	struct npc_get_kex_cfg_rsp *kex_rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	char mkex_pfl_name[MKEX_NAME_LEN];
-	struct otx2_idev_kex_cfg *idev;
-	int rc = 0;
-
-	idev = flow_intra_dev_kex_cfg();
-	if (!idev)
-		return -ENOMEM;
-
-	/* Is kex_cfg read by any another driver? */
-	if (rte_atomic16_add_return(&idev->kex_refcnt, 1) == 1) {
-		/* Call mailbox to get key & data size */
-		(void)otx2_mbox_alloc_msg_npc_get_kex_cfg(mbox);
-		otx2_mbox_msg_send(mbox, 0);
-		rc = otx2_mbox_get_rsp(mbox, 0, (void *)&kex_rsp);
-		if (rc) {
-			otx2_err("Failed to fetch NPC keyx config");
-			goto done;
-		}
-		memcpy(&idev->kex_cfg, kex_rsp,
-		       sizeof(struct npc_get_kex_cfg_rsp));
-	}
-
-	otx2_mbox_memcpy(mkex_pfl_name,
-			 idev->kex_cfg.mkex_pfl_name, MKEX_NAME_LEN);
-
-	strlcpy((char *)dev->mkex_pfl_name,
-		mkex_pfl_name, sizeof(dev->mkex_pfl_name));
-
-	flow_process_mkex_cfg(npc, &idev->kex_cfg);
-
-done:
-	return rc;
-}
-
-#define OTX2_MCAM_TOT_ENTRIES_96XX (4096)
-#define OTX2_MCAM_TOT_ENTRIES_98XX (16384)
-
-static int otx2_mcam_tot_entries(struct otx2_eth_dev *dev)
-{
-	if (otx2_dev_is_98xx(dev))
-		return OTX2_MCAM_TOT_ENTRIES_98XX;
-	else
-		return OTX2_MCAM_TOT_ENTRIES_96XX;
-}
-
-int
-otx2_flow_init(struct otx2_eth_dev *hw)
-{
-	uint8_t *mem = NULL, *nix_mem = NULL, *npc_mem = NULL;
-	struct otx2_npc_flow_info *npc = &hw->npc_flow;
-	uint32_t bmap_sz, tot_mcam_entries = 0;
-	int rc = 0, idx;
-
-	rc = flow_fetch_kex_cfg(hw);
-	if (rc) {
-		otx2_err("Failed to fetch NPC keyx config from idev");
-		return rc;
-	}
-
-	rte_atomic32_init(&npc->mark_actions);
-	npc->vtag_actions = 0;
-
-	tot_mcam_entries = otx2_mcam_tot_entries(hw);
-	npc->mcam_entries = tot_mcam_entries >> npc->keyw[NPC_MCAM_RX];
-	/* Free, free_rev, live and live_rev entries */
-	bmap_sz = rte_bitmap_get_memory_footprint(npc->mcam_entries);
-	mem = rte_zmalloc(NULL, 4 * bmap_sz * npc->flow_max_priority,
-			  RTE_CACHE_LINE_SIZE);
-	if (mem == NULL) {
-		otx2_err("Bmap alloc failed");
-		rc = -ENOMEM;
-		return rc;
-	}
-
-	npc->flow_entry_info = rte_zmalloc(NULL, npc->flow_max_priority
-					   * sizeof(struct otx2_mcam_ents_info),
-					   0);
-	if (npc->flow_entry_info == NULL) {
-		otx2_err("flow_entry_info alloc failed");
-		rc = -ENOMEM;
-		goto err;
-	}
-
-	npc->free_entries = rte_zmalloc(NULL, npc->flow_max_priority
-					* sizeof(struct rte_bitmap *),
-					0);
-	if (npc->free_entries == NULL) {
-		otx2_err("free_entries alloc failed");
-		rc = -ENOMEM;
-		goto err;
-	}
-
-	npc->free_entries_rev = rte_zmalloc(NULL, npc->flow_max_priority
-					* sizeof(struct rte_bitmap *),
-					0);
-	if (npc->free_entries_rev == NULL) {
-		otx2_err("free_entries_rev alloc failed");
-		rc = -ENOMEM;
-		goto err;
-	}
-
-	npc->live_entries = rte_zmalloc(NULL, npc->flow_max_priority
-					* sizeof(struct rte_bitmap *),
-					0);
-	if (npc->live_entries == NULL) {
-		otx2_err("live_entries alloc failed");
-		rc = -ENOMEM;
-		goto err;
-	}
-
-	npc->live_entries_rev = rte_zmalloc(NULL, npc->flow_max_priority
-					* sizeof(struct rte_bitmap *),
-					0);
-	if (npc->live_entries_rev == NULL) {
-		otx2_err("live_entries_rev alloc failed");
-		rc = -ENOMEM;
-		goto err;
-	}
-
-	npc->flow_list = rte_zmalloc(NULL, npc->flow_max_priority
-					* sizeof(struct otx2_flow_list),
-					0);
-	if (npc->flow_list == NULL) {
-		otx2_err("flow_list alloc failed");
-		rc = -ENOMEM;
-		goto err;
-	}
-
-	npc_mem = mem;
-	for (idx = 0; idx < npc->flow_max_priority; idx++) {
-		TAILQ_INIT(&npc->flow_list[idx]);
-
-		npc->free_entries[idx] =
-			rte_bitmap_init(npc->mcam_entries, mem, bmap_sz);
-		mem += bmap_sz;
-
-		npc->free_entries_rev[idx] =
-			rte_bitmap_init(npc->mcam_entries, mem, bmap_sz);
-		mem += bmap_sz;
-
-		npc->live_entries[idx] =
-			rte_bitmap_init(npc->mcam_entries, mem, bmap_sz);
-		mem += bmap_sz;
-
-		npc->live_entries_rev[idx] =
-			rte_bitmap_init(npc->mcam_entries, mem, bmap_sz);
-		mem += bmap_sz;
-
-		npc->flow_entry_info[idx].free_ent = 0;
-		npc->flow_entry_info[idx].live_ent = 0;
-		npc->flow_entry_info[idx].max_id = 0;
-		npc->flow_entry_info[idx].min_id = ~(0);
-	}
-
-	npc->rss_grps = NIX_RSS_GRPS;
-
-	bmap_sz = rte_bitmap_get_memory_footprint(npc->rss_grps);
-	nix_mem = rte_zmalloc(NULL, bmap_sz,  RTE_CACHE_LINE_SIZE);
-	if (nix_mem == NULL) {
-		otx2_err("Bmap alloc failed");
-		rc = -ENOMEM;
-		goto err;
-	}
-
-	npc->rss_grp_entries = rte_bitmap_init(npc->rss_grps, nix_mem, bmap_sz);
-
-	/* Group 0 will be used for RSS,
-	 * 1 -7 will be used for rte_flow RSS action
-	 */
-	rte_bitmap_set(npc->rss_grp_entries, 0);
-
-	return 0;
-
-err:
-	if (npc->flow_list)
-		rte_free(npc->flow_list);
-	if (npc->live_entries_rev)
-		rte_free(npc->live_entries_rev);
-	if (npc->live_entries)
-		rte_free(npc->live_entries);
-	if (npc->free_entries_rev)
-		rte_free(npc->free_entries_rev);
-	if (npc->free_entries)
-		rte_free(npc->free_entries);
-	if (npc->flow_entry_info)
-		rte_free(npc->flow_entry_info);
-	if (npc_mem)
-		rte_free(npc_mem);
-	return rc;
-}
-
-int
-otx2_flow_fini(struct otx2_eth_dev *hw)
-{
-	struct otx2_npc_flow_info *npc = &hw->npc_flow;
-	int rc;
-
-	rc = otx2_flow_free_all_resources(hw);
-	if (rc) {
-		otx2_err("Error when deleting NPC MCAM entries, counters");
-		return rc;
-	}
-
-	if (npc->flow_list)
-		rte_free(npc->flow_list);
-	if (npc->live_entries_rev)
-		rte_free(npc->live_entries_rev);
-	if (npc->live_entries)
-		rte_free(npc->live_entries);
-	if (npc->free_entries_rev)
-		rte_free(npc->free_entries_rev);
-	if (npc->free_entries)
-		rte_free(npc->free_entries);
-	if (npc->flow_entry_info)
-		rte_free(npc->flow_entry_info);
-
-	return 0;
-}
diff --git a/drivers/net/octeontx2/otx2_flow.h b/drivers/net/octeontx2/otx2_flow.h
deleted file mode 100644
index 790e6ef1e8..0000000000
--- a/drivers/net/octeontx2/otx2_flow.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_FLOW_H__
-#define __OTX2_FLOW_H__
-
-#include <stdint.h>
-
-#include <rte_flow_driver.h>
-#include <rte_malloc.h>
-#include <rte_tailq.h>
-
-#include "otx2_common.h"
-#include "otx2_ethdev.h"
-#include "otx2_mbox.h"
-
-struct otx2_eth_dev;
-
-int otx2_flow_init(struct otx2_eth_dev *hw);
-int otx2_flow_fini(struct otx2_eth_dev *hw);
-extern const struct rte_flow_ops otx2_flow_ops;
-
-enum {
-	OTX2_INTF_RX = 0,
-	OTX2_INTF_TX = 1,
-	OTX2_INTF_MAX = 2,
-};
-
-#define NPC_IH_LENGTH			8
-#define NPC_TPID_LENGTH			2
-#define NPC_HIGIG2_LENGTH		16
-#define NPC_MAX_RAW_ITEM_LEN		16
-#define NPC_COUNTER_NONE		(-1)
-/* 32 bytes from LDATA_CFG & 32 bytes from FLAGS_CFG */
-#define NPC_MAX_EXTRACT_DATA_LEN	(64)
-#define NPC_LDATA_LFLAG_LEN		(16)
-#define NPC_MAX_KEY_NIBBLES		(31)
-/* Nibble offsets */
-#define NPC_LAYER_KEYX_SZ		(3)
-#define NPC_PARSE_KEX_S_LA_OFFSET	(7)
-#define NPC_PARSE_KEX_S_LID_OFFSET(lid)		\
-	((((lid) - NPC_LID_LA) * NPC_LAYER_KEYX_SZ)  \
-	+ NPC_PARSE_KEX_S_LA_OFFSET)
-
-
-/* supported flow actions flags */
-#define OTX2_FLOW_ACT_MARK    (1 << 0)
-#define OTX2_FLOW_ACT_FLAG    (1 << 1)
-#define OTX2_FLOW_ACT_DROP    (1 << 2)
-#define OTX2_FLOW_ACT_QUEUE   (1 << 3)
-#define OTX2_FLOW_ACT_RSS     (1 << 4)
-#define OTX2_FLOW_ACT_DUP     (1 << 5)
-#define OTX2_FLOW_ACT_SEC     (1 << 6)
-#define OTX2_FLOW_ACT_COUNT   (1 << 7)
-#define OTX2_FLOW_ACT_PF      (1 << 8)
-#define OTX2_FLOW_ACT_VF      (1 << 9)
-#define OTX2_FLOW_ACT_VLAN_STRIP (1 << 10)
-#define OTX2_FLOW_ACT_VLAN_INSERT (1 << 11)
-#define OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT (1 << 12)
-#define OTX2_FLOW_ACT_VLAN_PCP_INSERT (1 << 13)
-
-/* terminating actions */
-#define OTX2_FLOW_ACT_TERM    (OTX2_FLOW_ACT_DROP  | \
-			       OTX2_FLOW_ACT_QUEUE | \
-			       OTX2_FLOW_ACT_RSS   | \
-			       OTX2_FLOW_ACT_DUP   | \
-			       OTX2_FLOW_ACT_SEC)
-
-/* This mark value indicates flag action */
-#define OTX2_FLOW_FLAG_VAL    (0xffff)
-
-#define NIX_RX_ACT_MATCH_OFFSET		(40)
-#define NIX_RX_ACT_MATCH_MASK		(0xFFFF)
-
-#define NIX_RSS_ACT_GRP_OFFSET		(20)
-#define NIX_RSS_ACT_ALG_OFFSET		(56)
-#define NIX_RSS_ACT_GRP_MASK		(0xFFFFF)
-#define NIX_RSS_ACT_ALG_MASK		(0x1F)
-
-/* PMD-specific definition of the opaque struct rte_flow */
-#define OTX2_MAX_MCAM_WIDTH_DWORDS	7
-
-enum npc_mcam_intf {
-	NPC_MCAM_RX,
-	NPC_MCAM_TX
-};
-
-struct npc_xtract_info {
-	/* Length in bytes of pkt data extracted. len = 0
-	 * indicates that extraction is disabled.
-	 */
-	uint8_t len;
-	uint8_t hdr_off; /* Byte offset of proto hdr: extract_src */
-	uint8_t key_off; /* Byte offset in MCAM key where data is placed */
-	uint8_t enable; /* Extraction enabled or disabled */
-	uint8_t flags_enable; /* Flags extraction enabled */
-};
-
-/* Information for a given {LAYER, LTYPE} */
-struct npc_lid_lt_xtract_info {
-	/* Info derived from parser configuration */
-	uint16_t npc_proto;              /* Network protocol identified */
-	uint8_t  valid_flags_mask;       /* Flags applicable */
-	uint8_t  is_terminating:1;       /* No more parsing */
-	struct npc_xtract_info xtract[NPC_MAX_LD];
-};
-
-union npc_kex_ldata_flags_cfg {
-	struct {
-	#if defined(__BIG_ENDIAN_BITFIELD)
-		uint64_t rvsd_62_1	: 61;
-		uint64_t lid		: 3;
-	#else
-		uint64_t lid		: 3;
-		uint64_t rvsd_62_1	: 61;
-	#endif
-	} s;
-
-	uint64_t i;
-};
-
-typedef struct npc_lid_lt_xtract_info
-	otx2_dxcfg_t[NPC_MAX_INTF][NPC_MAX_LID][NPC_MAX_LT];
-typedef struct npc_lid_lt_xtract_info
-	otx2_fxcfg_t[NPC_MAX_INTF][NPC_MAX_LD][NPC_MAX_LFL];
-typedef union npc_kex_ldata_flags_cfg otx2_ld_flags_t[NPC_MAX_LD];
-
-
-/* MBOX_MSG_NPC_GET_DATAX_CFG Response */
-struct npc_get_datax_cfg {
-	/* NPC_AF_KEX_LDATA(0..1)_FLAGS_CFG */
-	union npc_kex_ldata_flags_cfg ld_flags[NPC_MAX_LD];
-	/* Extract information indexed with [LID][LTYPE] */
-	struct npc_lid_lt_xtract_info lid_lt_xtract[NPC_MAX_LID][NPC_MAX_LT];
-	/* Flags based extract indexed with [LDATA][FLAGS_LOWER_NIBBLE]
-	 * Fields flags_ena_ld0, flags_ena_ld1 in
-	 * struct npc_lid_lt_xtract_info indicate if this is applicable
-	 * for a given {LAYER, LTYPE}
-	 */
-	struct npc_xtract_info flag_xtract[NPC_MAX_LD][NPC_MAX_LT];
-};
-
-struct otx2_mcam_ents_info {
-	/* Current max & min values of mcam index */
-	uint32_t max_id;
-	uint32_t min_id;
-	uint32_t free_ent;
-	uint32_t live_ent;
-};
-
-struct otx2_flow_dump_data {
-	uint8_t lid;
-	uint16_t ltype;
-};
-
-struct rte_flow {
-	uint8_t  nix_intf;
-	uint32_t  mcam_id;
-	int32_t ctr_id;
-	uint32_t priority;
-	/* Contiguous match string */
-	uint64_t mcam_data[OTX2_MAX_MCAM_WIDTH_DWORDS];
-	uint64_t mcam_mask[OTX2_MAX_MCAM_WIDTH_DWORDS];
-	uint64_t npc_action;
-	uint64_t vtag_action;
-	struct otx2_flow_dump_data dump_data[32];
-	uint16_t num_patterns;
-	TAILQ_ENTRY(rte_flow) next;
-};
-
-TAILQ_HEAD(otx2_flow_list, rte_flow);
-
-/* Accessed from ethdev private - otx2_eth_dev */
-struct otx2_npc_flow_info {
-	rte_atomic32_t mark_actions;
-	uint32_t vtag_actions;
-	uint32_t keyx_supp_nmask[NPC_MAX_INTF];/* nibble mask */
-	uint32_t keyx_len[NPC_MAX_INTF];	/* per intf key len in bits */
-	uint32_t datax_len[NPC_MAX_INTF];	/* per intf data len in bits */
-	uint32_t keyw[NPC_MAX_INTF];		/* max key + data len bits */
-	uint32_t mcam_entries;			/* mcam entries supported */
-	otx2_dxcfg_t prx_dxcfg;			/* intf, lid, lt, extract */
-	otx2_fxcfg_t prx_fxcfg;			/* Flag extract */
-	otx2_ld_flags_t prx_lfcfg;		/* KEX LD_Flags CFG */
-	/* mcam entry info per priority level: both free & in-use */
-	struct otx2_mcam_ents_info *flow_entry_info;
-	/* Bitmap of free preallocated entries in ascending index &
-	 * descending priority
-	 */
-	struct rte_bitmap **free_entries;
-	/* Bitmap of free preallocated entries in descending index &
-	 * ascending priority
-	 */
-	struct rte_bitmap **free_entries_rev;
-	/* Bitmap of live entries in ascending index & descending priority */
-	struct rte_bitmap **live_entries;
-	/* Bitmap of live entries in descending index & ascending priority */
-	struct rte_bitmap **live_entries_rev;
-	/* Priority bucket wise tail queue of all rte_flow resources */
-	struct otx2_flow_list *flow_list;
-	uint32_t rss_grps;  /* rss groups supported */
-	struct rte_bitmap *rss_grp_entries;
-	uint16_t channel; /*rx channel */
-	uint16_t flow_prealloc_size;
-	uint16_t flow_max_priority;
-	uint16_t switch_header_type;
-};
-
-struct otx2_parse_state {
-	struct otx2_npc_flow_info *npc;
-	const struct rte_flow_item *pattern;
-	const struct rte_flow_item *last_pattern; /* Temp usage */
-	struct rte_flow_error *error;
-	struct rte_flow *flow;
-	uint8_t tunnel;
-	uint8_t terminate;
-	uint8_t layer_mask;
-	uint8_t lt[NPC_MAX_LID];
-	uint8_t flags[NPC_MAX_LID];
-	uint8_t *mcam_data; /* point to flow->mcam_data + key_len */
-	uint8_t *mcam_mask; /* point to flow->mcam_mask + key_len */
-	bool is_vf;
-};
-
-struct otx2_flow_item_info {
-	const void *def_mask; /* rte_flow default mask */
-	void *hw_mask;        /* hardware supported mask */
-	int  len;             /* length of item */
-	const void *spec;     /* spec to use, NULL implies match any */
-	const void *mask;     /* mask to use */
-	uint8_t hw_hdr_len;  /* Extra data len at each layer*/
-};
-
-struct otx2_idev_kex_cfg {
-	struct npc_get_kex_cfg_rsp kex_cfg;
-	rte_atomic16_t kex_refcnt;
-};
-
-enum npc_kpu_parser_flag {
-	NPC_F_NA = 0,
-	NPC_F_PKI,
-	NPC_F_PKI_VLAN,
-	NPC_F_PKI_ETAG,
-	NPC_F_PKI_ITAG,
-	NPC_F_PKI_MPLS,
-	NPC_F_PKI_NSH,
-	NPC_F_ETYPE_UNK,
-	NPC_F_ETHER_VLAN,
-	NPC_F_ETHER_ETAG,
-	NPC_F_ETHER_ITAG,
-	NPC_F_ETHER_MPLS,
-	NPC_F_ETHER_NSH,
-	NPC_F_STAG_CTAG,
-	NPC_F_STAG_CTAG_UNK,
-	NPC_F_STAG_STAG_CTAG,
-	NPC_F_STAG_STAG_STAG,
-	NPC_F_QINQ_CTAG,
-	NPC_F_QINQ_CTAG_UNK,
-	NPC_F_QINQ_QINQ_CTAG,
-	NPC_F_QINQ_QINQ_QINQ,
-	NPC_F_BTAG_ITAG,
-	NPC_F_BTAG_ITAG_STAG,
-	NPC_F_BTAG_ITAG_CTAG,
-	NPC_F_BTAG_ITAG_UNK,
-	NPC_F_ETAG_CTAG,
-	NPC_F_ETAG_BTAG_ITAG,
-	NPC_F_ETAG_STAG,
-	NPC_F_ETAG_QINQ,
-	NPC_F_ETAG_ITAG,
-	NPC_F_ETAG_ITAG_STAG,
-	NPC_F_ETAG_ITAG_CTAG,
-	NPC_F_ETAG_ITAG_UNK,
-	NPC_F_ITAG_STAG_CTAG,
-	NPC_F_ITAG_STAG,
-	NPC_F_ITAG_CTAG,
-	NPC_F_MPLS_4_LABELS,
-	NPC_F_MPLS_3_LABELS,
-	NPC_F_MPLS_2_LABELS,
-	NPC_F_IP_HAS_OPTIONS,
-	NPC_F_IP_IP_IN_IP,
-	NPC_F_IP_6TO4,
-	NPC_F_IP_MPLS_IN_IP,
-	NPC_F_IP_UNK_PROTO,
-	NPC_F_IP_IP_IN_IP_HAS_OPTIONS,
-	NPC_F_IP_6TO4_HAS_OPTIONS,
-	NPC_F_IP_MPLS_IN_IP_HAS_OPTIONS,
-	NPC_F_IP_UNK_PROTO_HAS_OPTIONS,
-	NPC_F_IP6_HAS_EXT,
-	NPC_F_IP6_TUN_IP6,
-	NPC_F_IP6_MPLS_IN_IP,
-	NPC_F_TCP_HAS_OPTIONS,
-	NPC_F_TCP_HTTP,
-	NPC_F_TCP_HTTPS,
-	NPC_F_TCP_PPTP,
-	NPC_F_TCP_UNK_PORT,
-	NPC_F_TCP_HTTP_HAS_OPTIONS,
-	NPC_F_TCP_HTTPS_HAS_OPTIONS,
-	NPC_F_TCP_PPTP_HAS_OPTIONS,
-	NPC_F_TCP_UNK_PORT_HAS_OPTIONS,
-	NPC_F_UDP_VXLAN,
-	NPC_F_UDP_VXLAN_NOVNI,
-	NPC_F_UDP_VXLAN_NOVNI_NSH,
-	NPC_F_UDP_VXLANGPE,
-	NPC_F_UDP_VXLANGPE_NSH,
-	NPC_F_UDP_VXLANGPE_MPLS,
-	NPC_F_UDP_VXLANGPE_NOVNI,
-	NPC_F_UDP_VXLANGPE_NOVNI_NSH,
-	NPC_F_UDP_VXLANGPE_NOVNI_MPLS,
-	NPC_F_UDP_VXLANGPE_UNK,
-	NPC_F_UDP_VXLANGPE_NONP,
-	NPC_F_UDP_GTP_GTPC,
-	NPC_F_UDP_GTP_GTPU_G_PDU,
-	NPC_F_UDP_GTP_GTPU_UNK,
-	NPC_F_UDP_UNK_PORT,
-	NPC_F_UDP_GENEVE,
-	NPC_F_UDP_GENEVE_OAM,
-	NPC_F_UDP_GENEVE_CRI_OPT,
-	NPC_F_UDP_GENEVE_OAM_CRI_OPT,
-	NPC_F_GRE_NVGRE,
-	NPC_F_GRE_HAS_SRE,
-	NPC_F_GRE_HAS_CSUM,
-	NPC_F_GRE_HAS_KEY,
-	NPC_F_GRE_HAS_SEQ,
-	NPC_F_GRE_HAS_CSUM_KEY,
-	NPC_F_GRE_HAS_CSUM_SEQ,
-	NPC_F_GRE_HAS_KEY_SEQ,
-	NPC_F_GRE_HAS_CSUM_KEY_SEQ,
-	NPC_F_GRE_HAS_ROUTE,
-	NPC_F_GRE_UNK_PROTO,
-	NPC_F_GRE_VER1,
-	NPC_F_GRE_VER1_HAS_SEQ,
-	NPC_F_GRE_VER1_HAS_ACK,
-	NPC_F_GRE_VER1_HAS_SEQ_ACK,
-	NPC_F_GRE_VER1_UNK_PROTO,
-	NPC_F_TU_ETHER_UNK,
-	NPC_F_TU_ETHER_CTAG,
-	NPC_F_TU_ETHER_CTAG_UNK,
-	NPC_F_TU_ETHER_STAG_CTAG,
-	NPC_F_TU_ETHER_STAG_CTAG_UNK,
-	NPC_F_TU_ETHER_STAG,
-	NPC_F_TU_ETHER_STAG_UNK,
-	NPC_F_TU_ETHER_QINQ_CTAG,
-	NPC_F_TU_ETHER_QINQ_CTAG_UNK,
-	NPC_F_TU_ETHER_QINQ,
-	NPC_F_TU_ETHER_QINQ_UNK,
-	NPC_F_LAST /* has to be the last item */
-};
-
-
-int otx2_flow_mcam_free_counter(struct otx2_mbox *mbox, uint16_t ctr_id);
-
-int otx2_flow_mcam_read_counter(struct otx2_mbox *mbox, uint32_t ctr_id,
-				uint64_t *count);
-
-int otx2_flow_mcam_clear_counter(struct otx2_mbox *mbox, uint32_t ctr_id);
-
-int otx2_flow_mcam_free_entry(struct otx2_mbox *mbox, uint32_t entry);
-
-int otx2_flow_mcam_free_all_entries(struct otx2_mbox *mbox);
-
-int otx2_flow_update_parse_state(struct otx2_parse_state *pst,
-				 struct otx2_flow_item_info *info,
-				 int lid, int lt, uint8_t flags);
-
-int otx2_flow_parse_item_basic(const struct rte_flow_item *item,
-			       struct otx2_flow_item_info *info,
-			       struct rte_flow_error *error);
-
-void otx2_flow_keyx_compress(uint64_t *data, uint32_t nibble_mask);
-
-int otx2_flow_mcam_alloc_and_write(struct rte_flow *flow,
-				   struct otx2_mbox *mbox,
-				   struct otx2_parse_state *pst,
-				   struct otx2_npc_flow_info *flow_info);
-
-void otx2_flow_get_hw_supp_mask(struct otx2_parse_state *pst,
-				struct otx2_flow_item_info *info,
-				int lid, int lt);
-
-const struct rte_flow_item *
-otx2_flow_skip_void_and_any_items(const struct rte_flow_item *pattern);
-
-int otx2_flow_parse_lh(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_lg(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_lf(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_le(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_ld(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_lc(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_lb(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_la(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_higig2_hdr(struct otx2_parse_state *pst);
-
-int otx2_flow_parse_actions(struct rte_eth_dev *dev,
-			    const struct rte_flow_attr *attr,
-			    const struct rte_flow_action actions[],
-			    struct rte_flow_error *error,
-			    struct rte_flow *flow);
-
-int otx2_flow_free_all_resources(struct otx2_eth_dev *hw);
-
-int otx2_flow_parse_mpls(struct otx2_parse_state *pst, int lid);
-
-void otx2_flow_dump(FILE *file, struct otx2_eth_dev *hw,
-		    struct rte_flow *flow);
-#endif /* __OTX2_FLOW_H__ */
diff --git a/drivers/net/octeontx2/otx2_flow_ctrl.c b/drivers/net/octeontx2/otx2_flow_ctrl.c
deleted file mode 100644
index 071740de86..0000000000
--- a/drivers/net/octeontx2/otx2_flow_ctrl.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-
-int
-otx2_nix_rxchan_bpid_cfg(struct rte_eth_dev *eth_dev, bool enb)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_fc_info *fc = &dev->fc_info;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_bp_cfg_req *req;
-	struct nix_bp_cfg_rsp *rsp;
-	int rc;
-
-	if (otx2_dev_is_sdp(dev))
-		return 0;
-
-	if (enb) {
-		req = otx2_mbox_alloc_msg_nix_bp_enable(mbox);
-		req->chan_base = 0;
-		req->chan_cnt = 1;
-		req->bpid_per_chan = 0;
-
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc || req->chan_cnt != rsp->chan_cnt) {
-			otx2_err("Insufficient BPIDs, alloc=%u < req=%u rc=%d",
-				 rsp->chan_cnt, req->chan_cnt, rc);
-			return rc;
-		}
-
-		fc->bpid[0] = rsp->chan_bpid[0];
-	} else {
-		req = otx2_mbox_alloc_msg_nix_bp_disable(mbox);
-		req->chan_base = 0;
-		req->chan_cnt = 1;
-
-		rc = otx2_mbox_process(mbox);
-
-		memset(fc->bpid, 0, sizeof(uint16_t) * NIX_MAX_CHAN);
-	}
-
-	return rc;
-}
-
-int
-otx2_nix_flow_ctrl_get(struct rte_eth_dev *eth_dev,
-		       struct rte_eth_fc_conf *fc_conf)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct cgx_pause_frm_cfg *req, *rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc;
-
-	if (otx2_dev_is_lbk(dev)) {
-		fc_conf->mode = RTE_ETH_FC_NONE;
-		return 0;
-	}
-
-	req = otx2_mbox_alloc_msg_cgx_cfg_pause_frm(mbox);
-	req->set = 0;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		goto done;
-
-	if (rsp->rx_pause && rsp->tx_pause)
-		fc_conf->mode = RTE_ETH_FC_FULL;
-	else if (rsp->rx_pause)
-		fc_conf->mode = RTE_ETH_FC_RX_PAUSE;
-	else if (rsp->tx_pause)
-		fc_conf->mode = RTE_ETH_FC_TX_PAUSE;
-	else
-		fc_conf->mode = RTE_ETH_FC_NONE;
-
-done:
-	return rc;
-}
-
-static int
-otx2_nix_cq_bp_cfg(struct rte_eth_dev *eth_dev, bool enb)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_fc_info *fc = &dev->fc_info;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_req *aq;
-	struct otx2_eth_rxq *rxq;
-	int i, rc;
-
-	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-		rxq = eth_dev->data->rx_queues[i];
-
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		if (!aq) {
-			/* The shared memory buffer can be full.
-			 * flush it and retry
-			 */
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0)
-				return rc;
-
-			aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-			if (!aq)
-				return -ENOMEM;
-		}
-		aq->qidx = rxq->rq;
-		aq->ctype = NIX_AQ_CTYPE_CQ;
-		aq->op = NIX_AQ_INSTOP_WRITE;
-
-		if (enb) {
-			aq->cq.bpid = fc->bpid[0];
-			aq->cq_mask.bpid = ~(aq->cq_mask.bpid);
-			aq->cq.bp = rxq->cq_drop;
-			aq->cq_mask.bp = ~(aq->cq_mask.bp);
-		}
-
-		aq->cq.bp_ena = !!enb;
-		aq->cq_mask.bp_ena = ~(aq->cq_mask.bp_ena);
-	}
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_wait_for_rsp(mbox, 0);
-	if (rc < 0)
-		return rc;
-
-	return 0;
-}
-
-static int
-otx2_nix_rx_fc_cfg(struct rte_eth_dev *eth_dev, bool enb)
-{
-	return otx2_nix_cq_bp_cfg(eth_dev, enb);
-}
-
-int
-otx2_nix_flow_ctrl_set(struct rte_eth_dev *eth_dev,
-		       struct rte_eth_fc_conf *fc_conf)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_fc_info *fc = &dev->fc_info;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct cgx_pause_frm_cfg *req;
-	uint8_t tx_pause, rx_pause;
-	int rc = 0;
-
-	if (otx2_dev_is_lbk(dev)) {
-		otx2_info("No flow control support for LBK bound ethports");
-		return -ENOTSUP;
-	}
-
-	if (fc_conf->high_water || fc_conf->low_water || fc_conf->pause_time ||
-	    fc_conf->mac_ctrl_frame_fwd || fc_conf->autoneg) {
-		otx2_info("Flowctrl parameter is not supported");
-		return -EINVAL;
-	}
-
-	if (fc_conf->mode == fc->mode)
-		return 0;
-
-	rx_pause = (fc_conf->mode == RTE_ETH_FC_FULL) ||
-		    (fc_conf->mode == RTE_ETH_FC_RX_PAUSE);
-	tx_pause = (fc_conf->mode == RTE_ETH_FC_FULL) ||
-		    (fc_conf->mode == RTE_ETH_FC_TX_PAUSE);
-
-	/* Check if TX pause frame is already enabled or not */
-	if (fc->tx_pause ^ tx_pause) {
-		if (otx2_dev_is_Ax(dev) && eth_dev->data->dev_started) {
-			/* on Ax, CQ should be in disabled state
-			 * while setting flow control configuration.
-			 */
-			otx2_info("Stop the port=%d for setting flow control\n",
-				  eth_dev->data->port_id);
-				return 0;
-		}
-		/* TX pause frames, enable/disable flowctrl on RX side. */
-		rc = otx2_nix_rx_fc_cfg(eth_dev, tx_pause);
-		if (rc)
-			return rc;
-	}
-
-	req = otx2_mbox_alloc_msg_cgx_cfg_pause_frm(mbox);
-	req->set = 1;
-	req->rx_pause = rx_pause;
-	req->tx_pause = tx_pause;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	fc->tx_pause = tx_pause;
-	fc->rx_pause = rx_pause;
-	fc->mode = fc_conf->mode;
-
-	return rc;
-}
-
-int
-otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_fc_info *fc = &dev->fc_info;
-	struct rte_eth_fc_conf fc_conf;
-
-	if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev))
-		return 0;
-
-	memset(&fc_conf, 0, sizeof(struct rte_eth_fc_conf));
-	fc_conf.mode = fc->mode;
-
-	/* To avoid Link credit deadlock on Ax, disable Tx FC if it's enabled */
-	if (otx2_dev_is_Ax(dev) &&
-	    (dev->npc_flow.switch_header_type != OTX2_PRIV_FLAGS_HIGIG) &&
-	    (fc_conf.mode == RTE_ETH_FC_FULL || fc_conf.mode == RTE_ETH_FC_RX_PAUSE)) {
-		fc_conf.mode =
-				(fc_conf.mode == RTE_ETH_FC_FULL ||
-				fc_conf.mode == RTE_ETH_FC_TX_PAUSE) ?
-				RTE_ETH_FC_TX_PAUSE : RTE_ETH_FC_NONE;
-	}
-
-	return otx2_nix_flow_ctrl_set(eth_dev, &fc_conf);
-}
-
-int
-otx2_nix_flow_ctrl_init(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_fc_info *fc = &dev->fc_info;
-	struct rte_eth_fc_conf fc_conf;
-	int rc;
-
-	if (otx2_dev_is_lbk(dev) || otx2_dev_is_sdp(dev))
-		return 0;
-
-	memset(&fc_conf, 0, sizeof(struct rte_eth_fc_conf));
-	/* Both Rx & Tx flow ctrl get enabled(RTE_ETH_FC_FULL) in HW
-	 * by AF driver, update those info in PMD structure.
-	 */
-	rc = otx2_nix_flow_ctrl_get(eth_dev, &fc_conf);
-	if (rc)
-		goto exit;
-
-	fc->mode = fc_conf.mode;
-	fc->rx_pause = (fc_conf.mode == RTE_ETH_FC_FULL) ||
-			(fc_conf.mode == RTE_ETH_FC_RX_PAUSE);
-	fc->tx_pause = (fc_conf.mode == RTE_ETH_FC_FULL) ||
-			(fc_conf.mode == RTE_ETH_FC_TX_PAUSE);
-
-exit:
-	return rc;
-}
diff --git a/drivers/net/octeontx2/otx2_flow_dump.c b/drivers/net/octeontx2/otx2_flow_dump.c
deleted file mode 100644
index 3f86071300..0000000000
--- a/drivers/net/octeontx2/otx2_flow_dump.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-#include "otx2_ethdev_sec.h"
-#include "otx2_flow.h"
-
-#define NPC_MAX_FIELD_NAME_SIZE 80
-#define NPC_RX_ACTIONOP_MASK		GENMASK(3, 0)
-#define NPC_RX_ACTION_PFFUNC_MASK	GENMASK(19, 4)
-#define NPC_RX_ACTION_INDEX_MASK	GENMASK(39, 20)
-#define NPC_RX_ACTION_MATCH_MASK	GENMASK(55, 40)
-#define NPC_RX_ACTION_FLOWKEY_MASK	GENMASK(60, 56)
-
-#define NPC_TX_ACTION_INDEX_MASK	GENMASK(31, 12)
-#define NPC_TX_ACTION_MATCH_MASK	GENMASK(47, 32)
-
-#define NIX_RX_VTAGACT_VTAG0_RELPTR_MASK	GENMASK(7, 0)
-#define NIX_RX_VTAGACT_VTAG0_LID_MASK		GENMASK(10, 8)
-#define NIX_RX_VTAGACT_VTAG0_TYPE_MASK		GENMASK(14, 12)
-#define NIX_RX_VTAGACT_VTAG0_VALID_MASK		BIT_ULL(15)
-
-#define NIX_RX_VTAGACT_VTAG1_RELPTR_MASK	GENMASK(39, 32)
-#define NIX_RX_VTAGACT_VTAG1_LID_MASK		GENMASK(42, 40)
-#define NIX_RX_VTAGACT_VTAG1_TYPE_MASK		GENMASK(46, 44)
-#define NIX_RX_VTAGACT_VTAG1_VALID_MASK		BIT_ULL(47)
-
-#define NIX_TX_VTAGACT_VTAG0_RELPTR_MASK	GENMASK(7, 0)
-#define NIX_TX_VTAGACT_VTAG0_LID_MASK		GENMASK(10, 8)
-#define NIX_TX_VTAGACT_VTAG0_OP_MASK		GENMASK(13, 12)
-#define NIX_TX_VTAGACT_VTAG0_DEF_MASK		GENMASK(25, 16)
-
-#define NIX_TX_VTAGACT_VTAG1_RELPTR_MASK	GENMASK(39, 32)
-#define NIX_TX_VTAGACT_VTAG1_LID_MASK		GENMASK(42, 40)
-#define NIX_TX_VTAGACT_VTAG1_OP_MASK		GENMASK(45, 44)
-#define NIX_TX_VTAGACT_VTAG1_DEF_MASK		GENMASK(57, 48)
-
-struct npc_rx_parse_nibble_s {
-	uint16_t chan         : 3;
-	uint16_t errlev       : 1;
-	uint16_t errcode      : 2;
-	uint16_t l2l3bm       : 1;
-	uint16_t laflags      : 2;
-	uint16_t latype       : 1;
-	uint16_t lbflags      : 2;
-	uint16_t lbtype       : 1;
-	uint16_t lcflags      : 2;
-	uint16_t lctype       : 1;
-	uint16_t ldflags      : 2;
-	uint16_t ldtype       : 1;
-	uint16_t leflags      : 2;
-	uint16_t letype       : 1;
-	uint16_t lfflags      : 2;
-	uint16_t lftype       : 1;
-	uint16_t lgflags      : 2;
-	uint16_t lgtype       : 1;
-	uint16_t lhflags      : 2;
-	uint16_t lhtype       : 1;
-} __rte_packed;
-
-const char *intf_str[] = {
-	"NIX-RX",
-	"NIX-TX",
-};
-
-const char *ltype_str[NPC_MAX_LID][NPC_MAX_LT] = {
-	[NPC_LID_LA][0] = "NONE",
-	[NPC_LID_LA][NPC_LT_LA_ETHER] = "LA_ETHER",
-	[NPC_LID_LA][NPC_LT_LA_IH_NIX_ETHER] = "LA_IH_NIX_ETHER",
-	[NPC_LID_LA][NPC_LT_LA_HIGIG2_ETHER] = "LA_HIGIG2_ETHER",
-	[NPC_LID_LA][NPC_LT_LA_IH_NIX_HIGIG2_ETHER] = "LA_IH_NIX_HIGIG2_ETHER",
-	[NPC_LID_LB][0] = "NONE",
-	[NPC_LID_LB][NPC_LT_LB_CTAG] = "LB_CTAG",
-	[NPC_LID_LB][NPC_LT_LB_STAG_QINQ] = "LB_STAG_QINQ",
-	[NPC_LID_LB][NPC_LT_LB_ETAG] = "LB_ETAG",
-	[NPC_LID_LB][NPC_LT_LB_EXDSA] = "LB_EXDSA",
-	[NPC_LID_LB][NPC_LT_LB_VLAN_EXDSA] = "LB_VLAN_EXDSA",
-	[NPC_LID_LC][0] = "NONE",
-	[NPC_LID_LC][NPC_LT_LC_IP] = "LC_IP",
-	[NPC_LID_LC][NPC_LT_LC_IP6] = "LC_IP6",
-	[NPC_LID_LC][NPC_LT_LC_ARP] = "LC_ARP",
-	[NPC_LID_LC][NPC_LT_LC_IP6_EXT] = "LC_IP6_EXT",
-	[NPC_LID_LC][NPC_LT_LC_NGIO] = "LC_NGIO",
-	[NPC_LID_LD][0] = "NONE",
-	[NPC_LID_LD][NPC_LT_LD_ICMP] = "LD_ICMP",
-	[NPC_LID_LD][NPC_LT_LD_ICMP6] = "LD_ICMP6",
-	[NPC_LID_LD][NPC_LT_LD_UDP] = "LD_UDP",
-	[NPC_LID_LD][NPC_LT_LD_TCP] = "LD_TCP",
-	[NPC_LID_LD][NPC_LT_LD_SCTP] = "LD_SCTP",
-	[NPC_LID_LD][NPC_LT_LD_GRE] = "LD_GRE",
-	[NPC_LID_LD][NPC_LT_LD_NVGRE] = "LD_NVGRE",
-	[NPC_LID_LE][0] = "NONE",
-	[NPC_LID_LE][NPC_LT_LE_VXLAN] = "LE_VXLAN",
-	[NPC_LID_LE][NPC_LT_LE_ESP] = "LE_ESP",
-	[NPC_LID_LE][NPC_LT_LE_GTPC] = "LE_GTPC",
-	[NPC_LID_LE][NPC_LT_LE_GTPU] = "LE_GTPU",
-	[NPC_LID_LE][NPC_LT_LE_GENEVE] = "LE_GENEVE",
-	[NPC_LID_LE][NPC_LT_LE_VXLANGPE] = "LE_VXLANGPE",
-	[NPC_LID_LF][0] = "NONE",
-	[NPC_LID_LF][NPC_LT_LF_TU_ETHER] = "LF_TU_ETHER",
-	[NPC_LID_LG][0] = "NONE",
-	[NPC_LID_LG][NPC_LT_LG_TU_IP] = "LG_TU_IP",
-	[NPC_LID_LG][NPC_LT_LG_TU_IP6] = "LG_TU_IP6",
-	[NPC_LID_LH][0] = "NONE",
-	[NPC_LID_LH][NPC_LT_LH_TU_UDP] = "LH_TU_UDP",
-	[NPC_LID_LH][NPC_LT_LH_TU_TCP] = "LH_TU_TCP",
-	[NPC_LID_LH][NPC_LT_LH_TU_SCTP] = "LH_TU_SCTP",
-	[NPC_LID_LH][NPC_LT_LH_TU_ESP] = "LH_TU_ESP",
-};
-
-static uint16_t
-otx2_get_nibbles(struct rte_flow *flow, uint16_t size, uint32_t bit_offset)
-{
-	uint32_t byte_index, noffset;
-	uint16_t data, mask;
-	uint8_t *bytes;
-
-	bytes = (uint8_t *)flow->mcam_data;
-	mask = (1ULL << (size * 4)) - 1;
-	byte_index = bit_offset / 8;
-	noffset = bit_offset % 8;
-	data = *(uint16_t *)&bytes[byte_index];
-	data >>= noffset;
-	data &= mask;
-
-	return data;
-}
-
-static void
-otx2_flow_print_parse_nibbles(FILE *file, struct rte_flow *flow,
-			      uint64_t parse_nibbles)
-{
-	struct npc_rx_parse_nibble_s *rx_parse;
-	uint32_t data, offset = 0;
-
-	rx_parse = (struct npc_rx_parse_nibble_s *)&parse_nibbles;
-
-	if (rx_parse->chan) {
-		data = otx2_get_nibbles(flow, 3, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_CHAN:%#03X\n", data);
-		offset += 12;
-	}
-
-	if (rx_parse->errlev) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_ERRLEV:%#X\n", data);
-		offset += 4;
-	}
-
-	if (rx_parse->errcode) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_ERRCODE:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->l2l3bm) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_L2L3_BCAST:%#X\n", data);
-		offset += 4;
-	}
-
-	if (rx_parse->latype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LA_LTYPE:%s\n",
-			ltype_str[NPC_LID_LA][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->laflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LA_FLAGS:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->lbtype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LB_LTYPE:%s\n",
-			ltype_str[NPC_LID_LB][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->lbflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LB_FLAGS:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->lctype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LC_LTYPE:%s\n",
-			ltype_str[NPC_LID_LC][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->lcflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LC_FLAGS:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->ldtype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LD_LTYPE:%s\n",
-			ltype_str[NPC_LID_LD][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->ldflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LD_FLAGS:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->letype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LE_LTYPE:%s\n",
-			ltype_str[NPC_LID_LE][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->leflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LE_FLAGS:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->lftype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LF_LTYPE:%s\n",
-			ltype_str[NPC_LID_LF][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->lfflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LF_FLAGS:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->lgtype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LG_LTYPE:%s\n",
-			ltype_str[NPC_LID_LG][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->lgflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LG_FLAGS:%#02X\n", data);
-		offset += 8;
-	}
-
-	if (rx_parse->lhtype) {
-		data = otx2_get_nibbles(flow, 1, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LH_LTYPE:%s\n",
-			ltype_str[NPC_LID_LH][data]);
-		offset += 4;
-	}
-
-	if (rx_parse->lhflags) {
-		data = otx2_get_nibbles(flow, 2, offset);
-		fprintf(file, "\tNPC_PARSE_NIBBLE_LH_FLAGS:%#02X\n", data);
-	}
-}
-
-static void
-otx2_flow_print_xtractinfo(FILE *file, struct npc_xtract_info *lfinfo,
-			   struct rte_flow *flow, int lid, int lt)
-{
-	uint8_t *datastart, *maskstart;
-	int i;
-
-	datastart = (uint8_t *)&flow->mcam_data + lfinfo->key_off;
-	maskstart = (uint8_t *)&flow->mcam_mask + lfinfo->key_off;
-
-	fprintf(file, "\t%s, hdr offset:%#X, len:%#X, key offset:%#X, ",
-		ltype_str[lid][lt], lfinfo->hdr_off,
-		lfinfo->len, lfinfo->key_off);
-
-	fprintf(file, "Data:0X");
-	for (i = lfinfo->len - 1; i >= 0; i--)
-		fprintf(file, "%02X", datastart[i]);
-
-	fprintf(file, ", ");
-
-	fprintf(file, "Mask:0X");
-
-	for (i = lfinfo->len - 1; i >= 0; i--)
-		fprintf(file, "%02X", maskstart[i]);
-
-	fprintf(file, "\n");
-}
-
-static void
-otx2_flow_print_item(FILE *file, struct otx2_eth_dev *hw,
-		     struct npc_xtract_info *xinfo, struct rte_flow *flow,
-		     int intf, int lid, int lt, int ld)
-{
-	struct otx2_npc_flow_info *npc_flow = &hw->npc_flow;
-	struct npc_xtract_info *lflags_info;
-	int i, lf_cfg;
-
-	otx2_flow_print_xtractinfo(file, xinfo, flow, lid, lt);
-
-	if (xinfo->flags_enable) {
-		lf_cfg = npc_flow->prx_lfcfg[ld].i;
-
-		if (lf_cfg == lid) {
-			for (i = 0; i < NPC_MAX_LFL; i++) {
-				lflags_info = npc_flow->prx_fxcfg[intf]
-							[ld][i].xtract;
-
-				otx2_flow_print_xtractinfo(file, lflags_info,
-							   flow, lid, lt);
-			}
-		}
-	}
-}
-
-static void
-otx2_flow_dump_patterns(FILE *file, struct otx2_eth_dev *hw,
-			struct rte_flow *flow)
-{
-	struct otx2_npc_flow_info *npc_flow = &hw->npc_flow;
-	struct npc_lid_lt_xtract_info *lt_xinfo;
-	struct npc_xtract_info *xinfo;
-	uint32_t intf, lid, ld, i;
-	uint64_t parse_nibbles;
-	uint16_t ltype;
-
-	intf = flow->nix_intf;
-	parse_nibbles = npc_flow->keyx_supp_nmask[intf];
-	otx2_flow_print_parse_nibbles(file, flow, parse_nibbles);
-
-	for (i = 0; i < flow->num_patterns; i++) {
-		lid = flow->dump_data[i].lid;
-		ltype = flow->dump_data[i].ltype;
-		lt_xinfo = &npc_flow->prx_dxcfg[intf][lid][ltype];
-
-		for (ld = 0; ld < NPC_MAX_LD; ld++) {
-			xinfo = &lt_xinfo->xtract[ld];
-			if (!xinfo->enable)
-				continue;
-			otx2_flow_print_item(file, hw, xinfo, flow, intf, lid,
-					     ltype, ld);
-		}
-	}
-}
-
-static void
-otx2_flow_dump_tx_action(FILE *file, uint64_t npc_action)
-{
-	char index_name[NPC_MAX_FIELD_NAME_SIZE] = "Index:";
-	uint32_t tx_op, index, match_id;
-
-	tx_op = npc_action & NPC_RX_ACTIONOP_MASK;
-
-	fprintf(file, "\tActionOp:");
-
-	switch (tx_op) {
-	case NIX_TX_ACTIONOP_DROP:
-		fprintf(file, "NIX_TX_ACTIONOP_DROP (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_DROP);
-		break;
-	case NIX_TX_ACTIONOP_UCAST_DEFAULT:
-		fprintf(file, "NIX_TX_ACTIONOP_UCAST_DEFAULT (%lu)\n",
-			(uint64_t)NIX_TX_ACTIONOP_UCAST_DEFAULT);
-		break;
-	case NIX_TX_ACTIONOP_UCAST_CHAN:
-		fprintf(file, "NIX_TX_ACTIONOP_UCAST_DEFAULT (%lu)\n",
-			(uint64_t)NIX_TX_ACTIONOP_UCAST_CHAN);
-		strncpy(index_name, "Transmit Channel:",
-			NPC_MAX_FIELD_NAME_SIZE);
-		break;
-	case NIX_TX_ACTIONOP_MCAST:
-		fprintf(file, "NIX_TX_ACTIONOP_MCAST (%lu)\n",
-			(uint64_t)NIX_TX_ACTIONOP_MCAST);
-		strncpy(index_name, "Multicast Table Index:",
-			NPC_MAX_FIELD_NAME_SIZE);
-		break;
-	case NIX_TX_ACTIONOP_DROP_VIOL:
-		fprintf(file, "NIX_TX_ACTIONOP_DROP_VIOL (%lu)\n",
-			(uint64_t)NIX_TX_ACTIONOP_DROP_VIOL);
-		break;
-	}
-
-	index = ((npc_action & NPC_TX_ACTION_INDEX_MASK) >> 12) & 0xFFFFF;
-
-	fprintf(file, "\t%s:%#05X\n", index_name, index);
-
-	match_id = ((npc_action & NPC_TX_ACTION_MATCH_MASK) >> 32) & 0xFFFF;
-
-	fprintf(file, "\tMatch Id:%#04X\n", match_id);
-}
-
-static void
-otx2_flow_dump_rx_action(FILE *file, uint64_t npc_action)
-{
-	uint32_t rx_op, pf_func, index, match_id, flowkey_alg;
-	char index_name[NPC_MAX_FIELD_NAME_SIZE] = "Index:";
-
-	rx_op = npc_action & NPC_RX_ACTIONOP_MASK;
-
-	fprintf(file, "\tActionOp:");
-
-	switch (rx_op) {
-	case NIX_RX_ACTIONOP_DROP:
-		fprintf(file, "NIX_RX_ACTIONOP_DROP (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_DROP);
-		break;
-	case NIX_RX_ACTIONOP_UCAST:
-		fprintf(file, "NIX_RX_ACTIONOP_UCAST (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_UCAST);
-		strncpy(index_name, "RQ Index", NPC_MAX_FIELD_NAME_SIZE);
-		break;
-	case NIX_RX_ACTIONOP_UCAST_IPSEC:
-		fprintf(file, "NIX_RX_ACTIONOP_UCAST_IPSEC (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_UCAST_IPSEC);
-		strncpy(index_name, "RQ Index:", NPC_MAX_FIELD_NAME_SIZE);
-		break;
-	case NIX_RX_ACTIONOP_MCAST:
-		fprintf(file, "NIX_RX_ACTIONOP_MCAST (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_MCAST);
-		strncpy(index_name, "Multicast/mirror table index",
-			NPC_MAX_FIELD_NAME_SIZE);
-		break;
-	case NIX_RX_ACTIONOP_RSS:
-		fprintf(file, "NIX_RX_ACTIONOP_RSS (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_RSS);
-		strncpy(index_name, "RSS Group Index",
-			NPC_MAX_FIELD_NAME_SIZE);
-		break;
-	case NIX_RX_ACTIONOP_PF_FUNC_DROP:
-		fprintf(file, "NIX_RX_ACTIONOP_PF_FUNC_DROP (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_PF_FUNC_DROP);
-		break;
-	case NIX_RX_ACTIONOP_MIRROR:
-		fprintf(file, "NIX_RX_ACTIONOP_MIRROR (%lu)\n",
-			(uint64_t)NIX_RX_ACTIONOP_MIRROR);
-		strncpy(index_name, "Multicast/mirror table index",
-			NPC_MAX_FIELD_NAME_SIZE);
-		break;
-	}
-
-	pf_func = ((npc_action & NPC_RX_ACTION_PFFUNC_MASK) >> 4) & 0xFFFF;
-
-	fprintf(file, "\tPF_FUNC: %#04X\n", pf_func);
-
-	index = ((npc_action & NPC_RX_ACTION_INDEX_MASK) >> 20) & 0xFFFFF;
-
-	fprintf(file, "\t%s:%#05X\n", index_name, index);
-
-	match_id = ((npc_action & NPC_RX_ACTION_MATCH_MASK) >> 40) & 0xFFFF;
-
-	fprintf(file, "\tMatch Id:%#04X\n", match_id);
-
-	flowkey_alg = ((npc_action & NPC_RX_ACTION_FLOWKEY_MASK) >> 56) & 0x1F;
-
-	fprintf(file, "\tFlow Key Alg:%#X\n", flowkey_alg);
-}
-
-static void
-otx2_flow_dump_parsed_action(FILE *file, uint64_t npc_action, bool is_rx)
-{
-	if (is_rx) {
-		fprintf(file, "NPC RX Action:%#016lX\n", npc_action);
-		otx2_flow_dump_rx_action(file, npc_action);
-	} else {
-		fprintf(file, "NPC TX Action:%#016lX\n", npc_action);
-		otx2_flow_dump_tx_action(file, npc_action);
-	}
-}
-
-static void
-otx2_flow_dump_rx_vtag_action(FILE *file, uint64_t vtag_action)
-{
-	uint32_t type, lid, relptr;
-
-	if (vtag_action & NIX_RX_VTAGACT_VTAG0_VALID_MASK) {
-		relptr = vtag_action & NIX_RX_VTAGACT_VTAG0_RELPTR_MASK;
-		lid = ((vtag_action & NIX_RX_VTAGACT_VTAG0_LID_MASK) >> 8)
-			& 0x7;
-		type = ((vtag_action & NIX_RX_VTAGACT_VTAG0_TYPE_MASK) >> 12)
-			& 0x7;
-
-		fprintf(file, "\tVTAG0:relptr:%#X\n", relptr);
-		fprintf(file, "\tlid:%#X\n", lid);
-		fprintf(file, "\ttype:%#X\n", type);
-	}
-
-	if (vtag_action & NIX_RX_VTAGACT_VTAG1_VALID_MASK) {
-		relptr = ((vtag_action & NIX_RX_VTAGACT_VTAG1_RELPTR_MASK)
-			   >> 32) & 0xFF;
-		lid = ((vtag_action & NIX_RX_VTAGACT_VTAG1_LID_MASK) >> 40)
-			& 0x7;
-		type = ((vtag_action & NIX_RX_VTAGACT_VTAG1_TYPE_MASK) >> 44)
-			& 0x7;
-
-		fprintf(file, "\tVTAG1:relptr:%#X\n", relptr);
-		fprintf(file, "\tlid:%#X\n", lid);
-		fprintf(file, "\ttype:%#X\n", type);
-	}
-}
-
-static void
-otx2_get_vtag_opname(uint32_t op, char *opname, int len)
-{
-	switch (op) {
-	case 0x0:
-		strncpy(opname, "NOP", len - 1);
-		break;
-	case 0x1:
-		strncpy(opname, "INSERT", len - 1);
-		break;
-	case 0x2:
-		strncpy(opname, "REPLACE", len - 1);
-		break;
-	}
-}
-
-static void
-otx2_flow_dump_tx_vtag_action(FILE *file, uint64_t vtag_action)
-{
-	uint32_t relptr, lid, op, vtag_def;
-	char opname[10];
-
-	relptr = vtag_action & NIX_TX_VTAGACT_VTAG0_RELPTR_MASK;
-	lid = ((vtag_action & NIX_TX_VTAGACT_VTAG0_LID_MASK) >> 8) & 0x7;
-	op = ((vtag_action & NIX_TX_VTAGACT_VTAG0_OP_MASK) >> 12) & 0x3;
-	vtag_def = ((vtag_action & NIX_TX_VTAGACT_VTAG0_DEF_MASK) >> 16)
-		   & 0x3FF;
-
-	otx2_get_vtag_opname(op, opname, sizeof(opname));
-
-	fprintf(file, "\tVTAG0 relptr:%#X\n", relptr);
-	fprintf(file, "\tlid:%#X\n", lid);
-	fprintf(file, "\top:%s\n", opname);
-	fprintf(file, "\tvtag_def:%#X\n", vtag_def);
-
-	relptr = ((vtag_action & NIX_TX_VTAGACT_VTAG1_RELPTR_MASK) >> 32)
-		 & 0xFF;
-	lid = ((vtag_action & NIX_TX_VTAGACT_VTAG1_LID_MASK) >> 40) & 0x7;
-	op = ((vtag_action & NIX_TX_VTAGACT_VTAG1_OP_MASK) >> 44) & 0x3;
-	vtag_def = ((vtag_action & NIX_TX_VTAGACT_VTAG1_DEF_MASK) >> 48)
-		   & 0x3FF;
-
-	otx2_get_vtag_opname(op, opname, sizeof(opname));
-
-	fprintf(file, "\tVTAG1:relptr:%#X\n", relptr);
-	fprintf(file, "\tlid:%#X\n", lid);
-	fprintf(file, "\top:%s\n", opname);
-	fprintf(file, "\tvtag_def:%#X\n", vtag_def);
-}
-
-static void
-otx2_flow_dump_vtag_action(FILE *file, uint64_t vtag_action, bool is_rx)
-{
-	if (is_rx) {
-		fprintf(file, "NPC RX VTAG Action:%#016lX\n", vtag_action);
-		otx2_flow_dump_rx_vtag_action(file, vtag_action);
-	} else {
-		fprintf(file, "NPC TX VTAG Action:%#016lX\n", vtag_action);
-		otx2_flow_dump_tx_vtag_action(file, vtag_action);
-	}
-}
-
-void
-otx2_flow_dump(FILE *file, struct otx2_eth_dev *hw, struct rte_flow *flow)
-{
-	bool is_rx = 0;
-	int i;
-
-	fprintf(file, "MCAM Index:%d\n", flow->mcam_id);
-	fprintf(file, "Interface :%s (%d)\n", intf_str[flow->nix_intf],
-		flow->nix_intf);
-	fprintf(file, "Priority  :%d\n", flow->priority);
-
-	if (flow->nix_intf == NIX_INTF_RX)
-		is_rx = 1;
-
-	otx2_flow_dump_parsed_action(file, flow->npc_action, is_rx);
-	otx2_flow_dump_vtag_action(file, flow->vtag_action, is_rx);
-	fprintf(file, "Patterns:\n");
-	otx2_flow_dump_patterns(file, hw, flow);
-
-	fprintf(file, "MCAM Raw Data :\n");
-
-	for (i = 0; i < OTX2_MAX_MCAM_WIDTH_DWORDS; i++)  {
-		fprintf(file, "\tDW%d     :%016lX\n", i, flow->mcam_data[i]);
-		fprintf(file, "\tDW%d_Mask:%016lX\n", i, flow->mcam_mask[i]);
-	}
-
-	fprintf(file, "\n");
-}
diff --git a/drivers/net/octeontx2/otx2_flow_parse.c b/drivers/net/octeontx2/otx2_flow_parse.c
deleted file mode 100644
index 91267bbb81..0000000000
--- a/drivers/net/octeontx2/otx2_flow_parse.c
+++ /dev/null
@@ -1,1239 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-#include "otx2_flow.h"
-
-const struct rte_flow_item *
-otx2_flow_skip_void_and_any_items(const struct rte_flow_item *pattern)
-{
-	while ((pattern->type == RTE_FLOW_ITEM_TYPE_VOID) ||
-	       (pattern->type == RTE_FLOW_ITEM_TYPE_ANY))
-		pattern++;
-
-	return pattern;
-}
-
-/*
- * Tunnel+ESP, Tunnel+ICMP4/6, Tunnel+TCP, Tunnel+UDP,
- * Tunnel+SCTP
- */
-int
-otx2_flow_parse_lh(struct otx2_parse_state *pst)
-{
-	struct otx2_flow_item_info info;
-	char hw_mask[64];
-	int lid, lt;
-	int rc;
-
-	if (!pst->tunnel)
-		return 0;
-
-	info.hw_mask = &hw_mask;
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_hdr_len = 0;
-	lid = NPC_LID_LH;
-
-	switch (pst->pattern->type) {
-	case RTE_FLOW_ITEM_TYPE_UDP:
-		lt = NPC_LT_LH_TU_UDP;
-		info.def_mask = &rte_flow_item_udp_mask;
-		info.len = sizeof(struct rte_flow_item_udp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_TCP:
-		lt = NPC_LT_LH_TU_TCP;
-		info.def_mask = &rte_flow_item_tcp_mask;
-		info.len = sizeof(struct rte_flow_item_tcp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_SCTP:
-		lt = NPC_LT_LH_TU_SCTP;
-		info.def_mask = &rte_flow_item_sctp_mask;
-		info.len = sizeof(struct rte_flow_item_sctp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_ESP:
-		lt = NPC_LT_LH_TU_ESP;
-		info.def_mask = &rte_flow_item_esp_mask;
-		info.len = sizeof(struct rte_flow_item_esp);
-		break;
-	default:
-		return 0;
-	}
-
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
-}
-
-/* Tunnel+IPv4, Tunnel+IPv6 */
-int
-otx2_flow_parse_lg(struct otx2_parse_state *pst)
-{
-	struct otx2_flow_item_info info;
-	char hw_mask[64];
-	int lid, lt;
-	int rc;
-
-	if (!pst->tunnel)
-		return 0;
-
-	info.hw_mask = &hw_mask;
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_hdr_len = 0;
-	lid = NPC_LID_LG;
-
-	if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_IPV4) {
-		lt = NPC_LT_LG_TU_IP;
-		info.def_mask = &rte_flow_item_ipv4_mask;
-		info.len = sizeof(struct rte_flow_item_ipv4);
-	} else if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_IPV6) {
-		lt = NPC_LT_LG_TU_IP6;
-		info.def_mask = &rte_flow_item_ipv6_mask;
-		info.len = sizeof(struct rte_flow_item_ipv6);
-	} else {
-		/* There is no tunneled IP header */
-		return 0;
-	}
-
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
-}
-
-/* Tunnel+Ether */
-int
-otx2_flow_parse_lf(struct otx2_parse_state *pst)
-{
-	const struct rte_flow_item *pattern, *last_pattern;
-	struct rte_flow_item_eth hw_mask;
-	struct otx2_flow_item_info info;
-	int lid, lt, lflags;
-	int nr_vlans = 0;
-	int rc;
-
-	/* We hit this layer if there is a tunneling protocol */
-	if (!pst->tunnel)
-		return 0;
-
-	if (pst->pattern->type != RTE_FLOW_ITEM_TYPE_ETH)
-		return 0;
-
-	lid = NPC_LID_LF;
-	lt = NPC_LT_LF_TU_ETHER;
-	lflags = 0;
-
-	info.def_mask = &rte_flow_item_vlan_mask;
-	/* No match support for vlan tags */
-	info.hw_mask = NULL;
-	info.len = sizeof(struct rte_flow_item_vlan);
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_hdr_len = 0;
-
-	/* Look ahead and find out any VLAN tags. These can be
-	 * detected but no data matching is available.
-	 */
-	last_pattern = pst->pattern;
-	pattern = pst->pattern + 1;
-	pattern = otx2_flow_skip_void_and_any_items(pattern);
-	while (pattern->type == RTE_FLOW_ITEM_TYPE_VLAN) {
-		nr_vlans++;
-		rc = otx2_flow_parse_item_basic(pattern, &info, pst->error);
-		if (rc != 0)
-			return rc;
-		last_pattern = pattern;
-		pattern++;
-		pattern = otx2_flow_skip_void_and_any_items(pattern);
-	}
-	otx2_npc_dbg("Nr_vlans = %d", nr_vlans);
-	switch (nr_vlans) {
-	case 0:
-		break;
-	case 1:
-		lflags = NPC_F_TU_ETHER_CTAG;
-		break;
-	case 2:
-		lflags = NPC_F_TU_ETHER_STAG_CTAG;
-		break;
-	default:
-		rte_flow_error_set(pst->error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_ITEM,
-				   last_pattern,
-				   "more than 2 vlans with tunneled Ethernet "
-				   "not supported");
-		return -rte_errno;
-	}
-
-	info.def_mask = &rte_flow_item_eth_mask;
-	info.hw_mask = &hw_mask;
-	info.len = sizeof(struct rte_flow_item_eth);
-	info.hw_hdr_len = 0;
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	info.spec = NULL;
-	info.mask = NULL;
-
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	pst->pattern = last_pattern;
-
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, lflags);
-}
-
-int
-otx2_flow_parse_le(struct otx2_parse_state *pst)
-{
-	/*
-	 * We are positioned at UDP. Scan ahead and look for
-	 * UDP encapsulated tunnel protocols. If available,
-	 * parse them. In that case handle this:
-	 *	- RTE spec assumes we point to tunnel header.
-	 *	- NPC parser provides offset from UDP header.
-	 */
-
-	/*
-	 * Note: Add support to GENEVE, VXLAN_GPE when we
-	 * upgrade DPDK
-	 *
-	 * Note: Better to split flags into two nibbles:
-	 *	- Higher nibble can have flags
-	 *	- Lower nibble to further enumerate protocols
-	 *	  and have flags based extraction
-	 */
-	const struct rte_flow_item *pattern = pst->pattern;
-	struct otx2_flow_item_info info;
-	int lid, lt, lflags;
-	char hw_mask[64];
-	int rc;
-
-	if (pst->tunnel)
-		return 0;
-
-	if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_MPLS)
-		return otx2_flow_parse_mpls(pst, NPC_LID_LE);
-
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_mask = NULL;
-	info.def_mask = NULL;
-	info.len = 0;
-	info.hw_hdr_len = 0;
-	lid = NPC_LID_LE;
-	lflags = 0;
-
-	/* Ensure we are not matching anything in UDP */
-	rc = otx2_flow_parse_item_basic(pattern, &info, pst->error);
-	if (rc)
-		return rc;
-
-	info.hw_mask = &hw_mask;
-	pattern = otx2_flow_skip_void_and_any_items(pattern);
-	otx2_npc_dbg("Pattern->type = %d", pattern->type);
-	switch (pattern->type) {
-	case RTE_FLOW_ITEM_TYPE_VXLAN:
-		lflags = NPC_F_UDP_VXLAN;
-		info.def_mask = &rte_flow_item_vxlan_mask;
-		info.len = sizeof(struct rte_flow_item_vxlan);
-		lt = NPC_LT_LE_VXLAN;
-		break;
-	case RTE_FLOW_ITEM_TYPE_ESP:
-		lt = NPC_LT_LE_ESP;
-		info.def_mask = &rte_flow_item_esp_mask;
-		info.len = sizeof(struct rte_flow_item_esp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_GTPC:
-		lflags = NPC_F_UDP_GTP_GTPC;
-		info.def_mask = &rte_flow_item_gtp_mask;
-		info.len = sizeof(struct rte_flow_item_gtp);
-		lt = NPC_LT_LE_GTPC;
-		break;
-	case RTE_FLOW_ITEM_TYPE_GTPU:
-		lflags = NPC_F_UDP_GTP_GTPU_G_PDU;
-		info.def_mask = &rte_flow_item_gtp_mask;
-		info.len = sizeof(struct rte_flow_item_gtp);
-		lt = NPC_LT_LE_GTPU;
-		break;
-	case RTE_FLOW_ITEM_TYPE_GENEVE:
-		lflags = NPC_F_UDP_GENEVE;
-		info.def_mask = &rte_flow_item_geneve_mask;
-		info.len = sizeof(struct rte_flow_item_geneve);
-		lt = NPC_LT_LE_GENEVE;
-		break;
-	case RTE_FLOW_ITEM_TYPE_VXLAN_GPE:
-		lflags = NPC_F_UDP_VXLANGPE;
-		info.def_mask = &rte_flow_item_vxlan_gpe_mask;
-		info.len = sizeof(struct rte_flow_item_vxlan_gpe);
-		lt = NPC_LT_LE_VXLANGPE;
-		break;
-	default:
-		return 0;
-	}
-
-	pst->tunnel = 1;
-
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	rc = otx2_flow_parse_item_basic(pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, lflags);
-}
-
-static int
-flow_parse_mpls_label_stack(struct otx2_parse_state *pst, int *flag)
-{
-	int nr_labels = 0;
-	const struct rte_flow_item *pattern = pst->pattern;
-	struct otx2_flow_item_info info;
-	int rc;
-	uint8_t flag_list[] = {0, NPC_F_MPLS_2_LABELS,
-		NPC_F_MPLS_3_LABELS, NPC_F_MPLS_4_LABELS};
-
-	/*
-	 * pst->pattern points to first MPLS label. We only check
-	 * that subsequent labels do not have anything to match.
-	 */
-	info.def_mask = &rte_flow_item_mpls_mask;
-	info.hw_mask = NULL;
-	info.len = sizeof(struct rte_flow_item_mpls);
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_hdr_len = 0;
-
-	while (pattern->type == RTE_FLOW_ITEM_TYPE_MPLS) {
-		nr_labels++;
-
-		/* Basic validation of 2nd/3rd/4th mpls item */
-		if (nr_labels > 1) {
-			rc = otx2_flow_parse_item_basic(pattern, &info,
-							pst->error);
-			if (rc != 0)
-				return rc;
-		}
-		pst->last_pattern = pattern;
-		pattern++;
-		pattern = otx2_flow_skip_void_and_any_items(pattern);
-	}
-
-	if (nr_labels > 4) {
-		rte_flow_error_set(pst->error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_ITEM,
-				   pst->last_pattern,
-				   "more than 4 mpls labels not supported");
-		return -rte_errno;
-	}
-
-	*flag = flag_list[nr_labels - 1];
-	return 0;
-}
-
-int
-otx2_flow_parse_mpls(struct otx2_parse_state *pst, int lid)
-{
-	/* Find number of MPLS labels */
-	struct rte_flow_item_mpls hw_mask;
-	struct otx2_flow_item_info info;
-	int lt, lflags;
-	int rc;
-
-	lflags = 0;
-
-	if (lid == NPC_LID_LC)
-		lt = NPC_LT_LC_MPLS;
-	else if (lid == NPC_LID_LD)
-		lt = NPC_LT_LD_TU_MPLS_IN_IP;
-	else
-		lt = NPC_LT_LE_TU_MPLS_IN_UDP;
-
-	/* Prepare for parsing the first item */
-	info.def_mask = &rte_flow_item_mpls_mask;
-	info.hw_mask = &hw_mask;
-	info.len = sizeof(struct rte_flow_item_mpls);
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_hdr_len = 0;
-
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	/*
-	 * Parse for more labels.
-	 * This sets lflags and pst->last_pattern correctly.
-	 */
-	rc = flow_parse_mpls_label_stack(pst, &lflags);
-	if (rc != 0)
-		return rc;
-
-	pst->tunnel = 1;
-	pst->pattern = pst->last_pattern;
-
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, lflags);
-}
-
-/*
- * ICMP, ICMP6, UDP, TCP, SCTP, VXLAN, GRE, NVGRE,
- * GTP, GTPC, GTPU, ESP
- *
- * Note: UDP tunnel protocols are identified by flags.
- *       LPTR for these protocol still points to UDP
- *       header. Need flag based extraction to support
- *       this.
- */
-int
-otx2_flow_parse_ld(struct otx2_parse_state *pst)
-{
-	char hw_mask[NPC_MAX_EXTRACT_DATA_LEN];
-	uint32_t gre_key_mask = 0xffffffff;
-	struct otx2_flow_item_info info;
-	int lid, lt, lflags;
-	int rc;
-
-	if (pst->tunnel) {
-		/* We have already parsed MPLS or IPv4/v6 followed
-		 * by MPLS or IPv4/v6. Subsequent TCP/UDP etc
-		 * would be parsed as tunneled versions. Skip
-		 * this layer, except for tunneled MPLS. If LC is
-		 * MPLS, we have anyway skipped all stacked MPLS
-		 * labels.
-		 */
-		if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_MPLS)
-			return otx2_flow_parse_mpls(pst, NPC_LID_LD);
-		return 0;
-	}
-	info.hw_mask = &hw_mask;
-	info.spec = NULL;
-	info.mask = NULL;
-	info.def_mask = NULL;
-	info.len = 0;
-	info.hw_hdr_len = 0;
-
-	lid = NPC_LID_LD;
-	lflags = 0;
-
-	otx2_npc_dbg("Pst->pattern->type = %d", pst->pattern->type);
-	switch (pst->pattern->type) {
-	case RTE_FLOW_ITEM_TYPE_ICMP:
-		if (pst->lt[NPC_LID_LC] == NPC_LT_LC_IP6)
-			lt = NPC_LT_LD_ICMP6;
-		else
-			lt = NPC_LT_LD_ICMP;
-		info.def_mask = &rte_flow_item_icmp_mask;
-		info.len = sizeof(struct rte_flow_item_icmp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_UDP:
-		lt = NPC_LT_LD_UDP;
-		info.def_mask = &rte_flow_item_udp_mask;
-		info.len = sizeof(struct rte_flow_item_udp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_TCP:
-		lt = NPC_LT_LD_TCP;
-		info.def_mask = &rte_flow_item_tcp_mask;
-		info.len = sizeof(struct rte_flow_item_tcp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_SCTP:
-		lt = NPC_LT_LD_SCTP;
-		info.def_mask = &rte_flow_item_sctp_mask;
-		info.len = sizeof(struct rte_flow_item_sctp);
-		break;
-	case RTE_FLOW_ITEM_TYPE_GRE:
-		lt = NPC_LT_LD_GRE;
-		info.def_mask = &rte_flow_item_gre_mask;
-		info.len = sizeof(struct rte_flow_item_gre);
-		break;
-	case RTE_FLOW_ITEM_TYPE_GRE_KEY:
-		lt = NPC_LT_LD_GRE;
-		info.def_mask = &gre_key_mask;
-		info.len = sizeof(gre_key_mask);
-		info.hw_hdr_len = 4;
-		break;
-	case RTE_FLOW_ITEM_TYPE_NVGRE:
-		lt = NPC_LT_LD_NVGRE;
-		lflags = NPC_F_GRE_NVGRE;
-		info.def_mask = &rte_flow_item_nvgre_mask;
-		info.len = sizeof(struct rte_flow_item_nvgre);
-		/* Further IP/Ethernet are parsed as tunneled */
-		pst->tunnel = 1;
-		break;
-	default:
-		return 0;
-	}
-
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, lflags);
-}
-
-static inline void
-flow_check_lc_ip_tunnel(struct otx2_parse_state *pst)
-{
-	const struct rte_flow_item *pattern = pst->pattern + 1;
-
-	pattern = otx2_flow_skip_void_and_any_items(pattern);
-	if (pattern->type == RTE_FLOW_ITEM_TYPE_MPLS ||
-	    pattern->type == RTE_FLOW_ITEM_TYPE_IPV4 ||
-	    pattern->type == RTE_FLOW_ITEM_TYPE_IPV6)
-		pst->tunnel = 1;
-}
-
-static int
-otx2_flow_raw_item_prepare(const struct rte_flow_item_raw *raw_spec,
-			   const struct rte_flow_item_raw *raw_mask,
-			   struct otx2_flow_item_info *info,
-			   uint8_t *spec_buf, uint8_t *mask_buf)
-{
-	uint32_t custom_hdr_size = 0;
-
-	memset(spec_buf, 0, NPC_MAX_RAW_ITEM_LEN);
-	memset(mask_buf, 0, NPC_MAX_RAW_ITEM_LEN);
-	custom_hdr_size = raw_spec->offset + raw_spec->length;
-
-	memcpy(spec_buf + raw_spec->offset, raw_spec->pattern,
-	       raw_spec->length);
-
-	if (raw_mask->pattern) {
-		memcpy(mask_buf + raw_spec->offset, raw_mask->pattern,
-		       raw_spec->length);
-	} else {
-		memset(mask_buf + raw_spec->offset, 0xFF, raw_spec->length);
-	}
-
-	info->len = custom_hdr_size;
-	info->spec = spec_buf;
-	info->mask = mask_buf;
-
-	return 0;
-}
-
-/* Outer IPv4, Outer IPv6, MPLS, ARP */
-int
-otx2_flow_parse_lc(struct otx2_parse_state *pst)
-{
-	uint8_t raw_spec_buf[NPC_MAX_RAW_ITEM_LEN];
-	uint8_t raw_mask_buf[NPC_MAX_RAW_ITEM_LEN];
-	uint8_t hw_mask[NPC_MAX_EXTRACT_DATA_LEN];
-	const struct rte_flow_item_raw *raw_spec;
-	struct otx2_flow_item_info info;
-	int lid, lt, len;
-	int rc;
-
-	if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_MPLS)
-		return otx2_flow_parse_mpls(pst, NPC_LID_LC);
-
-	info.hw_mask = &hw_mask;
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_hdr_len = 0;
-	lid = NPC_LID_LC;
-
-	switch (pst->pattern->type) {
-	case RTE_FLOW_ITEM_TYPE_IPV4:
-		lt = NPC_LT_LC_IP;
-		info.def_mask = &rte_flow_item_ipv4_mask;
-		info.len = sizeof(struct rte_flow_item_ipv4);
-		break;
-	case RTE_FLOW_ITEM_TYPE_IPV6:
-		lid = NPC_LID_LC;
-		lt = NPC_LT_LC_IP6;
-		info.def_mask = &rte_flow_item_ipv6_mask;
-		info.len = sizeof(struct rte_flow_item_ipv6);
-		break;
-	case RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4:
-		lt = NPC_LT_LC_ARP;
-		info.def_mask = &rte_flow_item_arp_eth_ipv4_mask;
-		info.len = sizeof(struct rte_flow_item_arp_eth_ipv4);
-		break;
-	case RTE_FLOW_ITEM_TYPE_IPV6_EXT:
-		lid = NPC_LID_LC;
-		lt = NPC_LT_LC_IP6_EXT;
-		info.def_mask = &rte_flow_item_ipv6_ext_mask;
-		info.len = sizeof(struct rte_flow_item_ipv6_ext);
-		info.hw_hdr_len = 40;
-		break;
-	case RTE_FLOW_ITEM_TYPE_RAW:
-		raw_spec = pst->pattern->spec;
-		if (!raw_spec->relative)
-			return 0;
-
-		len = raw_spec->length + raw_spec->offset;
-		if (len > NPC_MAX_RAW_ITEM_LEN) {
-			rte_flow_error_set(pst->error, EINVAL,
-					   RTE_FLOW_ERROR_TYPE_ITEM, NULL,
-					   "Spec length too big");
-			return -rte_errno;
-		}
-
-		otx2_flow_raw_item_prepare((const struct rte_flow_item_raw *)
-					   pst->pattern->spec,
-					   (const struct rte_flow_item_raw *)
-					   pst->pattern->mask, &info,
-					   raw_spec_buf, raw_mask_buf);
-
-		lid = NPC_LID_LC;
-		lt = NPC_LT_LC_NGIO;
-		info.hw_mask = &hw_mask;
-		otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-		break;
-	default:
-		/* No match at this layer */
-		return 0;
-	}
-
-	/* Identify if IP tunnels MPLS or IPv4/v6 */
-	flow_check_lc_ip_tunnel(pst);
-
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
-}
-
-/* VLAN, ETAG */
-int
-otx2_flow_parse_lb(struct otx2_parse_state *pst)
-{
-	const struct rte_flow_item *pattern = pst->pattern;
-	uint8_t raw_spec_buf[NPC_MAX_RAW_ITEM_LEN];
-	uint8_t raw_mask_buf[NPC_MAX_RAW_ITEM_LEN];
-	const struct rte_flow_item *last_pattern;
-	const struct rte_flow_item_raw *raw_spec;
-	char hw_mask[NPC_MAX_EXTRACT_DATA_LEN];
-	struct otx2_flow_item_info info;
-	int lid, lt, lflags, len;
-	int nr_vlans = 0;
-	int rc;
-
-	info.spec = NULL;
-	info.mask = NULL;
-	info.hw_hdr_len = NPC_TPID_LENGTH;
-
-	lid = NPC_LID_LB;
-	lflags = 0;
-	last_pattern = pattern;
-
-	if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_VLAN) {
-		/* RTE vlan is either 802.1q or 802.1ad,
-		 * this maps to either CTAG/STAG. We need to decide
-		 * based on number of VLANS present. Matching is
-		 * supported on first tag only.
-		 */
-		info.def_mask = &rte_flow_item_vlan_mask;
-		info.hw_mask = NULL;
-		info.len = sizeof(struct rte_flow_item_vlan);
-
-		pattern = pst->pattern;
-		while (pattern->type == RTE_FLOW_ITEM_TYPE_VLAN) {
-			nr_vlans++;
-
-			/* Basic validation of 2nd/3rd vlan item */
-			if (nr_vlans > 1) {
-				otx2_npc_dbg("Vlans  = %d", nr_vlans);
-				rc = otx2_flow_parse_item_basic(pattern, &info,
-								pst->error);
-				if (rc != 0)
-					return rc;
-			}
-			last_pattern = pattern;
-			pattern++;
-			pattern = otx2_flow_skip_void_and_any_items(pattern);
-		}
-
-		switch (nr_vlans) {
-		case 1:
-			lt = NPC_LT_LB_CTAG;
-			break;
-		case 2:
-			lt = NPC_LT_LB_STAG_QINQ;
-			lflags = NPC_F_STAG_CTAG;
-			break;
-		case 3:
-			lt = NPC_LT_LB_STAG_QINQ;
-			lflags = NPC_F_STAG_STAG_CTAG;
-			break;
-		default:
-			rte_flow_error_set(pst->error, ENOTSUP,
-					   RTE_FLOW_ERROR_TYPE_ITEM,
-					   last_pattern,
-					   "more than 3 vlans not supported");
-			return -rte_errno;
-		}
-	} else if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_E_TAG) {
-		/* we can support ETAG and match a subsequent CTAG
-		 * without any matching support.
-		 */
-		lt = NPC_LT_LB_ETAG;
-		lflags = 0;
-
-		last_pattern = pst->pattern;
-		pattern = otx2_flow_skip_void_and_any_items(pst->pattern + 1);
-		if (pattern->type == RTE_FLOW_ITEM_TYPE_VLAN) {
-			info.def_mask = &rte_flow_item_vlan_mask;
-			/* set supported mask to NULL for vlan tag */
-			info.hw_mask = NULL;
-			info.len = sizeof(struct rte_flow_item_vlan);
-			rc = otx2_flow_parse_item_basic(pattern, &info,
-							pst->error);
-			if (rc != 0)
-				return rc;
-
-			lflags = NPC_F_ETAG_CTAG;
-			last_pattern = pattern;
-		}
-
-		info.def_mask = &rte_flow_item_e_tag_mask;
-		info.len = sizeof(struct rte_flow_item_e_tag);
-	} else if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_RAW) {
-		raw_spec = pst->pattern->spec;
-		if (raw_spec->relative)
-			return 0;
-		len = raw_spec->length + raw_spec->offset;
-		if (len > NPC_MAX_RAW_ITEM_LEN) {
-			rte_flow_error_set(pst->error, EINVAL,
-					   RTE_FLOW_ERROR_TYPE_ITEM, NULL,
-					   "Spec length too big");
-			return -rte_errno;
-		}
-
-		if (pst->npc->switch_header_type ==
-		    OTX2_PRIV_FLAGS_VLAN_EXDSA) {
-			lt = NPC_LT_LB_VLAN_EXDSA;
-		} else if (pst->npc->switch_header_type ==
-			   OTX2_PRIV_FLAGS_EXDSA) {
-			lt = NPC_LT_LB_EXDSA;
-		} else {
-			rte_flow_error_set(pst->error, ENOTSUP,
-					   RTE_FLOW_ERROR_TYPE_ITEM, NULL,
-					   "exdsa or vlan_exdsa not enabled on"
-					   " port");
-			return -rte_errno;
-		}
-
-		otx2_flow_raw_item_prepare((const struct rte_flow_item_raw *)
-					   pst->pattern->spec,
-					   (const struct rte_flow_item_raw *)
-					   pst->pattern->mask, &info,
-					   raw_spec_buf, raw_mask_buf);
-
-		info.hw_hdr_len = 0;
-	} else {
-		return 0;
-	}
-
-	info.hw_mask = &hw_mask;
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc != 0)
-		return rc;
-
-	/* Point pattern to last item consumed */
-	pst->pattern = last_pattern;
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, lflags);
-}
-
-
-int
-otx2_flow_parse_la(struct otx2_parse_state *pst)
-{
-	struct rte_flow_item_eth hw_mask;
-	struct otx2_flow_item_info info;
-	int lid, lt;
-	int rc;
-
-	/* Identify the pattern type into lid, lt */
-	if (pst->pattern->type != RTE_FLOW_ITEM_TYPE_ETH)
-		return 0;
-
-	lid = NPC_LID_LA;
-	lt = NPC_LT_LA_ETHER;
-	info.hw_hdr_len = 0;
-
-	if (pst->flow->nix_intf == NIX_INTF_TX) {
-		lt = NPC_LT_LA_IH_NIX_ETHER;
-		info.hw_hdr_len = NPC_IH_LENGTH;
-		if (pst->npc->switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
-			lt = NPC_LT_LA_IH_NIX_HIGIG2_ETHER;
-			info.hw_hdr_len += NPC_HIGIG2_LENGTH;
-		}
-	} else {
-		if (pst->npc->switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
-			lt = NPC_LT_LA_HIGIG2_ETHER;
-			info.hw_hdr_len = NPC_HIGIG2_LENGTH;
-		}
-	}
-
-	/* Prepare for parsing the item */
-	info.def_mask = &rte_flow_item_eth_mask;
-	info.hw_mask = &hw_mask;
-	info.len = sizeof(struct rte_flow_item_eth);
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	info.spec = NULL;
-	info.mask = NULL;
-
-	/* Basic validation of item parameters */
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc)
-		return rc;
-
-	/* Update pst if not validate only? clash check? */
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
-}
-
-int
-otx2_flow_parse_higig2_hdr(struct otx2_parse_state *pst)
-{
-	struct rte_flow_item_higig2_hdr hw_mask;
-	struct otx2_flow_item_info info;
-	int lid, lt;
-	int rc;
-
-	/* Identify the pattern type into lid, lt */
-	if (pst->pattern->type != RTE_FLOW_ITEM_TYPE_HIGIG2)
-		return 0;
-
-	lid = NPC_LID_LA;
-	lt = NPC_LT_LA_HIGIG2_ETHER;
-	info.hw_hdr_len = 0;
-
-	if (pst->flow->nix_intf == NIX_INTF_TX) {
-		lt = NPC_LT_LA_IH_NIX_HIGIG2_ETHER;
-		info.hw_hdr_len = NPC_IH_LENGTH;
-	}
-
-	/* Prepare for parsing the item */
-	info.def_mask = &rte_flow_item_higig2_hdr_mask;
-	info.hw_mask = &hw_mask;
-	info.len = sizeof(struct rte_flow_item_higig2_hdr);
-	otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
-	info.spec = NULL;
-	info.mask = NULL;
-
-	/* Basic validation of item parameters */
-	rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
-	if (rc)
-		return rc;
-
-	/* Update pst if not validate only? clash check? */
-	return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
-}
-
-static int
-parse_rss_action(struct rte_eth_dev *dev,
-		 const struct rte_flow_attr *attr,
-		 const struct rte_flow_action *act,
-		 struct rte_flow_error *error)
-{
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	struct otx2_rss_info *rss_info = &hw->rss_info;
-	const struct rte_flow_action_rss *rss;
-	uint32_t i;
-
-	rss = (const struct rte_flow_action_rss *)act->conf;
-
-	/* Not supported */
-	if (attr->egress) {
-		return rte_flow_error_set(error, EINVAL,
-					  RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
-					  attr, "No support of RSS in egress");
-	}
-
-	if (dev->data->dev_conf.rxmode.mq_mode != RTE_ETH_MQ_RX_RSS)
-		return rte_flow_error_set(error, ENOTSUP,
-					  RTE_FLOW_ERROR_TYPE_ACTION,
-					  act, "multi-queue mode is disabled");
-
-	/* Parse RSS related parameters from configuration */
-	if (!rss || !rss->queue_num)
-		return rte_flow_error_set(error, EINVAL,
-					  RTE_FLOW_ERROR_TYPE_ACTION,
-					  act, "no valid queues");
-
-	if (rss->func != RTE_ETH_HASH_FUNCTION_DEFAULT)
-		return rte_flow_error_set(error, ENOTSUP,
-					  RTE_FLOW_ERROR_TYPE_ACTION, act,
-					  "non-default RSS hash functions"
-					  " are not supported");
-
-	if (rss->key_len && rss->key_len > RTE_DIM(rss_info->key))
-		return rte_flow_error_set(error, ENOTSUP,
-					  RTE_FLOW_ERROR_TYPE_ACTION, act,
-					  "RSS hash key too large");
-
-	if (rss->queue_num > rss_info->rss_size)
-		return rte_flow_error_set
-			(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act,
-			 "too many queues for RSS context");
-
-	for (i = 0; i < rss->queue_num; i++) {
-		if (rss->queue[i] >= dev->data->nb_rx_queues)
-			return rte_flow_error_set(error, EINVAL,
-						  RTE_FLOW_ERROR_TYPE_ACTION,
-						  act,
-						  "queue id > max number"
-						  " of queues");
-	}
-
-	return 0;
-}
-
-int
-otx2_flow_parse_actions(struct rte_eth_dev *dev,
-			const struct rte_flow_attr *attr,
-			const struct rte_flow_action actions[],
-			struct rte_flow_error *error,
-			struct rte_flow *flow)
-{
-	struct otx2_eth_dev *hw = dev->data->dev_private;
-	struct otx2_npc_flow_info *npc = &hw->npc_flow;
-	const struct rte_flow_action_mark *act_mark;
-	const struct rte_flow_action_queue *act_q;
-	const struct rte_flow_action_vf *vf_act;
-	uint16_t pf_func, vf_id, port_id, pf_id;
-	char if_name[RTE_ETH_NAME_MAX_LEN];
-	bool vlan_insert_action = false;
-	struct rte_eth_dev *eth_dev;
-	const char *errmsg = NULL;
-	int sel_act, req_act = 0;
-	int errcode = 0;
-	int mark = 0;
-	int rq = 0;
-
-	/* Initialize actions */
-	flow->ctr_id = NPC_COUNTER_NONE;
-	pf_func = otx2_pfvf_func(hw->pf, hw->vf);
-
-	for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
-		otx2_npc_dbg("Action type = %d", actions->type);
-
-		switch (actions->type) {
-		case RTE_FLOW_ACTION_TYPE_VOID:
-			break;
-		case RTE_FLOW_ACTION_TYPE_MARK:
-			act_mark =
-			    (const struct rte_flow_action_mark *)actions->conf;
-
-			/* We have only 16 bits. Use highest val for flag */
-			if (act_mark->id > (OTX2_FLOW_FLAG_VAL - 2)) {
-				errmsg = "mark value must be < 0xfffe";
-				errcode = ENOTSUP;
-				goto err_exit;
-			}
-			mark = act_mark->id + 1;
-			req_act |= OTX2_FLOW_ACT_MARK;
-			rte_atomic32_inc(&npc->mark_actions);
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_FLAG:
-			mark = OTX2_FLOW_FLAG_VAL;
-			req_act |= OTX2_FLOW_ACT_FLAG;
-			rte_atomic32_inc(&npc->mark_actions);
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_COUNT:
-			/* Indicates, need a counter */
-			flow->ctr_id = 1;
-			req_act |= OTX2_FLOW_ACT_COUNT;
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_DROP:
-			req_act |= OTX2_FLOW_ACT_DROP;
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_PF:
-			req_act |= OTX2_FLOW_ACT_PF;
-			pf_func &= (0xfc00);
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_VF:
-			vf_act = (const struct rte_flow_action_vf *)
-				actions->conf;
-			req_act |= OTX2_FLOW_ACT_VF;
-			if (vf_act->original == 0) {
-				vf_id = vf_act->id & RVU_PFVF_FUNC_MASK;
-				if (vf_id  >= hw->maxvf) {
-					errmsg = "invalid vf specified";
-					errcode = EINVAL;
-					goto err_exit;
-				}
-				pf_func &= (0xfc00);
-				pf_func = (pf_func | (vf_id + 1));
-			}
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_PORT_ID:
-		case RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR:
-			if (actions->type == RTE_FLOW_ACTION_TYPE_PORT_ID) {
-				const struct rte_flow_action_port_id *port_act;
-
-				port_act = actions->conf;
-				port_id = port_act->id;
-			} else {
-				const struct rte_flow_action_ethdev *ethdev_act;
-
-				ethdev_act = actions->conf;
-				port_id = ethdev_act->port_id;
-			}
-			if (rte_eth_dev_get_name_by_port(port_id, if_name)) {
-				errmsg = "Name not found for output port id";
-				errcode = EINVAL;
-				goto err_exit;
-			}
-			eth_dev = rte_eth_dev_allocated(if_name);
-			if (!eth_dev) {
-				errmsg = "eth_dev not found for output port id";
-				errcode = EINVAL;
-				goto err_exit;
-			}
-			if (!otx2_ethdev_is_same_driver(eth_dev)) {
-				errmsg = "Output port id unsupported type";
-				errcode = ENOTSUP;
-				goto err_exit;
-			}
-			if (!otx2_dev_is_vf(otx2_eth_pmd_priv(eth_dev))) {
-				errmsg = "Output port should be VF";
-				errcode = ENOTSUP;
-				goto err_exit;
-			}
-			vf_id = otx2_eth_pmd_priv(eth_dev)->vf;
-			if (vf_id  >= hw->maxvf) {
-				errmsg = "Invalid vf for output port";
-				errcode = EINVAL;
-				goto err_exit;
-			}
-			pf_id = otx2_eth_pmd_priv(eth_dev)->pf;
-			if (pf_id != hw->pf) {
-				errmsg = "Output port unsupported PF";
-				errcode = ENOTSUP;
-				goto err_exit;
-			}
-			pf_func &= (0xfc00);
-			pf_func = (pf_func | (vf_id + 1));
-			req_act |= OTX2_FLOW_ACT_VF;
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_QUEUE:
-			/* Applicable only to ingress flow */
-			act_q = (const struct rte_flow_action_queue *)
-				actions->conf;
-			rq = act_q->index;
-			if (rq >= dev->data->nb_rx_queues) {
-				errmsg = "invalid queue index";
-				errcode = EINVAL;
-				goto err_exit;
-			}
-			req_act |= OTX2_FLOW_ACT_QUEUE;
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_RSS:
-			errcode = parse_rss_action(dev,	attr, actions, error);
-			if (errcode)
-				return -rte_errno;
-
-			req_act |= OTX2_FLOW_ACT_RSS;
-			break;
-
-		case RTE_FLOW_ACTION_TYPE_SECURITY:
-			/* Assumes user has already configured security
-			 * session for this flow. Associated conf is
-			 * opaque. When RTE security is implemented for otx2,
-			 * we need to verify that for specified security
-			 * session:
-			 *  action_type ==
-			 *    RTE_SECURITY_ACTION_TYPE_INLINE_PROTOCOL &&
-			 *  session_protocol ==
-			 *    RTE_SECURITY_PROTOCOL_IPSEC
-			 *
-			 * RSS is not supported with inline ipsec. Get the
-			 * rq from associated conf, or make
-			 * RTE_FLOW_ACTION_TYPE_QUEUE compulsory with this
-			 * action.
-			 * Currently, rq = 0 is assumed.
-			 */
-			req_act |= OTX2_FLOW_ACT_SEC;
-			rq = 0;
-			break;
-		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
-			req_act |= OTX2_FLOW_ACT_VLAN_INSERT;
-			break;
-		case RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:
-			req_act |= OTX2_FLOW_ACT_VLAN_STRIP;
-			break;
-		case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
-			req_act |= OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT;
-			break;
-		case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:
-			req_act |= OTX2_FLOW_ACT_VLAN_PCP_INSERT;
-			break;
-		default:
-			errmsg = "Unsupported action specified";
-			errcode = ENOTSUP;
-			goto err_exit;
-		}
-	}
-
-	if (req_act &
-	    (OTX2_FLOW_ACT_VLAN_INSERT | OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT |
-	     OTX2_FLOW_ACT_VLAN_PCP_INSERT))
-		vlan_insert_action = true;
-
-	if ((req_act &
-	     (OTX2_FLOW_ACT_VLAN_INSERT | OTX2_FLOW_ACT_VLAN_ETHTYPE_INSERT |
-	      OTX2_FLOW_ACT_VLAN_PCP_INSERT)) ==
-	    OTX2_FLOW_ACT_VLAN_PCP_INSERT) {
-		errmsg = " PCP insert action can't be supported alone";
-		errcode = ENOTSUP;
-		goto err_exit;
-	}
-
-	/* Both STRIP and INSERT actions are not supported */
-	if (vlan_insert_action && (req_act & OTX2_FLOW_ACT_VLAN_STRIP)) {
-		errmsg = "Both VLAN insert and strip actions not supported"
-			" together";
-		errcode = ENOTSUP;
-		goto err_exit;
-	}
-
-	/* Check if actions specified are compatible */
-	if (attr->egress) {
-		if (req_act & OTX2_FLOW_ACT_VLAN_STRIP) {
-			errmsg = "VLAN pop action is not supported on Egress";
-			errcode = ENOTSUP;
-			goto err_exit;
-		}
-
-		if (req_act & OTX2_FLOW_ACT_DROP) {
-			flow->npc_action = NIX_TX_ACTIONOP_DROP;
-		} else if ((req_act & OTX2_FLOW_ACT_COUNT) ||
-			   vlan_insert_action) {
-			flow->npc_action = NIX_TX_ACTIONOP_UCAST_DEFAULT;
-		} else {
-			errmsg = "Unsupported action for egress";
-			errcode = EINVAL;
-			goto err_exit;
-		}
-		goto set_pf_func;
-	}
-
-	/* We have already verified the attr, this is ingress.
-	 * - Exactly one terminating action is supported
-	 * - Exactly one of MARK or FLAG is supported
-	 * - If terminating action is DROP, only count is valid.
-	 */
-	sel_act = req_act & OTX2_FLOW_ACT_TERM;
-	if ((sel_act & (sel_act - 1)) != 0) {
-		errmsg = "Only one terminating action supported";
-		errcode = EINVAL;
-		goto err_exit;
-	}
-
-	if (req_act & OTX2_FLOW_ACT_DROP) {
-		sel_act = req_act & ~OTX2_FLOW_ACT_COUNT;
-		if ((sel_act & (sel_act - 1)) != 0) {
-			errmsg = "Only COUNT action is supported "
-				"with DROP ingress action";
-			errcode = ENOTSUP;
-			goto err_exit;
-		}
-	}
-
-	if ((req_act & (OTX2_FLOW_ACT_FLAG | OTX2_FLOW_ACT_MARK))
-	    == (OTX2_FLOW_ACT_FLAG | OTX2_FLOW_ACT_MARK)) {
-		errmsg = "Only one of FLAG or MARK action is supported";
-		errcode = ENOTSUP;
-		goto err_exit;
-	}
-
-	if (vlan_insert_action) {
-		errmsg = "VLAN push/Insert action is not supported on Ingress";
-		errcode = ENOTSUP;
-		goto err_exit;
-	}
-
-	if (req_act & OTX2_FLOW_ACT_VLAN_STRIP)
-		npc->vtag_actions++;
-
-	/* Only VLAN action is provided */
-	if (req_act == OTX2_FLOW_ACT_VLAN_STRIP)
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-	/* Set NIX_RX_ACTIONOP */
-	else if (req_act & (OTX2_FLOW_ACT_PF | OTX2_FLOW_ACT_VF)) {
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-		if (req_act & OTX2_FLOW_ACT_QUEUE)
-			flow->npc_action |= (uint64_t)rq << 20;
-	} else if (req_act & OTX2_FLOW_ACT_DROP) {
-		flow->npc_action = NIX_RX_ACTIONOP_DROP;
-	} else if (req_act & OTX2_FLOW_ACT_QUEUE) {
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-		flow->npc_action |= (uint64_t)rq << 20;
-	} else if (req_act & OTX2_FLOW_ACT_RSS) {
-		/* When user added a rule for rss, first we will add the
-		 *rule in MCAM and then update the action, once if we have
-		 *FLOW_KEY_ALG index. So, till we update the action with
-		 *flow_key_alg index, set the action to drop.
-		 */
-		if (dev->data->dev_conf.rxmode.mq_mode == RTE_ETH_MQ_RX_RSS)
-			flow->npc_action = NIX_RX_ACTIONOP_DROP;
-		else
-			flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-	} else if (req_act & OTX2_FLOW_ACT_SEC) {
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST_IPSEC;
-		flow->npc_action |= (uint64_t)rq << 20;
-	} else if (req_act & (OTX2_FLOW_ACT_FLAG | OTX2_FLOW_ACT_MARK)) {
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-	} else if (req_act & OTX2_FLOW_ACT_COUNT) {
-		/* Keep OTX2_FLOW_ACT_COUNT always at the end
-		 * This is default action, when user specify only
-		 * COUNT ACTION
-		 */
-		flow->npc_action = NIX_RX_ACTIONOP_UCAST;
-	} else {
-		/* Should never reach here */
-		errmsg = "Invalid action specified";
-		errcode = EINVAL;
-		goto err_exit;
-	}
-
-	if (mark)
-		flow->npc_action |= (uint64_t)mark << 40;
-
-	if (rte_atomic32_read(&npc->mark_actions) == 1) {
-		hw->rx_offload_flags |=
-			NIX_RX_OFFLOAD_MARK_UPDATE_F;
-		otx2_eth_set_rx_function(dev);
-	}
-
-	if (npc->vtag_actions == 1) {
-		hw->rx_offload_flags |= NIX_RX_OFFLOAD_VLAN_STRIP_F;
-		otx2_eth_set_rx_function(dev);
-	}
-
-set_pf_func:
-	/* Ideally AF must ensure that correct pf_func is set */
-	if (attr->egress)
-		flow->npc_action |= (uint64_t)pf_func << 48;
-	else
-		flow->npc_action |= (uint64_t)pf_func << 4;
-
-	return 0;
-
-err_exit:
-	rte_flow_error_set(error, errcode,
-			   RTE_FLOW_ERROR_TYPE_ACTION_NUM, NULL,
-			   errmsg);
-	return -rte_errno;
-}
diff --git a/drivers/net/octeontx2/otx2_flow_utils.c b/drivers/net/octeontx2/otx2_flow_utils.c
deleted file mode 100644
index 35f7d0f4bc..0000000000
--- a/drivers/net/octeontx2/otx2_flow_utils.c
+++ /dev/null
@@ -1,969 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-#include "otx2_flow.h"
-
-static int
-flow_mcam_alloc_counter(struct otx2_mbox *mbox, uint16_t *ctr)
-{
-	struct npc_mcam_alloc_counter_req *req;
-	struct npc_mcam_alloc_counter_rsp *rsp;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_alloc_counter(mbox);
-	req->count = 1;
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
-
-	*ctr = rsp->cntr_list[0];
-	return rc;
-}
-
-int
-otx2_flow_mcam_free_counter(struct otx2_mbox *mbox, uint16_t ctr_id)
-{
-	struct npc_mcam_oper_counter_req *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_free_counter(mbox);
-	req->cntr = ctr_id;
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, NULL);
-
-	return rc;
-}
-
-int
-otx2_flow_mcam_read_counter(struct otx2_mbox *mbox, uint32_t ctr_id,
-			    uint64_t *count)
-{
-	struct npc_mcam_oper_counter_req *req;
-	struct npc_mcam_oper_counter_rsp *rsp;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_counter_stats(mbox);
-	req->cntr = ctr_id;
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
-
-	*count = rsp->stat;
-	return rc;
-}
-
-int
-otx2_flow_mcam_clear_counter(struct otx2_mbox *mbox, uint32_t ctr_id)
-{
-	struct npc_mcam_oper_counter_req *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_clear_counter(mbox);
-	req->cntr = ctr_id;
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, NULL);
-
-	return rc;
-}
-
-int
-otx2_flow_mcam_free_entry(struct otx2_mbox *mbox, uint32_t entry)
-{
-	struct npc_mcam_free_entry_req *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
-	req->entry = entry;
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, NULL);
-
-	return rc;
-}
-
-int
-otx2_flow_mcam_free_all_entries(struct otx2_mbox *mbox)
-{
-	struct npc_mcam_free_entry_req *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
-	req->all = 1;
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, NULL);
-
-	return rc;
-}
-
-static void
-flow_prep_mcam_ldata(uint8_t *ptr, const uint8_t *data, int len)
-{
-	int idx;
-
-	for (idx = 0; idx < len; idx++)
-		ptr[idx] = data[len - 1 - idx];
-}
-
-static int
-flow_check_copysz(size_t size, size_t len)
-{
-	if (len <= size)
-		return len;
-	return -1;
-}
-
-static inline int
-flow_mem_is_zero(const void *mem, int len)
-{
-	const char *m = mem;
-	int i;
-
-	for (i = 0; i < len; i++) {
-		if (m[i] != 0)
-			return 0;
-	}
-	return 1;
-}
-
-static void
-flow_set_hw_mask(struct otx2_flow_item_info *info,
-		 struct npc_xtract_info *xinfo,
-		 char *hw_mask)
-{
-	int max_off, offset;
-	int j;
-
-	if (xinfo->enable == 0)
-		return;
-
-	if (xinfo->hdr_off < info->hw_hdr_len)
-		return;
-
-	max_off = xinfo->hdr_off + xinfo->len - info->hw_hdr_len;
-
-	if (max_off > info->len)
-		max_off = info->len;
-
-	offset = xinfo->hdr_off - info->hw_hdr_len;
-	for (j = offset; j < max_off; j++)
-		hw_mask[j] = 0xff;
-}
-
-void
-otx2_flow_get_hw_supp_mask(struct otx2_parse_state *pst,
-			   struct otx2_flow_item_info *info, int lid, int lt)
-{
-	struct npc_xtract_info *xinfo, *lfinfo;
-	char *hw_mask = info->hw_mask;
-	int lf_cfg;
-	int i, j;
-	int intf;
-
-	intf = pst->flow->nix_intf;
-	xinfo = pst->npc->prx_dxcfg[intf][lid][lt].xtract;
-	memset(hw_mask, 0, info->len);
-
-	for (i = 0; i < NPC_MAX_LD; i++) {
-		flow_set_hw_mask(info, &xinfo[i], hw_mask);
-	}
-
-	for (i = 0; i < NPC_MAX_LD; i++) {
-
-		if (xinfo[i].flags_enable == 0)
-			continue;
-
-		lf_cfg = pst->npc->prx_lfcfg[i].i;
-		if (lf_cfg == lid) {
-			for (j = 0; j < NPC_MAX_LFL; j++) {
-				lfinfo = pst->npc->prx_fxcfg[intf]
-					[i][j].xtract;
-				flow_set_hw_mask(info, &lfinfo[0], hw_mask);
-			}
-		}
-	}
-}
-
-static int
-flow_update_extraction_data(struct otx2_parse_state *pst,
-			    struct otx2_flow_item_info *info,
-			    struct npc_xtract_info *xinfo)
-{
-	uint8_t int_info_mask[NPC_MAX_EXTRACT_DATA_LEN];
-	uint8_t int_info[NPC_MAX_EXTRACT_DATA_LEN];
-	struct npc_xtract_info *x;
-	int k, idx, hdr_off;
-	int len = 0;
-
-	x = xinfo;
-	len = x->len;
-	hdr_off = x->hdr_off;
-
-	if (hdr_off < info->hw_hdr_len)
-		return 0;
-
-	if (x->enable == 0)
-		return 0;
-
-	otx2_npc_dbg("x->hdr_off = %d, len = %d, info->len = %d,"
-		     "x->key_off = %d", x->hdr_off, len, info->len,
-		     x->key_off);
-
-	hdr_off -= info->hw_hdr_len;
-
-	if (hdr_off + len > info->len)
-		len = info->len - hdr_off;
-
-	/* Check for over-write of previous layer */
-	if (!flow_mem_is_zero(pst->mcam_mask + x->key_off,
-			      len)) {
-		/* Cannot support this data match */
-		rte_flow_error_set(pst->error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_ITEM,
-				   pst->pattern,
-				   "Extraction unsupported");
-		return -rte_errno;
-	}
-
-	len = flow_check_copysz((OTX2_MAX_MCAM_WIDTH_DWORDS * 8)
-				- x->key_off,
-				len);
-	if (len < 0) {
-		rte_flow_error_set(pst->error, ENOTSUP,
-				   RTE_FLOW_ERROR_TYPE_ITEM,
-				   pst->pattern,
-				   "Internal Error");
-		return -rte_errno;
-	}
-
-	/* Need to reverse complete structure so that dest addr is at
-	 * MSB so as to program the MCAM using mcam_data & mcam_mask
-	 * arrays
-	 */
-	flow_prep_mcam_ldata(int_info,
-			     (const uint8_t *)info->spec + hdr_off,
-			     x->len);
-	flow_prep_mcam_ldata(int_info_mask,
-			     (const uint8_t *)info->mask + hdr_off,
-			     x->len);
-
-	otx2_npc_dbg("Spec: ");
-	for (k = 0; k < info->len; k++)
-		otx2_npc_dbg("0x%.2x ",
-			     ((const uint8_t *)info->spec)[k]);
-
-	otx2_npc_dbg("Int_info: ");
-	for (k = 0; k < info->len; k++)
-		otx2_npc_dbg("0x%.2x ", int_info[k]);
-
-	memcpy(pst->mcam_mask + x->key_off, int_info_mask, len);
-	memcpy(pst->mcam_data + x->key_off, int_info, len);
-
-	otx2_npc_dbg("Parse state mcam data & mask");
-	for (idx = 0; idx < len ; idx++)
-		otx2_npc_dbg("data[%d]: 0x%x, mask[%d]: 0x%x", idx,
-			     *(pst->mcam_data + idx + x->key_off), idx,
-			     *(pst->mcam_mask + idx + x->key_off));
-	return 0;
-}
-
-int
-otx2_flow_update_parse_state(struct otx2_parse_state *pst,
-			     struct otx2_flow_item_info *info, int lid, int lt,
-			     uint8_t flags)
-{
-	struct npc_lid_lt_xtract_info *xinfo;
-	struct otx2_flow_dump_data *dump;
-	struct npc_xtract_info *lfinfo;
-	int intf, lf_cfg;
-	int i, j, rc = 0;
-
-	otx2_npc_dbg("Parse state function info mask total %s",
-		     (const uint8_t *)info->mask);
-
-	pst->layer_mask |= lid;
-	pst->lt[lid] = lt;
-	pst->flags[lid] = flags;
-
-	intf = pst->flow->nix_intf;
-	xinfo = &pst->npc->prx_dxcfg[intf][lid][lt];
-	otx2_npc_dbg("Is_terminating = %d", xinfo->is_terminating);
-	if (xinfo->is_terminating)
-		pst->terminate = 1;
-
-	if (info->spec == NULL) {
-		otx2_npc_dbg("Info spec NULL");
-		goto done;
-	}
-
-	for (i = 0; i < NPC_MAX_LD; i++) {
-		rc = flow_update_extraction_data(pst, info, &xinfo->xtract[i]);
-		if (rc != 0)
-			return rc;
-	}
-
-	for (i = 0; i < NPC_MAX_LD; i++) {
-		if (xinfo->xtract[i].flags_enable == 0)
-			continue;
-
-		lf_cfg = pst->npc->prx_lfcfg[i].i;
-		if (lf_cfg == lid) {
-			for (j = 0; j < NPC_MAX_LFL; j++) {
-				lfinfo = pst->npc->prx_fxcfg[intf]
-					[i][j].xtract;
-				rc = flow_update_extraction_data(pst, info,
-								 &lfinfo[0]);
-				if (rc != 0)
-					return rc;
-
-				if (lfinfo[0].enable)
-					pst->flags[lid] = j;
-			}
-		}
-	}
-
-done:
-	dump = &pst->flow->dump_data[pst->flow->num_patterns++];
-	dump->lid = lid;
-	dump->ltype = lt;
-	/* Next pattern to parse by subsequent layers */
-	pst->pattern++;
-	return 0;
-}
-
-static inline int
-flow_range_is_valid(const char *spec, const char *last, const char *mask,
-		    int len)
-{
-	/* Mask must be zero or equal to spec as we do not support
-	 * non-contiguous ranges.
-	 */
-	while (len--) {
-		if (last[len] &&
-		    (spec[len] & mask[len]) != (last[len] & mask[len]))
-			return 0; /* False */
-	}
-	return 1;
-}
-
-
-static inline int
-flow_mask_is_supported(const char *mask, const char *hw_mask, int len)
-{
-	/*
-	 * If no hw_mask, assume nothing is supported.
-	 * mask is never NULL
-	 */
-	if (hw_mask == NULL)
-		return flow_mem_is_zero(mask, len);
-
-	while (len--) {
-		if ((mask[len] | hw_mask[len]) != hw_mask[len])
-			return 0; /* False */
-	}
-	return 1;
-}
-
-int
-otx2_flow_parse_item_basic(const struct rte_flow_item *item,
-			   struct otx2_flow_item_info *info,
-			   struct rte_flow_error *error)
-{
-	/* Item must not be NULL */
-	if (item == NULL) {
-		rte_flow_error_set(error, EINVAL,
-				   RTE_FLOW_ERROR_TYPE_ITEM, NULL,
-				   "Item is NULL");
-		return -rte_errno;
-	}
-	/* If spec is NULL, both mask and last must be NULL, this
-	 * makes it to match ANY value (eq to mask = 0).
-	 * Setting either mask or last without spec is an error
-	 */
-	if (item->spec == NULL) {
-		if (item->last == NULL && item->mask == NULL) {
-			info->spec = NULL;
-			return 0;
-		}
-		rte_flow_error_set(error, EINVAL,
-				   RTE_FLOW_ERROR_TYPE_ITEM, item,
-				   "mask or last set without spec");
-		return -rte_errno;
-	}
-
-	/* We have valid spec */
-	if (item->type != RTE_FLOW_ITEM_TYPE_RAW)
-		info->spec = item->spec;
-
-	/* If mask is not set, use default mask, err if default mask is
-	 * also NULL.
-	 */
-	if (item->mask == NULL) {
-		otx2_npc_dbg("Item mask null, using default mask");
-		if (info->def_mask == NULL) {
-			rte_flow_error_set(error, EINVAL,
-					   RTE_FLOW_ERROR_TYPE_ITEM, item,
-					   "No mask or default mask given");
-			return -rte_errno;
-		}
-		info->mask = info->def_mask;
-	} else {
-		if (item->type != RTE_FLOW_ITEM_TYPE_RAW)
-			info->mask = item->mask;
-	}
-
-	/* mask specified must be subset of hw supported mask
-	 * mask | hw_mask == hw_mask
-	 */
-	if (!flow_mask_is_supported(info->mask, info->hw_mask, info->len)) {
-		rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM,
-				   item, "Unsupported field in the mask");
-		return -rte_errno;
-	}
-
-	/* Now we have spec and mask. OTX2 does not support non-contiguous
-	 * range. We should have either:
-	 * - spec & mask == last & mask or,
-	 * - last == 0 or,
-	 * - last == NULL
-	 */
-	if (item->last != NULL && !flow_mem_is_zero(item->last, info->len)) {
-		if (!flow_range_is_valid(item->spec, item->last, info->mask,
-					 info->len)) {
-			rte_flow_error_set(error, EINVAL,
-					   RTE_FLOW_ERROR_TYPE_ITEM, item,
-					   "Unsupported range for match");
-			return -rte_errno;
-		}
-	}
-
-	return 0;
-}
-
-void
-otx2_flow_keyx_compress(uint64_t *data, uint32_t nibble_mask)
-{
-	uint64_t cdata[2] = {0ULL, 0ULL}, nibble;
-	int i, j = 0;
-
-	for (i = 0; i < NPC_MAX_KEY_NIBBLES; i++) {
-		if (nibble_mask & (1 << i)) {
-			nibble = (data[i / 16] >> ((i & 0xf) * 4)) & 0xf;
-			cdata[j / 16] |= (nibble << ((j & 0xf) * 4));
-			j += 1;
-		}
-	}
-
-	data[0] = cdata[0];
-	data[1] = cdata[1];
-}
-
-static int
-flow_first_set_bit(uint64_t slab)
-{
-	int num = 0;
-
-	if ((slab & 0xffffffff) == 0) {
-		num += 32;
-		slab >>= 32;
-	}
-	if ((slab & 0xffff) == 0) {
-		num += 16;
-		slab >>= 16;
-	}
-	if ((slab & 0xff) == 0) {
-		num += 8;
-		slab >>= 8;
-	}
-	if ((slab & 0xf) == 0) {
-		num += 4;
-		slab >>= 4;
-	}
-	if ((slab & 0x3) == 0) {
-		num += 2;
-		slab >>= 2;
-	}
-	if ((slab & 0x1) == 0)
-		num += 1;
-
-	return num;
-}
-
-static int
-flow_shift_lv_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
-		  struct otx2_npc_flow_info *flow_info,
-		  uint32_t old_ent, uint32_t new_ent)
-{
-	struct npc_mcam_shift_entry_req *req;
-	struct npc_mcam_shift_entry_rsp *rsp;
-	struct otx2_flow_list *list;
-	struct rte_flow *flow_iter;
-	int rc = 0;
-
-	otx2_npc_dbg("Old ent:%u new ent:%u priority:%u", old_ent, new_ent,
-		     flow->priority);
-
-	list = &flow_info->flow_list[flow->priority];
-
-	/* Old entry is disabled & it's contents are moved to new_entry,
-	 * new entry is enabled finally.
-	 */
-	req = otx2_mbox_alloc_msg_npc_mcam_shift_entry(mbox);
-	req->curr_entry[0] = old_ent;
-	req->new_entry[0] = new_ent;
-	req->shift_count = 1;
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	/* Remove old node from list */
-	TAILQ_FOREACH(flow_iter, list, next) {
-		if (flow_iter->mcam_id == old_ent)
-			TAILQ_REMOVE(list, flow_iter, next);
-	}
-
-	/* Insert node with new mcam id at right place */
-	TAILQ_FOREACH(flow_iter, list, next) {
-		if (flow_iter->mcam_id > new_ent)
-			TAILQ_INSERT_BEFORE(flow_iter, flow, next);
-	}
-	return rc;
-}
-
-/* Exchange all required entries with a given priority level */
-static int
-flow_shift_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
-	       struct otx2_npc_flow_info *flow_info,
-	       struct npc_mcam_alloc_entry_rsp *rsp, int dir, int prio_lvl)
-{
-	struct rte_bitmap *fr_bmp, *fr_bmp_rev, *lv_bmp, *lv_bmp_rev, *bmp;
-	uint32_t e_fr = 0, e_lv = 0, e, e_id = 0, mcam_entries;
-	uint64_t fr_bit_pos = 0, lv_bit_pos = 0, bit_pos = 0;
-	/* Bit position within the slab */
-	uint32_t sl_fr_bit_off = 0, sl_lv_bit_off = 0;
-	/* Overall bit position of the start of slab */
-	/* free & live entry index */
-	int rc_fr = 0, rc_lv = 0, rc = 0, idx = 0;
-	struct otx2_mcam_ents_info *ent_info;
-	/* free & live bitmap slab */
-	uint64_t sl_fr = 0, sl_lv = 0, *sl;
-
-	fr_bmp = flow_info->free_entries[prio_lvl];
-	fr_bmp_rev = flow_info->free_entries_rev[prio_lvl];
-	lv_bmp = flow_info->live_entries[prio_lvl];
-	lv_bmp_rev = flow_info->live_entries_rev[prio_lvl];
-	ent_info = &flow_info->flow_entry_info[prio_lvl];
-	mcam_entries = flow_info->mcam_entries;
-
-
-	/* New entries allocated are always contiguous, but older entries
-	 * already in free/live bitmap can be non-contiguous: so return
-	 * shifted entries should be in non-contiguous format.
-	 */
-	while (idx <= rsp->count) {
-		if (!sl_fr && !sl_lv) {
-			/* Lower index elements to be exchanged */
-			if (dir < 0) {
-				rc_fr = rte_bitmap_scan(fr_bmp, &e_fr, &sl_fr);
-				rc_lv = rte_bitmap_scan(lv_bmp, &e_lv, &sl_lv);
-				otx2_npc_dbg("Fwd slab rc fr %u rc lv %u "
-					     "e_fr %u e_lv %u", rc_fr, rc_lv,
-					      e_fr, e_lv);
-			} else {
-				rc_fr = rte_bitmap_scan(fr_bmp_rev,
-							&sl_fr_bit_off,
-							&sl_fr);
-				rc_lv = rte_bitmap_scan(lv_bmp_rev,
-							&sl_lv_bit_off,
-							&sl_lv);
-
-				otx2_npc_dbg("Rev slab rc fr %u rc lv %u "
-					     "e_fr %u e_lv %u", rc_fr, rc_lv,
-					      e_fr, e_lv);
-			}
-		}
-
-		if (rc_fr) {
-			fr_bit_pos = flow_first_set_bit(sl_fr);
-			e_fr = sl_fr_bit_off + fr_bit_pos;
-			otx2_npc_dbg("Fr_bit_pos 0x%" PRIx64, fr_bit_pos);
-		} else {
-			e_fr = ~(0);
-		}
-
-		if (rc_lv) {
-			lv_bit_pos = flow_first_set_bit(sl_lv);
-			e_lv = sl_lv_bit_off + lv_bit_pos;
-			otx2_npc_dbg("Lv_bit_pos 0x%" PRIx64, lv_bit_pos);
-		} else {
-			e_lv = ~(0);
-		}
-
-		/* First entry is from free_bmap */
-		if (e_fr < e_lv) {
-			bmp = fr_bmp;
-			e = e_fr;
-			sl = &sl_fr;
-			bit_pos = fr_bit_pos;
-			if (dir > 0)
-				e_id = mcam_entries - e - 1;
-			else
-				e_id = e;
-			otx2_npc_dbg("Fr e %u e_id %u", e, e_id);
-		} else {
-			bmp = lv_bmp;
-			e = e_lv;
-			sl = &sl_lv;
-			bit_pos = lv_bit_pos;
-			if (dir > 0)
-				e_id = mcam_entries - e - 1;
-			else
-				e_id = e;
-
-			otx2_npc_dbg("Lv e %u e_id %u", e, e_id);
-			if (idx < rsp->count)
-				rc =
-				  flow_shift_lv_ent(mbox, flow,
-						    flow_info, e_id,
-						    rsp->entry + idx);
-		}
-
-		rte_bitmap_clear(bmp, e);
-		rte_bitmap_set(bmp, rsp->entry + idx);
-		/* Update entry list, use non-contiguous
-		 * list now.
-		 */
-		rsp->entry_list[idx] = e_id;
-		*sl &= ~(1 << bit_pos);
-
-		/* Update min & max entry identifiers in current
-		 * priority level.
-		 */
-		if (dir < 0) {
-			ent_info->max_id = rsp->entry + idx;
-			ent_info->min_id = e_id;
-		} else {
-			ent_info->max_id = e_id;
-			ent_info->min_id = rsp->entry;
-		}
-
-		idx++;
-	}
-	return rc;
-}
-
-/* Validate if newly allocated entries lie in the correct priority zone
- * since NPC_MCAM_LOWER_PRIO & NPC_MCAM_HIGHER_PRIO don't ensure zone accuracy.
- * If not properly aligned, shift entries to do so
- */
-static int
-flow_validate_and_shift_prio_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
-				 struct otx2_npc_flow_info *flow_info,
-				 struct npc_mcam_alloc_entry_rsp *rsp,
-				 int req_prio)
-{
-	int prio_idx = 0, rc = 0, needs_shift = 0, idx, prio = flow->priority;
-	struct otx2_mcam_ents_info *info = flow_info->flow_entry_info;
-	int dir = (req_prio == NPC_MCAM_HIGHER_PRIO) ? 1 : -1;
-	uint32_t tot_ent = 0;
-
-	otx2_npc_dbg("Dir %d, priority = %d", dir, prio);
-
-	if (dir < 0)
-		prio_idx = flow_info->flow_max_priority - 1;
-
-	/* Only live entries needs to be shifted, free entries can just be
-	 * moved by bits manipulation.
-	 */
-
-	/* For dir = -1(NPC_MCAM_LOWER_PRIO), when shifting,
-	 * NPC_MAX_PREALLOC_ENT are exchanged with adjoining higher priority
-	 * level entries(lower indexes).
-	 *
-	 * For dir = +1(NPC_MCAM_HIGHER_PRIO), during shift,
-	 * NPC_MAX_PREALLOC_ENT are exchanged with adjoining lower priority
-	 * level entries(higher indexes) with highest indexes.
-	 */
-	do {
-		tot_ent = info[prio_idx].free_ent + info[prio_idx].live_ent;
-
-		if (dir < 0 && prio_idx != prio &&
-		    rsp->entry > info[prio_idx].max_id && tot_ent) {
-			otx2_npc_dbg("Rsp entry %u prio idx %u "
-				     "max id %u", rsp->entry, prio_idx,
-				      info[prio_idx].max_id);
-
-			needs_shift = 1;
-		} else if ((dir > 0) && (prio_idx != prio) &&
-		     (rsp->entry < info[prio_idx].min_id) && tot_ent) {
-			otx2_npc_dbg("Rsp entry %u prio idx %u "
-				     "min id %u", rsp->entry, prio_idx,
-				      info[prio_idx].min_id);
-			needs_shift = 1;
-		}
-
-		otx2_npc_dbg("Needs_shift = %d", needs_shift);
-		if (needs_shift) {
-			needs_shift = 0;
-			rc = flow_shift_ent(mbox, flow, flow_info, rsp, dir,
-					    prio_idx);
-		} else {
-			for (idx = 0; idx < rsp->count; idx++)
-				rsp->entry_list[idx] = rsp->entry + idx;
-		}
-	} while ((prio_idx != prio) && (prio_idx += dir));
-
-	return rc;
-}
-
-static int
-flow_find_ref_entry(struct otx2_npc_flow_info *flow_info, int *prio,
-		    int prio_lvl)
-{
-	struct otx2_mcam_ents_info *info = flow_info->flow_entry_info;
-	int step = 1;
-
-	while (step < flow_info->flow_max_priority) {
-		if (((prio_lvl + step) < flow_info->flow_max_priority) &&
-		    info[prio_lvl + step].live_ent) {
-			*prio = NPC_MCAM_HIGHER_PRIO;
-			return info[prio_lvl + step].min_id;
-		}
-
-		if (((prio_lvl - step) >= 0) &&
-		    info[prio_lvl - step].live_ent) {
-			otx2_npc_dbg("Prio_lvl %u live %u", prio_lvl - step,
-				     info[prio_lvl - step].live_ent);
-			*prio = NPC_MCAM_LOWER_PRIO;
-			return info[prio_lvl - step].max_id;
-		}
-		step++;
-	}
-	*prio = NPC_MCAM_ANY_PRIO;
-	return 0;
-}
-
-static int
-flow_fill_entry_cache(struct otx2_mbox *mbox, struct rte_flow *flow,
-		      struct otx2_npc_flow_info *flow_info, uint32_t *free_ent)
-{
-	struct rte_bitmap *free_bmp, *free_bmp_rev, *live_bmp, *live_bmp_rev;
-	struct npc_mcam_alloc_entry_rsp rsp_local;
-	struct npc_mcam_alloc_entry_rsp *rsp_cmd;
-	struct npc_mcam_alloc_entry_req *req;
-	struct npc_mcam_alloc_entry_rsp *rsp;
-	struct otx2_mcam_ents_info *info;
-	uint16_t ref_ent, idx;
-	int rc, prio;
-
-	info = &flow_info->flow_entry_info[flow->priority];
-	free_bmp = flow_info->free_entries[flow->priority];
-	free_bmp_rev = flow_info->free_entries_rev[flow->priority];
-	live_bmp = flow_info->live_entries[flow->priority];
-	live_bmp_rev = flow_info->live_entries_rev[flow->priority];
-
-	ref_ent = flow_find_ref_entry(flow_info, &prio, flow->priority);
-
-	req = otx2_mbox_alloc_msg_npc_mcam_alloc_entry(mbox);
-	req->contig = 1;
-	req->count = flow_info->flow_prealloc_size;
-	req->priority = prio;
-	req->ref_entry = ref_ent;
-
-	otx2_npc_dbg("Fill cache ref entry %u prio %u", ref_ent, prio);
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp_cmd);
-	if (rc)
-		return rc;
-
-	rsp = &rsp_local;
-	memcpy(rsp, rsp_cmd, sizeof(*rsp));
-
-	otx2_npc_dbg("Alloc entry %u count %u , prio = %d", rsp->entry,
-		     rsp->count, prio);
-
-	/* Non-first ent cache fill */
-	if (prio != NPC_MCAM_ANY_PRIO) {
-		flow_validate_and_shift_prio_ent(mbox, flow, flow_info, rsp,
-						 prio);
-	} else {
-		/* Copy into response entry list */
-		for (idx = 0; idx < rsp->count; idx++)
-			rsp->entry_list[idx] = rsp->entry + idx;
-	}
-
-	otx2_npc_dbg("Fill entry cache rsp count %u", rsp->count);
-	/* Update free entries, reverse free entries list,
-	 * min & max entry ids.
-	 */
-	for (idx = 0; idx < rsp->count; idx++) {
-		if (unlikely(rsp->entry_list[idx] < info->min_id))
-			info->min_id = rsp->entry_list[idx];
-
-		if (unlikely(rsp->entry_list[idx] > info->max_id))
-			info->max_id = rsp->entry_list[idx];
-
-		/* Skip entry to be returned, not to be part of free
-		 * list.
-		 */
-		if (prio == NPC_MCAM_HIGHER_PRIO) {
-			if (unlikely(idx == (rsp->count - 1))) {
-				*free_ent = rsp->entry_list[idx];
-				continue;
-			}
-		} else {
-			if (unlikely(!idx)) {
-				*free_ent = rsp->entry_list[idx];
-				continue;
-			}
-		}
-		info->free_ent++;
-		rte_bitmap_set(free_bmp, rsp->entry_list[idx]);
-		rte_bitmap_set(free_bmp_rev, flow_info->mcam_entries -
-			       rsp->entry_list[idx] - 1);
-
-		otx2_npc_dbg("Final rsp entry %u rsp entry rev %u",
-			     rsp->entry_list[idx],
-		flow_info->mcam_entries - rsp->entry_list[idx] - 1);
-	}
-
-	otx2_npc_dbg("Cache free entry %u, rev = %u", *free_ent,
-		     flow_info->mcam_entries - *free_ent - 1);
-	info->live_ent++;
-	rte_bitmap_set(live_bmp, *free_ent);
-	rte_bitmap_set(live_bmp_rev, flow_info->mcam_entries - *free_ent - 1);
-
-	return 0;
-}
-
-static int
-flow_check_preallocated_entry_cache(struct otx2_mbox *mbox,
-				    struct rte_flow *flow,
-				    struct otx2_npc_flow_info *flow_info)
-{
-	struct rte_bitmap *free, *free_rev, *live, *live_rev;
-	uint32_t pos = 0, free_ent = 0, mcam_entries;
-	struct otx2_mcam_ents_info *info;
-	uint64_t slab = 0;
-	int rc;
-
-	otx2_npc_dbg("Flow priority %u", flow->priority);
-
-	info = &flow_info->flow_entry_info[flow->priority];
-
-	free_rev = flow_info->free_entries_rev[flow->priority];
-	free = flow_info->free_entries[flow->priority];
-	live_rev = flow_info->live_entries_rev[flow->priority];
-	live = flow_info->live_entries[flow->priority];
-	mcam_entries = flow_info->mcam_entries;
-
-	if (info->free_ent) {
-		rc = rte_bitmap_scan(free, &pos, &slab);
-		if (rc) {
-			/* Get free_ent from free entry bitmap */
-			free_ent = pos + __builtin_ctzll(slab);
-			otx2_npc_dbg("Allocated from cache entry %u", free_ent);
-			/* Remove from free bitmaps and add to live ones */
-			rte_bitmap_clear(free, free_ent);
-			rte_bitmap_set(live, free_ent);
-			rte_bitmap_clear(free_rev,
-					 mcam_entries - free_ent - 1);
-			rte_bitmap_set(live_rev,
-				       mcam_entries - free_ent - 1);
-
-			info->free_ent--;
-			info->live_ent++;
-			return free_ent;
-		}
-
-		otx2_npc_dbg("No free entry:its a mess");
-		return -1;
-	}
-
-	rc = flow_fill_entry_cache(mbox, flow, flow_info, &free_ent);
-	if (rc)
-		return rc;
-
-	return free_ent;
-}
-
-int
-otx2_flow_mcam_alloc_and_write(struct rte_flow *flow, struct otx2_mbox *mbox,
-			       struct otx2_parse_state *pst,
-			       struct otx2_npc_flow_info *flow_info)
-{
-	int use_ctr = (flow->ctr_id == NPC_COUNTER_NONE ? 0 : 1);
-	struct npc_mcam_read_base_rule_rsp *base_rule_rsp;
-	struct npc_mcam_write_entry_req *req;
-	struct mcam_entry *base_entry;
-	struct mbox_msghdr *rsp;
-	uint16_t ctr = ~(0);
-	int rc, idx;
-	int entry;
-
-	if (use_ctr) {
-		rc = flow_mcam_alloc_counter(mbox, &ctr);
-		if (rc)
-			return rc;
-	}
-
-	entry = flow_check_preallocated_entry_cache(mbox, flow, flow_info);
-	if (entry < 0) {
-		otx2_err("Prealloc failed");
-		otx2_flow_mcam_free_counter(mbox, ctr);
-		return NPC_MCAM_ALLOC_FAILED;
-	}
-
-	if (pst->is_vf) {
-		(void)otx2_mbox_alloc_msg_npc_read_base_steer_rule(mbox);
-		rc = otx2_mbox_process_msg(mbox, (void *)&base_rule_rsp);
-		if (rc) {
-			otx2_err("Failed to fetch VF's base MCAM entry");
-			return rc;
-		}
-		base_entry = &base_rule_rsp->entry_data;
-		for (idx = 0; idx < OTX2_MAX_MCAM_WIDTH_DWORDS; idx++) {
-			flow->mcam_data[idx] |= base_entry->kw[idx];
-			flow->mcam_mask[idx] |= base_entry->kw_mask[idx];
-		}
-	}
-
-	req = otx2_mbox_alloc_msg_npc_mcam_write_entry(mbox);
-	req->set_cntr = use_ctr;
-	req->cntr = ctr;
-	req->entry = entry;
-	otx2_npc_dbg("Alloc & write entry %u", entry);
-
-	req->intf =
-		(flow->nix_intf == OTX2_INTF_RX) ? NPC_MCAM_RX : NPC_MCAM_TX;
-	req->enable_entry = 1;
-	req->entry_data.action = flow->npc_action;
-	req->entry_data.vtag_action = flow->vtag_action;
-
-	for (idx = 0; idx < OTX2_MAX_MCAM_WIDTH_DWORDS; idx++) {
-		req->entry_data.kw[idx] = flow->mcam_data[idx];
-		req->entry_data.kw_mask[idx] = flow->mcam_mask[idx];
-	}
-
-	if (flow->nix_intf == OTX2_INTF_RX) {
-		req->entry_data.kw[0] |= flow_info->channel;
-		req->entry_data.kw_mask[0] |=  (BIT_ULL(12) - 1);
-	} else {
-		uint16_t pf_func = (flow->npc_action >> 48) & 0xffff;
-
-		pf_func = htons(pf_func);
-		req->entry_data.kw[0] |= ((uint64_t)pf_func << 32);
-		req->entry_data.kw_mask[0] |= ((uint64_t)0xffff << 32);
-	}
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
-	if (rc != 0)
-		return rc;
-
-	flow->mcam_id = entry;
-	if (use_ctr)
-		flow->ctr_id = ctr;
-	return 0;
-}
diff --git a/drivers/net/octeontx2/otx2_link.c b/drivers/net/octeontx2/otx2_link.c
deleted file mode 100644
index 8f5d0eed92..0000000000
--- a/drivers/net/octeontx2/otx2_link.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_common.h>
-#include <ethdev_pci.h>
-
-#include "otx2_ethdev.h"
-
-void
-otx2_nix_toggle_flag_link_cfg(struct otx2_eth_dev *dev, bool set)
-{
-	if (set)
-		dev->flags |= OTX2_LINK_CFG_IN_PROGRESS_F;
-	else
-		dev->flags &= ~OTX2_LINK_CFG_IN_PROGRESS_F;
-
-	rte_wmb();
-}
-
-static inline int
-nix_wait_for_link_cfg(struct otx2_eth_dev *dev)
-{
-	uint16_t wait = 1000;
-
-	do {
-		rte_rmb();
-		if (!(dev->flags & OTX2_LINK_CFG_IN_PROGRESS_F))
-			break;
-		wait--;
-		rte_delay_ms(1);
-	} while (wait);
-
-	return wait ? 0 : -1;
-}
-
-static void
-nix_link_status_print(struct rte_eth_dev *eth_dev, struct rte_eth_link *link)
-{
-	if (link && link->link_status)
-		otx2_info("Port %d: Link Up - speed %u Mbps - %s",
-			  (int)(eth_dev->data->port_id),
-			  (uint32_t)link->link_speed,
-			  link->link_duplex == RTE_ETH_LINK_FULL_DUPLEX ?
-			  "full-duplex" : "half-duplex");
-	else
-		otx2_info("Port %d: Link Down", (int)(eth_dev->data->port_id));
-}
-
-void
-otx2_eth_dev_link_status_get(struct otx2_dev *dev,
-			     struct cgx_link_user_info *link)
-{
-	struct otx2_eth_dev *otx2_dev = (struct otx2_eth_dev *)dev;
-	struct rte_eth_link eth_link;
-	struct rte_eth_dev *eth_dev;
-
-	if (!link || !dev)
-		return;
-
-	eth_dev = otx2_dev->eth_dev;
-	if (!eth_dev)
-		return;
-
-	rte_eth_linkstatus_get(eth_dev, &eth_link);
-
-	link->link_up = eth_link.link_status;
-	link->speed = eth_link.link_speed;
-	link->an = eth_link.link_autoneg;
-	link->full_duplex = eth_link.link_duplex;
-}
-
-void
-otx2_eth_dev_link_status_update(struct otx2_dev *dev,
-				struct cgx_link_user_info *link)
-{
-	struct otx2_eth_dev *otx2_dev = (struct otx2_eth_dev *)dev;
-	struct rte_eth_link eth_link;
-	struct rte_eth_dev *eth_dev;
-
-	if (!link || !dev)
-		return;
-
-	eth_dev = otx2_dev->eth_dev;
-	if (!eth_dev || !eth_dev->data->dev_conf.intr_conf.lsc)
-		return;
-
-	if (nix_wait_for_link_cfg(otx2_dev)) {
-		otx2_err("Timeout waiting for link_cfg to complete");
-		return;
-	}
-
-	eth_link.link_status = link->link_up;
-	eth_link.link_speed = link->speed;
-	eth_link.link_autoneg = RTE_ETH_LINK_AUTONEG;
-	eth_link.link_duplex = link->full_duplex;
-
-	otx2_dev->speed = link->speed;
-	otx2_dev->duplex = link->full_duplex;
-
-	/* Print link info */
-	nix_link_status_print(eth_dev, &eth_link);
-
-	/* Update link info */
-	rte_eth_linkstatus_set(eth_dev, &eth_link);
-
-	/* Set the flag and execute application callbacks */
-	rte_eth_dev_callback_process(eth_dev, RTE_ETH_EVENT_INTR_LSC, NULL);
-}
-
-static int
-lbk_link_update(struct rte_eth_link *link)
-{
-	link->link_status = RTE_ETH_LINK_UP;
-	link->link_speed = RTE_ETH_SPEED_NUM_100G;
-	link->link_autoneg = RTE_ETH_LINK_FIXED;
-	link->link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
-	return 0;
-}
-
-static int
-cgx_link_update(struct otx2_eth_dev *dev, struct rte_eth_link *link)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct cgx_link_info_msg *rsp;
-	int rc;
-	otx2_mbox_alloc_msg_cgx_get_linkinfo(mbox);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	link->link_status = rsp->link_info.link_up;
-	link->link_speed = rsp->link_info.speed;
-	link->link_autoneg = RTE_ETH_LINK_AUTONEG;
-
-	if (rsp->link_info.full_duplex)
-		link->link_duplex = rsp->link_info.full_duplex;
-	return 0;
-}
-
-int
-otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_eth_link link;
-	int rc;
-
-	RTE_SET_USED(wait_to_complete);
-	memset(&link, 0, sizeof(struct rte_eth_link));
-
-	if (!eth_dev->data->dev_started || otx2_dev_is_sdp(dev))
-		return 0;
-
-	if (otx2_dev_is_lbk(dev))
-		rc = lbk_link_update(&link);
-	else
-		rc = cgx_link_update(dev, &link);
-
-	if (rc)
-		return rc;
-
-	return rte_eth_linkstatus_set(eth_dev, &link);
-}
-
-static int
-nix_dev_set_link_state(struct rte_eth_dev *eth_dev, uint8_t enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct cgx_set_link_state_msg *req;
-
-	req = otx2_mbox_alloc_msg_cgx_set_link_state(mbox);
-	req->enable = enable;
-	return otx2_mbox_process(mbox);
-}
-
-int
-otx2_nix_dev_set_link_up(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc, i;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return -ENOTSUP;
-
-	rc = nix_dev_set_link_state(eth_dev, 1);
-	if (rc)
-		goto done;
-
-	/* Start tx queues  */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
-		otx2_nix_tx_queue_start(eth_dev, i);
-
-done:
-	return rc;
-}
-
-int
-otx2_nix_dev_set_link_down(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int i;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return -ENOTSUP;
-
-	/* Stop tx queues  */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
-		otx2_nix_tx_queue_stop(eth_dev, i);
-
-	return nix_dev_set_link_state(eth_dev, 0);
-}
-
-static int
-cgx_change_mode(struct otx2_eth_dev *dev, struct cgx_set_link_mode_args *cfg)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct cgx_set_link_mode_req *req;
-
-	req = otx2_mbox_alloc_msg_cgx_set_link_mode(mbox);
-	req->args.speed = cfg->speed;
-	req->args.duplex = cfg->duplex;
-	req->args.an = cfg->an;
-
-	return otx2_mbox_process(mbox);
-}
-
-#define SPEED_NONE 0
-static inline uint32_t
-nix_parse_link_speeds(struct otx2_eth_dev *dev, uint32_t link_speeds)
-{
-	uint32_t link_speed = SPEED_NONE;
-
-	/* 50G and 100G to be supported for board version C0 and above */
-	if (!otx2_dev_is_Ax(dev)) {
-		if (link_speeds & RTE_ETH_LINK_SPEED_100G)
-			link_speed = 100000;
-		if (link_speeds & RTE_ETH_LINK_SPEED_50G)
-			link_speed = 50000;
-	}
-	if (link_speeds & RTE_ETH_LINK_SPEED_40G)
-		link_speed = 40000;
-	if (link_speeds & RTE_ETH_LINK_SPEED_25G)
-		link_speed = 25000;
-	if (link_speeds & RTE_ETH_LINK_SPEED_20G)
-		link_speed = 20000;
-	if (link_speeds & RTE_ETH_LINK_SPEED_10G)
-		link_speed = 10000;
-	if (link_speeds & RTE_ETH_LINK_SPEED_5G)
-		link_speed = 5000;
-	if (link_speeds & RTE_ETH_LINK_SPEED_1G)
-		link_speed = 1000;
-
-	return link_speed;
-}
-
-static inline uint8_t
-nix_parse_eth_link_duplex(uint32_t link_speeds)
-{
-	if ((link_speeds & RTE_ETH_LINK_SPEED_10M_HD) ||
-			(link_speeds & RTE_ETH_LINK_SPEED_100M_HD))
-		return RTE_ETH_LINK_HALF_DUPLEX;
-	else
-		return RTE_ETH_LINK_FULL_DUPLEX;
-}
-
-int
-otx2_apply_link_speed(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct rte_eth_conf *conf = &eth_dev->data->dev_conf;
-	struct cgx_set_link_mode_args cfg;
-
-	/* If VF/SDP/LBK, link attributes cannot be changed */
-	if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev))
-		return 0;
-
-	memset(&cfg, 0, sizeof(struct cgx_set_link_mode_args));
-	cfg.speed = nix_parse_link_speeds(dev, conf->link_speeds);
-	if (cfg.speed != SPEED_NONE && cfg.speed != dev->speed) {
-		cfg.duplex = nix_parse_eth_link_duplex(conf->link_speeds);
-		cfg.an = (conf->link_speeds & RTE_ETH_LINK_SPEED_FIXED) == 0;
-
-		return cgx_change_mode(dev, &cfg);
-	}
-	return 0;
-}
diff --git a/drivers/net/octeontx2/otx2_lookup.c b/drivers/net/octeontx2/otx2_lookup.c
deleted file mode 100644
index 5fa9ae1396..0000000000
--- a/drivers/net/octeontx2/otx2_lookup.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_common.h>
-#include <rte_memzone.h>
-
-#include "otx2_common.h"
-#include "otx2_ethdev.h"
-
-/* NIX_RX_PARSE_S's ERRCODE + ERRLEV (12 bits) */
-#define ERRCODE_ERRLEN_WIDTH		12
-#define ERR_ARRAY_SZ			((BIT(ERRCODE_ERRLEN_WIDTH)) *\
-					sizeof(uint32_t))
-
-#define SA_TBL_SZ			(RTE_MAX_ETHPORTS * sizeof(uint64_t))
-#define LOOKUP_ARRAY_SZ			(PTYPE_ARRAY_SZ + ERR_ARRAY_SZ +\
-					SA_TBL_SZ)
-
-const uint32_t *
-otx2_nix_supported_ptypes_get(struct rte_eth_dev *eth_dev)
-{
-	RTE_SET_USED(eth_dev);
-
-	static const uint32_t ptypes[] = {
-		RTE_PTYPE_L2_ETHER_QINQ, /* LB */
-		RTE_PTYPE_L2_ETHER_VLAN, /* LB */
-		RTE_PTYPE_L2_ETHER_TIMESYNC, /* LB */
-		RTE_PTYPE_L2_ETHER_ARP,	 /* LC */
-		RTE_PTYPE_L2_ETHER_NSH,	 /* LC */
-		RTE_PTYPE_L2_ETHER_FCOE, /* LC */
-		RTE_PTYPE_L2_ETHER_MPLS, /* LC */
-		RTE_PTYPE_L3_IPV4,	 /* LC */
-		RTE_PTYPE_L3_IPV4_EXT,	 /* LC */
-		RTE_PTYPE_L3_IPV6,	 /* LC */
-		RTE_PTYPE_L3_IPV6_EXT,	 /* LC */
-		RTE_PTYPE_L4_TCP,	 /* LD */
-		RTE_PTYPE_L4_UDP,	 /* LD */
-		RTE_PTYPE_L4_SCTP,	 /* LD */
-		RTE_PTYPE_L4_ICMP,	 /* LD */
-		RTE_PTYPE_L4_IGMP,	 /* LD */
-		RTE_PTYPE_TUNNEL_GRE,	 /* LD */
-		RTE_PTYPE_TUNNEL_ESP,	 /* LD */
-		RTE_PTYPE_TUNNEL_NVGRE,  /* LD */
-		RTE_PTYPE_TUNNEL_VXLAN,  /* LE */
-		RTE_PTYPE_TUNNEL_GENEVE, /* LE */
-		RTE_PTYPE_TUNNEL_GTPC,	 /* LE */
-		RTE_PTYPE_TUNNEL_GTPU,	 /* LE */
-		RTE_PTYPE_TUNNEL_VXLAN_GPE,   /* LE */
-		RTE_PTYPE_TUNNEL_MPLS_IN_GRE, /* LE */
-		RTE_PTYPE_TUNNEL_MPLS_IN_UDP, /* LE */
-		RTE_PTYPE_INNER_L2_ETHER,/* LF */
-		RTE_PTYPE_INNER_L3_IPV4, /* LG */
-		RTE_PTYPE_INNER_L3_IPV6, /* LG */
-		RTE_PTYPE_INNER_L4_TCP,	 /* LH */
-		RTE_PTYPE_INNER_L4_UDP,  /* LH */
-		RTE_PTYPE_INNER_L4_SCTP, /* LH */
-		RTE_PTYPE_INNER_L4_ICMP, /* LH */
-		RTE_PTYPE_UNKNOWN,
-	};
-
-	return ptypes;
-}
-
-int
-otx2_nix_ptypes_set(struct rte_eth_dev *eth_dev, uint32_t ptype_mask)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	if (ptype_mask) {
-		dev->rx_offload_flags |= NIX_RX_OFFLOAD_PTYPE_F;
-		dev->ptype_disable = 0;
-	} else {
-		dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_PTYPE_F;
-		dev->ptype_disable = 1;
-	}
-
-	otx2_eth_set_rx_function(eth_dev);
-
-	return 0;
-}
-
-/*
- * +------------------ +------------------ +
- * |  | IL4 | IL3| IL2 | TU | L4 | L3 | L2 |
- * +-------------------+-------------------+
- *
- * +-------------------+------------------ +
- * |  | LH | LG  | LF  | LE | LD | LC | LB |
- * +-------------------+-------------------+
- *
- * ptype       [LE - LD - LC - LB]  = TU  - L4 -  L3  - T2
- * ptype_tunnel[LH - LG - LF]  = IL4 - IL3 - IL2 - TU
- *
- */
-static void
-nix_create_non_tunnel_ptype_array(uint16_t *ptype)
-{
-	uint8_t lb, lc, ld, le;
-	uint16_t val;
-	uint32_t idx;
-
-	for (idx = 0; idx < PTYPE_NON_TUNNEL_ARRAY_SZ; idx++) {
-		lb = idx & 0xF;
-		lc = (idx & 0xF0) >> 4;
-		ld = (idx & 0xF00) >> 8;
-		le = (idx & 0xF000) >> 12;
-		val = RTE_PTYPE_UNKNOWN;
-
-		switch (lb) {
-		case NPC_LT_LB_STAG_QINQ:
-			val |= RTE_PTYPE_L2_ETHER_QINQ;
-			break;
-		case NPC_LT_LB_CTAG:
-			val |= RTE_PTYPE_L2_ETHER_VLAN;
-			break;
-		}
-
-		switch (lc) {
-		case NPC_LT_LC_ARP:
-			val |= RTE_PTYPE_L2_ETHER_ARP;
-			break;
-		case NPC_LT_LC_NSH:
-			val |= RTE_PTYPE_L2_ETHER_NSH;
-			break;
-		case NPC_LT_LC_FCOE:
-			val |= RTE_PTYPE_L2_ETHER_FCOE;
-			break;
-		case NPC_LT_LC_MPLS:
-			val |= RTE_PTYPE_L2_ETHER_MPLS;
-			break;
-		case NPC_LT_LC_IP:
-			val |= RTE_PTYPE_L3_IPV4;
-			break;
-		case NPC_LT_LC_IP_OPT:
-			val |= RTE_PTYPE_L3_IPV4_EXT;
-			break;
-		case NPC_LT_LC_IP6:
-			val |= RTE_PTYPE_L3_IPV6;
-			break;
-		case NPC_LT_LC_IP6_EXT:
-			val |= RTE_PTYPE_L3_IPV6_EXT;
-			break;
-		case NPC_LT_LC_PTP:
-			val |= RTE_PTYPE_L2_ETHER_TIMESYNC;
-			break;
-		}
-
-		switch (ld) {
-		case NPC_LT_LD_TCP:
-			val |= RTE_PTYPE_L4_TCP;
-			break;
-		case NPC_LT_LD_UDP:
-			val |= RTE_PTYPE_L4_UDP;
-			break;
-		case NPC_LT_LD_SCTP:
-			val |= RTE_PTYPE_L4_SCTP;
-			break;
-		case NPC_LT_LD_ICMP:
-		case NPC_LT_LD_ICMP6:
-			val |= RTE_PTYPE_L4_ICMP;
-			break;
-		case NPC_LT_LD_IGMP:
-			val |= RTE_PTYPE_L4_IGMP;
-			break;
-		case NPC_LT_LD_GRE:
-			val |= RTE_PTYPE_TUNNEL_GRE;
-			break;
-		case NPC_LT_LD_NVGRE:
-			val |= RTE_PTYPE_TUNNEL_NVGRE;
-			break;
-		}
-
-		switch (le) {
-		case NPC_LT_LE_VXLAN:
-			val |= RTE_PTYPE_TUNNEL_VXLAN;
-			break;
-		case NPC_LT_LE_ESP:
-			val |= RTE_PTYPE_TUNNEL_ESP;
-			break;
-		case NPC_LT_LE_VXLANGPE:
-			val |= RTE_PTYPE_TUNNEL_VXLAN_GPE;
-			break;
-		case NPC_LT_LE_GENEVE:
-			val |= RTE_PTYPE_TUNNEL_GENEVE;
-			break;
-		case NPC_LT_LE_GTPC:
-			val |= RTE_PTYPE_TUNNEL_GTPC;
-			break;
-		case NPC_LT_LE_GTPU:
-			val |= RTE_PTYPE_TUNNEL_GTPU;
-			break;
-		case NPC_LT_LE_TU_MPLS_IN_GRE:
-			val |= RTE_PTYPE_TUNNEL_MPLS_IN_GRE;
-			break;
-		case NPC_LT_LE_TU_MPLS_IN_UDP:
-			val |= RTE_PTYPE_TUNNEL_MPLS_IN_UDP;
-			break;
-		}
-		ptype[idx] = val;
-	}
-}
-
-#define TU_SHIFT(x) ((x) >> PTYPE_NON_TUNNEL_WIDTH)
-static void
-nix_create_tunnel_ptype_array(uint16_t *ptype)
-{
-	uint8_t lf, lg, lh;
-	uint16_t val;
-	uint32_t idx;
-
-	/* Skip non tunnel ptype array memory */
-	ptype = ptype + PTYPE_NON_TUNNEL_ARRAY_SZ;
-
-	for (idx = 0; idx < PTYPE_TUNNEL_ARRAY_SZ; idx++) {
-		lf = idx & 0xF;
-		lg = (idx & 0xF0) >> 4;
-		lh = (idx & 0xF00) >> 8;
-		val = RTE_PTYPE_UNKNOWN;
-
-		switch (lf) {
-		case NPC_LT_LF_TU_ETHER:
-			val |= TU_SHIFT(RTE_PTYPE_INNER_L2_ETHER);
-			break;
-		}
-		switch (lg) {
-		case NPC_LT_LG_TU_IP:
-			val |= TU_SHIFT(RTE_PTYPE_INNER_L3_IPV4);
-			break;
-		case NPC_LT_LG_TU_IP6:
-			val |= TU_SHIFT(RTE_PTYPE_INNER_L3_IPV6);
-			break;
-		}
-		switch (lh) {
-		case NPC_LT_LH_TU_TCP:
-			val |= TU_SHIFT(RTE_PTYPE_INNER_L4_TCP);
-			break;
-		case NPC_LT_LH_TU_UDP:
-			val |= TU_SHIFT(RTE_PTYPE_INNER_L4_UDP);
-			break;
-		case NPC_LT_LH_TU_SCTP:
-			val |= TU_SHIFT(RTE_PTYPE_INNER_L4_SCTP);
-			break;
-		case NPC_LT_LH_TU_ICMP:
-		case NPC_LT_LH_TU_ICMP6:
-			val |= TU_SHIFT(RTE_PTYPE_INNER_L4_ICMP);
-			break;
-		}
-
-		ptype[idx] = val;
-	}
-}
-
-static void
-nix_create_rx_ol_flags_array(void *mem)
-{
-	uint16_t idx, errcode, errlev;
-	uint32_t val, *ol_flags;
-
-	/* Skip ptype array memory */
-	ol_flags = (uint32_t *)((uint8_t *)mem + PTYPE_ARRAY_SZ);
-
-	for (idx = 0; idx < BIT(ERRCODE_ERRLEN_WIDTH); idx++) {
-		errlev = idx & 0xf;
-		errcode = (idx & 0xff0) >> 4;
-
-		val = RTE_MBUF_F_RX_IP_CKSUM_UNKNOWN;
-		val |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
-		val |= RTE_MBUF_F_RX_OUTER_L4_CKSUM_UNKNOWN;
-
-		switch (errlev) {
-		case NPC_ERRLEV_RE:
-			/* Mark all errors as BAD checksum errors
-			 * including Outer L2 length mismatch error
-			 */
-			if (errcode) {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
-				val |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
-			} else {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
-				val |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
-			}
-			break;
-		case NPC_ERRLEV_LC:
-			if (errcode == NPC_EC_OIP4_CSUM ||
-			    errcode == NPC_EC_IP_FRAG_OFFSET_1) {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
-				val |= RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD;
-			} else {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
-			}
-			break;
-		case NPC_ERRLEV_LG:
-			if (errcode == NPC_EC_IIP4_CSUM)
-				val |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
-			else
-				val |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
-			break;
-		case NPC_ERRLEV_NIX:
-			if (errcode == NIX_RX_PERRCODE_OL4_CHK ||
-			    errcode == NIX_RX_PERRCODE_OL4_LEN ||
-			    errcode == NIX_RX_PERRCODE_OL4_PORT) {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
-				val |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
-				val |= RTE_MBUF_F_RX_OUTER_L4_CKSUM_BAD;
-			} else if (errcode == NIX_RX_PERRCODE_IL4_CHK ||
-				   errcode == NIX_RX_PERRCODE_IL4_LEN ||
-				   errcode == NIX_RX_PERRCODE_IL4_PORT) {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
-				val |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
-			} else if (errcode == NIX_RX_PERRCODE_IL3_LEN ||
-				   errcode == NIX_RX_PERRCODE_OL3_LEN) {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
-			} else {
-				val |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
-				val |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
-			}
-			break;
-		}
-		ol_flags[idx] = val;
-	}
-}
-
-void *
-otx2_nix_fastpath_lookup_mem_get(void)
-{
-	const char name[] = OTX2_NIX_FASTPATH_LOOKUP_MEM;
-	const struct rte_memzone *mz;
-	void *mem;
-
-	/* SA_TBL starts after PTYPE_ARRAY & ERR_ARRAY */
-	RTE_BUILD_BUG_ON(OTX2_NIX_SA_TBL_START != (PTYPE_ARRAY_SZ +
-						   ERR_ARRAY_SZ));
-
-	mz = rte_memzone_lookup(name);
-	if (mz != NULL)
-		return mz->addr;
-
-	/* Request for the first time */
-	mz = rte_memzone_reserve_aligned(name, LOOKUP_ARRAY_SZ,
-					 SOCKET_ID_ANY, 0, OTX2_ALIGN);
-	if (mz != NULL) {
-		mem = mz->addr;
-		/* Form the ptype array lookup memory */
-		nix_create_non_tunnel_ptype_array(mem);
-		nix_create_tunnel_ptype_array(mem);
-		/* Form the rx ol_flags based on errcode */
-		nix_create_rx_ol_flags_array(mem);
-		return mem;
-	}
-	return NULL;
-}
diff --git a/drivers/net/octeontx2/otx2_mac.c b/drivers/net/octeontx2/otx2_mac.c
deleted file mode 100644
index 49a700ca1d..0000000000
--- a/drivers/net/octeontx2/otx2_mac.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_common.h>
-
-#include "otx2_dev.h"
-#include "otx2_ethdev.h"
-
-int
-otx2_cgx_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct cgx_mac_addr_set_or_get *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return -ENOTSUP;
-
-	if (otx2_dev_active_vfs(dev))
-		return -ENOTSUP;
-
-	req = otx2_mbox_alloc_msg_cgx_mac_addr_set(mbox);
-	otx2_mbox_memcpy(req->mac_addr, addr->addr_bytes, RTE_ETHER_ADDR_LEN);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		otx2_err("Failed to set mac address in CGX, rc=%d", rc);
-
-	return 0;
-}
-
-int
-otx2_cgx_mac_max_entries_get(struct otx2_eth_dev *dev)
-{
-	struct cgx_max_dmac_entries_get_rsp *rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return 0;
-
-	otx2_mbox_alloc_msg_cgx_mac_max_entries_get(mbox);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	return rsp->max_dmac_filters;
-}
-
-int
-otx2_nix_mac_addr_add(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr,
-		      uint32_t index __rte_unused, uint32_t pool __rte_unused)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct cgx_mac_addr_add_req *req;
-	struct cgx_mac_addr_add_rsp *rsp;
-	int rc;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return -ENOTSUP;
-
-	if (otx2_dev_active_vfs(dev))
-		return -ENOTSUP;
-
-	req = otx2_mbox_alloc_msg_cgx_mac_addr_add(mbox);
-	otx2_mbox_memcpy(req->mac_addr, addr->addr_bytes, RTE_ETHER_ADDR_LEN);
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc) {
-		otx2_err("Failed to add mac address, rc=%d", rc);
-		goto done;
-	}
-
-	/* Enable promiscuous mode at NIX level */
-	otx2_nix_promisc_config(eth_dev, 1);
-	dev->dmac_filter_enable = true;
-	eth_dev->data->promiscuous = 0;
-
-done:
-	return rc;
-}
-
-void
-otx2_nix_mac_addr_del(struct rte_eth_dev *eth_dev, uint32_t index)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct cgx_mac_addr_del_req *req;
-	int rc;
-
-	if (otx2_dev_is_vf_or_sdp(dev))
-		return;
-
-	req = otx2_mbox_alloc_msg_cgx_mac_addr_del(mbox);
-	req->index = index;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		otx2_err("Failed to delete mac address, rc=%d", rc);
-}
-
-int
-otx2_nix_mac_addr_set(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_set_mac_addr *req;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_nix_set_mac_addr(mbox);
-	otx2_mbox_memcpy(req->mac_addr, addr->addr_bytes, RTE_ETHER_ADDR_LEN);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc) {
-		otx2_err("Failed to set mac address, rc=%d", rc);
-		goto done;
-	}
-
-	otx2_mbox_memcpy(dev->mac_addr, addr->addr_bytes, RTE_ETHER_ADDR_LEN);
-
-	/* Install the same entry into CGX DMAC filter table too. */
-	otx2_cgx_mac_addr_set(eth_dev, addr);
-
-done:
-	return rc;
-}
-
-int
-otx2_nix_mac_addr_get(struct rte_eth_dev *eth_dev, uint8_t *addr)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_get_mac_addr_rsp *rsp;
-	int rc;
-
-	otx2_mbox_alloc_msg_nix_get_mac_addr(mbox);
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
-	if (rc) {
-		otx2_err("Failed to get mac address, rc=%d", rc);
-		goto done;
-	}
-
-	otx2_mbox_memcpy(addr, rsp->mac_addr, RTE_ETHER_ADDR_LEN);
-
-done:
-	return rc;
-}
diff --git a/drivers/net/octeontx2/otx2_mcast.c b/drivers/net/octeontx2/otx2_mcast.c
deleted file mode 100644
index b9c63ad3bc..0000000000
--- a/drivers/net/octeontx2/otx2_mcast.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-
-static int
-nix_mc_addr_list_free(struct otx2_eth_dev *dev, uint32_t entry_count)
-{
-	struct npc_mcam_free_entry_req *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct mcast_entry *entry;
-	int rc = 0;
-
-	if (entry_count == 0)
-		goto exit;
-
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next) {
-		req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
-		req->entry = entry->mcam_index;
-
-		rc = otx2_mbox_process_msg(mbox, NULL);
-		if (rc < 0)
-			goto exit;
-
-		TAILQ_REMOVE(&dev->mc_fltr_tbl, entry, next);
-		rte_free(entry);
-		entry_count--;
-
-		if (entry_count == 0)
-			break;
-	}
-
-	if (entry == NULL)
-		dev->mc_tbl_set = false;
-
-exit:
-	return rc;
-}
-
-static int
-nix_hw_update_mc_addr_list(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_npc_flow_info *npc = &dev->npc_flow;
-	volatile uint8_t *key_data, *key_mask;
-	struct npc_mcam_write_entry_req *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct npc_xtract_info *x_info;
-	uint64_t mcam_data, mcam_mask;
-	struct mcast_entry *entry;
-	otx2_dxcfg_t *ld_cfg;
-	uint8_t *mac_addr;
-	uint64_t action;
-	int idx, rc = 0;
-
-	ld_cfg = &npc->prx_dxcfg;
-	/* Get ETH layer profile info for populating mcam entries */
-	x_info = &(*ld_cfg)[NPC_MCAM_RX][NPC_LID_LA][NPC_LT_LA_ETHER].xtract[0];
-
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next) {
-		req = otx2_mbox_alloc_msg_npc_mcam_write_entry(mbox);
-		if (req == NULL) {
-			/* The mbox memory buffer can be full.
-			 * Flush it and retry
-			 */
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0)
-				goto exit;
-
-			req = otx2_mbox_alloc_msg_npc_mcam_write_entry(mbox);
-			if (req == NULL) {
-				rc = -ENOMEM;
-				goto exit;
-			}
-		}
-		req->entry = entry->mcam_index;
-		req->intf = NPC_MCAM_RX;
-		req->enable_entry = 1;
-
-		/* Channel base extracted to KW0[11:0] */
-		req->entry_data.kw[0] = dev->rx_chan_base;
-		req->entry_data.kw_mask[0] = RTE_LEN2MASK(12, uint64_t);
-
-		/* Update mcam address */
-		key_data = (volatile uint8_t *)req->entry_data.kw;
-		key_mask = (volatile uint8_t *)req->entry_data.kw_mask;
-
-		mcam_data = 0ull;
-		mcam_mask = RTE_LEN2MASK(48, uint64_t);
-		mac_addr = &entry->mcast_mac.addr_bytes[0];
-		for (idx = RTE_ETHER_ADDR_LEN - 1; idx >= 0; idx--)
-			mcam_data |= ((uint64_t)*mac_addr++) << (8 * idx);
-
-		otx2_mbox_memcpy(key_data + x_info->key_off,
-				 &mcam_data, x_info->len);
-		otx2_mbox_memcpy(key_mask + x_info->key_off,
-				 &mcam_mask, x_info->len);
-
-		action = NIX_RX_ACTIONOP_UCAST;
-
-		if (eth_dev->data->dev_conf.rxmode.mq_mode == RTE_ETH_MQ_RX_RSS) {
-			action = NIX_RX_ACTIONOP_RSS;
-			action |= (uint64_t)(dev->rss_info.alg_idx) << 56;
-		}
-
-		action |= ((uint64_t)otx2_pfvf_func(dev->pf, dev->vf)) << 4;
-		req->entry_data.action = action;
-	}
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_wait_for_rsp(mbox, 0);
-
-exit:
-	return rc;
-}
-
-int
-otx2_nix_mc_addr_list_install(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct npc_mcam_alloc_entry_req *req;
-	struct npc_mcam_alloc_entry_rsp *rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	uint32_t entry_count = 0, idx  = 0;
-	struct mcast_entry *entry;
-	int rc = 0;
-
-	if (!dev->mc_tbl_set)
-		return 0;
-
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next)
-		entry_count++;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_alloc_entry(mbox);
-	req->priority = NPC_MCAM_ANY_PRIO;
-	req->count = entry_count;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc || rsp->count  < entry_count) {
-		otx2_err("Failed to allocate required mcam entries");
-		goto exit;
-	}
-
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next)
-		entry->mcam_index = rsp->entry_list[idx];
-
-	rc = nix_hw_update_mc_addr_list(eth_dev);
-
-exit:
-	return rc;
-}
-
-int
-otx2_nix_mc_addr_list_uninstall(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct npc_mcam_free_entry_req *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct mcast_entry *entry;
-	int rc = 0;
-
-	if (!dev->mc_tbl_set)
-		return 0;
-
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next) {
-		req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
-		if (req == NULL) {
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0)
-				goto exit;
-
-			req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
-			if (req == NULL) {
-				rc = -ENOMEM;
-				goto exit;
-			}
-		}
-		req->entry = entry->mcam_index;
-	}
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_wait_for_rsp(mbox, 0);
-
-exit:
-	return rc;
-}
-
-static int
-nix_setup_mc_addr_list(struct otx2_eth_dev *dev,
-		       struct rte_ether_addr *mc_addr_set)
-{
-	struct npc_mcam_ena_dis_entry_req *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct mcast_entry *entry;
-	uint32_t idx = 0;
-	int rc = 0;
-
-	/* Populate PMD's mcast list with given mcast mac addresses and
-	 * disable all mcam entries pertaining to the mcast list.
-	 */
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next) {
-		rte_memcpy(&entry->mcast_mac, &mc_addr_set[idx++],
-			   RTE_ETHER_ADDR_LEN);
-
-		req = otx2_mbox_alloc_msg_npc_mcam_dis_entry(mbox);
-		if (req == NULL) {
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0)
-				goto exit;
-
-			req = otx2_mbox_alloc_msg_npc_mcam_dis_entry(mbox);
-			if (req == NULL) {
-				rc = -ENOMEM;
-				goto exit;
-			}
-		}
-		req->entry = entry->mcam_index;
-	}
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_wait_for_rsp(mbox, 0);
-
-exit:
-	return rc;
-}
-
-int
-otx2_nix_set_mc_addr_list(struct rte_eth_dev *eth_dev,
-			  struct rte_ether_addr *mc_addr_set,
-			  uint32_t nb_mc_addr)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct npc_mcam_alloc_entry_req *req;
-	struct npc_mcam_alloc_entry_rsp *rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	uint32_t idx, priv_count = 0;
-	struct mcast_entry *entry;
-	int rc = 0;
-
-	if (otx2_dev_is_vf(dev))
-		return -ENOTSUP;
-
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next)
-		priv_count++;
-
-	if (nb_mc_addr == 0 || mc_addr_set == NULL) {
-		/* Free existing list if new list is null */
-		nb_mc_addr = priv_count;
-		goto exit;
-	}
-
-	for (idx = 0; idx < nb_mc_addr; idx++) {
-		if (!rte_is_multicast_ether_addr(&mc_addr_set[idx]))
-			return -EINVAL;
-	}
-
-	/* New list is bigger than the existing list,
-	 * allocate mcam entries for the extra entries.
-	 */
-	if (nb_mc_addr > priv_count) {
-		req = otx2_mbox_alloc_msg_npc_mcam_alloc_entry(mbox);
-		req->priority = NPC_MCAM_ANY_PRIO;
-		req->count = nb_mc_addr - priv_count;
-
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc || (rsp->count + priv_count < nb_mc_addr)) {
-			otx2_err("Failed to allocate required entries");
-			nb_mc_addr = priv_count;
-			goto exit;
-		}
-
-		/* Append new mcam entries to the existing mc list */
-		for (idx = 0; idx < rsp->count; idx++) {
-			entry = rte_zmalloc("otx2_nix_mc_entry",
-					    sizeof(struct mcast_entry), 0);
-			if (!entry) {
-				otx2_err("Failed to allocate memory");
-				nb_mc_addr = priv_count;
-				rc = -ENOMEM;
-				goto exit;
-			}
-			entry->mcam_index = rsp->entry_list[idx];
-			TAILQ_INSERT_HEAD(&dev->mc_fltr_tbl, entry, next);
-		}
-	} else {
-		/* Free the extra mcam entries if the new list is smaller
-		 * than exiting list.
-		 */
-		nix_mc_addr_list_free(dev, priv_count - nb_mc_addr);
-	}
-
-
-	/* Now mc_fltr_tbl has the required number of mcam entries,
-	 * Traverse through it and add new multicast filter table entries.
-	 */
-	rc = nix_setup_mc_addr_list(dev, mc_addr_set);
-	if (rc < 0)
-		goto exit;
-
-	rc = nix_hw_update_mc_addr_list(eth_dev);
-	if (rc < 0)
-		goto exit;
-
-	dev->mc_tbl_set = true;
-
-	return 0;
-
-exit:
-	nix_mc_addr_list_free(dev, nb_mc_addr);
-	return rc;
-}
-
-void
-otx2_nix_mc_filter_init(struct otx2_eth_dev *dev)
-{
-	if (otx2_dev_is_vf(dev))
-		return;
-
-	TAILQ_INIT(&dev->mc_fltr_tbl);
-}
-
-void
-otx2_nix_mc_filter_fini(struct otx2_eth_dev *dev)
-{
-	struct mcast_entry *entry;
-	uint32_t count = 0;
-
-	if (otx2_dev_is_vf(dev))
-		return;
-
-	TAILQ_FOREACH(entry, &dev->mc_fltr_tbl, next)
-		count++;
-
-	nix_mc_addr_list_free(dev, count);
-}
diff --git a/drivers/net/octeontx2/otx2_ptp.c b/drivers/net/octeontx2/otx2_ptp.c
deleted file mode 100644
index abb2130587..0000000000
--- a/drivers/net/octeontx2/otx2_ptp.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <ethdev_driver.h>
-
-#include "otx2_ethdev.h"
-
-#define PTP_FREQ_ADJUST (1 << 9)
-
-/* Function to enable ptp config for VFs */
-void
-otx2_nix_ptp_enable_vf(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	if (otx2_nix_recalc_mtu(eth_dev))
-		otx2_err("Failed to set MTU size for ptp");
-
-	dev->scalar_ena = true;
-	dev->rx_offload_flags |= NIX_RX_OFFLOAD_TSTAMP_F;
-
-	/* Setting up the function pointers as per new offload flags */
-	otx2_eth_set_rx_function(eth_dev);
-	otx2_eth_set_tx_function(eth_dev);
-}
-
-static uint16_t
-nix_eth_ptp_vf_burst(void *queue, struct rte_mbuf **mbufs, uint16_t pkts)
-{
-	struct otx2_eth_rxq *rxq = queue;
-	struct rte_eth_dev *eth_dev;
-
-	RTE_SET_USED(mbufs);
-	RTE_SET_USED(pkts);
-
-	eth_dev = rxq->eth_dev;
-	otx2_nix_ptp_enable_vf(eth_dev);
-
-	return 0;
-}
-
-static int
-nix_read_raw_clock(struct otx2_eth_dev *dev, uint64_t *clock, uint64_t *tsc,
-		   uint8_t is_pmu)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct ptp_req *req;
-	struct ptp_rsp *rsp;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_ptp_op(mbox);
-	req->op = PTP_OP_GET_CLOCK;
-	req->is_pmu = is_pmu;
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		goto fail;
-
-	if (clock)
-		*clock = rsp->clk;
-	if (tsc)
-		*tsc = rsp->tsc;
-
-fail:
-	return rc;
-}
-
-/* This function calculates two parameters "clk_freq_mult" and
- * "clk_delta" which is useful in deriving PTP HI clock from
- * timestamp counter (tsc) value.
- */
-int
-otx2_nix_raw_clock_tsc_conv(struct otx2_eth_dev *dev)
-{
-	uint64_t ticks_base = 0, ticks = 0, tsc = 0, t_freq;
-	int rc, val;
-
-	/* Calculating the frequency at which PTP HI clock is running */
-	rc = nix_read_raw_clock(dev, &ticks_base, &tsc, false);
-	if (rc) {
-		otx2_err("Failed to read the raw clock value: %d", rc);
-		goto fail;
-	}
-
-	rte_delay_ms(100);
-
-	rc = nix_read_raw_clock(dev, &ticks, &tsc, false);
-	if (rc) {
-		otx2_err("Failed to read the raw clock value: %d", rc);
-		goto fail;
-	}
-
-	t_freq = (ticks - ticks_base) * 10;
-
-	/* Calculating the freq multiplier viz the ratio between the
-	 * frequency at which PTP HI clock works and tsc clock runs
-	 */
-	dev->clk_freq_mult =
-		(double)pow(10, floor(log10(t_freq))) / rte_get_timer_hz();
-
-	val = false;
-#ifdef RTE_ARM_EAL_RDTSC_USE_PMU
-	val = true;
-#endif
-	rc = nix_read_raw_clock(dev, &ticks, &tsc, val);
-	if (rc) {
-		otx2_err("Failed to read the raw clock value: %d", rc);
-		goto fail;
-	}
-
-	/* Calculating delta between PTP HI clock and tsc */
-	dev->clk_delta = ((uint64_t)(ticks / dev->clk_freq_mult) - tsc);
-
-fail:
-	return rc;
-}
-
-static void
-nix_start_timecounters(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	memset(&dev->systime_tc, 0, sizeof(struct rte_timecounter));
-	memset(&dev->rx_tstamp_tc, 0, sizeof(struct rte_timecounter));
-	memset(&dev->tx_tstamp_tc, 0, sizeof(struct rte_timecounter));
-
-	dev->systime_tc.cc_mask = OTX2_CYCLECOUNTER_MASK;
-	dev->rx_tstamp_tc.cc_mask = OTX2_CYCLECOUNTER_MASK;
-	dev->tx_tstamp_tc.cc_mask = OTX2_CYCLECOUNTER_MASK;
-}
-
-static int
-nix_ptp_config(struct rte_eth_dev *eth_dev, int en)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	uint8_t rc = -EINVAL;
-
-	if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev))
-		return rc;
-
-	if (en) {
-		/* Enable time stamping of sent PTP packets. */
-		otx2_mbox_alloc_msg_nix_lf_ptp_tx_enable(mbox);
-		rc = otx2_mbox_process(mbox);
-		if (rc) {
-			otx2_err("MBOX ptp tx conf enable failed: err %d", rc);
-			return rc;
-		}
-		/* Enable time stamping of received PTP packets. */
-		otx2_mbox_alloc_msg_cgx_ptp_rx_enable(mbox);
-	} else {
-		/* Disable time stamping of sent PTP packets. */
-		otx2_mbox_alloc_msg_nix_lf_ptp_tx_disable(mbox);
-		rc = otx2_mbox_process(mbox);
-		if (rc) {
-			otx2_err("MBOX ptp tx conf disable failed: err %d", rc);
-			return rc;
-		}
-		/* Disable time stamping of received PTP packets. */
-		otx2_mbox_alloc_msg_cgx_ptp_rx_disable(mbox);
-	}
-
-	return otx2_mbox_process(mbox);
-}
-
-int
-otx2_eth_dev_ptp_info_update(struct otx2_dev *dev, bool ptp_en)
-{
-	struct otx2_eth_dev *otx2_dev = (struct otx2_eth_dev *)dev;
-	struct rte_eth_dev *eth_dev;
-	int i;
-
-	if (!dev)
-		return -EINVAL;
-
-	eth_dev = otx2_dev->eth_dev;
-	if (!eth_dev)
-		return -EINVAL;
-
-	otx2_dev->ptp_en = ptp_en;
-	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-		struct otx2_eth_rxq *rxq = eth_dev->data->rx_queues[i];
-		rxq->mbuf_initializer =
-			otx2_nix_rxq_mbuf_setup(otx2_dev,
-						eth_dev->data->port_id);
-	}
-	if (otx2_dev_is_vf(otx2_dev) && !(otx2_dev_is_sdp(otx2_dev)) &&
-	    !(otx2_dev_is_lbk(otx2_dev))) {
-		/* In case of VF, setting of MTU cant be done directly in this
-		 * function as this is running as part of MBOX request(PF->VF)
-		 * and MTU setting also requires MBOX message to be
-		 * sent(VF->PF)
-		 */
-		eth_dev->rx_pkt_burst = nix_eth_ptp_vf_burst;
-		rte_mb();
-	}
-
-	return 0;
-}
-
-int
-otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int i, rc = 0;
-
-	/* If we are VF/SDP/LBK, ptp cannot not be enabled */
-	if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev)) {
-		otx2_info("PTP cannot be enabled in case of VF/SDP/LBK");
-		return -EINVAL;
-	}
-
-	if (otx2_ethdev_is_ptp_en(dev)) {
-		otx2_info("PTP mode is already enabled");
-		return -EINVAL;
-	}
-
-	if (!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)) {
-		otx2_err("Ptype offload is disabled, it should be enabled");
-		return -EINVAL;
-	}
-
-	if (dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_HIGIG) {
-		otx2_err("Both PTP and switch header enabled");
-		return -EINVAL;
-	}
-
-	/* Allocating a iova address for tx tstamp */
-	const struct rte_memzone *ts;
-	ts = rte_eth_dma_zone_reserve(eth_dev, "otx2_ts",
-				      0, OTX2_ALIGN, OTX2_ALIGN,
-				      dev->node);
-	if (ts == NULL) {
-		otx2_err("Failed to allocate mem for tx tstamp addr");
-		return -ENOMEM;
-	}
-
-	dev->tstamp.tx_tstamp_iova = ts->iova;
-	dev->tstamp.tx_tstamp = ts->addr;
-
-	rc = rte_mbuf_dyn_rx_timestamp_register(
-			&dev->tstamp.tstamp_dynfield_offset,
-			&dev->tstamp.rx_tstamp_dynflag);
-	if (rc != 0) {
-		otx2_err("Failed to register Rx timestamp field/flag");
-		return -rte_errno;
-	}
-
-	/* System time should be already on by default */
-	nix_start_timecounters(eth_dev);
-
-	dev->rx_offloads |= RTE_ETH_RX_OFFLOAD_TIMESTAMP;
-	dev->rx_offload_flags |= NIX_RX_OFFLOAD_TSTAMP_F;
-	dev->tx_offload_flags |= NIX_TX_OFFLOAD_TSTAMP_F;
-
-	rc = nix_ptp_config(eth_dev, 1);
-	if (!rc) {
-		for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-			struct otx2_eth_txq *txq = eth_dev->data->tx_queues[i];
-			otx2_nix_form_default_desc(txq);
-		}
-
-		/* Setting up the function pointers as per new offload flags */
-		otx2_eth_set_rx_function(eth_dev);
-		otx2_eth_set_tx_function(eth_dev);
-	}
-
-	rc = otx2_nix_recalc_mtu(eth_dev);
-	if (rc)
-		otx2_err("Failed to set MTU size for ptp");
-
-	return rc;
-}
-
-int
-otx2_nix_timesync_disable(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int i, rc = 0;
-
-	if (!otx2_ethdev_is_ptp_en(dev)) {
-		otx2_nix_dbg("PTP mode is disabled");
-		return -EINVAL;
-	}
-
-	if (otx2_dev_is_vf_or_sdp(dev) || otx2_dev_is_lbk(dev))
-		return -EINVAL;
-
-	dev->rx_offloads &= ~RTE_ETH_RX_OFFLOAD_TIMESTAMP;
-	dev->rx_offload_flags &= ~NIX_RX_OFFLOAD_TSTAMP_F;
-	dev->tx_offload_flags &= ~NIX_TX_OFFLOAD_TSTAMP_F;
-
-	rc = nix_ptp_config(eth_dev, 0);
-	if (!rc) {
-		for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-			struct otx2_eth_txq *txq = eth_dev->data->tx_queues[i];
-			otx2_nix_form_default_desc(txq);
-		}
-
-		/* Setting up the function pointers as per new offload flags */
-		otx2_eth_set_rx_function(eth_dev);
-		otx2_eth_set_tx_function(eth_dev);
-	}
-
-	rc = otx2_nix_recalc_mtu(eth_dev);
-	if (rc)
-		otx2_err("Failed to set MTU size for ptp");
-
-	return rc;
-}
-
-int
-otx2_nix_timesync_read_rx_timestamp(struct rte_eth_dev *eth_dev,
-				    struct timespec *timestamp,
-				    uint32_t __rte_unused flags)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_timesync_info *tstamp = &dev->tstamp;
-	uint64_t ns;
-
-	if (!tstamp->rx_ready)
-		return -EINVAL;
-
-	ns = rte_timecounter_update(&dev->rx_tstamp_tc, tstamp->rx_tstamp);
-	*timestamp = rte_ns_to_timespec(ns);
-	tstamp->rx_ready = 0;
-
-	otx2_nix_dbg("rx timestamp: %"PRIu64" sec: %"PRIu64" nsec %"PRIu64"",
-		     (uint64_t)tstamp->rx_tstamp, (uint64_t)timestamp->tv_sec,
-		     (uint64_t)timestamp->tv_nsec);
-
-	return 0;
-}
-
-int
-otx2_nix_timesync_read_tx_timestamp(struct rte_eth_dev *eth_dev,
-				    struct timespec *timestamp)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_timesync_info *tstamp = &dev->tstamp;
-	uint64_t ns;
-
-	if (*tstamp->tx_tstamp == 0)
-		return -EINVAL;
-
-	ns = rte_timecounter_update(&dev->tx_tstamp_tc, *tstamp->tx_tstamp);
-	*timestamp = rte_ns_to_timespec(ns);
-
-	otx2_nix_dbg("tx timestamp: %"PRIu64" sec: %"PRIu64" nsec %"PRIu64"",
-		     *tstamp->tx_tstamp, (uint64_t)timestamp->tv_sec,
-		     (uint64_t)timestamp->tv_nsec);
-
-	*tstamp->tx_tstamp = 0;
-	rte_wmb();
-
-	return 0;
-}
-
-int
-otx2_nix_timesync_adjust_time(struct rte_eth_dev *eth_dev, int64_t delta)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct ptp_req *req;
-	struct ptp_rsp *rsp;
-	int rc;
-
-	/* Adjust the frequent to make tics increments in 10^9 tics per sec */
-	if (delta < PTP_FREQ_ADJUST && delta > -PTP_FREQ_ADJUST) {
-		req = otx2_mbox_alloc_msg_ptp_op(mbox);
-		req->op = PTP_OP_ADJFINE;
-		req->scaled_ppm = delta;
-
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc)
-			return rc;
-		/* Since the frequency of PTP comp register is tuned, delta and
-		 * freq mult calculation for deriving PTP_HI from timestamp
-		 * counter should be done again.
-		 */
-		rc = otx2_nix_raw_clock_tsc_conv(dev);
-		if (rc)
-			otx2_err("Failed to calculate delta and freq mult");
-	}
-	dev->systime_tc.nsec += delta;
-	dev->rx_tstamp_tc.nsec += delta;
-	dev->tx_tstamp_tc.nsec += delta;
-
-	return 0;
-}
-
-int
-otx2_nix_timesync_write_time(struct rte_eth_dev *eth_dev,
-			     const struct timespec *ts)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t ns;
-
-	ns = rte_timespec_to_ns(ts);
-	/* Set the time counters to a new value. */
-	dev->systime_tc.nsec = ns;
-	dev->rx_tstamp_tc.nsec = ns;
-	dev->tx_tstamp_tc.nsec = ns;
-
-	return 0;
-}
-
-int
-otx2_nix_timesync_read_time(struct rte_eth_dev *eth_dev, struct timespec *ts)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct ptp_req *req;
-	struct ptp_rsp *rsp;
-	uint64_t ns;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_ptp_op(mbox);
-	req->op = PTP_OP_GET_CLOCK;
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	ns = rte_timecounter_update(&dev->systime_tc, rsp->clk);
-	*ts = rte_ns_to_timespec(ns);
-
-	otx2_nix_dbg("PTP time read: %"PRIu64" .%09"PRIu64"",
-		     (uint64_t)ts->tv_sec, (uint64_t)ts->tv_nsec);
-
-	return 0;
-}
-
-
-int
-otx2_nix_read_clock(struct rte_eth_dev *eth_dev, uint64_t *clock)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	/* This API returns the raw PTP HI clock value. Since LFs doesn't
-	 * have direct access to PTP registers and it requires mbox msg
-	 * to AF for this value. In fastpath reading this value for every
-	 * packet (which involes mbox call) becomes very expensive, hence
-	 * we should be able to derive PTP HI clock value from tsc by
-	 * using freq_mult and clk_delta calculated during configure stage.
-	 */
-	*clock = (rte_get_tsc_cycles() + dev->clk_delta) * dev->clk_freq_mult;
-
-	return 0;
-}
diff --git a/drivers/net/octeontx2/otx2_rss.c b/drivers/net/octeontx2/otx2_rss.c
deleted file mode 100644
index 68cef1caa3..0000000000
--- a/drivers/net/octeontx2/otx2_rss.c
+++ /dev/null
@@ -1,427 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include "otx2_ethdev.h"
-
-int
-otx2_nix_rss_tbl_init(struct otx2_eth_dev *dev,
-		      uint8_t group, uint16_t *ind_tbl)
-{
-	struct otx2_rss_info *rss = &dev->rss_info;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_req *req;
-	int rc, idx;
-
-	for (idx = 0; idx < rss->rss_size; idx++) {
-		req = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		if (!req) {
-			/* The shared memory buffer can be full.
-			 * Flush it and retry
-			 */
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0)
-				return rc;
-
-			req = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-			if (!req)
-				return -ENOMEM;
-		}
-		req->rss.rq = ind_tbl[idx];
-		/* Fill AQ info */
-		req->qidx = (group * rss->rss_size) + idx;
-		req->ctype = NIX_AQ_CTYPE_RSS;
-		req->op = NIX_AQ_INSTOP_INIT;
-
-		if (!dev->lock_rx_ctx)
-			continue;
-
-		req = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		if (!req) {
-			/* The shared memory buffer can be full.
-			 * Flush it and retry
-			 */
-			otx2_mbox_msg_send(mbox, 0);
-			rc = otx2_mbox_wait_for_rsp(mbox, 0);
-			if (rc < 0)
-				return rc;
-
-			req = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-			if (!req)
-				return -ENOMEM;
-		}
-		req->rss.rq = ind_tbl[idx];
-		/* Fill AQ info */
-		req->qidx = (group * rss->rss_size) + idx;
-		req->ctype = NIX_AQ_CTYPE_RSS;
-		req->op = NIX_AQ_INSTOP_LOCK;
-	}
-
-	otx2_mbox_msg_send(mbox, 0);
-	rc = otx2_mbox_wait_for_rsp(mbox, 0);
-	if (rc < 0)
-		return rc;
-
-	return 0;
-}
-
-int
-otx2_nix_dev_reta_update(struct rte_eth_dev *eth_dev,
-			 struct rte_eth_rss_reta_entry64 *reta_conf,
-			 uint16_t reta_size)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_rss_info *rss = &dev->rss_info;
-	int rc, i, j;
-	int idx = 0;
-
-	rc = -EINVAL;
-	if (reta_size != dev->rss_info.rss_size) {
-		otx2_err("Size of hash lookup table configured "
-		"(%d) doesn't match the number hardware can supported "
-		"(%d)", reta_size, dev->rss_info.rss_size);
-		goto fail;
-	}
-
-	/* Copy RETA table */
-	for (i = 0; i < (dev->rss_info.rss_size / RTE_ETH_RETA_GROUP_SIZE); i++) {
-		for (j = 0; j < RTE_ETH_RETA_GROUP_SIZE; j++) {
-			if ((reta_conf[i].mask >> j) & 0x01)
-				rss->ind_tbl[idx] = reta_conf[i].reta[j];
-			idx++;
-		}
-	}
-
-	return otx2_nix_rss_tbl_init(dev, 0, dev->rss_info.ind_tbl);
-
-fail:
-	return rc;
-}
-
-int
-otx2_nix_dev_reta_query(struct rte_eth_dev *eth_dev,
-			struct rte_eth_rss_reta_entry64 *reta_conf,
-			uint16_t reta_size)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_rss_info *rss = &dev->rss_info;
-	int rc, i, j;
-
-	rc = -EINVAL;
-
-	if (reta_size != dev->rss_info.rss_size) {
-		otx2_err("Size of hash lookup table configured "
-			"(%d) doesn't match the number hardware can supported "
-			"(%d)", reta_size, dev->rss_info.rss_size);
-		goto fail;
-	}
-
-	/* Copy RETA table */
-	for (i = 0; i < (dev->rss_info.rss_size / RTE_ETH_RETA_GROUP_SIZE); i++) {
-		for (j = 0; j < RTE_ETH_RETA_GROUP_SIZE; j++)
-			if ((reta_conf[i].mask >> j) & 0x01)
-				reta_conf[i].reta[j] = rss->ind_tbl[j];
-	}
-
-	return 0;
-
-fail:
-	return rc;
-}
-
-void
-otx2_nix_rss_set_key(struct otx2_eth_dev *dev, uint8_t *key,
-		     uint32_t key_len)
-{
-	const uint8_t default_key[NIX_HASH_KEY_SIZE] = {
-		0xFE, 0xED, 0x0B, 0xAD, 0xFE, 0xED, 0x0B, 0xAD,
-		0xFE, 0xED, 0x0B, 0xAD, 0xFE, 0xED, 0x0B, 0xAD,
-		0xFE, 0xED, 0x0B, 0xAD, 0xFE, 0xED, 0x0B, 0xAD,
-		0xFE, 0xED, 0x0B, 0xAD, 0xFE, 0xED, 0x0B, 0xAD,
-		0xFE, 0xED, 0x0B, 0xAD, 0xFE, 0xED, 0x0B, 0xAD,
-		0xFE, 0xED, 0x0B, 0xAD, 0xFE, 0xED, 0x0B, 0xAD
-	};
-	struct otx2_rss_info *rss = &dev->rss_info;
-	uint64_t *keyptr;
-	uint64_t val;
-	uint32_t idx;
-
-	if (key == NULL || key == 0) {
-		keyptr = (uint64_t *)(uintptr_t)default_key;
-		key_len = NIX_HASH_KEY_SIZE;
-		memset(rss->key, 0, key_len);
-	} else {
-		memcpy(rss->key, key, key_len);
-		keyptr = (uint64_t *)rss->key;
-	}
-
-	for (idx = 0; idx < (key_len >> 3); idx++) {
-		val = rte_cpu_to_be_64(*keyptr);
-		otx2_write64(val, dev->base + NIX_LF_RX_SECRETX(idx));
-		keyptr++;
-	}
-}
-
-static void
-rss_get_key(struct otx2_eth_dev *dev, uint8_t *key)
-{
-	uint64_t *keyptr = (uint64_t *)key;
-	uint64_t val;
-	int idx;
-
-	for (idx = 0; idx < (NIX_HASH_KEY_SIZE >> 3); idx++) {
-		val = otx2_read64(dev->base + NIX_LF_RX_SECRETX(idx));
-		*keyptr = rte_be_to_cpu_64(val);
-		keyptr++;
-	}
-}
-
-#define RSS_IPV4_ENABLE ( \
-			  RTE_ETH_RSS_IPV4 | \
-			  RTE_ETH_RSS_FRAG_IPV4 | \
-			  RTE_ETH_RSS_NONFRAG_IPV4_UDP | \
-			  RTE_ETH_RSS_NONFRAG_IPV4_TCP | \
-			  RTE_ETH_RSS_NONFRAG_IPV4_SCTP)
-
-#define RSS_IPV6_ENABLE ( \
-			  RTE_ETH_RSS_IPV6 | \
-			  RTE_ETH_RSS_FRAG_IPV6 | \
-			  RTE_ETH_RSS_NONFRAG_IPV6_UDP | \
-			  RTE_ETH_RSS_NONFRAG_IPV6_TCP | \
-			  RTE_ETH_RSS_NONFRAG_IPV6_SCTP)
-
-#define RSS_IPV6_EX_ENABLE ( \
-			     RTE_ETH_RSS_IPV6_EX | \
-			     RTE_ETH_RSS_IPV6_TCP_EX | \
-			     RTE_ETH_RSS_IPV6_UDP_EX)
-
-#define RSS_MAX_LEVELS   3
-
-#define RSS_IPV4_INDEX   0
-#define RSS_IPV6_INDEX   1
-#define RSS_TCP_INDEX    2
-#define RSS_UDP_INDEX    3
-#define RSS_SCTP_INDEX   4
-#define RSS_DMAC_INDEX   5
-
-uint32_t
-otx2_rss_ethdev_to_nix(struct otx2_eth_dev *dev, uint64_t ethdev_rss,
-		       uint8_t rss_level)
-{
-	uint32_t flow_key_type[RSS_MAX_LEVELS][6] = {
-		{
-			FLOW_KEY_TYPE_IPV4, FLOW_KEY_TYPE_IPV6,
-			FLOW_KEY_TYPE_TCP, FLOW_KEY_TYPE_UDP,
-			FLOW_KEY_TYPE_SCTP, FLOW_KEY_TYPE_ETH_DMAC
-		},
-		{
-			FLOW_KEY_TYPE_INNR_IPV4, FLOW_KEY_TYPE_INNR_IPV6,
-			FLOW_KEY_TYPE_INNR_TCP, FLOW_KEY_TYPE_INNR_UDP,
-			FLOW_KEY_TYPE_INNR_SCTP, FLOW_KEY_TYPE_INNR_ETH_DMAC
-		},
-		{
-			FLOW_KEY_TYPE_IPV4 | FLOW_KEY_TYPE_INNR_IPV4,
-			FLOW_KEY_TYPE_IPV6 | FLOW_KEY_TYPE_INNR_IPV6,
-			FLOW_KEY_TYPE_TCP | FLOW_KEY_TYPE_INNR_TCP,
-			FLOW_KEY_TYPE_UDP | FLOW_KEY_TYPE_INNR_UDP,
-			FLOW_KEY_TYPE_SCTP | FLOW_KEY_TYPE_INNR_SCTP,
-			FLOW_KEY_TYPE_ETH_DMAC | FLOW_KEY_TYPE_INNR_ETH_DMAC
-		}
-	};
-	uint32_t flowkey_cfg = 0;
-
-	dev->rss_info.nix_rss = ethdev_rss;
-
-	if (ethdev_rss & RTE_ETH_RSS_L2_PAYLOAD &&
-	    dev->npc_flow.switch_header_type == OTX2_PRIV_FLAGS_CH_LEN_90B) {
-		flowkey_cfg |= FLOW_KEY_TYPE_CH_LEN_90B;
-	}
-
-	if (ethdev_rss & RTE_ETH_RSS_C_VLAN)
-		flowkey_cfg |= FLOW_KEY_TYPE_VLAN;
-
-	if (ethdev_rss & RTE_ETH_RSS_L3_SRC_ONLY)
-		flowkey_cfg |= FLOW_KEY_TYPE_L3_SRC;
-
-	if (ethdev_rss & RTE_ETH_RSS_L3_DST_ONLY)
-		flowkey_cfg |= FLOW_KEY_TYPE_L3_DST;
-
-	if (ethdev_rss & RTE_ETH_RSS_L4_SRC_ONLY)
-		flowkey_cfg |= FLOW_KEY_TYPE_L4_SRC;
-
-	if (ethdev_rss & RTE_ETH_RSS_L4_DST_ONLY)
-		flowkey_cfg |= FLOW_KEY_TYPE_L4_DST;
-
-	if (ethdev_rss & RSS_IPV4_ENABLE)
-		flowkey_cfg |= flow_key_type[rss_level][RSS_IPV4_INDEX];
-
-	if (ethdev_rss & RSS_IPV6_ENABLE)
-		flowkey_cfg |= flow_key_type[rss_level][RSS_IPV6_INDEX];
-
-	if (ethdev_rss & RTE_ETH_RSS_TCP)
-		flowkey_cfg |= flow_key_type[rss_level][RSS_TCP_INDEX];
-
-	if (ethdev_rss & RTE_ETH_RSS_UDP)
-		flowkey_cfg |= flow_key_type[rss_level][RSS_UDP_INDEX];
-
-	if (ethdev_rss & RTE_ETH_RSS_SCTP)
-		flowkey_cfg |= flow_key_type[rss_level][RSS_SCTP_INDEX];
-
-	if (ethdev_rss & RTE_ETH_RSS_L2_PAYLOAD)
-		flowkey_cfg |= flow_key_type[rss_level][RSS_DMAC_INDEX];
-
-	if (ethdev_rss & RSS_IPV6_EX_ENABLE)
-		flowkey_cfg |= FLOW_KEY_TYPE_IPV6_EXT;
-
-	if (ethdev_rss & RTE_ETH_RSS_PORT)
-		flowkey_cfg |= FLOW_KEY_TYPE_PORT;
-
-	if (ethdev_rss & RTE_ETH_RSS_NVGRE)
-		flowkey_cfg |= FLOW_KEY_TYPE_NVGRE;
-
-	if (ethdev_rss & RTE_ETH_RSS_VXLAN)
-		flowkey_cfg |= FLOW_KEY_TYPE_VXLAN;
-
-	if (ethdev_rss & RTE_ETH_RSS_GENEVE)
-		flowkey_cfg |= FLOW_KEY_TYPE_GENEVE;
-
-	if (ethdev_rss & RTE_ETH_RSS_GTPU)
-		flowkey_cfg |= FLOW_KEY_TYPE_GTPU;
-
-	return flowkey_cfg;
-}
-
-int
-otx2_rss_set_hf(struct otx2_eth_dev *dev, uint32_t flowkey_cfg,
-		uint8_t *alg_idx, uint8_t group, int mcam_index)
-{
-	struct nix_rss_flowkey_cfg_rsp *rss_rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_rss_flowkey_cfg *cfg;
-	int rc;
-
-	rc = -EINVAL;
-
-	dev->rss_info.flowkey_cfg = flowkey_cfg;
-
-	cfg = otx2_mbox_alloc_msg_nix_rss_flowkey_cfg(mbox);
-
-	cfg->flowkey_cfg = flowkey_cfg;
-	cfg->mcam_index = mcam_index; /* -1 indicates default group */
-	cfg->group = group; /* 0 is default group */
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rss_rsp);
-	if (rc)
-		return rc;
-
-	if (alg_idx)
-		*alg_idx = rss_rsp->alg_idx;
-
-	return rc;
-}
-
-int
-otx2_nix_rss_hash_update(struct rte_eth_dev *eth_dev,
-			 struct rte_eth_rss_conf *rss_conf)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint8_t rss_hash_level;
-	uint32_t flowkey_cfg;
-	uint8_t alg_idx;
-	int rc;
-
-	rc = -EINVAL;
-
-	if (rss_conf->rss_key && rss_conf->rss_key_len != NIX_HASH_KEY_SIZE) {
-		otx2_err("Hash key size mismatch %d vs %d",
-			 rss_conf->rss_key_len, NIX_HASH_KEY_SIZE);
-		goto fail;
-	}
-
-	if (rss_conf->rss_key)
-		otx2_nix_rss_set_key(dev, rss_conf->rss_key,
-				     (uint32_t)rss_conf->rss_key_len);
-
-	rss_hash_level = RTE_ETH_RSS_LEVEL(rss_conf->rss_hf);
-	if (rss_hash_level)
-		rss_hash_level -= 1;
-	flowkey_cfg =
-		otx2_rss_ethdev_to_nix(dev, rss_conf->rss_hf, rss_hash_level);
-
-	rc = otx2_rss_set_hf(dev, flowkey_cfg, &alg_idx,
-			     NIX_DEFAULT_RSS_CTX_GROUP,
-			     NIX_DEFAULT_RSS_MCAM_IDX);
-	if (rc) {
-		otx2_err("Failed to set RSS hash function rc=%d", rc);
-		return rc;
-	}
-
-	dev->rss_info.alg_idx = alg_idx;
-
-fail:
-	return rc;
-}
-
-int
-otx2_nix_rss_hash_conf_get(struct rte_eth_dev *eth_dev,
-			   struct rte_eth_rss_conf *rss_conf)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	if (rss_conf->rss_key)
-		rss_get_key(dev, rss_conf->rss_key);
-
-	rss_conf->rss_key_len = NIX_HASH_KEY_SIZE;
-	rss_conf->rss_hf = dev->rss_info.nix_rss;
-
-	return 0;
-}
-
-int
-otx2_nix_rss_config(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint32_t idx, qcnt = eth_dev->data->nb_rx_queues;
-	uint8_t rss_hash_level;
-	uint32_t flowkey_cfg;
-	uint64_t rss_hf;
-	uint8_t alg_idx;
-	int rc;
-
-	/* Skip further configuration if selected mode is not RSS */
-	if (eth_dev->data->dev_conf.rxmode.mq_mode != RTE_ETH_MQ_RX_RSS || !qcnt)
-		return 0;
-
-	/* Update default RSS key and cfg */
-	otx2_nix_rss_set_key(dev, NULL, 0);
-
-	/* Update default RSS RETA */
-	for (idx = 0; idx < dev->rss_info.rss_size; idx++)
-		dev->rss_info.ind_tbl[idx] = idx % qcnt;
-
-	/* Init RSS table context */
-	rc = otx2_nix_rss_tbl_init(dev, 0, dev->rss_info.ind_tbl);
-	if (rc) {
-		otx2_err("Failed to init RSS table rc=%d", rc);
-		return rc;
-	}
-
-	rss_hf = eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf;
-	rss_hash_level = RTE_ETH_RSS_LEVEL(rss_hf);
-	if (rss_hash_level)
-		rss_hash_level -= 1;
-	flowkey_cfg = otx2_rss_ethdev_to_nix(dev, rss_hf, rss_hash_level);
-
-	rc = otx2_rss_set_hf(dev, flowkey_cfg, &alg_idx,
-			     NIX_DEFAULT_RSS_CTX_GROUP,
-			     NIX_DEFAULT_RSS_MCAM_IDX);
-	if (rc) {
-		otx2_err("Failed to set RSS hash function rc=%d", rc);
-		return rc;
-	}
-
-	dev->rss_info.alg_idx = alg_idx;
-
-	return 0;
-}
diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
deleted file mode 100644
index 5ee1aed786..0000000000
--- a/drivers/net/octeontx2/otx2_rx.c
+++ /dev/null
@@ -1,430 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_vect.h>
-
-#include "otx2_ethdev.h"
-#include "otx2_rx.h"
-
-#define NIX_DESCS_PER_LOOP	4
-#define CQE_CAST(x)		((struct nix_cqe_hdr_s *)(x))
-#define CQE_SZ(x)		((x) * NIX_CQ_ENTRY_SZ)
-
-static inline uint16_t
-nix_rx_nb_pkts(struct otx2_eth_rxq *rxq, const uint64_t wdata,
-	       const uint16_t pkts, const uint32_t qmask)
-{
-	uint32_t available = rxq->available;
-
-	/* Update the available count if cached value is not enough */
-	if (unlikely(available < pkts)) {
-		uint64_t reg, head, tail;
-
-		/* Use LDADDA version to avoid reorder */
-		reg = otx2_atomic64_add_sync(wdata, rxq->cq_status);
-		/* CQ_OP_STATUS operation error */
-		if (reg & BIT_ULL(CQ_OP_STAT_OP_ERR) ||
-		    reg & BIT_ULL(CQ_OP_STAT_CQ_ERR))
-			return 0;
-
-		tail = reg & 0xFFFFF;
-		head = (reg >> 20) & 0xFFFFF;
-		if (tail < head)
-			available = tail - head + qmask + 1;
-		else
-			available = tail - head;
-
-		rxq->available = available;
-	}
-
-	return RTE_MIN(pkts, available);
-}
-
-static __rte_always_inline uint16_t
-nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
-	      uint16_t pkts, const uint16_t flags)
-{
-	struct otx2_eth_rxq *rxq = rx_queue;
-	const uint64_t mbuf_init = rxq->mbuf_initializer;
-	const void *lookup_mem = rxq->lookup_mem;
-	const uint64_t data_off = rxq->data_off;
-	const uintptr_t desc = rxq->desc;
-	const uint64_t wdata = rxq->wdata;
-	const uint32_t qmask = rxq->qmask;
-	uint16_t packets = 0, nb_pkts;
-	uint32_t head = rxq->head;
-	struct nix_cqe_hdr_s *cq;
-	struct rte_mbuf *mbuf;
-
-	nb_pkts = nix_rx_nb_pkts(rxq, wdata, pkts, qmask);
-
-	while (packets < nb_pkts) {
-		/* Prefetch N desc ahead */
-		rte_prefetch_non_temporal((void *)(desc +
-					(CQE_SZ((head + 2) & qmask))));
-		cq = (struct nix_cqe_hdr_s *)(desc + CQE_SZ(head));
-
-		mbuf = nix_get_mbuf_from_cqe(cq, data_off);
-
-		otx2_nix_cqe_to_mbuf(cq, cq->tag, mbuf, lookup_mem, mbuf_init,
-				     flags);
-		otx2_nix_mbuf_to_tstamp(mbuf, rxq->tstamp, flags,
-				(uint64_t *)((uint8_t *)mbuf + data_off));
-		rx_pkts[packets++] = mbuf;
-		otx2_prefetch_store_keep(mbuf);
-		head++;
-		head &= qmask;
-	}
-
-	rxq->head = head;
-	rxq->available -= nb_pkts;
-
-	/* Free all the CQs that we've processed */
-	otx2_write64((wdata | nb_pkts), rxq->cq_door);
-
-	return nb_pkts;
-}
-
-#if defined(RTE_ARCH_ARM64)
-
-static __rte_always_inline uint64_t
-nix_vlan_update(const uint64_t w2, uint64_t ol_flags, uint8x16_t *f)
-{
-	if (w2 & BIT_ULL(21) /* vtag0_gone */) {
-		ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
-		*f = vsetq_lane_u16((uint16_t)(w2 >> 32), *f, 5);
-	}
-
-	return ol_flags;
-}
-
-static __rte_always_inline uint64_t
-nix_qinq_update(const uint64_t w2, uint64_t ol_flags, struct rte_mbuf *mbuf)
-{
-	if (w2 & BIT_ULL(23) /* vtag1_gone */) {
-		ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED;
-		mbuf->vlan_tci_outer = (uint16_t)(w2 >> 48);
-	}
-
-	return ol_flags;
-}
-
-static __rte_always_inline uint16_t
-nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
-		     uint16_t pkts, const uint16_t flags)
-{
-	struct otx2_eth_rxq *rxq = rx_queue; uint16_t packets = 0;
-	uint64x2_t cq0_w8, cq1_w8, cq2_w8, cq3_w8, mbuf01, mbuf23;
-	const uint64_t mbuf_initializer = rxq->mbuf_initializer;
-	const uint64x2_t data_off = vdupq_n_u64(rxq->data_off);
-	uint64_t ol_flags0, ol_flags1, ol_flags2, ol_flags3;
-	uint64x2_t rearm0 = vdupq_n_u64(mbuf_initializer);
-	uint64x2_t rearm1 = vdupq_n_u64(mbuf_initializer);
-	uint64x2_t rearm2 = vdupq_n_u64(mbuf_initializer);
-	uint64x2_t rearm3 = vdupq_n_u64(mbuf_initializer);
-	struct rte_mbuf *mbuf0, *mbuf1, *mbuf2, *mbuf3;
-	const uint16_t *lookup_mem = rxq->lookup_mem;
-	const uint32_t qmask = rxq->qmask;
-	const uint64_t wdata = rxq->wdata;
-	const uintptr_t desc = rxq->desc;
-	uint8x16_t f0, f1, f2, f3;
-	uint32_t head = rxq->head;
-	uint16_t pkts_left;
-
-	pkts = nix_rx_nb_pkts(rxq, wdata, pkts, qmask);
-	pkts_left = pkts & (NIX_DESCS_PER_LOOP - 1);
-
-	/* Packets has to be floor-aligned to NIX_DESCS_PER_LOOP */
-	pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);
-
-	while (packets < pkts) {
-		/* Exit loop if head is about to wrap and become unaligned */
-		if (((head + NIX_DESCS_PER_LOOP - 1) & qmask) <
-				NIX_DESCS_PER_LOOP) {
-			pkts_left += (pkts - packets);
-			break;
-		}
-
-		const uintptr_t cq0 = desc + CQE_SZ(head);
-
-		/* Prefetch N desc ahead */
-		rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(8)));
-		rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(9)));
-		rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(10)));
-		rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(11)));
-
-		/* Get NIX_RX_SG_S for size and buffer pointer */
-		cq0_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(0) + 64));
-		cq1_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(1) + 64));
-		cq2_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(2) + 64));
-		cq3_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(3) + 64));
-
-		/* Extract mbuf from NIX_RX_SG_S */
-		mbuf01 = vzip2q_u64(cq0_w8, cq1_w8);
-		mbuf23 = vzip2q_u64(cq2_w8, cq3_w8);
-		mbuf01 = vqsubq_u64(mbuf01, data_off);
-		mbuf23 = vqsubq_u64(mbuf23, data_off);
-
-		/* Move mbufs to scalar registers for future use */
-		mbuf0 = (struct rte_mbuf *)vgetq_lane_u64(mbuf01, 0);
-		mbuf1 = (struct rte_mbuf *)vgetq_lane_u64(mbuf01, 1);
-		mbuf2 = (struct rte_mbuf *)vgetq_lane_u64(mbuf23, 0);
-		mbuf3 = (struct rte_mbuf *)vgetq_lane_u64(mbuf23, 1);
-
-		/* Mask to get packet len from NIX_RX_SG_S */
-		const uint8x16_t shuf_msk = {
-			0xFF, 0xFF,   /* pkt_type set as unknown */
-			0xFF, 0xFF,   /* pkt_type set as unknown */
-			0, 1,         /* octet 1~0, low 16 bits pkt_len */
-			0xFF, 0xFF,   /* skip high 16 bits pkt_len, zero out */
-			0, 1,         /* octet 1~0, 16 bits data_len */
-			0xFF, 0xFF,
-			0xFF, 0xFF, 0xFF, 0xFF
-			};
-
-		/* Form the rx_descriptor_fields1 with pkt_len and data_len */
-		f0 = vqtbl1q_u8(cq0_w8, shuf_msk);
-		f1 = vqtbl1q_u8(cq1_w8, shuf_msk);
-		f2 = vqtbl1q_u8(cq2_w8, shuf_msk);
-		f3 = vqtbl1q_u8(cq3_w8, shuf_msk);
-
-		/* Load CQE word0 and word 1 */
-		uint64_t cq0_w0 = ((uint64_t *)(cq0 + CQE_SZ(0)))[0];
-		uint64_t cq0_w1 = ((uint64_t *)(cq0 + CQE_SZ(0)))[1];
-		uint64_t cq1_w0 = ((uint64_t *)(cq0 + CQE_SZ(1)))[0];
-		uint64_t cq1_w1 = ((uint64_t *)(cq0 + CQE_SZ(1)))[1];
-		uint64_t cq2_w0 = ((uint64_t *)(cq0 + CQE_SZ(2)))[0];
-		uint64_t cq2_w1 = ((uint64_t *)(cq0 + CQE_SZ(2)))[1];
-		uint64_t cq3_w0 = ((uint64_t *)(cq0 + CQE_SZ(3)))[0];
-		uint64_t cq3_w1 = ((uint64_t *)(cq0 + CQE_SZ(3)))[1];
-
-		if (flags & NIX_RX_OFFLOAD_RSS_F) {
-			/* Fill rss in the rx_descriptor_fields1 */
-			f0 = vsetq_lane_u32(cq0_w0, f0, 3);
-			f1 = vsetq_lane_u32(cq1_w0, f1, 3);
-			f2 = vsetq_lane_u32(cq2_w0, f2, 3);
-			f3 = vsetq_lane_u32(cq3_w0, f3, 3);
-			ol_flags0 = RTE_MBUF_F_RX_RSS_HASH;
-			ol_flags1 = RTE_MBUF_F_RX_RSS_HASH;
-			ol_flags2 = RTE_MBUF_F_RX_RSS_HASH;
-			ol_flags3 = RTE_MBUF_F_RX_RSS_HASH;
-		} else {
-			ol_flags0 = 0; ol_flags1 = 0;
-			ol_flags2 = 0; ol_flags3 = 0;
-		}
-
-		if (flags & NIX_RX_OFFLOAD_PTYPE_F) {
-			/* Fill packet_type in the rx_descriptor_fields1 */
-			f0 = vsetq_lane_u32(nix_ptype_get(lookup_mem, cq0_w1),
-					    f0, 0);
-			f1 = vsetq_lane_u32(nix_ptype_get(lookup_mem, cq1_w1),
-					    f1, 0);
-			f2 = vsetq_lane_u32(nix_ptype_get(lookup_mem, cq2_w1),
-					    f2, 0);
-			f3 = vsetq_lane_u32(nix_ptype_get(lookup_mem, cq3_w1),
-					    f3, 0);
-		}
-
-		if (flags & NIX_RX_OFFLOAD_CHECKSUM_F) {
-			ol_flags0 |= nix_rx_olflags_get(lookup_mem, cq0_w1);
-			ol_flags1 |= nix_rx_olflags_get(lookup_mem, cq1_w1);
-			ol_flags2 |= nix_rx_olflags_get(lookup_mem, cq2_w1);
-			ol_flags3 |= nix_rx_olflags_get(lookup_mem, cq3_w1);
-		}
-
-		if (flags & NIX_RX_OFFLOAD_VLAN_STRIP_F) {
-			uint64_t cq0_w2 = *(uint64_t *)(cq0 + CQE_SZ(0) + 16);
-			uint64_t cq1_w2 = *(uint64_t *)(cq0 + CQE_SZ(1) + 16);
-			uint64_t cq2_w2 = *(uint64_t *)(cq0 + CQE_SZ(2) + 16);
-			uint64_t cq3_w2 = *(uint64_t *)(cq0 + CQE_SZ(3) + 16);
-
-			ol_flags0 = nix_vlan_update(cq0_w2, ol_flags0, &f0);
-			ol_flags1 = nix_vlan_update(cq1_w2, ol_flags1, &f1);
-			ol_flags2 = nix_vlan_update(cq2_w2, ol_flags2, &f2);
-			ol_flags3 = nix_vlan_update(cq3_w2, ol_flags3, &f3);
-
-			ol_flags0 = nix_qinq_update(cq0_w2, ol_flags0, mbuf0);
-			ol_flags1 = nix_qinq_update(cq1_w2, ol_flags1, mbuf1);
-			ol_flags2 = nix_qinq_update(cq2_w2, ol_flags2, mbuf2);
-			ol_flags3 = nix_qinq_update(cq3_w2, ol_flags3, mbuf3);
-		}
-
-		if (flags & NIX_RX_OFFLOAD_MARK_UPDATE_F) {
-			ol_flags0 = nix_update_match_id(*(uint16_t *)
-				    (cq0 + CQE_SZ(0) + 38), ol_flags0, mbuf0);
-			ol_flags1 = nix_update_match_id(*(uint16_t *)
-				    (cq0 + CQE_SZ(1) + 38), ol_flags1, mbuf1);
-			ol_flags2 = nix_update_match_id(*(uint16_t *)
-				    (cq0 + CQE_SZ(2) + 38), ol_flags2, mbuf2);
-			ol_flags3 = nix_update_match_id(*(uint16_t *)
-				    (cq0 + CQE_SZ(3) + 38), ol_flags3, mbuf3);
-		}
-
-		/* Form rearm_data with ol_flags */
-		rearm0 = vsetq_lane_u64(ol_flags0, rearm0, 1);
-		rearm1 = vsetq_lane_u64(ol_flags1, rearm1, 1);
-		rearm2 = vsetq_lane_u64(ol_flags2, rearm2, 1);
-		rearm3 = vsetq_lane_u64(ol_flags3, rearm3, 1);
-
-		/* Update rx_descriptor_fields1 */
-		vst1q_u64((uint64_t *)mbuf0->rx_descriptor_fields1, f0);
-		vst1q_u64((uint64_t *)mbuf1->rx_descriptor_fields1, f1);
-		vst1q_u64((uint64_t *)mbuf2->rx_descriptor_fields1, f2);
-		vst1q_u64((uint64_t *)mbuf3->rx_descriptor_fields1, f3);
-
-		/* Update rearm_data */
-		vst1q_u64((uint64_t *)mbuf0->rearm_data, rearm0);
-		vst1q_u64((uint64_t *)mbuf1->rearm_data, rearm1);
-		vst1q_u64((uint64_t *)mbuf2->rearm_data, rearm2);
-		vst1q_u64((uint64_t *)mbuf3->rearm_data, rearm3);
-
-		/* Update that no more segments */
-		mbuf0->next = NULL;
-		mbuf1->next = NULL;
-		mbuf2->next = NULL;
-		mbuf3->next = NULL;
-
-		/* Store the mbufs to rx_pkts */
-		vst1q_u64((uint64_t *)&rx_pkts[packets], mbuf01);
-		vst1q_u64((uint64_t *)&rx_pkts[packets + 2], mbuf23);
-
-		/* Prefetch mbufs */
-		otx2_prefetch_store_keep(mbuf0);
-		otx2_prefetch_store_keep(mbuf1);
-		otx2_prefetch_store_keep(mbuf2);
-		otx2_prefetch_store_keep(mbuf3);
-
-		/* Mark mempool obj as "get" as it is alloc'ed by NIX */
-		RTE_MEMPOOL_CHECK_COOKIES(mbuf0->pool, (void **)&mbuf0, 1, 1);
-		RTE_MEMPOOL_CHECK_COOKIES(mbuf1->pool, (void **)&mbuf1, 1, 1);
-		RTE_MEMPOOL_CHECK_COOKIES(mbuf2->pool, (void **)&mbuf2, 1, 1);
-		RTE_MEMPOOL_CHECK_COOKIES(mbuf3->pool, (void **)&mbuf3, 1, 1);
-
-		/* Advance head pointer and packets */
-		head += NIX_DESCS_PER_LOOP; head &= qmask;
-		packets += NIX_DESCS_PER_LOOP;
-	}
-
-	rxq->head = head;
-	rxq->available -= packets;
-
-	rte_io_wmb();
-	/* Free all the CQs that we've processed */
-	otx2_write64((rxq->wdata | packets), rxq->cq_door);
-
-	if (unlikely(pkts_left))
-		packets += nix_recv_pkts(rx_queue, &rx_pkts[packets],
-					 pkts_left, flags);
-
-	return packets;
-}
-
-#else
-
-static inline uint16_t
-nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
-		     uint16_t pkts, const uint16_t flags)
-{
-	RTE_SET_USED(rx_queue);
-	RTE_SET_USED(rx_pkts);
-	RTE_SET_USED(pkts);
-	RTE_SET_USED(flags);
-
-	return 0;
-}
-
-#endif
-
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			       \
-static uint16_t __rte_noinline	__rte_hot					       \
-otx2_nix_recv_pkts_ ## name(void *rx_queue,				       \
-			struct rte_mbuf **rx_pkts, uint16_t pkts)	       \
-{									       \
-	return nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));		       \
-}									       \
-									       \
-static uint16_t __rte_noinline	__rte_hot					       \
-otx2_nix_recv_pkts_mseg_ ## name(void *rx_queue,			       \
-			struct rte_mbuf **rx_pkts, uint16_t pkts)	       \
-{									       \
-	return nix_recv_pkts(rx_queue, rx_pkts, pkts,			       \
-			     (flags) | NIX_RX_MULTI_SEG_F);		       \
-}									       \
-									       \
-static uint16_t __rte_noinline	__rte_hot					       \
-otx2_nix_recv_pkts_vec_ ## name(void *rx_queue,				       \
-			struct rte_mbuf **rx_pkts, uint16_t pkts)	       \
-{									       \
-	/* TSTMP is not supported by vector */				       \
-	if ((flags) & NIX_RX_OFFLOAD_TSTAMP_F)				       \
-		return 0;						       \
-	return nix_recv_pkts_vector(rx_queue, rx_pkts, pkts, (flags));	       \
-}									       \
-
-NIX_RX_FASTPATH_MODES
-#undef R
-
-static inline void
-pick_rx_func(struct rte_eth_dev *eth_dev,
-	     const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2])
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	/* [SEC] [TSTMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
-	eth_dev->rx_pkt_burst = rx_burst
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_PTYPE_F)]
-		[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_RSS_F)];
-}
-
-void
-otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-	[f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_ ## name,
-
-NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-	[f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_mseg_ ## name,
-
-NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = {
-#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)			\
-	[f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_vec_ ## name,
-
-NIX_RX_FASTPATH_MODES
-#undef R
-	};
-
-	/* For PTP enabled, scalar rx function should be chosen as most of the
-	 * PTP apps are implemented to rx burst 1 pkt.
-	 */
-	if (dev->scalar_ena || dev->rx_offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)
-		pick_rx_func(eth_dev, nix_eth_rx_burst);
-	else
-		pick_rx_func(eth_dev, nix_eth_rx_vec_burst);
-
-	if (dev->rx_offloads & RTE_ETH_RX_OFFLOAD_SCATTER)
-		pick_rx_func(eth_dev, nix_eth_rx_burst_mseg);
-
-	/* Copy multi seg version with no offload for tear down sequence */
-	if (rte_eal_process_type() == RTE_PROC_PRIMARY)
-		dev->rx_pkt_burst_no_offload =
-			nix_eth_rx_burst_mseg[0][0][0][0][0][0][0];
-	rte_mb();
-}
diff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h
deleted file mode 100644
index 98406244e2..0000000000
--- a/drivers/net/octeontx2/otx2_rx.h
+++ /dev/null
@@ -1,583 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_RX_H__
-#define __OTX2_RX_H__
-
-#include <rte_ether.h>
-
-#include "otx2_common.h"
-#include "otx2_ethdev_sec.h"
-#include "otx2_ipsec_anti_replay.h"
-#include "otx2_ipsec_fp.h"
-
-/* Default mark value used when none is provided. */
-#define OTX2_FLOW_ACTION_FLAG_DEFAULT	0xffff
-
-#define PTYPE_NON_TUNNEL_WIDTH		16
-#define PTYPE_TUNNEL_WIDTH		12
-#define PTYPE_NON_TUNNEL_ARRAY_SZ	BIT(PTYPE_NON_TUNNEL_WIDTH)
-#define PTYPE_TUNNEL_ARRAY_SZ		BIT(PTYPE_TUNNEL_WIDTH)
-#define PTYPE_ARRAY_SZ			((PTYPE_NON_TUNNEL_ARRAY_SZ +\
-					 PTYPE_TUNNEL_ARRAY_SZ) *\
-					 sizeof(uint16_t))
-
-#define NIX_RX_OFFLOAD_NONE            (0)
-#define NIX_RX_OFFLOAD_RSS_F           BIT(0)
-#define NIX_RX_OFFLOAD_PTYPE_F         BIT(1)
-#define NIX_RX_OFFLOAD_CHECKSUM_F      BIT(2)
-#define NIX_RX_OFFLOAD_VLAN_STRIP_F    BIT(3)
-#define NIX_RX_OFFLOAD_MARK_UPDATE_F   BIT(4)
-#define NIX_RX_OFFLOAD_TSTAMP_F        BIT(5)
-#define NIX_RX_OFFLOAD_SECURITY_F      BIT(6)
-
-/* Flags to control cqe_to_mbuf conversion function.
- * Defining it from backwards to denote its been
- * not used as offload flags to pick function
- */
-#define NIX_RX_MULTI_SEG_F            BIT(15)
-#define NIX_TIMESYNC_RX_OFFSET		8
-
-/* Inline IPsec offsets */
-
-/* nix_cqe_hdr_s + nix_rx_parse_s + nix_rx_sg_s + nix_iova_s */
-#define INLINE_CPT_RESULT_OFFSET	80
-
-struct otx2_timesync_info {
-	uint64_t	rx_tstamp;
-	rte_iova_t	tx_tstamp_iova;
-	uint64_t	*tx_tstamp;
-	uint64_t	rx_tstamp_dynflag;
-	int		tstamp_dynfield_offset;
-	uint8_t		tx_ready;
-	uint8_t		rx_ready;
-} __rte_cache_aligned;
-
-union mbuf_initializer {
-	struct {
-		uint16_t data_off;
-		uint16_t refcnt;
-		uint16_t nb_segs;
-		uint16_t port;
-	} fields;
-	uint64_t value;
-};
-
-static inline rte_mbuf_timestamp_t *
-otx2_timestamp_dynfield(struct rte_mbuf *mbuf,
-		struct otx2_timesync_info *info)
-{
-	return RTE_MBUF_DYNFIELD(mbuf,
-		info->tstamp_dynfield_offset, rte_mbuf_timestamp_t *);
-}
-
-static __rte_always_inline void
-otx2_nix_mbuf_to_tstamp(struct rte_mbuf *mbuf,
-			struct otx2_timesync_info *tstamp, const uint16_t flag,
-			uint64_t *tstamp_ptr)
-{
-	if ((flag & NIX_RX_OFFLOAD_TSTAMP_F) &&
-	    (mbuf->data_off == RTE_PKTMBUF_HEADROOM +
-	     NIX_TIMESYNC_RX_OFFSET)) {
-
-		mbuf->pkt_len -= NIX_TIMESYNC_RX_OFFSET;
-
-		/* Reading the rx timestamp inserted by CGX, viz at
-		 * starting of the packet data.
-		 */
-		*otx2_timestamp_dynfield(mbuf, tstamp) =
-				rte_be_to_cpu_64(*tstamp_ptr);
-		/* RTE_MBUF_F_RX_IEEE1588_TMST flag needs to be set only in case
-		 * PTP packets are received.
-		 */
-		if (mbuf->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) {
-			tstamp->rx_tstamp =
-					*otx2_timestamp_dynfield(mbuf, tstamp);
-			tstamp->rx_ready = 1;
-			mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP |
-				RTE_MBUF_F_RX_IEEE1588_TMST |
-				tstamp->rx_tstamp_dynflag;
-		}
-	}
-}
-
-static __rte_always_inline uint64_t
-nix_clear_data_off(uint64_t oldval)
-{
-	union mbuf_initializer mbuf_init = { .value = oldval };
-
-	mbuf_init.fields.data_off = 0;
-	return mbuf_init.value;
-}
-
-static __rte_always_inline struct rte_mbuf *
-nix_get_mbuf_from_cqe(void *cq, const uint64_t data_off)
-{
-	rte_iova_t buff;
-
-	/* Skip CQE, NIX_RX_PARSE_S and SG HDR(9 DWORDs) and peek buff addr */
-	buff = *((rte_iova_t *)((uint64_t *)cq + 9));
-	return (struct rte_mbuf *)(buff - data_off);
-}
-
-
-static __rte_always_inline uint32_t
-nix_ptype_get(const void * const lookup_mem, const uint64_t in)
-{
-	const uint16_t * const ptype = lookup_mem;
-	const uint16_t lh_lg_lf = (in & 0xFFF0000000000000) >> 52;
-	const uint16_t tu_l2 = ptype[(in & 0x000FFFF000000000) >> 36];
-	const uint16_t il4_tu = ptype[PTYPE_NON_TUNNEL_ARRAY_SZ + lh_lg_lf];
-
-	return (il4_tu << PTYPE_NON_TUNNEL_WIDTH) | tu_l2;
-}
-
-static __rte_always_inline uint32_t
-nix_rx_olflags_get(const void * const lookup_mem, const uint64_t in)
-{
-	const uint32_t * const ol_flags = (const uint32_t *)
-			((const uint8_t *)lookup_mem + PTYPE_ARRAY_SZ);
-
-	return ol_flags[(in & 0xfff00000) >> 20];
-}
-
-static inline uint64_t
-nix_update_match_id(const uint16_t match_id, uint64_t ol_flags,
-		    struct rte_mbuf *mbuf)
-{
-	/* There is no separate bit to check match_id
-	 * is valid or not? and no flag to identify it is an
-	 * RTE_FLOW_ACTION_TYPE_FLAG vs RTE_FLOW_ACTION_TYPE_MARK
-	 * action. The former case addressed through 0 being invalid
-	 * value and inc/dec match_id pair when MARK is activated.
-	 * The later case addressed through defining
-	 * OTX2_FLOW_MARK_DEFAULT as value for
-	 * RTE_FLOW_ACTION_TYPE_MARK.
-	 * This would translate to not use
-	 * OTX2_FLOW_ACTION_FLAG_DEFAULT - 1 and
-	 * OTX2_FLOW_ACTION_FLAG_DEFAULT for match_id.
-	 * i.e valid mark_id's are from
-	 * 0 to OTX2_FLOW_ACTION_FLAG_DEFAULT - 2
-	 */
-	if (likely(match_id)) {
-		ol_flags |= RTE_MBUF_F_RX_FDIR;
-		if (match_id != OTX2_FLOW_ACTION_FLAG_DEFAULT) {
-			ol_flags |= RTE_MBUF_F_RX_FDIR_ID;
-			mbuf->hash.fdir.hi = match_id - 1;
-		}
-	}
-
-	return ol_flags;
-}
-
-static __rte_always_inline void
-nix_cqe_xtract_mseg(const struct nix_rx_parse_s *rx,
-		    struct rte_mbuf *mbuf, uint64_t rearm)
-{
-	const rte_iova_t *iova_list;
-	struct rte_mbuf *head;
-	const rte_iova_t *eol;
-	uint8_t nb_segs;
-	uint64_t sg;
-
-	sg = *(const uint64_t *)(rx + 1);
-	nb_segs = (sg >> 48) & 0x3;
-	mbuf->nb_segs = nb_segs;
-	mbuf->data_len = sg & 0xFFFF;
-	sg = sg >> 16;
-
-	eol = ((const rte_iova_t *)(rx + 1) + ((rx->desc_sizem1 + 1) << 1));
-	/* Skip SG_S and first IOVA*/
-	iova_list = ((const rte_iova_t *)(rx + 1)) + 2;
-	nb_segs--;
-
-	rearm = rearm & ~0xFFFF;
-
-	head = mbuf;
-	while (nb_segs) {
-		mbuf->next = ((struct rte_mbuf *)*iova_list) - 1;
-		mbuf = mbuf->next;
-
-		RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1);
-
-		mbuf->data_len = sg & 0xFFFF;
-		sg = sg >> 16;
-		*(uint64_t *)(&mbuf->rearm_data) = rearm;
-		nb_segs--;
-		iova_list++;
-
-		if (!nb_segs && (iova_list + 1 < eol)) {
-			sg = *(const uint64_t *)(iova_list);
-			nb_segs = (sg >> 48) & 0x3;
-			head->nb_segs += nb_segs;
-			iova_list = (const rte_iova_t *)(iova_list + 1);
-		}
-	}
-	mbuf->next = NULL;
-}
-
-static __rte_always_inline uint16_t
-nix_rx_sec_cptres_get(const void *cq)
-{
-	volatile const struct otx2_cpt_res *res;
-
-	res = (volatile const struct otx2_cpt_res *)((const char *)cq +
-			INLINE_CPT_RESULT_OFFSET);
-
-	return res->u16[0];
-}
-
-static __rte_always_inline void *
-nix_rx_sec_sa_get(const void * const lookup_mem, int spi, uint16_t port)
-{
-	const uint64_t *const *sa_tbl = (const uint64_t * const *)
-			((const uint8_t *)lookup_mem + OTX2_NIX_SA_TBL_START);
-
-	return (void *)sa_tbl[port][spi];
-}
-
-static __rte_always_inline uint64_t
-nix_rx_sec_mbuf_update(const struct nix_rx_parse_s *rx,
-		       const struct nix_cqe_hdr_s *cq, struct rte_mbuf *m,
-		       const void * const lookup_mem)
-{
-	uint8_t *l2_ptr, *l3_ptr, *l2_ptr_actual, *l3_ptr_actual;
-	struct otx2_ipsec_fp_in_sa *sa;
-	uint16_t m_len, l2_len, ip_len;
-	struct rte_ipv6_hdr *ip6h;
-	struct rte_ipv4_hdr *iph;
-	uint16_t *ether_type;
-	uint32_t spi;
-	int i;
-
-	if (unlikely(nix_rx_sec_cptres_get(cq) != OTX2_SEC_COMP_GOOD))
-		return RTE_MBUF_F_RX_SEC_OFFLOAD | RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED;
-
-	/* 20 bits of tag would have the SPI */
-	spi = cq->tag & 0xFFFFF;
-
-	sa = nix_rx_sec_sa_get(lookup_mem, spi, m->port);
-	*rte_security_dynfield(m) = sa->udata64;
-
-	l2_ptr = rte_pktmbuf_mtod(m, uint8_t *);
-	l2_len = rx->lcptr - rx->laptr;
-	l3_ptr = RTE_PTR_ADD(l2_ptr, l2_len);
-
-	if (sa->replay_win_sz) {
-		if (cpt_ipsec_ip_antireplay_check(sa, l3_ptr) < 0)
-			return RTE_MBUF_F_RX_SEC_OFFLOAD | RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED;
-	}
-
-	l2_ptr_actual = RTE_PTR_ADD(l2_ptr,
-				    sizeof(struct otx2_ipsec_fp_res_hdr));
-	l3_ptr_actual = RTE_PTR_ADD(l3_ptr,
-				    sizeof(struct otx2_ipsec_fp_res_hdr));
-
-	for (i = l2_len - RTE_ETHER_TYPE_LEN - 1; i >= 0; i--)
-		l2_ptr_actual[i] = l2_ptr[i];
-
-	m->data_off += sizeof(struct otx2_ipsec_fp_res_hdr);
-
-	ether_type = RTE_PTR_SUB(l3_ptr_actual, RTE_ETHER_TYPE_LEN);
-
-	iph = (struct rte_ipv4_hdr *)l3_ptr_actual;
-	if ((iph->version_ihl >> 4) == 4) {
-		ip_len = rte_be_to_cpu_16(iph->total_length);
-		*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4);
-	} else {
-		ip6h = (struct rte_ipv6_hdr *)iph;
-		ip_len = rte_be_to_cpu_16(ip6h->payload_len);
-		*ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6);
-	}
-
-	m_len = ip_len + l2_len;
-	m->data_len = m_len;
-	m->pkt_len = m_len;
-	return RTE_MBUF_F_RX_SEC_OFFLOAD;
-}
-
-static __rte_always_inline void
-otx2_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
-		     struct rte_mbuf *mbuf, const void *lookup_mem,
-		     const uint64_t val, const uint16_t flag)
-{
-	const struct nix_rx_parse_s *rx =
-		 (const struct nix_rx_parse_s *)((const uint64_t *)cq + 1);
-	const uint64_t w1 = *(const uint64_t *)rx;
-	const uint16_t len = rx->pkt_lenm1 + 1;
-	uint64_t ol_flags = 0;
-
-	/* Mark mempool obj as "get" as it is alloc'ed by NIX */
-	RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1);
-
-	if (flag & NIX_RX_OFFLOAD_PTYPE_F)
-		mbuf->packet_type = nix_ptype_get(lookup_mem, w1);
-	else
-		mbuf->packet_type = 0;
-
-	if (flag & NIX_RX_OFFLOAD_RSS_F) {
-		mbuf->hash.rss = tag;
-		ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
-	}
-
-	if (flag & NIX_RX_OFFLOAD_CHECKSUM_F)
-		ol_flags |= nix_rx_olflags_get(lookup_mem, w1);
-
-	if (flag & NIX_RX_OFFLOAD_VLAN_STRIP_F) {
-		if (rx->vtag0_gone) {
-			ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
-			mbuf->vlan_tci = rx->vtag0_tci;
-		}
-		if (rx->vtag1_gone) {
-			ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED;
-			mbuf->vlan_tci_outer = rx->vtag1_tci;
-		}
-	}
-
-	if (flag & NIX_RX_OFFLOAD_MARK_UPDATE_F)
-		ol_flags = nix_update_match_id(rx->match_id, ol_flags, mbuf);
-
-	if ((flag & NIX_RX_OFFLOAD_SECURITY_F) &&
-	    cq->cqe_type == NIX_XQE_TYPE_RX_IPSECH) {
-		*(uint64_t *)(&mbuf->rearm_data) = val;
-		ol_flags |= nix_rx_sec_mbuf_update(rx, cq, mbuf, lookup_mem);
-		mbuf->ol_flags = ol_flags;
-		return;
-	}
-
-	mbuf->ol_flags = ol_flags;
-	*(uint64_t *)(&mbuf->rearm_data) = val;
-	mbuf->pkt_len = len;
-
-	if (flag & NIX_RX_MULTI_SEG_F) {
-		nix_cqe_xtract_mseg(rx, mbuf, val);
-	} else {
-		mbuf->data_len = len;
-		mbuf->next = NULL;
-	}
-}
-
-#define CKSUM_F NIX_RX_OFFLOAD_CHECKSUM_F
-#define PTYPE_F NIX_RX_OFFLOAD_PTYPE_F
-#define RSS_F	NIX_RX_OFFLOAD_RSS_F
-#define RX_VLAN_F  NIX_RX_OFFLOAD_VLAN_STRIP_F
-#define MARK_F  NIX_RX_OFFLOAD_MARK_UPDATE_F
-#define TS_F	NIX_RX_OFFLOAD_TSTAMP_F
-#define RX_SEC_F   NIX_RX_OFFLOAD_SECURITY_F
-
-/* [SEC] [TSMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
-#define NIX_RX_FASTPATH_MODES						       \
-R(no_offload,			0, 0, 0, 0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)      \
-R(rss,				0, 0, 0, 0, 0, 0, 1, RSS_F)		       \
-R(ptype,			0, 0, 0, 0, 0, 1, 0, PTYPE_F)		       \
-R(ptype_rss,			0, 0, 0, 0, 0, 1, 1, PTYPE_F | RSS_F)	       \
-R(cksum,			0, 0, 0, 0, 1, 0, 0, CKSUM_F)		       \
-R(cksum_rss,			0, 0, 0, 0, 1, 0, 1, CKSUM_F | RSS_F)	       \
-R(cksum_ptype,			0, 0, 0, 0, 1, 1, 0, CKSUM_F | PTYPE_F)	       \
-R(cksum_ptype_rss,		0, 0, 0, 0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F)\
-R(vlan,				0, 0, 0, 1, 0, 0, 0, RX_VLAN_F)		       \
-R(vlan_rss,			0, 0, 0, 1, 0, 0, 1, RX_VLAN_F | RSS_F)	       \
-R(vlan_ptype,			0, 0, 0, 1, 0, 1, 0, RX_VLAN_F | PTYPE_F)      \
-R(vlan_ptype_rss,		0, 0, 0, 1, 0, 1, 1,			       \
-			RX_VLAN_F | PTYPE_F | RSS_F)			       \
-R(vlan_cksum,			0, 0, 0, 1, 1, 0, 0, RX_VLAN_F | CKSUM_F)      \
-R(vlan_cksum_rss,		0, 0, 0, 1, 1, 0, 1,			       \
-			RX_VLAN_F | CKSUM_F | RSS_F)			       \
-R(vlan_cksum_ptype,		0, 0, 0, 1, 1, 1, 0,			       \
-			RX_VLAN_F | CKSUM_F | PTYPE_F)			       \
-R(vlan_cksum_ptype_rss,		0, 0, 0, 1, 1, 1, 1,			       \
-			RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)		       \
-R(mark,				0, 0, 1, 0, 0, 0, 0, MARK_F)		       \
-R(mark_rss,			0, 0, 1, 0, 0, 0, 1, MARK_F | RSS_F)	       \
-R(mark_ptype,			0, 0, 1, 0, 0, 1, 0, MARK_F | PTYPE_F)	       \
-R(mark_ptype_rss,		0, 0, 1, 0, 0, 1, 1, MARK_F | PTYPE_F | RSS_F) \
-R(mark_cksum,			0, 0, 1, 0, 1, 0, 0, MARK_F | CKSUM_F)	       \
-R(mark_cksum_rss,		0, 0, 1, 0, 1, 0, 1, MARK_F | CKSUM_F | RSS_F) \
-R(mark_cksum_ptype,		0, 0, 1, 0, 1, 1, 0,			       \
-			MARK_F | CKSUM_F | PTYPE_F)			       \
-R(mark_cksum_ptype_rss,		0, 0, 1, 0, 1, 1, 1,			       \
-			MARK_F | CKSUM_F | PTYPE_F | RSS_F)		       \
-R(mark_vlan,			0, 0, 1, 1, 0, 0, 0, MARK_F | RX_VLAN_F)       \
-R(mark_vlan_rss,		0, 0, 1, 1, 0, 0, 1,			       \
-			MARK_F | RX_VLAN_F | RSS_F)			       \
-R(mark_vlan_ptype,		0, 0, 1, 1, 0, 1, 0,			       \
-			MARK_F | RX_VLAN_F | PTYPE_F)			       \
-R(mark_vlan_ptype_rss,		0, 0, 1, 1, 0, 1, 1,			       \
-			MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)		       \
-R(mark_vlan_cksum,		0, 0, 1, 1, 1, 0, 0,			       \
-			MARK_F | RX_VLAN_F | CKSUM_F)			       \
-R(mark_vlan_cksum_rss,		0, 0, 1, 1, 1, 0, 1,			       \
-			MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)		       \
-R(mark_vlan_cksum_ptype,	0, 0, 1, 1, 1, 1, 0,			       \
-			MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)		       \
-R(mark_vlan_cksum_ptype_rss,	0, 0, 1, 1, 1, 1, 1,			       \
-			MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)	       \
-R(ts,				0, 1, 0, 0, 0, 0, 0, TS_F)		       \
-R(ts_rss,			0, 1, 0, 0, 0, 0, 1, TS_F | RSS_F)	       \
-R(ts_ptype,			0, 1, 0, 0, 0, 1, 0, TS_F | PTYPE_F)	       \
-R(ts_ptype_rss,			0, 1, 0, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F)   \
-R(ts_cksum,			0, 1, 0, 0, 1, 0, 0, TS_F | CKSUM_F)	       \
-R(ts_cksum_rss,			0, 1, 0, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F)   \
-R(ts_cksum_ptype,		0, 1, 0, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F) \
-R(ts_cksum_ptype_rss,		0, 1, 0, 0, 1, 1, 1,			       \
-			TS_F | CKSUM_F | PTYPE_F | RSS_F)		       \
-R(ts_vlan,			0, 1, 0, 1, 0, 0, 0, TS_F | RX_VLAN_F)	       \
-R(ts_vlan_rss,			0, 1, 0, 1, 0, 0, 1, TS_F | RX_VLAN_F | RSS_F) \
-R(ts_vlan_ptype,		0, 1, 0, 1, 0, 1, 0,			       \
-			TS_F | RX_VLAN_F | PTYPE_F)			       \
-R(ts_vlan_ptype_rss,		0, 1, 0, 1, 0, 1, 1,			       \
-			TS_F | RX_VLAN_F | PTYPE_F | RSS_F)		       \
-R(ts_vlan_cksum,		0, 1, 0, 1, 1, 0, 0,			       \
-			TS_F | RX_VLAN_F | CKSUM_F)			       \
-R(ts_vlan_cksum_rss,		0, 1, 0, 1, 1, 0, 1,			       \
-			MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)		       \
-R(ts_vlan_cksum_ptype,		0, 1, 0, 1, 1, 1, 0,			       \
-			TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F)		       \
-R(ts_vlan_cksum_ptype_rss,	0, 1, 0, 1, 1, 1, 1,			       \
-			TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)	       \
-R(ts_mark,			0, 1, 1, 0, 0, 0, 0, TS_F | MARK_F)	       \
-R(ts_mark_rss,			0, 1, 1, 0, 0, 0, 1, TS_F | MARK_F | RSS_F)    \
-R(ts_mark_ptype,		0, 1, 1, 0, 0, 1, 0, TS_F | MARK_F | PTYPE_F)  \
-R(ts_mark_ptype_rss,		0, 1, 1, 0, 0, 1, 1,			       \
-			TS_F | MARK_F | PTYPE_F | RSS_F)		       \
-R(ts_mark_cksum,		0, 1, 1, 0, 1, 0, 0, TS_F | MARK_F | CKSUM_F)  \
-R(ts_mark_cksum_rss,		0, 1, 1, 0, 1, 0, 1,			       \
-			TS_F | MARK_F | CKSUM_F | RSS_F)		       \
-R(ts_mark_cksum_ptype,		0, 1, 1, 0, 1, 1, 0,			       \
-			TS_F | MARK_F | CKSUM_F | PTYPE_F)		       \
-R(ts_mark_cksum_ptype_rss,	0, 1, 1, 0, 1, 1, 1,			       \
-			TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)	       \
-R(ts_mark_vlan,			0, 1, 1, 1, 0, 0, 0, TS_F | MARK_F | RX_VLAN_F)\
-R(ts_mark_vlan_rss,		0, 1, 1, 1, 0, 0, 1,			       \
-			TS_F | MARK_F | RX_VLAN_F | RSS_F)		       \
-R(ts_mark_vlan_ptype,		0, 1, 1, 1, 0, 1, 0,			       \
-			TS_F | MARK_F | RX_VLAN_F | PTYPE_F)		       \
-R(ts_mark_vlan_ptype_rss,	0, 1, 1, 1, 0, 1, 1,			       \
-			TS_F | MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)	       \
-R(ts_mark_vlan_cksum_ptype,	0, 1, 1, 1, 1, 1, 0,			       \
-			TS_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)	       \
-R(ts_mark_vlan_cksum_ptype_rss,	0, 1, 1, 1, 1, 1, 1,			       \
-			TS_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F) \
-R(sec,				1, 0, 0, 0, 0, 0, 0, RX_SEC_F)		       \
-R(sec_rss,			1, 0, 0, 0, 0, 0, 1, RX_SEC_F | RSS_F)	       \
-R(sec_ptype,			1, 0, 0, 0, 0, 1, 0, RX_SEC_F | PTYPE_F)       \
-R(sec_ptype_rss,		1, 0, 0, 0, 0, 1, 1,			       \
-			RX_SEC_F | PTYPE_F | RSS_F)			       \
-R(sec_cksum,			1, 0, 0, 0, 1, 0, 0, RX_SEC_F | CKSUM_F)       \
-R(sec_cksum_rss,		1, 0, 0, 0, 1, 0, 1,			       \
-			RX_SEC_F | CKSUM_F | RSS_F)			       \
-R(sec_cksum_ptype,		1, 0, 0, 0, 1, 1, 0,			       \
-			RX_SEC_F | CKSUM_F | PTYPE_F)			       \
-R(sec_cksum_ptype_rss,		1, 0, 0, 0, 1, 1, 1,			       \
-			RX_SEC_F | CKSUM_F | PTYPE_F | RSS_F)		       \
-R(sec_vlan,			1, 0, 0, 1, 0, 0, 0, RX_SEC_F | RX_VLAN_F)     \
-R(sec_vlan_rss,			1, 0, 0, 1, 0, 0, 1,			       \
-			RX_SEC_F | RX_VLAN_F | RSS_F)			       \
-R(sec_vlan_ptype,		1, 0, 0, 1, 0, 1, 0,			       \
-			RX_SEC_F | RX_VLAN_F | PTYPE_F)			       \
-R(sec_vlan_ptype_rss,		1, 0, 0, 1, 0, 1, 1,			       \
-			RX_SEC_F | RX_VLAN_F | PTYPE_F | RSS_F)		       \
-R(sec_vlan_cksum,		1, 0, 0, 1, 1, 0, 0,			       \
-			RX_SEC_F | RX_VLAN_F | CKSUM_F)			       \
-R(sec_vlan_cksum_rss,		1, 0, 0, 1, 1, 0, 1,			       \
-			RX_SEC_F | RX_VLAN_F | CKSUM_F | RSS_F)		       \
-R(sec_vlan_cksum_ptype,		1, 0, 0, 1, 1, 1, 0,			       \
-			RX_SEC_F | RX_VLAN_F | CKSUM_F | PTYPE_F)	       \
-R(sec_vlan_cksum_ptype_rss,	1, 0, 0, 1, 1, 1, 1,			       \
-			RX_SEC_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)      \
-R(sec_mark,			1, 0, 1, 0, 0, 0, 0, RX_SEC_F | MARK_F)	       \
-R(sec_mark_rss,			1, 0, 1, 0, 0, 0, 1, RX_SEC_F | MARK_F | RSS_F)\
-R(sec_mark_ptype,		1, 0, 1, 0, 0, 1, 0,			       \
-			RX_SEC_F | MARK_F | PTYPE_F)			       \
-R(sec_mark_ptype_rss,		1, 0, 1, 0, 0, 1, 1,			       \
-			RX_SEC_F | MARK_F | PTYPE_F | RSS_F)		       \
-R(sec_mark_cksum,		1, 0, 1, 0, 1, 0, 0,			       \
-			RX_SEC_F | MARK_F | CKSUM_F)			       \
-R(sec_mark_cksum_rss,		1, 0, 1, 0, 1, 0, 1,			       \
-			RX_SEC_F | MARK_F | CKSUM_F | RSS_F)		       \
-R(sec_mark_cksum_ptype,		1, 0, 1, 0, 1, 1, 0,			       \
-			RX_SEC_F | MARK_F | CKSUM_F | PTYPE_F)		       \
-R(sec_mark_cksum_ptype_rss,	1, 0, 1, 0, 1, 1, 1,			       \
-			RX_SEC_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)	       \
-R(sec_mark_vlan,		1, 0, 1, 1, 0, 0, 0, RX_SEC_F | RX_VLAN_F)     \
-R(sec_mark_vlan_rss,		1, 0, 1, 1, 0, 0, 1,			       \
-			RX_SEC_F | MARK_F | RX_VLAN_F | RSS_F)		       \
-R(sec_mark_vlan_ptype,		1, 0, 1, 1, 0, 1, 0,			       \
-			RX_SEC_F | MARK_F | RX_VLAN_F | PTYPE_F)	       \
-R(sec_mark_vlan_ptype_rss,	1, 0, 1, 1, 0, 1, 1,			       \
-			RX_SEC_F | MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)       \
-R(sec_mark_vlan_cksum,		1, 0, 1, 1, 1, 0, 0,			       \
-			RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F)	       \
-R(sec_mark_vlan_cksum_rss,	1, 0, 1, 1, 1, 0, 1,			       \
-			RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)       \
-R(sec_mark_vlan_cksum_ptype,	1, 0, 1, 1, 1, 1, 0,			       \
-			RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)     \
-R(sec_mark_vlan_cksum_ptype_rss,					       \
-				1, 0, 1, 1, 1, 1, 1,			       \
-			RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F |    \
-			RSS_F)						       \
-R(sec_ts,			1, 1, 0, 0, 0, 0, 0, RX_SEC_F | TS_F)	       \
-R(sec_ts_rss,			1, 1, 0, 0, 0, 0, 1, RX_SEC_F | TS_F | RSS_F)  \
-R(sec_ts_ptype,			1, 1, 0, 0, 0, 1, 0, RX_SEC_F | TS_F | PTYPE_F)\
-R(sec_ts_ptype_rss,		1, 1, 0, 0, 0, 1, 1,			       \
-			RX_SEC_F | TS_F | PTYPE_F | RSS_F)		       \
-R(sec_ts_cksum,			1, 1, 0, 0, 1, 0, 0, RX_SEC_F | TS_F | CKSUM_F)\
-R(sec_ts_cksum_rss,		1, 1, 0, 0, 1, 0, 1,			       \
-			RX_SEC_F | TS_F | CKSUM_F | RSS_F)		       \
-R(sec_ts_cksum_ptype,		1, 1, 0, 0, 1, 1, 0,			       \
-			RX_SEC_F | CKSUM_F | PTYPE_F)			       \
-R(sec_ts_cksum_ptype_rss,	1, 1, 0, 0, 1, 1, 1,			       \
-			RX_SEC_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)	       \
-R(sec_ts_vlan,			1, 1, 0, 1, 0, 0, 0,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F)			       \
-R(sec_ts_vlan_rss,		1, 1, 0, 1, 0, 0, 1,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F | RSS_F)		       \
-R(sec_ts_vlan_ptype,		1, 1, 0, 1, 0, 1, 0,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F | PTYPE_F)		       \
-R(sec_ts_vlan_ptype_rss,	1, 1, 0, 1, 0, 1, 1,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F | PTYPE_F | RSS_F)	       \
-R(sec_ts_vlan_cksum,		1, 1, 0, 1, 1, 0, 0,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F)		       \
-R(sec_ts_vlan_cksum_rss,	1, 1, 0, 1, 1, 0, 1,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F | RSS_F)	       \
-R(sec_ts_vlan_cksum_ptype,	1, 1, 0, 1, 1, 1, 0,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F)       \
-R(sec_ts_vlan_cksum_ptype_rss,	1, 1, 0, 1, 1, 1, 1,			       \
-			RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F |      \
-			RSS_F)						       \
-R(sec_ts_mark,			1, 1, 1, 0, 0, 0, 0, RX_SEC_F | TS_F | MARK_F) \
-R(sec_ts_mark_rss,		1, 1, 1, 0, 0, 0, 1,			       \
-			RX_SEC_F | TS_F | MARK_F | RSS_F)		       \
-R(sec_ts_mark_ptype,		1, 1, 1, 0, 0, 1, 0,			       \
-			RX_SEC_F | TS_F | MARK_F | PTYPE_F)		       \
-R(sec_ts_mark_ptype_rss,	1, 1, 1, 0, 0, 1, 1,			       \
-			RX_SEC_F | TS_F | MARK_F | PTYPE_F | RSS_F)	       \
-R(sec_ts_mark_cksum,		1, 1, 1, 0, 1, 0, 0,			       \
-			RX_SEC_F | TS_F | MARK_F | CKSUM_F)		       \
-R(sec_ts_mark_cksum_rss,	1, 1, 1, 0, 1, 0, 1,			       \
-			RX_SEC_F | TS_F | MARK_F | CKSUM_F | RSS_F)	       \
-R(sec_ts_mark_cksum_ptype,	1, 1, 1, 0, 1, 1, 0,			       \
-			RX_SEC_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)	       \
-R(sec_ts_mark_cksum_ptype_rss,	1, 1, 1, 0, 1, 1, 1,			       \
-			RX_SEC_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)  \
-R(sec_ts_mark_vlan,		1, 1, 1, 1, 0, 0, 0,			       \
-			RX_SEC_F | TS_F | MARK_F | RX_VLAN_F)		       \
-R(sec_ts_mark_vlan_rss,		1, 1, 1, 1, 0, 0, 1,			       \
-			RX_SEC_F | RX_VLAN_F | RSS_F)			       \
-R(sec_ts_mark_vlan_ptype,	1, 1, 1, 1, 0, 1, 0,			       \
-			RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | PTYPE_F)	       \
-R(sec_ts_mark_vlan_ptype_rss,	1, 1, 1, 1, 0, 1, 1,			       \
-			RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)\
-R(sec_ts_mark_vlan_cksum,	1, 1, 1, 1, 1, 0, 0,			       \
-			RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F)	       \
-R(sec_ts_mark_vlan_cksum_rss,	1, 1, 1, 1, 1, 0, 1,			       \
-			RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)\
-R(sec_ts_mark_vlan_cksum_ptype,	1, 1, 1, 1, 1, 1, 0,			       \
-			RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F |       \
-			PTYPE_F)					       \
-R(sec_ts_mark_vlan_cksum_ptype_rss,					       \
-				1, 1, 1, 1, 1, 1, 1,			       \
-			RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F |       \
-			PTYPE_F | RSS_F)
-#endif /* __OTX2_RX_H__ */
diff --git a/drivers/net/octeontx2/otx2_stats.c b/drivers/net/octeontx2/otx2_stats.c
deleted file mode 100644
index 3adf21608c..0000000000
--- a/drivers/net/octeontx2/otx2_stats.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <inttypes.h>
-
-#include "otx2_ethdev.h"
-
-struct otx2_nix_xstats_name {
-	char name[RTE_ETH_XSTATS_NAME_SIZE];
-	uint32_t offset;
-};
-
-static const struct otx2_nix_xstats_name nix_tx_xstats[] = {
-	{"tx_ucast", NIX_STAT_LF_TX_TX_UCAST},
-	{"tx_bcast", NIX_STAT_LF_TX_TX_BCAST},
-	{"tx_mcast", NIX_STAT_LF_TX_TX_MCAST},
-	{"tx_drop", NIX_STAT_LF_TX_TX_DROP},
-	{"tx_octs", NIX_STAT_LF_TX_TX_OCTS},
-};
-
-static const struct otx2_nix_xstats_name nix_rx_xstats[] = {
-	{"rx_octs", NIX_STAT_LF_RX_RX_OCTS},
-	{"rx_ucast", NIX_STAT_LF_RX_RX_UCAST},
-	{"rx_bcast", NIX_STAT_LF_RX_RX_BCAST},
-	{"rx_mcast", NIX_STAT_LF_RX_RX_MCAST},
-	{"rx_drop", NIX_STAT_LF_RX_RX_DROP},
-	{"rx_drop_octs", NIX_STAT_LF_RX_RX_DROP_OCTS},
-	{"rx_fcs", NIX_STAT_LF_RX_RX_FCS},
-	{"rx_err", NIX_STAT_LF_RX_RX_ERR},
-	{"rx_drp_bcast", NIX_STAT_LF_RX_RX_DRP_BCAST},
-	{"rx_drp_mcast", NIX_STAT_LF_RX_RX_DRP_MCAST},
-	{"rx_drp_l3bcast", NIX_STAT_LF_RX_RX_DRP_L3BCAST},
-	{"rx_drp_l3mcast", NIX_STAT_LF_RX_RX_DRP_L3MCAST},
-};
-
-static const struct otx2_nix_xstats_name nix_q_xstats[] = {
-	{"rq_op_re_pkts", NIX_LF_RQ_OP_RE_PKTS},
-};
-
-#define OTX2_NIX_NUM_RX_XSTATS RTE_DIM(nix_rx_xstats)
-#define OTX2_NIX_NUM_TX_XSTATS RTE_DIM(nix_tx_xstats)
-#define OTX2_NIX_NUM_QUEUE_XSTATS RTE_DIM(nix_q_xstats)
-
-#define OTX2_NIX_NUM_XSTATS_REG (OTX2_NIX_NUM_RX_XSTATS + \
-		OTX2_NIX_NUM_TX_XSTATS + OTX2_NIX_NUM_QUEUE_XSTATS)
-
-int
-otx2_nix_dev_stats_get(struct rte_eth_dev *eth_dev,
-		       struct rte_eth_stats *stats)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t reg, val;
-	uint32_t qidx, i;
-	int64_t *addr;
-
-	stats->opackets = otx2_read64(dev->base +
-			NIX_LF_TX_STATX(NIX_STAT_LF_TX_TX_UCAST));
-	stats->opackets += otx2_read64(dev->base +
-			NIX_LF_TX_STATX(NIX_STAT_LF_TX_TX_MCAST));
-	stats->opackets += otx2_read64(dev->base +
-			NIX_LF_TX_STATX(NIX_STAT_LF_TX_TX_BCAST));
-	stats->oerrors = otx2_read64(dev->base +
-			NIX_LF_TX_STATX(NIX_STAT_LF_TX_TX_DROP));
-	stats->obytes = otx2_read64(dev->base +
-			NIX_LF_TX_STATX(NIX_STAT_LF_TX_TX_OCTS));
-
-	stats->ipackets = otx2_read64(dev->base +
-			NIX_LF_RX_STATX(NIX_STAT_LF_RX_RX_UCAST));
-	stats->ipackets += otx2_read64(dev->base +
-			NIX_LF_RX_STATX(NIX_STAT_LF_RX_RX_MCAST));
-	stats->ipackets += otx2_read64(dev->base +
-			NIX_LF_RX_STATX(NIX_STAT_LF_RX_RX_BCAST));
-	stats->imissed = otx2_read64(dev->base +
-			NIX_LF_RX_STATX(NIX_STAT_LF_RX_RX_DROP));
-	stats->ibytes = otx2_read64(dev->base +
-			NIX_LF_RX_STATX(NIX_STAT_LF_RX_RX_OCTS));
-	stats->ierrors = otx2_read64(dev->base +
-			NIX_LF_RX_STATX(NIX_STAT_LF_RX_RX_ERR));
-
-	for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS; i++) {
-		if (dev->txmap[i] & (1U << 31)) {
-			qidx = dev->txmap[i] & 0xFFFF;
-			reg = (((uint64_t)qidx) << 32);
-
-			addr = (int64_t *)(dev->base + NIX_LF_SQ_OP_PKTS);
-			val = otx2_atomic64_add_nosync(reg, addr);
-			if (val & OP_ERR)
-				val = 0;
-			stats->q_opackets[i] = val;
-
-			addr = (int64_t *)(dev->base + NIX_LF_SQ_OP_OCTS);
-			val = otx2_atomic64_add_nosync(reg, addr);
-			if (val & OP_ERR)
-				val = 0;
-			stats->q_obytes[i] = val;
-
-			addr = (int64_t *)(dev->base + NIX_LF_SQ_OP_DROP_PKTS);
-			val = otx2_atomic64_add_nosync(reg, addr);
-			if (val & OP_ERR)
-				val = 0;
-			stats->q_errors[i] = val;
-		}
-	}
-
-	for (i = 0; i < RTE_ETHDEV_QUEUE_STAT_CNTRS; i++) {
-		if (dev->rxmap[i] & (1U << 31)) {
-			qidx = dev->rxmap[i] & 0xFFFF;
-			reg = (((uint64_t)qidx) << 32);
-
-			addr = (int64_t *)(dev->base + NIX_LF_RQ_OP_PKTS);
-			val = otx2_atomic64_add_nosync(reg, addr);
-			if (val & OP_ERR)
-				val = 0;
-			stats->q_ipackets[i] = val;
-
-			addr = (int64_t *)(dev->base + NIX_LF_RQ_OP_OCTS);
-			val = otx2_atomic64_add_nosync(reg, addr);
-			if (val & OP_ERR)
-				val = 0;
-			stats->q_ibytes[i] = val;
-
-			addr = (int64_t *)(dev->base + NIX_LF_RQ_OP_DROP_PKTS);
-			val = otx2_atomic64_add_nosync(reg, addr);
-			if (val & OP_ERR)
-				val = 0;
-			stats->q_errors[i] += val;
-		}
-	}
-
-	return 0;
-}
-
-int
-otx2_nix_dev_stats_reset(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-
-	if (otx2_mbox_alloc_msg_nix_stats_rst(mbox) == NULL)
-		return -ENOMEM;
-
-	return otx2_mbox_process(mbox);
-}
-
-int
-otx2_nix_queue_stats_mapping(struct rte_eth_dev *eth_dev, uint16_t queue_id,
-			     uint8_t stat_idx, uint8_t is_rx)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	if (is_rx)
-		dev->rxmap[stat_idx] = ((1U << 31) | queue_id);
-	else
-		dev->txmap[stat_idx] = ((1U << 31) | queue_id);
-
-	return 0;
-}
-
-int
-otx2_nix_xstats_get(struct rte_eth_dev *eth_dev,
-		    struct rte_eth_xstat *xstats,
-		    unsigned int n)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	unsigned int i, count = 0;
-	uint64_t reg, val;
-
-	if (n < OTX2_NIX_NUM_XSTATS_REG)
-		return OTX2_NIX_NUM_XSTATS_REG;
-
-	if (xstats == NULL)
-		return 0;
-
-	for (i = 0; i < OTX2_NIX_NUM_TX_XSTATS; i++) {
-		xstats[count].value = otx2_read64(dev->base +
-		NIX_LF_TX_STATX(nix_tx_xstats[i].offset));
-		xstats[count].id = count;
-		count++;
-	}
-
-	for (i = 0; i < OTX2_NIX_NUM_RX_XSTATS; i++) {
-		xstats[count].value = otx2_read64(dev->base +
-		NIX_LF_RX_STATX(nix_rx_xstats[i].offset));
-		xstats[count].id = count;
-		count++;
-	}
-
-	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-		reg = (((uint64_t)i) << 32);
-		val = otx2_atomic64_add_nosync(reg, (int64_t *)(dev->base +
-					       nix_q_xstats[0].offset));
-		if (val & OP_ERR)
-			val = 0;
-		xstats[count].value += val;
-	}
-	xstats[count].id = count;
-	count++;
-
-	return count;
-}
-
-int
-otx2_nix_xstats_get_names(struct rte_eth_dev *eth_dev,
-			  struct rte_eth_xstat_name *xstats_names,
-			  unsigned int limit)
-{
-	unsigned int i, count = 0;
-
-	RTE_SET_USED(eth_dev);
-
-	if (limit < OTX2_NIX_NUM_XSTATS_REG && xstats_names != NULL)
-		return -ENOMEM;
-
-	if (xstats_names) {
-		for (i = 0; i < OTX2_NIX_NUM_TX_XSTATS; i++) {
-			snprintf(xstats_names[count].name,
-				 sizeof(xstats_names[count].name),
-				 "%s", nix_tx_xstats[i].name);
-			count++;
-		}
-
-		for (i = 0; i < OTX2_NIX_NUM_RX_XSTATS; i++) {
-			snprintf(xstats_names[count].name,
-				 sizeof(xstats_names[count].name),
-				 "%s", nix_rx_xstats[i].name);
-			count++;
-		}
-
-		for (i = 0; i < OTX2_NIX_NUM_QUEUE_XSTATS; i++) {
-			snprintf(xstats_names[count].name,
-				 sizeof(xstats_names[count].name),
-				 "%s", nix_q_xstats[i].name);
-			count++;
-		}
-	}
-
-	return OTX2_NIX_NUM_XSTATS_REG;
-}
-
-int
-otx2_nix_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,
-				const uint64_t *ids,
-				struct rte_eth_xstat_name *xstats_names,
-				unsigned int limit)
-{
-	struct rte_eth_xstat_name xstats_names_copy[OTX2_NIX_NUM_XSTATS_REG];
-	uint16_t i;
-
-	if (limit < OTX2_NIX_NUM_XSTATS_REG && ids == NULL)
-		return OTX2_NIX_NUM_XSTATS_REG;
-
-	if (limit > OTX2_NIX_NUM_XSTATS_REG)
-		return -EINVAL;
-
-	if (xstats_names == NULL)
-		return -ENOMEM;
-
-	otx2_nix_xstats_get_names(eth_dev, xstats_names_copy, limit);
-
-	for (i = 0; i < OTX2_NIX_NUM_XSTATS_REG; i++) {
-		if (ids[i] >= OTX2_NIX_NUM_XSTATS_REG) {
-			otx2_err("Invalid id value");
-			return -EINVAL;
-		}
-		strncpy(xstats_names[i].name, xstats_names_copy[ids[i]].name,
-			sizeof(xstats_names[i].name));
-	}
-
-	return limit;
-}
-
-int
-otx2_nix_xstats_get_by_id(struct rte_eth_dev *eth_dev, const uint64_t *ids,
-			  uint64_t *values, unsigned int n)
-{
-	struct rte_eth_xstat xstats[OTX2_NIX_NUM_XSTATS_REG];
-	uint16_t i;
-
-	if (n < OTX2_NIX_NUM_XSTATS_REG && ids == NULL)
-		return OTX2_NIX_NUM_XSTATS_REG;
-
-	if (n > OTX2_NIX_NUM_XSTATS_REG)
-		return -EINVAL;
-
-	if (values == NULL)
-		return -ENOMEM;
-
-	otx2_nix_xstats_get(eth_dev, xstats, n);
-
-	for (i = 0; i < OTX2_NIX_NUM_XSTATS_REG; i++) {
-		if (ids[i] >= OTX2_NIX_NUM_XSTATS_REG) {
-			otx2_err("Invalid id value");
-			return -EINVAL;
-		}
-		values[i] = xstats[ids[i]].value;
-	}
-
-	return n;
-}
-
-static int
-nix_queue_stats_reset(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_aq_enq_rsp *rsp;
-	struct nix_aq_enq_req *aq;
-	uint32_t i;
-	int rc;
-
-	for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = i;
-		aq->ctype = NIX_AQ_CTYPE_RQ;
-		aq->op = NIX_AQ_INSTOP_READ;
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc) {
-			otx2_err("Failed to read rq context");
-			return rc;
-		}
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = i;
-		aq->ctype = NIX_AQ_CTYPE_RQ;
-		aq->op = NIX_AQ_INSTOP_WRITE;
-		otx2_mbox_memcpy(&aq->rq, &rsp->rq, sizeof(rsp->rq));
-		otx2_mbox_memset(&aq->rq_mask, 0, sizeof(aq->rq_mask));
-		aq->rq.octs = 0;
-		aq->rq.pkts = 0;
-		aq->rq.drop_octs = 0;
-		aq->rq.drop_pkts = 0;
-		aq->rq.re_pkts = 0;
-
-		aq->rq_mask.octs = ~(aq->rq_mask.octs);
-		aq->rq_mask.pkts = ~(aq->rq_mask.pkts);
-		aq->rq_mask.drop_octs = ~(aq->rq_mask.drop_octs);
-		aq->rq_mask.drop_pkts = ~(aq->rq_mask.drop_pkts);
-		aq->rq_mask.re_pkts = ~(aq->rq_mask.re_pkts);
-		rc = otx2_mbox_process(mbox);
-		if (rc) {
-			otx2_err("Failed to write rq context");
-			return rc;
-		}
-	}
-
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = i;
-		aq->ctype = NIX_AQ_CTYPE_SQ;
-		aq->op = NIX_AQ_INSTOP_READ;
-		rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc) {
-			otx2_err("Failed to read sq context");
-			return rc;
-		}
-		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-		aq->qidx = i;
-		aq->ctype = NIX_AQ_CTYPE_SQ;
-		aq->op = NIX_AQ_INSTOP_WRITE;
-		otx2_mbox_memcpy(&aq->sq, &rsp->sq, sizeof(rsp->sq));
-		otx2_mbox_memset(&aq->sq_mask, 0, sizeof(aq->sq_mask));
-		aq->sq.octs = 0;
-		aq->sq.pkts = 0;
-		aq->sq.drop_octs = 0;
-		aq->sq.drop_pkts = 0;
-
-		aq->sq_mask.octs = ~(aq->sq_mask.octs);
-		aq->sq_mask.pkts = ~(aq->sq_mask.pkts);
-		aq->sq_mask.drop_octs = ~(aq->sq_mask.drop_octs);
-		aq->sq_mask.drop_pkts = ~(aq->sq_mask.drop_pkts);
-		rc = otx2_mbox_process(mbox);
-		if (rc) {
-			otx2_err("Failed to write sq context");
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-int
-otx2_nix_xstats_reset(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	int ret;
-
-	if (otx2_mbox_alloc_msg_nix_stats_rst(mbox) == NULL)
-		return -ENOMEM;
-
-	ret = otx2_mbox_process(mbox);
-	if (ret != 0)
-		return ret;
-
-	/* Reset queue stats */
-	return nix_queue_stats_reset(eth_dev);
-}
diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
deleted file mode 100644
index 6aff1f9587..0000000000
--- a/drivers/net/octeontx2/otx2_tm.c
+++ /dev/null
@@ -1,3317 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_malloc.h>
-
-#include "otx2_ethdev.h"
-#include "otx2_tm.h"
-
-/* Use last LVL_CNT nodes as default nodes */
-#define NIX_DEFAULT_NODE_ID_START (RTE_TM_NODE_ID_NULL - NIX_TXSCH_LVL_CNT)
-
-enum otx2_tm_node_level {
-	OTX2_TM_LVL_ROOT = 0,
-	OTX2_TM_LVL_SCH1,
-	OTX2_TM_LVL_SCH2,
-	OTX2_TM_LVL_SCH3,
-	OTX2_TM_LVL_SCH4,
-	OTX2_TM_LVL_QUEUE,
-	OTX2_TM_LVL_MAX,
-};
-
-static inline
-uint64_t shaper2regval(struct shaper_params *shaper)
-{
-	return (shaper->burst_exponent << 37) | (shaper->burst_mantissa << 29) |
-		(shaper->div_exp << 13) | (shaper->exponent << 9) |
-		(shaper->mantissa << 1);
-}
-
-int
-otx2_nix_get_link(struct otx2_eth_dev *dev)
-{
-	int link = 13 /* SDP */;
-	uint16_t lmac_chan;
-	uint16_t map;
-
-	lmac_chan = dev->tx_chan_base;
-
-	/* CGX lmac link */
-	if (lmac_chan >= 0x800) {
-		map = lmac_chan & 0x7FF;
-		link = 4 * ((map >> 8) & 0xF) + ((map >> 4) & 0xF);
-	} else if (lmac_chan < 0x700) {
-		/* LBK channel */
-		link = 12;
-	}
-
-	return link;
-}
-
-static uint8_t
-nix_get_relchan(struct otx2_eth_dev *dev)
-{
-	return dev->tx_chan_base & 0xff;
-}
-
-static bool
-nix_tm_have_tl1_access(struct otx2_eth_dev *dev)
-{
-	bool is_lbk = otx2_dev_is_lbk(dev);
-	return otx2_dev_is_pf(dev) && !otx2_dev_is_Ax(dev) && !is_lbk;
-}
-
-static bool
-nix_tm_is_leaf(struct otx2_eth_dev *dev, int lvl)
-{
-	if (nix_tm_have_tl1_access(dev))
-		return (lvl == OTX2_TM_LVL_QUEUE);
-
-	return (lvl == OTX2_TM_LVL_SCH4);
-}
-
-static int
-find_prio_anchor(struct otx2_eth_dev *dev, uint32_t node_id)
-{
-	struct otx2_nix_tm_node *child_node;
-
-	TAILQ_FOREACH(child_node, &dev->node_list, node) {
-		if (!child_node->parent)
-			continue;
-		if (!(child_node->parent->id == node_id))
-			continue;
-		if (child_node->priority == child_node->parent->rr_prio)
-			continue;
-		return child_node->hw_id - child_node->priority;
-	}
-	return 0;
-}
-
-
-static struct otx2_nix_tm_shaper_profile *
-nix_tm_shaper_profile_search(struct otx2_eth_dev *dev, uint32_t shaper_id)
-{
-	struct otx2_nix_tm_shaper_profile *tm_shaper_profile;
-
-	TAILQ_FOREACH(tm_shaper_profile, &dev->shaper_profile_list, shaper) {
-		if (tm_shaper_profile->shaper_profile_id == shaper_id)
-			return tm_shaper_profile;
-	}
-	return NULL;
-}
-
-static inline uint64_t
-shaper_rate_to_nix(uint64_t value, uint64_t *exponent_p,
-		   uint64_t *mantissa_p, uint64_t *div_exp_p)
-{
-	uint64_t div_exp, exponent, mantissa;
-
-	/* Boundary checks */
-	if (value < MIN_SHAPER_RATE ||
-	    value > MAX_SHAPER_RATE)
-		return 0;
-
-	if (value <= SHAPER_RATE(0, 0, 0)) {
-		/* Calculate rate div_exp and mantissa using
-		 * the following formula:
-		 *
-		 * value = (2E6 * (256 + mantissa)
-		 *              / ((1 << div_exp) * 256))
-		 */
-		div_exp = 0;
-		exponent = 0;
-		mantissa = MAX_RATE_MANTISSA;
-
-		while (value < (NIX_SHAPER_RATE_CONST / (1 << div_exp)))
-			div_exp += 1;
-
-		while (value <
-		       ((NIX_SHAPER_RATE_CONST * (256 + mantissa)) /
-			((1 << div_exp) * 256)))
-			mantissa -= 1;
-	} else {
-		/* Calculate rate exponent and mantissa using
-		 * the following formula:
-		 *
-		 * value = (2E6 * ((256 + mantissa) << exponent)) / 256
-		 *
-		 */
-		div_exp = 0;
-		exponent = MAX_RATE_EXPONENT;
-		mantissa = MAX_RATE_MANTISSA;
-
-		while (value < (NIX_SHAPER_RATE_CONST * (1 << exponent)))
-			exponent -= 1;
-
-		while (value < ((NIX_SHAPER_RATE_CONST *
-				((256 + mantissa) << exponent)) / 256))
-			mantissa -= 1;
-	}
-
-	if (div_exp > MAX_RATE_DIV_EXP ||
-	    exponent > MAX_RATE_EXPONENT || mantissa > MAX_RATE_MANTISSA)
-		return 0;
-
-	if (div_exp_p)
-		*div_exp_p = div_exp;
-	if (exponent_p)
-		*exponent_p = exponent;
-	if (mantissa_p)
-		*mantissa_p = mantissa;
-
-	/* Calculate real rate value */
-	return SHAPER_RATE(exponent, mantissa, div_exp);
-}
-
-static inline uint64_t
-shaper_burst_to_nix(uint64_t value, uint64_t *exponent_p,
-		    uint64_t *mantissa_p)
-{
-	uint64_t exponent, mantissa;
-
-	if (value < MIN_SHAPER_BURST || value > MAX_SHAPER_BURST)
-		return 0;
-
-	/* Calculate burst exponent and mantissa using
-	 * the following formula:
-	 *
-	 * value = (((256 + mantissa) << (exponent + 1)
-	 / 256)
-	 *
-	 */
-	exponent = MAX_BURST_EXPONENT;
-	mantissa = MAX_BURST_MANTISSA;
-
-	while (value < (1ull << (exponent + 1)))
-		exponent -= 1;
-
-	while (value < ((256 + mantissa) << (exponent + 1)) / 256)
-		mantissa -= 1;
-
-	if (exponent > MAX_BURST_EXPONENT || mantissa > MAX_BURST_MANTISSA)
-		return 0;
-
-	if (exponent_p)
-		*exponent_p = exponent;
-	if (mantissa_p)
-		*mantissa_p = mantissa;
-
-	return SHAPER_BURST(exponent, mantissa);
-}
-
-static void
-shaper_config_to_nix(struct otx2_nix_tm_shaper_profile *profile,
-		     struct shaper_params *cir,
-		     struct shaper_params *pir)
-{
-	struct rte_tm_shaper_params *param = &profile->params;
-
-	if (!profile)
-		return;
-
-	/* Calculate CIR exponent and mantissa */
-	if (param->committed.rate)
-		cir->rate = shaper_rate_to_nix(param->committed.rate,
-					       &cir->exponent,
-					       &cir->mantissa,
-					       &cir->div_exp);
-
-	/* Calculate PIR exponent and mantissa */
-	if (param->peak.rate)
-		pir->rate = shaper_rate_to_nix(param->peak.rate,
-					       &pir->exponent,
-					       &pir->mantissa,
-					       &pir->div_exp);
-
-	/* Calculate CIR burst exponent and mantissa */
-	if (param->committed.size)
-		cir->burst = shaper_burst_to_nix(param->committed.size,
-						 &cir->burst_exponent,
-						 &cir->burst_mantissa);
-
-	/* Calculate PIR burst exponent and mantissa */
-	if (param->peak.size)
-		pir->burst = shaper_burst_to_nix(param->peak.size,
-						 &pir->burst_exponent,
-						 &pir->burst_mantissa);
-}
-
-static void
-shaper_default_red_algo(struct otx2_eth_dev *dev,
-			struct otx2_nix_tm_node *tm_node,
-			struct otx2_nix_tm_shaper_profile *profile)
-{
-	struct shaper_params cir, pir;
-
-	/* C0 doesn't support STALL when both PIR & CIR are enabled */
-	if (profile && otx2_dev_is_96xx_Cx(dev)) {
-		memset(&cir, 0, sizeof(cir));
-		memset(&pir, 0, sizeof(pir));
-		shaper_config_to_nix(profile, &cir, &pir);
-
-		if (pir.rate && cir.rate) {
-			tm_node->red_algo = NIX_REDALG_DISCARD;
-			tm_node->flags |= NIX_TM_NODE_RED_DISCARD;
-			return;
-		}
-	}
-
-	tm_node->red_algo = NIX_REDALG_STD;
-	tm_node->flags &= ~NIX_TM_NODE_RED_DISCARD;
-}
-
-static int
-populate_tm_tl1_default(struct otx2_eth_dev *dev, uint32_t schq)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_txschq_config *req;
-
-	/*
-	 * Default config for TL1.
-	 * For VF this is always ignored.
-	 */
-
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-	req->lvl = NIX_TXSCH_LVL_TL1;
-
-	/* Set DWRR quantum */
-	req->reg[0] = NIX_AF_TL1X_SCHEDULE(schq);
-	req->regval[0] = TXSCH_TL1_DFLT_RR_QTM;
-	req->num_regs++;
-
-	req->reg[1] = NIX_AF_TL1X_TOPOLOGY(schq);
-	req->regval[1] = (TXSCH_TL1_DFLT_RR_PRIO << 1);
-	req->num_regs++;
-
-	req->reg[2] = NIX_AF_TL1X_CIR(schq);
-	req->regval[2] = 0;
-	req->num_regs++;
-
-	return otx2_mbox_process(mbox);
-}
-
-static uint8_t
-prepare_tm_sched_reg(struct otx2_eth_dev *dev,
-		     struct otx2_nix_tm_node *tm_node,
-		     volatile uint64_t *reg, volatile uint64_t *regval)
-{
-	uint64_t strict_prio = tm_node->priority;
-	uint32_t hw_lvl = tm_node->hw_lvl;
-	uint32_t schq = tm_node->hw_id;
-	uint64_t rr_quantum;
-	uint8_t k = 0;
-
-	rr_quantum = NIX_TM_WEIGHT_TO_RR_QUANTUM(tm_node->weight);
-
-	/* For children to root, strict prio is default if either
-	 * device root is TL2 or TL1 Static Priority is disabled.
-	 */
-	if (hw_lvl == NIX_TXSCH_LVL_TL2 &&
-	    (dev->otx2_tm_root_lvl == NIX_TXSCH_LVL_TL2 ||
-	     dev->tm_flags & NIX_TM_TL1_NO_SP))
-		strict_prio = TXSCH_TL1_DFLT_RR_PRIO;
-
-	otx2_tm_dbg("Schedule config node %s(%u) lvl %u id %u, "
-		     "prio 0x%" PRIx64 ", rr_quantum 0x%" PRIx64 " (%p)",
-		     nix_hwlvl2str(tm_node->hw_lvl), schq, tm_node->lvl,
-		     tm_node->id, strict_prio, rr_quantum, tm_node);
-
-	switch (hw_lvl) {
-	case NIX_TXSCH_LVL_SMQ:
-		reg[k] = NIX_AF_MDQX_SCHEDULE(schq);
-		regval[k] = (strict_prio << 24) | rr_quantum;
-		k++;
-
-		break;
-	case NIX_TXSCH_LVL_TL4:
-		reg[k] = NIX_AF_TL4X_SCHEDULE(schq);
-		regval[k] = (strict_prio << 24) | rr_quantum;
-		k++;
-
-		break;
-	case NIX_TXSCH_LVL_TL3:
-		reg[k] = NIX_AF_TL3X_SCHEDULE(schq);
-		regval[k] = (strict_prio << 24) | rr_quantum;
-		k++;
-
-		break;
-	case NIX_TXSCH_LVL_TL2:
-		reg[k] = NIX_AF_TL2X_SCHEDULE(schq);
-		regval[k] = (strict_prio << 24) | rr_quantum;
-		k++;
-
-		break;
-	case NIX_TXSCH_LVL_TL1:
-		reg[k] = NIX_AF_TL1X_SCHEDULE(schq);
-		regval[k] = rr_quantum;
-		k++;
-
-		break;
-	}
-
-	return k;
-}
-
-static uint8_t
-prepare_tm_shaper_reg(struct otx2_nix_tm_node *tm_node,
-		      struct otx2_nix_tm_shaper_profile *profile,
-		      volatile uint64_t *reg, volatile uint64_t *regval)
-{
-	struct shaper_params cir, pir;
-	uint32_t schq = tm_node->hw_id;
-	uint64_t adjust = 0;
-	uint8_t k = 0;
-
-	memset(&cir, 0, sizeof(cir));
-	memset(&pir, 0, sizeof(pir));
-	shaper_config_to_nix(profile, &cir, &pir);
-
-	/* Packet length adjust */
-	if (tm_node->pkt_mode)
-		adjust = 1;
-	else if (profile)
-		adjust = profile->params.pkt_length_adjust & 0x1FF;
-
-	otx2_tm_dbg("Shaper config node %s(%u) lvl %u id %u, pir %" PRIu64
-		    "(%" PRIu64 "B), cir %" PRIu64 "(%" PRIu64 "B)"
-		    "adjust 0x%" PRIx64 "(pktmode %u) (%p)",
-		    nix_hwlvl2str(tm_node->hw_lvl), schq, tm_node->lvl,
-		    tm_node->id, pir.rate, pir.burst, cir.rate, cir.burst,
-		    adjust, tm_node->pkt_mode, tm_node);
-
-	switch (tm_node->hw_lvl) {
-	case NIX_TXSCH_LVL_SMQ:
-		/* Configure PIR, CIR */
-		reg[k] = NIX_AF_MDQX_PIR(schq);
-		regval[k] = (pir.rate && pir.burst) ?
-				(shaper2regval(&pir) | 1) : 0;
-		k++;
-
-		reg[k] = NIX_AF_MDQX_CIR(schq);
-		regval[k] = (cir.rate && cir.burst) ?
-				(shaper2regval(&cir) | 1) : 0;
-		k++;
-
-		/* Configure RED ALG */
-		reg[k] = NIX_AF_MDQX_SHAPE(schq);
-		regval[k] = (adjust |
-			     (uint64_t)tm_node->red_algo << 9 |
-			     (uint64_t)tm_node->pkt_mode << 24);
-		k++;
-		break;
-	case NIX_TXSCH_LVL_TL4:
-		/* Configure PIR, CIR */
-		reg[k] = NIX_AF_TL4X_PIR(schq);
-		regval[k] = (pir.rate && pir.burst) ?
-				(shaper2regval(&pir) | 1) : 0;
-		k++;
-
-		reg[k] = NIX_AF_TL4X_CIR(schq);
-		regval[k] = (cir.rate && cir.burst) ?
-				(shaper2regval(&cir) | 1) : 0;
-		k++;
-
-		/* Configure RED algo */
-		reg[k] = NIX_AF_TL4X_SHAPE(schq);
-		regval[k] = (adjust |
-			     (uint64_t)tm_node->red_algo << 9 |
-			     (uint64_t)tm_node->pkt_mode << 24);
-		k++;
-		break;
-	case NIX_TXSCH_LVL_TL3:
-		/* Configure PIR, CIR */
-		reg[k] = NIX_AF_TL3X_PIR(schq);
-		regval[k] = (pir.rate && pir.burst) ?
-				(shaper2regval(&pir) | 1) : 0;
-		k++;
-
-		reg[k] = NIX_AF_TL3X_CIR(schq);
-		regval[k] = (cir.rate && cir.burst) ?
-				(shaper2regval(&cir) | 1) : 0;
-		k++;
-
-		/* Configure RED algo */
-		reg[k] = NIX_AF_TL3X_SHAPE(schq);
-		regval[k] = (adjust |
-			     (uint64_t)tm_node->red_algo << 9 |
-			     (uint64_t)tm_node->pkt_mode << 24);
-		k++;
-
-		break;
-	case NIX_TXSCH_LVL_TL2:
-		/* Configure PIR, CIR */
-		reg[k] = NIX_AF_TL2X_PIR(schq);
-		regval[k] = (pir.rate && pir.burst) ?
-				(shaper2regval(&pir) | 1) : 0;
-		k++;
-
-		reg[k] = NIX_AF_TL2X_CIR(schq);
-		regval[k] = (cir.rate && cir.burst) ?
-				(shaper2regval(&cir) | 1) : 0;
-		k++;
-
-		/* Configure RED algo */
-		reg[k] = NIX_AF_TL2X_SHAPE(schq);
-		regval[k] = (adjust |
-			     (uint64_t)tm_node->red_algo << 9 |
-			     (uint64_t)tm_node->pkt_mode << 24);
-		k++;
-
-		break;
-	case NIX_TXSCH_LVL_TL1:
-		/* Configure CIR */
-		reg[k] = NIX_AF_TL1X_CIR(schq);
-		regval[k] = (cir.rate && cir.burst) ?
-				(shaper2regval(&cir) | 1) : 0;
-		k++;
-
-		/* Configure length disable and adjust */
-		reg[k] = NIX_AF_TL1X_SHAPE(schq);
-		regval[k] = (adjust |
-			     (uint64_t)tm_node->pkt_mode << 24);
-		k++;
-		break;
-	}
-
-	return k;
-}
-
-static uint8_t
-prepare_tm_sw_xoff(struct otx2_nix_tm_node *tm_node, bool enable,
-		   volatile uint64_t *reg, volatile uint64_t *regval)
-{
-	uint32_t hw_lvl = tm_node->hw_lvl;
-	uint32_t schq = tm_node->hw_id;
-	uint8_t k = 0;
-
-	otx2_tm_dbg("sw xoff config node %s(%u) lvl %u id %u, enable %u (%p)",
-		    nix_hwlvl2str(hw_lvl), schq, tm_node->lvl,
-		    tm_node->id, enable, tm_node);
-
-	regval[k] = enable;
-
-	switch (hw_lvl) {
-	case NIX_TXSCH_LVL_MDQ:
-		reg[k] = NIX_AF_MDQX_SW_XOFF(schq);
-		k++;
-		break;
-	case NIX_TXSCH_LVL_TL4:
-		reg[k] = NIX_AF_TL4X_SW_XOFF(schq);
-		k++;
-		break;
-	case NIX_TXSCH_LVL_TL3:
-		reg[k] = NIX_AF_TL3X_SW_XOFF(schq);
-		k++;
-		break;
-	case NIX_TXSCH_LVL_TL2:
-		reg[k] = NIX_AF_TL2X_SW_XOFF(schq);
-		k++;
-		break;
-	case NIX_TXSCH_LVL_TL1:
-		reg[k] = NIX_AF_TL1X_SW_XOFF(schq);
-		k++;
-		break;
-	default:
-		break;
-	}
-
-	return k;
-}
-
-static int
-populate_tm_reg(struct otx2_eth_dev *dev,
-		struct otx2_nix_tm_node *tm_node)
-{
-	struct otx2_nix_tm_shaper_profile *profile;
-	uint64_t regval_mask[MAX_REGS_PER_MBOX_MSG];
-	uint64_t regval[MAX_REGS_PER_MBOX_MSG];
-	uint64_t reg[MAX_REGS_PER_MBOX_MSG];
-	struct otx2_mbox *mbox = dev->mbox;
-	uint64_t parent = 0, child = 0;
-	uint32_t hw_lvl, rr_prio, schq;
-	struct nix_txschq_config *req;
-	int rc = -EFAULT;
-	uint8_t k = 0;
-
-	memset(regval_mask, 0, sizeof(regval_mask));
-	profile = nix_tm_shaper_profile_search(dev,
-					tm_node->params.shaper_profile_id);
-	rr_prio = tm_node->rr_prio;
-	hw_lvl = tm_node->hw_lvl;
-	schq = tm_node->hw_id;
-
-	/* Root node will not have a parent node */
-	if (hw_lvl == dev->otx2_tm_root_lvl)
-		parent = tm_node->parent_hw_id;
-	else
-		parent = tm_node->parent->hw_id;
-
-	/* Do we need this trigger to configure TL1 */
-	if (dev->otx2_tm_root_lvl == NIX_TXSCH_LVL_TL2 &&
-	    hw_lvl == dev->otx2_tm_root_lvl) {
-		rc = populate_tm_tl1_default(dev, parent);
-		if (rc)
-			goto error;
-	}
-
-	if (hw_lvl != NIX_TXSCH_LVL_SMQ)
-		child = find_prio_anchor(dev, tm_node->id);
-
-	/* Override default rr_prio when TL1
-	 * Static Priority is disabled
-	 */
-	if (hw_lvl == NIX_TXSCH_LVL_TL1 &&
-	    dev->tm_flags & NIX_TM_TL1_NO_SP) {
-		rr_prio = TXSCH_TL1_DFLT_RR_PRIO;
-		child = 0;
-	}
-
-	otx2_tm_dbg("Topology config node %s(%u)->%s(%"PRIu64") lvl %u, id %u"
-		    " prio_anchor %"PRIu64" rr_prio %u (%p)",
-		    nix_hwlvl2str(hw_lvl), schq, nix_hwlvl2str(hw_lvl + 1),
-		    parent, tm_node->lvl, tm_node->id, child, rr_prio, tm_node);
-
-	/* Prepare Topology and Link config */
-	switch (hw_lvl) {
-	case NIX_TXSCH_LVL_SMQ:
-
-		/* Set xoff which will be cleared later and minimum length
-		 * which will be used for zero padding if packet length is
-		 * smaller
-		 */
-		reg[k] = NIX_AF_SMQX_CFG(schq);
-		regval[k] = BIT_ULL(50) | ((uint64_t)NIX_MAX_VTAG_INS << 36) |
-			NIX_MIN_HW_FRS;
-		regval_mask[k] = ~(BIT_ULL(50) | (0x7ULL << 36) | 0x7f);
-		k++;
-
-		/* Parent and schedule conf */
-		reg[k] = NIX_AF_MDQX_PARENT(schq);
-		regval[k] = parent << 16;
-		k++;
-
-		break;
-	case NIX_TXSCH_LVL_TL4:
-		/* Parent and schedule conf */
-		reg[k] = NIX_AF_TL4X_PARENT(schq);
-		regval[k] = parent << 16;
-		k++;
-
-		reg[k] = NIX_AF_TL4X_TOPOLOGY(schq);
-		regval[k] = (child << 32) | (rr_prio << 1);
-		k++;
-
-		/* Configure TL4 to send to SDP channel instead of CGX/LBK */
-		if (otx2_dev_is_sdp(dev)) {
-			reg[k] = NIX_AF_TL4X_SDP_LINK_CFG(schq);
-			regval[k] = BIT_ULL(12);
-			k++;
-		}
-		break;
-	case NIX_TXSCH_LVL_TL3:
-		/* Parent and schedule conf */
-		reg[k] = NIX_AF_TL3X_PARENT(schq);
-		regval[k] = parent << 16;
-		k++;
-
-		reg[k] = NIX_AF_TL3X_TOPOLOGY(schq);
-		regval[k] = (child << 32) | (rr_prio << 1);
-		k++;
-
-		/* Link configuration */
-		if (!otx2_dev_is_sdp(dev) &&
-		    dev->link_cfg_lvl == NIX_TXSCH_LVL_TL3) {
-			reg[k] = NIX_AF_TL3_TL2X_LINKX_CFG(schq,
-						otx2_nix_get_link(dev));
-			regval[k] = BIT_ULL(12) | nix_get_relchan(dev);
-			k++;
-		}
-
-		break;
-	case NIX_TXSCH_LVL_TL2:
-		/* Parent and schedule conf */
-		reg[k] = NIX_AF_TL2X_PARENT(schq);
-		regval[k] = parent << 16;
-		k++;
-
-		reg[k] = NIX_AF_TL2X_TOPOLOGY(schq);
-		regval[k] = (child << 32) | (rr_prio << 1);
-		k++;
-
-		/* Link configuration */
-		if (!otx2_dev_is_sdp(dev) &&
-		    dev->link_cfg_lvl == NIX_TXSCH_LVL_TL2) {
-			reg[k] = NIX_AF_TL3_TL2X_LINKX_CFG(schq,
-						otx2_nix_get_link(dev));
-			regval[k] = BIT_ULL(12) | nix_get_relchan(dev);
-			k++;
-		}
-
-		break;
-	case NIX_TXSCH_LVL_TL1:
-		reg[k] = NIX_AF_TL1X_TOPOLOGY(schq);
-		regval[k] = (child << 32) | (rr_prio << 1 /*RR_PRIO*/);
-		k++;
-
-		break;
-	}
-
-	/* Prepare schedule config */
-	k += prepare_tm_sched_reg(dev, tm_node, &reg[k], &regval[k]);
-
-	/* Prepare shaping config */
-	k += prepare_tm_shaper_reg(tm_node, profile, &reg[k], &regval[k]);
-
-	if (!k)
-		return 0;
-
-	/* Copy and send config mbox */
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-	req->lvl = hw_lvl;
-	req->num_regs = k;
-
-	otx2_mbox_memcpy(req->reg, reg, sizeof(uint64_t) * k);
-	otx2_mbox_memcpy(req->regval, regval, sizeof(uint64_t) * k);
-	otx2_mbox_memcpy(req->regval_mask, regval_mask, sizeof(uint64_t) * k);
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		goto error;
-
-	return 0;
-error:
-	otx2_err("Txschq cfg request failed for node %p, rc=%d", tm_node, rc);
-	return rc;
-}
-
-
-static int
-nix_tm_txsch_reg_config(struct otx2_eth_dev *dev)
-{
-	struct otx2_nix_tm_node *tm_node;
-	uint32_t hw_lvl;
-	int rc = 0;
-
-	for (hw_lvl = 0; hw_lvl <= dev->otx2_tm_root_lvl; hw_lvl++) {
-		TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-			if (tm_node->hw_lvl == hw_lvl &&
-			    tm_node->hw_lvl != NIX_TXSCH_LVL_CNT) {
-				rc = populate_tm_reg(dev, tm_node);
-				if (rc)
-					goto exit;
-			}
-		}
-	}
-exit:
-	return rc;
-}
-
-static struct otx2_nix_tm_node *
-nix_tm_node_search(struct otx2_eth_dev *dev,
-		   uint32_t node_id, bool user)
-{
-	struct otx2_nix_tm_node *tm_node;
-
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (tm_node->id == node_id &&
-		    (user == !!(tm_node->flags & NIX_TM_NODE_USER)))
-			return tm_node;
-	}
-	return NULL;
-}
-
-static uint32_t
-check_rr(struct otx2_eth_dev *dev, uint32_t priority, uint32_t parent_id)
-{
-	struct otx2_nix_tm_node *tm_node;
-	uint32_t rr_num = 0;
-
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (!tm_node->parent)
-			continue;
-
-		if (!(tm_node->parent->id == parent_id))
-			continue;
-
-		if (tm_node->priority == priority)
-			rr_num++;
-	}
-	return rr_num;
-}
-
-static int
-nix_tm_update_parent_info(struct otx2_eth_dev *dev)
-{
-	struct otx2_nix_tm_node *tm_node_child;
-	struct otx2_nix_tm_node *tm_node;
-	struct otx2_nix_tm_node *parent;
-	uint32_t rr_num = 0;
-	uint32_t priority;
-
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (!tm_node->parent)
-			continue;
-		/* Count group of children of same priority i.e are RR */
-		parent = tm_node->parent;
-		priority = tm_node->priority;
-		rr_num = check_rr(dev, priority, parent->id);
-
-		/* Assuming that multiple RR groups are
-		 * not configured based on capability.
-		 */
-		if (rr_num > 1) {
-			parent->rr_prio = priority;
-			parent->rr_num = rr_num;
-		}
-
-		/* Find out static priority children that are not in RR */
-		TAILQ_FOREACH(tm_node_child, &dev->node_list, node) {
-			if (!tm_node_child->parent)
-				continue;
-			if (parent->id != tm_node_child->parent->id)
-				continue;
-			if (parent->max_prio == UINT32_MAX &&
-			    tm_node_child->priority != parent->rr_prio)
-				parent->max_prio = 0;
-
-			if (parent->max_prio < tm_node_child->priority &&
-			    parent->rr_prio != tm_node_child->priority)
-				parent->max_prio = tm_node_child->priority;
-		}
-	}
-
-	return 0;
-}
-
-static int
-nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
-			uint32_t parent_node_id, uint32_t priority,
-			uint32_t weight, uint16_t hw_lvl,
-			uint16_t lvl, bool user,
-			struct rte_tm_node_params *params)
-{
-	struct otx2_nix_tm_shaper_profile *profile;
-	struct otx2_nix_tm_node *tm_node, *parent_node;
-	uint32_t profile_id;
-
-	profile_id = params->shaper_profile_id;
-	profile = nix_tm_shaper_profile_search(dev, profile_id);
-
-	parent_node = nix_tm_node_search(dev, parent_node_id, user);
-
-	tm_node = rte_zmalloc("otx2_nix_tm_node",
-			      sizeof(struct otx2_nix_tm_node), 0);
-	if (!tm_node)
-		return -ENOMEM;
-
-	tm_node->lvl = lvl;
-	tm_node->hw_lvl = hw_lvl;
-
-	/* Maintain minimum weight */
-	if (!weight)
-		weight = 1;
-
-	tm_node->id = node_id;
-	tm_node->priority = priority;
-	tm_node->weight = weight;
-	tm_node->rr_prio = 0xf;
-	tm_node->max_prio = UINT32_MAX;
-	tm_node->hw_id = UINT32_MAX;
-	tm_node->flags = 0;
-	if (user)
-		tm_node->flags = NIX_TM_NODE_USER;
-
-	/* Packet mode */
-	if (!nix_tm_is_leaf(dev, lvl) &&
-	    ((profile && profile->params.packet_mode) ||
-	     (params->nonleaf.wfq_weight_mode &&
-	      params->nonleaf.n_sp_priorities &&
-	      !params->nonleaf.wfq_weight_mode[0])))
-		tm_node->pkt_mode = 1;
-
-	rte_memcpy(&tm_node->params, params, sizeof(struct rte_tm_node_params));
-
-	if (profile)
-		profile->reference_count++;
-
-	tm_node->parent = parent_node;
-	tm_node->parent_hw_id = UINT32_MAX;
-	shaper_default_red_algo(dev, tm_node, profile);
-
-	TAILQ_INSERT_TAIL(&dev->node_list, tm_node, node);
-
-	return 0;
-}
-
-static int
-nix_tm_clear_shaper_profiles(struct otx2_eth_dev *dev)
-{
-	struct otx2_nix_tm_shaper_profile *shaper_profile;
-
-	while ((shaper_profile = TAILQ_FIRST(&dev->shaper_profile_list))) {
-		if (shaper_profile->reference_count)
-			otx2_tm_dbg("Shaper profile %u has non zero references",
-				    shaper_profile->shaper_profile_id);
-		TAILQ_REMOVE(&dev->shaper_profile_list, shaper_profile, shaper);
-		rte_free(shaper_profile);
-	}
-
-	return 0;
-}
-
-static int
-nix_clear_path_xoff(struct otx2_eth_dev *dev,
-		    struct otx2_nix_tm_node *tm_node)
-{
-	struct nix_txschq_config *req;
-	struct otx2_nix_tm_node *p;
-	int rc;
-
-	/* Manipulating SW_XOFF not supported on Ax */
-	if (otx2_dev_is_Ax(dev))
-		return 0;
-
-	/* Enable nodes in path for flush to succeed */
-	if (!nix_tm_is_leaf(dev, tm_node->lvl))
-		p = tm_node;
-	else
-		p = tm_node->parent;
-	while (p) {
-		if (!(p->flags & NIX_TM_NODE_ENABLED) &&
-		    (p->flags & NIX_TM_NODE_HWRES)) {
-			req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-			req->lvl = p->hw_lvl;
-			req->num_regs = prepare_tm_sw_xoff(p, false, req->reg,
-							   req->regval);
-			rc = otx2_mbox_process(dev->mbox);
-			if (rc)
-				return rc;
-
-			p->flags |= NIX_TM_NODE_ENABLED;
-		}
-		p = p->parent;
-	}
-
-	return 0;
-}
-
-static int
-nix_smq_xoff(struct otx2_eth_dev *dev,
-	     struct otx2_nix_tm_node *tm_node,
-	     bool enable)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_txschq_config *req;
-	uint16_t smq;
-	int rc;
-
-	smq = tm_node->hw_id;
-	otx2_tm_dbg("Setting SMQ %u XOFF/FLUSH to %s", smq,
-		    enable ? "enable" : "disable");
-
-	rc = nix_clear_path_xoff(dev, tm_node);
-	if (rc)
-		return rc;
-
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-	req->lvl = NIX_TXSCH_LVL_SMQ;
-	req->num_regs = 1;
-
-	req->reg[0] = NIX_AF_SMQX_CFG(smq);
-	req->regval[0] = enable ? (BIT_ULL(50) | BIT_ULL(49)) : 0;
-	req->regval_mask[0] = enable ?
-				~(BIT_ULL(50) | BIT_ULL(49)) : ~BIT_ULL(50);
-
-	return otx2_mbox_process(mbox);
-}
-
-int
-otx2_nix_sq_sqb_aura_fc(void *__txq, bool enable)
-{
-	struct otx2_eth_txq *txq = __txq;
-	struct npa_aq_enq_req *req;
-	struct npa_aq_enq_rsp *rsp;
-	struct otx2_npa_lf *lf;
-	struct otx2_mbox *mbox;
-	uint64_t aura_handle;
-	int rc;
-
-	otx2_tm_dbg("Setting SQ %u SQB aura FC to %s", txq->sq,
-		    enable ? "enable" : "disable");
-
-	lf = otx2_npa_lf_obj_get();
-	if (!lf)
-		return -EFAULT;
-	mbox = lf->mbox;
-	/* Set/clear sqb aura fc_ena */
-	aura_handle = txq->sqb_pool->pool_id;
-	req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-
-	req->aura_id = npa_lf_aura_handle_to_aura(aura_handle);
-	req->ctype = NPA_AQ_CTYPE_AURA;
-	req->op = NPA_AQ_INSTOP_WRITE;
-	/* Below is not needed for aura writes but AF driver needs it */
-	/* AF will translate to associated poolctx */
-	req->aura.pool_addr = req->aura_id;
-
-	req->aura.fc_ena = enable;
-	req->aura_mask.fc_ena = 1;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	/* Read back npa aura ctx */
-	req = otx2_mbox_alloc_msg_npa_aq_enq(mbox);
-
-	req->aura_id = npa_lf_aura_handle_to_aura(aura_handle);
-	req->ctype = NPA_AQ_CTYPE_AURA;
-	req->op = NPA_AQ_INSTOP_READ;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	/* Init when enabled as there might be no triggers */
-	if (enable)
-		*(volatile uint64_t *)txq->fc_mem = rsp->aura.count;
-	else
-		*(volatile uint64_t *)txq->fc_mem = txq->nb_sqb_bufs;
-	/* Sync write barrier */
-	rte_wmb();
-
-	return 0;
-}
-
-static int
-nix_txq_flush_sq_spin(struct otx2_eth_txq *txq)
-{
-	uint16_t sqb_cnt, head_off, tail_off;
-	struct otx2_eth_dev *dev = txq->dev;
-	uint64_t wdata, val, prev;
-	uint16_t sq = txq->sq;
-	int64_t *regaddr;
-	uint64_t timeout;/* 10's of usec */
-
-	/* Wait for enough time based on shaper min rate */
-	timeout = (txq->qconf.nb_desc * NIX_MAX_HW_FRS * 8 * 1E5);
-	timeout = timeout / dev->tm_rate_min;
-	if (!timeout)
-		timeout = 10000;
-
-	wdata = ((uint64_t)sq << 32);
-	regaddr = (int64_t *)(dev->base + NIX_LF_SQ_OP_STATUS);
-	val = otx2_atomic64_add_nosync(wdata, regaddr);
-
-	/* Spin multiple iterations as "txq->fc_cache_pkts" can still
-	 * have space to send pkts even though fc_mem is disabled
-	 */
-
-	while (true) {
-		prev = val;
-		rte_delay_us(10);
-		val = otx2_atomic64_add_nosync(wdata, regaddr);
-		/* Continue on error */
-		if (val & BIT_ULL(63))
-			continue;
-
-		if (prev != val)
-			continue;
-
-		sqb_cnt = val & 0xFFFF;
-		head_off = (val >> 20) & 0x3F;
-		tail_off = (val >> 28) & 0x3F;
-
-		/* SQ reached quiescent state */
-		if (sqb_cnt <= 1 && head_off == tail_off &&
-		    (*txq->fc_mem == txq->nb_sqb_bufs)) {
-			break;
-		}
-
-		/* Timeout */
-		if (!timeout)
-			goto exit;
-		timeout--;
-	}
-
-	return 0;
-exit:
-	otx2_nix_tm_dump(dev);
-	return -EFAULT;
-}
-
-/* Flush and disable tx queue and its parent SMQ */
-int otx2_nix_sq_flush_pre(void *_txq, bool dev_started)
-{
-	struct otx2_nix_tm_node *tm_node, *sibling;
-	struct otx2_eth_txq *txq;
-	struct otx2_eth_dev *dev;
-	uint16_t sq;
-	bool user;
-	int rc;
-
-	txq = _txq;
-	dev = txq->dev;
-	sq = txq->sq;
-
-	user = !!(dev->tm_flags & NIX_TM_COMMITTED);
-
-	/* Find the node for this SQ */
-	tm_node = nix_tm_node_search(dev, sq, user);
-	if (!tm_node || !(tm_node->flags & NIX_TM_NODE_ENABLED)) {
-		otx2_err("Invalid node/state for sq %u", sq);
-		return -EFAULT;
-	}
-
-	/* Enable CGX RXTX to drain pkts */
-	if (!dev_started) {
-		/* Though it enables both RX MCAM Entries and CGX Link
-		 * we assume all the rx queues are stopped way back.
-		 */
-		otx2_mbox_alloc_msg_nix_lf_start_rx(dev->mbox);
-		rc = otx2_mbox_process(dev->mbox);
-		if (rc) {
-			otx2_err("cgx start failed, rc=%d", rc);
-			return rc;
-		}
-	}
-
-	/* Disable smq xoff for case it was enabled earlier */
-	rc = nix_smq_xoff(dev, tm_node->parent, false);
-	if (rc) {
-		otx2_err("Failed to enable smq %u, rc=%d",
-			 tm_node->parent->hw_id, rc);
-		return rc;
-	}
-
-	/* As per HRM, to disable an SQ, all other SQ's
-	 * that feed to same SMQ must be paused before SMQ flush.
-	 */
-	TAILQ_FOREACH(sibling, &dev->node_list, node) {
-		if (sibling->parent != tm_node->parent)
-			continue;
-		if (!(sibling->flags & NIX_TM_NODE_ENABLED))
-			continue;
-
-		sq = sibling->id;
-		txq = dev->eth_dev->data->tx_queues[sq];
-		if (!txq)
-			continue;
-
-		rc = otx2_nix_sq_sqb_aura_fc(txq, false);
-		if (rc) {
-			otx2_err("Failed to disable sqb aura fc, rc=%d", rc);
-			goto cleanup;
-		}
-
-		/* Wait for sq entries to be flushed */
-		rc = nix_txq_flush_sq_spin(txq);
-		if (rc) {
-			otx2_err("Failed to drain sq %u, rc=%d\n", txq->sq, rc);
-			return rc;
-		}
-	}
-
-	tm_node->flags &= ~NIX_TM_NODE_ENABLED;
-
-	/* Disable and flush */
-	rc = nix_smq_xoff(dev, tm_node->parent, true);
-	if (rc) {
-		otx2_err("Failed to disable smq %u, rc=%d",
-			 tm_node->parent->hw_id, rc);
-		goto cleanup;
-	}
-cleanup:
-	/* Restore cgx state */
-	if (!dev_started) {
-		otx2_mbox_alloc_msg_nix_lf_stop_rx(dev->mbox);
-		rc |= otx2_mbox_process(dev->mbox);
-	}
-
-	return rc;
-}
-
-int otx2_nix_sq_flush_post(void *_txq)
-{
-	struct otx2_nix_tm_node *tm_node, *sibling;
-	struct otx2_eth_txq *txq = _txq;
-	struct otx2_eth_txq *s_txq;
-	struct otx2_eth_dev *dev;
-	bool once = false;
-	uint16_t sq, s_sq;
-	bool user;
-	int rc;
-
-	dev = txq->dev;
-	sq = txq->sq;
-	user = !!(dev->tm_flags & NIX_TM_COMMITTED);
-
-	/* Find the node for this SQ */
-	tm_node = nix_tm_node_search(dev, sq, user);
-	if (!tm_node) {
-		otx2_err("Invalid node for sq %u", sq);
-		return -EFAULT;
-	}
-
-	/* Enable all the siblings back */
-	TAILQ_FOREACH(sibling, &dev->node_list, node) {
-		if (sibling->parent != tm_node->parent)
-			continue;
-
-		if (sibling->id == sq)
-			continue;
-
-		if (!(sibling->flags & NIX_TM_NODE_ENABLED))
-			continue;
-
-		s_sq = sibling->id;
-		s_txq = dev->eth_dev->data->tx_queues[s_sq];
-		if (!s_txq)
-			continue;
-
-		if (!once) {
-			/* Enable back if any SQ is still present */
-			rc = nix_smq_xoff(dev, tm_node->parent, false);
-			if (rc) {
-				otx2_err("Failed to enable smq %u, rc=%d",
-					 tm_node->parent->hw_id, rc);
-				return rc;
-			}
-			once = true;
-		}
-
-		rc = otx2_nix_sq_sqb_aura_fc(s_txq, true);
-		if (rc) {
-			otx2_err("Failed to enable sqb aura fc, rc=%d", rc);
-			return rc;
-		}
-	}
-
-	return 0;
-}
-
-static int
-nix_sq_sched_data(struct otx2_eth_dev *dev,
-		  struct otx2_nix_tm_node *tm_node,
-		  bool rr_quantum_only)
-{
-	struct rte_eth_dev *eth_dev = dev->eth_dev;
-	struct otx2_mbox *mbox = dev->mbox;
-	uint16_t sq = tm_node->id, smq;
-	struct nix_aq_enq_req *req;
-	uint64_t rr_quantum;
-	int rc;
-
-	smq = tm_node->parent->hw_id;
-	rr_quantum = NIX_TM_WEIGHT_TO_RR_QUANTUM(tm_node->weight);
-
-	if (rr_quantum_only)
-		otx2_tm_dbg("Update sq(%u) rr_quantum 0x%"PRIx64, sq, rr_quantum);
-	else
-		otx2_tm_dbg("Enabling sq(%u)->smq(%u), rr_quantum 0x%"PRIx64,
-			    sq, smq, rr_quantum);
-
-	if (sq > eth_dev->data->nb_tx_queues)
-		return -EFAULT;
-
-	req = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
-	req->qidx = sq;
-	req->ctype = NIX_AQ_CTYPE_SQ;
-	req->op = NIX_AQ_INSTOP_WRITE;
-
-	/* smq update only when needed */
-	if (!rr_quantum_only) {
-		req->sq.smq = smq;
-		req->sq_mask.smq = ~req->sq_mask.smq;
-	}
-	req->sq.smq_rr_quantum = rr_quantum;
-	req->sq_mask.smq_rr_quantum = ~req->sq_mask.smq_rr_quantum;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		otx2_err("Failed to set smq, rc=%d", rc);
-	return rc;
-}
-
-int otx2_nix_sq_enable(void *_txq)
-{
-	struct otx2_eth_txq *txq = _txq;
-	int rc;
-
-	/* Enable sqb_aura fc */
-	rc = otx2_nix_sq_sqb_aura_fc(txq, true);
-	if (rc) {
-		otx2_err("Failed to enable sqb aura fc, rc=%d", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
-static int
-nix_tm_free_resources(struct otx2_eth_dev *dev, uint32_t flags_mask,
-		      uint32_t flags, bool hw_only)
-{
-	struct otx2_nix_tm_shaper_profile *profile;
-	struct otx2_nix_tm_node *tm_node, *next_node;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_txsch_free_req *req;
-	uint32_t profile_id;
-	int rc = 0;
-
-	next_node = TAILQ_FIRST(&dev->node_list);
-	while (next_node) {
-		tm_node = next_node;
-		next_node = TAILQ_NEXT(tm_node, node);
-
-		/* Check for only requested nodes */
-		if ((tm_node->flags & flags_mask) != flags)
-			continue;
-
-		if (!nix_tm_is_leaf(dev, tm_node->lvl) &&
-		    tm_node->hw_lvl != NIX_TXSCH_LVL_TL1 &&
-		    tm_node->flags & NIX_TM_NODE_HWRES) {
-			/* Free specific HW resource */
-			otx2_tm_dbg("Free hwres %s(%u) lvl %u id %u (%p)",
-				    nix_hwlvl2str(tm_node->hw_lvl),
-				    tm_node->hw_id, tm_node->lvl,
-				    tm_node->id, tm_node);
-
-			rc = nix_clear_path_xoff(dev, tm_node);
-			if (rc)
-				return rc;
-
-			req = otx2_mbox_alloc_msg_nix_txsch_free(mbox);
-			req->flags = 0;
-			req->schq_lvl = tm_node->hw_lvl;
-			req->schq = tm_node->hw_id;
-			rc = otx2_mbox_process(mbox);
-			if (rc)
-				return rc;
-			tm_node->flags &= ~NIX_TM_NODE_HWRES;
-		}
-
-		/* Leave software elements if needed */
-		if (hw_only)
-			continue;
-
-		otx2_tm_dbg("Free node lvl %u id %u (%p)",
-			    tm_node->lvl, tm_node->id, tm_node);
-
-		profile_id = tm_node->params.shaper_profile_id;
-		profile = nix_tm_shaper_profile_search(dev, profile_id);
-		if (profile)
-			profile->reference_count--;
-
-		TAILQ_REMOVE(&dev->node_list, tm_node, node);
-		rte_free(tm_node);
-	}
-
-	if (!flags_mask) {
-		/* Free all hw resources */
-		req = otx2_mbox_alloc_msg_nix_txsch_free(mbox);
-		req->flags = TXSCHQ_FREE_ALL;
-
-		return otx2_mbox_process(mbox);
-	}
-
-	return rc;
-}
-
-static uint8_t
-nix_tm_copy_rsp_to_dev(struct otx2_eth_dev *dev,
-		       struct nix_txsch_alloc_rsp *rsp)
-{
-	uint16_t schq;
-	uint8_t lvl;
-
-	for (lvl = 0; lvl < NIX_TXSCH_LVL_CNT; lvl++) {
-		for (schq = 0; schq < MAX_TXSCHQ_PER_FUNC; schq++) {
-			dev->txschq_list[lvl][schq] = rsp->schq_list[lvl][schq];
-			dev->txschq_contig_list[lvl][schq] =
-				rsp->schq_contig_list[lvl][schq];
-		}
-
-		dev->txschq[lvl] = rsp->schq[lvl];
-		dev->txschq_contig[lvl] = rsp->schq_contig[lvl];
-	}
-	return 0;
-}
-
-static int
-nix_tm_assign_id_to_node(struct otx2_eth_dev *dev,
-			 struct otx2_nix_tm_node *child,
-			 struct otx2_nix_tm_node *parent)
-{
-	uint32_t hw_id, schq_con_index, prio_offset;
-	uint32_t l_id, schq_index;
-
-	otx2_tm_dbg("Assign hw id for child node %s lvl %u id %u (%p)",
-		    nix_hwlvl2str(child->hw_lvl), child->lvl, child->id, child);
-
-	child->flags |= NIX_TM_NODE_HWRES;
-
-	/* Process root nodes */
-	if (dev->otx2_tm_root_lvl == NIX_TXSCH_LVL_TL2 &&
-	    child->hw_lvl == dev->otx2_tm_root_lvl && !parent) {
-		int idx = 0;
-		uint32_t tschq_con_index;
-
-		l_id = child->hw_lvl;
-		tschq_con_index = dev->txschq_contig_index[l_id];
-		hw_id = dev->txschq_contig_list[l_id][tschq_con_index];
-		child->hw_id = hw_id;
-		dev->txschq_contig_index[l_id]++;
-		/* Update TL1 hw_id for its parent for config purpose */
-		idx = dev->txschq_index[NIX_TXSCH_LVL_TL1]++;
-		hw_id = dev->txschq_list[NIX_TXSCH_LVL_TL1][idx];
-		child->parent_hw_id = hw_id;
-		return 0;
-	}
-	if (dev->otx2_tm_root_lvl == NIX_TXSCH_LVL_TL1 &&
-	    child->hw_lvl == dev->otx2_tm_root_lvl && !parent) {
-		uint32_t tschq_con_index;
-
-		l_id = child->hw_lvl;
-		tschq_con_index = dev->txschq_index[l_id];
-		hw_id = dev->txschq_list[l_id][tschq_con_index];
-		child->hw_id = hw_id;
-		dev->txschq_index[l_id]++;
-		return 0;
-	}
-
-	/* Process children with parents */
-	l_id = child->hw_lvl;
-	schq_index = dev->txschq_index[l_id];
-	schq_con_index = dev->txschq_contig_index[l_id];
-
-	if (child->priority == parent->rr_prio) {
-		hw_id = dev->txschq_list[l_id][schq_index];
-		child->hw_id = hw_id;
-		child->parent_hw_id = parent->hw_id;
-		dev->txschq_index[l_id]++;
-	} else {
-		prio_offset = schq_con_index + child->priority;
-		hw_id = dev->txschq_contig_list[l_id][prio_offset];
-		child->hw_id = hw_id;
-	}
-	return 0;
-}
-
-static int
-nix_tm_assign_hw_id(struct otx2_eth_dev *dev)
-{
-	struct otx2_nix_tm_node *parent, *child;
-	uint32_t child_hw_lvl, con_index_inc, i;
-
-	for (i = NIX_TXSCH_LVL_TL1; i > 0; i--) {
-		TAILQ_FOREACH(parent, &dev->node_list, node) {
-			child_hw_lvl = parent->hw_lvl - 1;
-			if (parent->hw_lvl != i)
-				continue;
-			TAILQ_FOREACH(child, &dev->node_list, node) {
-				if (!child->parent)
-					continue;
-				if (child->parent->id != parent->id)
-					continue;
-				nix_tm_assign_id_to_node(dev, child, parent);
-			}
-
-			con_index_inc = parent->max_prio + 1;
-			dev->txschq_contig_index[child_hw_lvl] += con_index_inc;
-
-			/*
-			 * Explicitly assign id to parent node if it
-			 * doesn't have a parent
-			 */
-			if (parent->hw_lvl == dev->otx2_tm_root_lvl)
-				nix_tm_assign_id_to_node(dev, parent, NULL);
-		}
-	}
-	return 0;
-}
-
-static uint8_t
-nix_tm_count_req_schq(struct otx2_eth_dev *dev,
-		      struct nix_txsch_alloc_req *req, uint8_t lvl)
-{
-	struct otx2_nix_tm_node *tm_node;
-	uint8_t contig_count;
-
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (lvl == tm_node->hw_lvl) {
-			req->schq[lvl - 1] += tm_node->rr_num;
-			if (tm_node->max_prio != UINT32_MAX) {
-				contig_count = tm_node->max_prio + 1;
-				req->schq_contig[lvl - 1] += contig_count;
-			}
-		}
-		if (lvl == dev->otx2_tm_root_lvl &&
-		    dev->otx2_tm_root_lvl && lvl == NIX_TXSCH_LVL_TL2 &&
-		    tm_node->hw_lvl == dev->otx2_tm_root_lvl) {
-			req->schq_contig[dev->otx2_tm_root_lvl]++;
-		}
-	}
-
-	req->schq[NIX_TXSCH_LVL_TL1] = 1;
-	req->schq_contig[NIX_TXSCH_LVL_TL1] = 0;
-
-	return 0;
-}
-
-static int
-nix_tm_prepare_txschq_req(struct otx2_eth_dev *dev,
-			  struct nix_txsch_alloc_req *req)
-{
-	uint8_t i;
-
-	for (i = NIX_TXSCH_LVL_TL1; i > 0; i--)
-		nix_tm_count_req_schq(dev, req, i);
-
-	for (i = 0; i < NIX_TXSCH_LVL_CNT; i++) {
-		dev->txschq_index[i] = 0;
-		dev->txschq_contig_index[i] = 0;
-	}
-	return 0;
-}
-
-static int
-nix_tm_send_txsch_alloc_msg(struct otx2_eth_dev *dev)
-{
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_txsch_alloc_req *req;
-	struct nix_txsch_alloc_rsp *rsp;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_nix_txsch_alloc(mbox);
-
-	rc = nix_tm_prepare_txschq_req(dev, req);
-	if (rc)
-		return rc;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	nix_tm_copy_rsp_to_dev(dev, rsp);
-	dev->link_cfg_lvl = rsp->link_cfg_lvl;
-
-	nix_tm_assign_hw_id(dev);
-	return 0;
-}
-
-static int
-nix_tm_alloc_resources(struct rte_eth_dev *eth_dev, bool xmit_enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_node *tm_node;
-	struct otx2_eth_txq *txq;
-	uint16_t sq;
-	int rc;
-
-	nix_tm_update_parent_info(dev);
-
-	rc = nix_tm_send_txsch_alloc_msg(dev);
-	if (rc) {
-		otx2_err("TM failed to alloc tm resources=%d", rc);
-		return rc;
-	}
-
-	rc = nix_tm_txsch_reg_config(dev);
-	if (rc) {
-		otx2_err("TM failed to configure sched registers=%d", rc);
-		return rc;
-	}
-
-	/* Trigger MTU recalculate as SMQ needs MTU conf */
-	if (eth_dev->data->dev_started && eth_dev->data->nb_rx_queues) {
-		rc = otx2_nix_recalc_mtu(eth_dev);
-		if (rc) {
-			otx2_err("TM MTU update failed, rc=%d", rc);
-			return rc;
-		}
-	}
-
-	/* Mark all non-leaf's as enabled */
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (!nix_tm_is_leaf(dev, tm_node->lvl))
-			tm_node->flags |= NIX_TM_NODE_ENABLED;
-	}
-
-	if (!xmit_enable)
-		return 0;
-
-	/* Update SQ Sched Data while SQ is idle */
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (!nix_tm_is_leaf(dev, tm_node->lvl))
-			continue;
-
-		rc = nix_sq_sched_data(dev, tm_node, false);
-		if (rc) {
-			otx2_err("SQ %u sched update failed, rc=%d",
-				 tm_node->id, rc);
-			return rc;
-		}
-	}
-
-	/* Finally XON all SMQ's */
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (tm_node->hw_lvl != NIX_TXSCH_LVL_SMQ)
-			continue;
-
-		rc = nix_smq_xoff(dev, tm_node, false);
-		if (rc) {
-			otx2_err("Failed to enable smq %u, rc=%d",
-				 tm_node->hw_id, rc);
-			return rc;
-		}
-	}
-
-	/* Enable xmit as all the topology is ready */
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (!nix_tm_is_leaf(dev, tm_node->lvl))
-			continue;
-
-		sq = tm_node->id;
-		txq = eth_dev->data->tx_queues[sq];
-
-		rc = otx2_nix_sq_enable(txq);
-		if (rc) {
-			otx2_err("TM sw xon failed on SQ %u, rc=%d",
-				 tm_node->id, rc);
-			return rc;
-		}
-		tm_node->flags |= NIX_TM_NODE_ENABLED;
-	}
-
-	return 0;
-}
-
-static int
-send_tm_reqval(struct otx2_mbox *mbox,
-	       struct nix_txschq_config *req,
-	       struct rte_tm_error *error)
-{
-	int rc;
-
-	if (!req->num_regs ||
-	    req->num_regs > MAX_REGS_PER_MBOX_MSG) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "invalid config";
-		return -EIO;
-	}
-
-	rc = otx2_mbox_process(mbox);
-	if (rc) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "unexpected fatal error";
-	}
-	return rc;
-}
-
-static uint16_t
-nix_tm_lvl2nix(struct otx2_eth_dev *dev, uint32_t lvl)
-{
-	if (nix_tm_have_tl1_access(dev)) {
-		switch (lvl) {
-		case OTX2_TM_LVL_ROOT:
-			return NIX_TXSCH_LVL_TL1;
-		case OTX2_TM_LVL_SCH1:
-			return NIX_TXSCH_LVL_TL2;
-		case OTX2_TM_LVL_SCH2:
-			return NIX_TXSCH_LVL_TL3;
-		case OTX2_TM_LVL_SCH3:
-			return NIX_TXSCH_LVL_TL4;
-		case OTX2_TM_LVL_SCH4:
-			return NIX_TXSCH_LVL_SMQ;
-		default:
-			return NIX_TXSCH_LVL_CNT;
-		}
-	} else {
-		switch (lvl) {
-		case OTX2_TM_LVL_ROOT:
-			return NIX_TXSCH_LVL_TL2;
-		case OTX2_TM_LVL_SCH1:
-			return NIX_TXSCH_LVL_TL3;
-		case OTX2_TM_LVL_SCH2:
-			return NIX_TXSCH_LVL_TL4;
-		case OTX2_TM_LVL_SCH3:
-			return NIX_TXSCH_LVL_SMQ;
-		default:
-			return NIX_TXSCH_LVL_CNT;
-		}
-	}
-}
-
-static uint16_t
-nix_max_prio(struct otx2_eth_dev *dev, uint16_t hw_lvl)
-{
-	if (hw_lvl >= NIX_TXSCH_LVL_CNT)
-		return 0;
-
-	/* MDQ doesn't support SP */
-	if (hw_lvl == NIX_TXSCH_LVL_MDQ)
-		return 0;
-
-	/* PF's TL1 with VF's enabled doesn't support SP */
-	if (hw_lvl == NIX_TXSCH_LVL_TL1 &&
-	    (dev->otx2_tm_root_lvl == NIX_TXSCH_LVL_TL2 ||
-	     (dev->tm_flags & NIX_TM_TL1_NO_SP)))
-		return 0;
-
-	return TXSCH_TLX_SP_PRIO_MAX - 1;
-}
-
-
-static int
-validate_prio(struct otx2_eth_dev *dev, uint32_t lvl,
-	      uint32_t parent_id, uint32_t priority,
-	      struct rte_tm_error *error)
-{
-	uint8_t priorities[TXSCH_TLX_SP_PRIO_MAX];
-	struct otx2_nix_tm_node *tm_node;
-	uint32_t rr_num = 0;
-	int i;
-
-	/* Validate priority against max */
-	if (priority > nix_max_prio(dev, nix_tm_lvl2nix(dev, lvl - 1))) {
-		error->type = RTE_TM_ERROR_TYPE_CAPABILITIES;
-		error->message = "unsupported priority value";
-		return -EINVAL;
-	}
-
-	if (parent_id == RTE_TM_NODE_ID_NULL)
-		return 0;
-
-	memset(priorities, 0, TXSCH_TLX_SP_PRIO_MAX);
-	priorities[priority] = 1;
-
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (!tm_node->parent)
-			continue;
-
-		if (!(tm_node->flags & NIX_TM_NODE_USER))
-			continue;
-
-		if (tm_node->parent->id != parent_id)
-			continue;
-
-		priorities[tm_node->priority]++;
-	}
-
-	for (i = 0; i < TXSCH_TLX_SP_PRIO_MAX; i++)
-		if (priorities[i] > 1)
-			rr_num++;
-
-	/* At max, one rr groups per parent */
-	if (rr_num > 1) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_PRIORITY;
-		error->message = "multiple DWRR node priority";
-		return -EINVAL;
-	}
-
-	/* Check for previous priority to avoid holes in priorities */
-	if (priority && !priorities[priority - 1]) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_PRIORITY;
-		error->message = "priority not in order";
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int
-read_tm_reg(struct otx2_mbox *mbox, uint64_t reg,
-	    uint64_t *regval, uint32_t hw_lvl)
-{
-	volatile struct nix_txschq_config *req;
-	struct nix_txschq_config *rsp;
-	int rc;
-
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-	req->read = 1;
-	req->lvl = hw_lvl;
-	req->reg[0] = reg;
-	req->num_regs = 1;
-
-	rc = otx2_mbox_process_msg(mbox, (void **)&rsp);
-	if (rc)
-		return rc;
-	*regval = rsp->regval[0];
-	return 0;
-}
-
-/* Search for min rate in topology */
-static void
-nix_tm_shaper_profile_update_min(struct otx2_eth_dev *dev)
-{
-	struct otx2_nix_tm_shaper_profile *profile;
-	uint64_t rate_min = 1E9; /* 1 Gbps */
-
-	TAILQ_FOREACH(profile, &dev->shaper_profile_list, shaper) {
-		if (profile->params.peak.rate &&
-		    profile->params.peak.rate < rate_min)
-			rate_min = profile->params.peak.rate;
-
-		if (profile->params.committed.rate &&
-		    profile->params.committed.rate < rate_min)
-			rate_min = profile->params.committed.rate;
-	}
-
-	dev->tm_rate_min = rate_min;
-}
-
-static int
-nix_xmit_disable(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint16_t sq_cnt = eth_dev->data->nb_tx_queues;
-	uint16_t sqb_cnt, head_off, tail_off;
-	struct otx2_nix_tm_node *tm_node;
-	struct otx2_eth_txq *txq;
-	uint64_t wdata, val;
-	int i, rc;
-
-	otx2_tm_dbg("Disabling xmit on %s", eth_dev->data->name);
-
-	/* Enable CGX RXTX to drain pkts */
-	if (!eth_dev->data->dev_started) {
-		otx2_mbox_alloc_msg_nix_lf_start_rx(dev->mbox);
-		rc = otx2_mbox_process(dev->mbox);
-		if (rc)
-			return rc;
-	}
-
-	/* XON all SMQ's */
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (tm_node->hw_lvl != NIX_TXSCH_LVL_SMQ)
-			continue;
-		if (!(tm_node->flags & NIX_TM_NODE_HWRES))
-			continue;
-
-		rc = nix_smq_xoff(dev, tm_node, false);
-		if (rc) {
-			otx2_err("Failed to enable smq %u, rc=%d",
-				 tm_node->hw_id, rc);
-			goto cleanup;
-		}
-	}
-
-	/* Flush all tx queues */
-	for (i = 0; i < sq_cnt; i++) {
-		txq = eth_dev->data->tx_queues[i];
-
-		rc = otx2_nix_sq_sqb_aura_fc(txq, false);
-		if (rc) {
-			otx2_err("Failed to disable sqb aura fc, rc=%d", rc);
-			goto cleanup;
-		}
-
-		/* Wait for sq entries to be flushed */
-		rc = nix_txq_flush_sq_spin(txq);
-		if (rc) {
-			otx2_err("Failed to drain sq, rc=%d\n", rc);
-			goto cleanup;
-		}
-	}
-
-	/* XOFF & Flush all SMQ's. HRM mandates
-	 * all SQ's empty before SMQ flush is issued.
-	 */
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (tm_node->hw_lvl != NIX_TXSCH_LVL_SMQ)
-			continue;
-		if (!(tm_node->flags & NIX_TM_NODE_HWRES))
-			continue;
-
-		rc = nix_smq_xoff(dev, tm_node, true);
-		if (rc) {
-			otx2_err("Failed to enable smq %u, rc=%d",
-				 tm_node->hw_id, rc);
-			goto cleanup;
-		}
-	}
-
-	/* Verify sanity of all tx queues */
-	for (i = 0; i < sq_cnt; i++) {
-		txq = eth_dev->data->tx_queues[i];
-
-		wdata = ((uint64_t)txq->sq << 32);
-		val = otx2_atomic64_add_nosync(wdata,
-			       (int64_t *)(dev->base + NIX_LF_SQ_OP_STATUS));
-
-		sqb_cnt = val & 0xFFFF;
-		head_off = (val >> 20) & 0x3F;
-		tail_off = (val >> 28) & 0x3F;
-
-		if (sqb_cnt > 1 || head_off != tail_off ||
-		    (*txq->fc_mem != txq->nb_sqb_bufs))
-			otx2_err("Failed to gracefully flush sq %u", txq->sq);
-	}
-
-cleanup:
-	/* restore cgx state */
-	if (!eth_dev->data->dev_started) {
-		otx2_mbox_alloc_msg_nix_lf_stop_rx(dev->mbox);
-		rc |= otx2_mbox_process(dev->mbox);
-	}
-
-	return rc;
-}
-
-static int
-otx2_nix_tm_node_type_get(struct rte_eth_dev *eth_dev, uint32_t node_id,
-			  int *is_leaf, struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_node *tm_node;
-
-	if (is_leaf == NULL) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		return -EINVAL;
-	}
-
-	tm_node = nix_tm_node_search(dev, node_id, true);
-	if (node_id == RTE_TM_NODE_ID_NULL || !tm_node) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		return -EINVAL;
-	}
-	if (nix_tm_is_leaf(dev, tm_node->lvl))
-		*is_leaf = true;
-	else
-		*is_leaf = false;
-	return 0;
-}
-
-static int
-otx2_nix_tm_capa_get(struct rte_eth_dev *eth_dev,
-		     struct rte_tm_capabilities *cap,
-		     struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc, max_nr_nodes = 0, i;
-	struct free_rsrcs_rsp *rsp;
-
-	memset(cap, 0, sizeof(*cap));
-
-	otx2_mbox_alloc_msg_free_rsrc_cnt(mbox);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "unexpected fatal error";
-		return rc;
-	}
-
-	for (i = 0; i < NIX_TXSCH_LVL_TL1; i++)
-		max_nr_nodes += rsp->schq[i];
-
-	cap->n_nodes_max = max_nr_nodes + dev->tm_leaf_cnt;
-	/* TL1 level is reserved for PF */
-	cap->n_levels_max = nix_tm_have_tl1_access(dev) ?
-				OTX2_TM_LVL_MAX : OTX2_TM_LVL_MAX - 1;
-	cap->non_leaf_nodes_identical = 1;
-	cap->leaf_nodes_identical = 1;
-
-	/* Shaper Capabilities */
-	cap->shaper_private_n_max = max_nr_nodes;
-	cap->shaper_n_max = max_nr_nodes;
-	cap->shaper_private_dual_rate_n_max = max_nr_nodes;
-	cap->shaper_private_rate_min = MIN_SHAPER_RATE / 8;
-	cap->shaper_private_rate_max = MAX_SHAPER_RATE / 8;
-	cap->shaper_private_packet_mode_supported = 1;
-	cap->shaper_private_byte_mode_supported = 1;
-	cap->shaper_pkt_length_adjust_min = NIX_LENGTH_ADJUST_MIN;
-	cap->shaper_pkt_length_adjust_max = NIX_LENGTH_ADJUST_MAX;
-
-	/* Schedule Capabilities */
-	cap->sched_n_children_max = rsp->schq[NIX_TXSCH_LVL_MDQ];
-	cap->sched_sp_n_priorities_max = TXSCH_TLX_SP_PRIO_MAX;
-	cap->sched_wfq_n_children_per_group_max = cap->sched_n_children_max;
-	cap->sched_wfq_n_groups_max = 1;
-	cap->sched_wfq_weight_max = MAX_SCHED_WEIGHT;
-	cap->sched_wfq_packet_mode_supported = 1;
-	cap->sched_wfq_byte_mode_supported = 1;
-
-	cap->dynamic_update_mask =
-		RTE_TM_UPDATE_NODE_PARENT_KEEP_LEVEL |
-		RTE_TM_UPDATE_NODE_SUSPEND_RESUME;
-	cap->stats_mask =
-		RTE_TM_STATS_N_PKTS |
-		RTE_TM_STATS_N_BYTES |
-		RTE_TM_STATS_N_PKTS_RED_DROPPED |
-		RTE_TM_STATS_N_BYTES_RED_DROPPED;
-
-	for (i = 0; i < RTE_COLORS; i++) {
-		cap->mark_vlan_dei_supported[i] = false;
-		cap->mark_ip_ecn_tcp_supported[i] = false;
-		cap->mark_ip_dscp_supported[i] = false;
-	}
-
-	return 0;
-}
-
-static int
-otx2_nix_tm_level_capa_get(struct rte_eth_dev *eth_dev, uint32_t lvl,
-				   struct rte_tm_level_capabilities *cap,
-				   struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct free_rsrcs_rsp *rsp;
-	uint16_t hw_lvl;
-	int rc;
-
-	memset(cap, 0, sizeof(*cap));
-
-	otx2_mbox_alloc_msg_free_rsrc_cnt(mbox);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "unexpected fatal error";
-		return rc;
-	}
-
-	hw_lvl = nix_tm_lvl2nix(dev, lvl);
-
-	if (nix_tm_is_leaf(dev, lvl)) {
-		/* Leaf */
-		cap->n_nodes_max = dev->tm_leaf_cnt;
-		cap->n_nodes_leaf_max = dev->tm_leaf_cnt;
-		cap->leaf_nodes_identical = 1;
-		cap->leaf.stats_mask =
-			RTE_TM_STATS_N_PKTS |
-			RTE_TM_STATS_N_BYTES;
-
-	} else if (lvl == OTX2_TM_LVL_ROOT) {
-		/* Root node, aka TL2(vf)/TL1(pf) */
-		cap->n_nodes_max = 1;
-		cap->n_nodes_nonleaf_max = 1;
-		cap->non_leaf_nodes_identical = 1;
-
-		cap->nonleaf.shaper_private_supported = true;
-		cap->nonleaf.shaper_private_dual_rate_supported =
-			nix_tm_have_tl1_access(dev) ? false : true;
-		cap->nonleaf.shaper_private_rate_min = MIN_SHAPER_RATE / 8;
-		cap->nonleaf.shaper_private_rate_max = MAX_SHAPER_RATE / 8;
-		cap->nonleaf.shaper_private_packet_mode_supported = 1;
-		cap->nonleaf.shaper_private_byte_mode_supported = 1;
-
-		cap->nonleaf.sched_n_children_max = rsp->schq[hw_lvl - 1];
-		cap->nonleaf.sched_sp_n_priorities_max =
-					nix_max_prio(dev, hw_lvl) + 1;
-		cap->nonleaf.sched_wfq_n_groups_max = 1;
-		cap->nonleaf.sched_wfq_weight_max = MAX_SCHED_WEIGHT;
-		cap->nonleaf.sched_wfq_packet_mode_supported = 1;
-		cap->nonleaf.sched_wfq_byte_mode_supported = 1;
-
-		if (nix_tm_have_tl1_access(dev))
-			cap->nonleaf.stats_mask =
-				RTE_TM_STATS_N_PKTS_RED_DROPPED |
-				RTE_TM_STATS_N_BYTES_RED_DROPPED;
-	} else if ((lvl < OTX2_TM_LVL_MAX) &&
-		   (hw_lvl < NIX_TXSCH_LVL_CNT)) {
-		/* TL2, TL3, TL4, MDQ */
-		cap->n_nodes_max = rsp->schq[hw_lvl];
-		cap->n_nodes_nonleaf_max = cap->n_nodes_max;
-		cap->non_leaf_nodes_identical = 1;
-
-		cap->nonleaf.shaper_private_supported = true;
-		cap->nonleaf.shaper_private_dual_rate_supported = true;
-		cap->nonleaf.shaper_private_rate_min = MIN_SHAPER_RATE / 8;
-		cap->nonleaf.shaper_private_rate_max = MAX_SHAPER_RATE / 8;
-		cap->nonleaf.shaper_private_packet_mode_supported = 1;
-		cap->nonleaf.shaper_private_byte_mode_supported = 1;
-
-		/* MDQ doesn't support Strict Priority */
-		if (hw_lvl == NIX_TXSCH_LVL_MDQ)
-			cap->nonleaf.sched_n_children_max = dev->tm_leaf_cnt;
-		else
-			cap->nonleaf.sched_n_children_max =
-				rsp->schq[hw_lvl - 1];
-		cap->nonleaf.sched_sp_n_priorities_max =
-			nix_max_prio(dev, hw_lvl) + 1;
-		cap->nonleaf.sched_wfq_n_groups_max = 1;
-		cap->nonleaf.sched_wfq_weight_max = MAX_SCHED_WEIGHT;
-		cap->nonleaf.sched_wfq_packet_mode_supported = 1;
-		cap->nonleaf.sched_wfq_byte_mode_supported = 1;
-	} else {
-		/* unsupported level */
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		return rc;
-	}
-	return 0;
-}
-
-static int
-otx2_nix_tm_node_capa_get(struct rte_eth_dev *eth_dev, uint32_t node_id,
-			  struct rte_tm_node_capabilities *cap,
-			  struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct otx2_nix_tm_node *tm_node;
-	struct free_rsrcs_rsp *rsp;
-	int rc, hw_lvl, lvl;
-
-	memset(cap, 0, sizeof(*cap));
-
-	tm_node = nix_tm_node_search(dev, node_id, true);
-	if (!tm_node) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "no such node";
-		return -EINVAL;
-	}
-
-	hw_lvl = tm_node->hw_lvl;
-	lvl = tm_node->lvl;
-
-	/* Leaf node */
-	if (nix_tm_is_leaf(dev, lvl)) {
-		cap->stats_mask = RTE_TM_STATS_N_PKTS |
-					RTE_TM_STATS_N_BYTES;
-		return 0;
-	}
-
-	otx2_mbox_alloc_msg_free_rsrc_cnt(mbox);
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "unexpected fatal error";
-		return rc;
-	}
-
-	/* Non Leaf Shaper */
-	cap->shaper_private_supported = true;
-	cap->shaper_private_dual_rate_supported =
-		(hw_lvl == NIX_TXSCH_LVL_TL1) ? false : true;
-	cap->shaper_private_rate_min = MIN_SHAPER_RATE / 8;
-	cap->shaper_private_rate_max = MAX_SHAPER_RATE / 8;
-	cap->shaper_private_packet_mode_supported = 1;
-	cap->shaper_private_byte_mode_supported = 1;
-
-	/* Non Leaf Scheduler */
-	if (hw_lvl == NIX_TXSCH_LVL_MDQ)
-		cap->nonleaf.sched_n_children_max = dev->tm_leaf_cnt;
-	else
-		cap->nonleaf.sched_n_children_max = rsp->schq[hw_lvl - 1];
-
-	cap->nonleaf.sched_sp_n_priorities_max = nix_max_prio(dev, hw_lvl) + 1;
-	cap->nonleaf.sched_wfq_n_children_per_group_max =
-		cap->nonleaf.sched_n_children_max;
-	cap->nonleaf.sched_wfq_n_groups_max = 1;
-	cap->nonleaf.sched_wfq_weight_max = MAX_SCHED_WEIGHT;
-	cap->nonleaf.sched_wfq_packet_mode_supported = 1;
-	cap->nonleaf.sched_wfq_byte_mode_supported = 1;
-
-	if (hw_lvl == NIX_TXSCH_LVL_TL1)
-		cap->stats_mask = RTE_TM_STATS_N_PKTS_RED_DROPPED |
-			RTE_TM_STATS_N_BYTES_RED_DROPPED;
-	return 0;
-}
-
-static int
-otx2_nix_tm_shaper_profile_add(struct rte_eth_dev *eth_dev,
-			       uint32_t profile_id,
-			       struct rte_tm_shaper_params *params,
-			       struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_shaper_profile *profile;
-
-	profile = nix_tm_shaper_profile_search(dev, profile_id);
-	if (profile) {
-		error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID;
-		error->message = "shaper profile ID exist";
-		return -EINVAL;
-	}
-
-	/* Committed rate and burst size can be enabled/disabled */
-	if (params->committed.size || params->committed.rate) {
-		if (params->committed.size < MIN_SHAPER_BURST ||
-		    params->committed.size > MAX_SHAPER_BURST) {
-			error->type =
-				RTE_TM_ERROR_TYPE_SHAPER_PROFILE_COMMITTED_SIZE;
-			return -EINVAL;
-		} else if (!shaper_rate_to_nix(params->committed.rate * 8,
-					       NULL, NULL, NULL)) {
-			error->type =
-				RTE_TM_ERROR_TYPE_SHAPER_PROFILE_COMMITTED_RATE;
-			error->message = "shaper committed rate invalid";
-			return -EINVAL;
-		}
-	}
-
-	/* Peak rate and burst size can be enabled/disabled */
-	if (params->peak.size || params->peak.rate) {
-		if (params->peak.size < MIN_SHAPER_BURST ||
-		    params->peak.size > MAX_SHAPER_BURST) {
-			error->type =
-				RTE_TM_ERROR_TYPE_SHAPER_PROFILE_PEAK_SIZE;
-			return -EINVAL;
-		} else if (!shaper_rate_to_nix(params->peak.rate * 8,
-					       NULL, NULL, NULL)) {
-			error->type =
-				RTE_TM_ERROR_TYPE_SHAPER_PROFILE_COMMITTED_RATE;
-			error->message = "shaper peak rate invalid";
-			return -EINVAL;
-		}
-	}
-
-	if (params->pkt_length_adjust < NIX_LENGTH_ADJUST_MIN ||
-	    params->pkt_length_adjust > NIX_LENGTH_ADJUST_MAX) {
-		error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE_PKT_ADJUST_LEN;
-		error->message = "length adjust invalid";
-		return -EINVAL;
-	}
-
-	profile = rte_zmalloc("otx2_nix_tm_shaper_profile",
-			      sizeof(struct otx2_nix_tm_shaper_profile), 0);
-	if (!profile)
-		return -ENOMEM;
-
-	profile->shaper_profile_id = profile_id;
-	rte_memcpy(&profile->params, params,
-		   sizeof(struct rte_tm_shaper_params));
-	TAILQ_INSERT_TAIL(&dev->shaper_profile_list, profile, shaper);
-
-	otx2_tm_dbg("Added TM shaper profile %u, "
-		    " pir %" PRIu64 " , pbs %" PRIu64 ", cir %" PRIu64
-		    ", cbs %" PRIu64 " , adj %u, pkt mode %d",
-		    profile_id,
-		    params->peak.rate * 8,
-		    params->peak.size,
-		    params->committed.rate * 8,
-		    params->committed.size,
-		    params->pkt_length_adjust,
-		    params->packet_mode);
-
-	/* Translate rate as bits per second */
-	profile->params.peak.rate = profile->params.peak.rate * 8;
-	profile->params.committed.rate = profile->params.committed.rate * 8;
-	/* Always use PIR for single rate shaping */
-	if (!params->peak.rate && params->committed.rate) {
-		profile->params.peak = profile->params.committed;
-		memset(&profile->params.committed, 0,
-		       sizeof(profile->params.committed));
-	}
-
-	/* update min rate */
-	nix_tm_shaper_profile_update_min(dev);
-	return 0;
-}
-
-static int
-otx2_nix_tm_shaper_profile_delete(struct rte_eth_dev *eth_dev,
-				  uint32_t profile_id,
-				  struct rte_tm_error *error)
-{
-	struct otx2_nix_tm_shaper_profile *profile;
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	profile = nix_tm_shaper_profile_search(dev, profile_id);
-
-	if (!profile) {
-		error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID;
-		error->message = "shaper profile ID not exist";
-		return -EINVAL;
-	}
-
-	if (profile->reference_count) {
-		error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE;
-		error->message = "shaper profile in use";
-		return -EINVAL;
-	}
-
-	otx2_tm_dbg("Removing TM shaper profile %u", profile_id);
-	TAILQ_REMOVE(&dev->shaper_profile_list, profile, shaper);
-	rte_free(profile);
-
-	/* update min rate */
-	nix_tm_shaper_profile_update_min(dev);
-	return 0;
-}
-
-static int
-otx2_nix_tm_node_add(struct rte_eth_dev *eth_dev, uint32_t node_id,
-		     uint32_t parent_node_id, uint32_t priority,
-		     uint32_t weight, uint32_t lvl,
-		     struct rte_tm_node_params *params,
-		     struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_shaper_profile *profile = NULL;
-	struct otx2_nix_tm_node *parent_node;
-	int rc, pkt_mode, clear_on_fail = 0;
-	uint32_t exp_next_lvl, i;
-	uint32_t profile_id;
-	uint16_t hw_lvl;
-
-	/* we don't support dynamic updates */
-	if (dev->tm_flags & NIX_TM_COMMITTED) {
-		error->type = RTE_TM_ERROR_TYPE_CAPABILITIES;
-		error->message = "dynamic update not supported";
-		return -EIO;
-	}
-
-	/* Leaf nodes have to be same priority */
-	if (nix_tm_is_leaf(dev, lvl) && priority != 0) {
-		error->type = RTE_TM_ERROR_TYPE_CAPABILITIES;
-		error->message = "queue shapers must be priority 0";
-		return -EIO;
-	}
-
-	parent_node = nix_tm_node_search(dev, parent_node_id, true);
-
-	/* find the right level */
-	if (lvl == RTE_TM_NODE_LEVEL_ID_ANY) {
-		if (parent_node_id == RTE_TM_NODE_ID_NULL) {
-			lvl = OTX2_TM_LVL_ROOT;
-		} else if (parent_node) {
-			lvl = parent_node->lvl + 1;
-		} else {
-			/* Neigher proper parent nor proper level id given */
-			error->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;
-			error->message = "invalid parent node id";
-			return -ERANGE;
-		}
-	}
-
-	/* Translate rte_tm level id's to nix hw level id's */
-	hw_lvl = nix_tm_lvl2nix(dev, lvl);
-	if (hw_lvl == NIX_TXSCH_LVL_CNT &&
-	    !nix_tm_is_leaf(dev, lvl)) {
-		error->type = RTE_TM_ERROR_TYPE_LEVEL_ID;
-		error->message = "invalid level id";
-		return -ERANGE;
-	}
-
-	if (node_id < dev->tm_leaf_cnt)
-		exp_next_lvl = NIX_TXSCH_LVL_SMQ;
-	else
-		exp_next_lvl = hw_lvl + 1;
-
-	/* Check if there is no parent node yet */
-	if (hw_lvl != dev->otx2_tm_root_lvl &&
-	    (!parent_node || parent_node->hw_lvl != exp_next_lvl)) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;
-		error->message = "invalid parent node id";
-		return -EINVAL;
-	}
-
-	/* Check if a node already exists */
-	if (nix_tm_node_search(dev, node_id, true)) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "node already exists";
-		return -EINVAL;
-	}
-
-	if (!nix_tm_is_leaf(dev, lvl)) {
-		/* Check if shaper profile exists for non leaf node */
-		profile_id = params->shaper_profile_id;
-		profile = nix_tm_shaper_profile_search(dev, profile_id);
-		if (profile_id != RTE_TM_SHAPER_PROFILE_ID_NONE && !profile) {
-			error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID;
-			error->message = "invalid shaper profile";
-			return -EINVAL;
-		}
-
-		/* Minimum static priority count is 1 */
-		if (!params->nonleaf.n_sp_priorities ||
-		    params->nonleaf.n_sp_priorities > TXSCH_TLX_SP_PRIO_MAX) {
-			error->type =
-				RTE_TM_ERROR_TYPE_NODE_PARAMS_N_SP_PRIORITIES;
-			error->message = "invalid sp priorities";
-			return -EINVAL;
-		}
-
-		pkt_mode = 0;
-		/* Validate weight mode */
-		for (i = 0; i < params->nonleaf.n_sp_priorities &&
-		     params->nonleaf.wfq_weight_mode; i++) {
-			pkt_mode = !params->nonleaf.wfq_weight_mode[i];
-			if (pkt_mode == !params->nonleaf.wfq_weight_mode[0])
-				continue;
-
-			error->type =
-				RTE_TM_ERROR_TYPE_NODE_PARAMS_WFQ_WEIGHT_MODE;
-			error->message = "unsupported weight mode";
-			return -EINVAL;
-		}
-
-		if (profile && params->nonleaf.n_sp_priorities &&
-		    pkt_mode != profile->params.packet_mode) {
-			error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE;
-			error->message = "shaper wfq packet mode mismatch";
-			return -EINVAL;
-		}
-	}
-
-	/* Check if there is second DWRR already in siblings or holes in prio */
-	if (validate_prio(dev, lvl, parent_node_id, priority, error))
-		return -EINVAL;
-
-	if (weight > MAX_SCHED_WEIGHT) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_WEIGHT;
-		error->message = "max weight exceeded";
-		return -EINVAL;
-	}
-
-	rc = nix_tm_node_add_to_list(dev, node_id, parent_node_id,
-				     priority, weight, hw_lvl,
-				     lvl, true, params);
-	if (rc) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		/* cleanup user added nodes */
-		if (clear_on_fail)
-			nix_tm_free_resources(dev, NIX_TM_NODE_USER,
-					      NIX_TM_NODE_USER, false);
-		error->message = "failed to add node";
-		return rc;
-	}
-	error->type = RTE_TM_ERROR_TYPE_NONE;
-	return 0;
-}
-
-static int
-otx2_nix_tm_node_delete(struct rte_eth_dev *eth_dev, uint32_t node_id,
-			struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_node *tm_node, *child_node;
-	struct otx2_nix_tm_shaper_profile *profile;
-	uint32_t profile_id;
-
-	/* we don't support dynamic updates yet */
-	if (dev->tm_flags & NIX_TM_COMMITTED) {
-		error->type = RTE_TM_ERROR_TYPE_CAPABILITIES;
-		error->message = "hierarchy exists";
-		return -EIO;
-	}
-
-	if (node_id == RTE_TM_NODE_ID_NULL) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "invalid node id";
-		return -EINVAL;
-	}
-
-	tm_node = nix_tm_node_search(dev, node_id, true);
-	if (!tm_node) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "no such node";
-		return -EINVAL;
-	}
-
-	/* Check for any existing children */
-	TAILQ_FOREACH(child_node, &dev->node_list, node) {
-		if (child_node->parent == tm_node) {
-			error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-			error->message = "children exist";
-			return -EINVAL;
-		}
-	}
-
-	/* Remove shaper profile reference */
-	profile_id = tm_node->params.shaper_profile_id;
-	profile = nix_tm_shaper_profile_search(dev, profile_id);
-	profile->reference_count--;
-
-	TAILQ_REMOVE(&dev->node_list, tm_node, node);
-	rte_free(tm_node);
-	return 0;
-}
-
-static int
-nix_tm_node_suspend_resume(struct rte_eth_dev *eth_dev, uint32_t node_id,
-			   struct rte_tm_error *error, bool suspend)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct otx2_nix_tm_node *tm_node;
-	struct nix_txschq_config *req;
-	uint16_t flags;
-	int rc;
-
-	tm_node = nix_tm_node_search(dev, node_id, true);
-	if (!tm_node) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "no such node";
-		return -EINVAL;
-	}
-
-	if (!(dev->tm_flags & NIX_TM_COMMITTED)) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "hierarchy doesn't exist";
-		return -EINVAL;
-	}
-
-	flags = tm_node->flags;
-	flags = suspend ? (flags & ~NIX_TM_NODE_ENABLED) :
-		(flags | NIX_TM_NODE_ENABLED);
-
-	if (tm_node->flags == flags)
-		return 0;
-
-	/* send mbox for state change */
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-
-	req->lvl = tm_node->hw_lvl;
-	req->num_regs =	prepare_tm_sw_xoff(tm_node, suspend,
-					   req->reg, req->regval);
-	rc = send_tm_reqval(mbox, req, error);
-	if (!rc)
-		tm_node->flags = flags;
-	return rc;
-}
-
-static int
-otx2_nix_tm_node_suspend(struct rte_eth_dev *eth_dev, uint32_t node_id,
-			 struct rte_tm_error *error)
-{
-	return nix_tm_node_suspend_resume(eth_dev, node_id, error, true);
-}
-
-static int
-otx2_nix_tm_node_resume(struct rte_eth_dev *eth_dev, uint32_t node_id,
-			struct rte_tm_error *error)
-{
-	return nix_tm_node_suspend_resume(eth_dev, node_id, error, false);
-}
-
-static int
-otx2_nix_tm_hierarchy_commit(struct rte_eth_dev *eth_dev,
-			     int clear_on_fail,
-			     struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_node *tm_node;
-	uint32_t leaf_cnt = 0;
-	int rc;
-
-	if (dev->tm_flags & NIX_TM_COMMITTED) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "hierarchy exists";
-		return -EINVAL;
-	}
-
-	/* Check if we have all the leaf nodes */
-	TAILQ_FOREACH(tm_node, &dev->node_list, node) {
-		if (tm_node->flags & NIX_TM_NODE_USER &&
-		    tm_node->id < dev->tm_leaf_cnt)
-			leaf_cnt++;
-	}
-
-	if (leaf_cnt != dev->tm_leaf_cnt) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "incomplete hierarchy";
-		return -EINVAL;
-	}
-
-	/*
-	 * Disable xmit will be enabled when
-	 * new topology is available.
-	 */
-	rc = nix_xmit_disable(eth_dev);
-	if (rc) {
-		otx2_err("failed to disable TX, rc=%d", rc);
-		return -EIO;
-	}
-
-	/* Delete default/ratelimit tree */
-	if (dev->tm_flags & (NIX_TM_DEFAULT_TREE | NIX_TM_RATE_LIMIT_TREE)) {
-		rc = nix_tm_free_resources(dev, NIX_TM_NODE_USER, 0, false);
-		if (rc) {
-			error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-			error->message = "failed to free default resources";
-			return rc;
-		}
-		dev->tm_flags &= ~(NIX_TM_DEFAULT_TREE |
-				   NIX_TM_RATE_LIMIT_TREE);
-	}
-
-	/* Free up user alloc'ed resources */
-	rc = nix_tm_free_resources(dev, NIX_TM_NODE_USER,
-				   NIX_TM_NODE_USER, true);
-	if (rc) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "failed to free user resources";
-		return rc;
-	}
-
-	rc = nix_tm_alloc_resources(eth_dev, true);
-	if (rc) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "alloc resources failed";
-		/* TODO should we restore default config ? */
-		if (clear_on_fail)
-			nix_tm_free_resources(dev, 0, 0, false);
-		return rc;
-	}
-
-	error->type = RTE_TM_ERROR_TYPE_NONE;
-	dev->tm_flags |= NIX_TM_COMMITTED;
-	return 0;
-}
-
-static int
-otx2_nix_tm_node_shaper_update(struct rte_eth_dev *eth_dev,
-			       uint32_t node_id,
-			       uint32_t profile_id,
-			       struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_shaper_profile *profile = NULL;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct otx2_nix_tm_node *tm_node;
-	struct nix_txschq_config *req;
-	uint8_t k;
-	int rc;
-
-	tm_node = nix_tm_node_search(dev, node_id, true);
-	if (!tm_node || nix_tm_is_leaf(dev, tm_node->lvl)) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "invalid node";
-		return -EINVAL;
-	}
-
-	if (profile_id == tm_node->params.shaper_profile_id)
-		return 0;
-
-	if (profile_id != RTE_TM_SHAPER_PROFILE_ID_NONE) {
-		profile = nix_tm_shaper_profile_search(dev, profile_id);
-		if (!profile) {
-			error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID;
-			error->message = "shaper profile ID not exist";
-			return -EINVAL;
-		}
-	}
-
-	if (profile && profile->params.packet_mode != tm_node->pkt_mode) {
-		error->type = RTE_TM_ERROR_TYPE_SHAPER_PROFILE_ID;
-		error->message = "shaper profile pkt mode mismatch";
-		return -EINVAL;
-	}
-
-	tm_node->params.shaper_profile_id = profile_id;
-
-	/* Nothing to do if not yet committed */
-	if (!(dev->tm_flags & NIX_TM_COMMITTED))
-		return 0;
-
-	tm_node->flags &= ~NIX_TM_NODE_ENABLED;
-
-	/* Flush the specific node with SW_XOFF */
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-	req->lvl = tm_node->hw_lvl;
-	k = prepare_tm_sw_xoff(tm_node, true, req->reg, req->regval);
-	req->num_regs = k;
-
-	rc = send_tm_reqval(mbox, req, error);
-	if (rc)
-		return rc;
-
-	shaper_default_red_algo(dev, tm_node, profile);
-
-	/* Update the PIR/CIR and clear SW XOFF */
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-	req->lvl = tm_node->hw_lvl;
-
-	k = prepare_tm_shaper_reg(tm_node, profile, req->reg, req->regval);
-
-	k += prepare_tm_sw_xoff(tm_node, false, &req->reg[k], &req->regval[k]);
-
-	req->num_regs = k;
-	rc = send_tm_reqval(mbox, req, error);
-	if (!rc)
-		tm_node->flags |= NIX_TM_NODE_ENABLED;
-	return rc;
-}
-
-static int
-otx2_nix_tm_node_parent_update(struct rte_eth_dev *eth_dev,
-			       uint32_t node_id, uint32_t new_parent_id,
-			       uint32_t priority, uint32_t weight,
-			       struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_node *tm_node, *sibling;
-	struct otx2_nix_tm_node *new_parent;
-	struct nix_txschq_config *req;
-	uint8_t k;
-	int rc;
-
-	if (!(dev->tm_flags & NIX_TM_COMMITTED)) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "hierarchy doesn't exist";
-		return -EINVAL;
-	}
-
-	tm_node = nix_tm_node_search(dev, node_id, true);
-	if (!tm_node) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "no such node";
-		return -EINVAL;
-	}
-
-	/* Parent id valid only for non root nodes */
-	if (tm_node->hw_lvl != dev->otx2_tm_root_lvl) {
-		new_parent = nix_tm_node_search(dev, new_parent_id, true);
-		if (!new_parent) {
-			error->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;
-			error->message = "no such parent node";
-			return -EINVAL;
-		}
-
-		/* Current support is only for dynamic weight update */
-		if (tm_node->parent != new_parent ||
-		    tm_node->priority != priority) {
-			error->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;
-			error->message = "only weight update supported";
-			return -EINVAL;
-		}
-	}
-
-	/* Skip if no change */
-	if (tm_node->weight == weight)
-		return 0;
-
-	tm_node->weight = weight;
-
-	/* For leaf nodes, SQ CTX needs update */
-	if (nix_tm_is_leaf(dev, tm_node->lvl)) {
-		/* Update SQ quantum data on the fly */
-		rc = nix_sq_sched_data(dev, tm_node, true);
-		if (rc) {
-			error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-			error->message = "sq sched data update failed";
-			return rc;
-		}
-	} else {
-		/* XOFF Parent node */
-		req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-		req->lvl = tm_node->parent->hw_lvl;
-		req->num_regs = prepare_tm_sw_xoff(tm_node->parent, true,
-						   req->reg, req->regval);
-		rc = send_tm_reqval(dev->mbox, req, error);
-		if (rc)
-			return rc;
-
-		/* XOFF this node and all other siblings */
-		req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-		req->lvl = tm_node->hw_lvl;
-
-		k = 0;
-		TAILQ_FOREACH(sibling, &dev->node_list, node) {
-			if (sibling->parent != tm_node->parent)
-				continue;
-			k += prepare_tm_sw_xoff(sibling, true, &req->reg[k],
-						&req->regval[k]);
-		}
-		req->num_regs = k;
-		rc = send_tm_reqval(dev->mbox, req, error);
-		if (rc)
-			return rc;
-
-		/* Update new weight for current node */
-		req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-		req->lvl = tm_node->hw_lvl;
-		req->num_regs = prepare_tm_sched_reg(dev, tm_node,
-						     req->reg, req->regval);
-		rc = send_tm_reqval(dev->mbox, req, error);
-		if (rc)
-			return rc;
-
-		/* XON this node and all other siblings */
-		req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-		req->lvl = tm_node->hw_lvl;
-
-		k = 0;
-		TAILQ_FOREACH(sibling, &dev->node_list, node) {
-			if (sibling->parent != tm_node->parent)
-				continue;
-			k += prepare_tm_sw_xoff(sibling, false, &req->reg[k],
-						&req->regval[k]);
-		}
-		req->num_regs = k;
-		rc = send_tm_reqval(dev->mbox, req, error);
-		if (rc)
-			return rc;
-
-		/* XON Parent node */
-		req = otx2_mbox_alloc_msg_nix_txschq_cfg(dev->mbox);
-		req->lvl = tm_node->parent->hw_lvl;
-		req->num_regs = prepare_tm_sw_xoff(tm_node->parent, false,
-						   req->reg, req->regval);
-		rc = send_tm_reqval(dev->mbox, req, error);
-		if (rc)
-			return rc;
-	}
-	return 0;
-}
-
-static int
-otx2_nix_tm_node_stats_read(struct rte_eth_dev *eth_dev, uint32_t node_id,
-			    struct rte_tm_node_stats *stats,
-			    uint64_t *stats_mask, int clear,
-			    struct rte_tm_error *error)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_node *tm_node;
-	uint64_t reg, val;
-	int64_t *addr;
-	int rc = 0;
-
-	tm_node = nix_tm_node_search(dev, node_id, true);
-	if (!tm_node) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "no such node";
-		return -EINVAL;
-	}
-
-	if (!(tm_node->flags & NIX_TM_NODE_HWRES)) {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "HW resources not allocated";
-		return -EINVAL;
-	}
-
-	/* Stats support only for leaf node or TL1 root */
-	if (nix_tm_is_leaf(dev, tm_node->lvl)) {
-		reg = (((uint64_t)tm_node->id) << 32);
-
-		/* Packets */
-		addr = (int64_t *)(dev->base + NIX_LF_SQ_OP_PKTS);
-		val = otx2_atomic64_add_nosync(reg, addr);
-		if (val & OP_ERR)
-			val = 0;
-		stats->n_pkts = val - tm_node->last_pkts;
-
-		/* Bytes */
-		addr = (int64_t *)(dev->base + NIX_LF_SQ_OP_OCTS);
-		val = otx2_atomic64_add_nosync(reg, addr);
-		if (val & OP_ERR)
-			val = 0;
-		stats->n_bytes = val - tm_node->last_bytes;
-
-		if (clear) {
-			tm_node->last_pkts = stats->n_pkts;
-			tm_node->last_bytes = stats->n_bytes;
-		}
-
-		*stats_mask = RTE_TM_STATS_N_PKTS | RTE_TM_STATS_N_BYTES;
-
-	} else if (tm_node->hw_lvl == NIX_TXSCH_LVL_TL1) {
-		error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
-		error->message = "stats read error";
-
-		/* RED Drop packets */
-		reg = NIX_AF_TL1X_DROPPED_PACKETS(tm_node->hw_id);
-		rc = read_tm_reg(dev->mbox, reg, &val, NIX_TXSCH_LVL_TL1);
-		if (rc)
-			goto exit;
-		stats->leaf.n_pkts_dropped[RTE_COLOR_RED] =
-						val - tm_node->last_pkts;
-
-		/* RED Drop bytes */
-		reg = NIX_AF_TL1X_DROPPED_BYTES(tm_node->hw_id);
-		rc = read_tm_reg(dev->mbox, reg, &val, NIX_TXSCH_LVL_TL1);
-		if (rc)
-			goto exit;
-		stats->leaf.n_bytes_dropped[RTE_COLOR_RED] =
-						val - tm_node->last_bytes;
-
-		/* Clear stats */
-		if (clear) {
-			tm_node->last_pkts =
-				stats->leaf.n_pkts_dropped[RTE_COLOR_RED];
-			tm_node->last_bytes =
-				stats->leaf.n_bytes_dropped[RTE_COLOR_RED];
-		}
-
-		*stats_mask = RTE_TM_STATS_N_PKTS_RED_DROPPED |
-			RTE_TM_STATS_N_BYTES_RED_DROPPED;
-
-	} else {
-		error->type = RTE_TM_ERROR_TYPE_NODE_ID;
-		error->message = "unsupported node";
-		rc = -EINVAL;
-	}
-
-exit:
-	return rc;
-}
-
-const struct rte_tm_ops otx2_tm_ops = {
-	.node_type_get = otx2_nix_tm_node_type_get,
-
-	.capabilities_get = otx2_nix_tm_capa_get,
-	.level_capabilities_get = otx2_nix_tm_level_capa_get,
-	.node_capabilities_get = otx2_nix_tm_node_capa_get,
-
-	.shaper_profile_add = otx2_nix_tm_shaper_profile_add,
-	.shaper_profile_delete = otx2_nix_tm_shaper_profile_delete,
-
-	.node_add = otx2_nix_tm_node_add,
-	.node_delete = otx2_nix_tm_node_delete,
-	.node_suspend = otx2_nix_tm_node_suspend,
-	.node_resume = otx2_nix_tm_node_resume,
-	.hierarchy_commit = otx2_nix_tm_hierarchy_commit,
-
-	.node_shaper_update = otx2_nix_tm_node_shaper_update,
-	.node_parent_update = otx2_nix_tm_node_parent_update,
-	.node_stats_read = otx2_nix_tm_node_stats_read,
-};
-
-static int
-nix_tm_prepare_default_tree(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint32_t def = eth_dev->data->nb_tx_queues;
-	struct rte_tm_node_params params;
-	uint32_t leaf_parent, i;
-	int rc = 0, leaf_level;
-
-	/* Default params */
-	memset(&params, 0, sizeof(params));
-	params.shaper_profile_id = RTE_TM_SHAPER_PROFILE_ID_NONE;
-
-	if (nix_tm_have_tl1_access(dev)) {
-		dev->otx2_tm_root_lvl = NIX_TXSCH_LVL_TL1;
-		rc = nix_tm_node_add_to_list(dev, def, RTE_TM_NODE_ID_NULL, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_TL1,
-					     OTX2_TM_LVL_ROOT, false, &params);
-		if (rc)
-			goto exit;
-		rc = nix_tm_node_add_to_list(dev, def + 1, def, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_TL2,
-					     OTX2_TM_LVL_SCH1, false, &params);
-		if (rc)
-			goto exit;
-
-		rc = nix_tm_node_add_to_list(dev, def + 2, def + 1, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_TL3,
-					     OTX2_TM_LVL_SCH2, false, &params);
-		if (rc)
-			goto exit;
-
-		rc = nix_tm_node_add_to_list(dev, def + 3, def + 2, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_TL4,
-					     OTX2_TM_LVL_SCH3, false, &params);
-		if (rc)
-			goto exit;
-
-		rc = nix_tm_node_add_to_list(dev, def + 4, def + 3, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_SMQ,
-					     OTX2_TM_LVL_SCH4, false, &params);
-		if (rc)
-			goto exit;
-
-		leaf_parent = def + 4;
-		leaf_level = OTX2_TM_LVL_QUEUE;
-	} else {
-		dev->otx2_tm_root_lvl = NIX_TXSCH_LVL_TL2;
-		rc = nix_tm_node_add_to_list(dev, def, RTE_TM_NODE_ID_NULL, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_TL2,
-					     OTX2_TM_LVL_ROOT, false, &params);
-		if (rc)
-			goto exit;
-
-		rc = nix_tm_node_add_to_list(dev, def + 1, def, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_TL3,
-					     OTX2_TM_LVL_SCH1, false, &params);
-		if (rc)
-			goto exit;
-
-		rc = nix_tm_node_add_to_list(dev, def + 2, def + 1, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_TL4,
-					     OTX2_TM_LVL_SCH2, false, &params);
-		if (rc)
-			goto exit;
-
-		rc = nix_tm_node_add_to_list(dev, def + 3, def + 2, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_SMQ,
-					     OTX2_TM_LVL_SCH3, false, &params);
-		if (rc)
-			goto exit;
-
-		leaf_parent = def + 3;
-		leaf_level = OTX2_TM_LVL_SCH4;
-	}
-
-	/* Add leaf nodes */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-		rc = nix_tm_node_add_to_list(dev, i, leaf_parent, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_CNT,
-					     leaf_level, false, &params);
-		if (rc)
-			break;
-	}
-
-exit:
-	return rc;
-}
-
-void otx2_nix_tm_conf_init(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	TAILQ_INIT(&dev->node_list);
-	TAILQ_INIT(&dev->shaper_profile_list);
-	dev->tm_rate_min = 1E9; /* 1Gbps */
-}
-
-int otx2_nix_tm_init_default(struct rte_eth_dev *eth_dev)
-{
-	struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
-	struct otx2_eth_dev  *dev = otx2_eth_pmd_priv(eth_dev);
-	uint16_t sq_cnt = eth_dev->data->nb_tx_queues;
-	int rc;
-
-	/* Free up all resources already held */
-	rc = nix_tm_free_resources(dev, 0, 0, false);
-	if (rc) {
-		otx2_err("Failed to freeup existing resources,rc=%d", rc);
-		return rc;
-	}
-
-	/* Clear shaper profiles */
-	nix_tm_clear_shaper_profiles(dev);
-	dev->tm_flags = NIX_TM_DEFAULT_TREE;
-
-	/* Disable TL1 Static Priority when VF's are enabled
-	 * as otherwise VF's TL2 reallocation will be needed
-	 * runtime to support a specific topology of PF.
-	 */
-	if (pci_dev->max_vfs)
-		dev->tm_flags |= NIX_TM_TL1_NO_SP;
-
-	rc = nix_tm_prepare_default_tree(eth_dev);
-	if (rc != 0)
-		return rc;
-
-	rc = nix_tm_alloc_resources(eth_dev, false);
-	if (rc != 0)
-		return rc;
-	dev->tm_leaf_cnt = sq_cnt;
-
-	return 0;
-}
-
-static int
-nix_tm_prepare_rate_limited_tree(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint32_t def = eth_dev->data->nb_tx_queues;
-	struct rte_tm_node_params params;
-	uint32_t leaf_parent, i, rc = 0;
-
-	memset(&params, 0, sizeof(params));
-
-	if (nix_tm_have_tl1_access(dev)) {
-		dev->otx2_tm_root_lvl = NIX_TXSCH_LVL_TL1;
-		rc = nix_tm_node_add_to_list(dev, def, RTE_TM_NODE_ID_NULL, 0,
-					DEFAULT_RR_WEIGHT,
-					NIX_TXSCH_LVL_TL1,
-					OTX2_TM_LVL_ROOT, false, &params);
-		if (rc)
-			goto error;
-		rc = nix_tm_node_add_to_list(dev, def + 1, def, 0,
-					DEFAULT_RR_WEIGHT,
-					NIX_TXSCH_LVL_TL2,
-					OTX2_TM_LVL_SCH1, false, &params);
-		if (rc)
-			goto error;
-		rc = nix_tm_node_add_to_list(dev, def + 2, def + 1, 0,
-					DEFAULT_RR_WEIGHT,
-					NIX_TXSCH_LVL_TL3,
-					OTX2_TM_LVL_SCH2, false, &params);
-		if (rc)
-			goto error;
-		rc = nix_tm_node_add_to_list(dev, def + 3, def + 2, 0,
-					DEFAULT_RR_WEIGHT,
-					NIX_TXSCH_LVL_TL4,
-					OTX2_TM_LVL_SCH3, false, &params);
-		if (rc)
-			goto error;
-		leaf_parent = def + 3;
-
-		/* Add per queue SMQ nodes */
-		for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-			rc = nix_tm_node_add_to_list(dev, leaf_parent + 1 + i,
-						leaf_parent,
-						0, DEFAULT_RR_WEIGHT,
-						NIX_TXSCH_LVL_SMQ,
-						OTX2_TM_LVL_SCH4,
-						false, &params);
-			if (rc)
-				goto error;
-		}
-
-		/* Add leaf nodes */
-		for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-			rc = nix_tm_node_add_to_list(dev, i,
-						     leaf_parent + 1 + i, 0,
-						     DEFAULT_RR_WEIGHT,
-						     NIX_TXSCH_LVL_CNT,
-						     OTX2_TM_LVL_QUEUE,
-						     false, &params);
-		if (rc)
-			goto error;
-		}
-
-		return 0;
-	}
-
-	dev->otx2_tm_root_lvl = NIX_TXSCH_LVL_TL2;
-	rc = nix_tm_node_add_to_list(dev, def, RTE_TM_NODE_ID_NULL, 0,
-				DEFAULT_RR_WEIGHT, NIX_TXSCH_LVL_TL2,
-				OTX2_TM_LVL_ROOT, false, &params);
-	if (rc)
-		goto error;
-	rc = nix_tm_node_add_to_list(dev, def + 1, def, 0,
-				DEFAULT_RR_WEIGHT, NIX_TXSCH_LVL_TL3,
-				OTX2_TM_LVL_SCH1, false, &params);
-	if (rc)
-		goto error;
-	rc = nix_tm_node_add_to_list(dev, def + 2, def + 1, 0,
-				     DEFAULT_RR_WEIGHT, NIX_TXSCH_LVL_TL4,
-				     OTX2_TM_LVL_SCH2, false, &params);
-	if (rc)
-		goto error;
-	leaf_parent = def + 2;
-
-	/* Add per queue SMQ nodes */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-		rc = nix_tm_node_add_to_list(dev, leaf_parent + 1 + i,
-					     leaf_parent,
-					     0, DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_SMQ,
-					     OTX2_TM_LVL_SCH3,
-					     false, &params);
-		if (rc)
-			goto error;
-	}
-
-	/* Add leaf nodes */
-	for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
-		rc = nix_tm_node_add_to_list(dev, i, leaf_parent + 1 + i, 0,
-					     DEFAULT_RR_WEIGHT,
-					     NIX_TXSCH_LVL_CNT,
-					     OTX2_TM_LVL_SCH4,
-					     false, &params);
-		if (rc)
-			break;
-	}
-error:
-	return rc;
-}
-
-static int
-otx2_nix_tm_rate_limit_mdq(struct rte_eth_dev *eth_dev,
-			   struct otx2_nix_tm_node *tm_node,
-			   uint64_t tx_rate)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_nix_tm_shaper_profile profile;
-	struct otx2_mbox *mbox = dev->mbox;
-	volatile uint64_t *reg, *regval;
-	struct nix_txschq_config *req;
-	uint16_t flags;
-	uint8_t k = 0;
-	int rc;
-
-	flags = tm_node->flags;
-
-	req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
-	req->lvl = NIX_TXSCH_LVL_MDQ;
-	reg = req->reg;
-	regval = req->regval;
-
-	if (tx_rate == 0) {
-		k += prepare_tm_sw_xoff(tm_node, true, &reg[k], &regval[k]);
-		flags &= ~NIX_TM_NODE_ENABLED;
-		goto exit;
-	}
-
-	if (!(flags & NIX_TM_NODE_ENABLED)) {
-		k += prepare_tm_sw_xoff(tm_node, false, &reg[k], &regval[k]);
-		flags |= NIX_TM_NODE_ENABLED;
-	}
-
-	/* Use only PIR for rate limit */
-	memset(&profile, 0, sizeof(profile));
-	profile.params.peak.rate = tx_rate;
-	/* Minimum burst of ~4us Bytes of Tx */
-	profile.params.peak.size = RTE_MAX(NIX_MAX_HW_FRS,
-					   (4ull * tx_rate) / (1E6 * 8));
-	if (!dev->tm_rate_min || dev->tm_rate_min > tx_rate)
-		dev->tm_rate_min = tx_rate;
-
-	k += prepare_tm_shaper_reg(tm_node, &profile, &reg[k], &regval[k]);
-exit:
-	req->num_regs = k;
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	tm_node->flags = flags;
-	return 0;
-}
-
-int
-otx2_nix_tm_set_queue_rate_limit(struct rte_eth_dev *eth_dev,
-				uint16_t queue_idx, uint16_t tx_rate_mbps)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t tx_rate = tx_rate_mbps * (uint64_t)1E6;
-	struct otx2_nix_tm_node *tm_node;
-	int rc;
-
-	/* Check for supported revisions */
-	if (otx2_dev_is_95xx_Ax(dev) ||
-	    otx2_dev_is_96xx_Ax(dev))
-		return -EINVAL;
-
-	if (queue_idx >= eth_dev->data->nb_tx_queues)
-		return -EINVAL;
-
-	if (!(dev->tm_flags & NIX_TM_DEFAULT_TREE) &&
-	    !(dev->tm_flags & NIX_TM_RATE_LIMIT_TREE))
-		goto error;
-
-	if ((dev->tm_flags & NIX_TM_DEFAULT_TREE) &&
-	    eth_dev->data->nb_tx_queues > 1) {
-		/* For TM topology change ethdev needs to be stopped */
-		if (eth_dev->data->dev_started)
-			return -EBUSY;
-
-		/*
-		 * Disable xmit will be enabled when
-		 * new topology is available.
-		 */
-		rc = nix_xmit_disable(eth_dev);
-		if (rc) {
-			otx2_err("failed to disable TX, rc=%d", rc);
-			return -EIO;
-		}
-
-		rc = nix_tm_free_resources(dev, 0, 0, false);
-		if (rc < 0) {
-			otx2_tm_dbg("failed to free default resources, rc %d",
-				   rc);
-			return -EIO;
-		}
-
-		rc = nix_tm_prepare_rate_limited_tree(eth_dev);
-		if (rc < 0) {
-			otx2_tm_dbg("failed to prepare tm tree, rc=%d", rc);
-			return rc;
-		}
-
-		rc = nix_tm_alloc_resources(eth_dev, true);
-		if (rc != 0) {
-			otx2_tm_dbg("failed to allocate tm tree, rc=%d", rc);
-			return rc;
-		}
-
-		dev->tm_flags &= ~NIX_TM_DEFAULT_TREE;
-		dev->tm_flags |= NIX_TM_RATE_LIMIT_TREE;
-	}
-
-	tm_node = nix_tm_node_search(dev, queue_idx, false);
-
-	/* check if we found a valid leaf node */
-	if (!tm_node ||
-	    !nix_tm_is_leaf(dev, tm_node->lvl) ||
-	    !tm_node->parent ||
-	    tm_node->parent->hw_id == UINT32_MAX)
-		return -EIO;
-
-	return otx2_nix_tm_rate_limit_mdq(eth_dev, tm_node->parent, tx_rate);
-error:
-	otx2_tm_dbg("Unsupported TM tree 0x%0x", dev->tm_flags);
-	return -EINVAL;
-}
-
-int
-otx2_nix_tm_ops_get(struct rte_eth_dev *eth_dev, void *arg)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	if (!arg)
-		return -EINVAL;
-
-	/* Check for supported revisions */
-	if (otx2_dev_is_95xx_Ax(dev) ||
-	    otx2_dev_is_96xx_Ax(dev))
-		return -EINVAL;
-
-	*(const void **)arg = &otx2_tm_ops;
-
-	return 0;
-}
-
-int
-otx2_nix_tm_fini(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc;
-
-	/* Xmit is assumed to be disabled */
-	/* Free up resources already held */
-	rc = nix_tm_free_resources(dev, 0, 0, false);
-	if (rc) {
-		otx2_err("Failed to freeup existing resources,rc=%d", rc);
-		return rc;
-	}
-
-	/* Clear shaper profiles */
-	nix_tm_clear_shaper_profiles(dev);
-
-	dev->tm_flags = 0;
-	return 0;
-}
-
-int
-otx2_nix_tm_get_leaf_data(struct otx2_eth_dev *dev, uint16_t sq,
-			  uint32_t *rr_quantum, uint16_t *smq)
-{
-	struct otx2_nix_tm_node *tm_node;
-	int rc;
-
-	/* 0..sq_cnt-1 are leaf nodes */
-	if (sq >= dev->tm_leaf_cnt)
-		return -EINVAL;
-
-	/* Search for internal node first */
-	tm_node = nix_tm_node_search(dev, sq, false);
-	if (!tm_node)
-		tm_node = nix_tm_node_search(dev, sq, true);
-
-	/* Check if we found a valid leaf node */
-	if (!tm_node || !nix_tm_is_leaf(dev, tm_node->lvl) ||
-	    !tm_node->parent || tm_node->parent->hw_id == UINT32_MAX) {
-		return -EIO;
-	}
-
-	/* Get SMQ Id of leaf node's parent */
-	*smq = tm_node->parent->hw_id;
-	*rr_quantum = NIX_TM_WEIGHT_TO_RR_QUANTUM(tm_node->weight);
-
-	rc = nix_smq_xoff(dev, tm_node->parent, false);
-	if (rc)
-		return rc;
-	tm_node->flags |= NIX_TM_NODE_ENABLED;
-
-	return 0;
-}
diff --git a/drivers/net/octeontx2/otx2_tm.h b/drivers/net/octeontx2/otx2_tm.h
deleted file mode 100644
index db44d4891f..0000000000
--- a/drivers/net/octeontx2/otx2_tm.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_TM_H__
-#define __OTX2_TM_H__
-
-#include <stdbool.h>
-
-#include <rte_tm_driver.h>
-
-#define NIX_TM_DEFAULT_TREE	BIT_ULL(0)
-#define NIX_TM_COMMITTED	BIT_ULL(1)
-#define NIX_TM_RATE_LIMIT_TREE	BIT_ULL(2)
-#define NIX_TM_TL1_NO_SP	BIT_ULL(3)
-
-struct otx2_eth_dev;
-
-void otx2_nix_tm_conf_init(struct rte_eth_dev *eth_dev);
-int otx2_nix_tm_init_default(struct rte_eth_dev *eth_dev);
-int otx2_nix_tm_fini(struct rte_eth_dev *eth_dev);
-int otx2_nix_tm_ops_get(struct rte_eth_dev *eth_dev, void *ops);
-int otx2_nix_tm_get_leaf_data(struct otx2_eth_dev *dev, uint16_t sq,
-			      uint32_t *rr_quantum, uint16_t *smq);
-int otx2_nix_tm_set_queue_rate_limit(struct rte_eth_dev *eth_dev,
-				     uint16_t queue_idx, uint16_t tx_rate);
-int otx2_nix_sq_flush_pre(void *_txq, bool dev_started);
-int otx2_nix_sq_flush_post(void *_txq);
-int otx2_nix_sq_enable(void *_txq);
-int otx2_nix_get_link(struct otx2_eth_dev *dev);
-int otx2_nix_sq_sqb_aura_fc(void *_txq, bool enable);
-
-struct otx2_nix_tm_node {
-	TAILQ_ENTRY(otx2_nix_tm_node) node;
-	uint32_t id;
-	uint32_t hw_id;
-	uint32_t priority;
-	uint32_t weight;
-	uint16_t lvl;
-	uint16_t hw_lvl;
-	uint32_t rr_prio;
-	uint32_t rr_num;
-	uint32_t max_prio;
-	uint32_t parent_hw_id;
-	uint32_t flags:16;
-#define NIX_TM_NODE_HWRES	BIT_ULL(0)
-#define NIX_TM_NODE_ENABLED	BIT_ULL(1)
-#define NIX_TM_NODE_USER	BIT_ULL(2)
-#define NIX_TM_NODE_RED_DISCARD BIT_ULL(3)
-	/* Shaper algorithm for RED state @NIX_REDALG_E */
-	uint32_t red_algo:2;
-	uint32_t pkt_mode:1;
-
-	struct otx2_nix_tm_node *parent;
-	struct rte_tm_node_params params;
-
-	/* Last stats */
-	uint64_t last_pkts;
-	uint64_t last_bytes;
-};
-
-struct otx2_nix_tm_shaper_profile {
-	TAILQ_ENTRY(otx2_nix_tm_shaper_profile) shaper;
-	uint32_t shaper_profile_id;
-	uint32_t reference_count;
-	struct rte_tm_shaper_params params; /* Rate in bits/sec */
-};
-
-struct shaper_params {
-	uint64_t burst_exponent;
-	uint64_t burst_mantissa;
-	uint64_t div_exp;
-	uint64_t exponent;
-	uint64_t mantissa;
-	uint64_t burst;
-	uint64_t rate;
-};
-
-TAILQ_HEAD(otx2_nix_tm_node_list, otx2_nix_tm_node);
-TAILQ_HEAD(otx2_nix_tm_shaper_profile_list, otx2_nix_tm_shaper_profile);
-
-#define MAX_SCHED_WEIGHT ((uint8_t)~0)
-#define NIX_TM_RR_QUANTUM_MAX (BIT_ULL(24) - 1)
-#define NIX_TM_WEIGHT_TO_RR_QUANTUM(__weight)			\
-		((((__weight) & MAX_SCHED_WEIGHT) *             \
-		  NIX_TM_RR_QUANTUM_MAX) / MAX_SCHED_WEIGHT)
-
-/* DEFAULT_RR_WEIGHT * NIX_TM_RR_QUANTUM_MAX / MAX_SCHED_WEIGHT  */
-/* = NIX_MAX_HW_MTU */
-#define DEFAULT_RR_WEIGHT 71
-
-/** NIX rate limits */
-#define MAX_RATE_DIV_EXP 12
-#define MAX_RATE_EXPONENT 0xf
-#define MAX_RATE_MANTISSA 0xff
-
-#define NIX_SHAPER_RATE_CONST ((uint64_t)2E6)
-
-/* NIX rate calculation in Bits/Sec
- *	PIR_ADD = ((256 + NIX_*_PIR[RATE_MANTISSA])
- *		<< NIX_*_PIR[RATE_EXPONENT]) / 256
- *	PIR = (2E6 * PIR_ADD / (1 << NIX_*_PIR[RATE_DIVIDER_EXPONENT]))
- *
- *	CIR_ADD = ((256 + NIX_*_CIR[RATE_MANTISSA])
- *		<< NIX_*_CIR[RATE_EXPONENT]) / 256
- *	CIR = (2E6 * CIR_ADD / (CCLK_TICKS << NIX_*_CIR[RATE_DIVIDER_EXPONENT]))
- */
-#define SHAPER_RATE(exponent, mantissa, div_exp) \
-	((NIX_SHAPER_RATE_CONST * ((256 + (mantissa)) << (exponent)))\
-		/ (((1ull << (div_exp)) * 256)))
-
-/* 96xx rate limits in Bits/Sec */
-#define MIN_SHAPER_RATE \
-	SHAPER_RATE(0, 0, MAX_RATE_DIV_EXP)
-
-#define MAX_SHAPER_RATE \
-	SHAPER_RATE(MAX_RATE_EXPONENT, MAX_RATE_MANTISSA, 0)
-
-/* Min is limited so that NIX_AF_SMQX_CFG[MINLEN]+ADJUST is not -ve */
-#define NIX_LENGTH_ADJUST_MIN ((int)-NIX_MIN_HW_FRS + 1)
-#define NIX_LENGTH_ADJUST_MAX 255
-
-/** TM Shaper - low level operations */
-
-/** NIX burst limits */
-#define MAX_BURST_EXPONENT 0xf
-#define MAX_BURST_MANTISSA 0xff
-
-/* NIX burst calculation
- *	PIR_BURST = ((256 + NIX_*_PIR[BURST_MANTISSA])
- *		<< (NIX_*_PIR[BURST_EXPONENT] + 1))
- *			/ 256
- *
- *	CIR_BURST = ((256 + NIX_*_CIR[BURST_MANTISSA])
- *		<< (NIX_*_CIR[BURST_EXPONENT] + 1))
- *			/ 256
- */
-#define SHAPER_BURST(exponent, mantissa) \
-	(((256 + (mantissa)) << ((exponent) + 1)) / 256)
-
-/** Shaper burst limits */
-#define MIN_SHAPER_BURST \
-	SHAPER_BURST(0, 0)
-
-#define MAX_SHAPER_BURST \
-	SHAPER_BURST(MAX_BURST_EXPONENT,\
-		MAX_BURST_MANTISSA)
-
-/* Default TL1 priority and Quantum from AF */
-#define TXSCH_TL1_DFLT_RR_QTM  ((1 << 24) - 1)
-#define TXSCH_TL1_DFLT_RR_PRIO 1
-
-#define TXSCH_TLX_SP_PRIO_MAX 10
-
-static inline const char *
-nix_hwlvl2str(uint32_t hw_lvl)
-{
-	switch (hw_lvl) {
-	case NIX_TXSCH_LVL_MDQ:
-		return "SMQ/MDQ";
-	case NIX_TXSCH_LVL_TL4:
-		return "TL4";
-	case NIX_TXSCH_LVL_TL3:
-		return "TL3";
-	case NIX_TXSCH_LVL_TL2:
-		return "TL2";
-	case NIX_TXSCH_LVL_TL1:
-		return "TL1";
-	default:
-		break;
-	}
-
-	return "???";
-}
-
-#endif /* __OTX2_TM_H__ */
diff --git a/drivers/net/octeontx2/otx2_tx.c b/drivers/net/octeontx2/otx2_tx.c
deleted file mode 100644
index e95184632f..0000000000
--- a/drivers/net/octeontx2/otx2_tx.c
+++ /dev/null
@@ -1,1077 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_vect.h>
-
-#include "otx2_ethdev.h"
-
-#define NIX_XMIT_FC_OR_RETURN(txq, pkts) do {				\
-	/* Cached value is low, Update the fc_cache_pkts */		\
-	if (unlikely((txq)->fc_cache_pkts < (pkts))) {			\
-		/* Multiply with sqe_per_sqb to express in pkts */	\
-		(txq)->fc_cache_pkts =					\
-			((txq)->nb_sqb_bufs_adj - *(txq)->fc_mem) <<    \
-				(txq)->sqes_per_sqb_log2;		\
-		/* Check it again for the room */			\
-		if (unlikely((txq)->fc_cache_pkts < (pkts)))		\
-			return 0;					\
-	}								\
-} while (0)
-
-
-static __rte_always_inline uint16_t
-nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
-	      uint16_t pkts, uint64_t *cmd, const uint16_t flags)
-{
-	struct otx2_eth_txq *txq = tx_queue; uint16_t i;
-	const rte_iova_t io_addr = txq->io_addr;
-	void *lmt_addr = txq->lmt_addr;
-	uint64_t lso_tun_fmt;
-
-	NIX_XMIT_FC_OR_RETURN(txq, pkts);
-
-	otx2_lmt_mov(cmd, &txq->cmd[0], otx2_nix_tx_ext_subs(flags));
-
-	/* Perform header writes before barrier for TSO */
-	if (flags & NIX_TX_OFFLOAD_TSO_F) {
-		lso_tun_fmt = txq->lso_tun_fmt;
-		for (i = 0; i < pkts; i++)
-			otx2_nix_xmit_prepare_tso(tx_pkts[i], flags);
-	}
-
-	/* Lets commit any changes in the packet here as no further changes
-	 * to the packet will be done unless no fast free is enabled.
-	 */
-	if (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F))
-		rte_io_wmb();
-
-	for (i = 0; i < pkts; i++) {
-		otx2_nix_xmit_prepare(tx_pkts[i], cmd, flags, lso_tun_fmt);
-		/* Passing no of segdw as 4: HDR + EXT + SG + SMEM */
-		otx2_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0],
-					     tx_pkts[i]->ol_flags, 4, flags);
-		otx2_nix_xmit_one(cmd, lmt_addr, io_addr, flags);
-	}
-
-	/* Reduce the cached count */
-	txq->fc_cache_pkts -= pkts;
-
-	return pkts;
-}
-
-static __rte_always_inline uint16_t
-nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
-		   uint16_t pkts, uint64_t *cmd, const uint16_t flags)
-{
-	struct otx2_eth_txq *txq = tx_queue; uint64_t i;
-	const rte_iova_t io_addr = txq->io_addr;
-	void *lmt_addr = txq->lmt_addr;
-	uint64_t lso_tun_fmt;
-	uint16_t segdw;
-
-	NIX_XMIT_FC_OR_RETURN(txq, pkts);
-
-	otx2_lmt_mov(cmd, &txq->cmd[0], otx2_nix_tx_ext_subs(flags));
-
-	/* Perform header writes before barrier for TSO */
-	if (flags & NIX_TX_OFFLOAD_TSO_F) {
-		lso_tun_fmt = txq->lso_tun_fmt;
-		for (i = 0; i < pkts; i++)
-			otx2_nix_xmit_prepare_tso(tx_pkts[i], flags);
-	}
-
-	/* Lets commit any changes in the packet here as no further changes
-	 * to the packet will be done unless no fast free is enabled.
-	 */
-	if (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F))
-		rte_io_wmb();
-
-	for (i = 0; i < pkts; i++) {
-		otx2_nix_xmit_prepare(tx_pkts[i], cmd, flags, lso_tun_fmt);
-		segdw = otx2_nix_prepare_mseg(tx_pkts[i], cmd, flags);
-		otx2_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0],
-					     tx_pkts[i]->ol_flags, segdw,
-					     flags);
-		otx2_nix_xmit_mseg_one(cmd, lmt_addr, io_addr, segdw);
-	}
-
-	/* Reduce the cached count */
-	txq->fc_cache_pkts -= pkts;
-
-	return pkts;
-}
-
-#if defined(RTE_ARCH_ARM64)
-
-#define NIX_DESCS_PER_LOOP	4
-static __rte_always_inline uint16_t
-nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
-		     uint16_t pkts, uint64_t *cmd, const uint16_t flags)
-{
-	uint64x2_t dataoff_iova0, dataoff_iova1, dataoff_iova2, dataoff_iova3;
-	uint64x2_t len_olflags0, len_olflags1, len_olflags2, len_olflags3;
-	uint64_t *mbuf0, *mbuf1, *mbuf2, *mbuf3;
-	uint64x2_t senddesc01_w0, senddesc23_w0;
-	uint64x2_t senddesc01_w1, senddesc23_w1;
-	uint64x2_t sgdesc01_w0, sgdesc23_w0;
-	uint64x2_t sgdesc01_w1, sgdesc23_w1;
-	struct otx2_eth_txq *txq = tx_queue;
-	uint64_t *lmt_addr = txq->lmt_addr;
-	rte_iova_t io_addr = txq->io_addr;
-	uint64x2_t ltypes01, ltypes23;
-	uint64x2_t xtmp128, ytmp128;
-	uint64x2_t xmask01, xmask23;
-	uint64x2_t cmd00, cmd01;
-	uint64x2_t cmd10, cmd11;
-	uint64x2_t cmd20, cmd21;
-	uint64x2_t cmd30, cmd31;
-	uint64_t lmt_status, i;
-	uint16_t pkts_left;
-
-	NIX_XMIT_FC_OR_RETURN(txq, pkts);
-
-	pkts_left = pkts & (NIX_DESCS_PER_LOOP - 1);
-	pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);
-
-	/* Reduce the cached count */
-	txq->fc_cache_pkts -= pkts;
-
-	/* Lets commit any changes in the packet here as no further changes
-	 * to the packet will be done unless no fast free is enabled.
-	 */
-	if (!(flags & NIX_TX_OFFLOAD_MBUF_NOFF_F))
-		rte_io_wmb();
-
-	senddesc01_w0 = vld1q_dup_u64(&txq->cmd[0]);
-	senddesc23_w0 = senddesc01_w0;
-	senddesc01_w1 = vdupq_n_u64(0);
-	senddesc23_w1 = senddesc01_w1;
-	sgdesc01_w0 = vld1q_dup_u64(&txq->cmd[2]);
-	sgdesc23_w0 = sgdesc01_w0;
-
-	for (i = 0; i < pkts; i += NIX_DESCS_PER_LOOP) {
-		/* Clear lower 32bit of SEND_HDR_W0 and SEND_SG_W0 */
-		senddesc01_w0 = vbicq_u64(senddesc01_w0,
-					  vdupq_n_u64(0xFFFFFFFF));
-		sgdesc01_w0 = vbicq_u64(sgdesc01_w0,
-					vdupq_n_u64(0xFFFFFFFF));
-
-		senddesc23_w0 = senddesc01_w0;
-		sgdesc23_w0 = sgdesc01_w0;
-
-		/* Move mbufs to iova */
-		mbuf0 = (uint64_t *)tx_pkts[0];
-		mbuf1 = (uint64_t *)tx_pkts[1];
-		mbuf2 = (uint64_t *)tx_pkts[2];
-		mbuf3 = (uint64_t *)tx_pkts[3];
-
-		mbuf0 = (uint64_t *)((uintptr_t)mbuf0 +
-				     offsetof(struct rte_mbuf, buf_iova));
-		mbuf1 = (uint64_t *)((uintptr_t)mbuf1 +
-				     offsetof(struct rte_mbuf, buf_iova));
-		mbuf2 = (uint64_t *)((uintptr_t)mbuf2 +
-				     offsetof(struct rte_mbuf, buf_iova));
-		mbuf3 = (uint64_t *)((uintptr_t)mbuf3 +
-				     offsetof(struct rte_mbuf, buf_iova));
-		/*
-		 * Get mbuf's, olflags, iova, pktlen, dataoff
-		 * dataoff_iovaX.D[0] = iova,
-		 * dataoff_iovaX.D[1](15:0) = mbuf->dataoff
-		 * len_olflagsX.D[0] = ol_flags,
-		 * len_olflagsX.D[1](63:32) = mbuf->pkt_len
-		 */
-		dataoff_iova0  = vld1q_u64(mbuf0);
-		len_olflags0 = vld1q_u64(mbuf0 + 2);
-		dataoff_iova1  = vld1q_u64(mbuf1);
-		len_olflags1 = vld1q_u64(mbuf1 + 2);
-		dataoff_iova2  = vld1q_u64(mbuf2);
-		len_olflags2 = vld1q_u64(mbuf2 + 2);
-		dataoff_iova3  = vld1q_u64(mbuf3);
-		len_olflags3 = vld1q_u64(mbuf3 + 2);
-
-		if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
-			struct rte_mbuf *mbuf;
-			/* Set don't free bit if reference count > 1 */
-			xmask01 = vdupq_n_u64(0);
-			xmask23 = xmask01;
-
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf0 -
-				offsetof(struct rte_mbuf, buf_iova));
-
-			if (otx2_nix_prefree_seg(mbuf))
-				vsetq_lane_u64(0x80000, xmask01, 0);
-			else
-				RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool,
-							(void **)&mbuf,
-							1, 0);
-
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf1 -
-				offsetof(struct rte_mbuf, buf_iova));
-			if (otx2_nix_prefree_seg(mbuf))
-				vsetq_lane_u64(0x80000, xmask01, 1);
-			else
-				RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool,
-							(void **)&mbuf,
-							1, 0);
-
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf2 -
-				offsetof(struct rte_mbuf, buf_iova));
-			if (otx2_nix_prefree_seg(mbuf))
-				vsetq_lane_u64(0x80000, xmask23, 0);
-			else
-				RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool,
-							(void **)&mbuf,
-							1, 0);
-
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf3 -
-				offsetof(struct rte_mbuf, buf_iova));
-			if (otx2_nix_prefree_seg(mbuf))
-				vsetq_lane_u64(0x80000, xmask23, 1);
-			else
-				RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool,
-							(void **)&mbuf,
-							1, 0);
-			senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
-			senddesc23_w0 = vorrq_u64(senddesc23_w0, xmask23);
-			/* Ensuring mbuf fields which got updated in
-			 * otx2_nix_prefree_seg are written before LMTST.
-			 */
-			rte_io_wmb();
-		} else {
-			struct rte_mbuf *mbuf;
-			/* Mark mempool object as "put" since
-			 * it is freed by NIX
-			 */
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf0 -
-				offsetof(struct rte_mbuf, buf_iova));
-			RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf,
-						1, 0);
-
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf1 -
-				offsetof(struct rte_mbuf, buf_iova));
-			RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf,
-						1, 0);
-
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf2 -
-				offsetof(struct rte_mbuf, buf_iova));
-			RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf,
-						1, 0);
-
-			mbuf = (struct rte_mbuf *)((uintptr_t)mbuf3 -
-				offsetof(struct rte_mbuf, buf_iova));
-			RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf,
-						1, 0);
-			RTE_SET_USED(mbuf);
-		}
-
-		/* Move mbufs to point pool */
-		mbuf0 = (uint64_t *)((uintptr_t)mbuf0 +
-			 offsetof(struct rte_mbuf, pool) -
-			 offsetof(struct rte_mbuf, buf_iova));
-		mbuf1 = (uint64_t *)((uintptr_t)mbuf1 +
-			 offsetof(struct rte_mbuf, pool) -
-			 offsetof(struct rte_mbuf, buf_iova));
-		mbuf2 = (uint64_t *)((uintptr_t)mbuf2 +
-			 offsetof(struct rte_mbuf, pool) -
-			 offsetof(struct rte_mbuf, buf_iova));
-		mbuf3 = (uint64_t *)((uintptr_t)mbuf3 +
-			 offsetof(struct rte_mbuf, pool) -
-			 offsetof(struct rte_mbuf, buf_iova));
-
-		if (flags &
-		    (NIX_TX_OFFLOAD_OL3_OL4_CSUM_F |
-		     NIX_TX_OFFLOAD_L3_L4_CSUM_F)) {
-			/* Get tx_offload for ol2, ol3, l2, l3 lengths */
-			/*
-			 * E(8):OL2_LEN(7):OL3_LEN(9):E(24):L3_LEN(9):L2_LEN(7)
-			 * E(8):OL2_LEN(7):OL3_LEN(9):E(24):L3_LEN(9):L2_LEN(7)
-			 */
-
-			asm volatile ("LD1 {%[a].D}[0],[%[in]]\n\t" :
-				      [a]"+w"(senddesc01_w1) :
-				      [in]"r"(mbuf0 + 2) : "memory");
-
-			asm volatile ("LD1 {%[a].D}[1],[%[in]]\n\t" :
-				      [a]"+w"(senddesc01_w1) :
-				      [in]"r"(mbuf1 + 2) : "memory");
-
-			asm volatile ("LD1 {%[b].D}[0],[%[in]]\n\t" :
-				      [b]"+w"(senddesc23_w1) :
-				      [in]"r"(mbuf2 + 2) : "memory");
-
-			asm volatile ("LD1 {%[b].D}[1],[%[in]]\n\t" :
-				      [b]"+w"(senddesc23_w1) :
-				      [in]"r"(mbuf3 + 2) : "memory");
-
-			/* Get pool pointer alone */
-			mbuf0 = (uint64_t *)*mbuf0;
-			mbuf1 = (uint64_t *)*mbuf1;
-			mbuf2 = (uint64_t *)*mbuf2;
-			mbuf3 = (uint64_t *)*mbuf3;
-		} else {
-			/* Get pool pointer alone */
-			mbuf0 = (uint64_t *)*mbuf0;
-			mbuf1 = (uint64_t *)*mbuf1;
-			mbuf2 = (uint64_t *)*mbuf2;
-			mbuf3 = (uint64_t *)*mbuf3;
-		}
-
-		const uint8x16_t shuf_mask2 = {
-			0x4, 0x5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-			0xc, 0xd, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-		};
-		xtmp128 = vzip2q_u64(len_olflags0, len_olflags1);
-		ytmp128 = vzip2q_u64(len_olflags2, len_olflags3);
-
-		/* Clear dataoff_iovaX.D[1] bits other than dataoff(15:0) */
-		const uint64x2_t and_mask0 = {
-			0xFFFFFFFFFFFFFFFF,
-			0x000000000000FFFF,
-		};
-
-		dataoff_iova0 = vandq_u64(dataoff_iova0, and_mask0);
-		dataoff_iova1 = vandq_u64(dataoff_iova1, and_mask0);
-		dataoff_iova2 = vandq_u64(dataoff_iova2, and_mask0);
-		dataoff_iova3 = vandq_u64(dataoff_iova3, and_mask0);
-
-		/*
-		 * Pick only 16 bits of pktlen preset at bits 63:32
-		 * and place them at bits 15:0.
-		 */
-		xtmp128 = vqtbl1q_u8(xtmp128, shuf_mask2);
-		ytmp128 = vqtbl1q_u8(ytmp128, shuf_mask2);
-
-		/* Add pairwise to get dataoff + iova in sgdesc_w1 */
-		sgdesc01_w1 = vpaddq_u64(dataoff_iova0, dataoff_iova1);
-		sgdesc23_w1 = vpaddq_u64(dataoff_iova2, dataoff_iova3);
-
-		/* Orr both sgdesc_w0 and senddesc_w0 with 16 bits of
-		 * pktlen at 15:0 position.
-		 */
-		sgdesc01_w0 = vorrq_u64(sgdesc01_w0, xtmp128);
-		sgdesc23_w0 = vorrq_u64(sgdesc23_w0, ytmp128);
-		senddesc01_w0 = vorrq_u64(senddesc01_w0, xtmp128);
-		senddesc23_w0 = vorrq_u64(senddesc23_w0, ytmp128);
-
-		if ((flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F) &&
-		    !(flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)) {
-			/*
-			 * Lookup table to translate ol_flags to
-			 * il3/il4 types. But we still use ol3/ol4 types in
-			 * senddesc_w1 as only one header processing is enabled.
-			 */
-			const uint8x16_t tbl = {
-				/* [0-15] = il4type:il3type */
-				0x04, /* none (IPv6 assumed) */
-				0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6 assumed) */
-				0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6 assumed) */
-				0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6 assumed) */
-				0x03, /* RTE_MBUF_F_TX_IP_CKSUM */
-				0x13, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_TCP_CKSUM */
-				0x23, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_SCTP_CKSUM */
-				0x33, /* RTE_MBUF_F_TX_IP_CKSUM | RTE_MBUF_F_TX_UDP_CKSUM */
-				0x02, /* RTE_MBUF_F_TX_IPV4  */
-				0x12, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_TCP_CKSUM */
-				0x22, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_SCTP_CKSUM */
-				0x32, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_UDP_CKSUM */
-				0x03, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM */
-				0x13, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
-				       * RTE_MBUF_F_TX_TCP_CKSUM
-				       */
-				0x23, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
-				       * RTE_MBUF_F_TX_SCTP_CKSUM
-				       */
-				0x33, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
-				       * RTE_MBUF_F_TX_UDP_CKSUM
-				       */
-			};
-
-			/* Extract olflags to translate to iltypes */
-			xtmp128 = vzip1q_u64(len_olflags0, len_olflags1);
-			ytmp128 = vzip1q_u64(len_olflags2, len_olflags3);
-
-			/*
-			 * E(47):L3_LEN(9):L2_LEN(7+z)
-			 * E(47):L3_LEN(9):L2_LEN(7+z)
-			 */
-			senddesc01_w1 = vshlq_n_u64(senddesc01_w1, 1);
-			senddesc23_w1 = vshlq_n_u64(senddesc23_w1, 1);
-
-			/* Move OLFLAGS bits 55:52 to 51:48
-			 * with zeros preprended on the byte and rest
-			 * don't care
-			 */
-			xtmp128 = vshrq_n_u8(xtmp128, 4);
-			ytmp128 = vshrq_n_u8(ytmp128, 4);
-			/*
-			 * E(48):L3_LEN(8):L2_LEN(z+7)
-			 * E(48):L3_LEN(8):L2_LEN(z+7)
-			 */
-			const int8x16_t tshft3 = {
-				-1, 0, 8, 8, 8,	8, 8, 8,
-				-1, 0, 8, 8, 8,	8, 8, 8,
-			};
-
-			senddesc01_w1 = vshlq_u8(senddesc01_w1, tshft3);
-			senddesc23_w1 = vshlq_u8(senddesc23_w1, tshft3);
-
-			/* Do the lookup */
-			ltypes01 = vqtbl1q_u8(tbl, xtmp128);
-			ltypes23 = vqtbl1q_u8(tbl, ytmp128);
-
-			/* Just use ld1q to retrieve aura
-			 * when we don't need tx_offload
-			 */
-			mbuf0 = (uint64_t *)((uintptr_t)mbuf0 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf1 = (uint64_t *)((uintptr_t)mbuf1 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf2 = (uint64_t *)((uintptr_t)mbuf2 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf3 = (uint64_t *)((uintptr_t)mbuf3 +
-					offsetof(struct rte_mempool, pool_id));
-
-			/* Pick only relevant fields i.e Bit 48:55 of iltype
-			 * and place it in ol3/ol4type of senddesc_w1
-			 */
-			const uint8x16_t shuf_mask0 = {
-				0xFF, 0xFF, 0xFF, 0xFF,	0x6, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xE, 0xFF, 0xFF, 0xFF,
-			};
-
-			ltypes01 = vqtbl1q_u8(ltypes01, shuf_mask0);
-			ltypes23 = vqtbl1q_u8(ltypes23, shuf_mask0);
-
-			/* Prepare ol4ptr, ol3ptr from ol3len, ol2len.
-			 * a [E(32):E(16):OL3(8):OL2(8)]
-			 * a = a + (a << 8)
-			 * a [E(32):E(16):(OL3+OL2):OL2]
-			 * => E(32):E(16)::OL4PTR(8):OL3PTR(8)
-			 */
-			senddesc01_w1 = vaddq_u8(senddesc01_w1,
-						 vshlq_n_u16(senddesc01_w1, 8));
-			senddesc23_w1 = vaddq_u8(senddesc23_w1,
-						 vshlq_n_u16(senddesc23_w1, 8));
-
-			/* Create first half of 4W cmd for 4 mbufs (sgdesc) */
-			cmd01 = vzip1q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd11 = vzip2q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd21 = vzip1q_u64(sgdesc23_w0, sgdesc23_w1);
-			cmd31 = vzip2q_u64(sgdesc23_w0, sgdesc23_w1);
-
-			xmask01 = vdupq_n_u64(0);
-			xmask23 = xmask01;
-			asm volatile ("LD1 {%[a].H}[0],[%[in]]\n\t" :
-				[a]"+w"(xmask01) : [in]"r"(mbuf0) : "memory");
-
-			asm volatile ("LD1 {%[a].H}[4],[%[in]]\n\t" :
-				 [a]"+w"(xmask01) : [in]"r"(mbuf1) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[0],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf2) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[4],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf3) : "memory");
-			xmask01 = vshlq_n_u64(xmask01, 20);
-			xmask23 = vshlq_n_u64(xmask23, 20);
-
-			senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
-			senddesc23_w0 = vorrq_u64(senddesc23_w0, xmask23);
-			/* Move ltypes to senddesc*_w1 */
-			senddesc01_w1 = vorrq_u64(senddesc01_w1, ltypes01);
-			senddesc23_w1 = vorrq_u64(senddesc23_w1, ltypes23);
-
-			/* Create first half of 4W cmd for 4 mbufs (sendhdr) */
-			cmd00 = vzip1q_u64(senddesc01_w0, senddesc01_w1);
-			cmd10 = vzip2q_u64(senddesc01_w0, senddesc01_w1);
-			cmd20 = vzip1q_u64(senddesc23_w0, senddesc23_w1);
-			cmd30 = vzip2q_u64(senddesc23_w0, senddesc23_w1);
-
-		} else if (!(flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F) &&
-			   (flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)) {
-			/*
-			 * Lookup table to translate ol_flags to
-			 * ol3/ol4 types.
-			 */
-
-			const uint8x16_t tbl = {
-				/* [0-15] = ol4type:ol3type */
-				0x00, /* none */
-				0x03, /* OUTER_IP_CKSUM */
-				0x02, /* OUTER_IPV4 */
-				0x03, /* OUTER_IPV4 | OUTER_IP_CKSUM */
-				0x04, /* OUTER_IPV6 */
-				0x00, /* OUTER_IPV6 | OUTER_IP_CKSUM */
-				0x00, /* OUTER_IPV6 | OUTER_IPV4 */
-				0x00, /* OUTER_IPV6 | OUTER_IPV4 |
-				       * OUTER_IP_CKSUM
-				       */
-				0x00, /* OUTER_UDP_CKSUM */
-				0x33, /* OUTER_UDP_CKSUM | OUTER_IP_CKSUM */
-				0x32, /* OUTER_UDP_CKSUM | OUTER_IPV4 */
-				0x33, /* OUTER_UDP_CKSUM | OUTER_IPV4 |
-				       * OUTER_IP_CKSUM
-				       */
-				0x34, /* OUTER_UDP_CKSUM | OUTER_IPV6 */
-				0x00, /* OUTER_UDP_CKSUM | OUTER_IPV6 |
-				       * OUTER_IP_CKSUM
-				       */
-				0x00, /* OUTER_UDP_CKSUM | OUTER_IPV6 |
-				       * OUTER_IPV4
-				       */
-				0x00, /* OUTER_UDP_CKSUM | OUTER_IPV6 |
-				       * OUTER_IPV4 | OUTER_IP_CKSUM
-				       */
-			};
-
-			/* Extract olflags to translate to iltypes */
-			xtmp128 = vzip1q_u64(len_olflags0, len_olflags1);
-			ytmp128 = vzip1q_u64(len_olflags2, len_olflags3);
-
-			/*
-			 * E(47):OL3_LEN(9):OL2_LEN(7+z)
-			 * E(47):OL3_LEN(9):OL2_LEN(7+z)
-			 */
-			const uint8x16_t shuf_mask5 = {
-				0x6, 0x5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xE, 0xD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-			};
-			senddesc01_w1 = vqtbl1q_u8(senddesc01_w1, shuf_mask5);
-			senddesc23_w1 = vqtbl1q_u8(senddesc23_w1, shuf_mask5);
-
-			/* Extract outer ol flags only */
-			const uint64x2_t o_cksum_mask = {
-				0x1C00020000000000,
-				0x1C00020000000000,
-			};
-
-			xtmp128 = vandq_u64(xtmp128, o_cksum_mask);
-			ytmp128 = vandq_u64(ytmp128, o_cksum_mask);
-
-			/* Extract OUTER_UDP_CKSUM bit 41 and
-			 * move it to bit 61
-			 */
-
-			xtmp128 = xtmp128 | vshlq_n_u64(xtmp128, 20);
-			ytmp128 = ytmp128 | vshlq_n_u64(ytmp128, 20);
-
-			/* Shift oltype by 2 to start nibble from BIT(56)
-			 * instead of BIT(58)
-			 */
-			xtmp128 = vshrq_n_u8(xtmp128, 2);
-			ytmp128 = vshrq_n_u8(ytmp128, 2);
-			/*
-			 * E(48):L3_LEN(8):L2_LEN(z+7)
-			 * E(48):L3_LEN(8):L2_LEN(z+7)
-			 */
-			const int8x16_t tshft3 = {
-				-1, 0, 8, 8, 8, 8, 8, 8,
-				-1, 0, 8, 8, 8, 8, 8, 8,
-			};
-
-			senddesc01_w1 = vshlq_u8(senddesc01_w1, tshft3);
-			senddesc23_w1 = vshlq_u8(senddesc23_w1, tshft3);
-
-			/* Do the lookup */
-			ltypes01 = vqtbl1q_u8(tbl, xtmp128);
-			ltypes23 = vqtbl1q_u8(tbl, ytmp128);
-
-			/* Just use ld1q to retrieve aura
-			 * when we don't need tx_offload
-			 */
-			mbuf0 = (uint64_t *)((uintptr_t)mbuf0 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf1 = (uint64_t *)((uintptr_t)mbuf1 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf2 = (uint64_t *)((uintptr_t)mbuf2 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf3 = (uint64_t *)((uintptr_t)mbuf3 +
-					offsetof(struct rte_mempool, pool_id));
-
-			/* Pick only relevant fields i.e Bit 56:63 of oltype
-			 * and place it in ol3/ol4type of senddesc_w1
-			 */
-			const uint8x16_t shuf_mask0 = {
-				0xFF, 0xFF, 0xFF, 0xFF,	0x7, 0xFF, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF, 0xF, 0xFF, 0xFF, 0xFF,
-			};
-
-			ltypes01 = vqtbl1q_u8(ltypes01, shuf_mask0);
-			ltypes23 = vqtbl1q_u8(ltypes23, shuf_mask0);
-
-			/* Prepare ol4ptr, ol3ptr from ol3len, ol2len.
-			 * a [E(32):E(16):OL3(8):OL2(8)]
-			 * a = a + (a << 8)
-			 * a [E(32):E(16):(OL3+OL2):OL2]
-			 * => E(32):E(16)::OL4PTR(8):OL3PTR(8)
-			 */
-			senddesc01_w1 = vaddq_u8(senddesc01_w1,
-						 vshlq_n_u16(senddesc01_w1, 8));
-			senddesc23_w1 = vaddq_u8(senddesc23_w1,
-						 vshlq_n_u16(senddesc23_w1, 8));
-
-			/* Create second half of 4W cmd for 4 mbufs (sgdesc) */
-			cmd01 = vzip1q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd11 = vzip2q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd21 = vzip1q_u64(sgdesc23_w0, sgdesc23_w1);
-			cmd31 = vzip2q_u64(sgdesc23_w0, sgdesc23_w1);
-
-			xmask01 = vdupq_n_u64(0);
-			xmask23 = xmask01;
-			asm volatile ("LD1 {%[a].H}[0],[%[in]]\n\t" :
-				 [a]"+w"(xmask01) : [in]"r"(mbuf0) : "memory");
-
-			asm volatile ("LD1 {%[a].H}[4],[%[in]]\n\t" :
-				 [a]"+w"(xmask01) : [in]"r"(mbuf1) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[0],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf2) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[4],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf3) : "memory");
-			xmask01 = vshlq_n_u64(xmask01, 20);
-			xmask23 = vshlq_n_u64(xmask23, 20);
-
-			senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
-			senddesc23_w0 = vorrq_u64(senddesc23_w0, xmask23);
-			/* Move ltypes to senddesc*_w1 */
-			senddesc01_w1 = vorrq_u64(senddesc01_w1, ltypes01);
-			senddesc23_w1 = vorrq_u64(senddesc23_w1, ltypes23);
-
-			/* Create first half of 4W cmd for 4 mbufs (sendhdr) */
-			cmd00 = vzip1q_u64(senddesc01_w0, senddesc01_w1);
-			cmd10 = vzip2q_u64(senddesc01_w0, senddesc01_w1);
-			cmd20 = vzip1q_u64(senddesc23_w0, senddesc23_w1);
-			cmd30 = vzip2q_u64(senddesc23_w0, senddesc23_w1);
-
-		} else if ((flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F) &&
-			   (flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)) {
-			/* Lookup table to translate ol_flags to
-			 * ol4type, ol3type, il4type, il3type of senddesc_w1
-			 */
-			const uint8x16x2_t tbl = {
-			{
-				{
-					/* [0-15] = il4type:il3type */
-					0x04, /* none (IPv6) */
-					0x14, /* RTE_MBUF_F_TX_TCP_CKSUM (IPv6) */
-					0x24, /* RTE_MBUF_F_TX_SCTP_CKSUM (IPv6) */
-					0x34, /* RTE_MBUF_F_TX_UDP_CKSUM (IPv6) */
-					0x03, /* RTE_MBUF_F_TX_IP_CKSUM */
-					0x13, /* RTE_MBUF_F_TX_IP_CKSUM |
-					       * RTE_MBUF_F_TX_TCP_CKSUM
-					       */
-					0x23, /* RTE_MBUF_F_TX_IP_CKSUM |
-					       * RTE_MBUF_F_TX_SCTP_CKSUM
-					       */
-					0x33, /* RTE_MBUF_F_TX_IP_CKSUM |
-					       * RTE_MBUF_F_TX_UDP_CKSUM
-					       */
-					0x02, /* RTE_MBUF_F_TX_IPV4 */
-					0x12, /* RTE_MBUF_F_TX_IPV4 |
-					       * RTE_MBUF_F_TX_TCP_CKSUM
-					       */
-					0x22, /* RTE_MBUF_F_TX_IPV4 |
-					       * RTE_MBUF_F_TX_SCTP_CKSUM
-					       */
-					0x32, /* RTE_MBUF_F_TX_IPV4 |
-					       * RTE_MBUF_F_TX_UDP_CKSUM
-					       */
-					0x03, /* RTE_MBUF_F_TX_IPV4 |
-					       * RTE_MBUF_F_TX_IP_CKSUM
-					       */
-					0x13, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
-					       * RTE_MBUF_F_TX_TCP_CKSUM
-					       */
-					0x23, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
-					       * RTE_MBUF_F_TX_SCTP_CKSUM
-					       */
-					0x33, /* RTE_MBUF_F_TX_IPV4 | RTE_MBUF_F_TX_IP_CKSUM |
-					       * RTE_MBUF_F_TX_UDP_CKSUM
-					       */
-				},
-
-				{
-					/* [16-31] = ol4type:ol3type */
-					0x00, /* none */
-					0x03, /* OUTER_IP_CKSUM */
-					0x02, /* OUTER_IPV4 */
-					0x03, /* OUTER_IPV4 | OUTER_IP_CKSUM */
-					0x04, /* OUTER_IPV6 */
-					0x00, /* OUTER_IPV6 | OUTER_IP_CKSUM */
-					0x00, /* OUTER_IPV6 | OUTER_IPV4 */
-					0x00, /* OUTER_IPV6 | OUTER_IPV4 |
-					       * OUTER_IP_CKSUM
-					       */
-					0x00, /* OUTER_UDP_CKSUM */
-					0x33, /* OUTER_UDP_CKSUM |
-					       * OUTER_IP_CKSUM
-					       */
-					0x32, /* OUTER_UDP_CKSUM |
-					       * OUTER_IPV4
-					       */
-					0x33, /* OUTER_UDP_CKSUM |
-					       * OUTER_IPV4 | OUTER_IP_CKSUM
-					       */
-					0x34, /* OUTER_UDP_CKSUM |
-					       * OUTER_IPV6
-					       */
-					0x00, /* OUTER_UDP_CKSUM | OUTER_IPV6 |
-					       * OUTER_IP_CKSUM
-					       */
-					0x00, /* OUTER_UDP_CKSUM | OUTER_IPV6 |
-					       * OUTER_IPV4
-					       */
-					0x00, /* OUTER_UDP_CKSUM | OUTER_IPV6 |
-					       * OUTER_IPV4 | OUTER_IP_CKSUM
-					       */
-				},
-			}
-			};
-
-			/* Extract olflags to translate to oltype & iltype */
-			xtmp128 = vzip1q_u64(len_olflags0, len_olflags1);
-			ytmp128 = vzip1q_u64(len_olflags2, len_olflags3);
-
-			/*
-			 * E(8):OL2_LN(7):OL3_LN(9):E(23):L3_LN(9):L2_LN(7+z)
-			 * E(8):OL2_LN(7):OL3_LN(9):E(23):L3_LN(9):L2_LN(7+z)
-			 */
-			const uint32x4_t tshft_4 = {
-				1, 0,
-				1, 0,
-			};
-			senddesc01_w1 = vshlq_u32(senddesc01_w1, tshft_4);
-			senddesc23_w1 = vshlq_u32(senddesc23_w1, tshft_4);
-
-			/*
-			 * E(32):L3_LEN(8):L2_LEN(7+Z):OL3_LEN(8):OL2_LEN(7+Z)
-			 * E(32):L3_LEN(8):L2_LEN(7+Z):OL3_LEN(8):OL2_LEN(7+Z)
-			 */
-			const uint8x16_t shuf_mask5 = {
-				0x6, 0x5, 0x0, 0x1, 0xFF, 0xFF, 0xFF, 0xFF,
-				0xE, 0xD, 0x8, 0x9, 0xFF, 0xFF,	0xFF, 0xFF,
-			};
-			senddesc01_w1 = vqtbl1q_u8(senddesc01_w1, shuf_mask5);
-			senddesc23_w1 = vqtbl1q_u8(senddesc23_w1, shuf_mask5);
-
-			/* Extract outer and inner header ol_flags */
-			const uint64x2_t oi_cksum_mask = {
-				0x1CF0020000000000,
-				0x1CF0020000000000,
-			};
-
-			xtmp128 = vandq_u64(xtmp128, oi_cksum_mask);
-			ytmp128 = vandq_u64(ytmp128, oi_cksum_mask);
-
-			/* Extract OUTER_UDP_CKSUM bit 41 and
-			 * move it to bit 61
-			 */
-
-			xtmp128 = xtmp128 | vshlq_n_u64(xtmp128, 20);
-			ytmp128 = ytmp128 | vshlq_n_u64(ytmp128, 20);
-
-			/* Shift right oltype by 2 and iltype by 4
-			 * to start oltype nibble from BIT(58)
-			 * instead of BIT(56) and iltype nibble from BIT(48)
-			 * instead of BIT(52).
-			 */
-			const int8x16_t tshft5 = {
-				8, 8, 8, 8, 8, 8, -4, -2,
-				8, 8, 8, 8, 8, 8, -4, -2,
-			};
-
-			xtmp128 = vshlq_u8(xtmp128, tshft5);
-			ytmp128 = vshlq_u8(ytmp128, tshft5);
-			/*
-			 * E(32):L3_LEN(8):L2_LEN(8):OL3_LEN(8):OL2_LEN(8)
-			 * E(32):L3_LEN(8):L2_LEN(8):OL3_LEN(8):OL2_LEN(8)
-			 */
-			const int8x16_t tshft3 = {
-				-1, 0, -1, 0, 0, 0, 0, 0,
-				-1, 0, -1, 0, 0, 0, 0, 0,
-			};
-
-			senddesc01_w1 = vshlq_u8(senddesc01_w1, tshft3);
-			senddesc23_w1 = vshlq_u8(senddesc23_w1, tshft3);
-
-			/* Mark Bit(4) of oltype */
-			const uint64x2_t oi_cksum_mask2 = {
-				0x1000000000000000,
-				0x1000000000000000,
-			};
-
-			xtmp128 = vorrq_u64(xtmp128, oi_cksum_mask2);
-			ytmp128 = vorrq_u64(ytmp128, oi_cksum_mask2);
-
-			/* Do the lookup */
-			ltypes01 = vqtbl2q_u8(tbl, xtmp128);
-			ltypes23 = vqtbl2q_u8(tbl, ytmp128);
-
-			/* Just use ld1q to retrieve aura
-			 * when we don't need tx_offload
-			 */
-			mbuf0 = (uint64_t *)((uintptr_t)mbuf0 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf1 = (uint64_t *)((uintptr_t)mbuf1 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf2 = (uint64_t *)((uintptr_t)mbuf2 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf3 = (uint64_t *)((uintptr_t)mbuf3 +
-					offsetof(struct rte_mempool, pool_id));
-
-			/* Pick only relevant fields i.e Bit 48:55 of iltype and
-			 * Bit 56:63 of oltype and place it in corresponding
-			 * place in senddesc_w1.
-			 */
-			const uint8x16_t shuf_mask0 = {
-				0xFF, 0xFF, 0xFF, 0xFF, 0x7, 0x6, 0xFF, 0xFF,
-				0xFF, 0xFF, 0xFF, 0xFF,	0xF, 0xE, 0xFF, 0xFF,
-			};
-
-			ltypes01 = vqtbl1q_u8(ltypes01, shuf_mask0);
-			ltypes23 = vqtbl1q_u8(ltypes23, shuf_mask0);
-
-			/* Prepare l4ptr, l3ptr, ol4ptr, ol3ptr from
-			 * l3len, l2len, ol3len, ol2len.
-			 * a [E(32):L3(8):L2(8):OL3(8):OL2(8)]
-			 * a = a + (a << 8)
-			 * a [E:(L3+L2):(L2+OL3):(OL3+OL2):OL2]
-			 * a = a + (a << 16)
-			 * a [E:(L3+L2+OL3+OL2):(L2+OL3+OL2):(OL3+OL2):OL2]
-			 * => E(32):IL4PTR(8):IL3PTR(8):OL4PTR(8):OL3PTR(8)
-			 */
-			senddesc01_w1 = vaddq_u8(senddesc01_w1,
-						 vshlq_n_u32(senddesc01_w1, 8));
-			senddesc23_w1 = vaddq_u8(senddesc23_w1,
-						 vshlq_n_u32(senddesc23_w1, 8));
-
-			/* Create second half of 4W cmd for 4 mbufs (sgdesc) */
-			cmd01 = vzip1q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd11 = vzip2q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd21 = vzip1q_u64(sgdesc23_w0, sgdesc23_w1);
-			cmd31 = vzip2q_u64(sgdesc23_w0, sgdesc23_w1);
-
-			/* Continue preparing l4ptr, l3ptr, ol4ptr, ol3ptr */
-			senddesc01_w1 = vaddq_u8(senddesc01_w1,
-						vshlq_n_u32(senddesc01_w1, 16));
-			senddesc23_w1 = vaddq_u8(senddesc23_w1,
-						vshlq_n_u32(senddesc23_w1, 16));
-
-			xmask01 = vdupq_n_u64(0);
-			xmask23 = xmask01;
-			asm volatile ("LD1 {%[a].H}[0],[%[in]]\n\t" :
-				 [a]"+w"(xmask01) : [in]"r"(mbuf0) : "memory");
-
-			asm volatile ("LD1 {%[a].H}[4],[%[in]]\n\t" :
-				 [a]"+w"(xmask01) : [in]"r"(mbuf1) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[0],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf2) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[4],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf3) : "memory");
-			xmask01 = vshlq_n_u64(xmask01, 20);
-			xmask23 = vshlq_n_u64(xmask23, 20);
-
-			senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
-			senddesc23_w0 = vorrq_u64(senddesc23_w0, xmask23);
-			/* Move ltypes to senddesc*_w1 */
-			senddesc01_w1 = vorrq_u64(senddesc01_w1, ltypes01);
-			senddesc23_w1 = vorrq_u64(senddesc23_w1, ltypes23);
-
-			/* Create first half of 4W cmd for 4 mbufs (sendhdr) */
-			cmd00 = vzip1q_u64(senddesc01_w0, senddesc01_w1);
-			cmd10 = vzip2q_u64(senddesc01_w0, senddesc01_w1);
-			cmd20 = vzip1q_u64(senddesc23_w0, senddesc23_w1);
-			cmd30 = vzip2q_u64(senddesc23_w0, senddesc23_w1);
-		} else {
-			/* Just use ld1q to retrieve aura
-			 * when we don't need tx_offload
-			 */
-			mbuf0 = (uint64_t *)((uintptr_t)mbuf0 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf1 = (uint64_t *)((uintptr_t)mbuf1 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf2 = (uint64_t *)((uintptr_t)mbuf2 +
-					offsetof(struct rte_mempool, pool_id));
-			mbuf3 = (uint64_t *)((uintptr_t)mbuf3 +
-					offsetof(struct rte_mempool, pool_id));
-			xmask01 = vdupq_n_u64(0);
-			xmask23 = xmask01;
-			asm volatile ("LD1 {%[a].H}[0],[%[in]]\n\t" :
-				 [a]"+w"(xmask01) : [in]"r"(mbuf0) : "memory");
-
-			asm volatile ("LD1 {%[a].H}[4],[%[in]]\n\t" :
-				 [a]"+w"(xmask01) : [in]"r"(mbuf1) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[0],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf2) : "memory");
-
-			asm volatile ("LD1 {%[b].H}[4],[%[in]]\n\t" :
-				 [b]"+w"(xmask23) : [in]"r"(mbuf3) : "memory");
-			xmask01 = vshlq_n_u64(xmask01, 20);
-			xmask23 = vshlq_n_u64(xmask23, 20);
-
-			senddesc01_w0 = vorrq_u64(senddesc01_w0, xmask01);
-			senddesc23_w0 = vorrq_u64(senddesc23_w0, xmask23);
-
-			/* Create 4W cmd for 4 mbufs (sendhdr, sgdesc) */
-			cmd00 = vzip1q_u64(senddesc01_w0, senddesc01_w1);
-			cmd01 = vzip1q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd10 = vzip2q_u64(senddesc01_w0, senddesc01_w1);
-			cmd11 = vzip2q_u64(sgdesc01_w0, sgdesc01_w1);
-			cmd20 = vzip1q_u64(senddesc23_w0, senddesc23_w1);
-			cmd21 = vzip1q_u64(sgdesc23_w0, sgdesc23_w1);
-			cmd30 = vzip2q_u64(senddesc23_w0, senddesc23_w1);
-			cmd31 = vzip2q_u64(sgdesc23_w0, sgdesc23_w1);
-		}
-
-		do {
-			vst1q_u64(lmt_addr, cmd00);
-			vst1q_u64(lmt_addr + 2, cmd01);
-			vst1q_u64(lmt_addr + 4, cmd10);
-			vst1q_u64(lmt_addr + 6, cmd11);
-			vst1q_u64(lmt_addr + 8, cmd20);
-			vst1q_u64(lmt_addr + 10, cmd21);
-			vst1q_u64(lmt_addr + 12, cmd30);
-			vst1q_u64(lmt_addr + 14, cmd31);
-			lmt_status = otx2_lmt_submit(io_addr);
-
-		} while (lmt_status == 0);
-		tx_pkts = tx_pkts + NIX_DESCS_PER_LOOP;
-	}
-
-	if (unlikely(pkts_left))
-		pkts += nix_xmit_pkts(tx_queue, tx_pkts, pkts_left, cmd, flags);
-
-	return pkts;
-}
-
-#else
-static __rte_always_inline uint16_t
-nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
-		     uint16_t pkts, uint64_t *cmd, const uint16_t flags)
-{
-	RTE_SET_USED(tx_queue);
-	RTE_SET_USED(tx_pkts);
-	RTE_SET_USED(pkts);
-	RTE_SET_USED(cmd);
-	RTE_SET_USED(flags);
-	return 0;
-}
-#endif
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-static uint16_t __rte_noinline	__rte_hot					\
-otx2_nix_xmit_pkts_ ## name(void *tx_queue,				\
-			struct rte_mbuf **tx_pkts, uint16_t pkts)	\
-{									\
-	uint64_t cmd[sz];						\
-									\
-	/* For TSO inner checksum is a must */				\
-	if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&				\
-	    !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))			\
-		return 0;						\
-	return nix_xmit_pkts(tx_queue, tx_pkts, pkts, cmd, flags);	\
-}
-
-NIX_TX_FASTPATH_MODES
-#undef T
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-static uint16_t __rte_noinline	__rte_hot					\
-otx2_nix_xmit_pkts_mseg_ ## name(void *tx_queue,			\
-			struct rte_mbuf **tx_pkts, uint16_t pkts)	\
-{									\
-	uint64_t cmd[(sz) + NIX_TX_MSEG_SG_DWORDS - 2];			\
-									\
-	/* For TSO inner checksum is a must */				\
-	if (((flags) & NIX_TX_OFFLOAD_TSO_F) &&				\
-	    !((flags) & NIX_TX_OFFLOAD_L3_L4_CSUM_F))			\
-		return 0;						\
-	return nix_xmit_pkts_mseg(tx_queue, tx_pkts, pkts, cmd,		\
-				  (flags) | NIX_TX_MULTI_SEG_F);	\
-}
-
-NIX_TX_FASTPATH_MODES
-#undef T
-
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-static uint16_t __rte_noinline	__rte_hot					\
-otx2_nix_xmit_pkts_vec_ ## name(void *tx_queue,				\
-			struct rte_mbuf **tx_pkts, uint16_t pkts)	\
-{									\
-	uint64_t cmd[sz];						\
-									\
-	/* VLAN, TSTMP, TSO is not supported by vec */			\
-	if ((flags) & NIX_TX_OFFLOAD_VLAN_QINQ_F ||			\
-	    (flags) & NIX_TX_OFFLOAD_TSTAMP_F ||			\
-	    (flags) & NIX_TX_OFFLOAD_TSO_F)				\
-		return 0;						\
-	return nix_xmit_pkts_vector(tx_queue, tx_pkts, pkts, cmd, (flags)); \
-}
-
-NIX_TX_FASTPATH_MODES
-#undef T
-
-static inline void
-pick_tx_func(struct rte_eth_dev *eth_dev,
-	     const eth_tx_burst_t tx_burst[2][2][2][2][2][2][2])
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	/* [SEC] [TSTMP] [NOFF] [VLAN] [OL3_OL4_CSUM] [IL3_IL4_CSUM] */
-	eth_dev->tx_pkt_burst = tx_burst
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_SECURITY_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSO_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_TSTAMP_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_MBUF_NOFF_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_VLAN_QINQ_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F)]
-		[!!(dev->tx_offload_flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)];
-}
-
-void
-otx2_eth_set_tx_function(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-
-	const eth_tx_burst_t nix_eth_tx_burst[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-	[f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_xmit_pkts_ ## name,
-
-NIX_TX_FASTPATH_MODES
-#undef T
-	};
-
-	const eth_tx_burst_t nix_eth_tx_burst_mseg[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-	[f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_xmit_pkts_mseg_ ## name,
-
-NIX_TX_FASTPATH_MODES
-#undef T
-	};
-
-	const eth_tx_burst_t nix_eth_tx_vec_burst[2][2][2][2][2][2][2] = {
-#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)			\
-	[f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_xmit_pkts_vec_ ## name,
-
-NIX_TX_FASTPATH_MODES
-#undef T
-	};
-
-	if (dev->scalar_ena ||
-	    (dev->tx_offload_flags &
-	     (NIX_TX_OFFLOAD_VLAN_QINQ_F | NIX_TX_OFFLOAD_TSTAMP_F |
-	      NIX_TX_OFFLOAD_TSO_F)))
-		pick_tx_func(eth_dev, nix_eth_tx_burst);
-	else
-		pick_tx_func(eth_dev, nix_eth_tx_vec_burst);
-
-	if (dev->tx_offloads & RTE_ETH_TX_OFFLOAD_MULTI_SEGS)
-		pick_tx_func(eth_dev, nix_eth_tx_burst_mseg);
-
-	rte_mb();
-}
diff --git a/drivers/net/octeontx2/otx2_tx.h b/drivers/net/octeontx2/otx2_tx.h
deleted file mode 100644
index 4bbd5a390f..0000000000
--- a/drivers/net/octeontx2/otx2_tx.h
+++ /dev/null
@@ -1,791 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#ifndef __OTX2_TX_H__
-#define __OTX2_TX_H__
-
-#define NIX_TX_OFFLOAD_NONE		(0)
-#define NIX_TX_OFFLOAD_L3_L4_CSUM_F	BIT(0)
-#define NIX_TX_OFFLOAD_OL3_OL4_CSUM_F	BIT(1)
-#define NIX_TX_OFFLOAD_VLAN_QINQ_F	BIT(2)
-#define NIX_TX_OFFLOAD_MBUF_NOFF_F	BIT(3)
-#define NIX_TX_OFFLOAD_TSTAMP_F		BIT(4)
-#define NIX_TX_OFFLOAD_TSO_F		BIT(5)
-#define NIX_TX_OFFLOAD_SECURITY_F	BIT(6)
-
-/* Flags to control xmit_prepare function.
- * Defining it from backwards to denote its been
- * not used as offload flags to pick function
- */
-#define NIX_TX_MULTI_SEG_F		BIT(15)
-
-#define NIX_TX_NEED_SEND_HDR_W1	\
-	(NIX_TX_OFFLOAD_L3_L4_CSUM_F | NIX_TX_OFFLOAD_OL3_OL4_CSUM_F |	\
-	 NIX_TX_OFFLOAD_VLAN_QINQ_F | NIX_TX_OFFLOAD_TSO_F)
-
-#define NIX_TX_NEED_EXT_HDR \
-	(NIX_TX_OFFLOAD_VLAN_QINQ_F | NIX_TX_OFFLOAD_TSTAMP_F | \
-	 NIX_TX_OFFLOAD_TSO_F)
-
-#define NIX_UDP_TUN_BITMASK \
-	((1ull << (RTE_MBUF_F_TX_TUNNEL_VXLAN >> 45)) | \
-	 (1ull << (RTE_MBUF_F_TX_TUNNEL_GENEVE >> 45)))
-
-#define NIX_LSO_FORMAT_IDX_TSOV4	(0)
-#define NIX_LSO_FORMAT_IDX_TSOV6	(1)
-
-/* Function to determine no of tx subdesc required in case ext
- * sub desc is enabled.
- */
-static __rte_always_inline int
-otx2_nix_tx_ext_subs(const uint16_t flags)
-{
-	return (flags & NIX_TX_OFFLOAD_TSTAMP_F) ? 2 :
-		((flags & (NIX_TX_OFFLOAD_VLAN_QINQ_F | NIX_TX_OFFLOAD_TSO_F)) ?
-		 1 : 0);
-}
-
-static __rte_always_inline void
-otx2_nix_xmit_prepare_tstamp(uint64_t *cmd,  const uint64_t *send_mem_desc,
-			     const uint64_t ol_flags, const uint16_t no_segdw,
-			     const uint16_t flags)
-{
-	if (flags & NIX_TX_OFFLOAD_TSTAMP_F) {
-		struct nix_send_mem_s *send_mem;
-		uint16_t off = (no_segdw - 1) << 1;
-		const uint8_t is_ol_tstamp = !(ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST);
-
-		send_mem = (struct nix_send_mem_s *)(cmd + off);
-		if (flags & NIX_TX_MULTI_SEG_F) {
-			/* Retrieving the default desc values */
-			cmd[off] = send_mem_desc[6];
-
-			/* Using compiler barier to avoid voilation of C
-			 * aliasing rules.
-			 */
-			rte_compiler_barrier();
-		}
-
-		/* Packets for which RTE_MBUF_F_TX_IEEE1588_TMST is not set, tx tstamp
-		 * should not be recorded, hence changing the alg type to
-		 * NIX_SENDMEMALG_SET and also changing send mem addr field to
-		 * next 8 bytes as it corrpt the actual tx tstamp registered
-		 * address.
-		 */
-		send_mem->alg = NIX_SENDMEMALG_SETTSTMP - (is_ol_tstamp);
-
-		send_mem->addr = (rte_iova_t)((uint64_t *)send_mem_desc[7] +
-					      (is_ol_tstamp));
-	}
-}
-
-static __rte_always_inline uint64_t
-otx2_pktmbuf_detach(struct rte_mbuf *m)
-{
-	struct rte_mempool *mp = m->pool;
-	uint32_t mbuf_size, buf_len;
-	struct rte_mbuf *md;
-	uint16_t priv_size;
-	uint16_t refcount;
-
-	/* Update refcount of direct mbuf */
-	md = rte_mbuf_from_indirect(m);
-	refcount = rte_mbuf_refcnt_update(md, -1);
-
-	priv_size = rte_pktmbuf_priv_size(mp);
-	mbuf_size = (uint32_t)(sizeof(struct rte_mbuf) + priv_size);
-	buf_len = rte_pktmbuf_data_room_size(mp);
-
-	m->priv_size = priv_size;
-	m->buf_addr = (char *)m + mbuf_size;
-	m->buf_iova = rte_mempool_virt2iova(m) + mbuf_size;
-	m->buf_len = (uint16_t)buf_len;
-	rte_pktmbuf_reset_headroom(m);
-	m->data_len = 0;
-	m->ol_flags = 0;
-	m->next = NULL;
-	m->nb_segs = 1;
-
-	/* Now indirect mbuf is safe to free */
-	rte_pktmbuf_free(m);
-
-	if (refcount == 0) {
-		rte_mbuf_refcnt_set(md, 1);
-		md->data_len = 0;
-		md->ol_flags = 0;
-		md->next = NULL;
-		md->nb_segs = 1;
-		return 0;
-	} else {
-		return 1;
-	}
-}
-
-static __rte_always_inline uint64_t
-otx2_nix_prefree_seg(struct rte_mbuf *m)
-{
-	if (likely(rte_mbuf_refcnt_read(m) == 1)) {
-		if (!RTE_MBUF_DIRECT(m))
-			return otx2_pktmbuf_detach(m);
-
-		m->next = NULL;
-		m->nb_segs = 1;
-		return 0;
-	} else if (rte_mbuf_refcnt_update(m, -1) == 0) {
-		if (!RTE_MBUF_DIRECT(m))
-			return otx2_pktmbuf_detach(m);
-
-		rte_mbuf_refcnt_set(m, 1);
-		m->next = NULL;
-		m->nb_segs = 1;
-		return 0;
-	}
-
-	/* Mbuf is having refcount more than 1 so need not to be freed */
-	return 1;
-}
-
-static __rte_always_inline void
-otx2_nix_xmit_prepare_tso(struct rte_mbuf *m, const uint64_t flags)
-{
-	uint64_t mask, ol_flags = m->ol_flags;
-
-	if (flags & NIX_TX_OFFLOAD_TSO_F &&
-	    (ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {
-		uintptr_t mdata = rte_pktmbuf_mtod(m, uintptr_t);
-		uint16_t *iplen, *oiplen, *oudplen;
-		uint16_t lso_sb, paylen;
-
-		mask = -!!(ol_flags & (RTE_MBUF_F_TX_OUTER_IPV4 | RTE_MBUF_F_TX_OUTER_IPV6));
-		lso_sb = (mask & (m->outer_l2_len + m->outer_l3_len)) +
-			m->l2_len + m->l3_len + m->l4_len;
-
-		/* Reduce payload len from base headers */
-		paylen = m->pkt_len - lso_sb;
-
-		/* Get iplen position assuming no tunnel hdr */
-		iplen = (uint16_t *)(mdata + m->l2_len +
-				     (2 << !!(ol_flags & RTE_MBUF_F_TX_IPV6)));
-		/* Handle tunnel tso */
-		if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-		    (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) {
-			const uint8_t is_udp_tun = (NIX_UDP_TUN_BITMASK >>
-				((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) & 0x1;
-
-			oiplen = (uint16_t *)(mdata + m->outer_l2_len +
-				(2 << !!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)));
-			*oiplen = rte_cpu_to_be_16(rte_be_to_cpu_16(*oiplen) -
-						   paylen);
-
-			/* Update format for UDP tunneled packet */
-			if (is_udp_tun) {
-				oudplen = (uint16_t *)(mdata + m->outer_l2_len +
-						       m->outer_l3_len + 4);
-				*oudplen =
-				rte_cpu_to_be_16(rte_be_to_cpu_16(*oudplen) -
-						 paylen);
-			}
-
-			/* Update iplen position to inner ip hdr */
-			iplen = (uint16_t *)(mdata + lso_sb - m->l3_len -
-				m->l4_len + (2 << !!(ol_flags & RTE_MBUF_F_TX_IPV6)));
-		}
-
-		*iplen = rte_cpu_to_be_16(rte_be_to_cpu_16(*iplen) - paylen);
-	}
-}
-
-static __rte_always_inline void
-otx2_nix_xmit_prepare(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags,
-		      const uint64_t lso_tun_fmt)
-{
-	struct nix_send_ext_s *send_hdr_ext;
-	struct nix_send_hdr_s *send_hdr;
-	uint64_t ol_flags = 0, mask;
-	union nix_send_hdr_w1_u w1;
-	union nix_send_sg_s *sg;
-
-	send_hdr = (struct nix_send_hdr_s *)cmd;
-	if (flags & NIX_TX_NEED_EXT_HDR) {
-		send_hdr_ext = (struct nix_send_ext_s *)(cmd + 2);
-		sg = (union nix_send_sg_s *)(cmd + 4);
-		/* Clear previous markings */
-		send_hdr_ext->w0.lso = 0;
-		send_hdr_ext->w1.u = 0;
-	} else {
-		sg = (union nix_send_sg_s *)(cmd + 2);
-	}
-
-	if (flags & NIX_TX_NEED_SEND_HDR_W1) {
-		ol_flags = m->ol_flags;
-		w1.u = 0;
-	}
-
-	if (!(flags & NIX_TX_MULTI_SEG_F)) {
-		send_hdr->w0.total = m->data_len;
-		send_hdr->w0.aura =
-			npa_lf_aura_handle_to_aura(m->pool->pool_id);
-	}
-
-	/*
-	 * L3type:  2 => IPV4
-	 *          3 => IPV4 with csum
-	 *          4 => IPV6
-	 * L3type and L3ptr needs to be set for either
-	 * L3 csum or L4 csum or LSO
-	 *
-	 */
-
-	if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-	    (flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F)) {
-		const uint8_t csum = !!(ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM);
-		const uint8_t ol3type =
-			((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV4)) << 1) +
-			((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)) << 2) +
-			!!(ol_flags & RTE_MBUF_F_TX_OUTER_IP_CKSUM);
-
-		/* Outer L3 */
-		w1.ol3type = ol3type;
-		mask = 0xffffull << ((!!ol3type) << 4);
-		w1.ol3ptr = ~mask & m->outer_l2_len;
-		w1.ol4ptr = ~mask & (w1.ol3ptr + m->outer_l3_len);
-
-		/* Outer L4 */
-		w1.ol4type = csum + (csum << 1);
-
-		/* Inner L3 */
-		w1.il3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
-			((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2);
-		w1.il3ptr = w1.ol4ptr + m->l2_len;
-		w1.il4ptr = w1.il3ptr + m->l3_len;
-		/* Increment it by 1 if it is IPV4 as 3 is with csum */
-		w1.il3type = w1.il3type + !!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
-
-		/* Inner L4 */
-		w1.il4type =  (ol_flags & RTE_MBUF_F_TX_L4_MASK) >> 52;
-
-		/* In case of no tunnel header use only
-		 * shift IL3/IL4 fields a bit to use
-		 * OL3/OL4 for header checksum
-		 */
-		mask = !ol3type;
-		w1.u = ((w1.u & 0xFFFFFFFF00000000) >> (mask << 3)) |
-			((w1.u & 0X00000000FFFFFFFF) >> (mask << 4));
-
-	} else if (flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) {
-		const uint8_t csum = !!(ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM);
-		const uint8_t outer_l2_len = m->outer_l2_len;
-
-		/* Outer L3 */
-		w1.ol3ptr = outer_l2_len;
-		w1.ol4ptr = outer_l2_len + m->outer_l3_len;
-		/* Increment it by 1 if it is IPV4 as 3 is with csum */
-		w1.ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV4)) << 1) +
-			((!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6)) << 2) +
-			!!(ol_flags & RTE_MBUF_F_TX_OUTER_IP_CKSUM);
-
-		/* Outer L4 */
-		w1.ol4type = csum + (csum << 1);
-
-	} else if (flags & NIX_TX_OFFLOAD_L3_L4_CSUM_F) {
-		const uint8_t l2_len = m->l2_len;
-
-		/* Always use OLXPTR and OLXTYPE when only
-		 * when one header is present
-		 */
-
-		/* Inner L3 */
-		w1.ol3ptr = l2_len;
-		w1.ol4ptr = l2_len + m->l3_len;
-		/* Increment it by 1 if it is IPV4 as 3 is with csum */
-		w1.ol3type = ((!!(ol_flags & RTE_MBUF_F_TX_IPV4)) << 1) +
-			((!!(ol_flags & RTE_MBUF_F_TX_IPV6)) << 2) +
-			!!(ol_flags & RTE_MBUF_F_TX_IP_CKSUM);
-
-		/* Inner L4 */
-		w1.ol4type =  (ol_flags & RTE_MBUF_F_TX_L4_MASK) >> 52;
-	}
-
-	if (flags & NIX_TX_NEED_EXT_HDR &&
-	    flags & NIX_TX_OFFLOAD_VLAN_QINQ_F) {
-		send_hdr_ext->w1.vlan1_ins_ena = !!(ol_flags & RTE_MBUF_F_TX_VLAN);
-		/* HW will update ptr after vlan0 update */
-		send_hdr_ext->w1.vlan1_ins_ptr = 12;
-		send_hdr_ext->w1.vlan1_ins_tci = m->vlan_tci;
-
-		send_hdr_ext->w1.vlan0_ins_ena = !!(ol_flags & RTE_MBUF_F_TX_QINQ);
-		/* 2B before end of l2 header */
-		send_hdr_ext->w1.vlan0_ins_ptr = 12;
-		send_hdr_ext->w1.vlan0_ins_tci = m->vlan_tci_outer;
-	}
-
-	if (flags & NIX_TX_OFFLOAD_TSO_F &&
-	    (ol_flags & RTE_MBUF_F_TX_TCP_SEG)) {
-		uint16_t lso_sb;
-		uint64_t mask;
-
-		mask = -(!w1.il3type);
-		lso_sb = (mask & w1.ol4ptr) + (~mask & w1.il4ptr) + m->l4_len;
-
-		send_hdr_ext->w0.lso_sb = lso_sb;
-		send_hdr_ext->w0.lso = 1;
-		send_hdr_ext->w0.lso_mps = m->tso_segsz;
-		send_hdr_ext->w0.lso_format =
-			NIX_LSO_FORMAT_IDX_TSOV4 + !!(ol_flags & RTE_MBUF_F_TX_IPV6);
-		w1.ol4type = NIX_SENDL4TYPE_TCP_CKSUM;
-
-		/* Handle tunnel tso */
-		if ((flags & NIX_TX_OFFLOAD_OL3_OL4_CSUM_F) &&
-		    (ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)) {
-			const uint8_t is_udp_tun = (NIX_UDP_TUN_BITMASK >>
-				((ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) >> 45)) & 0x1;
-			uint8_t shift = is_udp_tun ? 32 : 0;
-
-			shift += (!!(ol_flags & RTE_MBUF_F_TX_OUTER_IPV6) << 4);
-			shift += (!!(ol_flags & RTE_MBUF_F_TX_IPV6) << 3);
-
-			w1.il4type = NIX_SENDL4TYPE_TCP_CKSUM;
-			w1.ol4type = is_udp_tun ? NIX_SENDL4TYPE_UDP_CKSUM : 0;
-			/* Update format for UDP tunneled packet */
-			send_hdr_ext->w0.lso_format = (lso_tun_fmt >> shift);
-		}
-	}
-
-	if (flags & NIX_TX_NEED_SEND_HDR_W1)
-		send_hdr->w1.u = w1.u;
-
-	if (!(flags & NIX_TX_MULTI_SEG_F)) {
-		sg->seg1_size = m->data_len;
-		*(rte_iova_t *)(++sg) = rte_mbuf_data_iova(m);
-
-		if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
-			/* DF bit = 1 if refcount of current mbuf or parent mbuf
-			 *		is greater than 1
-			 * DF bit = 0 otherwise
-			 */
-			send_hdr->w0.df = otx2_nix_prefree_seg(m);
-			/* Ensuring mbuf fields which got updated in
-			 * otx2_nix_prefree_seg are written before LMTST.
-			 */
-			rte_io_wmb();
-		}
-		/* Mark mempool object as "put" since it is freed by NIX */
-		if (!send_hdr->w0.df)
-			RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
-	}
-}
-
-
-static __rte_always_inline void
-otx2_nix_xmit_one(uint64_t *cmd, void *lmt_addr,
-		  const rte_iova_t io_addr, const uint32_t flags)
-{
-	uint64_t lmt_status;
-
-	do {
-		otx2_lmt_mov(lmt_addr, cmd, otx2_nix_tx_ext_subs(flags));
-		lmt_status = otx2_lmt_submit(io_addr);
-	} while (lmt_status == 0);
-}
-
-static __rte_always_inline void
-otx2_nix_xmit_prep_lmt(uint64_t *cmd, void *lmt_addr, const uint32_t flags)
-{
-	otx2_lmt_mov(lmt_addr, cmd, otx2_nix_tx_ext_subs(flags));
-}
-
-static __rte_always_inline uint64_t
-otx2_nix_xmit_submit_lmt(const rte_iova_t io_addr)
-{
-	return otx2_lmt_submit(io_addr);
-}
-
-static __rte_always_inline uint64_t
-otx2_nix_xmit_submit_lmt_release(const rte_iova_t io_addr)
-{
-	return otx2_lmt_submit_release(io_addr);
-}
-
-static __rte_always_inline uint16_t
-otx2_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
-{
-	struct nix_send_hdr_s *send_hdr;
-	union nix_send_sg_s *sg;
-	struct rte_mbuf *m_next;
-	uint64_t *slist, sg_u;
-	uint64_t nb_segs;
-	uint64_t segdw;
-	uint8_t off, i;
-
-	send_hdr = (struct nix_send_hdr_s *)cmd;
-	send_hdr->w0.total = m->pkt_len;
-	send_hdr->w0.aura = npa_lf_aura_handle_to_aura(m->pool->pool_id);
-
-	if (flags & NIX_TX_NEED_EXT_HDR)
-		off = 2;
-	else
-		off = 0;
-
-	sg = (union nix_send_sg_s *)&cmd[2 + off];
-	/* Clear sg->u header before use */
-	sg->u &= 0xFC00000000000000;
-	sg_u = sg->u;
-	slist = &cmd[3 + off];
-
-	i = 0;
-	nb_segs = m->nb_segs;
-
-	/* Fill mbuf segments */
-	do {
-		m_next = m->next;
-		sg_u = sg_u | ((uint64_t)m->data_len << (i << 4));
-		*slist = rte_mbuf_data_iova(m);
-		/* Set invert df if buffer is not to be freed by H/W */
-		if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
-			sg_u |=	(otx2_nix_prefree_seg(m) << (i + 55));
-			/* Commit changes to mbuf */
-			rte_io_wmb();
-		}
-		/* Mark mempool object as "put" since it is freed by NIX */
-#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
-		if (!(sg_u & (1ULL << (i + 55))))
-			RTE_MEMPOOL_CHECK_COOKIES(m->pool, (void **)&m, 1, 0);
-		rte_io_wmb();
-#endif
-		slist++;
-		i++;
-		nb_segs--;
-		if (i > 2 && nb_segs) {
-			i = 0;
-			/* Next SG subdesc */
-			*(uint64_t *)slist = sg_u & 0xFC00000000000000;
-			sg->u = sg_u;
-			sg->segs = 3;
-			sg = (union nix_send_sg_s *)slist;
-			sg_u = sg->u;
-			slist++;
-		}
-		m = m_next;
-	} while (nb_segs);
-
-	sg->u = sg_u;
-	sg->segs = i;
-	segdw = (uint64_t *)slist - (uint64_t *)&cmd[2 + off];
-	/* Roundup extra dwords to multiple of 2 */
-	segdw = (segdw >> 1) + (segdw & 0x1);
-	/* Default dwords */
-	segdw += (off >> 1) + 1 + !!(flags & NIX_TX_OFFLOAD_TSTAMP_F);
-	send_hdr->w0.sizem1 = segdw - 1;
-
-	return segdw;
-}
-
-static __rte_always_inline void
-otx2_nix_xmit_mseg_prep_lmt(uint64_t *cmd, void *lmt_addr, uint16_t segdw)
-{
-	otx2_lmt_mov_seg(lmt_addr, (const void *)cmd, segdw);
-}
-
-static __rte_always_inline void
-otx2_nix_xmit_mseg_one(uint64_t *cmd, void *lmt_addr,
-		       rte_iova_t io_addr, uint16_t segdw)
-{
-	uint64_t lmt_status;
-
-	do {
-		otx2_lmt_mov_seg(lmt_addr, (const void *)cmd, segdw);
-		lmt_status = otx2_lmt_submit(io_addr);
-	} while (lmt_status == 0);
-}
-
-static __rte_always_inline void
-otx2_nix_xmit_mseg_one_release(uint64_t *cmd, void *lmt_addr,
-		       rte_iova_t io_addr, uint16_t segdw)
-{
-	uint64_t lmt_status;
-
-	rte_io_wmb();
-	do {
-		otx2_lmt_mov_seg(lmt_addr, (const void *)cmd, segdw);
-		lmt_status = otx2_lmt_submit(io_addr);
-	} while (lmt_status == 0);
-}
-
-#define L3L4CSUM_F   NIX_TX_OFFLOAD_L3_L4_CSUM_F
-#define OL3OL4CSUM_F NIX_TX_OFFLOAD_OL3_OL4_CSUM_F
-#define VLAN_F       NIX_TX_OFFLOAD_VLAN_QINQ_F
-#define NOFF_F       NIX_TX_OFFLOAD_MBUF_NOFF_F
-#define TSP_F        NIX_TX_OFFLOAD_TSTAMP_F
-#define TSO_F        NIX_TX_OFFLOAD_TSO_F
-#define TX_SEC_F     NIX_TX_OFFLOAD_SECURITY_F
-
-/* [SEC] [TSO] [TSTMP] [NOFF] [VLAN] [OL3OL4CSUM] [L3L4CSUM] */
-#define NIX_TX_FASTPATH_MODES						\
-T(no_offload,				0, 0, 0, 0, 0, 0, 0,	4,	\
-		NIX_TX_OFFLOAD_NONE)					\
-T(l3l4csum,				0, 0, 0, 0, 0, 0, 1,	4,	\
-		L3L4CSUM_F)						\
-T(ol3ol4csum,				0, 0, 0, 0, 0, 1, 0,	4,	\
-		OL3OL4CSUM_F)						\
-T(ol3ol4csum_l3l4csum,			0, 0, 0, 0, 0, 1, 1,	4,	\
-		OL3OL4CSUM_F | L3L4CSUM_F)				\
-T(vlan,					0, 0, 0, 0, 1, 0, 0,	6,	\
-		VLAN_F)							\
-T(vlan_l3l4csum,			0, 0, 0, 0, 1, 0, 1,	6,	\
-		VLAN_F | L3L4CSUM_F)					\
-T(vlan_ol3ol4csum,			0, 0, 0, 0, 1, 1, 0,	6,	\
-		VLAN_F | OL3OL4CSUM_F)					\
-T(vlan_ol3ol4csum_l3l4csum,		0, 0, 0, 0, 1, 1, 1,	6,	\
-		VLAN_F | OL3OL4CSUM_F |	L3L4CSUM_F)			\
-T(noff,					0, 0, 0, 1, 0, 0, 0,	4,	\
-		NOFF_F)							\
-T(noff_l3l4csum,			0, 0, 0, 1, 0, 0, 1,	4,	\
-		NOFF_F | L3L4CSUM_F)					\
-T(noff_ol3ol4csum,			0, 0, 0, 1, 0, 1, 0,	4,	\
-		NOFF_F | OL3OL4CSUM_F)					\
-T(noff_ol3ol4csum_l3l4csum,		0, 0, 0, 1, 0, 1, 1,	4,	\
-		NOFF_F | OL3OL4CSUM_F |	L3L4CSUM_F)			\
-T(noff_vlan,				0, 0, 0, 1, 1, 0, 0,	6,	\
-		NOFF_F | VLAN_F)					\
-T(noff_vlan_l3l4csum,			0, 0, 0, 1, 1, 0, 1,	6,	\
-		NOFF_F | VLAN_F | L3L4CSUM_F)				\
-T(noff_vlan_ol3ol4csum,			0, 0, 0, 1, 1, 1, 0,	6,	\
-		NOFF_F | VLAN_F | OL3OL4CSUM_F)				\
-T(noff_vlan_ol3ol4csum_l3l4csum,	0, 0, 0, 1, 1, 1, 1,	6,	\
-		NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(ts,					0, 0, 1, 0, 0, 0, 0,	8,	\
-		TSP_F)							\
-T(ts_l3l4csum,				0, 0, 1, 0, 0, 0, 1,	8,	\
-		TSP_F | L3L4CSUM_F)					\
-T(ts_ol3ol4csum,			0, 0, 1, 0, 0, 1, 0,	8,	\
-		TSP_F | OL3OL4CSUM_F)					\
-T(ts_ol3ol4csum_l3l4csum,		0, 0, 1, 0, 0, 1, 1,	8,	\
-		TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)			\
-T(ts_vlan,				0, 0, 1, 0, 1, 0, 0,	8,	\
-		TSP_F | VLAN_F)						\
-T(ts_vlan_l3l4csum,			0, 0, 1, 0, 1, 0, 1,	8,	\
-		TSP_F | VLAN_F | L3L4CSUM_F)				\
-T(ts_vlan_ol3ol4csum,			0, 0, 1, 0, 1, 1, 0,	8,	\
-		TSP_F | VLAN_F | OL3OL4CSUM_F)				\
-T(ts_vlan_ol3ol4csum_l3l4csum,		0, 0, 1, 0, 1, 1, 1,	8,	\
-		TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(ts_noff,				0, 0, 1, 1, 0, 0, 0,	8,	\
-		TSP_F | NOFF_F)						\
-T(ts_noff_l3l4csum,			0, 0, 1, 1, 0, 0, 1,	8,	\
-		TSP_F | NOFF_F | L3L4CSUM_F)				\
-T(ts_noff_ol3ol4csum,			0, 0, 1, 1, 0, 1, 0,	8,	\
-		TSP_F | NOFF_F | OL3OL4CSUM_F)				\
-T(ts_noff_ol3ol4csum_l3l4csum,		0, 0, 1, 1, 0, 1, 1,	8,	\
-		TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(ts_noff_vlan,				0, 0, 1, 1, 1, 0, 0,	8,	\
-		TSP_F | NOFF_F | VLAN_F)				\
-T(ts_noff_vlan_l3l4csum,		0, 0, 1, 1, 1, 0, 1,	8,	\
-		TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)			\
-T(ts_noff_vlan_ol3ol4csum,		0, 0, 1, 1, 1, 1, 0,	8,	\
-		TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)			\
-T(ts_noff_vlan_ol3ol4csum_l3l4csum,	0, 0, 1, 1, 1, 1, 1,	8,	\
-		TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-									\
-T(tso,					0, 1, 0, 0, 0, 0, 0,	6,	\
-		TSO_F)							\
-T(tso_l3l4csum,				0, 1, 0, 0, 0, 0, 1,	6,	\
-		TSO_F | L3L4CSUM_F)					\
-T(tso_ol3ol4csum,			0, 1, 0, 0, 0, 1, 0,	6,	\
-		TSO_F | OL3OL4CSUM_F)					\
-T(tso_ol3ol4csum_l3l4csum,		0, 1, 0, 0, 0, 1, 1,	6,	\
-		TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)			\
-T(tso_vlan,				0, 1, 0, 0, 1, 0, 0,	6,	\
-		TSO_F | VLAN_F)						\
-T(tso_vlan_l3l4csum,			0, 1, 0, 0, 1, 0, 1,	6,	\
-		TSO_F | VLAN_F | L3L4CSUM_F)				\
-T(tso_vlan_ol3ol4csum,			0, 1, 0, 0, 1, 1, 0,	6,	\
-		TSO_F | VLAN_F | OL3OL4CSUM_F)				\
-T(tso_vlan_ol3ol4csum_l3l4csum,		0, 1, 0, 0, 1, 1, 1,	6,	\
-		TSO_F | VLAN_F | OL3OL4CSUM_F |	L3L4CSUM_F)		\
-T(tso_noff,				0, 1, 0, 1, 0, 0, 0,	6,	\
-		TSO_F | NOFF_F)						\
-T(tso_noff_l3l4csum,			0, 1, 0, 1, 0, 0, 1,	6,	\
-		TSO_F | NOFF_F | L3L4CSUM_F)				\
-T(tso_noff_ol3ol4csum,			0, 1, 0, 1, 0, 1, 0,	6,	\
-		TSO_F | NOFF_F | OL3OL4CSUM_F)				\
-T(tso_noff_ol3ol4csum_l3l4csum,		0, 1, 0, 1, 0, 1, 1,	6,	\
-		TSO_F | NOFF_F | OL3OL4CSUM_F |	L3L4CSUM_F)		\
-T(tso_noff_vlan,			0, 1, 0, 1, 1, 0, 0,	6,	\
-		TSO_F | NOFF_F | VLAN_F)				\
-T(tso_noff_vlan_l3l4csum,		0, 1, 0, 1, 1, 0, 1,	6,	\
-		TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)			\
-T(tso_noff_vlan_ol3ol4csum,		0, 1, 0, 1, 1, 1, 0,	6,	\
-		TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)			\
-T(tso_noff_vlan_ol3ol4csum_l3l4csum,	0, 1, 0, 1, 1, 1, 1,	6,	\
-		TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(tso_ts,				0, 1, 1, 0, 0, 0, 0,	8,	\
-		TSO_F | TSP_F)						\
-T(tso_ts_l3l4csum,			0, 1, 1, 0, 0, 0, 1,	8,	\
-		TSO_F | TSP_F | L3L4CSUM_F)				\
-T(tso_ts_ol3ol4csum,			0, 1, 1, 0, 0, 1, 0,	8,	\
-		TSO_F | TSP_F | OL3OL4CSUM_F)				\
-T(tso_ts_ol3ol4csum_l3l4csum,		0, 1, 1, 0, 0, 1, 1,	8,	\
-		TSO_F | TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(tso_ts_vlan,				0, 1, 1, 0, 1, 0, 0,	8,	\
-		TSO_F | TSP_F | VLAN_F)					\
-T(tso_ts_vlan_l3l4csum,			0, 1, 1, 0, 1, 0, 1,	8,	\
-		TSO_F | TSP_F | VLAN_F | L3L4CSUM_F)			\
-T(tso_ts_vlan_ol3ol4csum,		0, 1, 1, 0, 1, 1, 0,	8,	\
-		TSO_F | TSP_F | VLAN_F | OL3OL4CSUM_F)			\
-T(tso_ts_vlan_ol3ol4csum_l3l4csum,	0, 1, 1, 0, 1, 1, 1,	8,	\
-		TSO_F | TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(tso_ts_noff,				0, 1, 1, 1, 0, 0, 0,	8,	\
-		TSO_F | TSP_F | NOFF_F)					\
-T(tso_ts_noff_l3l4csum,			0, 1, 1, 1, 0, 0, 1,	8,	\
-		TSO_F | TSP_F | NOFF_F | L3L4CSUM_F)			\
-T(tso_ts_noff_ol3ol4csum,		0, 1, 1, 1, 0, 1, 0,	8,	\
-		TSO_F | TSP_F | NOFF_F | OL3OL4CSUM_F)			\
-T(tso_ts_noff_ol3ol4csum_l3l4csum,	0, 1, 1, 1, 0, 1, 1,	8,	\
-		TSO_F | TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(tso_ts_noff_vlan,			0, 1, 1, 1, 1, 0, 0,	8,	\
-		TSO_F | TSP_F | NOFF_F | VLAN_F)			\
-T(tso_ts_noff_vlan_l3l4csum,		0, 1, 1, 1, 1, 0, 1,	8,	\
-		TSO_F | TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)		\
-T(tso_ts_noff_vlan_ol3ol4csum,		0, 1, 1, 1, 1, 1, 0,	8,	\
-		TSO_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)		\
-T(tso_ts_noff_vlan_ol3ol4csum_l3l4csum,	0, 1, 1, 1, 1, 1, 1,	8,	\
-		TSO_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F |	\
-		L3L4CSUM_F)						\
-T(sec,					1, 0, 0, 0, 0, 0, 0,	8,	\
-		TX_SEC_F)						\
-T(sec_l3l4csum,				1, 0, 0, 0, 0, 0, 1,	8,	\
-		TX_SEC_F | L3L4CSUM_F)					\
-T(sec_ol3ol4csum,			1, 0, 0, 0, 0, 1, 0,	8,	\
-		TX_SEC_F | OL3OL4CSUM_F)				\
-T(sec_ol3ol4csum_l3l4csum,		1, 0, 0, 0, 0, 1, 1,	8,	\
-		TX_SEC_F | OL3OL4CSUM_F | L3L4CSUM_F)			\
-T(sec_vlan,				1, 0, 0, 0, 1, 0, 0,	8,	\
-		TX_SEC_F | VLAN_F)					\
-T(sec_vlan_l3l4csum,			1, 0, 0, 0, 1, 0, 1,	8,	\
-		TX_SEC_F | VLAN_F | L3L4CSUM_F)				\
-T(sec_vlan_ol3ol4csum,			1, 0, 0, 0, 1, 1, 0,	8,	\
-		TX_SEC_F | VLAN_F | OL3OL4CSUM_F)			\
-T(sec_vlan_ol3ol4csum_l3l4csum,		1, 0, 0, 0, 1, 1, 1,	8,	\
-		TX_SEC_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(sec_noff,				1, 0, 0, 1, 0, 0, 0,	8,	\
-		TX_SEC_F | NOFF_F)					\
-T(sec_noff_l3l4csum,			1, 0, 0, 1, 0, 0, 1,	8,	\
-		TX_SEC_F | NOFF_F | L3L4CSUM_F)				\
-T(sec_noff_ol3ol4csum,			1, 0, 0, 1, 0, 1, 0,	8,	\
-		TX_SEC_F | NOFF_F | OL3OL4CSUM_F)			\
-T(sec_noff_ol3ol4csum_l3l4csum,		1, 0, 0, 1, 0, 1, 1,	8,	\
-		TX_SEC_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(sec_noff_vlan,			1, 0, 0, 1, 1, 0, 0,	8,	\
-		TX_SEC_F | NOFF_F | VLAN_F)				\
-T(sec_noff_vlan_l3l4csum,		1, 0, 0, 1, 1, 0, 1,	8,	\
-		TX_SEC_F | NOFF_F | VLAN_F | L3L4CSUM_F)		\
-T(sec_noff_vlan_ol3ol4csum,		1, 0, 0, 1, 1, 1, 0,	8,	\
-		TX_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)		\
-T(sec_noff_vlan_ol3ol4csum_l3l4csum,	1, 0, 0, 1, 1, 1, 1,	8,	\
-		TX_SEC_F | NOFF_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(sec_ts,				1, 0, 1, 0, 0, 0, 0,	8,	\
-		TX_SEC_F | TSP_F)					\
-T(sec_ts_l3l4csum,			1, 0, 1, 0, 0, 0, 1,	8,	\
-		TX_SEC_F | TSP_F | L3L4CSUM_F)				\
-T(sec_ts_ol3ol4csum,			1, 0, 1, 0, 0, 1, 0,	8,	\
-		TX_SEC_F | TSP_F | OL3OL4CSUM_F)			\
-T(sec_ts_ol3ol4csum_l3l4csum,		1, 0, 1, 0, 0, 1, 1,	8,	\
-		TX_SEC_F | TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(sec_ts_vlan,				1, 0, 1, 0, 1, 0, 0,	8,	\
-		TX_SEC_F | TSP_F | VLAN_F)				\
-T(sec_ts_vlan_l3l4csum,			1, 0, 1, 0, 1, 0, 1,	8,	\
-		TX_SEC_F | TSP_F | VLAN_F | L3L4CSUM_F)			\
-T(sec_ts_vlan_ol3ol4csum,		1, 0, 1, 0, 1, 1, 0,	8,	\
-		TX_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F)		\
-T(sec_ts_vlan_ol3ol4csum_l3l4csum,	1, 0, 1, 0, 1, 1, 1,	8,	\
-		TX_SEC_F | TSP_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(sec_ts_noff,				1, 0, 1, 1, 0, 0, 0,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F)				\
-T(sec_ts_noff_l3l4csum,			1, 0, 1, 1, 0, 0, 1,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F | L3L4CSUM_F)			\
-T(sec_ts_noff_ol3ol4csum,		1, 0, 1, 1, 0, 1, 0,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F)		\
-T(sec_ts_noff_ol3ol4csum_l3l4csum,	1, 0, 1, 1, 0, 1, 1,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(sec_ts_noff_vlan,			1, 0, 1, 1, 1, 0, 0,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F | VLAN_F)			\
-T(sec_ts_noff_vlan_l3l4csum,		1, 0, 1, 1, 1, 0, 1,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)	\
-T(sec_ts_noff_vlan_ol3ol4csum,		1, 0, 1, 1, 1, 1, 0,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)	\
-T(sec_ts_noff_vlan_ol3ol4csum_l3l4csum,	1, 0, 1, 1, 1, 1, 1,	8,	\
-		TX_SEC_F | TSP_F | NOFF_F | VLAN_F | OL3OL4CSUM_F |	\
-		L3L4CSUM_F)						\
-T(sec_tso,				1, 1, 0, 0, 0, 0, 0,	8,	\
-		TX_SEC_F | TSO_F)					\
-T(sec_tso_l3l4csum,			1, 1, 0, 0, 0, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | L3L4CSUM_F)				\
-T(sec_tso_ol3ol4csum,			1, 1, 0, 0, 0, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | OL3OL4CSUM_F)			\
-T(sec_tso_ol3ol4csum_l3l4csum,		1, 1, 0, 0, 0, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | OL3OL4CSUM_F | L3L4CSUM_F)		\
-T(sec_tso_vlan,				1, 1, 0, 0, 1, 0, 0,	8,	\
-		TX_SEC_F | TSO_F | VLAN_F)				\
-T(sec_tso_vlan_l3l4csum,		1, 1, 0, 0, 1, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | VLAN_F | L3L4CSUM_F)			\
-T(sec_tso_vlan_ol3ol4csum,		1, 1, 0, 0, 1, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F)		\
-T(sec_tso_vlan_ol3ol4csum_l3l4csum,	1, 1, 0, 0, 1, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | VLAN_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(sec_tso_noff,				1, 1, 0, 1, 0, 0, 0,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F)				\
-T(sec_tso_noff_l3l4csum,		1, 1, 0, 1, 0, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F | L3L4CSUM_F)			\
-T(sec_tso_noff_ol3ol4csum,		1, 1, 0, 1, 0, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F)		\
-T(sec_tso_noff_ol3ol4csum_l3l4csum,	1, 1, 0, 1, 0, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(sec_tso_noff_vlan,			1, 1, 0, 1, 1, 0, 0,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F | VLAN_F)			\
-T(sec_tso_noff_vlan_l3l4csum,		1, 1, 0, 1, 1, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F | VLAN_F | L3L4CSUM_F)	\
-T(sec_tso_noff_vlan_ol3ol4csum,		1, 1, 0, 1, 1, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F)	\
-T(sec_tso_noff_vlan_ol3ol4csum_l3l4csum,				\
-					1, 1, 0, 1, 1, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | NOFF_F | VLAN_F | OL3OL4CSUM_F |	\
-		L3L4CSUM_F)						\
-T(sec_tso_ts,				1, 1, 1, 0, 0, 0, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F)				\
-T(sec_tso_ts_l3l4csum,			1, 1, 1, 0, 0, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | L3L4CSUM_F)			\
-T(sec_tso_ts_ol3ol4csum,		1, 1, 1, 0, 0, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | OL3OL4CSUM_F)		\
-T(sec_tso_ts_ol3ol4csum_l3l4csum,	1, 1, 1, 0, 0, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | OL3OL4CSUM_F | L3L4CSUM_F)	\
-T(sec_tso_ts_vlan,			1, 1, 1, 0, 1, 0, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | VLAN_F)			\
-T(sec_tso_ts_vlan_l3l4csum,		1, 1, 1, 0, 1, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | VLAN_F | L3L4CSUM_F)		\
-T(sec_tso_ts_vlan_ol3ol4csum,		1, 1, 1, 0, 1, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | VLAN_F | OL3OL4CSUM_F)	\
-T(sec_tso_ts_vlan_ol3ol4csum_l3l4csum,	1, 1, 1, 0, 1, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | VLAN_F | OL3OL4CSUM_F |	\
-		L3L4CSUM_F)						\
-T(sec_tso_ts_noff,			1, 1, 1, 1, 0, 0, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F)			\
-T(sec_tso_ts_noff_l3l4csum,		1, 1, 1, 1, 0, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F | L3L4CSUM_F)		\
-T(sec_tso_ts_noff_ol3ol4csum,		1, 1, 1, 1, 0, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F | OL3OL4CSUM_F)	\
-T(sec_tso_ts_noff_ol3ol4csum_l3l4csum,	1, 1, 1, 1, 0, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F | OL3OL4CSUM_F |	\
-		L3L4CSUM_F)						\
-T(sec_tso_ts_noff_vlan,			1, 1, 1, 1, 1, 0, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F | VLAN_F)		\
-T(sec_tso_ts_noff_vlan_l3l4csum,	1, 1, 1, 1, 1, 0, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F | VLAN_F | L3L4CSUM_F)\
-T(sec_tso_ts_noff_vlan_ol3ol4csum,	1, 1, 1, 1, 1, 1, 0,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F | VLAN_F |		\
-		OL3OL4CSUM_F)						\
-T(sec_tso_ts_noff_vlan_ol3ol4csum_l3l4csum,				\
-					1, 1, 1, 1, 1, 1, 1,	8,	\
-		TX_SEC_F | TSO_F | TSP_F | NOFF_F | VLAN_F |		\
-		OL3OL4CSUM_F | L3L4CSUM_F)
-#endif /* __OTX2_TX_H__ */
diff --git a/drivers/net/octeontx2/otx2_vlan.c b/drivers/net/octeontx2/otx2_vlan.c
deleted file mode 100644
index cce643b7b5..0000000000
--- a/drivers/net/octeontx2/otx2_vlan.c
+++ /dev/null
@@ -1,1035 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(C) 2019 Marvell International Ltd.
- */
-
-#include <rte_malloc.h>
-#include <rte_tailq.h>
-
-#include "otx2_ethdev.h"
-#include "otx2_flow.h"
-
-
-#define VLAN_ID_MATCH	0x1
-#define VTAG_F_MATCH	0x2
-#define MAC_ADDR_MATCH	0x4
-#define QINQ_F_MATCH	0x8
-#define VLAN_DROP	0x10
-#define DEF_F_ENTRY	0x20
-
-enum vtag_cfg_dir {
-	VTAG_TX,
-	VTAG_RX
-};
-
-static int
-nix_vlan_mcam_enb_dis(struct otx2_eth_dev *dev,
-		      uint32_t entry, const int enable)
-{
-	struct npc_mcam_ena_dis_entry_req *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc = -EINVAL;
-
-	if (enable)
-		req = otx2_mbox_alloc_msg_npc_mcam_ena_entry(mbox);
-	else
-		req = otx2_mbox_alloc_msg_npc_mcam_dis_entry(mbox);
-
-	req->entry = entry;
-
-	rc = otx2_mbox_process_msg(mbox, NULL);
-	return rc;
-}
-
-static void
-nix_set_rx_vlan_action(struct rte_eth_dev *eth_dev,
-		    struct mcam_entry *entry, bool qinq, bool drop)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int pcifunc = otx2_pfvf_func(dev->pf, dev->vf);
-	uint64_t action = 0, vtag_action = 0;
-
-	action = NIX_RX_ACTIONOP_UCAST;
-
-	if (eth_dev->data->dev_conf.rxmode.mq_mode == RTE_ETH_MQ_RX_RSS) {
-		action = NIX_RX_ACTIONOP_RSS;
-		action |= (uint64_t)(dev->rss_info.alg_idx) << 56;
-	}
-
-	action |= (uint64_t)pcifunc << 4;
-	entry->action = action;
-
-	if (drop) {
-		entry->action &= ~((uint64_t)0xF);
-		entry->action |= NIX_RX_ACTIONOP_DROP;
-		return;
-	}
-
-	if (!qinq) {
-		/* VTAG0 fields denote CTAG in single vlan case */
-		vtag_action |= (NIX_RX_VTAGACTION_VTAG_VALID << 15);
-		vtag_action |= (NPC_LID_LB << 8);
-		vtag_action |= NIX_RX_VTAGACTION_VTAG0_RELPTR;
-	} else {
-		/* VTAG0 & VTAG1 fields denote CTAG & STAG respectively */
-		vtag_action |= (NIX_RX_VTAGACTION_VTAG_VALID << 15);
-		vtag_action |= (NPC_LID_LB << 8);
-		vtag_action |= NIX_RX_VTAGACTION_VTAG1_RELPTR;
-		vtag_action |= (NIX_RX_VTAGACTION_VTAG_VALID << 47);
-		vtag_action |= ((uint64_t)(NPC_LID_LB) << 40);
-		vtag_action |= (NIX_RX_VTAGACTION_VTAG0_RELPTR << 32);
-	}
-
-	entry->vtag_action = vtag_action;
-}
-
-static void
-nix_set_tx_vlan_action(struct mcam_entry *entry, enum rte_vlan_type type,
-		       int vtag_index)
-{
-	union {
-		uint64_t reg;
-		struct nix_tx_vtag_action_s act;
-	} vtag_action;
-
-	uint64_t action;
-
-	action = NIX_TX_ACTIONOP_UCAST_DEFAULT;
-
-	/*
-	 * Take offset from LA since in case of untagged packet,
-	 * lbptr is zero.
-	 */
-	if (type == RTE_ETH_VLAN_TYPE_OUTER) {
-		vtag_action.act.vtag0_def = vtag_index;
-		vtag_action.act.vtag0_lid = NPC_LID_LA;
-		vtag_action.act.vtag0_op = NIX_TX_VTAGOP_INSERT;
-		vtag_action.act.vtag0_relptr = NIX_TX_VTAGACTION_VTAG0_RELPTR;
-	} else {
-		vtag_action.act.vtag1_def = vtag_index;
-		vtag_action.act.vtag1_lid = NPC_LID_LA;
-		vtag_action.act.vtag1_op = NIX_TX_VTAGOP_INSERT;
-		vtag_action.act.vtag1_relptr = NIX_TX_VTAGACTION_VTAG1_RELPTR;
-	}
-
-	entry->action = action;
-	entry->vtag_action = vtag_action.reg;
-}
-
-static int
-nix_vlan_mcam_free(struct otx2_eth_dev *dev, uint32_t entry)
-{
-	struct npc_mcam_free_entry_req *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc = -EINVAL;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
-	req->entry = entry;
-
-	rc = otx2_mbox_process_msg(mbox, NULL);
-	return rc;
-}
-
-static int
-nix_vlan_mcam_write(struct rte_eth_dev *eth_dev, uint16_t ent_idx,
-		    struct mcam_entry *entry, uint8_t intf, uint8_t ena)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct npc_mcam_write_entry_req *req;
-	struct otx2_mbox *mbox = dev->mbox;
-	struct msghdr *rsp;
-	int rc = -EINVAL;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_write_entry(mbox);
-
-	req->entry = ent_idx;
-	req->intf = intf;
-	req->enable_entry = ena;
-	memcpy(&req->entry_data, entry, sizeof(struct mcam_entry));
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	return rc;
-}
-
-static int
-nix_vlan_mcam_alloc_and_write(struct rte_eth_dev *eth_dev,
-			      struct mcam_entry *entry,
-			      uint8_t intf, bool drop)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct npc_mcam_alloc_and_write_entry_req *req;
-	struct npc_mcam_alloc_and_write_entry_rsp *rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc = -EINVAL;
-
-	req = otx2_mbox_alloc_msg_npc_mcam_alloc_and_write_entry(mbox);
-
-	if (intf == NPC_MCAM_RX) {
-		if (!drop && dev->vlan_info.def_rx_mcam_idx) {
-			req->priority = NPC_MCAM_HIGHER_PRIO;
-			req->ref_entry = dev->vlan_info.def_rx_mcam_idx;
-		} else if (drop && dev->vlan_info.qinq_mcam_idx) {
-			req->priority = NPC_MCAM_LOWER_PRIO;
-			req->ref_entry = dev->vlan_info.qinq_mcam_idx;
-		} else {
-			req->priority = NPC_MCAM_ANY_PRIO;
-			req->ref_entry = 0;
-		}
-	} else {
-		req->priority = NPC_MCAM_ANY_PRIO;
-		req->ref_entry = 0;
-	}
-
-	req->intf = intf;
-	req->enable_entry = 1;
-	memcpy(&req->entry_data, entry, sizeof(struct mcam_entry));
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	return rsp->entry;
-}
-
-static void
-nix_vlan_update_mac(struct rte_eth_dev *eth_dev, int mcam_index,
-			   int enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct vlan_mkex_info *mkex = &dev->vlan_info.mkex;
-	volatile uint8_t *key_data, *key_mask;
-	struct npc_mcam_read_entry_req *req;
-	struct npc_mcam_read_entry_rsp *rsp;
-	struct otx2_mbox *mbox = dev->mbox;
-	uint64_t mcam_data, mcam_mask;
-	struct mcam_entry entry;
-	uint8_t intf, mcam_ena;
-	int idx, rc = -EINVAL;
-	uint8_t *mac_addr;
-
-	memset(&entry, 0, sizeof(struct mcam_entry));
-
-	/* Read entry first */
-	req = otx2_mbox_alloc_msg_npc_mcam_read_entry(mbox);
-
-	req->entry = mcam_index;
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc) {
-		otx2_err("Failed to read entry %d", mcam_index);
-		return;
-	}
-
-	entry = rsp->entry_data;
-	intf = rsp->intf;
-	mcam_ena = rsp->enable;
-
-	/* Update mcam address */
-	key_data = (volatile uint8_t *)entry.kw;
-	key_mask = (volatile uint8_t *)entry.kw_mask;
-
-	if (enable) {
-		mcam_mask = 0;
-		otx2_mbox_memcpy(key_mask + mkex->la_xtract.key_off,
-				 &mcam_mask, mkex->la_xtract.len + 1);
-
-	} else {
-		mcam_data = 0ULL;
-		mac_addr = dev->mac_addr;
-		for (idx = RTE_ETHER_ADDR_LEN - 1; idx >= 0; idx--)
-			mcam_data |= ((uint64_t)*mac_addr++) << (8 * idx);
-
-		mcam_mask = BIT_ULL(48) - 1;
-
-		otx2_mbox_memcpy(key_data + mkex->la_xtract.key_off,
-				 &mcam_data, mkex->la_xtract.len + 1);
-		otx2_mbox_memcpy(key_mask + mkex->la_xtract.key_off,
-				 &mcam_mask, mkex->la_xtract.len + 1);
-	}
-
-	/* Write back the mcam entry */
-	rc = nix_vlan_mcam_write(eth_dev, mcam_index,
-				 &entry, intf, mcam_ena);
-	if (rc) {
-		otx2_err("Failed to write entry %d", mcam_index);
-		return;
-	}
-}
-
-void
-otx2_nix_vlan_update_promisc(struct rte_eth_dev *eth_dev, int enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_vlan_info *vlan = &dev->vlan_info;
-	struct vlan_entry *entry;
-
-	/* Already in required mode */
-	if (enable == vlan->promisc_on)
-		return;
-
-	/* Update default rx entry */
-	if (vlan->def_rx_mcam_idx)
-		nix_vlan_update_mac(eth_dev, vlan->def_rx_mcam_idx, enable);
-
-	/* Update all other rx filter entries */
-	TAILQ_FOREACH(entry, &vlan->fltr_tbl, next)
-		nix_vlan_update_mac(eth_dev, entry->mcam_idx, enable);
-
-	vlan->promisc_on = enable;
-}
-
-/* Configure mcam entry with required MCAM search rules */
-static int
-nix_vlan_mcam_config(struct rte_eth_dev *eth_dev,
-		     uint16_t vlan_id, uint16_t flags)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct vlan_mkex_info *mkex = &dev->vlan_info.mkex;
-	volatile uint8_t *key_data, *key_mask;
-	uint64_t mcam_data, mcam_mask;
-	struct mcam_entry entry;
-	uint8_t *mac_addr;
-	int idx, kwi = 0;
-
-	memset(&entry, 0, sizeof(struct mcam_entry));
-	key_data = (volatile uint8_t *)entry.kw;
-	key_mask = (volatile uint8_t *)entry.kw_mask;
-
-	/* Channel base extracted to KW0[11:0] */
-	entry.kw[kwi] = dev->rx_chan_base;
-	entry.kw_mask[kwi] = BIT_ULL(12) - 1;
-
-	/* Adds vlan_id & LB CTAG flag to MCAM KW */
-	if (flags & VLAN_ID_MATCH) {
-		entry.kw[kwi] |= (NPC_LT_LB_CTAG | NPC_LT_LB_STAG_QINQ)
-							<< mkex->lb_lt_offset;
-		entry.kw_mask[kwi] |=
-			(0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ))
-							<< mkex->lb_lt_offset;
-
-		mcam_data = (uint16_t)vlan_id;
-		mcam_mask = (BIT_ULL(16) - 1);
-		otx2_mbox_memcpy(key_data + mkex->lb_xtract.key_off,
-				     &mcam_data, mkex->lb_xtract.len);
-		otx2_mbox_memcpy(key_mask + mkex->lb_xtract.key_off,
-				     &mcam_mask, mkex->lb_xtract.len);
-	}
-
-	/* Adds LB STAG flag to MCAM KW */
-	if (flags & QINQ_F_MATCH) {
-		entry.kw[kwi] |= NPC_LT_LB_STAG_QINQ << mkex->lb_lt_offset;
-		entry.kw_mask[kwi] |= 0xFULL << mkex->lb_lt_offset;
-	}
-
-	/* Adds LB CTAG & LB STAG flags to MCAM KW */
-	if (flags & VTAG_F_MATCH) {
-		entry.kw[kwi] |= (NPC_LT_LB_CTAG | NPC_LT_LB_STAG_QINQ)
-							<< mkex->lb_lt_offset;
-		entry.kw_mask[kwi] |=
-			(0xF & ~(NPC_LT_LB_CTAG ^ NPC_LT_LB_STAG_QINQ))
-							<< mkex->lb_lt_offset;
-	}
-
-	/* Adds port MAC address to MCAM KW */
-	if (flags & MAC_ADDR_MATCH) {
-		mcam_data = 0ULL;
-		mac_addr = dev->mac_addr;
-		for (idx = RTE_ETHER_ADDR_LEN - 1; idx >= 0; idx--)
-			mcam_data |= ((uint64_t)*mac_addr++) << (8 * idx);
-
-		mcam_mask = BIT_ULL(48) - 1;
-		otx2_mbox_memcpy(key_data + mkex->la_xtract.key_off,
-				     &mcam_data, mkex->la_xtract.len + 1);
-		otx2_mbox_memcpy(key_mask + mkex->la_xtract.key_off,
-				     &mcam_mask, mkex->la_xtract.len + 1);
-	}
-
-	/* VLAN_DROP: for drop action for all vlan packets when filter is on.
-	 * For QinQ, enable vtag action for both outer & inner tags
-	 */
-	if (flags & VLAN_DROP)
-		nix_set_rx_vlan_action(eth_dev, &entry, false, true);
-	else if (flags & QINQ_F_MATCH)
-		nix_set_rx_vlan_action(eth_dev, &entry, true, false);
-	else
-		nix_set_rx_vlan_action(eth_dev, &entry, false, false);
-
-	if (flags & DEF_F_ENTRY)
-		dev->vlan_info.def_rx_mcam_ent = entry;
-
-	return nix_vlan_mcam_alloc_and_write(eth_dev, &entry, NIX_INTF_RX,
-					     flags & VLAN_DROP);
-}
-
-/* Installs/Removes/Modifies default rx entry */
-static int
-nix_vlan_handle_default_rx_entry(struct rte_eth_dev *eth_dev, bool strip,
-				 bool filter, bool enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_vlan_info *vlan = &dev->vlan_info;
-	uint16_t flags = 0;
-	int mcam_idx, rc;
-
-	/* Use default mcam entry to either drop vlan traffic when
-	 * vlan filter is on or strip vtag when strip is enabled.
-	 * Allocate default entry which matches port mac address
-	 * and vtag(ctag/stag) flags with drop action.
-	 */
-	if (!vlan->def_rx_mcam_idx) {
-		if (!eth_dev->data->promiscuous)
-			flags = MAC_ADDR_MATCH;
-
-		if (filter && enable)
-			flags |= VTAG_F_MATCH | VLAN_DROP;
-		else if (strip && enable)
-			flags |= VTAG_F_MATCH;
-		else
-			return 0;
-
-		flags |= DEF_F_ENTRY;
-
-		mcam_idx = nix_vlan_mcam_config(eth_dev, 0, flags);
-		if (mcam_idx < 0) {
-			otx2_err("Failed to config vlan mcam");
-			return -mcam_idx;
-		}
-
-		vlan->def_rx_mcam_idx = mcam_idx;
-		return 0;
-	}
-
-	/* Filter is already enabled, so packets would be dropped anyways. No
-	 * processing needed for enabling strip wrt mcam entry.
-	 */
-
-	/* Filter disable request */
-	if (vlan->filter_on && filter && !enable) {
-		vlan->def_rx_mcam_ent.action &= ~((uint64_t)0xF);
-
-		/* Free default rx entry only when
-		 * 1. strip is not on and
-		 * 2. qinq entry is allocated before default entry.
-		 */
-		if (vlan->strip_on ||
-		    (vlan->qinq_on && !vlan->qinq_before_def)) {
-			if (eth_dev->data->dev_conf.rxmode.mq_mode ==
-								RTE_ETH_MQ_RX_RSS)
-				vlan->def_rx_mcam_ent.action |=
-							NIX_RX_ACTIONOP_RSS;
-			else
-				vlan->def_rx_mcam_ent.action |=
-							NIX_RX_ACTIONOP_UCAST;
-			return nix_vlan_mcam_write(eth_dev,
-						   vlan->def_rx_mcam_idx,
-						   &vlan->def_rx_mcam_ent,
-						   NIX_INTF_RX, 1);
-		} else {
-			rc = nix_vlan_mcam_free(dev, vlan->def_rx_mcam_idx);
-			if (rc)
-				return rc;
-			vlan->def_rx_mcam_idx = 0;
-		}
-	}
-
-	/* Filter enable request */
-	if (!vlan->filter_on && filter && enable) {
-		vlan->def_rx_mcam_ent.action &= ~((uint64_t)0xF);
-		vlan->def_rx_mcam_ent.action |= NIX_RX_ACTIONOP_DROP;
-		return nix_vlan_mcam_write(eth_dev, vlan->def_rx_mcam_idx,
-				   &vlan->def_rx_mcam_ent, NIX_INTF_RX, 1);
-	}
-
-	/* Strip disable request */
-	if (vlan->strip_on && strip && !enable) {
-		if (!vlan->filter_on &&
-		    !(vlan->qinq_on && !vlan->qinq_before_def)) {
-			rc = nix_vlan_mcam_free(dev, vlan->def_rx_mcam_idx);
-			if (rc)
-				return rc;
-			vlan->def_rx_mcam_idx = 0;
-		}
-	}
-
-	return 0;
-}
-
-/* Installs/Removes default tx entry */
-static int
-nix_vlan_handle_default_tx_entry(struct rte_eth_dev *eth_dev,
-				 enum rte_vlan_type type, int vtag_index,
-				 int enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_vlan_info *vlan = &dev->vlan_info;
-	struct mcam_entry entry;
-	uint16_t pf_func;
-	int rc;
-
-	if (!vlan->def_tx_mcam_idx && enable) {
-		memset(&entry, 0, sizeof(struct mcam_entry));
-
-		/* Only pf_func is matched, swap it's bytes */
-		pf_func = (dev->pf_func & 0xff) << 8;
-		pf_func |= (dev->pf_func >> 8) & 0xff;
-
-		/* PF Func extracted to KW1[47:32] */
-		entry.kw[0] = (uint64_t)pf_func << 32;
-		entry.kw_mask[0] = (BIT_ULL(16) - 1) << 32;
-
-		nix_set_tx_vlan_action(&entry, type, vtag_index);
-		vlan->def_tx_mcam_ent = entry;
-
-		return nix_vlan_mcam_alloc_and_write(eth_dev, &entry,
-						     NIX_INTF_TX, 0);
-	}
-
-	if (vlan->def_tx_mcam_idx && !enable) {
-		rc = nix_vlan_mcam_free(dev, vlan->def_tx_mcam_idx);
-		if (rc)
-			return rc;
-		vlan->def_rx_mcam_idx = 0;
-	}
-
-	return 0;
-}
-
-/* Configure vlan stripping on or off */
-static int
-nix_vlan_hw_strip(struct rte_eth_dev *eth_dev, const uint8_t enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_mbox *mbox = dev->mbox;
-	struct nix_vtag_config *vtag_cfg;
-	int rc = -EINVAL;
-
-	rc = nix_vlan_handle_default_rx_entry(eth_dev, true, false, enable);
-	if (rc) {
-		otx2_err("Failed to config default rx entry");
-		return rc;
-	}
-
-	vtag_cfg = otx2_mbox_alloc_msg_nix_vtag_cfg(mbox);
-	/* cfg_type = 1 for rx vlan cfg */
-	vtag_cfg->cfg_type = VTAG_RX;
-
-	if (enable)
-		vtag_cfg->rx.strip_vtag = 1;
-	else
-		vtag_cfg->rx.strip_vtag = 0;
-
-	/* Always capture */
-	vtag_cfg->rx.capture_vtag = 1;
-	vtag_cfg->vtag_size = NIX_VTAGSIZE_T4;
-	/* Use rx vtag type index[0] for now */
-	vtag_cfg->rx.vtag_type = 0;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	dev->vlan_info.strip_on = enable;
-	return rc;
-}
-
-/* Configure vlan filtering on or off for all vlans if vlan_id == 0 */
-static int
-nix_vlan_hw_filter(struct rte_eth_dev *eth_dev, const uint8_t enable,
-		   uint16_t vlan_id)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_vlan_info *vlan = &dev->vlan_info;
-	struct vlan_entry *entry;
-	int rc = -EINVAL;
-
-	if (!vlan_id && enable) {
-		rc = nix_vlan_handle_default_rx_entry(eth_dev, false, true,
-						      enable);
-		if (rc) {
-			otx2_err("Failed to config vlan mcam");
-			return rc;
-		}
-		dev->vlan_info.filter_on = enable;
-		return 0;
-	}
-
-	/* Enable/disable existing vlan filter entries */
-	TAILQ_FOREACH(entry, &vlan->fltr_tbl, next) {
-		if (vlan_id) {
-			if (entry->vlan_id == vlan_id) {
-				rc = nix_vlan_mcam_enb_dis(dev,
-							   entry->mcam_idx,
-							   enable);
-				if (rc)
-					return rc;
-			}
-		} else {
-			rc = nix_vlan_mcam_enb_dis(dev, entry->mcam_idx,
-						   enable);
-			if (rc)
-				return rc;
-		}
-	}
-
-	if (!vlan_id && !enable) {
-		rc = nix_vlan_handle_default_rx_entry(eth_dev, false, true,
-						      enable);
-		if (rc) {
-			otx2_err("Failed to config vlan mcam");
-			return rc;
-		}
-		dev->vlan_info.filter_on = enable;
-		return 0;
-	}
-
-	return 0;
-}
-
-/* Enable/disable vlan filtering for the given vlan_id */
-int
-otx2_nix_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id,
-			 int on)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_vlan_info *vlan = &dev->vlan_info;
-	struct vlan_entry *entry;
-	int entry_exists = 0;
-	int rc = -EINVAL;
-	int mcam_idx;
-
-	if (!vlan_id) {
-		otx2_err("Vlan Id can't be zero");
-		return rc;
-	}
-
-	if (!vlan->def_rx_mcam_idx) {
-		otx2_err("Vlan Filtering is disabled, enable it first");
-		return rc;
-	}
-
-	if (on) {
-		TAILQ_FOREACH(entry, &vlan->fltr_tbl, next) {
-			if (entry->vlan_id == vlan_id) {
-				/* Vlan entry already exists */
-				entry_exists = 1;
-				/* Mcam entry already allocated */
-				if (entry->mcam_idx) {
-					rc = nix_vlan_hw_filter(eth_dev, on,
-								vlan_id);
-					return rc;
-				}
-				break;
-			}
-		}
-
-		if (!entry_exists) {
-			entry = rte_zmalloc("otx2_nix_vlan_entry",
-					    sizeof(struct vlan_entry), 0);
-			if (!entry) {
-				otx2_err("Failed to allocate memory");
-				return -ENOMEM;
-			}
-		}
-
-		/* Enables vlan_id & mac address based filtering */
-		if (eth_dev->data->promiscuous)
-			mcam_idx = nix_vlan_mcam_config(eth_dev, vlan_id,
-							VLAN_ID_MATCH);
-		else
-			mcam_idx = nix_vlan_mcam_config(eth_dev, vlan_id,
-							VLAN_ID_MATCH |
-							MAC_ADDR_MATCH);
-		if (mcam_idx < 0) {
-			otx2_err("Failed to config vlan mcam");
-			TAILQ_REMOVE(&vlan->fltr_tbl, entry, next);
-			rte_free(entry);
-			return mcam_idx;
-		}
-
-		entry->mcam_idx = mcam_idx;
-		if (!entry_exists) {
-			entry->vlan_id  = vlan_id;
-			TAILQ_INSERT_HEAD(&vlan->fltr_tbl, entry, next);
-		}
-	} else {
-		TAILQ_FOREACH(entry, &vlan->fltr_tbl, next) {
-			if (entry->vlan_id == vlan_id) {
-				rc = nix_vlan_mcam_free(dev, entry->mcam_idx);
-				if (rc)
-					return rc;
-				TAILQ_REMOVE(&vlan->fltr_tbl, entry, next);
-				rte_free(entry);
-				break;
-			}
-		}
-	}
-	return 0;
-}
-
-/* Configure double vlan(qinq) on or off */
-static int
-otx2_nix_config_double_vlan(struct rte_eth_dev *eth_dev,
-			    const uint8_t enable)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_vlan_info *vlan_info;
-	int mcam_idx;
-	int rc;
-
-	vlan_info = &dev->vlan_info;
-
-	if (!enable) {
-		if (!vlan_info->qinq_mcam_idx)
-			return 0;
-
-		rc = nix_vlan_mcam_free(dev, vlan_info->qinq_mcam_idx);
-		if (rc)
-			return rc;
-
-		vlan_info->qinq_mcam_idx = 0;
-		dev->vlan_info.qinq_on = 0;
-		vlan_info->qinq_before_def = 0;
-		return 0;
-	}
-
-	if (eth_dev->data->promiscuous)
-		mcam_idx = nix_vlan_mcam_config(eth_dev, 0, QINQ_F_MATCH);
-	else
-		mcam_idx = nix_vlan_mcam_config(eth_dev, 0,
-						QINQ_F_MATCH | MAC_ADDR_MATCH);
-	if (mcam_idx < 0)
-		return mcam_idx;
-
-	if (!vlan_info->def_rx_mcam_idx)
-		vlan_info->qinq_before_def = 1;
-
-	vlan_info->qinq_mcam_idx = mcam_idx;
-	dev->vlan_info.qinq_on = 1;
-	return 0;
-}
-
-int
-otx2_nix_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	uint64_t offloads = dev->rx_offloads;
-	struct rte_eth_rxmode *rxmode;
-	int rc = 0;
-
-	rxmode = &eth_dev->data->dev_conf.rxmode;
-
-	if (mask & RTE_ETH_VLAN_STRIP_MASK) {
-		if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
-			offloads |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
-			rc = nix_vlan_hw_strip(eth_dev, true);
-		} else {
-			offloads &= ~RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
-			rc = nix_vlan_hw_strip(eth_dev, false);
-		}
-		if (rc)
-			goto done;
-	}
-
-	if (mask & RTE_ETH_VLAN_FILTER_MASK) {
-		if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_FILTER) {
-			offloads |= RTE_ETH_RX_OFFLOAD_VLAN_FILTER;
-			rc = nix_vlan_hw_filter(eth_dev, true, 0);
-		} else {
-			offloads &= ~RTE_ETH_RX_OFFLOAD_VLAN_FILTER;
-			rc = nix_vlan_hw_filter(eth_dev, false, 0);
-		}
-		if (rc)
-			goto done;
-	}
-
-	if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) {
-		if (!dev->vlan_info.qinq_on) {
-			offloads |= RTE_ETH_RX_OFFLOAD_QINQ_STRIP;
-			rc = otx2_nix_config_double_vlan(eth_dev, true);
-			if (rc)
-				goto done;
-		}
-	} else {
-		if (dev->vlan_info.qinq_on) {
-			offloads &= ~RTE_ETH_RX_OFFLOAD_QINQ_STRIP;
-			rc = otx2_nix_config_double_vlan(eth_dev, false);
-			if (rc)
-				goto done;
-		}
-	}
-
-	if (offloads & (RTE_ETH_RX_OFFLOAD_VLAN_STRIP |
-			RTE_ETH_RX_OFFLOAD_QINQ_STRIP)) {
-		dev->rx_offloads |= offloads;
-		dev->rx_offload_flags |= NIX_RX_OFFLOAD_VLAN_STRIP_F;
-		otx2_eth_set_rx_function(eth_dev);
-	}
-
-done:
-	return rc;
-}
-
-int
-otx2_nix_vlan_tpid_set(struct rte_eth_dev *eth_dev,
-		       enum rte_vlan_type type, uint16_t tpid)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct nix_set_vlan_tpid *tpid_cfg;
-	struct otx2_mbox *mbox = dev->mbox;
-	int rc;
-
-	tpid_cfg = otx2_mbox_alloc_msg_nix_set_vlan_tpid(mbox);
-
-	tpid_cfg->tpid = tpid;
-	if (type == RTE_ETH_VLAN_TYPE_OUTER)
-		tpid_cfg->vlan_type = NIX_VLAN_TYPE_OUTER;
-	else
-		tpid_cfg->vlan_type = NIX_VLAN_TYPE_INNER;
-
-	rc = otx2_mbox_process(mbox);
-	if (rc)
-		return rc;
-
-	if (type == RTE_ETH_VLAN_TYPE_OUTER)
-		dev->vlan_info.outer_vlan_tpid = tpid;
-	else
-		dev->vlan_info.inner_vlan_tpid = tpid;
-	return 0;
-}
-
-int
-otx2_nix_vlan_pvid_set(struct rte_eth_dev *dev,       uint16_t vlan_id, int on)
-{
-	struct otx2_eth_dev *otx2_dev = otx2_eth_pmd_priv(dev);
-	struct otx2_mbox *mbox = otx2_dev->mbox;
-	struct nix_vtag_config *vtag_cfg;
-	struct nix_vtag_config_rsp *rsp;
-	struct otx2_vlan_info *vlan;
-	int rc, rc1, vtag_index = 0;
-
-	if (vlan_id == 0) {
-		otx2_err("vlan id can't be zero");
-		return -EINVAL;
-	}
-
-	vlan = &otx2_dev->vlan_info;
-
-	if (on && vlan->pvid_insert_on && vlan->pvid == vlan_id) {
-		otx2_err("pvid %d is already enabled", vlan_id);
-		return -EINVAL;
-	}
-
-	if (on && vlan->pvid_insert_on && vlan->pvid != vlan_id) {
-		otx2_err("another pvid is enabled, disable that first");
-		return -EINVAL;
-	}
-
-	/* No pvid active */
-	if (!on && !vlan->pvid_insert_on)
-		return 0;
-
-	/* Given pvid already disabled */
-	if (!on && vlan->pvid != vlan_id)
-		return 0;
-
-	vtag_cfg = otx2_mbox_alloc_msg_nix_vtag_cfg(mbox);
-
-	if (on) {
-		vtag_cfg->cfg_type = VTAG_TX;
-		vtag_cfg->vtag_size = NIX_VTAGSIZE_T4;
-
-		if (vlan->outer_vlan_tpid)
-			vtag_cfg->tx.vtag0 = ((uint32_t)vlan->outer_vlan_tpid
-					      << 16) | vlan_id;
-		else
-			vtag_cfg->tx.vtag0 =
-				((RTE_ETHER_TYPE_VLAN << 16) | vlan_id);
-		vtag_cfg->tx.cfg_vtag0 = 1;
-	} else {
-		vtag_cfg->cfg_type = VTAG_TX;
-		vtag_cfg->vtag_size = NIX_VTAGSIZE_T4;
-
-		vtag_cfg->tx.vtag0_idx = vlan->outer_vlan_idx;
-		vtag_cfg->tx.free_vtag0 = 1;
-	}
-
-	rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
-	if (rc)
-		return rc;
-
-	if (on) {
-		vtag_index = rsp->vtag0_idx;
-	} else {
-		vlan->pvid = 0;
-		vlan->pvid_insert_on = 0;
-		vlan->outer_vlan_idx = 0;
-	}
-
-	rc = nix_vlan_handle_default_tx_entry(dev, RTE_ETH_VLAN_TYPE_OUTER,
-					      vtag_index, on);
-	if (rc < 0) {
-		printf("Default tx entry failed with rc %d\n", rc);
-		vtag_cfg->tx.vtag0_idx = vtag_index;
-		vtag_cfg->tx.free_vtag0 = 1;
-		vtag_cfg->tx.cfg_vtag0 = 0;
-
-		rc1 = otx2_mbox_process_msg(mbox, (void *)&rsp);
-		if (rc1)
-			otx2_err("Vtag free failed");
-
-		return rc;
-	}
-
-	if (on) {
-		vlan->pvid = vlan_id;
-		vlan->pvid_insert_on = 1;
-		vlan->outer_vlan_idx = vtag_index;
-	}
-
-	return 0;
-}
-
-void otx2_nix_vlan_strip_queue_set(__rte_unused struct rte_eth_dev *dev,
-				   __rte_unused uint16_t queue,
-				   __rte_unused int on)
-{
-	otx2_err("Not Supported");
-}
-
-static int
-nix_vlan_rx_mkex_offset(uint64_t mask)
-{
-	int nib_count = 0;
-
-	while (mask) {
-		nib_count += mask & 1;
-		mask >>= 1;
-	}
-
-	return nib_count * 4;
-}
-
-static int
-nix_vlan_get_mkex_info(struct otx2_eth_dev *dev)
-{
-	struct vlan_mkex_info *mkex = &dev->vlan_info.mkex;
-	struct otx2_npc_flow_info *npc = &dev->npc_flow;
-	struct npc_xtract_info *x_info = NULL;
-	uint64_t rx_keyx;
-	otx2_dxcfg_t *p;
-	int rc = -EINVAL;
-
-	if (npc == NULL) {
-		otx2_err("Missing npc mkex configuration");
-		return rc;
-	}
-
-#define NPC_KEX_CHAN_NIBBLE_ENA			0x7ULL
-#define NPC_KEX_LB_LTYPE_NIBBLE_ENA		0x1000ULL
-#define NPC_KEX_LB_LTYPE_NIBBLE_MASK		0xFFFULL
-
-	rx_keyx = npc->keyx_supp_nmask[NPC_MCAM_RX];
-	if ((rx_keyx & NPC_KEX_CHAN_NIBBLE_ENA) != NPC_KEX_CHAN_NIBBLE_ENA)
-		return rc;
-
-	if ((rx_keyx & NPC_KEX_LB_LTYPE_NIBBLE_ENA) !=
-	    NPC_KEX_LB_LTYPE_NIBBLE_ENA)
-		return rc;
-
-	mkex->lb_lt_offset =
-	    nix_vlan_rx_mkex_offset(rx_keyx & NPC_KEX_LB_LTYPE_NIBBLE_MASK);
-
-	p = &npc->prx_dxcfg;
-	x_info = &(*p)[NPC_MCAM_RX][NPC_LID_LA][NPC_LT_LA_ETHER].xtract[0];
-	memcpy(&mkex->la_xtract, x_info, sizeof(struct npc_xtract_info));
-	x_info = &(*p)[NPC_MCAM_RX][NPC_LID_LB][NPC_LT_LB_CTAG].xtract[0];
-	memcpy(&mkex->lb_xtract, x_info, sizeof(struct npc_xtract_info));
-
-	return 0;
-}
-
-static void nix_vlan_reinstall_vlan_filters(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct vlan_entry *entry;
-	int rc;
-
-	/* VLAN filters can't be set without setting filtern on */
-	rc = nix_vlan_handle_default_rx_entry(eth_dev, false, true, true);
-	if (rc) {
-		otx2_err("Failed to reinstall vlan filters");
-		return;
-	}
-
-	TAILQ_FOREACH(entry, &dev->vlan_info.fltr_tbl, next) {
-		rc = otx2_nix_vlan_filter_set(eth_dev, entry->vlan_id, true);
-		if (rc)
-			otx2_err("Failed to reinstall filter for vlan:%d",
-				 entry->vlan_id);
-	}
-}
-
-int
-otx2_nix_vlan_offload_init(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	int rc, mask;
-
-	/* Port initialized for first time or restarted */
-	if (!dev->configured) {
-		rc = nix_vlan_get_mkex_info(dev);
-		if (rc) {
-			otx2_err("Failed to get vlan mkex info rc=%d", rc);
-			return rc;
-		}
-
-		TAILQ_INIT(&dev->vlan_info.fltr_tbl);
-	} else {
-		/* Reinstall all mcam entries now if filter offload is set */
-		if (eth_dev->data->dev_conf.rxmode.offloads &
-		    RTE_ETH_RX_OFFLOAD_VLAN_FILTER)
-			nix_vlan_reinstall_vlan_filters(eth_dev);
-	}
-
-	mask =
-	    RTE_ETH_VLAN_STRIP_MASK | RTE_ETH_VLAN_FILTER_MASK;
-	rc = otx2_nix_vlan_offload_set(eth_dev, mask);
-	if (rc) {
-		otx2_err("Failed to set vlan offload rc=%d", rc);
-		return rc;
-	}
-
-	return 0;
-}
-
-int
-otx2_nix_vlan_fini(struct rte_eth_dev *eth_dev)
-{
-	struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
-	struct otx2_vlan_info *vlan = &dev->vlan_info;
-	struct vlan_entry *entry;
-	int rc;
-
-	TAILQ_FOREACH(entry, &vlan->fltr_tbl, next) {
-		if (!dev->configured) {
-			TAILQ_REMOVE(&vlan->fltr_tbl, entry, next);
-			rte_free(entry);
-		} else {
-			/* MCAM entries freed by flow_fini & lf_free on
-			 * port stop.
-			 */
-			entry->mcam_idx = 0;
-		}
-	}
-
-	if (!dev->configured) {
-		if (vlan->def_rx_mcam_idx) {
-			rc = nix_vlan_mcam_free(dev, vlan->def_rx_mcam_idx);
-			if (rc)
-				return rc;
-		}
-	}
-
-	otx2_nix_config_double_vlan(eth_dev, false);
-	vlan->def_rx_mcam_idx = 0;
-	return 0;
-}
diff --git a/drivers/net/octeontx2/version.map b/drivers/net/octeontx2/version.map
deleted file mode 100644
index c2e0723b4c..0000000000
--- a/drivers/net/octeontx2/version.map
+++ /dev/null
@@ -1,3 +0,0 @@
-DPDK_22 {
-	local: *;
-};
diff --git a/drivers/net/octeontx_ep/otx2_ep_vf.h b/drivers/net/octeontx_ep/otx2_ep_vf.h
index 9326925025..dc720368ab 100644
--- a/drivers/net/octeontx_ep/otx2_ep_vf.h
+++ b/drivers/net/octeontx_ep/otx2_ep_vf.h
@@ -113,7 +113,7 @@
 #define otx2_read64(addr) rte_read64_relaxed((void *)(addr))
 #define otx2_write64(val, addr) rte_write64_relaxed((val), (void *)(addr))
 
-#define PCI_DEVID_OCTEONTX2_EP_NET_VF		0xB203 /* OCTEON TX2 EP mode */
+#define PCI_DEVID_CN9K_EP_NET_VF		0xB203 /* OCTEON 9 EP mode */
 #define PCI_DEVID_CN98XX_EP_NET_VF		0xB103
 
 int
diff --git a/drivers/net/octeontx_ep/otx_ep_common.h b/drivers/net/octeontx_ep/otx_ep_common.h
index fd5e8ed263..8a59a1a194 100644
--- a/drivers/net/octeontx_ep/otx_ep_common.h
+++ b/drivers/net/octeontx_ep/otx_ep_common.h
@@ -150,7 +150,7 @@ struct otx_ep_iq_config {
 
 /** The instruction (input) queue.
  *  The input queue is used to post raw (instruction) mode data or packet data
- *  to OCTEON TX2 device from the host. Each IQ of a OTX_EP EP VF device has one
+ *  to OCTEON 9 device from the host. Each IQ of a OTX_EP EP VF device has one
  *  such structure to represent it.
  */
 struct otx_ep_instr_queue {
@@ -170,12 +170,12 @@ struct otx_ep_instr_queue {
 	/* Input ring index, where the driver should write the next packet */
 	uint32_t host_write_index;
 
-	/* Input ring index, where the OCTEON TX2 should read the next packet */
+	/* Input ring index, where the OCTEON 9 should read the next packet */
 	uint32_t otx_read_index;
 
 	uint32_t reset_instr_cnt;
 
-	/** This index aids in finding the window in the queue where OCTEON TX2
+	/** This index aids in finding the window in the queue where OCTEON 9
 	 *  has read the commands.
 	 */
 	uint32_t flush_index;
@@ -195,7 +195,7 @@ struct otx_ep_instr_queue {
 	/* OTX_EP instruction count register for this ring. */
 	void *inst_cnt_reg;
 
-	/* Number of instructions pending to be posted to OCTEON TX2. */
+	/* Number of instructions pending to be posted to OCTEON 9. */
 	uint32_t fill_cnt;
 
 	/* Statistics for this input queue. */
@@ -230,8 +230,8 @@ union otx_ep_rh {
 };
 #define OTX_EP_RH_SIZE (sizeof(union otx_ep_rh))
 
-/** Information about packet DMA'ed by OCTEON TX2.
- *  The format of the information available at Info Pointer after OCTEON TX2
+/** Information about packet DMA'ed by OCTEON 9.
+ *  The format of the information available at Info Pointer after OCTEON 9
  *  has posted a packet. Not all descriptors have valid information. Only
  *  the Info field of the first descriptor for a packet has information
  *  about the packet.
@@ -295,7 +295,7 @@ struct otx_ep_droq {
 	/* Driver should read the next packet at this index */
 	uint32_t read_idx;
 
-	/* OCTEON TX2 will write the next packet at this index */
+	/* OCTEON 9 will write the next packet at this index */
 	uint32_t write_idx;
 
 	/* At this index, the driver will refill the descriptor's buffer */
@@ -326,7 +326,7 @@ struct otx_ep_droq {
 	 */
 	void *pkts_credit_reg;
 
-	/** Pointer to the mapped packet sent register. OCTEON TX2 writes the
+	/** Pointer to the mapped packet sent register. OCTEON 9 writes the
 	 *  number of packets DMA'ed to host memory in this register.
 	 */
 	void *pkts_sent_reg;
diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeontx_ep/otx_ep_ethdev.c
index c3cec6d833..806add246b 100644
--- a/drivers/net/octeontx_ep/otx_ep_ethdev.c
+++ b/drivers/net/octeontx_ep/otx_ep_ethdev.c
@@ -102,7 +102,7 @@ otx_ep_chip_specific_setup(struct otx_ep_device *otx_epvf)
 		ret = otx_ep_vf_setup_device(otx_epvf);
 		otx_epvf->fn_list.disable_io_queues(otx_epvf);
 		break;
-	case PCI_DEVID_OCTEONTX2_EP_NET_VF:
+	case PCI_DEVID_CN9K_EP_NET_VF:
 	case PCI_DEVID_CN98XX_EP_NET_VF:
 		otx_epvf->chip_id = dev_id;
 		ret = otx2_ep_vf_setup_device(otx_epvf);
@@ -137,7 +137,7 @@ otx_epdev_init(struct otx_ep_device *otx_epvf)
 	otx_epvf->eth_dev->rx_pkt_burst = &otx_ep_recv_pkts;
 	if (otx_epvf->chip_id == PCI_DEVID_OCTEONTX_EP_VF)
 		otx_epvf->eth_dev->tx_pkt_burst = &otx_ep_xmit_pkts;
-	else if (otx_epvf->chip_id == PCI_DEVID_OCTEONTX2_EP_NET_VF ||
+	else if (otx_epvf->chip_id == PCI_DEVID_CN9K_EP_NET_VF ||
 		 otx_epvf->chip_id == PCI_DEVID_CN98XX_EP_NET_VF)
 		otx_epvf->eth_dev->tx_pkt_burst = &otx2_ep_xmit_pkts;
 	ethdev_queues = (uint32_t)(otx_epvf->sriov_info.rings_per_vf);
@@ -422,7 +422,7 @@ otx_ep_eth_dev_init(struct rte_eth_dev *eth_dev)
 	otx_epvf->pdev = pdev;
 
 	otx_epdev_init(otx_epvf);
-	if (pdev->id.device_id == PCI_DEVID_OCTEONTX2_EP_NET_VF)
+	if (pdev->id.device_id == PCI_DEVID_CN9K_EP_NET_VF)
 		otx_epvf->pkind = SDP_OTX2_PKIND;
 	else
 		otx_epvf->pkind = SDP_PKIND;
@@ -450,7 +450,7 @@ otx_ep_eth_dev_pci_remove(struct rte_pci_device *pci_dev)
 /* Set of PCI devices this driver supports */
 static const struct rte_pci_id pci_id_otx_ep_map[] = {
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX_EP_VF) },
-	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX2_EP_NET_VF) },
+	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN9K_EP_NET_VF) },
 	{ RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_CN98XX_EP_NET_VF) },
 	{ .vendor_id = 0, /* sentinel */ }
 };
diff --git a/drivers/net/octeontx_ep/otx_ep_rxtx.c b/drivers/net/octeontx_ep/otx_ep_rxtx.c
index 9338b30672..59df6ad857 100644
--- a/drivers/net/octeontx_ep/otx_ep_rxtx.c
+++ b/drivers/net/octeontx_ep/otx_ep_rxtx.c
@@ -85,7 +85,7 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
 	iq = otx_ep->instr_queue[iq_no];
 	q_size = conf->iq.instr_type * num_descs;
 
-	/* IQ memory creation for Instruction submission to OCTEON TX2 */
+	/* IQ memory creation for Instruction submission to OCTEON 9 */
 	iq->iq_mz = rte_eth_dma_zone_reserve(otx_ep->eth_dev,
 					     "instr_queue", iq_no, q_size,
 					     OTX_EP_PCI_RING_ALIGN,
@@ -106,8 +106,8 @@ otx_ep_init_instr_queue(struct otx_ep_device *otx_ep, int iq_no, int num_descs,
 	iq->nb_desc = num_descs;
 
 	/* Create a IQ request list to hold requests that have been
-	 * posted to OCTEON TX2. This list will be used for freeing the IQ
-	 * data buffer(s) later once the OCTEON TX2 fetched the requests.
+	 * posted to OCTEON 9. This list will be used for freeing the IQ
+	 * data buffer(s) later once the OCTEON 9 fetched the requests.
 	 */
 	iq->req_list = rte_zmalloc_socket("request_list",
 			(iq->nb_desc * OTX_EP_IQREQ_LIST_SIZE),
@@ -450,7 +450,7 @@ post_iqcmd(struct otx_ep_instr_queue *iq, uint8_t *iqcmd)
 	uint8_t *iqptr, cmdsize;
 
 	/* This ensures that the read index does not wrap around to
-	 * the same position if queue gets full before OCTEON TX2 could
+	 * the same position if queue gets full before OCTEON 9 could
 	 * fetch any instr.
 	 */
 	if (iq->instr_pending > (iq->nb_desc - 1))
@@ -979,7 +979,7 @@ otx_ep_check_droq_pkts(struct otx_ep_droq *droq)
 	return new_pkts;
 }
 
-/* Check for response arrival from OCTEON TX2
+/* Check for response arrival from OCTEON 9
  * returns number of requests completed
  */
 uint16_t
diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 6cea732228..ace4627218 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -65,11 +65,11 @@
 intel_ntb_icx = {'Class': '06', 'Vendor': '8086', 'Device': '347e',
                  'SVendor': None, 'SDevice': None}
 
-octeontx2_sso = {'Class': '08', 'Vendor': '177d', 'Device': 'a0f9,a0fa',
+cnxk_sso = {'Class': '08', 'Vendor': '177d', 'Device': 'a0f9,a0fa',
                  'SVendor': None, 'SDevice': None}
-octeontx2_npa = {'Class': '08', 'Vendor': '177d', 'Device': 'a0fb,a0fc',
+cnxk_npa = {'Class': '08', 'Vendor': '177d', 'Device': 'a0fb,a0fc',
                  'SVendor': None, 'SDevice': None}
-octeontx2_ree = {'Class': '08', 'Vendor': '177d', 'Device': 'a0f4',
+cn9k_ree = {'Class': '08', 'Vendor': '177d', 'Device': 'a0f4',
                  'SVendor': None, 'SDevice': None}
 
 network_devices = [network_class, cavium_pkx, avp_vnic, ifpga_class]
@@ -77,10 +77,10 @@
 crypto_devices = [encryption_class, intel_processor_class]
 dma_devices = [cnxk_dma, hisilicon_dma,
                intel_idxd_spr, intel_ioat_bdw, intel_ioat_icx, intel_ioat_skx]
-eventdev_devices = [cavium_sso, cavium_tim, intel_dlb, octeontx2_sso]
-mempool_devices = [cavium_fpa, octeontx2_npa]
+eventdev_devices = [cavium_sso, cavium_tim, intel_dlb, cnxk_sso]
+mempool_devices = [cavium_fpa, cnxk_npa]
 compress_devices = [cavium_zip]
-regex_devices = [octeontx2_ree]
+regex_devices = [cn9k_ree]
 misc_devices = [cnxk_bphy, cnxk_bphy_cgx, cnxk_inl_dev,
                 intel_ntb_skx, intel_ntb_icx]
 
