d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

raw/ioat: make HW register spec private

Browse Source 
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>
This commit is contained in:
Bruce Richardson 2020-10-08 10:51:17 +01:00 committed by Thomas Monjalon
parent f55d185540
commit cae8a1b19e
4 changed files with 44 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/raw/ioat/ioat_rawdev.c
View File

@ -4,10 +4,12 @@
#include <rte_cycles.h> #include <rte_cycles.h>
#include <rte_bus_pci.h> #include <rte_bus_pci.h>
#include <rte_memzone.h>
#include <rte_string_fns.h> #include <rte_string_fns.h>
#include <rte_rawdev_pmd.h> #include <rte_rawdev_pmd.h>
#include "rte_ioat_rawdev.h" #include "rte_ioat_rawdev.h"
#include "ioat_spec.h"
static struct rte_pci_driver ioat_pmd_drv; 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->rawdev = rawdev;
ioat->mz = mz; ioat->mz = mz;
ioat->regs = dev->mem_resource[0].addr; ioat->regs = dev->mem_resource[0].addr;
ioat->doorbell = &ioat->regs->dmacount;
ioat->ring_size = 0; ioat->ring_size = 0;
ioat->desc_ring = NULL; ioat->desc_ring = NULL;
ioat->status_addr = ioat->mz->iova + ioat->status_addr = ioat->mz->iova +

26
drivers/raw/ioat/rte_ioat_spec.h → drivers/raw/ioat/ioat_spec.h
View File

@ -86,32 +86,6 @@ struct rte_ioat_registers {
#define RTE_IOAT_CHANCMP_ALIGN 8 /* CHANCMP address must be 64-bit aligned */ #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 { struct rte_ioat_dma_hw_desc {
uint32_t size; uint32_t size;
union { union {

3
drivers/raw/ioat/meson.build
View File

@ -8,5 +8,4 @@ sources = files('ioat_rawdev.c',
deps += ['rawdev', 'bus_pci', 'mbuf'] deps += ['rawdev', 'bus_pci', 'mbuf']
install_headers('rte_ioat_rawdev.h', install_headers('rte_ioat_rawdev.h',
'rte_ioat_rawdev_fns.h', 'rte_ioat_rawdev_fns.h')
'rte_ioat_spec.h')

43
drivers/raw/ioat/rte_ioat_rawdev_fns.h
View File

@ -8,7 +8,36 @@
#include <rte_rawdev.h> #include <rte_rawdev.h>
#include <rte_memzone.h> #include <rte_memzone.h>
#include <rte_prefetch.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 * @internal
@ -19,7 +48,7 @@ struct rte_ioat_rawdev {
const struct rte_memzone *mz; const struct rte_memzone *mz;
const struct rte_memzone *desc_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 status_addr;
phys_addr_t ring_addr; phys_addr_t ring_addr;
@ -40,8 +69,16 @@ struct rte_ioat_rawdev {
/* to report completions, the device will write status back here */ /* to report completions, the device will write status back here */
volatile uint64_t status __rte_cache_aligned; 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 * 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 ioat->desc_ring[(ioat->next_write - 1) & (ioat->ring_size - 1)].u
.control.completion_update = 1; .control.completion_update = 1;
rte_compiler_barrier(); rte_compiler_barrier();
ioat->regs->dmacount = ioat->next_write; *ioat->doorbell = ioat->next_write;
ioat->started = ioat->enqueued; ioat->started = ioat->enqueued;
} }