diff mbox series

[v1] drivers: remove octeontx2 drivers

Message ID 20211206083542.3115019-1-jerinj@marvell.com (mailing list archive)
State Changes Requested, archived
Delegated to: Thomas Monjalon
Headers show
Series [v1] drivers: remove octeontx2 drivers | expand

Checks

Context Check Description
ci/Intel-compilation fail Compilation issues
ci/iol-testing warning apply patch failure
ci/checkpatch warning coding style issues

Commit Message

Jerin Jacob Kollanukkaran Dec. 6, 2021, 8:35 a.m. UTC
From: Jerin Jacob <jerinj@marvell.com>

As per the deprecation notice,  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 patch does the following

- 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 config/arm/arm64_octeontx2_linux_gcc as
  config/arm/arm64_cn9k_linux_gcc
- Update the documentation and MAINTAINERS to reflect the same.
- Change the reference to OCTEONTX2 as OCTEON 9. The kernel related
documentation is not accounted for this change as kernel documentation
still uses OCTEONTX2.

Depends-on: series-20804 ("common/cnxk: add REE HW definitions")
Signed-off-by: Jerin Jacob <jerinj@marvell.com>
---
 MAINTAINERS                                   |   37 -
 app/test/meson.build                          |    1 -
 app/test/test_cryptodev.c                     |    7 -
 app/test/test_cryptodev.h                     |    1 -
 app/test/test_cryptodev_asym.c                |   17 -
 app/test/test_eventdev.c                      |    8 -
 config/arm/arm64_cn10k_linux_gcc              |    1 -
 ...teontx2_linux_gcc => arm64_cn9k_linux_gcc} |    3 +-
 config/arm/meson.build                        |   10 +-
 devtools/check-abi.sh                         |    4 +
 doc/guides/cryptodevs/features/octeontx2.ini  |   87 -
 doc/guides/cryptodevs/index.rst               |    1 -
 doc/guides/cryptodevs/octeontx2.rst           |  188 -
 doc/guides/dmadevs/cnxk.rst                   |    2 +-
 doc/guides/eventdevs/features/octeontx2.ini   |   30 -
 doc/guides/eventdevs/index.rst                |    1 -
 doc/guides/eventdevs/octeontx2.rst            |  178 -
 doc/guides/mempool/index.rst                  |    1 -
 doc/guides/mempool/octeontx2.rst              |   92 -
 doc/guides/nics/cnxk.rst                      |    4 +-
 doc/guides/nics/features/octeontx2.ini        |   97 -
 doc/guides/nics/features/octeontx2_vec.ini    |   48 -
 doc/guides/nics/features/octeontx2_vf.ini     |   45 -
 doc/guides/nics/index.rst                     |    1 -
 doc/guides/nics/octeontx2.rst                 |  465 ---
 doc/guides/nics/octeontx_ep.rst               |    4 +-
 doc/guides/platform/cnxk.rst                  |   12 +
 .../octeontx2_packet_flow_hw_accelerators.svg | 2804 --------------
 .../img/octeontx2_resource_virtualization.svg | 2418 ------------
 doc/guides/platform/index.rst                 |    1 -
 doc/guides/platform/octeontx2.rst             |  520 ---
 doc/guides/rel_notes/deprecation.rst          |   17 -
 doc/guides/rel_notes/release_19_08.rst        |   12 +-
 doc/guides/rel_notes/release_19_11.rst        |    6 +-
 doc/guides/rel_notes/release_20_02.rst        |    8 +-
 doc/guides/rel_notes/release_20_05.rst        |    4 +-
 doc/guides/rel_notes/release_20_08.rst        |    6 +-
 doc/guides/rel_notes/release_20_11.rst        |    8 +-
 doc/guides/rel_notes/release_21_02.rst        |   10 +-
 doc/guides/rel_notes/release_21_05.rst        |    6 +-
 doc/guides/rel_notes/release_21_11.rst        |    2 +-
 doc/guides/tools/cryptoperf.rst               |    1 -
 drivers/common/meson.build                    |    1 -
 drivers/common/octeontx2/hw/otx2_nix.h        | 1391 -------
 drivers/common/octeontx2/hw/otx2_npa.h        |  305 --
 drivers/common/octeontx2/hw/otx2_npc.h        |  503 ---
 drivers/common/octeontx2/hw/otx2_ree.h        |   27 -
 drivers/common/octeontx2/hw/otx2_rvu.h        |  219 --
 drivers/common/octeontx2/hw/otx2_sdp.h        |  184 -
 drivers/common/octeontx2/hw/otx2_sso.h        |  209 --
 drivers/common/octeontx2/hw/otx2_ssow.h       |   56 -
 drivers/common/octeontx2/hw/otx2_tim.h        |   34 -
 drivers/common/octeontx2/meson.build          |   24 -
 drivers/common/octeontx2/otx2_common.c        |  216 --
 drivers/common/octeontx2/otx2_common.h        |  179 -
 drivers/common/octeontx2/otx2_dev.c           | 1074 ------
 drivers/common/octeontx2/otx2_dev.h           |  161 -
 drivers/common/octeontx2/otx2_io_arm64.h      |  114 -
 drivers/common/octeontx2/otx2_io_generic.h    |   75 -
 drivers/common/octeontx2/otx2_irq.c           |  288 --
 drivers/common/octeontx2/otx2_irq.h           |   28 -
 drivers/common/octeontx2/otx2_mbox.c          |  465 ---
 drivers/common/octeontx2/otx2_mbox.h          | 1958 ----------
 drivers/common/octeontx2/otx2_sec_idev.c      |  183 -
 drivers/common/octeontx2/otx2_sec_idev.h      |   43 -
 drivers/common/octeontx2/version.map          |   44 -
 drivers/crypto/meson.build                    |    1 -
 drivers/crypto/octeontx2/meson.build          |   30 -
 drivers/crypto/octeontx2/otx2_cryptodev.c     |  188 -
 drivers/crypto/octeontx2/otx2_cryptodev.h     |   63 -
 .../octeontx2/otx2_cryptodev_capabilities.c   |  924 -----
 .../octeontx2/otx2_cryptodev_capabilities.h   |   45 -
 .../octeontx2/otx2_cryptodev_hw_access.c      |  225 --
 .../octeontx2/otx2_cryptodev_hw_access.h      |  161 -
 .../crypto/octeontx2/otx2_cryptodev_mbox.c    |  285 --
 .../crypto/octeontx2/otx2_cryptodev_mbox.h    |   37 -
 drivers/crypto/octeontx2/otx2_cryptodev_ops.c | 1438 -------
 drivers/crypto/octeontx2/otx2_cryptodev_ops.h |   15 -
 .../octeontx2/otx2_cryptodev_ops_helper.h     |   82 -
 drivers/crypto/octeontx2/otx2_cryptodev_qp.h  |   46 -
 drivers/crypto/octeontx2/otx2_cryptodev_sec.c |  655 ----
 drivers/crypto/octeontx2/otx2_cryptodev_sec.h |   64 -
 .../crypto/octeontx2/otx2_ipsec_anti_replay.h |  227 --
 drivers/crypto/octeontx2/otx2_ipsec_fp.h      |  371 --
 drivers/crypto/octeontx2/otx2_ipsec_po.h      |  447 ---
 drivers/crypto/octeontx2/otx2_ipsec_po_ops.h  |  167 -
 drivers/crypto/octeontx2/otx2_security.h      |   37 -
 drivers/crypto/octeontx2/version.map          |   13 -
 drivers/event/cnxk/cn9k_eventdev.c            |   10 +
 drivers/event/meson.build                     |    1 -
 drivers/event/octeontx2/meson.build           |   26 -
 drivers/event/octeontx2/otx2_evdev.c          | 1900 ----------
 drivers/event/octeontx2/otx2_evdev.h          |  430 ---
 drivers/event/octeontx2/otx2_evdev_adptr.c    |  656 ----
 .../event/octeontx2/otx2_evdev_crypto_adptr.c |  132 -
 .../octeontx2/otx2_evdev_crypto_adptr_rx.h    |   77 -
 .../octeontx2/otx2_evdev_crypto_adptr_tx.h    |   83 -
 drivers/event/octeontx2/otx2_evdev_irq.c      |  272 --
 drivers/event/octeontx2/otx2_evdev_selftest.c | 1517 --------
 drivers/event/octeontx2/otx2_evdev_stats.h    |  286 --
 drivers/event/octeontx2/otx2_tim_evdev.c      |  735 ----
 drivers/event/octeontx2/otx2_tim_evdev.h      |  256 --
 drivers/event/octeontx2/otx2_tim_worker.c     |  192 -
 drivers/event/octeontx2/otx2_tim_worker.h     |  598 ---
 drivers/event/octeontx2/otx2_worker.c         |  372 --
 drivers/event/octeontx2/otx2_worker.h         |  339 --
 drivers/event/octeontx2/otx2_worker_dual.c    |  345 --
 drivers/event/octeontx2/otx2_worker_dual.h    |  110 -
 drivers/event/octeontx2/version.map           |    3 -
 drivers/mempool/cnxk/cnxk_mempool.c           |   56 +-
 drivers/mempool/meson.build                   |    1 -
 drivers/mempool/octeontx2/meson.build         |   18 -
 drivers/mempool/octeontx2/otx2_mempool.c      |  457 ---
 drivers/mempool/octeontx2/otx2_mempool.h      |  221 --
 .../mempool/octeontx2/otx2_mempool_debug.c    |  135 -
 drivers/mempool/octeontx2/otx2_mempool_irq.c  |  303 --
 drivers/mempool/octeontx2/otx2_mempool_ops.c  |  901 -----
 drivers/mempool/octeontx2/version.map         |    8 -
 drivers/net/cnxk/cn9k_ethdev.c                |   15 +
 drivers/net/meson.build                       |    1 -
 drivers/net/octeontx2/meson.build             |   47 -
 drivers/net/octeontx2/otx2_ethdev.c           | 2814 --------------
 drivers/net/octeontx2/otx2_ethdev.h           |  619 ---
 drivers/net/octeontx2/otx2_ethdev_debug.c     |  811 ----
 drivers/net/octeontx2/otx2_ethdev_devargs.c   |  215 --
 drivers/net/octeontx2/otx2_ethdev_irq.c       |  493 ---
 drivers/net/octeontx2/otx2_ethdev_ops.c       |  589 ---
 drivers/net/octeontx2/otx2_ethdev_sec.c       |  923 -----
 drivers/net/octeontx2/otx2_ethdev_sec.h       |  130 -
 drivers/net/octeontx2/otx2_ethdev_sec_tx.h    |  182 -
 drivers/net/octeontx2/otx2_flow.c             | 1189 ------
 drivers/net/octeontx2/otx2_flow.h             |  414 --
 drivers/net/octeontx2/otx2_flow_ctrl.c        |  252 --
 drivers/net/octeontx2/otx2_flow_dump.c        |  595 ---
 drivers/net/octeontx2/otx2_flow_parse.c       | 1239 ------
 drivers/net/octeontx2/otx2_flow_utils.c       |  969 -----
 drivers/net/octeontx2/otx2_link.c             |  287 --
 drivers/net/octeontx2/otx2_lookup.c           |  352 --
 drivers/net/octeontx2/otx2_mac.c              |  151 -
 drivers/net/octeontx2/otx2_mcast.c            |  339 --
 drivers/net/octeontx2/otx2_ptp.c              |  450 ---
 drivers/net/octeontx2/otx2_rss.c              |  427 ---
 drivers/net/octeontx2/otx2_rx.c               |  430 ---
 drivers/net/octeontx2/otx2_rx.h               |  583 ---
 drivers/net/octeontx2/otx2_stats.c            |  397 --
 drivers/net/octeontx2/otx2_tm.c               | 3317 -----------------
 drivers/net/octeontx2/otx2_tm.h               |  176 -
 drivers/net/octeontx2/otx2_tx.c               | 1077 ------
 drivers/net/octeontx2/otx2_tx.h               |  791 ----
 drivers/net/octeontx2/otx2_vlan.c             | 1035 -----
 drivers/net/octeontx2/version.map             |    3 -
 drivers/net/octeontx_ep/otx2_ep_vf.h          |    2 +-
 drivers/net/octeontx_ep/otx_ep_common.h       |   16 +-
 drivers/net/octeontx_ep/otx_ep_ethdev.c       |    8 +-
 drivers/net/octeontx_ep/otx_ep_rxtx.c         |   10 +-
 usertools/dpdk-devbind.py                     |   12 +-
 156 files changed, 121 insertions(+), 52149 deletions(-)
 rename config/arm/{arm64_octeontx2_linux_gcc => arm64_cn9k_linux_gcc} (84%)
 delete mode 100644 doc/guides/cryptodevs/features/octeontx2.ini
 delete mode 100644 doc/guides/cryptodevs/octeontx2.rst
 delete mode 100644 doc/guides/eventdevs/features/octeontx2.ini
 delete mode 100644 doc/guides/eventdevs/octeontx2.rst
 delete mode 100644 doc/guides/mempool/octeontx2.rst
 delete mode 100644 doc/guides/nics/features/octeontx2.ini
 delete mode 100644 doc/guides/nics/features/octeontx2_vec.ini
 delete mode 100644 doc/guides/nics/features/octeontx2_vf.ini
 delete mode 100644 doc/guides/nics/octeontx2.rst
 delete mode 100644 doc/guides/platform/img/octeontx2_packet_flow_hw_accelerators.svg
 delete mode 100644 doc/guides/platform/img/octeontx2_resource_virtualization.svg
 delete mode 100644 doc/guides/platform/octeontx2.rst
 delete mode 100644 drivers/common/octeontx2/hw/otx2_nix.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_npa.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_npc.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_ree.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_rvu.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_sdp.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_sso.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_ssow.h
 delete mode 100644 drivers/common/octeontx2/hw/otx2_tim.h
 delete mode 100644 drivers/common/octeontx2/meson.build
 delete mode 100644 drivers/common/octeontx2/otx2_common.c
 delete mode 100644 drivers/common/octeontx2/otx2_common.h
 delete mode 100644 drivers/common/octeontx2/otx2_dev.c
 delete mode 100644 drivers/common/octeontx2/otx2_dev.h
 delete mode 100644 drivers/common/octeontx2/otx2_io_arm64.h
 delete mode 100644 drivers/common/octeontx2/otx2_io_generic.h
 delete mode 100644 drivers/common/octeontx2/otx2_irq.c
 delete mode 100644 drivers/common/octeontx2/otx2_irq.h
 delete mode 100644 drivers/common/octeontx2/otx2_mbox.c
 delete mode 100644 drivers/common/octeontx2/otx2_mbox.h
 delete mode 100644 drivers/common/octeontx2/otx2_sec_idev.c
 delete mode 100644 drivers/common/octeontx2/otx2_sec_idev.h
 delete mode 100644 drivers/common/octeontx2/version.map
 delete mode 100644 drivers/crypto/octeontx2/meson.build
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev.c
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_capabilities.c
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_capabilities.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_hw_access.c
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_hw_access.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_mbox.c
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_mbox.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_ops.c
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_ops.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_ops_helper.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_qp.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_sec.c
 delete mode 100644 drivers/crypto/octeontx2/otx2_cryptodev_sec.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_ipsec_anti_replay.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_ipsec_fp.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_ipsec_po.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_ipsec_po_ops.h
 delete mode 100644 drivers/crypto/octeontx2/otx2_security.h
 delete mode 100644 drivers/crypto/octeontx2/version.map
 delete mode 100644 drivers/event/octeontx2/meson.build
 delete mode 100644 drivers/event/octeontx2/otx2_evdev.c
 delete mode 100644 drivers/event/octeontx2/otx2_evdev.h
 delete mode 100644 drivers/event/octeontx2/otx2_evdev_adptr.c
 delete mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr.c
 delete mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr_rx.h
 delete mode 100644 drivers/event/octeontx2/otx2_evdev_crypto_adptr_tx.h
 delete mode 100644 drivers/event/octeontx2/otx2_evdev_irq.c
 delete mode 100644 drivers/event/octeontx2/otx2_evdev_selftest.c
 delete mode 100644 drivers/event/octeontx2/otx2_evdev_stats.h
 delete mode 100644 drivers/event/octeontx2/otx2_tim_evdev.c
 delete mode 100644 drivers/event/octeontx2/otx2_tim_evdev.h
 delete mode 100644 drivers/event/octeontx2/otx2_tim_worker.c
 delete mode 100644 drivers/event/octeontx2/otx2_tim_worker.h
 delete mode 100644 drivers/event/octeontx2/otx2_worker.c
 delete mode 100644 drivers/event/octeontx2/otx2_worker.h
 delete mode 100644 drivers/event/octeontx2/otx2_worker_dual.c
 delete mode 100644 drivers/event/octeontx2/otx2_worker_dual.h
 delete mode 100644 drivers/event/octeontx2/version.map
 delete mode 100644 drivers/mempool/octeontx2/meson.build
 delete mode 100644 drivers/mempool/octeontx2/otx2_mempool.c
 delete mode 100644 drivers/mempool/octeontx2/otx2_mempool.h
 delete mode 100644 drivers/mempool/octeontx2/otx2_mempool_debug.c
 delete mode 100644 drivers/mempool/octeontx2/otx2_mempool_irq.c
 delete mode 100644 drivers/mempool/octeontx2/otx2_mempool_ops.c
 delete mode 100644 drivers/mempool/octeontx2/version.map
 delete mode 100644 drivers/net/octeontx2/meson.build
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev.c
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev.h
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev_debug.c
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev_devargs.c
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev_irq.c
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev_ops.c
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev_sec.c
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev_sec.h
 delete mode 100644 drivers/net/octeontx2/otx2_ethdev_sec_tx.h
 delete mode 100644 drivers/net/octeontx2/otx2_flow.c
 delete mode 100644 drivers/net/octeontx2/otx2_flow.h
 delete mode 100644 drivers/net/octeontx2/otx2_flow_ctrl.c
 delete mode 100644 drivers/net/octeontx2/otx2_flow_dump.c
 delete mode 100644 drivers/net/octeontx2/otx2_flow_parse.c
 delete mode 100644 drivers/net/octeontx2/otx2_flow_utils.c
 delete mode 100644 drivers/net/octeontx2/otx2_link.c
 delete mode 100644 drivers/net/octeontx2/otx2_lookup.c
 delete mode 100644 drivers/net/octeontx2/otx2_mac.c
 delete mode 100644 drivers/net/octeontx2/otx2_mcast.c
 delete mode 100644 drivers/net/octeontx2/otx2_ptp.c
 delete mode 100644 drivers/net/octeontx2/otx2_rss.c
 delete mode 100644 drivers/net/octeontx2/otx2_rx.c
 delete mode 100644 drivers/net/octeontx2/otx2_rx.h
 delete mode 100644 drivers/net/octeontx2/otx2_stats.c
 delete mode 100644 drivers/net/octeontx2/otx2_tm.c
 delete mode 100644 drivers/net/octeontx2/otx2_tm.h
 delete mode 100644 drivers/net/octeontx2/otx2_tx.c
 delete mode 100644 drivers/net/octeontx2/otx2_tx.h
 delete mode 100644 drivers/net/octeontx2/otx2_vlan.c
 delete mode 100644 drivers/net/octeontx2/version.map

Comments

Ferruh Yigit Dec. 6, 2021, 1:35 p.m. UTC | #1
On 12/6/2021 8:35 AM, jerinj@marvell.com wrote:
> From: Jerin Jacob<jerinj@marvell.com>
> 
> As per the deprecation notice,  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 patch does the following
> 
> - 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 config/arm/arm64_octeontx2_linux_gcc as
>    config/arm/arm64_cn9k_linux_gcc
> - Update the documentation and MAINTAINERS to reflect the same.
> - Change the reference to OCTEONTX2 as OCTEON 9. The kernel related
> documentation is not accounted for this change as kernel documentation
> still uses OCTEONTX2.
> 
> Depends-on: series-20804 ("common/cnxk: add REE HW definitions")
> Signed-off-by: Jerin Jacob<jerinj@marvell.com>
> ---
>   MAINTAINERS                                   |   37 -
>   app/test/meson.build                          |    1 -
>   app/test/test_cryptodev.c                     |    7 -
>   app/test/test_cryptodev.h                     |    1 -
>   app/test/test_cryptodev_asym.c                |   17 -
>   app/test/test_eventdev.c                      |    8 -
>   config/arm/arm64_cn10k_linux_gcc              |    1 -
>   ...teontx2_linux_gcc => arm64_cn9k_linux_gcc} |    3 +-
>   config/arm/meson.build                        |   10 +-
>   devtools/check-abi.sh                         |    4 +
>   doc/guides/cryptodevs/features/octeontx2.ini  |   87 -
>   doc/guides/cryptodevs/index.rst               |    1 -
>   doc/guides/cryptodevs/octeontx2.rst           |  188 -
>   doc/guides/dmadevs/cnxk.rst                   |    2 +-
>   doc/guides/eventdevs/features/octeontx2.ini   |   30 -
>   doc/guides/eventdevs/index.rst                |    1 -
>   doc/guides/eventdevs/octeontx2.rst            |  178 -
>   doc/guides/mempool/index.rst                  |    1 -
>   doc/guides/mempool/octeontx2.rst              |   92 -
>   doc/guides/nics/cnxk.rst                      |    4 +-
>   doc/guides/nics/features/octeontx2.ini        |   97 -
>   doc/guides/nics/features/octeontx2_vec.ini    |   48 -
>   doc/guides/nics/features/octeontx2_vf.ini     |   45 -
>   doc/guides/nics/index.rst                     |    1 -
>   doc/guides/nics/octeontx2.rst                 |  465 ---
>   doc/guides/nics/octeontx_ep.rst               |    4 +-
>   doc/guides/platform/cnxk.rst                  |   12 +
>   .../octeontx2_packet_flow_hw_accelerators.svg | 2804 --------------
>   .../img/octeontx2_resource_virtualization.svg | 2418 ------------
>   doc/guides/platform/index.rst                 |    1 -
>   doc/guides/platform/octeontx2.rst             |  520 ---
>   doc/guides/rel_notes/deprecation.rst          |   17 -
>   doc/guides/rel_notes/release_19_08.rst        |   12 +-
>   doc/guides/rel_notes/release_19_11.rst        |    6 +-
>   doc/guides/rel_notes/release_20_02.rst        |    8 +-
>   doc/guides/rel_notes/release_20_05.rst        |    4 +-
>   doc/guides/rel_notes/release_20_08.rst        |    6 +-
>   doc/guides/rel_notes/release_20_11.rst        |    8 +-
>   doc/guides/rel_notes/release_21_02.rst        |   10 +-
>   doc/guides/rel_notes/release_21_05.rst        |    6 +-
>   doc/guides/rel_notes/release_21_11.rst        |    2 +-

Not sure about updating old release notes files, using 'octeontx2' still can make
sense for the context of those releases.

Also search still gives some instances of 'octeontx2', like 'devtools/check-abi.sh'
one, can you please confirm if OK to have them:
$git grep -i octeontx2

Except from above items, agree with change in principal and build test looks good:
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
Jerin Jacob Dec. 7, 2021, 7:39 a.m. UTC | #2
On Mon, Dec 6, 2021 at 7:05 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote:
>
> On 12/6/2021 8:35 AM, jerinj@marvell.com wrote:
> > From: Jerin Jacob<jerinj@marvell.com>
> >
> > As per the deprecation notice,  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 patch does the following
> >
> > - 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 config/arm/arm64_octeontx2_linux_gcc as
> >    config/arm/arm64_cn9k_linux_gcc
> > - Update the documentation and MAINTAINERS to reflect the same.
> > - Change the reference to OCTEONTX2 as OCTEON 9. The kernel related
> > documentation is not accounted for this change as kernel documentation
> > still uses OCTEONTX2.
> >
> > Depends-on: series-20804 ("common/cnxk: add REE HW definitions")
> > Signed-off-by: Jerin Jacob<jerinj@marvell.com>
> > ---
> >   MAINTAINERS                                   |   37 -
> >   app/test/meson.build                          |    1 -
> >   app/test/test_cryptodev.c                     |    7 -
> >   app/test/test_cryptodev.h                     |    1 -
> >   app/test/test_cryptodev_asym.c                |   17 -
> >   app/test/test_eventdev.c                      |    8 -
> >   config/arm/arm64_cn10k_linux_gcc              |    1 -
> >   ...teontx2_linux_gcc => arm64_cn9k_linux_gcc} |    3 +-
> >   config/arm/meson.build                        |   10 +-
> >   devtools/check-abi.sh                         |    4 +
> >   doc/guides/cryptodevs/features/octeontx2.ini  |   87 -
> >   doc/guides/cryptodevs/index.rst               |    1 -
> >   doc/guides/cryptodevs/octeontx2.rst           |  188 -
> >   doc/guides/dmadevs/cnxk.rst                   |    2 +-
> >   doc/guides/eventdevs/features/octeontx2.ini   |   30 -
> >   doc/guides/eventdevs/index.rst                |    1 -
> >   doc/guides/eventdevs/octeontx2.rst            |  178 -
> >   doc/guides/mempool/index.rst                  |    1 -
> >   doc/guides/mempool/octeontx2.rst              |   92 -
> >   doc/guides/nics/cnxk.rst                      |    4 +-
> >   doc/guides/nics/features/octeontx2.ini        |   97 -
> >   doc/guides/nics/features/octeontx2_vec.ini    |   48 -
> >   doc/guides/nics/features/octeontx2_vf.ini     |   45 -
> >   doc/guides/nics/index.rst                     |    1 -
> >   doc/guides/nics/octeontx2.rst                 |  465 ---
> >   doc/guides/nics/octeontx_ep.rst               |    4 +-
> >   doc/guides/platform/cnxk.rst                  |   12 +
> >   .../octeontx2_packet_flow_hw_accelerators.svg | 2804 --------------
> >   .../img/octeontx2_resource_virtualization.svg | 2418 ------------
> >   doc/guides/platform/index.rst                 |    1 -
> >   doc/guides/platform/octeontx2.rst             |  520 ---
> >   doc/guides/rel_notes/deprecation.rst          |   17 -
> >   doc/guides/rel_notes/release_19_08.rst        |   12 +-
> >   doc/guides/rel_notes/release_19_11.rst        |    6 +-
> >   doc/guides/rel_notes/release_20_02.rst        |    8 +-
> >   doc/guides/rel_notes/release_20_05.rst        |    4 +-
> >   doc/guides/rel_notes/release_20_08.rst        |    6 +-
> >   doc/guides/rel_notes/release_20_11.rst        |    8 +-
> >   doc/guides/rel_notes/release_21_02.rst        |   10 +-
> >   doc/guides/rel_notes/release_21_05.rst        |    6 +-
> >   doc/guides/rel_notes/release_21_11.rst        |    2 +-
>
> Not sure about updating old release notes files, using 'octeontx2' still can make
> sense for the context of those releases.

OK. I will send v2 with keeping octeontx2 in OLD release notes.


>
> Also search still gives some instances of 'octeontx2', like 'devtools/check-abi.sh'
> one, can you please confirm if OK to have them:
> $git grep -i octeontx2

This change to skip octeontx2 driver for ABI check as it is removed.
This change is needed.

        if grep -qE "\<librte_*.*_octeontx2" $dump; then
                echo "Skipped removed driver $name."

>
> Except from above items, agree with change in principal and build test looks good:
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
Akhil Goyal Dec. 7, 2021, 8:12 a.m. UTC | #3
> As per the deprecation notice,  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 patch does the following
> 
> - 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 config/arm/arm64_octeontx2_linux_gcc as
>   config/arm/arm64_cn9k_linux_gcc
> - Update the documentation and MAINTAINERS to reflect the same.
> - Change the reference to OCTEONTX2 as OCTEON 9. The kernel related
> documentation is not accounted for this change as kernel documentation
> still uses OCTEONTX2.
> 
> Depends-on: series-20804 ("common/cnxk: add REE HW definitions")
> Signed-off-by: Jerin Jacob <jerinj@marvell.com>

From crypto point of view.
The patch is good.
Acked-by: Akhil Goyal <gakhil@marvell.com>

Old release notes need not be updated as Ferruh suggested.
Ferruh Yigit Dec. 7, 2021, 11:01 a.m. UTC | #4
On 12/7/2021 7:39 AM, Jerin Jacob wrote:
> On Mon, Dec 6, 2021 at 7:05 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote:
>>
>> On 12/6/2021 8:35 AM, jerinj@marvell.com wrote:
>>> From: Jerin Jacob<jerinj@marvell.com>
>>>
>>> As per the deprecation notice,  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 patch does the following
>>>
>>> - 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 config/arm/arm64_octeontx2_linux_gcc as
>>>     config/arm/arm64_cn9k_linux_gcc
>>> - Update the documentation and MAINTAINERS to reflect the same.
>>> - Change the reference to OCTEONTX2 as OCTEON 9. The kernel related
>>> documentation is not accounted for this change as kernel documentation
>>> still uses OCTEONTX2.
>>>
>>> Depends-on: series-20804 ("common/cnxk: add REE HW definitions")
>>> Signed-off-by: Jerin Jacob<jerinj@marvell.com>
>>> ---
>>>    MAINTAINERS                                   |   37 -
>>>    app/test/meson.build                          |    1 -
>>>    app/test/test_cryptodev.c                     |    7 -
>>>    app/test/test_cryptodev.h                     |    1 -
>>>    app/test/test_cryptodev_asym.c                |   17 -
>>>    app/test/test_eventdev.c                      |    8 -
>>>    config/arm/arm64_cn10k_linux_gcc              |    1 -
>>>    ...teontx2_linux_gcc => arm64_cn9k_linux_gcc} |    3 +-
>>>    config/arm/meson.build                        |   10 +-
>>>    devtools/check-abi.sh                         |    4 +
>>>    doc/guides/cryptodevs/features/octeontx2.ini  |   87 -
>>>    doc/guides/cryptodevs/index.rst               |    1 -
>>>    doc/guides/cryptodevs/octeontx2.rst           |  188 -
>>>    doc/guides/dmadevs/cnxk.rst                   |    2 +-
>>>    doc/guides/eventdevs/features/octeontx2.ini   |   30 -
>>>    doc/guides/eventdevs/index.rst                |    1 -
>>>    doc/guides/eventdevs/octeontx2.rst            |  178 -
>>>    doc/guides/mempool/index.rst                  |    1 -
>>>    doc/guides/mempool/octeontx2.rst              |   92 -
>>>    doc/guides/nics/cnxk.rst                      |    4 +-
>>>    doc/guides/nics/features/octeontx2.ini        |   97 -
>>>    doc/guides/nics/features/octeontx2_vec.ini    |   48 -
>>>    doc/guides/nics/features/octeontx2_vf.ini     |   45 -
>>>    doc/guides/nics/index.rst                     |    1 -
>>>    doc/guides/nics/octeontx2.rst                 |  465 ---
>>>    doc/guides/nics/octeontx_ep.rst               |    4 +-
>>>    doc/guides/platform/cnxk.rst                  |   12 +
>>>    .../octeontx2_packet_flow_hw_accelerators.svg | 2804 --------------
>>>    .../img/octeontx2_resource_virtualization.svg | 2418 ------------
>>>    doc/guides/platform/index.rst                 |    1 -
>>>    doc/guides/platform/octeontx2.rst             |  520 ---
>>>    doc/guides/rel_notes/deprecation.rst          |   17 -
>>>    doc/guides/rel_notes/release_19_08.rst        |   12 +-
>>>    doc/guides/rel_notes/release_19_11.rst        |    6 +-
>>>    doc/guides/rel_notes/release_20_02.rst        |    8 +-
>>>    doc/guides/rel_notes/release_20_05.rst        |    4 +-
>>>    doc/guides/rel_notes/release_20_08.rst        |    6 +-
>>>    doc/guides/rel_notes/release_20_11.rst        |    8 +-
>>>    doc/guides/rel_notes/release_21_02.rst        |   10 +-
>>>    doc/guides/rel_notes/release_21_05.rst        |    6 +-
>>>    doc/guides/rel_notes/release_21_11.rst        |    2 +-
>>
>> Not sure about updating old release notes files, using 'octeontx2' still can make
>> sense for the context of those releases.
> 
> OK. I will send v2 with keeping octeontx2 in OLD release notes.
> 
> 

Not related with this set specifically, a more general question about updating
old release notes.
For me release notes should be frozen with the release and shouldn't be updated
at all afterwards, but there is no agreement on this and in practice old release
notes are updated.

My question is, is there any benefit to keep a separate release notes file for
each release, and need to maintain old ones.
What about having a single release file, 'release.rst', and reset it after each
release?
Kevin Traynor Dec. 7, 2021, 11:51 a.m. UTC | #5
On 07/12/2021 11:01, Ferruh Yigit wrote:
> On 12/7/2021 7:39 AM, Jerin Jacob wrote:
>> On Mon, Dec 6, 2021 at 7:05 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote:
>>>
>>> On 12/6/2021 8:35 AM, jerinj@marvell.com wrote:
>>>> From: Jerin Jacob<jerinj@marvell.com>
>>>>
>>>> As per the deprecation notice,  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 patch does the following
>>>>
>>>> - 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 config/arm/arm64_octeontx2_linux_gcc as
>>>>      config/arm/arm64_cn9k_linux_gcc
>>>> - Update the documentation and MAINTAINERS to reflect the same.
>>>> - Change the reference to OCTEONTX2 as OCTEON 9. The kernel related
>>>> documentation is not accounted for this change as kernel documentation
>>>> still uses OCTEONTX2.
>>>>
>>>> Depends-on: series-20804 ("common/cnxk: add REE HW definitions")
>>>> Signed-off-by: Jerin Jacob<jerinj@marvell.com>
>>>> ---
>>>>     MAINTAINERS                                   |   37 -
>>>>     app/test/meson.build                          |    1 -
>>>>     app/test/test_cryptodev.c                     |    7 -
>>>>     app/test/test_cryptodev.h                     |    1 -
>>>>     app/test/test_cryptodev_asym.c                |   17 -
>>>>     app/test/test_eventdev.c                      |    8 -
>>>>     config/arm/arm64_cn10k_linux_gcc              |    1 -
>>>>     ...teontx2_linux_gcc => arm64_cn9k_linux_gcc} |    3 +-
>>>>     config/arm/meson.build                        |   10 +-
>>>>     devtools/check-abi.sh                         |    4 +
>>>>     doc/guides/cryptodevs/features/octeontx2.ini  |   87 -
>>>>     doc/guides/cryptodevs/index.rst               |    1 -
>>>>     doc/guides/cryptodevs/octeontx2.rst           |  188 -
>>>>     doc/guides/dmadevs/cnxk.rst                   |    2 +-
>>>>     doc/guides/eventdevs/features/octeontx2.ini   |   30 -
>>>>     doc/guides/eventdevs/index.rst                |    1 -
>>>>     doc/guides/eventdevs/octeontx2.rst            |  178 -
>>>>     doc/guides/mempool/index.rst                  |    1 -
>>>>     doc/guides/mempool/octeontx2.rst              |   92 -
>>>>     doc/guides/nics/cnxk.rst                      |    4 +-
>>>>     doc/guides/nics/features/octeontx2.ini        |   97 -
>>>>     doc/guides/nics/features/octeontx2_vec.ini    |   48 -
>>>>     doc/guides/nics/features/octeontx2_vf.ini     |   45 -
>>>>     doc/guides/nics/index.rst                     |    1 -
>>>>     doc/guides/nics/octeontx2.rst                 |  465 ---
>>>>     doc/guides/nics/octeontx_ep.rst               |    4 +-
>>>>     doc/guides/platform/cnxk.rst                  |   12 +
>>>>     .../octeontx2_packet_flow_hw_accelerators.svg | 2804 --------------
>>>>     .../img/octeontx2_resource_virtualization.svg | 2418 ------------
>>>>     doc/guides/platform/index.rst                 |    1 -
>>>>     doc/guides/platform/octeontx2.rst             |  520 ---
>>>>     doc/guides/rel_notes/deprecation.rst          |   17 -
>>>>     doc/guides/rel_notes/release_19_08.rst        |   12 +-
>>>>     doc/guides/rel_notes/release_19_11.rst        |    6 +-
>>>>     doc/guides/rel_notes/release_20_02.rst        |    8 +-
>>>>     doc/guides/rel_notes/release_20_05.rst        |    4 +-
>>>>     doc/guides/rel_notes/release_20_08.rst        |    6 +-
>>>>     doc/guides/rel_notes/release_20_11.rst        |    8 +-
>>>>     doc/guides/rel_notes/release_21_02.rst        |   10 +-
>>>>     doc/guides/rel_notes/release_21_05.rst        |    6 +-
>>>>     doc/guides/rel_notes/release_21_11.rst        |    2 +-
>>>
>>> Not sure about updating old release notes files, using 'octeontx2' still can make
>>> sense for the context of those releases.
>>
>> OK. I will send v2 with keeping octeontx2 in OLD release notes.
>>
>>
> 
> Not related with this set specifically, a more general question about updating
> old release notes.
> For me release notes should be frozen with the release and shouldn't be updated
> at all afterwards, but there is no agreement on this and in practice old release
> notes are updated.
> 
> My question is, is there any benefit to keep a separate release notes file for
> each release, and need to maintain old ones.
> What about having a single release file, 'release.rst', and reset it after each
> release?
> 

I think there is a benefit to keeping them all - you can quickly 
look/grep through the files for multiple releases. e.g. if you wanted to 
check when a driver/feature was added etc. I agree it doesn't make sense 
to update them, unless there was a mistake at the time of release.
Thomas Monjalon Jan. 11, 2022, 4:58 p.m. UTC | #6
07/12/2021 12:51, Kevin Traynor:
> On 07/12/2021 11:01, Ferruh Yigit wrote:
> > Not related with this set specifically, a more general question about updating
> > old release notes.
> > For me release notes should be frozen with the release and shouldn't be updated
> > at all afterwards, but there is no agreement on this and in practice old release
> > notes are updated.
> > 
> > My question is, is there any benefit to keep a separate release notes file for
> > each release, and need to maintain old ones.
> > What about having a single release file, 'release.rst', and reset it after each
> > release?
> > 
> 
> I think there is a benefit to keeping them all - you can quickly 
> look/grep through the files for multiple releases. e.g. if you wanted to 
> check when a driver/feature was added etc. I agree it doesn't make sense 
> to update them, unless there was a mistake at the time of release.

It makes sense to update old release notes, at least to make them compile.
Please remember we generate all of them as part of the guides:
	https://doc.dpdk.org/guides/rel_notes/
diff mbox series

Patch

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 ca523eb94c..675f10142e 100755
--- a/devtools/check-abi.sh
+++ b/devtools/check-abi.sh
@@ -48,6 +48,10 @@  for dump in $(find $refdir -name "*.dump"); do
 		echo "Skipped removed driver $name."
 		continue
 	fi
+	if grep -qE "\<librte_*.*_octeontx2" $dump; then
+		echo "Skipped removed driver $name."
+		continue
+	fi
 	dump2=$(find $newdir -name $name)
 	if [ -z "$dump2" ] || [ ! -e "$dump2" ]; then
 		echo "Error: cannot find $name in $newdir" >&2
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..2f6973cef3 100644
--- a/doc/guides/rel_notes/release_19_08.rst
+++ b/doc/guides/rel_notes/release_19_08.rst
@@ -146,17 +146,17 @@  New Features
   of via software, reducing cycles spent copying large blocks of data in
   applications.
 
-* **Added Marvell OCTEON TX2 drivers.**
+* **Added Marvell OCTEON 9 drivers.**
 
   Added the new ``ethdev``, ``eventdev``, ``mempool``, ``eventdev Rx adapter``,
   ``eventdev Tx adapter``, ``eventdev Timer adapter`` and ``rawdev DMA``
-  drivers for various HW co-processors available in ``OCTEON TX2`` SoC.
+  drivers for various HW co-processors available in ``OCTEON 9`` 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..6c3aa14c0d 100644
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -187,12 +187,12 @@  New Features
   Added support for asymmetric operations to Marvell OCTEON TX crypto PMD.
   Supports RSA and modexp operations.
 
-* **Added Marvell OCTEON TX2 crypto PMD.**
+* **Added Marvell OCTEON 9 crypto PMD.**
 
-  Added a new PMD for hardware crypto offload block on ``OCTEON TX2``
+  Added a new PMD for hardware crypto offload block on ``OCTEON 9``
   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/rel_notes/release_20_02.rst b/doc/guides/rel_notes/release_20_02.rst
index 925985b4f8..daeca868e0 100644
--- a/doc/guides/rel_notes/release_20_02.rst
+++ b/doc/guides/rel_notes/release_20_02.rst
@@ -175,18 +175,18 @@  New Features
   armv8 crypto library is not used anymore. The library name has been changed
   from armv8_crypto to AArch64crypto.
 
-* **Added inline IPsec support to Marvell OCTEON TX2 PMD.**
+* **Added inline IPsec support to Marvell OCTEON 9 PMD.**
 
-  Added inline IPsec support to Marvell OCTEON TX2 PMD. With this feature,
+  Added inline IPsec support to Marvell OCTEON 9 PMD. With this feature,
   applications will be able to offload entire IPsec offload to the hardware.
   For the configured sessions, hardware will do the lookup and perform
   decryption and IPsec transformation. For the outbound path, applications
   can submit a plain packet to the PMD, and it will be sent out on the wire
   after doing encryption and IPsec transformation of the packet.
 
-* **Added Marvell OCTEON TX2 End Point rawdev PMD.**
+* **Added Marvell OCTEON 9 End Point rawdev PMD.**
 
-  Added a new OCTEON TX2 rawdev PMD for End Point mode of operation.
+  Added a new OCTEON 9 rawdev PMD for End Point mode of operation.
   See ``rawdevs/octeontx2_ep`` for more details on this new PMD.
 
 * **Added event mode to l3fwd sample application.**
diff --git a/doc/guides/rel_notes/release_20_05.rst b/doc/guides/rel_notes/release_20_05.rst
index a38c6c673d..b853f00ae6 100644
--- a/doc/guides/rel_notes/release_20_05.rst
+++ b/doc/guides/rel_notes/release_20_05.rst
@@ -116,9 +116,9 @@  New Features
   * Added support for DCF (Device Config Function) feature.
   * Added switch filter support for Intel DCF.
 
-* **Updated Marvell OCTEON TX2 ethdev driver.**
+* **Updated Marvell OCTEON 9 ethdev driver.**
 
-  Updated Marvell OCTEON TX2 ethdev driver with traffic manager support,
+  Updated Marvell OCTEON 9 ethdev driver with traffic manager support,
   including:
 
   * Hierarchical Scheduling with DWRR and SP.
diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst
index 445e40fbac..e597cd0130 100644
--- a/doc/guides/rel_notes/release_20_08.rst
+++ b/doc/guides/rel_notes/release_20_08.rst
@@ -183,11 +183,11 @@  New Features
   * Added support for Intel GEN2 QuickAssist device 200xx
     (PF device id 0x18ee, VF device id 0x18ef).
 
-* **Updated the OCTEON TX2 crypto PMD.**
+* **Updated the OCTEON 9 crypto PMD.**
 
-  * Added Chacha20-Poly1305 AEAD algorithm support in OCTEON TX2 crypto PMD.
+  * Added Chacha20-Poly1305 AEAD algorithm support in OCTEON 9 crypto PMD.
 
-  * Updated the OCTEON TX2 crypto PMD to support ``rte_security`` lookaside
+  * Updated the OCTEON 9 crypto PMD to support ``rte_security`` lookaside
     protocol offload for IPsec.
 
 * **Added support for BPF_ABS/BPF_IND load instructions.**
diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst
index 7fd15398e4..4ce9b6aea9 100644
--- a/doc/guides/rel_notes/release_20_11.rst
+++ b/doc/guides/rel_notes/release_20_11.rst
@@ -265,9 +265,9 @@  New Features
   * Added AES-GCM support.
   * Added cipher only offload support.
 
-* **Updated Marvell OCTEON TX2 crypto PMD.**
+* **Updated Marvell OCTEON 9 crypto PMD.**
 
-  * Updated the OCTEON TX2 crypto PMD lookaside protocol offload for IPsec with
+  * Updated the OCTEON 9 crypto PMD lookaside protocol offload for IPsec with
     IPv6 support.
 
 * **Updated Intel QAT PMD.**
@@ -286,9 +286,9 @@  New Features
   ``rte_security_pdcp_xform`` in ``rte_security`` lib is updated to enable
   5G NR processing of SDAP headers in PMDs.
 
-* **Added Marvell OCTEON TX2 regex PMD.**
+* **Added Marvell OCTEON 9 regex PMD.**
 
-  Added a new PMD for the hardware regex offload block for OCTEON TX2 SoC.
+  Added a new PMD for the hardware regex offload block for OCTEON 9 SoC.
 
   See ``regexdevs/octeontx2`` for more details.
 
diff --git a/doc/guides/rel_notes/release_21_02.rst b/doc/guides/rel_notes/release_21_02.rst
index 5fbf5b3d43..ac996dce95 100644
--- a/doc/guides/rel_notes/release_21_02.rst
+++ b/doc/guides/rel_notes/release_21_02.rst
@@ -123,14 +123,14 @@  New Features
   enable applications to add/remove user callbacks which get called
   for every enqueue/dequeue operation.
 
-* **Updated the OCTEON TX2 crypto PMD.**
+* **Updated the OCTEON 9 crypto PMD.**
 
-  * Updated the OCTEON TX2 crypto PMD lookaside protocol offload for IPsec with
+  * Updated the OCTEON 9 crypto PMD lookaside protocol offload for IPsec with
     ESN and anti-replay support.
-  * Updated the OCTEON TX2 crypto PMD with CN98xx support.
-  * Added support for aes-cbc sha1-hmac cipher combination in OCTEON TX2 crypto
+  * Updated the OCTEON 9 crypto PMD with CN98xx support.
+  * Added support for aes-cbc sha1-hmac cipher combination in OCTEON 9 crypto
     PMD lookaside protocol offload for IPsec.
-  * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON TX2
+  * Added support for aes-cbc sha256-128-hmac cipher combination in OCTEON 9
     crypto PMD lookaside protocol offload for IPsec.
 
 * **Added mlx5 compress PMD.**
diff --git a/doc/guides/rel_notes/release_21_05.rst b/doc/guides/rel_notes/release_21_05.rst
index 49044ed422..89a261e5f5 100644
--- a/doc/guides/rel_notes/release_21_05.rst
+++ b/doc/guides/rel_notes/release_21_05.rst
@@ -121,7 +121,7 @@  New Features
   * Added GTPU TEID support for DCF switch filter.
   * Added flow priority support for DCF switch filter.
 
-* **Updated Marvell OCTEON TX2 ethdev driver.**
+* **Updated Marvell OCTEON 9 ethdev driver.**
 
   * Added support for flow action port id.
 
@@ -187,9 +187,9 @@  New Features
 
   * Added support for ``DIGEST_ENCRYPTED`` mode in the OCTEON TX crypto PMD.
 
-* **Updated the OCTEON TX2 crypto PMD.**
+* **Updated the OCTEON 9 crypto PMD.**
 
-  * Added support for ``DIGEST_ENCRYPTED`` mode in OCTEON TX2 crypto PMD.
+  * Added support for ``DIGEST_ENCRYPTED`` mode in OCTEON 9 crypto PMD.
   * Added support in lookaside protocol offload mode for IPsec with
     UDP encapsulation support for NAT Traversal.
   * Added support in lookaside protocol offload mode for IPsec with
diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst
index db09ec01ea..f2497f1447 100644
--- a/doc/guides/rel_notes/release_21_11.rst
+++ b/doc/guides/rel_notes/release_21_11.rst
@@ -54,7 +54,7 @@  New Features
 * **Added Marvell CNXK DMA driver.**
 
   Added dmadev driver for the DPI DMA hardware accelerator
-  of Marvell OCTEONTX2 and OCTEONTX3 family of SoCs.
+  of Marvell OCTEON 9 and OCTEON 10 family of SoCs.
 
 * **Added NXP DPAA DMA driver.**
 
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)