net/ixgbe: check driver type in MACsec API
[dpdk.git] / drivers / net / ena / base / ena_com.c
index 39356d2..6257c53 100644 (file)
@@ -1,35 +1,7 @@
-/*-
-* BSD LICENSE
-*
-* Copyright (c) 2015-2016 Amazon.com, Inc. or its affiliates.
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-*
-* * Redistributions of source code must retain the above copyright
-* notice, this list of conditions and the following disclaimer.
-* * Redistributions in binary form must reproduce the above copyright
-* notice, this list of conditions and the following disclaimer in
-* the documentation and/or other materials provided with the
-* distribution.
-* * Neither the name of copyright holder nor the names of its
-* contributors may be used to endorse or promote products derived
-* from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2020 Amazon.com, Inc. or its affiliates.
+ * All rights reserved.
+ */
 
 #include "ena_com.h"
 
 /*****************************************************************************/
 
 /* Timeout in micro-sec */
-#define ADMIN_CMD_TIMEOUT_US (1000000)
+#define ADMIN_CMD_TIMEOUT_US (3000000)
 
-#define ENA_ASYNC_QUEUE_DEPTH 4
+#define ENA_ASYNC_QUEUE_DEPTH 16
 #define ENA_ADMIN_QUEUE_DEPTH 32
 
-#define MIN_ENA_VER (((ENA_COMMON_SPEC_VERSION_MAJOR) << \
-               ENA_REGS_VERSION_MAJOR_VERSION_SHIFT) \
-               | (ENA_COMMON_SPEC_VERSION_MINOR))
-
 #define ENA_CTRL_MAJOR         0
 #define ENA_CTRL_MINOR         0
 #define ENA_CTRL_SUB_MINOR     1
 
 #define ENA_MMIO_READ_TIMEOUT 0xFFFFFFFF
 
-static int ena_alloc_cnt;
+#define ENA_COM_BOUNCE_BUFFER_CNTRL_CNT        4
+
+#define ENA_REGS_ADMIN_INTR_MASK 1
+
+#define ENA_POLL_MS    5
 
 /*****************************************************************************/
 /*****************************************************************************/
@@ -86,7 +58,12 @@ struct ena_comp_ctx {
        bool occupied;
 };
 
-static inline int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
+struct ena_com_stats_ctx {
+       struct ena_admin_aq_get_stats_cmd get_cmd;
+       struct ena_admin_acq_get_stats_resp get_resp;
+};
+
+static int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
                                       struct ena_common_mem_addr *ena_addr,
                                       dma_addr_t addr)
 {
@@ -95,50 +72,49 @@ static inline int ena_com_mem_addr_set(struct ena_com_dev *ena_dev,
                return ENA_COM_INVAL;
        }
 
-       ena_addr->mem_addr_low = (u32)addr;
-       ena_addr->mem_addr_high =
-               ((addr & GENMASK_ULL(ena_dev->dma_addr_bits - 1, 32)) >> 32);
+       ena_addr->mem_addr_low = lower_32_bits(addr);
+       ena_addr->mem_addr_high = (u16)upper_32_bits(addr);
 
        return 0;
 }
 
 static int ena_com_admin_init_sq(struct ena_com_admin_queue *queue)
 {
-       ENA_MEM_ALLOC_COHERENT(queue->q_dmadev,
-                              ADMIN_SQ_SIZE(queue->q_depth),
-                              queue->sq.entries,
-                              queue->sq.dma_addr,
-                              queue->sq.mem_handle);
+       struct ena_com_admin_sq *sq = &queue->sq;
+       u16 size = ADMIN_SQ_SIZE(queue->q_depth);
+
+       ENA_MEM_ALLOC_COHERENT(queue->q_dmadev, size, sq->entries, sq->dma_addr,
+                              sq->mem_handle);
 
-       if (!queue->sq.entries) {
-               ena_trc_err("memory allocation failed");
+       if (!sq->entries) {
+               ena_trc_err("memory allocation failed\n");
                return ENA_COM_NO_MEM;
        }
 
-       queue->sq.head = 0;
-       queue->sq.tail = 0;
-       queue->sq.phase = 1;
+       sq->head = 0;
+       sq->tail = 0;
+       sq->phase = 1;
 
-       queue->sq.db_addr = NULL;
+       sq->db_addr = NULL;
 
        return 0;
 }
 
 static int ena_com_admin_init_cq(struct ena_com_admin_queue *queue)
 {
-       ENA_MEM_ALLOC_COHERENT(queue->q_dmadev,
-                              ADMIN_CQ_SIZE(queue->q_depth),
-                              queue->cq.entries,
-                              queue->cq.dma_addr,
-                              queue->cq.mem_handle);
+       struct ena_com_admin_cq *cq = &queue->cq;
+       u16 size = ADMIN_CQ_SIZE(queue->q_depth);
 
-       if (!queue->cq.entries)  {
-               ena_trc_err("memory allocation failed");
+       ENA_MEM_ALLOC_COHERENT(queue->q_dmadev, size, cq->entries, cq->dma_addr,
+                              cq->mem_handle);
+
+       if (!cq->entries)  {
+               ena_trc_err("memory allocation failed\n");
                return ENA_COM_NO_MEM;
        }
 
-       queue->cq.head = 0;
-       queue->cq.phase = 1;
+       cq->head = 0;
+       cq->phase = 1;
 
        return 0;
 }
@@ -146,49 +122,49 @@ static int ena_com_admin_init_cq(struct ena_com_admin_queue *queue)
 static int ena_com_admin_init_aenq(struct ena_com_dev *dev,
                                   struct ena_aenq_handlers *aenq_handlers)
 {
+       struct ena_com_aenq *aenq = &dev->aenq;
        u32 addr_low, addr_high, aenq_caps;
+       u16 size;
 
        dev->aenq.q_depth = ENA_ASYNC_QUEUE_DEPTH;
-       ENA_MEM_ALLOC_COHERENT(dev->dmadev,
-                              ADMIN_AENQ_SIZE(dev->aenq.q_depth),
-                              dev->aenq.entries,
-                              dev->aenq.dma_addr,
-                              dev->aenq.mem_handle);
-
-       if (!dev->aenq.entries) {
-               ena_trc_err("memory allocation failed");
+       size = ADMIN_AENQ_SIZE(ENA_ASYNC_QUEUE_DEPTH);
+       ENA_MEM_ALLOC_COHERENT(dev->dmadev, size,
+                       aenq->entries,
+                       aenq->dma_addr,
+                       aenq->mem_handle);
+
+       if (!aenq->entries) {
+               ena_trc_err("memory allocation failed\n");
                return ENA_COM_NO_MEM;
        }
 
-       dev->aenq.head = dev->aenq.q_depth;
-       dev->aenq.phase = 1;
+       aenq->head = aenq->q_depth;
+       aenq->phase = 1;
 
-       addr_low = ENA_DMA_ADDR_TO_UINT32_LOW(dev->aenq.dma_addr);
-       addr_high = ENA_DMA_ADDR_TO_UINT32_HIGH(dev->aenq.dma_addr);
+       addr_low = ENA_DMA_ADDR_TO_UINT32_LOW(aenq->dma_addr);
+       addr_high = ENA_DMA_ADDR_TO_UINT32_HIGH(aenq->dma_addr);
 
-       ENA_REG_WRITE32(addr_low, (unsigned char *)dev->reg_bar
-                       + ENA_REGS_AENQ_BASE_LO_OFF);
-       ENA_REG_WRITE32(addr_high, (unsigned char *)dev->reg_bar
-                       + ENA_REGS_AENQ_BASE_HI_OFF);
+       ENA_REG_WRITE32(dev->bus, addr_low, dev->reg_bar + ENA_REGS_AENQ_BASE_LO_OFF);
+       ENA_REG_WRITE32(dev->bus, addr_high, dev->reg_bar + ENA_REGS_AENQ_BASE_HI_OFF);
 
        aenq_caps = 0;
        aenq_caps |= dev->aenq.q_depth & ENA_REGS_AENQ_CAPS_AENQ_DEPTH_MASK;
        aenq_caps |= (sizeof(struct ena_admin_aenq_entry) <<
                ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_SHIFT) &
                ENA_REGS_AENQ_CAPS_AENQ_ENTRY_SIZE_MASK;
+       ENA_REG_WRITE32(dev->bus, aenq_caps, dev->reg_bar + ENA_REGS_AENQ_CAPS_OFF);
 
-       ENA_REG_WRITE32(aenq_caps, (unsigned char *)dev->reg_bar
-                       + ENA_REGS_AENQ_CAPS_OFF);
-
-       if (unlikely(!aenq_handlers))
+       if (unlikely(!aenq_handlers)) {
                ena_trc_err("aenq handlers pointer is NULL\n");
+               return ENA_COM_INVAL;
+       }
 
-       dev->aenq.aenq_handlers = aenq_handlers;
+       aenq->aenq_handlers = aenq_handlers;
 
        return 0;
 }
 
-static inline void comp_ctxt_release(struct ena_com_admin_queue *queue,
+static void comp_ctxt_release(struct ena_com_admin_queue *queue,
                                     struct ena_comp_ctx *comp_ctx)
 {
        comp_ctx->occupied = false;
@@ -204,6 +180,11 @@ static struct ena_comp_ctx *get_comp_ctxt(struct ena_com_admin_queue *queue,
                return NULL;
        }
 
+       if (unlikely(!queue->comp_ctx)) {
+               ena_trc_err("Completion context is NULL\n");
+               return NULL;
+       }
+
        if (unlikely(queue->comp_ctx[command_id].occupied && capture)) {
                ena_trc_err("Completion context is occupied\n");
                return NULL;
@@ -217,12 +198,11 @@ static struct ena_comp_ctx *get_comp_ctxt(struct ena_com_admin_queue *queue,
        return &queue->comp_ctx[command_id];
 }
 
-static struct ena_comp_ctx *
-__ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
-                          struct ena_admin_aq_entry *cmd,
-                          size_t cmd_size_in_bytes,
-                          struct ena_admin_acq_entry *comp,
-                          size_t comp_size_in_bytes)
+static struct ena_comp_ctx *__ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
+                                                      struct ena_admin_aq_entry *cmd,
+                                                      size_t cmd_size_in_bytes,
+                                                      struct ena_admin_acq_entry *comp,
+                                                      size_t comp_size_in_bytes)
 {
        struct ena_comp_ctx *comp_ctx;
        u16 tail_masked, cmd_id;
@@ -234,12 +214,9 @@ __ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
        tail_masked = admin_queue->sq.tail & queue_size_mask;
 
        /* In case of queue FULL */
-       cnt = admin_queue->sq.tail - admin_queue->sq.head;
+       cnt = (u16)ATOMIC32_READ(&admin_queue->outstanding_cmds);
        if (cnt >= admin_queue->q_depth) {
-               ena_trc_dbg("admin queue is FULL (tail %d head %d depth: %d)\n",
-                           admin_queue->sq.tail,
-                           admin_queue->sq.head,
-                           admin_queue->q_depth);
+               ena_trc_dbg("admin queue is full.\n");
                admin_queue->stats.out_of_space++;
                return ERR_PTR(ENA_COM_NO_SPACE);
        }
@@ -253,6 +230,8 @@ __ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
                ENA_ADMIN_AQ_COMMON_DESC_COMMAND_ID_MASK;
 
        comp_ctx = get_comp_ctxt(admin_queue, cmd_id, true);
+       if (unlikely(!comp_ctx))
+               return ERR_PTR(ENA_COM_INVAL);
 
        comp_ctx->status = ENA_CMD_SUBMITTED;
        comp_ctx->comp_size = (u32)comp_size_in_bytes;
@@ -272,12 +251,14 @@ __ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
        if (unlikely((admin_queue->sq.tail & queue_size_mask) == 0))
                admin_queue->sq.phase = !admin_queue->sq.phase;
 
-       ENA_REG_WRITE32(admin_queue->sq.tail, admin_queue->sq.db_addr);
+       ENA_DB_SYNC(&admin_queue->sq.mem_handle);
+       ENA_REG_WRITE32(admin_queue->bus, admin_queue->sq.tail,
+                       admin_queue->sq.db_addr);
 
        return comp_ctx;
 }
 
-static inline int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
+static int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
 {
        size_t size = queue->q_depth * sizeof(struct ena_comp_ctx);
        struct ena_comp_ctx *comp_ctx;
@@ -285,7 +266,7 @@ static inline int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
 
        queue->comp_ctx = ENA_MEM_ALLOC(queue->q_dmadev, size);
        if (unlikely(!queue->comp_ctx)) {
-               ena_trc_err("memory allocation failed");
+               ena_trc_err("memory allocation failed\n");
                return ENA_COM_NO_MEM;
        }
 
@@ -298,12 +279,11 @@ static inline int ena_com_init_comp_ctxt(struct ena_com_admin_queue *queue)
        return 0;
 }
 
-static struct ena_comp_ctx *
-ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
-                        struct ena_admin_aq_entry *cmd,
-                        size_t cmd_size_in_bytes,
-                        struct ena_admin_acq_entry *comp,
-                        size_t comp_size_in_bytes)
+static struct ena_comp_ctx *ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
+                                                    struct ena_admin_aq_entry *cmd,
+                                                    size_t cmd_size_in_bytes,
+                                                    struct ena_admin_acq_entry *comp,
+                                                    size_t comp_size_in_bytes)
 {
        unsigned long flags = 0;
        struct ena_comp_ctx *comp_ctx;
@@ -317,7 +297,7 @@ ena_com_submit_admin_cmd(struct ena_com_admin_queue *admin_queue,
                                              cmd_size_in_bytes,
                                              comp,
                                              comp_size_in_bytes);
-       if (unlikely(IS_ERR(comp_ctx)))
+       if (IS_ERR(comp_ctx))
                admin_queue->running_state = false;
        ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
 
@@ -331,44 +311,79 @@ static int ena_com_init_io_sq(struct ena_com_dev *ena_dev,
        size_t size;
        int dev_node = 0;
 
-       ENA_TOUCH(ctx);
-
-       memset(&io_sq->desc_addr, 0x0, sizeof(struct ena_com_io_desc_addr));
+       memset(&io_sq->desc_addr, 0x0, sizeof(io_sq->desc_addr));
 
+       io_sq->dma_addr_bits = (u8)ena_dev->dma_addr_bits;
        io_sq->desc_entry_size =
                (io_sq->direction == ENA_COM_IO_QUEUE_DIRECTION_TX) ?
                sizeof(struct ena_eth_io_tx_desc) :
                sizeof(struct ena_eth_io_rx_desc);
 
        size = io_sq->desc_entry_size * io_sq->q_depth;
+       io_sq->bus = ena_dev->bus;
 
        if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST) {
                ENA_MEM_ALLOC_COHERENT_NODE(ena_dev->dmadev,
                                            size,
                                            io_sq->desc_addr.virt_addr,
                                            io_sq->desc_addr.phys_addr,
+                                           io_sq->desc_addr.mem_handle,
                                            ctx->numa_node,
                                            dev_node);
-               if (!io_sq->desc_addr.virt_addr)
+               if (!io_sq->desc_addr.virt_addr) {
                        ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
                                               size,
                                               io_sq->desc_addr.virt_addr,
                                               io_sq->desc_addr.phys_addr,
                                               io_sq->desc_addr.mem_handle);
-       } else {
+               }
+
+               if (!io_sq->desc_addr.virt_addr) {
+                       ena_trc_err("memory allocation failed\n");
+                       return ENA_COM_NO_MEM;
+               }
+       }
+
+       if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_DEV) {
+               /* Allocate bounce buffers */
+               io_sq->bounce_buf_ctrl.buffer_size =
+                       ena_dev->llq_info.desc_list_entry_size;
+               io_sq->bounce_buf_ctrl.buffers_num =
+                       ENA_COM_BOUNCE_BUFFER_CNTRL_CNT;
+               io_sq->bounce_buf_ctrl.next_to_use = 0;
+
+               size = io_sq->bounce_buf_ctrl.buffer_size *
+                       io_sq->bounce_buf_ctrl.buffers_num;
+
                ENA_MEM_ALLOC_NODE(ena_dev->dmadev,
                                   size,
-                                  io_sq->desc_addr.virt_addr,
+                                  io_sq->bounce_buf_ctrl.base_buffer,
                                   ctx->numa_node,
                                   dev_node);
-               if (!io_sq->desc_addr.virt_addr)
-                       io_sq->desc_addr.virt_addr =
-                               ENA_MEM_ALLOC(ena_dev->dmadev, size);
-       }
+               if (!io_sq->bounce_buf_ctrl.base_buffer)
+                       io_sq->bounce_buf_ctrl.base_buffer = ENA_MEM_ALLOC(ena_dev->dmadev, size);
 
-       if (!io_sq->desc_addr.virt_addr) {
-               ena_trc_err("memory allocation failed");
-               return ENA_COM_NO_MEM;
+               if (!io_sq->bounce_buf_ctrl.base_buffer) {
+                       ena_trc_err("bounce buffer memory allocation failed\n");
+                       return ENA_COM_NO_MEM;
+               }
+
+               memcpy(&io_sq->llq_info, &ena_dev->llq_info,
+                      sizeof(io_sq->llq_info));
+
+               /* Initiate the first bounce buffer */
+               io_sq->llq_buf_ctrl.curr_bounce_buf =
+                       ena_com_get_next_bounce_buffer(&io_sq->bounce_buf_ctrl);
+               memset(io_sq->llq_buf_ctrl.curr_bounce_buf,
+                      0x0, io_sq->llq_info.desc_list_entry_size);
+               io_sq->llq_buf_ctrl.descs_left_in_line =
+                       io_sq->llq_info.descs_num_before_header;
+               io_sq->disable_meta_caching =
+                       io_sq->llq_info.disable_meta_caching;
+
+               if (io_sq->llq_info.max_entries_in_tx_burst > 0)
+                       io_sq->entries_in_tx_burst_left =
+                               io_sq->llq_info.max_entries_in_tx_burst;
        }
 
        io_sq->tail = 0;
@@ -385,8 +400,7 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,
        size_t size;
        int prev_node = 0;
 
-       ENA_TOUCH(ctx);
-       memset(&io_cq->cdesc_addr, 0x0, sizeof(struct ena_com_io_desc_addr));
+       memset(&io_cq->cdesc_addr, 0x0, sizeof(io_cq->cdesc_addr));
 
        /* Use the basic completion descriptor for Rx */
        io_cq->cdesc_entry_size_in_bytes =
@@ -395,22 +409,25 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,
                sizeof(struct ena_eth_io_rx_cdesc_base);
 
        size = io_cq->cdesc_entry_size_in_bytes * io_cq->q_depth;
+       io_cq->bus = ena_dev->bus;
 
        ENA_MEM_ALLOC_COHERENT_NODE(ena_dev->dmadev,
-                                   size,
-                                   io_cq->cdesc_addr.virt_addr,
-                                   io_cq->cdesc_addr.phys_addr,
-                                   ctx->numa_node,
-                                   prev_node);
-       if (!io_cq->cdesc_addr.virt_addr)
+                       size,
+                       io_cq->cdesc_addr.virt_addr,
+                       io_cq->cdesc_addr.phys_addr,
+                       io_cq->cdesc_addr.mem_handle,
+                       ctx->numa_node,
+                       prev_node);
+       if (!io_cq->cdesc_addr.virt_addr) {
                ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
                                       size,
                                       io_cq->cdesc_addr.virt_addr,
                                       io_cq->cdesc_addr.phys_addr,
                                       io_cq->cdesc_addr.mem_handle);
+       }
 
        if (!io_cq->cdesc_addr.virt_addr) {
-               ena_trc_err("memory allocation failed");
+               ena_trc_err("memory allocation failed\n");
                return ENA_COM_NO_MEM;
        }
 
@@ -420,9 +437,8 @@ static int ena_com_init_io_cq(struct ena_com_dev *ena_dev,
        return 0;
 }
 
-static void
-ena_com_handle_single_admin_completion(struct ena_com_admin_queue *admin_queue,
-                                      struct ena_admin_acq_entry *cqe)
+static void ena_com_handle_single_admin_completion(struct ena_com_admin_queue *admin_queue,
+                                                  struct ena_admin_acq_entry *cqe)
 {
        struct ena_comp_ctx *comp_ctx;
        u16 cmd_id;
@@ -447,8 +463,7 @@ ena_com_handle_single_admin_completion(struct ena_com_admin_queue *admin_queue,
                ENA_WAIT_EVENT_SIGNAL(comp_ctx->wait_event);
 }
 
-static void
-ena_com_handle_admin_completion(struct ena_com_admin_queue *admin_queue)
+static void ena_com_handle_admin_completion(struct ena_com_admin_queue *admin_queue)
 {
        struct ena_admin_acq_entry *cqe = NULL;
        u16 comp_num = 0;
@@ -461,12 +476,12 @@ ena_com_handle_admin_completion(struct ena_com_admin_queue *admin_queue)
        cqe = &admin_queue->cq.entries[head_masked];
 
        /* Go over all the completions */
-       while ((cqe->acq_common_descriptor.flags &
+       while ((READ_ONCE8(cqe->acq_common_descriptor.flags) &
                        ENA_ADMIN_ACQ_COMMON_DESC_PHASE_MASK) == phase) {
                /* Do not read the rest of the completion entry before the
                 * phase bit was validated
                 */
-               rmb();
+               dma_rmb();
                ena_com_handle_single_admin_completion(admin_queue, cqe);
 
                head_masked++;
@@ -490,16 +505,13 @@ static int ena_com_comp_status_to_errno(u8 comp_status)
        if (unlikely(comp_status != 0))
                ena_trc_err("admin command failed[%u]\n", comp_status);
 
-       if (unlikely(comp_status > ENA_ADMIN_UNKNOWN_ERROR))
-               return ENA_COM_INVAL;
-
        switch (comp_status) {
        case ENA_ADMIN_SUCCESS:
-               return 0;
+               return ENA_COM_OK;
        case ENA_ADMIN_RESOURCE_ALLOCATION_FAILURE:
                return ENA_COM_NO_MEM;
        case ENA_ADMIN_UNSUPPORTED_OPCODE:
-               return ENA_COM_PERMISSION;
+               return ENA_COM_UNSUPPORTED;
        case ENA_ADMIN_BAD_OPCODE:
        case ENA_ADMIN_MALFORMED_REQUEST:
        case ENA_ADMIN_ILLEGAL_PARAMETER:
@@ -507,23 +519,27 @@ static int ena_com_comp_status_to_errno(u8 comp_status)
                return ENA_COM_INVAL;
        }
 
-       return 0;
+       return ENA_COM_INVAL;
 }
 
-static int
-ena_com_wait_and_process_admin_cq_polling(
-               struct ena_comp_ctx *comp_ctx,
-               struct ena_com_admin_queue *admin_queue)
+static int ena_com_wait_and_process_admin_cq_polling(struct ena_comp_ctx *comp_ctx,
+                                                    struct ena_com_admin_queue *admin_queue)
 {
        unsigned long flags = 0;
-       u64 start_time;
+       ena_time_t timeout;
        int ret;
 
-       start_time = ENA_GET_SYSTEM_USECS();
+       timeout = ENA_GET_SYSTEM_TIMEOUT(admin_queue->completion_timeout);
 
-       while (comp_ctx->status == ENA_CMD_SUBMITTED) {
-               if ((ENA_GET_SYSTEM_USECS() - start_time) >
-                   ADMIN_CMD_TIMEOUT_US) {
+       while (1) {
+               ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
+               ena_com_handle_admin_completion(admin_queue);
+               ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
+
+               if (comp_ctx->status != ENA_CMD_SUBMITTED)
+                       break;
+
+               if (ENA_TIME_EXPIRE(timeout)) {
                        ena_trc_err("Wait for completion (polling) timeout\n");
                        /* ENA didn't have any completion */
                        ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
@@ -535,9 +551,7 @@ ena_com_wait_and_process_admin_cq_polling(
                        goto err;
                }
 
-               ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
-               ena_com_handle_admin_completion(admin_queue);
-               ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
+               ENA_MSLEEP(ENA_POLL_MS);
        }
 
        if (unlikely(comp_ctx->status == ENA_CMD_ABORTED)) {
@@ -549,8 +563,8 @@ ena_com_wait_and_process_admin_cq_polling(
                goto err;
        }
 
-       ENA_ASSERT(comp_ctx->status == ENA_CMD_COMPLETED,
-                  "Invalid comp status %d\n", comp_ctx->status);
+       ENA_WARN(comp_ctx->status != ENA_CMD_COMPLETED,
+                "Invalid comp status %d\n", comp_ctx->status);
 
        ret = ena_com_comp_status_to_errno(comp_ctx->comp_status);
 err:
@@ -558,16 +572,183 @@ err:
        return ret;
 }
 
-static int
-ena_com_wait_and_process_admin_cq_interrupts(
-               struct ena_comp_ctx *comp_ctx,
-               struct ena_com_admin_queue *admin_queue)
+/**
+ * Set the LLQ configurations of the firmware
+ *
+ * The driver provides only the enabled feature values to the device,
+ * which in turn, checks if they are supported.
+ */
+static int ena_com_set_llq(struct ena_com_dev *ena_dev)
+{
+       struct ena_com_admin_queue *admin_queue;
+       struct ena_admin_set_feat_cmd cmd;
+       struct ena_admin_set_feat_resp resp;
+       struct ena_com_llq_info *llq_info = &ena_dev->llq_info;
+       int ret;
+
+       memset(&cmd, 0x0, sizeof(cmd));
+       admin_queue = &ena_dev->admin_queue;
+
+       cmd.aq_common_descriptor.opcode = ENA_ADMIN_SET_FEATURE;
+       cmd.feat_common.feature_id = ENA_ADMIN_LLQ;
+
+       cmd.u.llq.header_location_ctrl_enabled = llq_info->header_location_ctrl;
+       cmd.u.llq.entry_size_ctrl_enabled = llq_info->desc_list_entry_size_ctrl;
+       cmd.u.llq.desc_num_before_header_enabled = llq_info->descs_num_before_header;
+       cmd.u.llq.descriptors_stride_ctrl_enabled = llq_info->desc_stride_ctrl;
+
+       if (llq_info->disable_meta_caching)
+               cmd.u.llq.accel_mode.u.set.enabled_flags |=
+                       BIT(ENA_ADMIN_DISABLE_META_CACHING);
+
+       if (llq_info->max_entries_in_tx_burst)
+               cmd.u.llq.accel_mode.u.set.enabled_flags |=
+                       BIT(ENA_ADMIN_LIMIT_TX_BURST);
+
+       ret = ena_com_execute_admin_command(admin_queue,
+                                           (struct ena_admin_aq_entry *)&cmd,
+                                           sizeof(cmd),
+                                           (struct ena_admin_acq_entry *)&resp,
+                                           sizeof(resp));
+
+       if (unlikely(ret))
+               ena_trc_err("Failed to set LLQ configurations: %d\n", ret);
+
+       return ret;
+}
+
+static int ena_com_config_llq_info(struct ena_com_dev *ena_dev,
+                                  struct ena_admin_feature_llq_desc *llq_features,
+                                  struct ena_llq_configurations *llq_default_cfg)
+{
+       struct ena_com_llq_info *llq_info = &ena_dev->llq_info;
+       u16 supported_feat;
+       int rc;
+
+       memset(llq_info, 0, sizeof(*llq_info));
+
+       supported_feat = llq_features->header_location_ctrl_supported;
+
+       if (likely(supported_feat & llq_default_cfg->llq_header_location)) {
+               llq_info->header_location_ctrl =
+                       llq_default_cfg->llq_header_location;
+       } else {
+               ena_trc_err("Invalid header location control, supported: 0x%x\n",
+                           supported_feat);
+               return -EINVAL;
+       }
+
+       if (likely(llq_info->header_location_ctrl == ENA_ADMIN_INLINE_HEADER)) {
+               supported_feat = llq_features->descriptors_stride_ctrl_supported;
+               if (likely(supported_feat & llq_default_cfg->llq_stride_ctrl)) {
+                       llq_info->desc_stride_ctrl = llq_default_cfg->llq_stride_ctrl;
+               } else  {
+                       if (supported_feat & ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY) {
+                               llq_info->desc_stride_ctrl = ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY;
+                       } else if (supported_feat & ENA_ADMIN_SINGLE_DESC_PER_ENTRY) {
+                               llq_info->desc_stride_ctrl = ENA_ADMIN_SINGLE_DESC_PER_ENTRY;
+                       } else {
+                               ena_trc_err("Invalid desc_stride_ctrl, supported: 0x%x\n",
+                                           supported_feat);
+                               return -EINVAL;
+                       }
+
+                       ena_trc_err("Default llq stride ctrl is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",
+                                   llq_default_cfg->llq_stride_ctrl,
+                                   supported_feat,
+                                   llq_info->desc_stride_ctrl);
+               }
+       } else {
+               llq_info->desc_stride_ctrl = 0;
+       }
+
+       supported_feat = llq_features->entry_size_ctrl_supported;
+       if (likely(supported_feat & llq_default_cfg->llq_ring_entry_size)) {
+               llq_info->desc_list_entry_size_ctrl = llq_default_cfg->llq_ring_entry_size;
+               llq_info->desc_list_entry_size = llq_default_cfg->llq_ring_entry_size_value;
+       } else {
+               if (supported_feat & ENA_ADMIN_LIST_ENTRY_SIZE_128B) {
+                       llq_info->desc_list_entry_size_ctrl = ENA_ADMIN_LIST_ENTRY_SIZE_128B;
+                       llq_info->desc_list_entry_size = 128;
+               } else if (supported_feat & ENA_ADMIN_LIST_ENTRY_SIZE_192B) {
+                       llq_info->desc_list_entry_size_ctrl = ENA_ADMIN_LIST_ENTRY_SIZE_192B;
+                       llq_info->desc_list_entry_size = 192;
+               } else if (supported_feat & ENA_ADMIN_LIST_ENTRY_SIZE_256B) {
+                       llq_info->desc_list_entry_size_ctrl = ENA_ADMIN_LIST_ENTRY_SIZE_256B;
+                       llq_info->desc_list_entry_size = 256;
+               } else {
+                       ena_trc_err("Invalid entry_size_ctrl, supported: 0x%x\n", supported_feat);
+                       return -EINVAL;
+               }
+
+               ena_trc_err("Default llq ring entry size is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",
+                           llq_default_cfg->llq_ring_entry_size,
+                           supported_feat,
+                           llq_info->desc_list_entry_size);
+       }
+       if (unlikely(llq_info->desc_list_entry_size & 0x7)) {
+               /* The desc list entry size should be whole multiply of 8
+                * This requirement comes from __iowrite64_copy()
+                */
+               ena_trc_err("illegal entry size %d\n",
+                           llq_info->desc_list_entry_size);
+               return -EINVAL;
+       }
+
+       if (llq_info->desc_stride_ctrl == ENA_ADMIN_MULTIPLE_DESCS_PER_ENTRY)
+               llq_info->descs_per_entry = llq_info->desc_list_entry_size /
+                       sizeof(struct ena_eth_io_tx_desc);
+       else
+               llq_info->descs_per_entry = 1;
+
+       supported_feat = llq_features->desc_num_before_header_supported;
+       if (likely(supported_feat & llq_default_cfg->llq_num_decs_before_header)) {
+               llq_info->descs_num_before_header = llq_default_cfg->llq_num_decs_before_header;
+       } else {
+               if (supported_feat & ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_2) {
+                       llq_info->descs_num_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_2;
+               } else if (supported_feat & ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_1) {
+                       llq_info->descs_num_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_1;
+               } else if (supported_feat & ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_4) {
+                       llq_info->descs_num_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_4;
+               } else if (supported_feat & ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_8) {
+                       llq_info->descs_num_before_header = ENA_ADMIN_LLQ_NUM_DESCS_BEFORE_HEADER_8;
+               } else {
+                       ena_trc_err("Invalid descs_num_before_header, supported: 0x%x\n",
+                                   supported_feat);
+                       return -EINVAL;
+               }
+
+               ena_trc_err("Default llq num descs before header is not supported, performing fallback, default: 0x%x, supported: 0x%x, used: 0x%x\n",
+                           llq_default_cfg->llq_num_decs_before_header,
+                           supported_feat,
+                           llq_info->descs_num_before_header);
+       }
+       /* Check for accelerated queue supported */
+       llq_info->disable_meta_caching =
+               llq_features->accel_mode.u.get.supported_flags &
+               BIT(ENA_ADMIN_DISABLE_META_CACHING);
+
+       if (llq_features->accel_mode.u.get.supported_flags & BIT(ENA_ADMIN_LIMIT_TX_BURST))
+               llq_info->max_entries_in_tx_burst =
+                       llq_features->accel_mode.u.get.max_tx_burst_size /
+                       llq_default_cfg->llq_ring_entry_size_value;
+
+       rc = ena_com_set_llq(ena_dev);
+       if (rc)
+               ena_trc_err("Cannot set LLQ configuration: %d\n", rc);
+
+       return rc;
+}
+
+static int ena_com_wait_and_process_admin_cq_interrupts(struct ena_comp_ctx *comp_ctx,
+                                                       struct ena_com_admin_queue *admin_queue)
 {
        unsigned long flags = 0;
-       int ret = 0;
+       int ret;
 
        ENA_WAIT_EVENT_WAIT(comp_ctx->wait_event,
-                           ADMIN_CMD_TIMEOUT_US);
+                           admin_queue->completion_timeout);
 
        /* In case the command wasn't completed find out the root cause.
         * There might be 2 kinds of errors
@@ -580,16 +761,25 @@ ena_com_wait_and_process_admin_cq_interrupts(
                admin_queue->stats.no_completion++;
                ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
 
-               if (comp_ctx->status == ENA_CMD_COMPLETED)
-                       ena_trc_err("The ena device have completion but the driver didn't receive any MSI-X interrupt (cmd %d)\n",
-                                   comp_ctx->cmd_opcode);
-               else
-                       ena_trc_err("The ena device doesn't send any completion for the admin cmd %d status %d\n",
+               if (comp_ctx->status == ENA_CMD_COMPLETED) {
+                       ena_trc_err("The ena device sent a completion but the driver didn't receive a MSI-X interrupt (cmd %d), autopolling mode is %s\n",
+                                   comp_ctx->cmd_opcode, admin_queue->auto_polling ? "ON" : "OFF");
+                       /* Check if fallback to polling is enabled */
+                       if (admin_queue->auto_polling)
+                               admin_queue->polling = true;
+               } else {
+                       ena_trc_err("The ena device didn't send a completion for the admin cmd %d status %d\n",
                                    comp_ctx->cmd_opcode, comp_ctx->status);
-
-               admin_queue->running_state = false;
-               ret = ENA_COM_TIMER_EXPIRED;
-               goto err;
+               }
+               /* Check if shifted to polling mode.
+                * This will happen if there is a completion without an interrupt
+                * and autopolling mode is enabled. Continuing normal execution in such case
+                */
+               if (!admin_queue->polling) {
+                       admin_queue->running_state = false;
+                       ret = ENA_COM_TIMER_EXPIRED;
+                       goto err;
+               }
        }
 
        ret = ena_com_comp_status_to_errno(comp_ctx->comp_status);
@@ -607,16 +797,18 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset)
        struct ena_com_mmio_read *mmio_read = &ena_dev->mmio_read;
        volatile struct ena_admin_ena_mmio_req_read_less_resp *read_resp =
                mmio_read->read_resp;
-       u32 mmio_read_reg, ret;
+       u32 mmio_read_reg, ret, i;
        unsigned long flags = 0;
-       int i;
+       u32 timeout = mmio_read->reg_read_to;
 
        ENA_MIGHT_SLEEP();
 
+       if (timeout == 0)
+               timeout = ENA_REG_READ_TIMEOUT;
+
        /* If readless is disabled, perform regular read */
        if (!mmio_read->readless_supported)
-               return ENA_REG_READ32((unsigned char *)ena_dev->reg_bar +
-                                     offset);
+               return ENA_REG_READ32(ena_dev->bus, ena_dev->reg_bar + offset);
 
        ENA_SPINLOCK_LOCK(mmio_read->lock, flags);
        mmio_read->seq_num++;
@@ -627,22 +819,17 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset)
        mmio_read_reg |= mmio_read->seq_num &
                        ENA_REGS_MMIO_REG_READ_REQ_ID_MASK;
 
-       /* make sure read_resp->req_id get updated before the hw can write
-        * there
-        */
-       wmb();
-
-       ENA_REG_WRITE32(mmio_read_reg, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_MMIO_REG_READ_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, mmio_read_reg,
+                       ena_dev->reg_bar + ENA_REGS_MMIO_REG_READ_OFF);
 
-       for (i = 0; i < ENA_REG_READ_TIMEOUT; i++) {
-               if (read_resp->req_id == mmio_read->seq_num)
+       for (i = 0; i < timeout; i++) {
+               if (READ_ONCE16(read_resp->req_id) == mmio_read->seq_num)
                        break;
 
                ENA_UDELAY(1);
        }
 
-       if (unlikely(i == ENA_REG_READ_TIMEOUT)) {
+       if (unlikely(i == timeout)) {
                ena_trc_err("reading reg failed for timeout. expected: req id[%hu] offset[%hu] actual: req id[%hu] offset[%hu]\n",
                            mmio_read->seq_num,
                            offset,
@@ -653,7 +840,7 @@ static u32 ena_com_reg_bar_read32(struct ena_com_dev *ena_dev, u16 offset)
        }
 
        if (read_resp->reg_off != offset) {
-               ena_trc_err("reading failed for wrong offset value");
+               ena_trc_err("Read failure: wrong offset provided\n");
                ret = ENA_MMIO_READ_TIMEOUT;
        } else {
                ret = read_resp->reg_val;
@@ -671,9 +858,8 @@ err:
  * It is expected that the IRQ called ena_com_handle_admin_completion
  * to mark the completions.
  */
-static int
-ena_com_wait_and_process_admin_cq(struct ena_comp_ctx *comp_ctx,
-                                 struct ena_com_admin_queue *admin_queue)
+static int ena_com_wait_and_process_admin_cq(struct ena_comp_ctx *comp_ctx,
+                                            struct ena_com_admin_queue *admin_queue)
 {
        if (admin_queue->polling)
                return ena_com_wait_and_process_admin_cq_polling(comp_ctx,
@@ -692,7 +878,7 @@ static int ena_com_destroy_io_sq(struct ena_com_dev *ena_dev,
        u8 direction;
        int ret;
 
-       memset(&destroy_cmd, 0x0, sizeof(struct ena_admin_aq_destroy_sq_cmd));
+       memset(&destroy_cmd, 0x0, sizeof(destroy_cmd));
 
        if (io_sq->direction == ENA_COM_IO_QUEUE_DIRECTION_TX)
                direction = ENA_ADMIN_SQ_DIRECTION_TX;
@@ -706,12 +892,11 @@ static int ena_com_destroy_io_sq(struct ena_com_dev *ena_dev,
        destroy_cmd.sq.sq_idx = io_sq->idx;
        destroy_cmd.aq_common_descriptor.opcode = ENA_ADMIN_DESTROY_SQ;
 
-       ret = ena_com_execute_admin_command(
-                       admin_queue,
-                       (struct ena_admin_aq_entry *)&destroy_cmd,
-                       sizeof(destroy_cmd),
-                       (struct ena_admin_acq_entry *)&destroy_resp,
-                       sizeof(destroy_resp));
+       ret = ena_com_execute_admin_command(admin_queue,
+                                           (struct ena_admin_aq_entry *)&destroy_cmd,
+                                           sizeof(destroy_cmd),
+                                           (struct ena_admin_acq_entry *)&destroy_resp,
+                                           sizeof(destroy_resp));
 
        if (unlikely(ret && (ret != ENA_COM_NO_DEVICE)))
                ena_trc_err("failed to destroy io sq error: %d\n", ret);
@@ -740,25 +925,31 @@ static void ena_com_io_queue_free(struct ena_com_dev *ena_dev,
        if (io_sq->desc_addr.virt_addr) {
                size = io_sq->desc_entry_size * io_sq->q_depth;
 
-               if (io_sq->mem_queue_type == ENA_ADMIN_PLACEMENT_POLICY_HOST)
-                       ENA_MEM_FREE_COHERENT(ena_dev->dmadev,
-                                             size,
-                                             io_sq->desc_addr.virt_addr,
-                                             io_sq->desc_addr.phys_addr,
-                                             io_sq->desc_addr.mem_handle);
-               else
-                       ENA_MEM_FREE(ena_dev->dmadev,
-                                    io_sq->desc_addr.virt_addr);
+               ENA_MEM_FREE_COHERENT(ena_dev->dmadev,
+                                     size,
+                                     io_sq->desc_addr.virt_addr,
+                                     io_sq->desc_addr.phys_addr,
+                                     io_sq->desc_addr.mem_handle);
 
                io_sq->desc_addr.virt_addr = NULL;
        }
+
+       if (io_sq->bounce_buf_ctrl.base_buffer) {
+               ENA_MEM_FREE(ena_dev->dmadev,
+                            io_sq->bounce_buf_ctrl.base_buffer,
+                            (io_sq->llq_info.desc_list_entry_size * ENA_COM_BOUNCE_BUFFER_CNTRL_CNT));
+               io_sq->bounce_buf_ctrl.base_buffer = NULL;
+       }
 }
 
-static int wait_for_reset_state(struct ena_com_dev *ena_dev,
-                               u32 timeout, u16 exp_state)
+static int wait_for_reset_state(struct ena_com_dev *ena_dev, u32 timeout,
+                               u16 exp_state)
 {
        u32 val, i;
 
+       /* Convert timeout from resolution of 100ms to ENA_POLL_MS */
+       timeout = (timeout * 100) / ENA_POLL_MS;
+
        for (i = 0; i < timeout; i++) {
                val = ena_com_reg_bar_read32(ena_dev, ENA_REGS_DEV_STS_OFF);
 
@@ -771,16 +962,14 @@ static int wait_for_reset_state(struct ena_com_dev *ena_dev,
                        exp_state)
                        return 0;
 
-               /* The resolution of the timeout is 100ms */
-               ENA_MSLEEP(100);
+               ENA_MSLEEP(ENA_POLL_MS);
        }
 
        return ENA_COM_TIMER_EXPIRED;
 }
 
-static bool
-ena_com_check_supported_feature_id(struct ena_com_dev *ena_dev,
-                                  enum ena_admin_aq_feature_id feature_id)
+static bool ena_com_check_supported_feature_id(struct ena_com_dev *ena_dev,
+                                              enum ena_admin_aq_feature_id feature_id)
 {
        u32 feature_mask = 1 << feature_id;
 
@@ -796,20 +985,16 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,
                                  struct ena_admin_get_feat_resp *get_resp,
                                  enum ena_admin_aq_feature_id feature_id,
                                  dma_addr_t control_buf_dma_addr,
-                                 u32 control_buff_size)
+                                 u32 control_buff_size,
+                                 u8 feature_ver)
 {
        struct ena_com_admin_queue *admin_queue;
        struct ena_admin_get_feat_cmd get_cmd;
        int ret;
 
-       if (!ena_dev) {
-               ena_trc_err("%s : ena_dev is NULL\n", __func__);
-               return ENA_COM_NO_DEVICE;
-       }
-
        if (!ena_com_check_supported_feature_id(ena_dev, feature_id)) {
-               ena_trc_info("Feature %d isn't supported\n", feature_id);
-               return ENA_COM_PERMISSION;
+               ena_trc_dbg("Feature %d isn't supported\n", feature_id);
+               return ENA_COM_UNSUPPORTED;
        }
 
        memset(&get_cmd, 0x0, sizeof(get_cmd));
@@ -832,7 +1017,7 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,
        }
 
        get_cmd.control_buffer.length = control_buff_size;
-
+       get_cmd.feat_common.feature_version = feature_ver;
        get_cmd.feat_common.feature_id = feature_id;
 
        ret = ena_com_execute_admin_command(admin_queue,
@@ -852,13 +1037,28 @@ static int ena_com_get_feature_ex(struct ena_com_dev *ena_dev,
 
 static int ena_com_get_feature(struct ena_com_dev *ena_dev,
                               struct ena_admin_get_feat_resp *get_resp,
-                              enum ena_admin_aq_feature_id feature_id)
+                              enum ena_admin_aq_feature_id feature_id,
+                              u8 feature_ver)
 {
        return ena_com_get_feature_ex(ena_dev,
                                      get_resp,
                                      feature_id,
                                      0,
-                                     0);
+                                     0,
+                                     feature_ver);
+}
+
+static void ena_com_hash_key_fill_default_key(struct ena_com_dev *ena_dev)
+{
+       struct ena_admin_feature_rss_flow_hash_control *hash_key =
+               (ena_dev->rss).hash_key;
+
+       ENA_RSS_FILL_KEY(&hash_key->key, sizeof(hash_key->key));
+       /* The key is stored in the device in uint32_t array
+        * as well as the API requires the key to be passed in this
+        * format. Thus the size of our array should be divided by 4
+        */
+       hash_key->keys_num = sizeof(hash_key->key) / sizeof(uint32_t);
 }
 
 static int ena_com_hash_key_allocate(struct ena_com_dev *ena_dev)
@@ -928,7 +1128,7 @@ static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev,
        int ret;
 
        ret = ena_com_get_feature(ena_dev, &get_resp,
-                                 ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG);
+                                 ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG, 0);
        if (unlikely(ret))
                return ret;
 
@@ -945,10 +1145,10 @@ static int ena_com_indirect_table_allocate(struct ena_com_dev *ena_dev,
                sizeof(struct ena_admin_rss_ind_table_entry);
 
        ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
-                              tbl_size,
-                              rss->rss_ind_tbl,
-                              rss->rss_ind_tbl_dma_addr,
-                              rss->rss_ind_tbl_mem_handle);
+                            tbl_size,
+                            rss->rss_ind_tbl,
+                            rss->rss_ind_tbl_dma_addr,
+                            rss->rss_ind_tbl_mem_handle);
        if (unlikely(!rss->rss_ind_tbl))
                goto mem_err1;
 
@@ -992,7 +1192,9 @@ static void ena_com_indirect_table_destroy(struct ena_com_dev *ena_dev)
        rss->rss_ind_tbl = NULL;
 
        if (rss->host_rss_ind_tbl)
-               ENA_MEM_FREE(ena_dev->dmadev, rss->host_rss_ind_tbl);
+               ENA_MEM_FREE(ena_dev->dmadev,
+                            rss->host_rss_ind_tbl,
+                            ((1ULL << rss->tbl_log_size) * sizeof(u16)));
        rss->host_rss_ind_tbl = NULL;
 }
 
@@ -1005,7 +1207,7 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,
        u8 direction;
        int ret;
 
-       memset(&create_cmd, 0x0, sizeof(struct ena_admin_aq_create_sq_cmd));
+       memset(&create_cmd, 0x0, sizeof(create_cmd));
 
        create_cmd.aq_common_descriptor.opcode = ENA_ADMIN_CREATE_SQ;
 
@@ -1041,12 +1243,11 @@ static int ena_com_create_io_sq(struct ena_com_dev *ena_dev,
                }
        }
 
-       ret = ena_com_execute_admin_command(
-                       admin_queue,
-                       (struct ena_admin_aq_entry *)&create_cmd,
-                       sizeof(create_cmd),
-                       (struct ena_admin_acq_entry *)&cmd_completion,
-                       sizeof(cmd_completion));
+       ret = ena_com_execute_admin_command(admin_queue,
+                                           (struct ena_admin_aq_entry *)&create_cmd,
+                                           sizeof(create_cmd),
+                                           (struct ena_admin_acq_entry *)&cmd_completion,
+                                           sizeof(cmd_completion));
        if (unlikely(ret)) {
                ena_trc_err("Failed to create IO SQ. error: %d\n", ret);
                return ret;
@@ -1094,64 +1295,29 @@ static int ena_com_ind_tbl_convert_to_device(struct ena_com_dev *ena_dev)
        return 0;
 }
 
-static int ena_com_ind_tbl_convert_from_device(struct ena_com_dev *ena_dev)
-{
-       u16 dev_idx_to_host_tbl[ENA_TOTAL_NUM_QUEUES] = { (u16)-1 };
-       struct ena_rss *rss = &ena_dev->rss;
-       u8 idx;
-       u16 i;
-
-       for (i = 0; i < ENA_TOTAL_NUM_QUEUES; i++)
-               dev_idx_to_host_tbl[ena_dev->io_sq_queues[i].idx] = i;
-
-       for (i = 0; i < 1 << rss->tbl_log_size; i++) {
-               if (rss->rss_ind_tbl[i].cq_idx > ENA_TOTAL_NUM_QUEUES)
-                       return ENA_COM_INVAL;
-               idx = (u8)rss->rss_ind_tbl[i].cq_idx;
-
-               if (dev_idx_to_host_tbl[idx] > ENA_TOTAL_NUM_QUEUES)
-                       return ENA_COM_INVAL;
-
-               rss->host_rss_ind_tbl[i] = dev_idx_to_host_tbl[idx];
-       }
-
-       return 0;
-}
-
-static int ena_com_init_interrupt_moderation_table(struct ena_com_dev *ena_dev)
+static void ena_com_update_intr_delay_resolution(struct ena_com_dev *ena_dev,
+                                                u16 intr_delay_resolution)
 {
-       size_t size;
+       u16 prev_intr_delay_resolution = ena_dev->intr_delay_resolution;
 
-       size = sizeof(struct ena_intr_moder_entry) * ENA_INTR_MAX_NUM_OF_LEVELS;
-
-       ena_dev->intr_moder_tbl = ENA_MEM_ALLOC(ena_dev->dmadev, size);
-       if (!ena_dev->intr_moder_tbl)
-               return ENA_COM_NO_MEM;
-
-       ena_com_config_default_interrupt_moderation_table(ena_dev);
-
-       return 0;
-}
-
-static void
-ena_com_update_intr_delay_resolution(struct ena_com_dev *ena_dev,
-                                    u16 intr_delay_resolution)
-{
-       struct ena_intr_moder_entry *intr_moder_tbl = ena_dev->intr_moder_tbl;
-       unsigned int i;
-
-       if (!intr_delay_resolution) {
+       if (unlikely(!intr_delay_resolution)) {
                ena_trc_err("Illegal intr_delay_resolution provided. Going to use default 1 usec resolution\n");
-               intr_delay_resolution = 1;
+               intr_delay_resolution = ENA_DEFAULT_INTR_DELAY_RESOLUTION;
        }
-       ena_dev->intr_delay_resolution = intr_delay_resolution;
 
        /* update Rx */
-       for (i = 0; i < ENA_INTR_MAX_NUM_OF_LEVELS; i++)
-               intr_moder_tbl[i].intr_moder_interval /= intr_delay_resolution;
+       ena_dev->intr_moder_rx_interval =
+               ena_dev->intr_moder_rx_interval *
+               prev_intr_delay_resolution /
+               intr_delay_resolution;
 
        /* update Tx */
-       ena_dev->intr_moder_tx_interval /= intr_delay_resolution;
+       ena_dev->intr_moder_tx_interval =
+               ena_dev->intr_moder_tx_interval *
+               prev_intr_delay_resolution /
+               intr_delay_resolution;
+
+       ena_dev->intr_delay_resolution = intr_delay_resolution;
 }
 
 /*****************************************************************************/
@@ -1165,13 +1331,18 @@ int ena_com_execute_admin_command(struct ena_com_admin_queue *admin_queue,
                                  size_t comp_size)
 {
        struct ena_comp_ctx *comp_ctx;
-       int ret = 0;
+       int ret;
 
        comp_ctx = ena_com_submit_admin_cmd(admin_queue, cmd, cmd_size,
                                            comp, comp_size);
-       if (unlikely(IS_ERR(comp_ctx))) {
-               ena_trc_err("Failed to submit command [%ld]\n",
-                           PTR_ERR(comp_ctx));
+       if (IS_ERR(comp_ctx)) {
+               if (comp_ctx == ERR_PTR(ENA_COM_NO_DEVICE))
+                       ena_trc_dbg("Failed to submit command [%ld]\n",
+                                   PTR_ERR(comp_ctx));
+               else
+                       ena_trc_err("Failed to submit command [%ld]\n",
+                                   PTR_ERR(comp_ctx));
+
                return PTR_ERR(comp_ctx);
        }
 
@@ -1195,7 +1366,7 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev,
        struct ena_admin_acq_create_cq_resp_desc cmd_completion;
        int ret;
 
-       memset(&create_cmd, 0x0, sizeof(struct ena_admin_aq_create_cq_cmd));
+       memset(&create_cmd, 0x0, sizeof(create_cmd));
 
        create_cmd.aq_common_descriptor.opcode = ENA_ADMIN_CREATE_CQ;
 
@@ -1215,12 +1386,11 @@ int ena_com_create_io_cq(struct ena_com_dev *ena_dev,
                return ret;
        }
 
-       ret = ena_com_execute_admin_command(
-                       admin_queue,
-                       (struct ena_admin_aq_entry *)&create_cmd,
-                       sizeof(create_cmd),
-                       (struct ena_admin_acq_entry *)&cmd_completion,
-                       sizeof(cmd_completion));
+       ret = ena_com_execute_admin_command(admin_queue,
+                                           (struct ena_admin_aq_entry *)&create_cmd,
+                                           sizeof(create_cmd),
+                                           (struct ena_admin_acq_entry *)&cmd_completion,
+                                           sizeof(cmd_completion));
        if (unlikely(ret)) {
                ena_trc_err("Failed to create IO CQ. error: %d\n", ret);
                return ret;
@@ -1290,7 +1460,7 @@ void ena_com_wait_for_abort_completion(struct ena_com_dev *ena_dev)
        ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
        while (ATOMIC32_READ(&admin_queue->outstanding_cmds) != 0) {
                ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
-               ENA_MSLEEP(20);
+               ENA_MSLEEP(ENA_POLL_MS);
                ENA_SPINLOCK_LOCK(admin_queue->q_lock, flags);
        }
        ENA_SPINLOCK_UNLOCK(admin_queue->q_lock, flags);
@@ -1304,17 +1474,16 @@ int ena_com_destroy_io_cq(struct ena_com_dev *ena_dev,
        struct ena_admin_acq_destroy_cq_resp_desc destroy_resp;
        int ret;
 
-       memset(&destroy_cmd, 0x0, sizeof(struct ena_admin_aq_destroy_sq_cmd));
+       memset(&destroy_cmd, 0x0, sizeof(destroy_cmd));
 
        destroy_cmd.cq_idx = io_cq->idx;
        destroy_cmd.aq_common_descriptor.opcode = ENA_ADMIN_DESTROY_CQ;
 
-       ret = ena_com_execute_admin_command(
-                       admin_queue,
-                       (struct ena_admin_aq_entry *)&destroy_cmd,
-                       sizeof(destroy_cmd),
-                       (struct ena_admin_acq_entry *)&destroy_resp,
-                       sizeof(destroy_resp));
+       ret = ena_com_execute_admin_command(admin_queue,
+                                           (struct ena_admin_aq_entry *)&destroy_cmd,
+                                           sizeof(destroy_cmd),
+                                           (struct ena_admin_acq_entry *)&destroy_resp,
+                                           sizeof(destroy_resp));
 
        if (unlikely(ret && (ret != ENA_COM_NO_DEVICE)))
                ena_trc_err("Failed to destroy IO CQ. error: %d\n", ret);
@@ -1341,13 +1510,12 @@ void ena_com_admin_aenq_enable(struct ena_com_dev *ena_dev)
 {
        u16 depth = ena_dev->aenq.q_depth;
 
-       ENA_ASSERT(ena_dev->aenq.head == depth, "Invalid AENQ state\n");
+       ENA_WARN(ena_dev->aenq.head != depth, "Invalid AENQ state\n");
 
        /* Init head_db to mark that all entries in the queue
         * are initially available
         */
-       ENA_REG_WRITE32(depth, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_AENQ_HEAD_DB_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, depth, ena_dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);
 }
 
 int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)
@@ -1356,24 +1524,19 @@ int ena_com_set_aenq_config(struct ena_com_dev *ena_dev, u32 groups_flag)
        struct ena_admin_set_feat_cmd cmd;
        struct ena_admin_set_feat_resp resp;
        struct ena_admin_get_feat_resp get_resp;
-       int ret = 0;
-
-       if (unlikely(!ena_dev)) {
-               ena_trc_err("%s : ena_dev is NULL\n", __func__);
-               return ENA_COM_NO_DEVICE;
-       }
+       int ret;
 
-       ret = ena_com_get_feature(ena_dev, &get_resp, ENA_ADMIN_AENQ_CONFIG);
+       ret = ena_com_get_feature(ena_dev, &get_resp, ENA_ADMIN_AENQ_CONFIG, 0);
        if (ret) {
                ena_trc_info("Can't get aenq configuration\n");
                return ret;
        }
 
        if ((get_resp.u.aenq.supported_groups & groups_flag) != groups_flag) {
-               ena_trc_warn("Trying to set unsupported aenq events. supported flag: %x asked flag: %x\n",
+               ena_trc_warn("Trying to set unsupported aenq events. supported flag: 0x%x asked flag: 0x%x\n",
                             get_resp.u.aenq.supported_groups,
                             groups_flag);
-               return ENA_COM_PERMISSION;
+               return ENA_COM_UNSUPPORTED;
        }
 
        memset(&cmd, 0x0, sizeof(cmd));
@@ -1445,11 +1608,6 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev)
                     ENA_REGS_VERSION_MAJOR_VERSION_SHIFT,
                     ver & ENA_REGS_VERSION_MINOR_VERSION_MASK);
 
-       if (ver < MIN_ENA_VER) {
-               ena_trc_err("ENA version is lower than the minimal version the driver supports\n");
-               return -1;
-       }
-
        ena_trc_info("ena controller version: %d.%d.%d implementation version %d\n",
                     (ctrl_ver & ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_MASK)
                     >> ENA_REGS_CONTROLLER_VERSION_MAJOR_VERSION_SHIFT,
@@ -1476,44 +1634,60 @@ int ena_com_validate_version(struct ena_com_dev *ena_dev)
 void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
 {
        struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue;
+       struct ena_com_admin_cq *cq = &admin_queue->cq;
+       struct ena_com_admin_sq *sq = &admin_queue->sq;
+       struct ena_com_aenq *aenq = &ena_dev->aenq;
+       u16 size;
 
-       if (!admin_queue)
-               return;
-
+       ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
        if (admin_queue->comp_ctx)
-               ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);
+               ENA_MEM_FREE(ena_dev->dmadev,
+                            admin_queue->comp_ctx,
+                            (admin_queue->q_depth * sizeof(struct ena_comp_ctx)));
        admin_queue->comp_ctx = NULL;
-
-       if (admin_queue->sq.entries)
-               ENA_MEM_FREE_COHERENT(ena_dev->dmadev,
-                                     ADMIN_SQ_SIZE(admin_queue->q_depth),
-                                     admin_queue->sq.entries,
-                                     admin_queue->sq.dma_addr,
-                                     admin_queue->sq.mem_handle);
-       admin_queue->sq.entries = NULL;
-
-       if (admin_queue->cq.entries)
-               ENA_MEM_FREE_COHERENT(ena_dev->dmadev,
-                                     ADMIN_CQ_SIZE(admin_queue->q_depth),
-                                     admin_queue->cq.entries,
-                                     admin_queue->cq.dma_addr,
-                                     admin_queue->cq.mem_handle);
-       admin_queue->cq.entries = NULL;
-
+       size = ADMIN_SQ_SIZE(admin_queue->q_depth);
+       if (sq->entries)
+               ENA_MEM_FREE_COHERENT(ena_dev->dmadev, size, sq->entries,
+                                     sq->dma_addr, sq->mem_handle);
+       sq->entries = NULL;
+
+       size = ADMIN_CQ_SIZE(admin_queue->q_depth);
+       if (cq->entries)
+               ENA_MEM_FREE_COHERENT(ena_dev->dmadev, size, cq->entries,
+                                     cq->dma_addr, cq->mem_handle);
+       cq->entries = NULL;
+
+       size = ADMIN_AENQ_SIZE(aenq->q_depth);
        if (ena_dev->aenq.entries)
-               ENA_MEM_FREE_COHERENT(ena_dev->dmadev,
-                                     ADMIN_AENQ_SIZE(ena_dev->aenq.q_depth),
-                                     ena_dev->aenq.entries,
-                                     ena_dev->aenq.dma_addr,
-                                     ena_dev->aenq.mem_handle);
-       ena_dev->aenq.entries = NULL;
+               ENA_MEM_FREE_COHERENT(ena_dev->dmadev, size, aenq->entries,
+                                     aenq->dma_addr, aenq->mem_handle);
+       aenq->entries = NULL;
+       ENA_SPINLOCK_DESTROY(admin_queue->q_lock);
 }
 
 void ena_com_set_admin_polling_mode(struct ena_com_dev *ena_dev, bool polling)
 {
+       u32 mask_value = 0;
+
+       if (polling)
+               mask_value = ENA_REGS_ADMIN_INTR_MASK;
+
+       ENA_REG_WRITE32(ena_dev->bus, mask_value,
+                       ena_dev->reg_bar + ENA_REGS_INTR_MASK_OFF);
        ena_dev->admin_queue.polling = polling;
 }
 
+bool ena_com_get_admin_polling_mode(struct ena_com_dev * ena_dev)
+{
+       return ena_dev->admin_queue.polling;
+}
+
+void ena_com_set_admin_auto_polling_mode(struct ena_com_dev *ena_dev,
+                                        bool polling)
+{
+       ena_dev->admin_queue.auto_polling = polling;
+}
+
 int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev)
 {
        struct ena_com_mmio_read *mmio_read = &ena_dev->mmio_read;
@@ -1525,7 +1699,7 @@ int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev)
                               mmio_read->read_resp_dma_addr,
                               mmio_read->read_resp_mem_handle);
        if (unlikely(!mmio_read->read_resp))
-               return ENA_COM_NO_MEM;
+               goto err;
 
        ena_com_mmio_reg_read_request_write_dev_addr(ena_dev);
 
@@ -1534,10 +1708,13 @@ int ena_com_mmio_reg_read_request_init(struct ena_com_dev *ena_dev)
        mmio_read->readless_supported = true;
 
        return 0;
+
+err:
+               ENA_SPINLOCK_DESTROY(mmio_read->lock);
+               return ENA_COM_NO_MEM;
 }
 
-void
-ena_com_set_mmio_read_mode(struct ena_com_dev *ena_dev, bool readless_supported)
+void ena_com_set_mmio_read_mode(struct ena_com_dev *ena_dev, bool readless_supported)
 {
        struct ena_com_mmio_read *mmio_read = &ena_dev->mmio_read;
 
@@ -1548,10 +1725,8 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev)
 {
        struct ena_com_mmio_read *mmio_read = &ena_dev->mmio_read;
 
-       ENA_REG_WRITE32(0x0, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_MMIO_RESP_LO_OFF);
-       ENA_REG_WRITE32(0x0, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_MMIO_RESP_HI_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, 0x0, ena_dev->reg_bar + ENA_REGS_MMIO_RESP_LO_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, 0x0, ena_dev->reg_bar + ENA_REGS_MMIO_RESP_HI_OFF);
 
        ENA_MEM_FREE_COHERENT(ena_dev->dmadev,
                              sizeof(*mmio_read->read_resp),
@@ -1560,6 +1735,7 @@ void ena_com_mmio_reg_read_request_destroy(struct ena_com_dev *ena_dev)
                              mmio_read->read_resp_mem_handle);
 
        mmio_read->read_resp = NULL;
+       ENA_SPINLOCK_DESTROY(mmio_read->lock);
 }
 
 void ena_com_mmio_reg_read_request_write_dev_addr(struct ena_com_dev *ena_dev)
@@ -1570,15 +1746,12 @@ void ena_com_mmio_reg_read_request_write_dev_addr(struct ena_com_dev *ena_dev)
        addr_low = ENA_DMA_ADDR_TO_UINT32_LOW(mmio_read->read_resp_dma_addr);
        addr_high = ENA_DMA_ADDR_TO_UINT32_HIGH(mmio_read->read_resp_dma_addr);
 
-       ENA_REG_WRITE32(addr_low, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_MMIO_RESP_LO_OFF);
-       ENA_REG_WRITE32(addr_high, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_MMIO_RESP_HI_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, addr_low, ena_dev->reg_bar + ENA_REGS_MMIO_RESP_LO_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, addr_high, ena_dev->reg_bar + ENA_REGS_MMIO_RESP_HI_OFF);
 }
 
 int ena_com_admin_init(struct ena_com_dev *ena_dev,
-                      struct ena_aenq_handlers *aenq_handlers,
-                      bool init_spinlock)
+                      struct ena_aenq_handlers *aenq_handlers)
 {
        struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue;
        u32 aq_caps, acq_caps, dev_sts, addr_low, addr_high;
@@ -1598,14 +1771,14 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,
 
        admin_queue->q_depth = ENA_ADMIN_QUEUE_DEPTH;
 
+       admin_queue->bus = ena_dev->bus;
        admin_queue->q_dmadev = ena_dev->dmadev;
        admin_queue->polling = false;
        admin_queue->curr_cmd_id = 0;
 
        ATOMIC32_SET(&admin_queue->outstanding_cmds, 0);
 
-       if (init_spinlock)
-               ENA_SPINLOCK_INIT(admin_queue->q_lock);
+       ENA_SPINLOCK_INIT(admin_queue->q_lock);
 
        ret = ena_com_init_comp_ctxt(admin_queue);
        if (ret)
@@ -1619,24 +1792,20 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,
        if (ret)
                goto error;
 
-       admin_queue->sq.db_addr = (u32 __iomem *)
-               ((unsigned char *)ena_dev->reg_bar + ENA_REGS_AQ_DB_OFF);
+       admin_queue->sq.db_addr = (u32 __iomem *)((uintptr_t)ena_dev->reg_bar +
+               ENA_REGS_AQ_DB_OFF);
 
        addr_low = ENA_DMA_ADDR_TO_UINT32_LOW(admin_queue->sq.dma_addr);
        addr_high = ENA_DMA_ADDR_TO_UINT32_HIGH(admin_queue->sq.dma_addr);
 
-       ENA_REG_WRITE32(addr_low, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_AQ_BASE_LO_OFF);
-       ENA_REG_WRITE32(addr_high, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_AQ_BASE_HI_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, addr_low, ena_dev->reg_bar + ENA_REGS_AQ_BASE_LO_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, addr_high, ena_dev->reg_bar + ENA_REGS_AQ_BASE_HI_OFF);
 
        addr_low = ENA_DMA_ADDR_TO_UINT32_LOW(admin_queue->cq.dma_addr);
        addr_high = ENA_DMA_ADDR_TO_UINT32_HIGH(admin_queue->cq.dma_addr);
 
-       ENA_REG_WRITE32(addr_low, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_ACQ_BASE_LO_OFF);
-       ENA_REG_WRITE32(addr_high, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_ACQ_BASE_HI_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, addr_low, ena_dev->reg_bar + ENA_REGS_ACQ_BASE_LO_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, addr_high, ena_dev->reg_bar + ENA_REGS_ACQ_BASE_HI_OFF);
 
        aq_caps = 0;
        aq_caps |= admin_queue->q_depth & ENA_REGS_AQ_CAPS_AQ_DEPTH_MASK;
@@ -1650,10 +1819,8 @@ int ena_com_admin_init(struct ena_com_dev *ena_dev,
                ENA_REGS_ACQ_CAPS_ACQ_ENTRY_SIZE_SHIFT) &
                ENA_REGS_ACQ_CAPS_ACQ_ENTRY_SIZE_MASK;
 
-       ENA_REG_WRITE32(aq_caps, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_AQ_CAPS_OFF);
-       ENA_REG_WRITE32(acq_caps, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_ACQ_CAPS_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, aq_caps, ena_dev->reg_bar + ENA_REGS_AQ_CAPS_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, acq_caps, ena_dev->reg_bar + ENA_REGS_ACQ_CAPS_OFF);
        ret = ena_com_admin_init_aenq(ena_dev, aenq_handlers);
        if (ret)
                goto error;
@@ -1672,7 +1839,7 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,
 {
        struct ena_com_io_sq *io_sq;
        struct ena_com_io_cq *io_cq;
-       int ret = 0;
+       int ret;
 
        if (ctx->qid >= ENA_TOTAL_NUM_QUEUES) {
                ena_trc_err("Qid (%d) is bigger than max num of queues (%d)\n",
@@ -1683,8 +1850,8 @@ int ena_com_create_io_queue(struct ena_com_dev *ena_dev,
        io_sq = &ena_dev->io_sq_queues[ctx->qid];
        io_cq = &ena_dev->io_cq_queues[ctx->qid];
 
-       memset(io_sq, 0x0, sizeof(struct ena_com_io_sq));
-       memset(io_cq, 0x0, sizeof(struct ena_com_io_cq));
+       memset(io_sq, 0x0, sizeof(*io_sq));
+       memset(io_cq, 0x0, sizeof(*io_cq));
 
        /* Init CQ */
        io_cq->q_depth = ctx->queue_size;
@@ -1751,7 +1918,7 @@ void ena_com_destroy_io_queue(struct ena_com_dev *ena_dev, u16 qid)
 int ena_com_get_link_params(struct ena_com_dev *ena_dev,
                            struct ena_admin_get_feat_resp *resp)
 {
-       return ena_com_get_feature(ena_dev, resp, ENA_ADMIN_LINK_CONFIG);
+       return ena_com_get_feature(ena_dev, resp, ENA_ADMIN_LINK_CONFIG, 0);
 }
 
 int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,
@@ -1761,7 +1928,7 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,
        int rc;
 
        rc = ena_com_get_feature(ena_dev, &get_resp,
-                                ENA_ADMIN_DEVICE_ATTRIBUTES);
+                                ENA_ADMIN_DEVICE_ATTRIBUTES, 0);
        if (rc)
                return rc;
 
@@ -1769,17 +1936,34 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,
               sizeof(get_resp.u.dev_attr));
        ena_dev->supported_features = get_resp.u.dev_attr.supported_features;
 
-       rc = ena_com_get_feature(ena_dev, &get_resp,
-                                ENA_ADMIN_MAX_QUEUES_NUM);
-       if (rc)
-               return rc;
+       if (ena_dev->supported_features & BIT(ENA_ADMIN_MAX_QUEUES_EXT)) {
+               rc = ena_com_get_feature(ena_dev, &get_resp,
+                                        ENA_ADMIN_MAX_QUEUES_EXT,
+                                        ENA_FEATURE_MAX_QUEUE_EXT_VER);
+               if (rc)
+                       return rc;
 
-       memcpy(&get_feat_ctx->max_queues, &get_resp.u.max_queue,
-              sizeof(get_resp.u.max_queue));
-       ena_dev->tx_max_header_size = get_resp.u.max_queue.max_header_size;
+               if (get_resp.u.max_queue_ext.version != ENA_FEATURE_MAX_QUEUE_EXT_VER)
+                       return -EINVAL;
+
+               memcpy(&get_feat_ctx->max_queue_ext, &get_resp.u.max_queue_ext,
+                      sizeof(get_resp.u.max_queue_ext));
+               ena_dev->tx_max_header_size =
+                       get_resp.u.max_queue_ext.max_queue_ext.max_tx_header_size;
+       } else {
+               rc = ena_com_get_feature(ena_dev, &get_resp,
+                                        ENA_ADMIN_MAX_QUEUES_NUM, 0);
+               memcpy(&get_feat_ctx->max_queues, &get_resp.u.max_queue,
+                      sizeof(get_resp.u.max_queue));
+               ena_dev->tx_max_header_size =
+                       get_resp.u.max_queue.max_header_size;
+
+               if (rc)
+                       return rc;
+       }
 
        rc = ena_com_get_feature(ena_dev, &get_resp,
-                                ENA_ADMIN_AENQ_CONFIG);
+                                ENA_ADMIN_AENQ_CONFIG, 0);
        if (rc)
                return rc;
 
@@ -1787,13 +1971,46 @@ int ena_com_get_dev_attr_feat(struct ena_com_dev *ena_dev,
               sizeof(get_resp.u.aenq));
 
        rc = ena_com_get_feature(ena_dev, &get_resp,
-                                ENA_ADMIN_STATELESS_OFFLOAD_CONFIG);
+                                ENA_ADMIN_STATELESS_OFFLOAD_CONFIG, 0);
        if (rc)
                return rc;
 
        memcpy(&get_feat_ctx->offload, &get_resp.u.offload,
               sizeof(get_resp.u.offload));
 
+       /* Driver hints isn't mandatory admin command. So in case the
+        * command isn't supported set driver hints to 0
+        */
+       rc = ena_com_get_feature(ena_dev, &get_resp, ENA_ADMIN_HW_HINTS, 0);
+
+       if (!rc)
+               memcpy(&get_feat_ctx->hw_hints, &get_resp.u.hw_hints,
+                      sizeof(get_resp.u.hw_hints));
+       else if (rc == ENA_COM_UNSUPPORTED)
+               memset(&get_feat_ctx->hw_hints, 0x0, sizeof(get_feat_ctx->hw_hints));
+       else
+               return rc;
+
+       rc = ena_com_get_feature(ena_dev, &get_resp, ENA_ADMIN_LLQ, 0);
+       if (!rc)
+               memcpy(&get_feat_ctx->llq, &get_resp.u.llq,
+                      sizeof(get_resp.u.llq));
+       else if (rc == ENA_COM_UNSUPPORTED)
+               memset(&get_feat_ctx->llq, 0x0, sizeof(get_feat_ctx->llq));
+       else
+               return rc;
+
+       rc = ena_com_get_feature(ena_dev, &get_resp,
+                                ENA_ADMIN_RSS_REDIRECTION_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;
 }
 
@@ -1825,6 +2042,7 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)
        struct ena_admin_aenq_entry *aenq_e;
        struct ena_admin_aenq_common_desc *aenq_common;
        struct ena_com_aenq *aenq  = &dev->aenq;
+       u64 timestamp;
        ena_aenq_handler handler_cb;
        u16 masked_head, processed = 0;
        u8 phase;
@@ -1835,13 +2053,20 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)
        aenq_common = &aenq_e->aenq_common_desc;
 
        /* Go over all the events */
-       while ((aenq_common->flags & ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) ==
-               phase) {
-               ena_trc_dbg("AENQ! Group[%x] Syndrom[%x] timestamp: [%llus]\n",
+       while ((READ_ONCE8(aenq_common->flags) &
+               ENA_ADMIN_AENQ_COMMON_DESC_PHASE_MASK) == phase) {
+               /* Make sure the phase bit (ownership) is as expected before
+                * reading the rest of the descriptor.
+                */
+               dma_rmb();
+
+               timestamp = (u64)aenq_common->timestamp_low |
+                       ((u64)aenq_common->timestamp_high << 32);
+               ENA_TOUCH(timestamp); /* In case debug is disabled */
+               ena_trc_dbg("AENQ! Group[%x] Syndrom[%x] timestamp: [%" ENA_PRIu64 "s]\n",
                            aenq_common->group,
                            aenq_common->syndrom,
-                           (unsigned long long)aenq_common->timestamp_low +
-                           ((u64)aenq_common->timestamp_high << 32));
+                           timestamp);
 
                /* Handle specific event*/
                handler_cb = ena_com_get_specific_aenq_cb(dev,
@@ -1869,11 +2094,15 @@ void ena_com_aenq_intr_handler(struct ena_com_dev *dev, void *data)
 
        /* write the aenq doorbell after all AENQ descriptors were read */
        mb();
-       ENA_REG_WRITE32((u32)aenq->head, (unsigned char *)dev->reg_bar
-                       + ENA_REGS_AENQ_HEAD_DB_OFF);
+       ENA_REG_WRITE32_RELAXED(dev->bus, (u32)aenq->head,
+                               dev->reg_bar + ENA_REGS_AENQ_HEAD_DB_OFF);
+#ifndef MMIOWB_NOT_DEFINED
+       mmiowb();
+#endif
 }
 
-int ena_com_dev_reset(struct ena_com_dev *ena_dev)
+int ena_com_dev_reset(struct ena_com_dev *ena_dev,
+                     enum ena_regs_reset_reason_types reset_reason)
 {
        u32 stat, timeout, cap, reset_val;
        int rc;
@@ -1901,8 +2130,9 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev)
 
        /* start reset */
        reset_val = ENA_REGS_DEV_CTL_DEV_RESET_MASK;
-       ENA_REG_WRITE32(reset_val, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_DEV_CTL_OFF);
+       reset_val |= (reset_reason << ENA_REGS_DEV_CTL_RESET_REASON_SHIFT) &
+                       ENA_REGS_DEV_CTL_RESET_REASON_MASK;
+       ENA_REG_WRITE32(ena_dev->bus, reset_val, ena_dev->reg_bar + ENA_REGS_DEV_CTL_OFF);
 
        /* Write again the MMIO read request address */
        ena_com_mmio_reg_read_request_write_dev_addr(ena_dev);
@@ -1915,29 +2145,32 @@ int ena_com_dev_reset(struct ena_com_dev *ena_dev)
        }
 
        /* reset done */
-       ENA_REG_WRITE32(0, (unsigned char *)ena_dev->reg_bar
-                       + ENA_REGS_DEV_CTL_OFF);
+       ENA_REG_WRITE32(ena_dev->bus, 0, ena_dev->reg_bar + ENA_REGS_DEV_CTL_OFF);
        rc = wait_for_reset_state(ena_dev, timeout, 0);
        if (rc != 0) {
                ena_trc_err("Reset indication didn't turn off\n");
                return rc;
        }
 
+       timeout = (cap & ENA_REGS_CAPS_ADMIN_CMD_TO_MASK) >>
+               ENA_REGS_CAPS_ADMIN_CMD_TO_SHIFT;
+       if (timeout)
+               /* the resolution of timeout reg is 100ms */
+               ena_dev->admin_queue.completion_timeout = timeout * 100000;
+       else
+               ena_dev->admin_queue.completion_timeout = ADMIN_CMD_TIMEOUT_US;
+
        return 0;
 }
 
 static int ena_get_dev_stats(struct ena_com_dev *ena_dev,
-                            struct ena_admin_aq_get_stats_cmd *get_cmd,
-                            struct ena_admin_acq_get_stats_resp *get_resp,
+                            struct ena_com_stats_ctx *ctx,
                             enum ena_admin_get_stats_type type)
 {
+       struct ena_admin_aq_get_stats_cmd *get_cmd = &ctx->get_cmd;
+       struct ena_admin_acq_get_stats_resp *get_resp = &ctx->get_resp;
        struct ena_com_admin_queue *admin_queue;
-       int ret = 0;
-
-       if (!ena_dev) {
-               ena_trc_err("%s : ena_dev is NULL\n", __func__);
-               return ENA_COM_NO_DEVICE;
-       }
+       int ret;
 
        admin_queue = &ena_dev->admin_queue;
 
@@ -1945,12 +2178,11 @@ static int ena_get_dev_stats(struct ena_com_dev *ena_dev,
        get_cmd->aq_common_descriptor.flags = 0;
        get_cmd->type = type;
 
-       ret =  ena_com_execute_admin_command(
-                       admin_queue,
-                       (struct ena_admin_aq_entry *)get_cmd,
-                       sizeof(*get_cmd),
-                       (struct ena_admin_acq_entry *)get_resp,
-                       sizeof(*get_resp));
+       ret =  ena_com_execute_admin_command(admin_queue,
+                                            (struct ena_admin_aq_entry *)get_cmd,
+                                            sizeof(*get_cmd),
+                                            (struct ena_admin_acq_entry *)get_resp,
+                                            sizeof(*get_resp));
 
        if (unlikely(ret))
                ena_trc_err("Failed to get stats. error: %d\n", ret);
@@ -1961,60 +2193,15 @@ static int ena_get_dev_stats(struct ena_com_dev *ena_dev,
 int ena_com_get_dev_basic_stats(struct ena_com_dev *ena_dev,
                                struct ena_admin_basic_stats *stats)
 {
-       int ret = 0;
-       struct ena_admin_aq_get_stats_cmd get_cmd;
-       struct ena_admin_acq_get_stats_resp get_resp;
+       struct ena_com_stats_ctx ctx;
+       int ret;
 
-       memset(&get_cmd, 0x0, sizeof(get_cmd));
-       ret = ena_get_dev_stats(ena_dev, &get_cmd, &get_resp,
-                               ENA_ADMIN_GET_STATS_TYPE_BASIC);
+       memset(&ctx, 0x0, sizeof(ctx));
+       ret = ena_get_dev_stats(ena_dev, &ctx, ENA_ADMIN_GET_STATS_TYPE_BASIC);
        if (likely(ret == 0))
-               memcpy(stats, &get_resp.basic_stats,
-                      sizeof(get_resp.basic_stats));
-
-       return ret;
-}
-
-int ena_com_get_dev_extended_stats(struct ena_com_dev *ena_dev, char *buff,
-                                  u32 len)
-{
-       int ret = 0;
-       struct ena_admin_aq_get_stats_cmd get_cmd;
-       struct ena_admin_acq_get_stats_resp get_resp;
-       ena_mem_handle_t mem_handle = 0;
-       void *virt_addr;
-       dma_addr_t phys_addr;
-
-       ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev, len,
-                              virt_addr, phys_addr, mem_handle);
-       if (!virt_addr) {
-               ret = ENA_COM_NO_MEM;
-               goto done;
-       }
-       memset(&get_cmd, 0x0, sizeof(get_cmd));
-       ret = ena_com_mem_addr_set(ena_dev,
-                                  &get_cmd.u.control_buffer.address,
-                                  phys_addr);
-       if (unlikely(ret)) {
-               ena_trc_err("memory address set failed\n");
-               return ret;
-       }
-       get_cmd.u.control_buffer.length = len;
-
-       get_cmd.device_id = ena_dev->stats_func;
-       get_cmd.queue_idx = ena_dev->stats_queue;
-
-       ret = ena_get_dev_stats(ena_dev, &get_cmd, &get_resp,
-                               ENA_ADMIN_GET_STATS_TYPE_EXTENDED);
-       if (ret < 0)
-               goto free_ext_stats_mem;
+               memcpy(stats, &ctx.get_resp.basic_stats,
+                      sizeof(ctx.get_resp.basic_stats));
 
-       ret = snprintf(buff, len, "%s", (char *)virt_addr);
-
-free_ext_stats_mem:
-       ENA_MEM_FREE_COHERENT(ena_dev->dmadev, len, virt_addr, phys_addr,
-                             mem_handle);
-done:
        return ret;
 }
 
@@ -2023,16 +2210,11 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu)
        struct ena_com_admin_queue *admin_queue;
        struct ena_admin_set_feat_cmd cmd;
        struct ena_admin_set_feat_resp resp;
-       int ret = 0;
-
-       if (unlikely(!ena_dev)) {
-               ena_trc_err("%s : ena_dev is NULL\n", __func__);
-               return ENA_COM_NO_DEVICE;
-       }
+       int ret;
 
        if (!ena_com_check_supported_feature_id(ena_dev, ENA_ADMIN_MTU)) {
-               ena_trc_info("Feature %d isn't supported\n", ENA_ADMIN_MTU);
-               return ENA_COM_PERMISSION;
+               ena_trc_dbg("Feature %d isn't supported\n", ENA_ADMIN_MTU);
+               return ENA_COM_UNSUPPORTED;
        }
 
        memset(&cmd, 0x0, sizeof(cmd));
@@ -2049,11 +2231,10 @@ int ena_com_set_dev_mtu(struct ena_com_dev *ena_dev, int mtu)
                                            (struct ena_admin_acq_entry *)&resp,
                                            sizeof(resp));
 
-       if (unlikely(ret)) {
+       if (unlikely(ret))
                ena_trc_err("Failed to set mtu %d. error: %d\n", mtu, ret);
-               return ENA_COM_INVAL;
-       }
-       return 0;
+
+       return ret;
 }
 
 int ena_com_get_offload_settings(struct ena_com_dev *ena_dev,
@@ -2063,10 +2244,10 @@ int ena_com_get_offload_settings(struct ena_com_dev *ena_dev,
        struct ena_admin_get_feat_resp resp;
 
        ret = ena_com_get_feature(ena_dev, &resp,
-                                 ENA_ADMIN_STATELESS_OFFLOAD_CONFIG);
+                                 ENA_ADMIN_STATELESS_OFFLOAD_CONFIG, 0);
        if (unlikely(ret)) {
                ena_trc_err("Failed to get offload capabilities %d\n", ret);
-               return ENA_COM_INVAL;
+               return ret;
        }
 
        memcpy(offload, &resp.u.offload, sizeof(resp.u.offload));
@@ -2085,21 +2266,21 @@ int ena_com_set_hash_function(struct ena_com_dev *ena_dev)
 
        if (!ena_com_check_supported_feature_id(ena_dev,
                                                ENA_ADMIN_RSS_HASH_FUNCTION)) {
-               ena_trc_info("Feature %d isn't supported\n",
-                            ENA_ADMIN_RSS_HASH_FUNCTION);
-               return ENA_COM_PERMISSION;
+               ena_trc_dbg("Feature %d isn't supported\n",
+                           ENA_ADMIN_RSS_HASH_FUNCTION);
+               return ENA_COM_UNSUPPORTED;
        }
 
        /* Validate hash function is supported */
        ret = ena_com_get_feature(ena_dev, &get_resp,
-                                 ENA_ADMIN_RSS_HASH_FUNCTION);
+                                 ENA_ADMIN_RSS_HASH_FUNCTION, 0);
        if (unlikely(ret))
                return ret;
 
-       if (get_resp.u.flow_hash_func.supported_func & (1 << rss->hash_func)) {
+       if (!(get_resp.u.flow_hash_func.supported_func & BIT(rss->hash_func))) {
                ena_trc_err("Func hash %d isn't supported by device, abort\n",
                            rss->hash_func);
-               return ENA_COM_PERMISSION;
+               return ENA_COM_UNSUPPORTED;
        }
 
        memset(&cmd, 0x0, sizeof(cmd));
@@ -2139,12 +2320,14 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,
                               enum ena_admin_hash_functions func,
                               const u8 *key, u16 key_len, u32 init_val)
 {
-       struct ena_rss *rss = &ena_dev->rss;
+       struct ena_admin_feature_rss_flow_hash_control *hash_key;
        struct ena_admin_get_feat_resp get_resp;
-       struct ena_admin_feature_rss_flow_hash_control *hash_key =
-               rss->hash_key;
+       enum ena_admin_hash_functions old_func;
+       struct ena_rss *rss = &ena_dev->rss;
        int rc;
 
+       hash_key = rss->hash_key;
+
        /* Make sure size is a mult of DWs */
        if (unlikely(key_len & 0x3))
                return ENA_COM_INVAL;
@@ -2152,26 +2335,27 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,
        rc = ena_com_get_feature_ex(ena_dev, &get_resp,
                                    ENA_ADMIN_RSS_HASH_FUNCTION,
                                    rss->hash_key_dma_addr,
-                                   sizeof(*rss->hash_key));
+                                   sizeof(*rss->hash_key), 0);
        if (unlikely(rc))
                return rc;
 
-       if (!((1 << func) & get_resp.u.flow_hash_func.supported_func)) {
+       if (!(BIT(func) & get_resp.u.flow_hash_func.supported_func)) {
                ena_trc_err("Flow hash function %d isn't supported\n", func);
-               return ENA_COM_PERMISSION;
+               return ENA_COM_UNSUPPORTED;
        }
 
        switch (func) {
        case ENA_ADMIN_TOEPLITZ:
-               if (key_len > sizeof(hash_key->key)) {
-                       ena_trc_err("key len (%hu) is bigger than the max supported (%zu)\n",
-                                   key_len, sizeof(hash_key->key));
-                       return ENA_COM_INVAL;
+               if (key) {
+                       if (key_len != sizeof(hash_key->key)) {
+                               ena_trc_err("key len (%hu) doesn't equal the supported size (%zu)\n",
+                                            key_len, sizeof(hash_key->key));
+                               return ENA_COM_INVAL;
+                       }
+                       memcpy(hash_key->key, key, key_len);
+                       rss->hash_init_val = init_val;
+                       hash_key->keys_num = key_len / sizeof(u32);
                }
-
-               memcpy(hash_key->key, key, key_len);
-               rss->hash_init_val = init_val;
-               hash_key->keys_num = key_len >> 2;
                break;
        case ENA_ADMIN_CRC32:
                rss->hash_init_val = init_val;
@@ -2181,11 +2365,13 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev,
                return ENA_COM_INVAL;
        }
 
+       old_func = rss->hash_func;
+       rss->hash_func = func;
        rc = ena_com_set_hash_function(ena_dev);
 
        /* Restore the old function */
        if (unlikely(rc))
-               ena_com_get_hash_function(ena_dev, NULL, NULL);
+               rss->hash_func = old_func;
 
        return rc;
 }
@@ -2203,11 +2389,15 @@ int ena_com_get_hash_function(struct ena_com_dev *ena_dev,
        rc = ena_com_get_feature_ex(ena_dev, &get_resp,
                                    ENA_ADMIN_RSS_HASH_FUNCTION,
                                    rss->hash_key_dma_addr,
-                                   sizeof(*rss->hash_key));
+                                   sizeof(*rss->hash_key), 0);
        if (unlikely(rc))
                return rc;
 
-       rss->hash_func = (enum ena_admin_hash_functions)get_resp.u.flow_hash_func.selected_func;
+       /* ENA_FFS returns 1 in case the lsb is set */
+       rss->hash_func = ENA_FFS(get_resp.u.flow_hash_func.selected_func);
+       if (rss->hash_func)
+               rss->hash_func--;
+
        if (func)
                *func = rss->hash_func;
 
@@ -2228,7 +2418,7 @@ int ena_com_get_hash_ctrl(struct ena_com_dev *ena_dev,
        rc = ena_com_get_feature_ex(ena_dev, &get_resp,
                                    ENA_ADMIN_RSS_HASH_INPUT,
                                    rss->hash_ctrl_dma_addr,
-                                   sizeof(*rss->hash_ctrl));
+                                   sizeof(*rss->hash_ctrl), 0);
        if (unlikely(rc))
                return rc;
 
@@ -2242,17 +2432,20 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)
 {
        struct ena_com_admin_queue *admin_queue = &ena_dev->admin_queue;
        struct ena_rss *rss = &ena_dev->rss;
+       struct ena_admin_feature_rss_hash_control *hash_ctrl = rss->hash_ctrl;
        struct ena_admin_set_feat_cmd cmd;
        struct ena_admin_set_feat_resp resp;
        int ret;
 
        if (!ena_com_check_supported_feature_id(ena_dev,
                                                ENA_ADMIN_RSS_HASH_INPUT)) {
-               ena_trc_info("Feature %d isn't supported\n",
-                            ENA_ADMIN_RSS_HASH_INPUT);
-               return ENA_COM_PERMISSION;
+               ena_trc_dbg("Feature %d isn't supported\n",
+                           ENA_ADMIN_RSS_HASH_INPUT);
+               return ENA_COM_UNSUPPORTED;
        }
 
+       memset(&cmd, 0x0, sizeof(cmd));
+
        cmd.aq_common_descriptor.opcode = ENA_ADMIN_SET_FEATURE;
        cmd.aq_common_descriptor.flags =
                ENA_ADMIN_AQ_COMMON_DESC_CTRL_DATA_INDIRECT_MASK;
@@ -2268,20 +2461,17 @@ int ena_com_set_hash_ctrl(struct ena_com_dev *ena_dev)
                ena_trc_err("memory address set failed\n");
                return ret;
        }
-       cmd.control_buffer.length =
-               sizeof(struct ena_admin_feature_rss_hash_control);
+       cmd.control_buffer.length = sizeof(*hash_ctrl);
 
        ret = ena_com_execute_admin_command(admin_queue,
                                            (struct ena_admin_aq_entry *)&cmd,
                                            sizeof(cmd),
                                            (struct ena_admin_acq_entry *)&resp,
                                            sizeof(resp));
-       if (unlikely(ret)) {
+       if (unlikely(ret))
                ena_trc_err("Failed to set hash input. error: %d\n", ret);
-               ret = ENA_COM_INVAL;
-       }
 
-       return 0;
+       return ret;
 }
 
 int ena_com_set_default_hash_ctrl(struct ena_com_dev *ena_dev)
@@ -2293,7 +2483,7 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev *ena_dev)
        int rc, i;
 
        /* Get the supported hash input */
-       rc = ena_com_get_hash_ctrl(ena_dev, (enum ena_admin_flow_hash_proto)0, NULL);
+       rc = ena_com_get_hash_ctrl(ena_dev, 0, NULL);
        if (unlikely(rc))
                return rc;
 
@@ -2322,7 +2512,7 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev *ena_dev)
        hash_ctrl->selected_fields[ENA_ADMIN_RSS_IP4_FRAG].fields =
                ENA_ADMIN_RSS_L3_SA | ENA_ADMIN_RSS_L3_DA;
 
-       hash_ctrl->selected_fields[ENA_ADMIN_RSS_IP4_FRAG].fields =
+       hash_ctrl->selected_fields[ENA_ADMIN_RSS_NOT_IP].fields =
                ENA_ADMIN_RSS_L2_DA | ENA_ADMIN_RSS_L2_SA;
 
        for (i = 0; i < ENA_ADMIN_RSS_PROTO_NUM; i++) {
@@ -2332,7 +2522,7 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev *ena_dev)
                        ena_trc_err("hash control doesn't support all the desire configuration. proto %x supported %x selected %x\n",
                                    i, hash_ctrl->supported_fields[i].fields,
                                    hash_ctrl->selected_fields[i].fields);
-                       return ENA_COM_PERMISSION;
+                       return ENA_COM_UNSUPPORTED;
                }
        }
 
@@ -2340,7 +2530,7 @@ int ena_com_set_default_hash_ctrl(struct ena_com_dev *ena_dev)
 
        /* In case of failure, restore the old hash ctrl */
        if (unlikely(rc))
-               ena_com_get_hash_ctrl(ena_dev, (enum ena_admin_flow_hash_proto)0, NULL);
+               ena_com_get_hash_ctrl(ena_dev, 0, NULL);
 
        return rc;
 }
@@ -2377,7 +2567,7 @@ int ena_com_fill_hash_ctrl(struct ena_com_dev *ena_dev,
 
        /* In case of failure, restore the old hash ctrl */
        if (unlikely(rc))
-               ena_com_get_hash_ctrl(ena_dev, (enum ena_admin_flow_hash_proto)0, NULL);
+               ena_com_get_hash_ctrl(ena_dev, 0, NULL);
 
        return 0;
 }
@@ -2404,14 +2594,13 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)
        struct ena_rss *rss = &ena_dev->rss;
        struct ena_admin_set_feat_cmd cmd;
        struct ena_admin_set_feat_resp resp;
-       int ret = 0;
+       int ret;
 
-       if (!ena_com_check_supported_feature_id(
-                               ena_dev,
-                               ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG)) {
-               ena_trc_info("Feature %d isn't supported\n",
-                            ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG);
-               return ENA_COM_PERMISSION;
+       if (!ena_com_check_supported_feature_id(ena_dev,
+                                               ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG)) {
+               ena_trc_dbg("Feature %d isn't supported\n",
+                           ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG);
+               return ENA_COM_UNSUPPORTED;
        }
 
        ret = ena_com_ind_tbl_convert_to_device(ena_dev);
@@ -2446,12 +2635,10 @@ int ena_com_indirect_table_set(struct ena_com_dev *ena_dev)
                                            (struct ena_admin_acq_entry *)&resp,
                                            sizeof(resp));
 
-       if (unlikely(ret)) {
+       if (unlikely(ret))
                ena_trc_err("Failed to set indirect table. error: %d\n", ret);
-               return ENA_COM_INVAL;
-       }
 
-       return 0;
+       return ret;
 }
 
 int ena_com_indirect_table_get(struct ena_com_dev *ena_dev, u32 *ind_tbl)
@@ -2467,17 +2654,13 @@ int ena_com_indirect_table_get(struct ena_com_dev *ena_dev, u32 *ind_tbl)
        rc = ena_com_get_feature_ex(ena_dev, &get_resp,
                                    ENA_ADMIN_RSS_REDIRECTION_TABLE_CONFIG,
                                    rss->rss_ind_tbl_dma_addr,
-                                   tbl_size);
+                                   tbl_size, 0);
        if (unlikely(rc))
                return rc;
 
        if (!ind_tbl)
                return 0;
 
-       rc = ena_com_ind_tbl_convert_from_device(ena_dev);
-       if (unlikely(rc))
-               return rc;
-
        for (i = 0; i < (1 << rss->tbl_log_size); i++)
                ind_tbl[i] = rss->host_rss_ind_tbl[i];
 
@@ -2498,6 +2681,8 @@ int ena_com_rss_init(struct ena_com_dev *ena_dev, u16 indr_tbl_log_size)
        if (unlikely(rc))
                goto err_hash_key;
 
+       ena_com_hash_key_fill_default_key(ena_dev);
+
        rc = ena_com_hash_ctrl_init(ena_dev);
        if (unlikely(rc))
                goto err_hash_ctrl;
@@ -2534,21 +2719,26 @@ int ena_com_allocate_host_info(struct ena_com_dev *ena_dev)
        if (unlikely(!host_attr->host_info))
                return ENA_COM_NO_MEM;
 
+       host_attr->host_info->ena_spec_version = ((ENA_COMMON_SPEC_VERSION_MAJOR <<
+               ENA_REGS_VERSION_MAJOR_VERSION_SHIFT) |
+               (ENA_COMMON_SPEC_VERSION_MINOR));
+
        return 0;
 }
 
 int ena_com_allocate_debug_area(struct ena_com_dev *ena_dev,
-                               u32 debug_area_size) {
+                               u32 debug_area_size)
+{
        struct ena_host_attribute *host_attr = &ena_dev->host_attr;
 
-               ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
-                                      debug_area_size,
-                                      host_attr->debug_area_virt_addr,
-                                      host_attr->debug_area_dma_addr,
-                                      host_attr->debug_area_dma_handle);
-               if (unlikely(!host_attr->debug_area_virt_addr)) {
-                       host_attr->debug_area_size = 0;
-                       return ENA_COM_NO_MEM;
+       ENA_MEM_ALLOC_COHERENT(ena_dev->dmadev,
+                              debug_area_size,
+                              host_attr->debug_area_virt_addr,
+                              host_attr->debug_area_dma_addr,
+                              host_attr->debug_area_dma_handle);
+       if (unlikely(!host_attr->debug_area_virt_addr)) {
+               host_attr->debug_area_size = 0;
+               return ENA_COM_NO_MEM;
        }
 
        host_attr->debug_area_size = debug_area_size;
@@ -2590,6 +2780,7 @@ int ena_com_set_host_attributes(struct ena_com_dev *ena_dev)
        struct ena_com_admin_queue *admin_queue;
        struct ena_admin_set_feat_cmd cmd;
        struct ena_admin_set_feat_resp resp;
+
        int ret;
 
        /* Host attribute config is called before ena_com_get_dev_attr_feat
@@ -2635,49 +2826,39 @@ int ena_com_set_host_attributes(struct ena_com_dev *ena_dev)
 /* Interrupt moderation */
 bool ena_com_interrupt_moderation_supported(struct ena_com_dev *ena_dev)
 {
-       return ena_com_check_supported_feature_id(
-                       ena_dev,
-                       ENA_ADMIN_INTERRUPT_MODERATION);
+       return ena_com_check_supported_feature_id(ena_dev,
+                                                 ENA_ADMIN_INTERRUPT_MODERATION);
 }
 
-int
-ena_com_update_nonadaptive_moderation_interval_tx(struct ena_com_dev *ena_dev,
-                                                 u32 tx_coalesce_usecs)
+static int ena_com_update_nonadaptive_moderation_interval(u32 coalesce_usecs,
+                                                         u32 intr_delay_resolution,
+                                                         u32 *intr_moder_interval)
 {
-       if (!ena_dev->intr_delay_resolution) {
+       if (!intr_delay_resolution) {
                ena_trc_err("Illegal interrupt delay granularity value\n");
                return ENA_COM_FAULT;
        }
 
-       ena_dev->intr_moder_tx_interval = tx_coalesce_usecs /
-               ena_dev->intr_delay_resolution;
+       *intr_moder_interval = coalesce_usecs / intr_delay_resolution;
 
        return 0;
 }
 
-int
-ena_com_update_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev,
-                                                 u32 rx_coalesce_usecs)
-{
-       if (!ena_dev->intr_delay_resolution) {
-               ena_trc_err("Illegal interrupt delay granularity value\n");
-               return ENA_COM_FAULT;
-       }
 
-       /* We use LOWEST entry of moderation table for storing
-        * nonadaptive interrupt coalescing values
-        */
-       ena_dev->intr_moder_tbl[ENA_INTR_MODER_LOWEST].intr_moder_interval =
-               rx_coalesce_usecs / ena_dev->intr_delay_resolution;
-
-       return 0;
+int ena_com_update_nonadaptive_moderation_interval_tx(struct ena_com_dev *ena_dev,
+                                                     u32 tx_coalesce_usecs)
+{
+       return ena_com_update_nonadaptive_moderation_interval(tx_coalesce_usecs,
+                                                             ena_dev->intr_delay_resolution,
+                                                             &ena_dev->intr_moder_tx_interval);
 }
 
-void ena_com_destroy_interrupt_moderation(struct ena_com_dev *ena_dev)
+int ena_com_update_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev,
+                                                     u32 rx_coalesce_usecs)
 {
-       if (ena_dev->intr_moder_tbl)
-               ENA_MEM_FREE(ena_dev->dmadev, ena_dev->intr_moder_tbl);
-       ena_dev->intr_moder_tbl = NULL;
+       return ena_com_update_nonadaptive_moderation_interval(rx_coalesce_usecs,
+                                                             ena_dev->intr_delay_resolution,
+                                                             &ena_dev->intr_moder_rx_interval);
 }
 
 int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)
@@ -2687,12 +2868,12 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)
        int rc;
 
        rc = ena_com_get_feature(ena_dev, &get_resp,
-                                ENA_ADMIN_INTERRUPT_MODERATION);
+                                ENA_ADMIN_INTERRUPT_MODERATION, 0);
 
        if (rc) {
-               if (rc == ENA_COM_PERMISSION) {
-                       ena_trc_info("Feature %d isn't supported\n",
-                                    ENA_ADMIN_INTERRUPT_MODERATION);
+               if (rc == ENA_COM_UNSUPPORTED) {
+                       ena_trc_dbg("Feature %d isn't supported\n",
+                                   ENA_ADMIN_INTERRUPT_MODERATION);
                        rc = 0;
                } else {
                        ena_trc_err("Failed to get interrupt moderation admin cmd. rc: %d\n",
@@ -2704,112 +2885,51 @@ int ena_com_init_interrupt_moderation(struct ena_com_dev *ena_dev)
                return rc;
        }
 
-       rc = ena_com_init_interrupt_moderation_table(ena_dev);
-       if (rc)
-               goto err;
-
        /* if moderation is supported by device we set adaptive moderation */
        delay_resolution = get_resp.u.intr_moderation.intr_delay_resolution;
        ena_com_update_intr_delay_resolution(ena_dev, delay_resolution);
-       ena_com_enable_adaptive_moderation(ena_dev);
+
+       /* Disable adaptive moderation by default - can be enabled later */
+       ena_com_disable_adaptive_moderation(ena_dev);
 
        return 0;
-err:
-       ena_com_destroy_interrupt_moderation(ena_dev);
-       return rc;
 }
 
-void
-ena_com_config_default_interrupt_moderation_table(struct ena_com_dev *ena_dev)
-{
-       struct ena_intr_moder_entry *intr_moder_tbl = ena_dev->intr_moder_tbl;
-
-       if (!intr_moder_tbl)
-               return;
-
-       intr_moder_tbl[ENA_INTR_MODER_LOWEST].intr_moder_interval =
-               ENA_INTR_LOWEST_USECS;
-       intr_moder_tbl[ENA_INTR_MODER_LOWEST].pkts_per_interval =
-               ENA_INTR_LOWEST_PKTS;
-       intr_moder_tbl[ENA_INTR_MODER_LOWEST].bytes_per_interval =
-               ENA_INTR_LOWEST_BYTES;
-
-       intr_moder_tbl[ENA_INTR_MODER_LOW].intr_moder_interval =
-               ENA_INTR_LOW_USECS;
-       intr_moder_tbl[ENA_INTR_MODER_LOW].pkts_per_interval =
-               ENA_INTR_LOW_PKTS;
-       intr_moder_tbl[ENA_INTR_MODER_LOW].bytes_per_interval =
-               ENA_INTR_LOW_BYTES;
-
-       intr_moder_tbl[ENA_INTR_MODER_MID].intr_moder_interval =
-               ENA_INTR_MID_USECS;
-       intr_moder_tbl[ENA_INTR_MODER_MID].pkts_per_interval =
-               ENA_INTR_MID_PKTS;
-       intr_moder_tbl[ENA_INTR_MODER_MID].bytes_per_interval =
-               ENA_INTR_MID_BYTES;
-
-       intr_moder_tbl[ENA_INTR_MODER_HIGH].intr_moder_interval =
-               ENA_INTR_HIGH_USECS;
-       intr_moder_tbl[ENA_INTR_MODER_HIGH].pkts_per_interval =
-               ENA_INTR_HIGH_PKTS;
-       intr_moder_tbl[ENA_INTR_MODER_HIGH].bytes_per_interval =
-               ENA_INTR_HIGH_BYTES;
-
-       intr_moder_tbl[ENA_INTR_MODER_HIGHEST].intr_moder_interval =
-               ENA_INTR_HIGHEST_USECS;
-       intr_moder_tbl[ENA_INTR_MODER_HIGHEST].pkts_per_interval =
-               ENA_INTR_HIGHEST_PKTS;
-       intr_moder_tbl[ENA_INTR_MODER_HIGHEST].bytes_per_interval =
-               ENA_INTR_HIGHEST_BYTES;
-}
-
-unsigned int
-ena_com_get_nonadaptive_moderation_interval_tx(struct ena_com_dev *ena_dev)
+unsigned int ena_com_get_nonadaptive_moderation_interval_tx(struct ena_com_dev *ena_dev)
 {
        return ena_dev->intr_moder_tx_interval;
 }
 
-unsigned int
-ena_com_get_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev)
+unsigned int ena_com_get_nonadaptive_moderation_interval_rx(struct ena_com_dev *ena_dev)
 {
-       struct ena_intr_moder_entry *intr_moder_tbl = ena_dev->intr_moder_tbl;
-
-       if (intr_moder_tbl)
-               return intr_moder_tbl[ENA_INTR_MODER_LOWEST].intr_moder_interval;
-
-       return 0;
+       return ena_dev->intr_moder_rx_interval;
 }
 
-void ena_com_init_intr_moderation_entry(struct ena_com_dev *ena_dev,
-                                       enum ena_intr_moder_level level,
-                                       struct ena_intr_moder_entry *entry)
+int ena_com_config_dev_mode(struct ena_com_dev *ena_dev,
+                           struct ena_admin_feature_llq_desc *llq_features,
+                           struct ena_llq_configurations *llq_default_cfg)
 {
-       struct ena_intr_moder_entry *intr_moder_tbl = ena_dev->intr_moder_tbl;
+       int rc;
+       struct ena_com_llq_info *llq_info = &(ena_dev->llq_info);;
 
-       if (level >= ENA_INTR_MAX_NUM_OF_LEVELS)
-               return;
+       if (!llq_features->max_llq_num) {
+               ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_HOST;
+               return 0;
+       }
 
-       intr_moder_tbl[level].intr_moder_interval = entry->intr_moder_interval;
-       if (ena_dev->intr_delay_resolution)
-               intr_moder_tbl[level].intr_moder_interval /=
-                       ena_dev->intr_delay_resolution;
-       intr_moder_tbl[level].pkts_per_interval = entry->pkts_per_interval;
-       intr_moder_tbl[level].bytes_per_interval = entry->bytes_per_interval;
-}
+       rc = ena_com_config_llq_info(ena_dev, llq_features, llq_default_cfg);
+       if (rc)
+               return rc;
 
-void ena_com_get_intr_moderation_entry(struct ena_com_dev *ena_dev,
-                                      enum ena_intr_moder_level level,
-                                      struct ena_intr_moder_entry *entry)
-{
-       struct ena_intr_moder_entry *intr_moder_tbl = ena_dev->intr_moder_tbl;
+       ena_dev->tx_max_header_size = llq_info->desc_list_entry_size -
+               (llq_info->descs_num_before_header * sizeof(struct ena_eth_io_tx_desc));
 
-       if (level >= ENA_INTR_MAX_NUM_OF_LEVELS)
-               return;
+       if (ena_dev->tx_max_header_size == 0) {
+               ena_trc_err("the size of the LLQ entry is smaller than needed\n");
+               return -EINVAL;
+       }
 
-       entry->intr_moder_interval = intr_moder_tbl[level].intr_moder_interval;
-       if (ena_dev->intr_delay_resolution)
-               entry->intr_moder_interval *= ena_dev->intr_delay_resolution;
-       entry->pkts_per_interval =
-       intr_moder_tbl[level].pkts_per_interval;
-       entry->bytes_per_interval = intr_moder_tbl[level].bytes_per_interval;
+       ena_dev->tx_mem_queue_type = ENA_ADMIN_PLACEMENT_POLICY_DEV;
+
+       return 0;
 }