net/mlx5: rearrange creation of WQ and CQ object

[dpdk.git] / drivers / net / axgbe / axgbe_ethdev.c

diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index fef8d12..0c25739 100644 (file)
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -143,9 +143,6 @@ static const struct axgbe_xstats axgbe_xstats_strings[] = {
 #define AMD_PCI_AXGBE_DEVICE_V2A 0x1458
 #define AMD_PCI_AXGBE_DEVICE_V2B 0x1459
 
-int axgbe_logtype_init;
-int axgbe_logtype_driver;
-
 static const struct rte_pci_id pci_id_axgbe_map[] = {
        {RTE_PCI_DEVICE(AMD_PCI_VENDOR_ID, AMD_PCI_AXGBE_DEVICE_V2A)},
        {RTE_PCI_DEVICE(AMD_PCI_VENDOR_ID, AMD_PCI_AXGBE_DEVICE_V2B)},
@@ -343,8 +340,8 @@ axgbe_dev_start(struct rte_eth_dev *dev)
        axgbe_dev_enable_tx(dev);
        axgbe_dev_enable_rx(dev);
 
-       axgbe_clear_bit(AXGBE_STOPPED, &pdata->dev_state);
-       axgbe_clear_bit(AXGBE_DOWN, &pdata->dev_state);
+       rte_bit_relaxed_clear32(AXGBE_STOPPED, &pdata->dev_state);
+       rte_bit_relaxed_clear32(AXGBE_DOWN, &pdata->dev_state);
        if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) ||
                                max_pkt_len > pdata->rx_buf_size)
                dev_data->scattered_rx = 1;
@@ -368,17 +365,17 @@ axgbe_dev_stop(struct rte_eth_dev *dev)
 
        rte_intr_disable(&pdata->pci_dev->intr_handle);
 
-       if (axgbe_test_bit(AXGBE_STOPPED, &pdata->dev_state))
+       if (rte_bit_relaxed_get32(AXGBE_STOPPED, &pdata->dev_state))
                return;
 
-       axgbe_set_bit(AXGBE_STOPPED, &pdata->dev_state);
+       rte_bit_relaxed_set32(AXGBE_STOPPED, &pdata->dev_state);
        axgbe_dev_disable_tx(dev);
        axgbe_dev_disable_rx(dev);
 
        pdata->phy_if.phy_stop(pdata);
        pdata->hw_if.exit(pdata);
        memset(&dev->data->dev_link, 0, sizeof(struct rte_eth_link));
-       axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state);
+       rte_bit_relaxed_set32(AXGBE_DOWN, &pdata->dev_state);
 }
 
 /* Clear all resources like TX/RX queues. */
@@ -1644,8 +1641,8 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
 
        pdata = eth_dev->data->dev_private;
        /* initial state */
-       axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state);
-       axgbe_set_bit(AXGBE_STOPPED, &pdata->dev_state);
+       rte_bit_relaxed_set32(AXGBE_DOWN, &pdata->dev_state);
+       rte_bit_relaxed_set32(AXGBE_STOPPED, &pdata->dev_state);
        pdata->eth_dev = eth_dev;
 
        pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
@@ -1842,13 +1839,5 @@ static struct rte_pci_driver rte_axgbe_pmd = {
 RTE_PMD_REGISTER_PCI(net_axgbe, rte_axgbe_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_axgbe, pci_id_axgbe_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_axgbe, "* igb_uio | uio_pci_generic | vfio-pci");
-
-RTE_INIT(axgbe_init_log)
-{
-       axgbe_logtype_init = rte_log_register("pmd.net.axgbe.init");
-       if (axgbe_logtype_init >= 0)
-               rte_log_set_level(axgbe_logtype_init, RTE_LOG_NOTICE);
-       axgbe_logtype_driver = rte_log_register("pmd.net.axgbe.driver");
-       if (axgbe_logtype_driver >= 0)
-               rte_log_set_level(axgbe_logtype_driver, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(axgbe_logtype_init, pmd.net.axgbe.init, NOTICE);
+RTE_LOG_REGISTER(axgbe_logtype_driver, pmd.net.axgbe.driver, NOTICE);