raw/ioat: make HW register spec private
authorBruce Richardson <bruce.richardson@intel.com>
Thu, 8 Oct 2020 09:51:17 +0000 (10:51 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 8 Oct 2020 12:33:20 +0000 (14:33 +0200)
Only a few definitions from the hardware spec are actually used in the
driver runtime, so we can copy over those few and make the rest of the spec
a private header in the driver.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Kevin Laatz <kevin.laatz@intel.com>
Acked-by: Radu Nicolau <radu.nicolau@intel.com>
drivers/raw/ioat/ioat_rawdev.c
drivers/raw/ioat/ioat_spec.h [new file with mode: 0644]
drivers/raw/ioat/meson.build
drivers/raw/ioat/rte_ioat_rawdev_fns.h
drivers/raw/ioat/rte_ioat_spec.h [deleted file]

index ea9f51f..aa59b73 100644 (file)
@@ -4,10 +4,12 @@
 
 #include <rte_cycles.h>
 #include <rte_bus_pci.h>
+#include <rte_memzone.h>
 #include <rte_string_fns.h>
 #include <rte_rawdev_pmd.h>
 
 #include "rte_ioat_rawdev.h"
+#include "ioat_spec.h"
 
 static struct rte_pci_driver ioat_pmd_drv;
 
@@ -268,6 +270,7 @@ ioat_rawdev_create(const char *name, struct rte_pci_device *dev)
        ioat->rawdev = rawdev;
        ioat->mz = mz;
        ioat->regs = dev->mem_resource[0].addr;
+       ioat->doorbell = &ioat->regs->dmacount;
        ioat->ring_size = 0;
        ioat->desc_ring = NULL;
        ioat->status_addr = ioat->mz->iova +
diff --git a/drivers/raw/ioat/ioat_spec.h b/drivers/raw/ioat/ioat_spec.h
new file mode 100644 (file)
index 0000000..9645e16
--- /dev/null
@@ -0,0 +1,275 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) Intel Corporation
+ */
+
+/**
+ * \file
+ * I/OAT specification definitions
+ *
+ * Taken from ioat_spec.h from SPDK project, with prefix renames and
+ * other minor changes.
+ */
+
+#ifndef RTE_IOAT_SPEC_H
+#define RTE_IOAT_SPEC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+#define RTE_IOAT_PCI_CHANERR_INT_OFFSET        0x180
+
+#define RTE_IOAT_INTRCTRL_MASTER_INT_EN        0x01
+
+#define RTE_IOAT_VER_3_0                0x30
+#define RTE_IOAT_VER_3_3                0x33
+
+/* DMA Channel Registers */
+#define RTE_IOAT_CHANCTRL_CHANNEL_PRIORITY_MASK        0xF000
+#define RTE_IOAT_CHANCTRL_COMPL_DCA_EN         0x0200
+#define RTE_IOAT_CHANCTRL_CHANNEL_IN_USE               0x0100
+#define RTE_IOAT_CHANCTRL_DESCRIPTOR_ADDR_SNOOP_CONTROL        0x0020
+#define RTE_IOAT_CHANCTRL_ERR_INT_EN           0x0010
+#define RTE_IOAT_CHANCTRL_ANY_ERR_ABORT_EN             0x0008
+#define RTE_IOAT_CHANCTRL_ERR_COMPLETION_EN            0x0004
+#define RTE_IOAT_CHANCTRL_INT_REARM                    0x0001
+
+/* DMA Channel Capabilities */
+#define        RTE_IOAT_DMACAP_PB              (1 << 0)
+#define        RTE_IOAT_DMACAP_DCA             (1 << 4)
+#define        RTE_IOAT_DMACAP_BFILL           (1 << 6)
+#define        RTE_IOAT_DMACAP_XOR             (1 << 8)
+#define        RTE_IOAT_DMACAP_PQ              (1 << 9)
+#define        RTE_IOAT_DMACAP_DMA_DIF (1 << 10)
+
+struct rte_ioat_registers {
+       uint8_t         chancnt;
+       uint8_t         xfercap;
+       uint8_t         genctrl;
+       uint8_t         intrctrl;
+       uint32_t        attnstatus;
+       uint8_t         cbver;          /* 0x08 */
+       uint8_t         reserved4[0x3]; /* 0x09 */
+       uint16_t        intrdelay;      /* 0x0C */
+       uint16_t        cs_status;      /* 0x0E */
+       uint32_t        dmacapability;  /* 0x10 */
+       uint8_t         reserved5[0x6C]; /* 0x14 */
+       uint16_t        chanctrl;       /* 0x80 */
+       uint8_t         reserved6[0x2]; /* 0x82 */
+       uint8_t         chancmd;        /* 0x84 */
+       uint8_t         reserved3[1];   /* 0x85 */
+       uint16_t        dmacount;       /* 0x86 */
+       uint64_t        chansts;        /* 0x88 */
+       uint64_t        chainaddr;      /* 0x90 */
+       uint64_t        chancmp;        /* 0x98 */
+       uint8_t         reserved2[0x8]; /* 0xA0 */
+       uint32_t        chanerr;        /* 0xA8 */
+       uint32_t        chanerrmask;    /* 0xAC */
+} __rte_packed;
+
+#define RTE_IOAT_CHANCMD_RESET                 0x20
+#define RTE_IOAT_CHANCMD_SUSPEND               0x04
+
+#define RTE_IOAT_CHANSTS_STATUS                0x7ULL
+#define RTE_IOAT_CHANSTS_ACTIVE                0x0
+#define RTE_IOAT_CHANSTS_IDLE                  0x1
+#define RTE_IOAT_CHANSTS_SUSPENDED             0x2
+#define RTE_IOAT_CHANSTS_HALTED                0x3
+#define RTE_IOAT_CHANSTS_ARMED                 0x4
+
+#define RTE_IOAT_CHANSTS_UNAFFILIATED_ERROR    0x8ULL
+#define RTE_IOAT_CHANSTS_SOFT_ERROR            0x10ULL
+
+#define RTE_IOAT_CHANSTS_COMPLETED_DESCRIPTOR_MASK     (~0x3FULL)
+
+#define RTE_IOAT_CHANCMP_ALIGN                 8       /* CHANCMP address must be 64-bit aligned */
+
+struct rte_ioat_dma_hw_desc {
+       uint32_t size;
+       union {
+               uint32_t control_raw;
+               struct {
+                       uint32_t int_enable: 1;
+                       uint32_t src_snoop_disable: 1;
+                       uint32_t dest_snoop_disable: 1;
+                       uint32_t completion_update: 1;
+                       uint32_t fence: 1;
+                       uint32_t null: 1;
+                       uint32_t src_page_break: 1;
+                       uint32_t dest_page_break: 1;
+                       uint32_t bundle: 1;
+                       uint32_t dest_dca: 1;
+                       uint32_t hint: 1;
+                       uint32_t reserved: 13;
+#define RTE_IOAT_OP_COPY 0x00
+                       uint32_t op: 8;
+               } control;
+       } u;
+       uint64_t src_addr;
+       uint64_t dest_addr;
+       uint64_t next;
+       uint64_t reserved;
+       uint64_t reserved2;
+       uint64_t user1;
+       uint64_t user2;
+};
+
+struct rte_ioat_fill_hw_desc {
+       uint32_t size;
+       union {
+               uint32_t control_raw;
+               struct {
+                       uint32_t int_enable: 1;
+                       uint32_t reserved: 1;
+                       uint32_t dest_snoop_disable: 1;
+                       uint32_t completion_update: 1;
+                       uint32_t fence: 1;
+                       uint32_t reserved2: 2;
+                       uint32_t dest_page_break: 1;
+                       uint32_t bundle: 1;
+                       uint32_t reserved3: 15;
+#define RTE_IOAT_OP_FILL 0x01
+                       uint32_t op: 8;
+               } control;
+       } u;
+       uint64_t src_data;
+       uint64_t dest_addr;
+       uint64_t next;
+       uint64_t reserved;
+       uint64_t next_dest_addr;
+       uint64_t user1;
+       uint64_t user2;
+};
+
+struct rte_ioat_xor_hw_desc {
+       uint32_t size;
+       union {
+               uint32_t control_raw;
+               struct {
+                       uint32_t int_enable: 1;
+                       uint32_t src_snoop_disable: 1;
+                       uint32_t dest_snoop_disable: 1;
+                       uint32_t completion_update: 1;
+                       uint32_t fence: 1;
+                       uint32_t src_count: 3;
+                       uint32_t bundle: 1;
+                       uint32_t dest_dca: 1;
+                       uint32_t hint: 1;
+                       uint32_t reserved: 13;
+#define RTE_IOAT_OP_XOR 0x87
+#define RTE_IOAT_OP_XOR_VAL 0x88
+                       uint32_t op: 8;
+               } control;
+       } u;
+       uint64_t src_addr;
+       uint64_t dest_addr;
+       uint64_t next;
+       uint64_t src_addr2;
+       uint64_t src_addr3;
+       uint64_t src_addr4;
+       uint64_t src_addr5;
+};
+
+struct rte_ioat_xor_ext_hw_desc {
+       uint64_t src_addr6;
+       uint64_t src_addr7;
+       uint64_t src_addr8;
+       uint64_t next;
+       uint64_t reserved[4];
+};
+
+struct rte_ioat_pq_hw_desc {
+       uint32_t size;
+       union {
+               uint32_t control_raw;
+               struct {
+                       uint32_t int_enable: 1;
+                       uint32_t src_snoop_disable: 1;
+                       uint32_t dest_snoop_disable: 1;
+                       uint32_t completion_update: 1;
+                       uint32_t fence: 1;
+                       uint32_t src_count: 3;
+                       uint32_t bundle: 1;
+                       uint32_t dest_dca: 1;
+                       uint32_t hint: 1;
+                       uint32_t p_disable: 1;
+                       uint32_t q_disable: 1;
+                       uint32_t reserved: 11;
+#define RTE_IOAT_OP_PQ 0x89
+#define RTE_IOAT_OP_PQ_VAL 0x8a
+                       uint32_t op: 8;
+               } control;
+       } u;
+       uint64_t src_addr;
+       uint64_t p_addr;
+       uint64_t next;
+       uint64_t src_addr2;
+       uint64_t src_addr3;
+       uint8_t  coef[8];
+       uint64_t q_addr;
+};
+
+struct rte_ioat_pq_ext_hw_desc {
+       uint64_t src_addr4;
+       uint64_t src_addr5;
+       uint64_t src_addr6;
+       uint64_t next;
+       uint64_t src_addr7;
+       uint64_t src_addr8;
+       uint64_t reserved[2];
+};
+
+struct rte_ioat_pq_update_hw_desc {
+       uint32_t size;
+       union {
+               uint32_t control_raw;
+               struct {
+                       uint32_t int_enable: 1;
+                       uint32_t src_snoop_disable: 1;
+                       uint32_t dest_snoop_disable: 1;
+                       uint32_t completion_update: 1;
+                       uint32_t fence: 1;
+                       uint32_t src_cnt: 3;
+                       uint32_t bundle: 1;
+                       uint32_t dest_dca: 1;
+                       uint32_t hint: 1;
+                       uint32_t p_disable: 1;
+                       uint32_t q_disable: 1;
+                       uint32_t reserved: 3;
+                       uint32_t coef: 8;
+#define RTE_IOAT_OP_PQ_UP 0x8b
+                       uint32_t op: 8;
+               } control;
+       } u;
+       uint64_t src_addr;
+       uint64_t p_addr;
+       uint64_t next;
+       uint64_t src_addr2;
+       uint64_t p_src;
+       uint64_t q_src;
+       uint64_t q_addr;
+};
+
+struct rte_ioat_raw_hw_desc {
+       uint64_t field[8];
+};
+
+union rte_ioat_hw_desc {
+       struct rte_ioat_raw_hw_desc raw;
+       struct rte_ioat_generic_hw_desc generic;
+       struct rte_ioat_dma_hw_desc dma;
+       struct rte_ioat_fill_hw_desc fill;
+       struct rte_ioat_xor_hw_desc xor_desc;
+       struct rte_ioat_xor_ext_hw_desc xor_ext;
+       struct rte_ioat_pq_hw_desc pq;
+       struct rte_ioat_pq_ext_hw_desc pq_ext;
+       struct rte_ioat_pq_update_hw_desc pq_update;
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* RTE_IOAT_SPEC_H */
index f66e9b6..06636f8 100644 (file)
@@ -8,5 +8,4 @@ sources = files('ioat_rawdev.c',
 deps += ['rawdev', 'bus_pci', 'mbuf']
 
 install_headers('rte_ioat_rawdev.h',
-               'rte_ioat_rawdev_fns.h',
-               'rte_ioat_spec.h')
+               'rte_ioat_rawdev_fns.h')
index 466721a..c6e0b9a 100644 (file)
@@ -8,7 +8,36 @@
 #include <rte_rawdev.h>
 #include <rte_memzone.h>
 #include <rte_prefetch.h>
-#include "rte_ioat_spec.h"
+
+/**
+ * @internal
+ * Structure representing a device descriptor
+ */
+struct rte_ioat_generic_hw_desc {
+       uint32_t size;
+       union {
+               uint32_t control_raw;
+               struct {
+                       uint32_t int_enable: 1;
+                       uint32_t src_snoop_disable: 1;
+                       uint32_t dest_snoop_disable: 1;
+                       uint32_t completion_update: 1;
+                       uint32_t fence: 1;
+                       uint32_t reserved2: 1;
+                       uint32_t src_page_break: 1;
+                       uint32_t dest_page_break: 1;
+                       uint32_t bundle: 1;
+                       uint32_t dest_dca: 1;
+                       uint32_t hint: 1;
+                       uint32_t reserved: 13;
+                       uint32_t op: 8;
+               } control;
+       } u;
+       uint64_t src_addr;
+       uint64_t dest_addr;
+       uint64_t next;
+       uint64_t op_specific[4];
+};
 
 /**
  * @internal
@@ -19,7 +48,7 @@ struct rte_ioat_rawdev {
        const struct rte_memzone *mz;
        const struct rte_memzone *desc_mz;
 
-       volatile struct rte_ioat_registers *regs;
+       volatile uint16_t *doorbell;
        phys_addr_t status_addr;
        phys_addr_t ring_addr;
 
@@ -40,8 +69,16 @@ struct rte_ioat_rawdev {
 
        /* to report completions, the device will write status back here */
        volatile uint64_t status __rte_cache_aligned;
+
+       /* pointer to the register bar */
+       volatile struct rte_ioat_registers *regs;
 };
 
+#define RTE_IOAT_CHANSTS_IDLE                  0x1
+#define RTE_IOAT_CHANSTS_SUSPENDED             0x2
+#define RTE_IOAT_CHANSTS_HALTED                        0x3
+#define RTE_IOAT_CHANSTS_ARMED                 0x4
+
 /*
  * Enqueue a copy operation onto the ioat device
  */
@@ -109,7 +146,7 @@ rte_ioat_perform_ops(int dev_id)
        ioat->desc_ring[(ioat->next_write - 1) & (ioat->ring_size - 1)].u
                        .control.completion_update = 1;
        rte_compiler_barrier();
-       ioat->regs->dmacount = ioat->next_write;
+       *ioat->doorbell = ioat->next_write;
        ioat->started = ioat->enqueued;
 }
 
diff --git a/drivers/raw/ioat/rte_ioat_spec.h b/drivers/raw/ioat/rte_ioat_spec.h
deleted file mode 100644 (file)
index c6e7929..0000000
+++ /dev/null
@@ -1,301 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) Intel Corporation
- */
-
-/**
- * \file
- * I/OAT specification definitions
- *
- * Taken from ioat_spec.h from SPDK project, with prefix renames and
- * other minor changes.
- */
-
-#ifndef RTE_IOAT_SPEC_H
-#define RTE_IOAT_SPEC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-#define RTE_IOAT_PCI_CHANERR_INT_OFFSET        0x180
-
-#define RTE_IOAT_INTRCTRL_MASTER_INT_EN        0x01
-
-#define RTE_IOAT_VER_3_0                0x30
-#define RTE_IOAT_VER_3_3                0x33
-
-/* DMA Channel Registers */
-#define RTE_IOAT_CHANCTRL_CHANNEL_PRIORITY_MASK        0xF000
-#define RTE_IOAT_CHANCTRL_COMPL_DCA_EN         0x0200
-#define RTE_IOAT_CHANCTRL_CHANNEL_IN_USE               0x0100
-#define RTE_IOAT_CHANCTRL_DESCRIPTOR_ADDR_SNOOP_CONTROL        0x0020
-#define RTE_IOAT_CHANCTRL_ERR_INT_EN           0x0010
-#define RTE_IOAT_CHANCTRL_ANY_ERR_ABORT_EN             0x0008
-#define RTE_IOAT_CHANCTRL_ERR_COMPLETION_EN            0x0004
-#define RTE_IOAT_CHANCTRL_INT_REARM                    0x0001
-
-/* DMA Channel Capabilities */
-#define        RTE_IOAT_DMACAP_PB              (1 << 0)
-#define        RTE_IOAT_DMACAP_DCA             (1 << 4)
-#define        RTE_IOAT_DMACAP_BFILL           (1 << 6)
-#define        RTE_IOAT_DMACAP_XOR             (1 << 8)
-#define        RTE_IOAT_DMACAP_PQ              (1 << 9)
-#define        RTE_IOAT_DMACAP_DMA_DIF (1 << 10)
-
-struct rte_ioat_registers {
-       uint8_t         chancnt;
-       uint8_t         xfercap;
-       uint8_t         genctrl;
-       uint8_t         intrctrl;
-       uint32_t        attnstatus;
-       uint8_t         cbver;          /* 0x08 */
-       uint8_t         reserved4[0x3]; /* 0x09 */
-       uint16_t        intrdelay;      /* 0x0C */
-       uint16_t        cs_status;      /* 0x0E */
-       uint32_t        dmacapability;  /* 0x10 */
-       uint8_t         reserved5[0x6C]; /* 0x14 */
-       uint16_t        chanctrl;       /* 0x80 */
-       uint8_t         reserved6[0x2]; /* 0x82 */
-       uint8_t         chancmd;        /* 0x84 */
-       uint8_t         reserved3[1];   /* 0x85 */
-       uint16_t        dmacount;       /* 0x86 */
-       uint64_t        chansts;        /* 0x88 */
-       uint64_t        chainaddr;      /* 0x90 */
-       uint64_t        chancmp;        /* 0x98 */
-       uint8_t         reserved2[0x8]; /* 0xA0 */
-       uint32_t        chanerr;        /* 0xA8 */
-       uint32_t        chanerrmask;    /* 0xAC */
-} __rte_packed;
-
-#define RTE_IOAT_CHANCMD_RESET                 0x20
-#define RTE_IOAT_CHANCMD_SUSPEND               0x04
-
-#define RTE_IOAT_CHANSTS_STATUS                0x7ULL
-#define RTE_IOAT_CHANSTS_ACTIVE                0x0
-#define RTE_IOAT_CHANSTS_IDLE                  0x1
-#define RTE_IOAT_CHANSTS_SUSPENDED             0x2
-#define RTE_IOAT_CHANSTS_HALTED                0x3
-#define RTE_IOAT_CHANSTS_ARMED                 0x4
-
-#define RTE_IOAT_CHANSTS_UNAFFILIATED_ERROR    0x8ULL
-#define RTE_IOAT_CHANSTS_SOFT_ERROR            0x10ULL
-
-#define RTE_IOAT_CHANSTS_COMPLETED_DESCRIPTOR_MASK     (~0x3FULL)
-
-#define RTE_IOAT_CHANCMP_ALIGN                 8       /* CHANCMP address must be 64-bit aligned */
-
-struct rte_ioat_generic_hw_desc {
-       uint32_t size;
-       union {
-               uint32_t control_raw;
-               struct {
-                       uint32_t int_enable: 1;
-                       uint32_t src_snoop_disable: 1;
-                       uint32_t dest_snoop_disable: 1;
-                       uint32_t completion_update: 1;
-                       uint32_t fence: 1;
-                       uint32_t reserved2: 1;
-                       uint32_t src_page_break: 1;
-                       uint32_t dest_page_break: 1;
-                       uint32_t bundle: 1;
-                       uint32_t dest_dca: 1;
-                       uint32_t hint: 1;
-                       uint32_t reserved: 13;
-                       uint32_t op: 8;
-               } control;
-       } u;
-       uint64_t src_addr;
-       uint64_t dest_addr;
-       uint64_t next;
-       uint64_t op_specific[4];
-};
-
-struct rte_ioat_dma_hw_desc {
-       uint32_t size;
-       union {
-               uint32_t control_raw;
-               struct {
-                       uint32_t int_enable: 1;
-                       uint32_t src_snoop_disable: 1;
-                       uint32_t dest_snoop_disable: 1;
-                       uint32_t completion_update: 1;
-                       uint32_t fence: 1;
-                       uint32_t null: 1;
-                       uint32_t src_page_break: 1;
-                       uint32_t dest_page_break: 1;
-                       uint32_t bundle: 1;
-                       uint32_t dest_dca: 1;
-                       uint32_t hint: 1;
-                       uint32_t reserved: 13;
-#define RTE_IOAT_OP_COPY 0x00
-                       uint32_t op: 8;
-               } control;
-       } u;
-       uint64_t src_addr;
-       uint64_t dest_addr;
-       uint64_t next;
-       uint64_t reserved;
-       uint64_t reserved2;
-       uint64_t user1;
-       uint64_t user2;
-};
-
-struct rte_ioat_fill_hw_desc {
-       uint32_t size;
-       union {
-               uint32_t control_raw;
-               struct {
-                       uint32_t int_enable: 1;
-                       uint32_t reserved: 1;
-                       uint32_t dest_snoop_disable: 1;
-                       uint32_t completion_update: 1;
-                       uint32_t fence: 1;
-                       uint32_t reserved2: 2;
-                       uint32_t dest_page_break: 1;
-                       uint32_t bundle: 1;
-                       uint32_t reserved3: 15;
-#define RTE_IOAT_OP_FILL 0x01
-                       uint32_t op: 8;
-               } control;
-       } u;
-       uint64_t src_data;
-       uint64_t dest_addr;
-       uint64_t next;
-       uint64_t reserved;
-       uint64_t next_dest_addr;
-       uint64_t user1;
-       uint64_t user2;
-};
-
-struct rte_ioat_xor_hw_desc {
-       uint32_t size;
-       union {
-               uint32_t control_raw;
-               struct {
-                       uint32_t int_enable: 1;
-                       uint32_t src_snoop_disable: 1;
-                       uint32_t dest_snoop_disable: 1;
-                       uint32_t completion_update: 1;
-                       uint32_t fence: 1;
-                       uint32_t src_count: 3;
-                       uint32_t bundle: 1;
-                       uint32_t dest_dca: 1;
-                       uint32_t hint: 1;
-                       uint32_t reserved: 13;
-#define RTE_IOAT_OP_XOR 0x87
-#define RTE_IOAT_OP_XOR_VAL 0x88
-                       uint32_t op: 8;
-               } control;
-       } u;
-       uint64_t src_addr;
-       uint64_t dest_addr;
-       uint64_t next;
-       uint64_t src_addr2;
-       uint64_t src_addr3;
-       uint64_t src_addr4;
-       uint64_t src_addr5;
-};
-
-struct rte_ioat_xor_ext_hw_desc {
-       uint64_t src_addr6;
-       uint64_t src_addr7;
-       uint64_t src_addr8;
-       uint64_t next;
-       uint64_t reserved[4];
-};
-
-struct rte_ioat_pq_hw_desc {
-       uint32_t size;
-       union {
-               uint32_t control_raw;
-               struct {
-                       uint32_t int_enable: 1;
-                       uint32_t src_snoop_disable: 1;
-                       uint32_t dest_snoop_disable: 1;
-                       uint32_t completion_update: 1;
-                       uint32_t fence: 1;
-                       uint32_t src_count: 3;
-                       uint32_t bundle: 1;
-                       uint32_t dest_dca: 1;
-                       uint32_t hint: 1;
-                       uint32_t p_disable: 1;
-                       uint32_t q_disable: 1;
-                       uint32_t reserved: 11;
-#define RTE_IOAT_OP_PQ 0x89
-#define RTE_IOAT_OP_PQ_VAL 0x8a
-                       uint32_t op: 8;
-               } control;
-       } u;
-       uint64_t src_addr;
-       uint64_t p_addr;
-       uint64_t next;
-       uint64_t src_addr2;
-       uint64_t src_addr3;
-       uint8_t  coef[8];
-       uint64_t q_addr;
-};
-
-struct rte_ioat_pq_ext_hw_desc {
-       uint64_t src_addr4;
-       uint64_t src_addr5;
-       uint64_t src_addr6;
-       uint64_t next;
-       uint64_t src_addr7;
-       uint64_t src_addr8;
-       uint64_t reserved[2];
-};
-
-struct rte_ioat_pq_update_hw_desc {
-       uint32_t size;
-       union {
-               uint32_t control_raw;
-               struct {
-                       uint32_t int_enable: 1;
-                       uint32_t src_snoop_disable: 1;
-                       uint32_t dest_snoop_disable: 1;
-                       uint32_t completion_update: 1;
-                       uint32_t fence: 1;
-                       uint32_t src_cnt: 3;
-                       uint32_t bundle: 1;
-                       uint32_t dest_dca: 1;
-                       uint32_t hint: 1;
-                       uint32_t p_disable: 1;
-                       uint32_t q_disable: 1;
-                       uint32_t reserved: 3;
-                       uint32_t coef: 8;
-#define RTE_IOAT_OP_PQ_UP 0x8b
-                       uint32_t op: 8;
-               } control;
-       } u;
-       uint64_t src_addr;
-       uint64_t p_addr;
-       uint64_t next;
-       uint64_t src_addr2;
-       uint64_t p_src;
-       uint64_t q_src;
-       uint64_t q_addr;
-};
-
-struct rte_ioat_raw_hw_desc {
-       uint64_t field[8];
-};
-
-union rte_ioat_hw_desc {
-       struct rte_ioat_raw_hw_desc raw;
-       struct rte_ioat_generic_hw_desc generic;
-       struct rte_ioat_dma_hw_desc dma;
-       struct rte_ioat_fill_hw_desc fill;
-       struct rte_ioat_xor_hw_desc xor_desc;
-       struct rte_ioat_xor_ext_hw_desc xor_ext;
-       struct rte_ioat_pq_hw_desc pq;
-       struct rte_ioat_pq_ext_hw_desc pq_ext;
-       struct rte_ioat_pq_update_hw_desc pq_update;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RTE_IOAT_SPEC_H */