Adjust ENA driver files to latest ena-com changes

* Use the new API of ena_trace_*
* Fix typo syndrom --> syndrome
* Remove validation of the Rx req ID (already performed in the ena-com)
* Remove usage of deprecated ENA_ASSERT macro

Submitted by:   Ido Segev <idose@amazon.com>
Submitted by:   Michal Krawczyk <mk@semihalf.com>
Obtained from:  Semihalf
Sponsored by:   Amazon, Inc
MFC after:      1 week
Differential revision:  https://reviews.freebsd.org/D27115

4 files changed, 114 insertions, 139 deletions

diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c
index b2310391c596..4d853d968351 100644
--- a/sys/dev/ena/ena.c
+++ b/sys/dev/ena/ena.c
@@ -226,14 +226,14 @@ ena_dma_alloc(device_t dmadev, bus_size_t size,
 	    NULL,	      /* lockarg 			*/
 	    &dma->tag);
 	if (unlikely(error != 0)) {
-		ena_trace(ENA_ALERT, "bus_dma_tag_create failed: %d\n", error);
+		ena_trace(NULL, ENA_ALERT, "bus_dma_tag_create failed: %d\n", error);
 		goto fail_tag;
 	}
 
 	error = bus_dmamem_alloc(dma->tag, (void**) &dma->vaddr,
 	    BUS_DMA_COHERENT | BUS_DMA_ZERO, &dma->map);
 	if (unlikely(error != 0)) {
-		ena_trace(ENA_ALERT, "bus_dmamem_alloc(%ju) failed: %d\n",
+		ena_trace(NULL, ENA_ALERT, "bus_dmamem_alloc(%ju) failed: %d\n",
 		    (uintmax_t)size, error);
 		goto fail_map_create;
 	}
@@ -242,7 +242,7 @@ ena_dma_alloc(device_t dmadev, bus_size_t size,
 	error = bus_dmamap_load(dma->tag, dma->map, dma->vaddr,
 	    size, ena_dmamap_callback, &dma->paddr, mapflags);
 	if (unlikely((error != 0) || (dma->paddr == 0))) {
-		ena_trace(ENA_ALERT, ": bus_dmamap_load failed: %d\n", error);
+		ena_trace(NULL, ENA_ALERT, ": bus_dmamap_load failed: %d\n", error);
 		goto fail_map_load;
 	}
 
@@ -315,7 +315,7 @@ ena_probe(device_t dev)
 	while (ent->vendor_id != 0) {
 		if ((pci_vendor_id == ent->vendor_id) &&
 		    (pci_device_id == ent->device_id)) {
-			ena_trace(ENA_DBG, "vendor=%x device=%x\n",
+			ena_trace(NULL, ENA_DBG, "vendor=%x device=%x\n",
 			    pci_vendor_id, pci_device_id);
 
 			sprintf(adapter_name, DEVICE_DESC);
@@ -345,7 +345,7 @@ ena_change_mtu(if_t ifp, int new_mtu)
 
 	rc = ena_com_set_dev_mtu(adapter->ena_dev, new_mtu);
 	if (likely(rc == 0)) {
-		ena_trace(ENA_DBG, "set MTU to %d\n", new_mtu);
+		ena_trace(NULL, ENA_DBG, "set MTU to %d\n", new_mtu);
 		if_setmtu(ifp, new_mtu);
 	} else {
 		device_printf(adapter->pdev, "Failed to set MTU to %d\n",
@@ -666,7 +666,7 @@ ena_setup_tx_resources(struct ena_adapter *adapter, int qid)
 		err = bus_dmamap_create(adapter->tx_buf_tag, 0,
 		    &tx_ring->tx_buffer_info[i].dmamap);
 		if (unlikely(err != 0)) {
-			ena_trace(ENA_ALERT,
+			ena_trace(NULL, ENA_ALERT,
 			    "Unable to create Tx DMA map for buffer %d\n",
 			    i);
 			goto err_map_release;
@@ -679,7 +679,7 @@ ena_setup_tx_resources(struct ena_adapter *adapter, int qid)
 				err = bus_dmamap_create(adapter->tx_buf_tag, 0,
 				    &map[j]);
 				if (unlikely(err != 0)) {
-					ena_trace(ENA_ALERT, "Unable to create "
+					ena_trace(NULL, ENA_ALERT, "Unable to create "
 					    "Tx DMA for buffer %d %d\n", i, j);
 					goto err_map_release;
 				}
@@ -693,7 +693,7 @@ ena_setup_tx_resources(struct ena_adapter *adapter, int qid)
 	tx_ring->enqueue_tq = taskqueue_create_fast("ena_tx_enque", M_NOWAIT,
 	    taskqueue_thread_enqueue, &tx_ring->enqueue_tq);
 	if (unlikely(tx_ring->enqueue_tq == NULL)) {
-		ena_trace(ENA_ALERT,
+		ena_trace(NULL, ENA_ALERT,
 		    "Unable to create taskqueue for enqueue task\n");
 		i = tx_ring->ring_size;
 		goto err_map_release;
@@ -878,7 +878,7 @@ ena_setup_rx_resources(struct ena_adapter *adapter, unsigned int qid)
 		err = bus_dmamap_create(adapter->rx_buf_tag, 0,
 		    &(rx_ring->rx_buffer_info[i].map));
 		if (err != 0) {
-			ena_trace(ENA_ALERT,
+			ena_trace(NULL, ENA_ALERT,
 			    "Unable to create Rx DMA map for buffer %d\n", i);
 			goto err_buf_info_unmap;
 		}
@@ -891,7 +891,7 @@ ena_setup_rx_resources(struct ena_adapter *adapter, unsigned int qid)
 			device_printf(adapter->pdev,
 			    "LRO[%d] Initialization failed!\n", qid);
 		} else {
-			ena_trace(ENA_INFO,
+			ena_trace(NULL, ENA_INFO,
 			    "RX Soft LRO[%d] Initialized\n", qid);
 			rx_ring->lro.ifp = adapter->ifp;
 		}
@@ -1022,13 +1022,13 @@ ena_alloc_rx_mbuf(struct ena_adapter *adapter,
 	rx_info->mbuf->m_pkthdr.len = rx_info->mbuf->m_len = mlen;
 
 	/* Map packets for DMA */
-	ena_trace(ENA_DBG | ENA_RSC | ENA_RXPTH,
+	ena_trace(NULL, ENA_DBG | ENA_RSC | ENA_RXPTH,
 	    "Using tag %p for buffers' DMA mapping, mbuf %p len: %d\n",
 	    adapter->rx_buf_tag,rx_info->mbuf, rx_info->mbuf->m_len);
 	error = bus_dmamap_load_mbuf_sg(adapter->rx_buf_tag, rx_info->map,
 	    rx_info->mbuf, segs, &nsegs, BUS_DMA_NOWAIT);
 	if (unlikely((error != 0) || (nsegs != 1))) {
-		ena_trace(ENA_WARNING, "failed to map mbuf, error: %d, "
+		ena_trace(NULL, ENA_WARNING, "failed to map mbuf, error: %d, "
 		    "nsegs: %d\n", error, nsegs);
 		counter_u64_add(rx_ring->rx_stats.dma_mapping_err, 1);
 		goto exit;
@@ -1041,7 +1041,7 @@ ena_alloc_rx_mbuf(struct ena_adapter *adapter,
 	ena_buf->paddr = segs[0].ds_addr;
 	ena_buf->len = mlen;
 
-	ena_trace(ENA_DBG | ENA_RSC | ENA_RXPTH,
+	ena_trace(NULL, ENA_DBG | ENA_RSC | ENA_RXPTH,
 	    "ALLOC RX BUF: mbuf %p, rx_info %p, len %d, paddr %#jx\n",
 	    rx_info->mbuf, rx_info,ena_buf->len, (uintmax_t)ena_buf->paddr);
 
@@ -1059,7 +1059,7 @@ ena_free_rx_mbuf(struct ena_adapter *adapter, struct ena_ring *rx_ring,
 {
 
 	if (rx_info->mbuf == NULL) {
-		ena_trace(ENA_WARNING, "Trying to free unallocated buffer\n");
+		ena_trace(NULL, ENA_WARNING, "Trying to free unallocated buffer\n");
 		return;
 	}
 
@@ -1084,7 +1084,7 @@ ena_refill_rx_bufs(struct ena_ring *rx_ring, uint32_t num)
 	uint32_t i;
 	int rc;
 
-	ena_trace(ENA_DBG | ENA_RXPTH | ENA_RSC, "refill qid: %d\n",
+	ena_trace(NULL, ENA_DBG | ENA_RXPTH | ENA_RSC, "refill qid: %d\n",
 	    rx_ring->qid);
 
 	next_to_use = rx_ring->next_to_use;
@@ -1092,7 +1092,7 @@ ena_refill_rx_bufs(struct ena_ring *rx_ring, uint32_t num)
 	for (i = 0; i < num; i++) {
 		struct ena_rx_buffer *rx_info;
 
-		ena_trace(ENA_DBG | ENA_RXPTH | ENA_RSC,
+		ena_trace(NULL, ENA_DBG | ENA_RXPTH | ENA_RSC,
 		    "RX buffer - next to use: %d\n", next_to_use);
 
 		req_id = rx_ring->free_rx_ids[next_to_use];
@@ -1104,7 +1104,7 @@ ena_refill_rx_bufs(struct ena_ring *rx_ring, uint32_t num)
 #endif /* DEV_NETMAP */
 			rc = ena_alloc_rx_mbuf(adapter, rx_ring, rx_info);
 		if (unlikely(rc != 0)) {
-			ena_trace(ENA_WARNING,
+			ena_trace(NULL, ENA_WARNING,
 			    "failed to alloc buffer for rx queue %d\n",
 			    rx_ring->qid);
 			break;
@@ -1112,7 +1112,7 @@ ena_refill_rx_bufs(struct ena_ring *rx_ring, uint32_t num)
 		rc = ena_com_add_single_rx_desc(rx_ring->ena_com_io_sq,
 		    &rx_info->ena_buf, req_id);
 		if (unlikely(rc != 0)) {
-			ena_trace(ENA_WARNING,
+			ena_trace(NULL, ENA_WARNING,
 			    "failed to add buffer for rx queue %d\n",
 			    rx_ring->qid);
 			break;
@@ -1123,7 +1123,7 @@ ena_refill_rx_bufs(struct ena_ring *rx_ring, uint32_t num)
 
 	if (unlikely(i < num)) {
 		counter_u64_add(rx_ring->rx_stats.refil_partial, 1);
-		ena_trace(ENA_WARNING,
+		ena_trace(NULL, ENA_WARNING,
 		     "refilled rx qid %d with only %d mbufs (from %d)\n",
 		     rx_ring->qid, i, num);
 	}
@@ -1332,7 +1332,7 @@ ena_refill_all_rx_bufs(struct ena_adapter *adapter)
 		bufs_num = rx_ring->ring_size - 1;
 		rc = ena_refill_rx_bufs(rx_ring, bufs_num);
 		if (unlikely(rc != bufs_num))
-			ena_trace(ENA_WARNING, "refilling Queue %d failed. "
+			ena_trace(NULL, ENA_WARNING, "refilling Queue %d failed. "
 			    "Allocated %d buffers from: %d\n", i, rc, bufs_num);
 #ifdef DEV_NETMAP
 		rx_ring->initialized = true;
@@ -1373,7 +1373,7 @@ ena_free_tx_bufs(struct ena_adapter *adapter, unsigned int qid)
 			    qid, i);
 			print_once = false;
 		} else {
-			ena_trace(ENA_DBG,
+			ena_trace(NULL, ENA_DBG,
 			    "free uncompleted tx mbuf qid %d idx 0x%x\n",
 			     qid, i);
 		}
@@ -1589,7 +1589,7 @@ ena_enable_msix(struct ena_adapter *adapter)
 	adapter->msix_entries = malloc(msix_vecs * sizeof(struct msix_entry),
 	    M_DEVBUF, M_WAITOK | M_ZERO);
 
-	ena_trace(ENA_DBG, "trying to enable MSI-X, vectors: %d\n", msix_vecs);
+	ena_trace(NULL, ENA_DBG, "trying to enable MSI-X, vectors: %d\n", msix_vecs);
 
 	for (i = 0; i < msix_vecs; i++) {
 		adapter->msix_entries[i].entry = i;
@@ -1667,7 +1667,7 @@ ena_setup_io_intr(struct ena_adapter *adapter)
 		adapter->irq_tbl[irq_idx].data = &adapter->que[i];
 		adapter->irq_tbl[irq_idx].vector =
 		    adapter->msix_entries[irq_idx].vector;
-		ena_trace(ENA_INFO | ENA_IOQ, "ena_setup_io_intr vector: %d\n",
+		ena_trace(NULL, ENA_INFO | ENA_IOQ, "ena_setup_io_intr vector: %d\n",
 		    adapter->msix_entries[irq_idx].vector);
 
 		/*
@@ -1717,7 +1717,7 @@ ena_request_mgmnt_irq(struct ena_adapter *adapter)
 	return (rc);
 
 err_res_free:
-	ena_trace(ENA_INFO | ENA_ADMQ, "releasing resource for irq %d\n",
+	ena_trace(NULL, ENA_INFO | ENA_ADMQ, "releasing resource for irq %d\n",
 	    irq->vector);
 	rcc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
 	    irq->vector, irq->res);
@@ -1770,7 +1770,7 @@ ena_request_io_irq(struct ena_adapter *adapter)
 		}
 		irq->requested = true;
 
-		ena_trace(ENA_INFO, "queue %d - cpu %d\n",
+		ena_trace(NULL, ENA_INFO, "queue %d - cpu %d\n",
 		    i - ENA_IO_IRQ_FIRST_IDX, irq->cpu);
 	}
 
@@ -1817,7 +1817,7 @@ ena_free_mgmnt_irq(struct ena_adapter *adapter)
 
 	irq = &adapter->irq_tbl[ENA_MGMNT_IRQ_IDX];
 	if (irq->requested) {
-		ena_trace(ENA_INFO | ENA_ADMQ, "tear down irq: %d\n",
+		ena_trace(NULL, ENA_INFO | ENA_ADMQ, "tear down irq: %d\n",
 		    irq->vector);
 		rc = bus_teardown_intr(adapter->pdev, irq->res, irq->cookie);
 		if (unlikely(rc != 0))
@@ -1827,7 +1827,7 @@ ena_free_mgmnt_irq(struct ena_adapter *adapter)
 	}
 
 	if (irq->res != NULL) {
-		ena_trace(ENA_INFO | ENA_ADMQ, "release resource irq: %d\n",
+		ena_trace(NULL, ENA_INFO | ENA_ADMQ, "release resource irq: %d\n",
 		    irq->vector);
 		rc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
 		    irq->vector, irq->res);
@@ -1847,7 +1847,7 @@ ena_free_io_irq(struct ena_adapter *adapter)
 	for (int i = ENA_IO_IRQ_FIRST_IDX; i < adapter->msix_vecs; i++) {
 		irq = &adapter->irq_tbl[i];
 		if (irq->requested) {
-			ena_trace(ENA_INFO | ENA_IOQ, "tear down irq: %d\n",
+			ena_trace(NULL, ENA_INFO | ENA_IOQ, "tear down irq: %d\n",
 			    irq->vector);
 			rc = bus_teardown_intr(adapter->pdev, irq->res,
 			    irq->cookie);
@@ -1859,7 +1859,7 @@ ena_free_io_irq(struct ena_adapter *adapter)
 		}
 
 		if (irq->res != NULL) {
-			ena_trace(ENA_INFO | ENA_IOQ, "release resource irq: %d\n",
+			ena_trace(NULL, ENA_INFO | ENA_IOQ, "release resource irq: %d\n",
 			    irq->vector);
 			rc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
 			    irq->vector, irq->res);
@@ -2006,21 +2006,21 @@ create_queues_with_size_backoff(struct ena_adapter *adapter)
 		/* Allocate transmit descriptors */
 		rc = ena_setup_all_tx_resources(adapter);
 		if (unlikely(rc != 0)) {
-			ena_trace(ENA_ALERT, "err_setup_tx\n");
+			ena_trace(NULL, ENA_ALERT, "err_setup_tx\n");
 			goto err_setup_tx;
 		}
 
 		/* Allocate receive descriptors */
 		rc = ena_setup_all_rx_resources(adapter);
 		if (unlikely(rc != 0)) {
-			ena_trace(ENA_ALERT, "err_setup_rx\n");
+			ena_trace(NULL, ENA_ALERT, "err_setup_rx\n");
 			goto err_setup_rx;
 		}
 
 		/* Create IO queues for Rx & Tx */
 		rc = ena_create_io_queues(adapter);
 		if (unlikely(rc != 0)) {
-			ena_trace(ENA_ALERT,
+			ena_trace(NULL, ENA_ALERT,
 			    "create IO queues failed\n");
 			goto err_io_que;
 		}
@@ -2037,7 +2037,7 @@ err_setup_tx:
 		 * error straightaway.
 		 */
 		if (unlikely(rc != ENOMEM)) {
-			ena_trace(ENA_ALERT,
+			ena_trace(NULL, ENA_ALERT,
 			    "Queue creation failed with error code: %d\n", rc);
 			return (rc);
 		}
@@ -2092,12 +2092,12 @@ ena_up(struct ena_adapter *adapter)
 	/* setup interrupts for IO queues */
 	rc = ena_setup_io_intr(adapter);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_ALERT, "error setting up IO interrupt\n");
+		ena_trace(NULL, ENA_ALERT, "error setting up IO interrupt\n");
 		goto error;
 	}
 	rc = ena_request_io_irq(adapter);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_ALERT, "err_req_irq\n");
+		ena_trace(NULL, ENA_ALERT, "err_req_irq\n");
 		goto error;
 	}
 
@@ -2112,7 +2112,7 @@ ena_up(struct ena_adapter *adapter)
 
 	rc = create_queues_with_size_backoff(adapter);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_ALERT,
+		ena_trace(NULL, ENA_ALERT,
 		    "error creating queues with size backoff\n");
 		goto err_create_queues_with_backoff;
 	}
@@ -2194,7 +2194,7 @@ static void
 ena_media_status(if_t ifp, struct ifmediareq *ifmr)
 {
 	struct ena_adapter *adapter = if_getsoftc(ifp);
-	ena_trace(ENA_DBG, "enter\n");
+	ena_trace(NULL, ENA_DBG, "enter\n");
 
 	ENA_LOCK_LOCK(adapter);
 
@@ -2203,7 +2203,7 @@ ena_media_status(if_t ifp, struct ifmediareq *ifmr)
 
 	if (!ENA_FLAG_ISSET(ENA_FLAG_LINK_UP, adapter)) {
 		ENA_LOCK_UNLOCK(adapter);
-		ena_trace(ENA_INFO, "Link is down\n");
+		ena_trace(NULL, ENA_INFO, "Link is down\n");
 		return;
 	}
 
@@ -2397,7 +2397,7 @@ ena_setup_ifnet(device_t pdev, struct ena_adapter *adapter,
 
 	ifp = adapter->ifp = if_gethandle(IFT_ETHER);
 	if (unlikely(ifp == NULL)) {
-		ena_trace(ENA_ALERT, "can not allocate ifnet structure\n");
+		ena_trace(NULL, ENA_ALERT, "can not allocate ifnet structure\n");
 		return (ENXIO);
 	}
 	if_initname(ifp, device_get_name(pdev), device_get_unit(pdev));
@@ -2534,7 +2534,7 @@ ena_enable_wc(struct resource *res)
 	/* Enable write combining */
 	rc = pmap_change_attr(va, len, VM_MEMATTR_WRITE_COMBINING);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_ALERT, "pmap_change_attr failed, %d\n", rc);
+		ena_trace(NULL, ENA_ALERT, "pmap_change_attr failed, %d\n", rc);
 		return (rc);
 	}
 
@@ -2745,7 +2745,7 @@ ena_rss_init_default_deferred(void *arg)
 
 	dc = devclass_find("ena");
 	if (unlikely(dc == NULL)) {
-		ena_trace(ENA_ALERT, "No devclass ena\n");
+		ena_trace(NULL, ENA_ALERT, "No devclass ena\n");
 		return;
 	}
 
@@ -2776,7 +2776,7 @@ ena_config_host_info(struct ena_com_dev *ena_dev, device_t dev)
 	/* Allocate only the host info */
 	rc = ena_com_allocate_host_info(ena_dev);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_ALERT, "Cannot allocate host info\n");
+		ena_trace(NULL, ENA_ALERT, "Cannot allocate host info\n");
 		return;
 	}
 
@@ -2801,9 +2801,9 @@ ena_config_host_info(struct ena_com_dev *ena_dev, device_t dev)
 	rc = ena_com_set_host_attributes(ena_dev);
 	if (unlikely(rc != 0)) {
 		if (rc == EOPNOTSUPP)
-			ena_trace(ENA_WARNING, "Cannot set host attributes\n");
+			ena_trace(NULL, ENA_WARNING, "Cannot set host attributes\n");
 		else
-			ena_trace(ENA_ALERT, "Cannot set host attributes\n");
+			ena_trace(NULL, ENA_ALERT, "Cannot set host attributes\n");
 
 		goto err;
 	}
@@ -3057,7 +3057,7 @@ check_missing_comp_in_tx_queue(struct ena_adapter *adapter,
 		if (unlikely(time_offset > adapter->missing_tx_timeout)) {
 
 			if (!tx_buf->print_once)
-				ena_trace(ENA_WARNING, "Found a Tx that wasn't "
+				ena_trace(NULL, ENA_WARNING, "Found a Tx that wasn't "
 				    "completed on time, qid %d, index %d.\n",
 				    tx_ring->qid, i);
 
@@ -3786,11 +3786,11 @@ static void ena_notification(void *adapter_data,
 	struct ena_adapter *adapter = (struct ena_adapter *)adapter_data;
 	struct ena_admin_ena_hw_hints *hints;
 
-	ENA_WARN(aenq_e->aenq_common_desc.group != ENA_ADMIN_NOTIFICATION,
+	ENA_WARN(NULL, aenq_e->aenq_common_desc.group != ENA_ADMIN_NOTIFICATION,
 	    "Invalid group(%x) expected %x\n",	aenq_e->aenq_common_desc.group,
 	    ENA_ADMIN_NOTIFICATION);
 
-	switch (aenq_e->aenq_common_desc.syndrom) {
+	switch (aenq_e->aenq_common_desc.syndrome) {
 	case ENA_ADMIN_UPDATE_HINTS:
 		hints =
 		    (struct ena_admin_ena_hw_hints *)(&aenq_e->inline_data_w4);
@@ -3799,7 +3799,7 @@ static void ena_notification(void *adapter_data,
 	default:
 		device_printf(adapter->pdev,
 		    "Invalid aenq notification link state %d\n",
-		    aenq_e->aenq_common_desc.syndrom);
+		    aenq_e->aenq_common_desc.syndrome);
 	}
 }
 
diff --git a/sys/dev/ena/ena.h b/sys/dev/ena/ena.h
index ee57f53f365b..a40d89457d8c 100644
--- a/sys/dev/ena/ena.h
+++ b/sys/dev/ena/ena.h
@@ -514,20 +514,4 @@ ena_trigger_reset(struct ena_adapter *adapter,
 	}
 }
 
-static inline int
-validate_rx_req_id(struct ena_ring *rx_ring, uint16_t req_id)
-{
-	if (likely(req_id < rx_ring->ring_size))
-		return (0);
-
-	device_printf(rx_ring->adapter->pdev, "Invalid rx req_id: %hu\n",
-	    req_id);
-	counter_u64_add(rx_ring->rx_stats.bad_req_id, 1);
-
-	/* Trigger device reset */
-	ena_trigger_reset(rx_ring->adapter, ENA_REGS_RESET_INV_RX_REQ_ID);
-
-	return (EFAULT);
-}
-
 #endif /* !(ENA_H) */
diff --git a/sys/dev/ena/ena_datapath.c b/sys/dev/ena/ena_datapath.c
index f95bab8dc1a5..f2783efd98cc 100644
--- a/sys/dev/ena/ena_datapath.c
+++ b/sys/dev/ena/ena_datapath.c
@@ -76,7 +76,7 @@ ena_cleanup(void *arg, int pending)
 	if (unlikely((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0))
 		return;
 
-	ena_trace(ENA_DBG, "MSI-X TX/RX routine\n");
+	ena_trace(NULL, ENA_DBG, "MSI-X TX/RX routine\n");
 
 	tx_ring = que->tx_ring;
 	rx_ring = que->rx_ring;
@@ -267,7 +267,7 @@ ena_tx_cleanup(struct ena_ring *tx_ring)
 		bus_dmamap_unload(adapter->tx_buf_tag,
 		    tx_info->dmamap);
 
-		ena_trace(ENA_DBG | ENA_TXPTH, "tx: q %d mbuf %p completed\n",
+		ena_trace(NULL, ENA_DBG | ENA_TXPTH, "tx: q %d mbuf %p completed\n",
 		    tx_ring->qid, mbuf);
 
 		m_freem(mbuf);
@@ -292,7 +292,7 @@ ena_tx_cleanup(struct ena_ring *tx_ring)
 
 	work_done = TX_BUDGET - budget;
 
-	ena_trace(ENA_DBG | ENA_TXPTH, "tx: q %d done. total pkts: %d\n",
+	ena_trace(NULL, ENA_DBG | ENA_TXPTH, "tx: q %d done. total pkts: %d\n",
 	tx_ring->qid, work_done);
 
 	/* If there is still something to commit update ring state */
@@ -409,7 +409,6 @@ ena_rx_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_buf_info *ena_bufs,
 	struct ena_rx_buffer *rx_info;
 	struct ena_adapter *adapter;
 	unsigned int descs = ena_rx_ctx->descs;
-	int rc;
 	uint16_t ntc, len, req_id, buf = 0;
 
 	ntc = *next_to_clean;
@@ -417,17 +416,13 @@ ena_rx_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_buf_info *ena_bufs,
 
 	len = ena_bufs[buf].len;
 	req_id = ena_bufs[buf].req_id;
-	rc = validate_rx_req_id(rx_ring, req_id);
-	if (unlikely(rc != 0))
-		return (NULL);
-
 	rx_info = &rx_ring->rx_buffer_info[req_id];
 	if (unlikely(rx_info->mbuf == NULL)) {
 		device_printf(adapter->pdev, "NULL mbuf in rx_info");
 		return (NULL);
 	}
 
-	ena_trace(ENA_DBG | ENA_RXPTH, "rx_info %p, mbuf %p, paddr %jx\n",
+	ena_trace(NULL, ENA_DBG | ENA_RXPTH, "rx_info %p, mbuf %p, paddr %jx\n",
 	    rx_info, rx_info->mbuf, (uintmax_t)rx_info->ena_buf.paddr);
 
 	bus_dmamap_sync(adapter->rx_buf_tag, rx_info->map,
@@ -441,7 +436,7 @@ ena_rx_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_buf_info *ena_bufs,
 	/* Fill mbuf with hash key and it's interpretation for optimization */
 	ena_rx_hash_mbuf(rx_ring, ena_rx_ctx, mbuf);
 
-	ena_trace(ENA_DBG | ENA_RXPTH, "rx mbuf 0x%p, flags=0x%x, len: %d\n",
+	ena_trace(NULL, ENA_DBG | ENA_RXPTH, "rx mbuf 0x%p, flags=0x%x, len: %d\n",
 	    mbuf, mbuf->m_flags, mbuf->m_pkthdr.len);
 
 	/* DMA address is not needed anymore, unmap it */
@@ -459,16 +454,6 @@ ena_rx_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_buf_info *ena_bufs,
 		++buf;
 		len = ena_bufs[buf].len;
 		req_id = ena_bufs[buf].req_id;
-		rc = validate_rx_req_id(rx_ring, req_id);
-		if (unlikely(rc != 0)) {
-			/*
-			 * If the req_id is invalid, then the device will be
-			 * reset. In that case we must free all mbufs that
-			 * were already gathered.
-			 */
-			m_freem(mbuf);
-			return (NULL);
-		}
 		rx_info = &rx_ring->rx_buffer_info[req_id];
 
 		if (unlikely(rx_info->mbuf == NULL)) {
@@ -491,11 +476,11 @@ ena_rx_mbuf(struct ena_ring *rx_ring, struct ena_com_rx_buf_info *ena_bufs,
 		    BUS_DMASYNC_POSTREAD);
 		if (unlikely(m_append(mbuf, len, rx_info->mbuf->m_data) == 0)) {
 			counter_u64_add(rx_ring->rx_stats.mbuf_alloc_fail, 1);
-			ena_trace(ENA_WARNING, "Failed to append Rx mbuf %p\n",
+			ena_trace(NULL, ENA_WARNING, "Failed to append Rx mbuf %p\n",
 			    mbuf);
 		}
 
-		ena_trace(ENA_DBG | ENA_RXPTH,
+		ena_trace(NULL, ENA_DBG | ENA_RXPTH,
 		    "rx mbuf updated. len %d\n", mbuf->m_pkthdr.len);
 
 		/* Free already appended mbuf, it won't be useful anymore */
@@ -526,7 +511,7 @@ ena_rx_checksum(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx,
 		/* ipv4 checksum error */
 		mbuf->m_pkthdr.csum_flags = 0;
 		counter_u64_add(rx_ring->rx_stats.bad_csum, 1);
-		ena_trace(ENA_DBG, "RX IPv4 header checksum error\n");
+		ena_trace(NULL, ENA_DBG, "RX IPv4 header checksum error\n");
 		return;
 	}
 
@@ -537,7 +522,7 @@ ena_rx_checksum(struct ena_ring *rx_ring, struct ena_com_rx_ctx *ena_rx_ctx,
 			/* TCP/UDP checksum error */
 			mbuf->m_pkthdr.csum_flags = 0;
 			counter_u64_add(rx_ring->rx_stats.bad_csum, 1);
-			ena_trace(ENA_DBG, "RX L4 checksum error\n");
+			ena_trace(NULL, ENA_DBG, "RX L4 checksum error\n");
 		} else {
 			mbuf->m_pkthdr.csum_flags = CSUM_IP_CHECKED;
 			mbuf->m_pkthdr.csum_flags |= CSUM_IP_VALID;
@@ -557,6 +542,7 @@ ena_rx_cleanup(struct ena_ring *rx_ring)
 	struct ena_com_rx_ctx ena_rx_ctx;
 	struct ena_com_io_cq* io_cq;
 	struct ena_com_io_sq* io_sq;
+	enum ena_regs_reset_reason_types reset_reason;
 	if_t ifp;
 	uint16_t ena_qid;
 	uint16_t next_to_clean;
@@ -583,7 +569,7 @@ ena_rx_cleanup(struct ena_ring *rx_ring)
 		return (0);
 #endif /* DEV_NETMAP */
 
-	ena_trace(ENA_DBG, "rx: qid %d\n", qid);
+	ena_trace(NULL, ENA_DBG, "rx: qid %d\n", qid);
 
 	do {
 		ena_rx_ctx.ena_bufs = rx_ring->ena_bufs;
@@ -592,14 +578,24 @@ ena_rx_cleanup(struct ena_ring *rx_ring)
 		bus_dmamap_sync(io_cq->cdesc_addr.mem_handle.tag,
 		    io_cq->cdesc_addr.mem_handle.map, BUS_DMASYNC_POSTREAD);
 		rc = ena_com_rx_pkt(io_cq, io_sq, &ena_rx_ctx);
-
-		if (unlikely(rc != 0))
-			goto error;
+		if (unlikely(rc != 0)) {
+			if (rc == ENA_COM_NO_SPACE) {
+				counter_u64_add(rx_ring->rx_stats.bad_desc_num,
+				    1);
+				reset_reason = ENA_REGS_RESET_TOO_MANY_RX_DESCS;
+			} else {
+				counter_u64_add(rx_ring->rx_stats.bad_req_id,
+				    1);
+				reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;
+			}
+			ena_trigger_reset(adapter, reset_reason);
+			return (0);
+		}
 
 		if (unlikely(ena_rx_ctx.descs == 0))
 			break;
 
-		ena_trace(ENA_DBG | ENA_RXPTH, "rx: q %d got packet from ena. "
+		ena_trace(NULL, ENA_DBG | ENA_RXPTH, "rx: q %d got packet from ena. "
 		    "descs #: %d l3 proto %d l4 proto %d hash: %x\n",
 		    rx_ring->qid, ena_rx_ctx.descs, ena_rx_ctx.l3_proto,
 		    ena_rx_ctx.l4_proto, ena_rx_ctx.hash);
@@ -652,7 +648,7 @@ ena_rx_cleanup(struct ena_ring *rx_ring)
 					do_if_input = 0;
 		}
 		if (do_if_input != 0) {
-			ena_trace(ENA_DBG | ENA_RXPTH,
+			ena_trace(NULL, ENA_DBG | ENA_RXPTH,
 			    "calling if_input() with mbuf %p\n", mbuf);
 			(*ifp->if_input)(ifp, mbuf);
 		}
@@ -678,14 +674,6 @@ ena_rx_cleanup(struct ena_ring *rx_ring)
 	tcp_lro_flush_all(&rx_ring->lro);
 
 	return (RX_BUDGET - budget);
-
-error:
-	counter_u64_add(rx_ring->rx_stats.bad_desc_num, 1);
-
-	/* Too many desc from the device. Trigger reset */
-	ena_trigger_reset(adapter, ENA_REGS_RESET_TOO_MANY_RX_DESCS);
-
-	return (0);
 }
 
 static void
@@ -841,7 +829,7 @@ ena_tx_map_mbuf(struct ena_ring *tx_ring, struct ena_tx_buffer *tx_info,
 	rc = bus_dmamap_load_mbuf_sg(adapter->tx_buf_tag, tx_info->dmamap, mbuf,
 	    segs, &nsegs, BUS_DMA_NOWAIT);
 	if (unlikely((rc != 0) || (nsegs == 0))) {
-		ena_trace(ENA_WARNING,
+		ena_trace(NULL, ENA_WARNING,
 		    "dmamap load failed! err: %d nsegs: %d\n", rc, nsegs);
 		goto dma_error;
 	}
@@ -873,7 +861,7 @@ ena_tx_map_mbuf(struct ena_ring *tx_ring, struct ena_tx_buffer *tx_info,
 			counter_u64_add(tx_ring->tx_stats.llq_buffer_copy, 1);
 		}
 
-		ena_trace(ENA_DBG | ENA_TXPTH,
+		ena_trace(NULL, ENA_DBG | ENA_TXPTH,
 		    "mbuf: %p header_buf->vaddr: %p push_len: %d\n",
 		    mbuf, *push_hdr, *header_len);
 
@@ -951,12 +939,12 @@ ena_xmit_mbuf(struct ena_ring *tx_ring, struct mbuf **mbuf)
 
 	rc = ena_check_and_collapse_mbuf(tx_ring, mbuf);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_WARNING,
+		ena_trace(NULL, ENA_WARNING,
 		    "Failed to collapse mbuf! err: %d\n", rc);
 		return (rc);
 	}
 
-	ena_trace(ENA_DBG | ENA_TXPTH, "Tx: %d bytes\n", (*mbuf)->m_pkthdr.len);
+	ena_trace(NULL, ENA_DBG | ENA_TXPTH, "Tx: %d bytes\n", (*mbuf)->m_pkthdr.len);
 
 	next_to_use = tx_ring->next_to_use;
 	req_id = tx_ring->free_tx_ids[next_to_use];
@@ -965,7 +953,7 @@ ena_xmit_mbuf(struct ena_ring *tx_ring, struct mbuf **mbuf)
 
 	rc = ena_tx_map_mbuf(tx_ring, tx_info, *mbuf, &push_hdr, &header_len);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_WARNING, "Failed to map TX mbuf\n");
+		ena_trace(NULL, ENA_WARNING, "Failed to map TX mbuf\n");
 		return (rc);
 	}
 	memset(&ena_tx_ctx, 0x0, sizeof(struct ena_com_tx_ctx));
@@ -980,7 +968,7 @@ ena_xmit_mbuf(struct ena_ring *tx_ring, struct mbuf **mbuf)
 
 	if (tx_ring->acum_pkts == DB_THRESHOLD ||
 	    ena_com_is_doorbell_needed(tx_ring->ena_com_io_sq, &ena_tx_ctx)) {
-		ena_trace(ENA_DBG | ENA_TXPTH,
+		ena_trace(NULL, ENA_DBG | ENA_TXPTH,
 		    "llq tx max burst size of queue %d achieved, writing doorbell to send burst\n",
 		    tx_ring->que->id);
 		ena_com_write_sq_doorbell(tx_ring->ena_com_io_sq);
@@ -992,7 +980,7 @@ ena_xmit_mbuf(struct ena_ring *tx_ring, struct mbuf **mbuf)
 	rc = ena_com_prepare_tx(io_sq, &ena_tx_ctx, &nb_hw_desc);
 	if (unlikely(rc != 0)) {
 		if (likely(rc == ENA_COM_NO_MEM)) {
-			ena_trace(ENA_DBG | ENA_TXPTH,
+			ena_trace(NULL, ENA_DBG | ENA_TXPTH,
 			    "tx ring[%d] if out of space\n", tx_ring->que->id);
 		} else {
 			device_printf(adapter->pdev,
@@ -1025,7 +1013,7 @@ ena_xmit_mbuf(struct ena_ring *tx_ring, struct mbuf **mbuf)
 	 */
 	if (unlikely(!ena_com_sq_have_enough_space(tx_ring->ena_com_io_sq,
 	    adapter->max_tx_sgl_size + 2))) {
-		ena_trace(ENA_DBG | ENA_TXPTH, "Stop queue %d\n",
+		ena_trace(NULL, ENA_DBG | ENA_TXPTH, "Stop queue %d\n",
 		    tx_ring->que->id);
 
 		tx_ring->running = false;
@@ -1078,7 +1066,7 @@ ena_start_xmit(struct ena_ring *tx_ring)
 	io_sq = &adapter->ena_dev->io_sq_queues[ena_qid];
 
 	while ((mbuf = drbr_peek(adapter->ifp, tx_ring->br)) != NULL) {
-		ena_trace(ENA_DBG | ENA_TXPTH, "\ndequeued mbuf %p with flags %#x and"
+		ena_trace(NULL, ENA_DBG | ENA_TXPTH, "\ndequeued mbuf %p with flags %#x and"
 		    " header csum flags %#jx\n",
 		    mbuf, mbuf->m_flags, (uint64_t)mbuf->m_pkthdr.csum_flags);
 
diff --git a/sys/dev/ena/ena_netmap.c b/sys/dev/ena/ena_netmap.c
index 20a341173c8c..1f8e712358e9 100644
--- a/sys/dev/ena/ena_netmap.c
+++ b/sys/dev/ena/ena_netmap.c
@@ -88,7 +88,7 @@ ena_netmap_attach(struct ena_adapter *adapter)
 {
 	struct netmap_adapter na;
 
-	ena_trace(ENA_NETMAP, "netmap attach\n");
+	ena_trace(NULL, ENA_NETMAP, "netmap attach\n");
 
 	bzero(&na, sizeof(na));
 	na.na_flags = NAF_MOREFRAG;
@@ -126,12 +126,12 @@ ena_netmap_alloc_rx_slot(struct ena_adapter *adapter,
 	nm_i = kring->nr_hwcur;
 	head = kring->rhead;
 
-	ena_trace(ENA_NETMAP | ENA_DBG, "nr_hwcur: %d, nr_hwtail: %d, "
+	ena_trace(NULL, ENA_NETMAP | ENA_DBG, "nr_hwcur: %d, nr_hwtail: %d, "
 	    "rhead: %d, rcur: %d, rtail: %d\n", kring->nr_hwcur,
 	    kring->nr_hwtail, kring->rhead, kring->rcur, kring->rtail);
 
 	if ((nm_i == head) && rx_ring->initialized) {
-		ena_trace(ENA_NETMAP, "No free slots in netmap ring\n");
+		ena_trace(NULL, ENA_NETMAP, "No free slots in netmap ring\n");
 		return (ENOMEM);
 	}
 
@@ -150,7 +150,7 @@ ena_netmap_alloc_rx_slot(struct ena_adapter *adapter,
 
 	rc = netmap_load_map(na, adapter->rx_buf_tag, rx_info->map, addr);
 	if (rc != 0) {
-		ena_trace(ENA_WARNING, "DMA mapping error\n");
+		ena_trace(NULL, ENA_WARNING, "DMA mapping error\n");
 		return (rc);
 	}
 	bus_dmamap_sync(adapter->rx_buf_tag, rx_info->map, BUS_DMASYNC_PREREAD);
@@ -210,7 +210,7 @@ ena_netmap_free_rx_slot(struct ena_adapter *adapter,
 
 	slot = &kring->ring->slot[nm_i];
 
-	ENA_ASSERT(slot->buf_idx == 0, "Overwrite slot buf\n");
+	ENA_WARN(slot->buf_idx != 0, NULL, "Overwrite slot buf\n");
 	slot->buf_idx = rx_info->netmap_buf_idx;
 	slot->flags = NS_BUF_CHANGED;
 
@@ -252,7 +252,7 @@ ena_netmap_reset_ring(struct ena_adapter *adapter, int qid, enum txrx x)
 		return;
 
 	netmap_reset(NA(adapter->ifp), x, qid, 0);
-	ena_trace(ENA_NETMAP, "%s ring %d is in netmap mode\n",
+	ena_trace(NULL, ENA_NETMAP, "%s ring %d is in netmap mode\n",
 	    (x == NR_TX) ? "Tx" : "Rx", qid);
 }
 
@@ -282,7 +282,7 @@ ena_netmap_reg(struct netmap_adapter *na, int onoff)
 	ena_down(adapter);
 
 	if (onoff) {
-		ena_trace(ENA_NETMAP, "netmap on\n");
+		ena_trace(NULL, ENA_NETMAP, "netmap on\n");
 		for_rx_tx(t) {
 			for (i = 0; i <= nma_get_nrings(na, t); i++) {
 				kring = NMR(na, t)[i];
@@ -293,7 +293,7 @@ ena_netmap_reg(struct netmap_adapter *na, int onoff)
 		}
 		nm_set_native_flags(na);
 	} else {
-		ena_trace(ENA_NETMAP, "netmap off\n");
+		ena_trace(NULL, ENA_NETMAP, "netmap off\n");
 		nm_clear_native_flags(na);
 		for_rx_tx(t) {
 			for (i = 0; i <= nma_get_nrings(na, t); i++) {
@@ -307,7 +307,7 @@ ena_netmap_reg(struct netmap_adapter *na, int onoff)
 
 	rc = ena_up(adapter);
 	if (rc != 0) {
-		ena_trace(ENA_WARNING, "ena_up failed with rc=%d\n", rc);
+		ena_trace(NULL, ENA_WARNING, "ena_up failed with rc=%d\n", rc);
 		adapter->reset_reason = ENA_REGS_RESET_DRIVER_INVALID_STATE;
 		nm_clear_native_flags(na);
 		ena_destroy_device(adapter, false);
@@ -401,7 +401,7 @@ ena_netmap_tx_frame(struct ena_netmap_ctx *ctx)
 
 	adapter = ctx->adapter;
 	if (ena_netmap_count_slots(ctx) > adapter->max_tx_sgl_size) {
-		ena_trace(ENA_WARNING, "Too many slots per packet\n");
+		ena_trace(NULL, ENA_WARNING, "Too many slots per packet\n");
 		return (EINVAL);
 	}
 
@@ -438,7 +438,7 @@ ena_netmap_tx_frame(struct ena_netmap_ctx *ctx)
 	rc = ena_com_prepare_tx(ctx->io_sq, &ena_tx_ctx, &nb_hw_desc);
 	if (unlikely(rc != 0)) {
 		if (likely(rc == ENA_COM_NO_MEM)) {
-			ena_trace(ENA_NETMAP | ENA_DBG | ENA_TXPTH,
+			ena_trace(NULL, ENA_NETMAP | ENA_DBG | ENA_TXPTH,
 			    "Tx ring[%d] is out of space\n", tx_ring->que->id);
 		} else {
 			device_printf(adapter->pdev,
@@ -532,13 +532,13 @@ ena_netmap_map_single_slot(struct netmap_adapter *na, struct netmap_slot *slot,
 
 	*vaddr = PNMB(na, slot, paddr);
 	if (unlikely(vaddr == NULL)) {
-		ena_trace(ENA_ALERT, "Slot address is NULL\n");
+		ena_trace(NULL, ENA_ALERT, "Slot address is NULL\n");
 		return (EINVAL);
 	}
 
 	rc = netmap_load_map(na, dmatag, dmamap, *vaddr);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_ALERT, "Failed to map slot %d for DMA\n",
+		ena_trace(NULL, ENA_ALERT, "Failed to map slot %d for DMA\n",
 		    slot->buf_idx);
 		return (EINVAL);
 	}
@@ -626,7 +626,7 @@ ena_netmap_tx_map_slots(struct ena_netmap_ctx *ctx,
 			delta = push_len - slot_head_len;
 		}
 
-		ena_trace(ENA_NETMAP | ENA_DBG | ENA_TXPTH,
+		ena_trace(NULL, ENA_NETMAP | ENA_DBG | ENA_TXPTH,
 		    "slot: %d header_buf->vaddr: %p push_len: %d\n",
 		    slot->buf_idx, *push_hdr, push_len);
 
@@ -860,7 +860,7 @@ ena_netmap_tx_clean_one(struct ena_netmap_ctx *ctx, uint16_t req_id)
 	/* Next, retain the sockets back to the userspace */
 	for (n = 0; n < nm_info->sockets_used; n++) {
 		ctx->nm_i = nm_next(ctx->nm_i, ctx->lim);
-		ENA_ASSERT(ctx->slots[ctx->nm_i].buf_idx == 0,
+		ENA_WARN(ctx->slots[ctx->nm_i].buf_idx != 0, NULL,
 		    "Tx idx is not 0.\n");
 		ctx->slots[ctx->nm_i].buf_idx = nm_info->socket_buf_idx[n];
 		ctx->slots[ctx->nm_i].flags = NS_BUF_CHANGED;
@@ -882,7 +882,7 @@ validate_tx_req_id(struct ena_ring *tx_ring, uint16_t req_id)
 	if (likely(req_id < tx_ring->ring_size))
 		return (0);
 
-	ena_trace(ENA_WARNING, "Invalid req_id: %hu\n", req_id);
+	ena_trace(NULL, ENA_WARNING, "Invalid req_id: %hu\n", req_id);
 	counter_u64_add(tx_ring->tx_stats.bad_req_id, 1);
 
 	ena_trigger_reset(adapter, ENA_REGS_RESET_INV_TX_REQ_ID);
@@ -949,6 +949,7 @@ static inline int
 ena_netmap_rx_frame(struct ena_netmap_ctx *ctx)
 {
 	struct ena_com_rx_ctx ena_rx_ctx;
+	enum ena_regs_reset_reason_types reset_reason;
 	int rc, len = 0;
 	uint16_t buf, nm;
 
@@ -959,16 +960,22 @@ ena_netmap_rx_frame(struct ena_netmap_ctx *ctx)
 
 	rc = ena_com_rx_pkt(ctx->io_cq, ctx->io_sq, &ena_rx_ctx);
 	if (unlikely(rc != 0)) {
-		ena_trace(ENA_ALERT, "Too many desc from the device.\n");
-		counter_u64_add(ctx->ring->rx_stats.bad_desc_num, 1);
-		ena_trigger_reset(ctx->adapter,
-		    ENA_REGS_RESET_TOO_MANY_RX_DESCS);
+		ena_trace(NULL, ENA_ALERT,
+		    "Failed to read pkt from the device with error: %d\n", rc);
+		if (rc == ENA_COM_NO_SPACE) {
+			counter_u64_add(ctx->ring->rx_stats.bad_desc_num, 1);
+			reset_reason = ENA_REGS_RESET_TOO_MANY_RX_DESCS;
+		} else {
+			counter_u64_add(ctx->ring->rx_stats.bad_req_id, 1);
+			reset_reason = ENA_REGS_RESET_INV_RX_REQ_ID;
+		}
+		ena_trigger_reset(ctx->adapter, reset_reason);
 		return (rc);
 	}
 	if (unlikely(ena_rx_ctx.descs == 0))
 		return (ENA_NETMAP_NO_MORE_FRAMES);
 
-        ena_trace(ENA_NETMAP | ENA_DBG, "Rx: q %d got packet from ena. descs #:"
+        ena_trace(NULL, ENA_NETMAP | ENA_DBG, "Rx: q %d got packet from ena. descs #:"
 	    " %d l3 proto %d l4 proto %d hash: %x\n", ctx->ring->qid,
 	    ena_rx_ctx.descs, ena_rx_ctx.l3_proto, ena_rx_ctx.l4_proto,
 	    ena_rx_ctx.hash);
@@ -1017,19 +1024,15 @@ ena_netmap_rx_load_desc(struct ena_netmap_ctx *ctx, uint16_t buf, int *len)
 {
 	struct ena_rx_buffer *rx_info;
 	uint16_t req_id;
-	int rc;
 
 	req_id = ctx->ring->ena_bufs[buf].req_id;
-	rc = validate_rx_req_id(ctx->ring, req_id);
-	if (unlikely(rc != 0))
-		return (rc);
-
 	rx_info = &ctx->ring->rx_buffer_info[req_id];
 	bus_dmamap_sync(ctx->adapter->rx_buf_tag, rx_info->map,
 	    BUS_DMASYNC_POSTREAD);
 	netmap_unload_map(ctx->na, ctx->adapter->rx_buf_tag, rx_info->map);
 
-	ENA_ASSERT(ctx->slots[ctx->nm_i].buf_idx == 0, "Rx idx is not 0.\n");
+	ENA_WARN(ctx->slots[ctx->nm_i].buf_idx != 0, NULL,
+	    "Rx idx is not 0.\n");
 
 	ctx->slots[ctx->nm_i].buf_idx = rx_info->netmap_buf_idx;
 	rx_info->netmap_buf_idx = 0;
@@ -1041,7 +1044,7 @@ ena_netmap_rx_load_desc(struct ena_netmap_ctx *ctx, uint16_t buf, int *len)
 	ctx->slots[ctx->nm_i].len = ctx->ring->ena_bufs[buf].len;
 	*len += ctx->slots[ctx->nm_i].len;
 	ctx->ring->free_rx_ids[ctx->nt] = req_id;
-	ena_trace(ENA_DBG, "rx_info %p, buf_idx %d, paddr %jx, nm: %d\n",
+	ena_trace(NULL, ENA_DBG, "rx_info %p, buf_idx %d, paddr %jx, nm: %d\n",
 	    rx_info, ctx->slots[ctx->nm_i].buf_idx,
 	    (uintmax_t)rx_info->ena_buf.paddr, ctx->nm_i);