net/mvpp2: fix configured state dependency

[dpdk.git] / drivers / net / mvpp2 / mrvl_ethdev.c

diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
index 0c32037..1802695 100644 (file)
--- a/drivers/net/mvpp2/mrvl_ethdev.c
+++ b/drivers/net/mvpp2/mrvl_ethdev.c
@@ -52,8 +52,6 @@
 #define MRVL_IFACE_NAME_ARG "iface"
 #define MRVL_CFG_ARG "cfg"
 
-#define MRVL_BURST_SIZE 64
-
 #define MRVL_ARP_LENGTH 28
 
 #define MRVL_COOKIE_ADDR_INVALID ~0ULL
@@ -535,12 +533,18 @@ mrvl_dev_configure(struct rte_eth_dev *dev)
            dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_RSS) {
                MRVL_LOG(WARNING, "Disabling hash for 1 rx queue");
                priv->ppio_params.inqs_params.hash_type = PP2_PPIO_HASH_T_NONE;
-
+               priv->configured = 1;
                return 0;
        }
 
-       return mrvl_configure_rss(priv,
+       ret = mrvl_configure_rss(priv,
                        &dev->data->dev_conf.rx_adv_conf.rss_conf);
+       if (ret < 0)
+               return ret;
+
+       priv->configured = 1;
+
+       return 0;
 }
 
 /**
@@ -814,12 +818,15 @@ mrvl_dev_start(struct rte_eth_dev *dev)
        priv->ppio_params.match = match;
        priv->ppio_params.eth_start_hdr = PP2_PPIO_HDR_ETH;
        priv->forward_bad_frames = 0;
+       priv->fill_bpool_buffs = MRVL_BURST_SIZE;
 
        if (mrvl_cfg) {
                priv->ppio_params.eth_start_hdr =
                        mrvl_cfg->port[dev->data->port_id].eth_start_hdr;
                priv->forward_bad_frames =
                        mrvl_cfg->port[dev->data->port_id].forward_bad_frames;
+               priv->fill_bpool_buffs =
+                       mrvl_cfg->port[dev->data->port_id].fill_bpool_buffs;
        }
 
        /*
@@ -905,7 +912,7 @@ mrvl_dev_start(struct rte_eth_dev *dev)
 
        /* For default QoS config, don't start classifier. */
        if (mrvl_cfg  &&
-           mrvl_cfg->port[dev->data->port_id].use_global_defaults == 0) {
+           mrvl_cfg->port[dev->data->port_id].use_qos_global_defaults == 0) {
                ret = mrvl_start_qos_mapping(priv);
                if (ret) {
                        MRVL_LOG(ERR, "Failed to setup QoS mapping");
@@ -2339,32 +2346,18 @@ mrvl_rss_hash_conf_get(struct rte_eth_dev *dev,
  *
  * @param dev
  *   Pointer to the device structure.
- * @param filer_type
- *   Flow filter type.
- * @param filter_op
- *   Flow filter operation.
- * @param arg
+ * @param ops
  *   Pointer to pass the flow ops.
  *
  * @return
  *   0 on success, negative error value otherwise.
  */
 static int
-mrvl_eth_filter_ctrl(struct rte_eth_dev *dev __rte_unused,
-                    enum rte_filter_type filter_type,
-                    enum rte_filter_op filter_op, void *arg)
+mrvl_eth_flow_ops_get(struct rte_eth_dev *dev __rte_unused,
+                     const struct rte_flow_ops **ops)
 {
-       switch (filter_type) {
-       case RTE_ETH_FILTER_GENERIC:
-               if (filter_op != RTE_ETH_FILTER_GET)
-                       return -EINVAL;
-               *(const void **)arg = &mrvl_flow_ops;
-               return 0;
-       default:
-               MRVL_LOG(WARNING, "Filter type (%d) not supported",
-                               filter_type);
-               return -EINVAL;
-       }
+       *ops = &mrvl_flow_ops;
+       return 0;
 }
 
 /**
@@ -2442,7 +2435,7 @@ static const struct eth_dev_ops mrvl_ops = {
        .flow_ctrl_set = mrvl_flow_ctrl_set,
        .rss_hash_update = mrvl_rss_hash_update,
        .rss_hash_conf_get = mrvl_rss_hash_conf_get,
-       .filter_ctrl = mrvl_eth_filter_ctrl,
+       .flow_ops_get = mrvl_eth_flow_ops_get,
        .mtr_ops_get = mrvl_mtr_ops_get,
        .tm_ops_get = mrvl_tm_ops_get,
 };
@@ -2666,7 +2659,7 @@ mrvl_rx_pkt_burst(void *rxq, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
 
                if (unlikely(num <= q->priv->bpool_min_size ||
                             (!rx_done && num < q->priv->bpool_init_size))) {
-                       mrvl_fill_bpool(q, MRVL_BURST_SIZE);
+                       mrvl_fill_bpool(q, q->priv->fill_bpool_buffs);
                } else if (unlikely(num > q->priv->bpool_max_size)) {
                        int i;
                        int pkt_to_remove = num - q->priv->bpool_init_size;
@@ -3322,4 +3315,4 @@ static struct rte_vdev_driver pmd_mrvl_drv = {
 
 RTE_PMD_REGISTER_VDEV(net_mvpp2, pmd_mrvl_drv);
 RTE_PMD_REGISTER_ALIAS(net_mvpp2, eth_mvpp2);
-RTE_LOG_REGISTER(mrvl_logtype, pmd.net.mvpp2, NOTICE);
+RTE_LOG_REGISTER_DEFAULT(mrvl_logtype, NOTICE);