net/mlx5: share Rx queue indirection table code

[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 1918696..653ab9b 100644 (file)
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -47,24 +47,9 @@ enum octeontx_link_speed {
        OCTEONTX_LINK_SPEED_RESERVE2
 };
 
-int otx_net_logtype_mbox;
-int otx_net_logtype_init;
-int otx_net_logtype_driver;
-
-RTE_INIT(otx_net_init_log)
-{
-       otx_net_logtype_mbox = rte_log_register("pmd.net.octeontx.mbox");
-       if (otx_net_logtype_mbox >= 0)
-               rte_log_set_level(otx_net_logtype_mbox, RTE_LOG_NOTICE);
-
-       otx_net_logtype_init = rte_log_register("pmd.net.octeontx.init");
-       if (otx_net_logtype_init >= 0)
-               rte_log_set_level(otx_net_logtype_init, RTE_LOG_NOTICE);
-
-       otx_net_logtype_driver = rte_log_register("pmd.net.octeontx.driver");
-       if (otx_net_logtype_driver >= 0)
-               rte_log_set_level(otx_net_logtype_driver, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(otx_net_logtype_mbox, pmd.net.octeontx.mbox, NOTICE);
+RTE_LOG_REGISTER(otx_net_logtype_init, pmd.net.octeontx.init, NOTICE);
+RTE_LOG_REGISTER(otx_net_logtype_driver, pmd.net.octeontx.driver, NOTICE);
 
 /* Parse integer from integer argument */
 static int
@@ -370,6 +355,16 @@ octeontx_tx_offload_flags(struct rte_eth_dev *eth_dev)
        struct octeontx_nic *nic = octeontx_pmd_priv(eth_dev);
        uint16_t flags = 0;
 
+       if (nic->tx_offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM ||
+           nic->tx_offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM)
+               flags |= OCCTX_TX_OFFLOAD_OL3_OL4_CSUM_F;
+
+       if (nic->tx_offloads & DEV_TX_OFFLOAD_IPV4_CKSUM ||
+           nic->tx_offloads & DEV_TX_OFFLOAD_TCP_CKSUM ||
+           nic->tx_offloads & DEV_TX_OFFLOAD_UDP_CKSUM ||
+           nic->tx_offloads & DEV_TX_OFFLOAD_SCTP_CKSUM)
+               flags |= OCCTX_TX_OFFLOAD_L3_L4_CSUM_F;
+
        if (!(nic->tx_offloads & DEV_TX_OFFLOAD_MBUF_FAST_FREE))
                flags |= OCCTX_TX_OFFLOAD_MBUF_NOFF_F;
 
@@ -383,13 +378,15 @@ static uint16_t
 octeontx_rx_offload_flags(struct rte_eth_dev *eth_dev)
 {
        struct octeontx_nic *nic = octeontx_pmd_priv(eth_dev);
-       struct rte_eth_dev_data *data = eth_dev->data;
-       struct rte_eth_conf *conf = &data->dev_conf;
-       struct rte_eth_rxmode *rxmode = &conf->rxmode;
        uint16_t flags = 0;
 
-       if (rxmode->mq_mode == ETH_MQ_RX_RSS)
-               flags |= OCCTX_RX_OFFLOAD_RSS_F;
+       if (nic->rx_offloads & (DEV_RX_OFFLOAD_TCP_CKSUM |
+                        DEV_RX_OFFLOAD_UDP_CKSUM))
+               flags |= OCCTX_RX_OFFLOAD_CSUM_F;
+
+       if (nic->rx_offloads & (DEV_RX_OFFLOAD_IPV4_CKSUM |
+                               DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM))
+               flags |= OCCTX_RX_OFFLOAD_CSUM_F;
 
        if (nic->rx_offloads & DEV_RX_OFFLOAD_SCATTER) {
                flags |= OCCTX_RX_MULTI_SEG_F;
@@ -1366,7 +1363,6 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
 
        eth_dev->device = &dev->device;
        eth_dev->intr_handle = NULL;
-       eth_dev->data->kdrv = RTE_KDRV_NONE;
        eth_dev->data->numa_node = dev->device.numa_node;
 
        data->port_id = eth_dev->data->port_id;
@@ -1442,6 +1438,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,
 
 free_mac_addrs:
        rte_free(data->mac_addrs);
+       data->mac_addrs = NULL;
 err:
        if (nic)
                octeontx_port_close(nic);