net/bnxt: fix ring and context memory allocation

[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 1579d79..74ade93 100644 (file)
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -580,13 +580,14 @@ static int bnxt_register_fc_ctx_mem(struct bnxt *bp)
        return rc;
 }
 
-static int bnxt_alloc_ctx_mem_buf(char *type, size_t size,
+static int bnxt_alloc_ctx_mem_buf(struct bnxt *bp, char *type, size_t size,
                                  struct bnxt_ctx_mem_buf_info *ctx)
 {
        if (!ctx)
                return -EINVAL;
 
-       ctx->va = rte_zmalloc(type, size, 0);
+       ctx->va = rte_zmalloc_socket(type, size, 0,
+                                    bp->eth_dev->device->numa_node);
        if (ctx->va == NULL)
                return -ENOMEM;
        rte_mem_lock_page(ctx->va);
@@ -610,7 +611,7 @@ static int bnxt_init_fc_ctx_mem(struct bnxt *bp)
        sprintf(type, "bnxt_rx_fc_in_" PCI_PRI_FMT, pdev->addr.domain,
                pdev->addr.bus, pdev->addr.devid, pdev->addr.function);
        /* 4 bytes for each counter-id */
-       rc = bnxt_alloc_ctx_mem_buf(type,
+       rc = bnxt_alloc_ctx_mem_buf(bp, type,
                                    max_fc * 4,
                                    &bp->flow_stat->rx_fc_in_tbl);
        if (rc)
@@ -619,7 +620,7 @@ static int bnxt_init_fc_ctx_mem(struct bnxt *bp)
        sprintf(type, "bnxt_rx_fc_out_" PCI_PRI_FMT, pdev->addr.domain,
                pdev->addr.bus, pdev->addr.devid, pdev->addr.function);
        /* 16 bytes for each counter - 8 bytes pkt_count, 8 bytes byte_count */
-       rc = bnxt_alloc_ctx_mem_buf(type,
+       rc = bnxt_alloc_ctx_mem_buf(bp, type,
                                    max_fc * 16,
                                    &bp->flow_stat->rx_fc_out_tbl);
        if (rc)
@@ -628,7 +629,7 @@ static int bnxt_init_fc_ctx_mem(struct bnxt *bp)
        sprintf(type, "bnxt_tx_fc_in_" PCI_PRI_FMT, pdev->addr.domain,
                pdev->addr.bus, pdev->addr.devid, pdev->addr.function);
        /* 4 bytes for each counter-id */
-       rc = bnxt_alloc_ctx_mem_buf(type,
+       rc = bnxt_alloc_ctx_mem_buf(bp, type,
                                    max_fc * 4,
                                    &bp->flow_stat->tx_fc_in_tbl);
        if (rc)
@@ -637,7 +638,7 @@ static int bnxt_init_fc_ctx_mem(struct bnxt *bp)
        sprintf(type, "bnxt_tx_fc_out_" PCI_PRI_FMT, pdev->addr.domain,
                pdev->addr.bus, pdev->addr.devid, pdev->addr.function);
        /* 16 bytes for each counter - 8 bytes pkt_count, 8 bytes byte_count */
-       rc = bnxt_alloc_ctx_mem_buf(type,
+       rc = bnxt_alloc_ctx_mem_buf(bp, type,
                                    max_fc * 16,
                                    &bp->flow_stat->tx_fc_out_tbl);
        if (rc)
@@ -966,7 +967,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev,
        dev_info->max_rx_queues = max_rx_rings;
        dev_info->max_tx_queues = max_rx_rings;
        dev_info->reta_size = bnxt_rss_hash_tbl_size(bp);
-       dev_info->hash_key_size = 40;
+       dev_info->hash_key_size = HW_HASH_KEY_SIZE;
        max_vnics = bp->max_vnics;
 
        /* MTU specifics */
@@ -2071,7 +2072,6 @@ static int bnxt_reta_query_op(struct rte_eth_dev *eth_dev,
        if (rc)
                return rc;
 
-       /* Retrieve from the default VNIC */
        if (!vnic)
                return -EINVAL;
        if (!vnic->rss_table)
@@ -2153,7 +2153,8 @@ static int bnxt_rss_hash_update_op(struct rte_eth_dev *eth_dev,
 
        if (rss_conf->rss_key_len != HW_HASH_KEY_SIZE) {
                PMD_DRV_LOG(ERR,
-                           "Invalid hashkey length, should be 16 bytes\n");
+                           "Invalid hashkey length, should be %d bytes\n",
+                           HW_HASH_KEY_SIZE);
                return -EINVAL;
        }
        memcpy(vnic->rss_hash_key, rss_conf->rss_key, rss_conf->rss_key_len);
@@ -4347,6 +4348,10 @@ err_start:
 err:
        bp->flags |= BNXT_FLAG_FATAL_ERROR;
        bnxt_uninit_resources(bp, false);
+       if (bp->eth_dev->data->dev_conf.intr_conf.rmv)
+               rte_eth_dev_callback_process(bp->eth_dev,
+                                            RTE_ETH_EVENT_INTR_RMV,
+                                            NULL);
        pthread_mutex_unlock(&bp->err_recovery_lock);
        PMD_DRV_LOG(ERR, "Failed to recover from FW reset\n");
 }
@@ -4663,7 +4668,7 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
                if (!mz) {
                        mz = rte_memzone_reserve_aligned(mz_name,
                                                rmem->nr_pages * 8,
-                                               SOCKET_ID_ANY,
+                                               bp->eth_dev->device->numa_node,
                                                RTE_MEMZONE_2MB |
                                                RTE_MEMZONE_SIZE_HINT_ONLY |
                                                RTE_MEMZONE_IOVA_CONTIG,
@@ -4686,7 +4691,7 @@ static int bnxt_alloc_ctx_mem_blk(struct bnxt *bp,
        if (!mz) {
                mz = rte_memzone_reserve_aligned(mz_name,
                                                 mem_size,
-                                                SOCKET_ID_ANY,
+                                                bp->eth_dev->device->numa_node,
                                                 RTE_MEMZONE_1GB |
                                                 RTE_MEMZONE_SIZE_HINT_ONLY |
                                                 RTE_MEMZONE_IOVA_CONTIG,
@@ -6501,6 +6506,7 @@ static int bnxt_pci_remove(struct rte_pci_device *pci_dev)
 static struct rte_pci_driver bnxt_rte_pmd = {
        .id_table = bnxt_pci_id_map,
        .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
+                       RTE_PCI_DRV_INTR_RMV |
                        RTE_PCI_DRV_PROBE_AGAIN, /* Needed in case of VF-REPs
                                                  * and OVS-DPDK
                                                  */