git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ethdev: make default behavior CRC strip on Rx
[dpdk.git] / drivers / net / octeontx / octeontx_ethdev.c
diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index 261b17f..71843c6 100644 (file)
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -46,9 +46,7 @@ int otx_net_logtype_mbox;
 int otx_net_logtype_init;
 int otx_net_logtype_driver;
 
-RTE_INIT(otx_net_init_log);
-static void
-otx_net_init_log(void)
+RTE_INIT(otx_net_init_log)
 {
        otx_net_logtype_mbox = rte_log_register("pmd.net.octeontx.mbox");
        if (otx_net_logtype_mbox >= 0)
@@ -262,8 +260,6 @@ octeontx_dev_configure(struct rte_eth_dev *dev)
        struct rte_eth_rxmode *rxmode = &conf->rxmode;
        struct rte_eth_txmode *txmode = &conf->txmode;
        struct octeontx_nic *nic = octeontx_pmd_priv(dev);
-       uint64_t configured_offloads;
-       uint64_t unsupported_offloads;
        int ret;
 
        PMD_INIT_FUNC_TRACE();
@@ -285,38 +281,9 @@ octeontx_dev_configure(struct rte_eth_dev *dev)
                return -EINVAL;
        }
 
-       configured_offloads = rxmode->offloads;
-
-       if (!(configured_offloads & DEV_RX_OFFLOAD_CRC_STRIP)) {
-               PMD_INIT_LOG(NOTICE, "can't disable hw crc strip");
-               configured_offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
-       }
-
-       unsupported_offloads = configured_offloads & ~OCTEONTX_RX_OFFLOADS;
-
-       if (unsupported_offloads) {
-               PMD_INIT_LOG(ERR, "Rx offloads 0x%" PRIx64 " are not supported. "
-                     "Requested 0x%" PRIx64 " supported 0x%" PRIx64 "\n",
-                     unsupported_offloads, configured_offloads,
-                     (uint64_t)OCTEONTX_RX_OFFLOADS);
-               return -ENOTSUP;
-       }
-
-       configured_offloads = txmode->offloads;
-
-       if (!(configured_offloads & DEV_TX_OFFLOAD_MT_LOCKFREE)) {
+       if (!(txmode->offloads & DEV_TX_OFFLOAD_MT_LOCKFREE)) {
                PMD_INIT_LOG(NOTICE, "cant disable lockfree tx");
-               configured_offloads |= DEV_TX_OFFLOAD_MT_LOCKFREE;
-       }
-
-       unsupported_offloads = configured_offloads & ~OCTEONTX_TX_OFFLOADS;
-
-       if (unsupported_offloads) {
-               PMD_INIT_LOG(ERR, "Tx offloads 0x%" PRIx64 " are not supported."
-                     "Requested 0x%" PRIx64 " supported 0x%" PRIx64 ".\n",
-                     unsupported_offloads, configured_offloads,
-                     (uint64_t)OCTEONTX_TX_OFFLOADS);
-               return -ENOTSUP;
+               txmode->offloads |= DEV_TX_OFFLOAD_MT_LOCKFREE;
        }
 
        if (conf->link_speeds & ETH_LINK_SPEED_FIXED) {
@@ -378,6 +345,9 @@ octeontx_dev_close(struct rte_eth_dev *dev)
 
                rte_free(txq);
        }
+
+       dev->tx_pkt_burst = NULL;
+       dev->rx_pkt_burst = NULL;
 }
 
 static int
@@ -471,9 +441,6 @@ octeontx_dev_stop(struct rte_eth_dev *dev)
                             ret);
                return;
        }
-
-       dev->tx_pkt_burst = NULL;
-       dev->rx_pkt_burst = NULL;
 }
 
 static void
@@ -735,14 +702,12 @@ octeontx_dev_tx_queue_release(void *tx_queue)
 static int
 octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
                            uint16_t nb_desc, unsigned int socket_id,
-                           const struct rte_eth_txconf *tx_conf)
+                           const struct rte_eth_txconf *tx_conf __rte_unused)
 {
        struct octeontx_nic *nic = octeontx_pmd_priv(dev);
        struct octeontx_txq *txq = NULL;
        uint16_t dq_num;
        int res = 0;
-       uint64_t configured_offloads;
-       uint64_t unsupported_offloads;
 
        RTE_SET_USED(nb_desc);
        RTE_SET_USED(socket_id);
@@ -763,22 +728,6 @@ octeontx_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
                dev->data->tx_queues[qidx] = NULL;
        }
 
-       configured_offloads = tx_conf->offloads;
-
-       if (!(configured_offloads & DEV_TX_OFFLOAD_MT_LOCKFREE)) {
-               PMD_INIT_LOG(NOTICE, "cant disable lockfree tx");
-               configured_offloads |= DEV_TX_OFFLOAD_MT_LOCKFREE;
-       }
-
-       unsupported_offloads = configured_offloads & ~OCTEONTX_TX_OFFLOADS;
-       if (unsupported_offloads) {
-               PMD_INIT_LOG(ERR, "Tx offloads 0x%" PRIx64 " are not supported."
-                     "Requested 0x%" PRIx64 " supported 0x%" PRIx64 ".\n",
-                     unsupported_offloads, configured_offloads,
-                     (uint64_t)OCTEONTX_TX_OFFLOADS);
-               return -ENOTSUP;
-       }
-
        /* Allocating tx queue data structure */
        txq = rte_zmalloc_socket("ethdev TX queue", sizeof(struct octeontx_txq),
                                 RTE_CACHE_LINE_SIZE, nic->node);
@@ -831,11 +780,9 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
        pki_qos_cfg_t pki_qos;
        uintptr_t pool;
        int ret, port;
-       uint8_t gaura;
+       uint16_t gaura;
        unsigned int ev_queues = (nic->ev_queues * nic->port_id) + qidx;
        unsigned int ev_ports = (nic->ev_ports * nic->port_id) + qidx;
-       uint64_t configured_offloads;
-       uint64_t unsupported_offloads;
 
        RTE_SET_USED(nb_desc);
 
@@ -858,22 +805,6 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
 
        port = nic->port_id;
 
-       configured_offloads = rx_conf->offloads;
-
-       if (!(configured_offloads & DEV_RX_OFFLOAD_CRC_STRIP)) {
-               PMD_INIT_LOG(NOTICE, "can't disable hw crc strip");
-               configured_offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
-       }
-
-       unsupported_offloads = configured_offloads & ~OCTEONTX_RX_OFFLOADS;
-
-       if (unsupported_offloads) {
-               PMD_INIT_LOG(ERR, "Rx offloads 0x%" PRIx64 " are not supported. "
-                     "Requested 0x%" PRIx64 " supported 0x%" PRIx64 "\n",
-                     unsupported_offloads, configured_offloads,
-                     (uint64_t)OCTEONTX_RX_OFFLOADS);
-               return -ENOTSUP;
-       }
        /* Rx deferred start is not supported */
        if (rx_conf->rx_deferred_start) {
                octeontx_log_err("rx deferred start not supported");
@@ -960,8 +891,8 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
 
                pool = (uintptr_t)mb_pool->pool_id;
 
-               /* Get the gpool Id */
-               gaura = octeontx_fpa_bufpool_gpool(pool);
+               /* Get the gaura Id */
+               gaura = octeontx_fpa_bufpool_gaura(pool);
 
                pki_qos.qpg_qos = PKI_QPG_QOS_NONE;
                pki_qos.num_entry = 1;
@@ -1076,8 +1007,11 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
                if (eth_dev == NULL)
                        return -ENODEV;
 
+               eth_dev->dev_ops = &octeontx_dev_ops;
+               eth_dev->device = &dev->device;
                eth_dev->tx_pkt_burst = octeontx_xmit_pkts;
                eth_dev->rx_pkt_burst = octeontx_recv_pkts;
+               rte_eth_dev_probing_finish(eth_dev);
                return 0;
        }
 
@@ -1162,6 +1096,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
        rte_octeontx_pchan_map[(nic->base_ochan >> 8) & 0x7]
                [(nic->base_ochan >> 4) & 0xF] = data->port_id;
 
+       rte_eth_dev_probing_finish(eth_dev);
        return data->port_id;
 
 err:
@@ -1242,6 +1177,8 @@ octeontx_probe(struct rte_vdev_device *dev)
                }
                /* TODO: request info from primary to set up Rx and Tx */
                eth_dev->dev_ops = &octeontx_dev_ops;
+               eth_dev->device = &dev->device;
+               rte_eth_dev_probing_finish(eth_dev);
                return 0;
        }
 
DPDK repo used for reviews