net/virtio: replace SMP barrier with IO barrier

[dpdk.git] / drivers / net / ionic / ionic_lif.c

diff --git a/drivers/net/ionic/ionic_lif.c b/drivers/net/ionic/ionic_lif.c
index c13a2d1..28ae9dc 100644 (file)
--- a/drivers/net/ionic/ionic_lif.c
+++ b/drivers/net/ionic/ionic_lif.c
@@ -77,11 +77,14 @@ void
 ionic_lif_reset(struct ionic_lif *lif)
 {
        struct ionic_dev *idev = &lif->adapter->idev;
+       int err;
 
        IONIC_PRINT_CALL();
 
        ionic_dev_cmd_lif_reset(idev, lif->index);
-       ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
+       err = ionic_dev_cmd_wait_check(idev, IONIC_DEVCMD_TIMEOUT);
+       if (err)
+               IONIC_PRINT(WARNING, "Failed to reset %s", lif->name);
 }
 
 static void
@@ -305,10 +308,11 @@ ionic_dev_add_mac(struct rte_eth_dev *eth_dev,
 }
 
 void
-ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index __rte_unused)
+ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index)
 {
        struct ionic_lif *lif = IONIC_ETH_DEV_TO_LIF(eth_dev);
        struct ionic_adapter *adapter = lif->adapter;
+       struct rte_ether_addr *mac_addr;
 
        IONIC_PRINT_CALL();
 
@@ -319,11 +323,12 @@ ionic_dev_remove_mac(struct rte_eth_dev *eth_dev, uint32_t index __rte_unused)
                return;
        }
 
-       if (!rte_is_valid_assigned_ether_addr(&eth_dev->data->mac_addrs[index]))
+       mac_addr = &eth_dev->data->mac_addrs[index];
+
+       if (!rte_is_valid_assigned_ether_addr(mac_addr))
                return;
 
-       ionic_lif_addr_del(lif, (const uint8_t *)
-               &eth_dev->data->mac_addrs[index]);
+       ionic_lif_addr_del(lif, (const uint8_t *)mac_addr);
 }
 
 int
@@ -536,8 +541,6 @@ ionic_lif_change_mtu(struct ionic_lif *lif, int new_mtu)
        if (err)
                return err;
 
-       lif->mtu = new_mtu;
-
        return 0;
 }
 
@@ -551,7 +554,7 @@ ionic_intr_alloc(struct ionic_lif *lif, struct ionic_intr_info *intr)
        /*
         * Note: interrupt handler is called for index = 0 only
         * (we use interrupts for the notifyq only anyway,
-        * which hash index = 0)
+        * which has index = 0)
         */
 
        for (index = 0; index < adapter->nintrs; index++)
@@ -583,7 +586,7 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type,
                uint32_t desc_size,
                uint32_t cq_desc_size,
                uint32_t sg_desc_size,
-               uint32_t pid, struct ionic_qcq **qcq)
+               struct ionic_qcq **qcq)
 {
        struct ionic_dev *idev = &lif->adapter->idev;
        struct ionic_qcq *new;
@@ -633,7 +636,7 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type,
        new->q.type = type;
 
        err = ionic_q_init(lif, idev, &new->q, index, num_descs,
-               desc_size, sg_desc_size, pid);
+               desc_size, sg_desc_size);
        if (err) {
                IONIC_PRINT(ERR, "Queue initialization failed");
                return err;
@@ -684,8 +687,8 @@ ionic_qcq_alloc(struct ionic_lif *lif, uint8_t type,
                ionic_q_sg_map(&new->q, sg_base, sg_base_pa);
        }
 
-       IONIC_PRINT(DEBUG, "Q-Base-PA = %ju CQ-Base-PA = %ju "
-               "SG-base-PA = %ju",
+       IONIC_PRINT(DEBUG, "Q-Base-PA = %#jx CQ-Base-PA = %#jx "
+               "SG-base-PA = %#jx",
                q_base_pa, cq_base_pa, sg_base_pa);
 
        ionic_q_map(&new->q, q_base, q_base_pa);
@@ -734,7 +737,7 @@ ionic_rx_qcq_alloc(struct ionic_lif *lif, uint32_t index, uint16_t nrxq_descs,
                sizeof(struct ionic_rxq_desc),
                sizeof(struct ionic_rxq_comp),
                sizeof(struct ionic_rxq_sg_desc),
-               lif->kern_pid, &lif->rxqcqs[index]);
+               &lif->rxqcqs[index]);
        if (err)
                return err;
 
@@ -756,7 +759,7 @@ ionic_tx_qcq_alloc(struct ionic_lif *lif, uint32_t index, uint16_t ntxq_descs,
                sizeof(struct ionic_txq_desc),
                sizeof(struct ionic_txq_comp),
                sizeof(struct ionic_txq_sg_desc),
-               lif->kern_pid, &lif->txqcqs[index]);
+               &lif->txqcqs[index]);
        if (err)
                return err;
 
@@ -777,7 +780,7 @@ ionic_admin_qcq_alloc(struct ionic_lif *lif)
                sizeof(struct ionic_admin_cmd),
                sizeof(struct ionic_admin_comp),
                0,
-               lif->kern_pid, &lif->adminqcq);
+               &lif->adminqcq);
        if (err)
                return err;
 
@@ -798,7 +801,7 @@ ionic_notify_qcq_alloc(struct ionic_lif *lif)
                sizeof(struct ionic_notifyq_cmd),
                sizeof(union ionic_notifyq_comp),
                0,
-               lif->kern_pid, &lif->notifyqcq);
+               &lif->notifyqcq);
        if (err)
                return err;
 
@@ -824,15 +827,19 @@ ionic_lif_alloc(struct ionic_lif *lif)
        int dbpage_num;
        int err;
 
-       snprintf(lif->name, sizeof(lif->name), "lif%u", lif->index);
+       /*
+        * lif->name was zeroed on allocation.
+        * Copy (sizeof() - 1) bytes to ensure that it is NULL terminated.
+        */
+       memcpy(lif->name, lif->eth_dev->data->name, sizeof(lif->name) - 1);
+
+       IONIC_PRINT(DEBUG, "LIF: %s", lif->name);
 
        IONIC_PRINT(DEBUG, "Allocating Lif Info");
 
        rte_spinlock_init(&lif->adminq_lock);
        rte_spinlock_init(&lif->adminq_service_lock);
 
-       lif->kern_pid = 0;
-
        dbpage_num = ionic_db_page_num(lif, 0);
 
        lif->kern_dbpage = ionic_bus_map_dbpage(adapter, dbpage_num);
@@ -867,8 +874,6 @@ ionic_lif_alloc(struct ionic_lif *lif)
 
        IONIC_PRINT(DEBUG, "Allocating Admin Queue");
 
-       IONIC_PRINT(DEBUG, "Allocating Admin Queue");
-
        err = ionic_admin_qcq_alloc(lif);
        if (err) {
                IONIC_PRINT(ERR, "Cannot allocate admin queue");
@@ -1211,19 +1216,18 @@ ionic_lif_notifyq_init(struct ionic_lif *lif)
                        .index = q->index,
                        .flags = (IONIC_QINIT_F_IRQ | IONIC_QINIT_F_ENA),
                        .intr_index = qcq->intr.index,
-                       .pid = q->pid,
                        .ring_size = rte_log2_u32(q->num_descs),
                        .ring_base = q->base_pa,
                }
        };
 
-       IONIC_PRINT(DEBUG, "notifyq_init.pid %d", ctx.cmd.q_init.pid);
        IONIC_PRINT(DEBUG, "notifyq_init.index %d",
                ctx.cmd.q_init.index);
        IONIC_PRINT(DEBUG, "notifyq_init.ring_base 0x%" PRIx64 "",
                ctx.cmd.q_init.ring_base);
        IONIC_PRINT(DEBUG, "notifyq_init.ring_size %d",
                ctx.cmd.q_init.ring_size);
+       IONIC_PRINT(DEBUG, "notifyq_init.ver %u", ctx.cmd.q_init.ver);
 
        err = ionic_adminq_post_wait(lif, &ctx);
        if (err)
@@ -1320,7 +1324,6 @@ ionic_lif_txq_init(struct ionic_qcq *qcq)
                        .index = q->index,
                        .flags = IONIC_QINIT_F_SG,
                        .intr_index = cq->bound_intr->index,
-                       .pid = q->pid,
                        .ring_size = rte_log2_u32(q->num_descs),
                        .ring_base = q->base_pa,
                        .cq_ring_base = cq->base_pa,
@@ -1329,12 +1332,12 @@ ionic_lif_txq_init(struct ionic_qcq *qcq)
        };
        int err;
 
-       IONIC_PRINT(DEBUG, "txq_init.pid %d", ctx.cmd.q_init.pid);
        IONIC_PRINT(DEBUG, "txq_init.index %d", ctx.cmd.q_init.index);
        IONIC_PRINT(DEBUG, "txq_init.ring_base 0x%" PRIx64 "",
                ctx.cmd.q_init.ring_base);
        IONIC_PRINT(DEBUG, "txq_init.ring_size %d",
                ctx.cmd.q_init.ring_size);
+       IONIC_PRINT(DEBUG, "txq_init.ver %u", ctx.cmd.q_init.ver);
 
        err = ionic_adminq_post_wait(qcq->lif, &ctx);
        if (err)
@@ -1368,7 +1371,6 @@ ionic_lif_rxq_init(struct ionic_qcq *qcq)
                        .index = q->index,
                        .flags = IONIC_QINIT_F_SG,
                        .intr_index = cq->bound_intr->index,
-                       .pid = q->pid,
                        .ring_size = rte_log2_u32(q->num_descs),
                        .ring_base = q->base_pa,
                        .cq_ring_base = cq->base_pa,
@@ -1377,12 +1379,12 @@ ionic_lif_rxq_init(struct ionic_qcq *qcq)
        };
        int err;
 
-       IONIC_PRINT(DEBUG, "rxq_init.pid %d", ctx.cmd.q_init.pid);
        IONIC_PRINT(DEBUG, "rxq_init.index %d", ctx.cmd.q_init.index);
        IONIC_PRINT(DEBUG, "rxq_init.ring_base 0x%" PRIx64 "",
                ctx.cmd.q_init.ring_base);
        IONIC_PRINT(DEBUG, "rxq_init.ring_size %d",
                ctx.cmd.q_init.ring_size);
+       IONIC_PRINT(DEBUG, "rxq_init.ver %u", ctx.cmd.q_init.ver);
 
        err = ionic_adminq_post_wait(qcq->lif, &ctx);
        if (err)
@@ -1453,8 +1455,8 @@ ionic_lif_set_name(struct ionic_lif *lif)
                },
        };
 
-       snprintf(ctx.cmd.lif_setattr.name, sizeof(ctx.cmd.lif_setattr.name),
-               "%d", lif->port_id);
+       memcpy(ctx.cmd.lif_setattr.name, lif->name,
+               sizeof(ctx.cmd.lif_setattr.name) - 1);
 
        ionic_adminq_post_wait(lif, &ctx);
 }
@@ -1491,6 +1493,7 @@ ionic_lif_init(struct ionic_lif *lif)
                | IONIC_ETH_HW_RX_HASH
                | IONIC_ETH_HW_TX_SG
                | IONIC_ETH_HW_RX_SG
+               | IONIC_ETH_HW_TX_CSUM
                | IONIC_ETH_HW_RX_CSUM
                | IONIC_ETH_HW_TSO
                | IONIC_ETH_HW_TSO_IPV6
@@ -1599,7 +1602,7 @@ ionic_lif_start(struct ionic_lif *lif)
 
        for (i = 0; i < lif->nrxqcqs; i++) {
                struct ionic_qcq *rxq = lif->rxqcqs[i];
-               if (!rxq->deferred_start) {
+               if (!(rxq->flags & IONIC_QCQ_F_DEFERRED)) {
                        err = ionic_dev_rx_queue_start(lif->eth_dev, i);
 
                        if (err)
@@ -1609,7 +1612,7 @@ ionic_lif_start(struct ionic_lif *lif)
 
        for (i = 0; i < lif->ntxqcqs; i++) {
                struct ionic_qcq *txq = lif->txqcqs[i];
-               if (!txq->deferred_start) {
+               if (!(txq->flags & IONIC_QCQ_F_DEFERRED)) {
                        err = ionic_dev_tx_queue_start(lif->eth_dev, i);
 
                        if (err)
@@ -1684,7 +1687,8 @@ ionic_lifs_size(struct ionic_adapter *adapter)
        nintrs = nlifs * 1 /* notifyq */;
 
        if (nintrs > dev_nintrs) {
-               IONIC_PRINT(ERR, "At most %d intr queues supported, minimum required is %u",
+               IONIC_PRINT(ERR,
+                       "At most %d intr supported, minimum req'd is %u",
                        dev_nintrs, nintrs);
                return -ENOSPC;
        }