git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ring: move code in a new header file
[dpdk.git]
/
drivers
/
net
/
nfp
/
nfp_net_pmd.h
diff --git
a/drivers/net/nfp/nfp_net_pmd.h
b/drivers/net/nfp/nfp_net_pmd.h
index
dc70d57
..
1ae0ea6
100644
(file)
--- a/
drivers/net/nfp/nfp_net_pmd.h
+++ b/
drivers/net/nfp/nfp_net_pmd.h
@@
-42,6
+42,7
@@
#define NFP_NET_PMD_VERSION "0.1"
#define PCI_VENDOR_ID_NETRONOME 0x19ee
#define NFP_NET_PMD_VERSION "0.1"
#define PCI_VENDOR_ID_NETRONOME 0x19ee
+#define PCI_DEVICE_ID_NFP4000_PF_NIC 0x4000
#define PCI_DEVICE_ID_NFP6000_PF_NIC 0x6000
#define PCI_DEVICE_ID_NFP6000_VF_NIC 0x6003
#define PCI_DEVICE_ID_NFP6000_PF_NIC 0x6000
#define PCI_DEVICE_ID_NFP6000_VF_NIC 0x6003
@@
-121,25
+122,31
@@
struct nfp_net_adapter;
#define NFD_CFG_MINOR_VERSION_of(x) (((x) >> 0) & 0xff)
#include <linux/types.h>
#define NFD_CFG_MINOR_VERSION_of(x) (((x) >> 0) & 0xff)
#include <linux/types.h>
+#include <rte_io.h>
static inline uint8_t nn_readb(volatile const void *addr)
{
static inline uint8_t nn_readb(volatile const void *addr)
{
- return
*((volatile const uint8_t *)(addr)
);
+ return
rte_read8(addr
);
}
static inline void nn_writeb(uint8_t val, volatile void *addr)
{
}
static inline void nn_writeb(uint8_t val, volatile void *addr)
{
-
*((volatile uint8_t *)(addr)) = val
;
+
rte_write8(val, addr)
;
}
static inline uint32_t nn_readl(volatile const void *addr)
{
}
static inline uint32_t nn_readl(volatile const void *addr)
{
- return
*((volatile const uint32_t *)(addr)
);
+ return
rte_read32(addr
);
}
static inline void nn_writel(uint32_t val, volatile void *addr)
{
}
static inline void nn_writel(uint32_t val, volatile void *addr)
{
- *((volatile uint32_t *)(addr)) = val;
+ rte_write32(val, addr);
+}
+
+static inline void nn_writew(uint16_t val, volatile void *addr)
+{
+ rte_write16(val, addr);
}
static inline uint64_t nn_readq(volatile void *addr)
}
static inline uint64_t nn_readq(volatile void *addr)
@@
-216,12
+223,10
@@
struct nfp_net_txq {
uint32_t wr_p;
uint32_t rd_p;
uint32_t wr_p;
uint32_t rd_p;
- uint32_t qcp_rd_p;
uint32_t tx_count;
uint32_t tx_free_thresh;
uint32_t tx_count;
uint32_t tx_free_thresh;
- uint32_t tail;
/*
* For each descriptor keep a reference to the mbuff and
/*
* For each descriptor keep a reference to the mbuff and
@@
-240,7
+245,7
@@
struct nfp_net_txq {
struct nfp_net_tx_desc *txds;
/*
struct nfp_net_tx_desc *txds;
/*
- * At this point
56
bytes have been used for all the fields in the
+ * At this point
48
bytes have been used for all the fields in the
* TX critical path. We have room for 8 bytes and still all placed
* in a cache line. We are not using the threshold values below nor
* the txq_flags but if we need to, we can add the most used in the
* TX critical path. We have room for 8 bytes and still all placed
* in a cache line. We are not using the threshold values below nor
* the txq_flags but if we need to, we can add the most used in the
@@
-251,7
+256,7
@@
struct nfp_net_txq {
uint32_t tx_hthresh; /* not used by now. Future? */
uint32_t tx_wthresh; /* not used by now. Future? */
uint32_t txq_flags; /* not used by now. Future? */
uint32_t tx_hthresh; /* not used by now. Future? */
uint32_t tx_wthresh; /* not used by now. Future? */
uint32_t txq_flags; /* not used by now. Future? */
- uint
8_t
port_id;
+ uint
16_t
port_id;
int qidx;
int tx_qcidx;
__le64 dma;
int qidx;
int tx_qcidx;
__le64 dma;
@@
-326,7
+331,6
@@
struct nfp_net_rxq {
* freelist descriptors and @rd_p is where the driver start
* reading descriptors for newly arrive packets from.
*/
* freelist descriptors and @rd_p is where the driver start
* reading descriptors for newly arrive packets from.
*/
- uint32_t wr_p;
uint32_t rd_p;
/*
uint32_t rd_p;
/*
@@
-433,6
+437,13
@@
struct nfp_net_hw {
struct nfp_cpp_area *rx_area;
struct nfp_cpp_area *msix_area;
#endif
struct nfp_cpp_area *rx_area;
struct nfp_cpp_area *msix_area;
#endif
+ uint8_t *hw_queues;
+ uint8_t is_pf;
+ uint8_t pf_port_idx;
+ uint8_t pf_multiport_enabled;
+ union eth_table_entry *eth_table;
+ nspu_desc_t *nspu_desc;
+ nfpu_desc_t *nfpu_desc;
};
struct nfp_net_adapter {
};
struct nfp_net_adapter {