net/vmxnet3: allow variable length Tx data ring

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

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 09f2085..05b0864 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -224,6 +224,24 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw)
                VMXNET3_WRITE_BAR0_REG(hw, VMXNET3_REG_IMR + i * 8, 1);
 }
 
+/*
+ * Gets tx data ring descriptor size.
+ */
+static uint16_t
+eth_vmxnet3_txdata_get(struct vmxnet3_hw *hw)
+{
+       uint16 txdata_desc_size;
+
+       VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD,
+                              VMXNET3_CMD_GET_TXDATA_DESC_SIZE);
+       txdata_desc_size = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_CMD);
+
+       return (txdata_desc_size < VMXNET3_TXDATA_DESC_MIN_SIZE ||
+               txdata_desc_size > VMXNET3_TXDATA_DESC_MAX_SIZE ||
+               txdata_desc_size & VMXNET3_TXDATA_DESC_SIZE_MASK) ?
+               sizeof(struct Vmxnet3_TxDataDesc) : txdata_desc_size;
+}
+
 /*
  * It returns 0 on success.
  */
@@ -320,6 +338,9 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
        /* allow untagged pkts */
        VMXNET3_SET_VFTABLE_ENTRY(hw->shadow_vfta, 0);
 
+       hw->txdata_desc_size = VMXNET3_VERSION_GE_3(hw) ?
+               eth_vmxnet3_txdata_get(hw) : sizeof(struct Vmxnet3_TxDataDesc);
+
        return 0;
 }
 
@@ -511,6 +532,7 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev)
                tqd->conf.txRingSize   = txq->cmd_ring.size;
                tqd->conf.compRingSize = txq->comp_ring.size;
                tqd->conf.dataRingSize = txq->data_ring.size;
+               tqd->conf.txDataRingDescSize = txq->txdata_desc_size;
                tqd->conf.intrIdx      = txq->comp_ring.intr_idx;
                tqd->status.stopped    = TRUE;
                tqd->status.error      = 0;