net/sfc: avoid Rx queue setup failure if thresholds are set

[dpdk.git] / drivers / net / vmxnet3 / vmxnet3_ethdev.h

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h
index 348c840..b48058a 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.h
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h
@@ -101,6 +101,13 @@ struct vmxnet3_hw {
        uint8_t num_rx_queues;
        uint8_t bufs_per_pkt;
 
+       uint8_t version;
+
+       uint16_t txdata_desc_size; /* tx data ring buffer size */
+       uint16_t rxdata_desc_size; /* rx data ring buffer size */
+
+       uint8_t num_intrs;
+
        Vmxnet3_TxQueueDesc   *tqd_start;       /* start address of all tx queue desc */
        Vmxnet3_RxQueueDesc   *rqd_start;       /* start address of all rx queue desc */
 
@@ -114,9 +121,20 @@ struct vmxnet3_hw {
        uint64_t              rss_confPA;
        vmxnet3_mf_table_t    *mf_table;
        uint32_t              shadow_vfta[VMXNET3_VFT_SIZE];
+       Vmxnet3_MemRegs       *memRegs;
+       uint64_t              memRegsPA;
 #define VMXNET3_VFT_TABLE_SIZE     (VMXNET3_VFT_SIZE * sizeof(uint32_t))
+       UPT1_TxStats          saved_tx_stats[VMXNET3_MAX_TX_QUEUES];
+       UPT1_RxStats          saved_rx_stats[VMXNET3_MAX_RX_QUEUES];
 };
 
+#define VMXNET3_REV_3          2               /* Vmxnet3 Rev. 3 */
+#define VMXNET3_REV_2          1               /* Vmxnet3 Rev. 2 */
+#define VMXNET3_REV_1          0               /* Vmxnet3 Rev. 1 */
+
+#define VMXNET3_VERSION_GE_3(hw) ((hw)->version >= VMXNET3_REV_3 + 1)
+#define VMXNET3_VERSION_GE_2(hw) ((hw)->version >= VMXNET3_REV_2 + 1)
+
 #define VMXNET3_GET_ADDR_LO(reg)   ((uint32_t)(reg))
 #define VMXNET3_GET_ADDR_HI(reg)   ((uint32_t)(((uint64_t)(reg)) >> 32))
 
@@ -146,6 +164,20 @@ vmxnet3_read_addr(volatile void *addr)
 #define VMXNET3_WRITE_BAR1_REG(hw, reg, value) \
        VMXNET3_PCI_REG_WRITE(VMXNET3_PCI_BAR1_REG_ADDR((hw), (reg)), (value))
 
+static inline uint8_t
+vmxnet3_get_ring_idx(struct vmxnet3_hw *hw, uint32 rqID)
+{
+       return (rqID >= hw->num_rx_queues &&
+               rqID < 2 * hw->num_rx_queues) ? 1 : 0;
+}
+
+static inline bool
+vmxnet3_rx_data_ring(struct vmxnet3_hw *hw, uint32 rqID)
+{
+       return (rqID >= 2 * hw->num_rx_queues &&
+               rqID < 3 * hw->num_rx_queues);
+}
+
 /*
  * RX/TX function prototypes
  */