net/nfp: fix multi-process PF probing

[dpdk.git] / drivers / net / ena / base / ena_com.c

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 9dc9f28..5ca36ab 100644 (file)
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -1382,7 +1382,7 @@ int ena_com_execute_admin_command(struct ena_com_admin_queue *admin_queue,
                                    "Failed to submit command [%ld]\n",
                                    PTR_ERR(comp_ctx));
 
-               return PTR_ERR(comp_ctx);
+               return (int)PTR_ERR(comp_ctx);
        }
 
        ret = ena_com_wait_and_process_admin_cq(comp_ctx, admin_queue);
@@ -1602,7 +1602,7 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)
 int ena_com_get_dma_width(struct ena_com_dev *ena_dev)
 {
        u32 caps = ena_com_reg_bar_read32(ena_dev, ENA_REGS_CAPS_OFF);
-       int width;
+       u32 width;
 
        if (unlikely(caps == ENA_MMIO_READ_TIMEOUT)) {
                ena_trc_err(ena_dev, "Reg read timeout occurred\n");
@@ -1671,6 +1671,22 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev)
        return 0;
 }
 
+static void
+ena_com_free_ena_admin_queue_comp_ctx(struct ena_com_dev *ena_dev,
+                                     struct ena_com_admin_queue *admin_queue)
+
+{
+       if (!admin_queue->comp_ctx)
+               return;
+
+       ENA_WAIT_EVENTS_DESTROY(admin_queue);
+       ENA_MEM_FREE(ena_dev->dmadev,
+                    admin_queue->comp_ctx,
+                    (admin_queue->q_depth * sizeof(struct ena_comp_ctx)));
+
+       admin_queue->comp_ctx = NULL;
+}
+
 void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
 {
        struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue;
@@ -1679,14 +1695,8 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
        struct ena_com_aenq *aenq = &ena_dev->aenq;
        u16 size;
 
-       if (admin_queue->comp_ctx) {
-               ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
-               ENA_MEM_FREE(ena_dev->dmadev,
-                            admin_queue->comp_ctx,
-                            (admin_queue->q_depth * sizeof(struct ena_comp_ctx)));
-       }
+       ena_com_free_ena_admin_queue_comp_ctx(ena_dev, admin_queue);
 
-       admin_queue->comp_ctx = NULL;
        size = ADMIN_SQ_SIZE(admin_queue->q_depth);
        if (sq->entries)
                ENA_MEM_FREE_COHERENT(ena_dev->dmadev, size, sq->entries,
@@ -2044,17 +2054,6 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,
        else
                return rc;
 
-       rc = ena_com_get_feature(ena_dev, &get_resp,
-                                ENA_ADMIN_RSS_INDIRECTION_TABLE_CONFIG, 0);
-       if (!rc)
-               memcpy(&get_feat_ctx->ind_table, &get_resp.u.ind_table,
-                      sizeof(get_resp.u.ind_table));
-       else if (rc == ENA_COM_UNSUPPORTED)
-               memset(&get_feat_ctx->ind_table, 0x0,
-                      sizeof(get_feat_ctx->ind_table));
-       else
-               return rc;
-
        return 0;
 }
 
@@ -2280,7 +2279,7 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu)
        cmd.aq_common_descriptor.opcode = ENA_ADMIN_SET_FEATURE;
        cmd.aq_common_descriptor.flags = 0;
        cmd.feat_common.feature_id = ENA_ADMIN_MTU;
-       cmd.u.mtu.mtu = mtu;
+       cmd.u.mtu.mtu = (u32)mtu;
 
        ret = ena_com_execute_admin_command(admin_queue,
                                            (struct ena_admin_aq_entry *)&cmd,
@@ -2691,7 +2690,7 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)
                return ret;
        }
 
-       cmd.control_buffer.length = (1ULL << rss->tbl_log_size) *
+       cmd.control_buffer.length = (u32)(1ULL << rss->tbl_log_size) *
                sizeof(struct ena_admin_rss_ind_table_entry);
 
        ret = ena_com_execute_admin_command(admin_queue,
@@ -2713,7 +2712,7 @@ int ena_com_indirect_table_get(struct ena_com_dev *ena_dev, u32 *ind_tbl)
        u32 tbl_size;
        int i, rc;
 
-       tbl_size = (1ULL << rss->tbl_log_size) *
+       tbl_size = (u32)(1ULL << rss->tbl_log_size) *
                sizeof(struct ena_admin_rss_ind_table_entry);
 
        rc = ena_com_get_feature_ex(ena_dev, &get_resp,