D12860.id34672.diff
No OneTemporary
Actions

Size

40 KB

Referenced Files

None

Subscribers

None

D12860.id34672.diff
View Options

	Index: sys/dev/ena/ena.h
	===================================================================
	--- sys/dev/ena/ena.h
	+++ sys/dev/ena/ena.h
	@@ -246,7 +246,6 @@
	counter_u64_t empty_rx_ring;
	};

	-
	struct ena_ring {
	/* Holds the empty requests for TX/RX out of order completions */
	union {
	@@ -423,7 +422,6 @@
	enum ena_regs_reset_reason_types reset_reason;
	};

	-
	#define ENA_DEV_LOCK mtx_lock(&adapter->global_mtx)
	#define ENA_DEV_UNLOCK mtx_unlock(&adapter->global_mtx)

	Index: sys/dev/ena/ena.c
	===================================================================
	--- sys/dev/ena/ena.c
	+++ sys/dev/ena/ena.c
	@@ -193,7 +193,6 @@
	SYSCTL_INT(_hw_ena, OID_AUTO, buf_ring_size, CTLFLAG_RWTUN,
	&ena_buf_ring_size, 0, "Size of the bufring");

	-
	static ena_vendor_info_t ena_vendor_info_array[] = {
	{ PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_PF, 0},
	{ PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_LLQ_PF, 0},
	@@ -211,10 +210,9 @@
	void
	ena_dmamap_callback(void arg, bus_dma_segment_t segs, int nseg, int error)
	{
	- if (error)
	+ if (error != 0)
	return;
	(bus_addr_t ) arg = segs[0].ds_addr;
	- return;
	}

	int
	@@ -222,12 +220,16 @@
	ena_mem_handle_t *dma , int mapflags)
	{
	struct ena_adapter* adapter = device_get_softc(dmadev);
	- uint32_t maxsize = ((size - 1)/PAGE_SIZE + 1) * PAGE_SIZE;
	- uint64_t dma_space_addr = ENA_DMA_BIT_MASK(adapter->dma_width);
	+ uint32_t maxsize;
	+ uint64_t dma_space_addr;
	int error;

	+ maxsize = ((size - 1) / PAGE_SIZE + 1) * PAGE_SIZE;
	+
	+ dma_space_addr = ENA_DMA_BIT_MASK(adapter->dma_width);
	if (dma_space_addr == 0)
	dma_space_addr = BUS_SPACE_MAXADDR;
	+
	error = bus_dma_tag_create(bus_get_dma_tag(dmadev), /* parent */
	8, 0, /* alignment, bounds */
	dma_space_addr, /* lowaddr of exclusion window */
	@@ -240,29 +242,26 @@
	NULL, /* lockfunc */
	NULL, /* lockarg */
	&dma->tag);
	- if (error) {
	- device_printf(dmadev,
	- "%s: bus_dma_tag_create failed: %d\n",
	- __func__, error);
	+ if (error != 0) {
	+ device_printf(dmadev, "%s: bus_dma_tag_create failed: %d\n",
	+ __func__, error);
	goto fail_tag;
	}

	error = bus_dmamem_alloc(dma->tag, (void**) &dma->vaddr,
	BUS_DMA_COHERENT \| BUS_DMA_ZERO, &dma->map);
	- if (error) {
	- device_printf(dmadev,
	- "%s: bus_dmamem_alloc(%ju) failed: %d\n",
	- __func__, (uintmax_t)size, error);
	+ if (error != 0) {
	+ device_printf(dmadev, "%s: bus_dmamem_alloc(%ju) failed: %d\n",
	+ __func__, (uintmax_t)size, error);
	goto fail_map_create;
	}

	dma->paddr = 0;
	error = bus_dmamap_load(dma->tag, dma->map, dma->vaddr,
	size, ena_dmamap_callback, &dma->paddr, mapflags);
	- if (error \|\| dma->paddr == 0) {
	- device_printf(dmadev,
	- "%s: bus_dmamap_load failed: %d\n",
	- __func__, error);
	+ if ((error != 0) \|\| (dma->paddr == 0)) {
	+ device_printf(dmadev, "%s: bus_dmamap_load failed: %d\n",
	+ __func__, error);
	goto fail_map_load;
	}

	@@ -311,8 +310,6 @@
	bus_release_resource(pdev, SYS_RES_MEMORY,
	PCIR_BAR(ENA_REG_BAR), adapter->registers);
	}
	-
	- return;
	}

	static int
	@@ -353,7 +350,7 @@
	int rc, old_mtu, max_frame;

	rc = ena_com_get_dev_attr_feat(adapter->ena_dev, &get_feat_ctx);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Cannot get attribute for ena device\n");
	return (ENXIO);
	@@ -591,7 +588,6 @@
	return (ret);
	}

	-
	/**
	* ena_setup_tx_resources - allocate Tx resources (Descriptors)
	* @adapter: network interface device structure
	@@ -739,7 +735,7 @@

	for (i = 0; i < adapter->num_queues; i++) {
	rc = ena_setup_tx_resources(adapter, i);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Allocation for Tx Queue %u failed\n", i);
	goto err_setup_tx;
	@@ -768,8 +764,6 @@

	for (i = 0; i < adapter->num_queues; i++)
	ena_free_tx_resources(adapter, i);
	-
	- return;
	}

	static inline int
	@@ -841,9 +835,9 @@
	}

	/* Create LRO for the ring */
	- if (adapter->ifp->if_capenable & IFCAP_LRO) {
	+ if ((adapter->ifp->if_capenable & IFCAP_LRO) != 0) {
	int err = tcp_lro_init(&rx_ring->lro);
	- if (err) {
	+ if (err != 0) {
	device_printf(adapter->pdev,
	"LRO[%d] Initialization failed!\n", qid);
	} else {
	@@ -932,8 +926,6 @@

	free(rx_ring->free_rx_ids, M_DEVBUF);
	rx_ring->free_rx_ids = NULL;
	-
	- return;
	}

	/**
	@@ -949,7 +941,7 @@

	for (i = 0; i < adapter->num_queues; i++) {
	rc = ena_setup_rx_resources(adapter, i);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Allocation for Rx Queue %u failed\n", i);
	goto err_setup_rx;
	@@ -977,8 +969,6 @@

	for (i = 0; i < adapter->num_queues; i++)
	ena_free_rx_resources(adapter, i);
	-
	- return;
	}

	static inline int
	@@ -1009,7 +999,7 @@
	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 (error \|\| (nsegs != 1)) {
	+ if ((error != 0) \|\| (nsegs != 1)) {
	device_printf(adapter->pdev, "failed to map mbuf, error: %d, "
	"nsegs: %d\n", error, nsegs);
	counter_u64_add(rx_ring->rx_stats.dma_mapping_err, 1);
	@@ -1046,11 +1036,8 @@
	bus_dmamap_unload(adapter->rx_buf_tag, rx_info->map);
	m_freem(rx_info->mbuf);
	rx_info->mbuf = NULL;
	-
	- return;
	}

	-
	/**
	* ena_refill_rx_bufs - Refills ring with descriptors
	* @rx_ring: the ring which we want to feed with free descriptors
	@@ -1078,7 +1065,7 @@

	req_id = rx_ring->free_rx_ids[next_to_use];
	rc = validate_rx_req_id(rx_ring, req_id);
	- if (unlikely(rc))
	+ if (unlikely(rc != 0))
	break;

	rx_info = &rx_ring->rx_buffer_info[req_id];
	@@ -1091,7 +1078,7 @@
	}
	rc = ena_com_add_single_rx_desc(rx_ring->ena_com_io_sq,
	&rx_info->ena_buf, req_id);
	- if (unlikely(rc)) {
	+ if (unlikely(rc != 0)) {
	device_printf(adapter->pdev,
	"failed to add buffer for rx queue %d\n",
	rx_ring->qid);
	@@ -1125,11 +1112,9 @@
	for (i = 0; i < rx_ring->ring_size; i++) {
	struct ena_rx_buffer *rx_info = &rx_ring->rx_buffer_info[i];

	- if (rx_info->mbuf)
	+ if (rx_info->mbuf != NULL)
	ena_free_rx_mbuf(adapter, rx_ring, rx_info);
	}
	-
	- return;
	}

	/**
	@@ -1162,7 +1147,6 @@

	for (i = 0; i < adapter->num_queues; i++)
	ena_free_rx_bufs(adapter, i);
	- return;
	}

	/**
	@@ -1190,8 +1174,6 @@
	tx_info->mbuf = NULL;
	}
	ENA_RING_MTX_UNLOCK(tx_ring);
	-
	- return;
	}

	static void
	@@ -1200,8 +1182,6 @@

	for (int i = 0; i < adapter->num_queues; i++)
	ena_free_tx_bufs(adapter, i);
	-
	- return;
	}

	static void
	@@ -1242,8 +1222,8 @@

	if (likely(req_id < tx_ring->ring_size)) {
	tx_info = &tx_ring->tx_buffer_info[req_id];
	- if (tx_info->mbuf)
	- return 0;
	+ if (tx_info->mbuf != NULL)
	+ return (0);
	}

	counter_u64_add(tx_ring->tx_stats.bad_req_id, 1);
	@@ -1271,7 +1251,7 @@
	ctx.msix_vector = msix_vector;
	ctx.qid = ena_qid;
	rc = ena_com_create_io_queue(ena_dev, &ctx);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Failed to create io TX queue #%d rc: %d\n", i, rc);
	goto err_tx;
	@@ -1280,7 +1260,7 @@
	rc = ena_com_get_io_handlers(ena_dev, ena_qid,
	&ring->ena_com_io_sq,
	&ring->ena_com_io_cq);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Failed to get TX queue handlers. TX queue num"
	" %d rc: %d\n", i, rc);
	@@ -1299,7 +1279,7 @@
	ctx.msix_vector = msix_vector;
	ctx.qid = ena_qid;
	rc = ena_com_create_io_queue(ena_dev, &ctx);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Failed to create io RX queue[%d] rc: %d\n", i, rc);
	goto err_rx;
	@@ -1309,7 +1289,7 @@
	rc = ena_com_get_io_handlers(ena_dev, ena_qid,
	&ring->ena_com_io_sq,
	&ring->ena_com_io_cq);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Failed to get RX queue handlers. RX queue num"
	" %d rc: %d\n", i, rc);
	@@ -1370,7 +1350,7 @@
	break;

	rc = validate_tx_req_id(tx_ring, req_id);
	- if (rc)
	+ if (rc != 0)
	break;

	tx_info = &tx_ring->tx_buffer_info[req_id];
	@@ -1397,7 +1377,9 @@
	commit = TX_COMMIT;
	/* update ring state every TX_COMMIT descriptor */
	tx_ring->next_to_clean = next_to_clean;
	- ena_com_comp_ack(&adapter->ena_dev->io_sq_queues[ena_qid], total_done);
	+ ena_com_comp_ack(
	+ &adapter->ena_dev->io_sq_queues[ena_qid],
	+ total_done);
	ena_com_update_dev_comp_head(io_cq);
	total_done = 0;
	}
	@@ -1408,7 +1390,8 @@
	/* If there is still something to commit update ring state */
	if (commit != TX_COMMIT) {
	tx_ring->next_to_clean = next_to_clean;
	- ena_com_comp_ack(&adapter->ena_dev->io_sq_queues[ena_qid], total_done);
	+ ena_com_comp_ack(&adapter->ena_dev->io_sq_queues[ena_qid],
	+ total_done);
	ena_com_update_dev_comp_head(io_cq);
	}

	@@ -1427,7 +1410,7 @@
	mbuf->m_pkthdr.flowid = ena_rx_ctx->hash;

	if (ena_rx_ctx->frag &&
	- ena_rx_ctx->l3_proto != ENA_ETH_IO_L4_PROTO_UNKNOWN) {
	+ (ena_rx_ctx->l3_proto != ENA_ETH_IO_L4_PROTO_UNKNOWN)) {
	M_HASHTYPE_SET(mbuf, M_HASHTYPE_OPAQUE_HASH);
	return;
	}
	@@ -1581,7 +1564,7 @@

	/* if IP and error */
	if ((ena_rx_ctx->l3_proto == ENA_ETH_IO_L3_PROTO_IPV4) &&
	- (ena_rx_ctx->l3_csum_err)) {
	+ ena_rx_ctx->l3_csum_err) {
	/* ipv4 checksum error */
	mbuf->m_pkthdr.csum_flags = 0;
	counter_u64_add(rx_ring->rx_stats.bad_csum, 1);
	@@ -1600,8 +1583,6 @@
	mbuf->m_pkthdr.csum_flags \|= CSUM_IP_VALID;
	}
	}
	-
	- return;
	}

	static void
	@@ -1634,7 +1615,6 @@
	struct ena_com_rx_ctx ena_rx_ctx;
	struct ena_com_io_cq* io_cq;
	struct ena_com_io_sq* io_sq;
	- /* struct ena_eth_io_intr_reg intr_reg; */
	if_t ifp;
	uint16_t ena_qid;
	uint16_t next_to_clean;
	@@ -1659,7 +1639,7 @@
	ena_rx_ctx.descs = 0;
	rc = ena_com_rx_pkt(io_cq, io_sq, &ena_rx_ctx);

	- if (unlikely(rc))
	+ if (unlikely(rc != 0))
	goto error;

	if (unlikely(ena_rx_ctx.descs == 0))
	@@ -1670,7 +1650,7 @@
	&ena_rx_ctx, &next_to_clean);

	/* Exit if we failed to retrieve a buffer */
	- if (unlikely(!mbuf)) {
	+ if (unlikely(mbuf == NULL)) {
	for (i = 0; i < ena_rx_ctx.descs; ++i) {
	rx_ring->free_tx_ids[next_to_clean] =
	rx_ring->ena_bufs[i].req_id;
	@@ -1684,8 +1664,8 @@
	ena_trace(ENA_DBG \| ENA_RXPTH, "Rx: %d bytes",
	mbuf->m_pkthdr.len);

	- if ((ifp->if_capenable & IFCAP_RXCSUM) \|\|
	- (ifp->if_capenable & IFCAP_RXCSUM_IPV6)) {
	+ if (((ifp->if_capenable & IFCAP_RXCSUM) != 0) \|\|
	+ ((ifp->if_capenable & IFCAP_RXCSUM_IPV6) != 0)) {
	ena_rx_checksum(rx_ring, &ena_rx_ctx, mbuf);
	}

	@@ -1700,22 +1680,22 @@
	* should be computed by hardware.
	*/
	do_if_input = 1;
	- if ((ifp->if_capenable & IFCAP_LRO) &&
	- (mbuf->m_pkthdr.csum_flags & CSUM_IP_VALID) &&
	- ena_rx_ctx.l4_proto == ENA_ETH_IO_L4_PROTO_TCP) {
	+ if (((ifp->if_capenable & IFCAP_LRO) != 0) &&
	+ ((mbuf->m_pkthdr.csum_flags & CSUM_IP_VALID) != 0) &&
	+ (ena_rx_ctx.l4_proto == ENA_ETH_IO_L4_PROTO_TCP)) {
	/*
	* Send to the stack if:
	* - LRO not enabled, or
	* - no LRO resources, or
	* - lro enqueue fails
	*/
	- if (rx_ring->lro.lro_cnt != 0 &&
	- tcp_lro_rx(&rx_ring->lro, mbuf, 0) == 0)
	+ if ((rx_ring->lro.lro_cnt != 0) &&
	+ (tcp_lro_rx(&rx_ring->lro, mbuf, 0) == 0))
	do_if_input = 0;
	}
	- if (do_if_input) {
	- ena_trace(ENA_DBG \| ENA_RXPTH, "calling if_input() with mbuf %p",
	- mbuf);
	+ if (do_if_input != 0) {
	+ ena_trace(ENA_DBG \| ENA_RXPTH,
	+ "calling if_input() with mbuf %p", mbuf);
	(*ifp->if_input)(ifp, mbuf);
	}

	@@ -1781,7 +1761,7 @@
	int qid, ena_qid;
	int txc, rxc, i;

	- if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
	+ if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
	return;

	ena_trace(ENA_DBG, "MSI-X TX/RX routine");
	@@ -1798,7 +1778,7 @@
	* being executed and rx ring is being cleaned up in
	* another thread.
	*/
	- if (ENA_RING_MTX_TRYLOCK(rx_ring)) {
	+ if (ENA_RING_MTX_TRYLOCK(rx_ring) != 0) {
	rxc = ena_rx_cleanup(rx_ring);
	ENA_RING_MTX_UNLOCK(rx_ring);
	} else {
	@@ -1810,10 +1790,10 @@
	txc = ena_tx_cleanup(tx_ring);
	ENA_RING_MTX_UNLOCK(tx_ring);

	- if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
	+ if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0)
	return;

	- if (txc != TX_BUDGET && rxc != RX_BUDGET)
	+ if ((txc != TX_BUDGET) && (rxc != RX_BUDGET))
	break;
	}

	@@ -1882,8 +1862,6 @@
	adapter->irq_tbl[ENA_MGMNT_IRQ_IDX].data = adapter;
	adapter->irq_tbl[ENA_MGMNT_IRQ_IDX].vector =
	adapter->msix_entries[ENA_MGMNT_IRQ_IDX].vector;
	-
	- return;
	}

	static void
	@@ -1919,8 +1897,6 @@
	last_bind_cpu = CPU_NEXT(last_bind_cpu);
	#endif
	}
	-
	- return;
	}

	static int
	@@ -1942,16 +1918,18 @@
	return (ENXIO);
	}

	- if ((rc = bus_activate_resource(adapter->pdev, SYS_RES_IRQ, irq->vector,
	- irq->res)) != 0) {
	+ rc = bus_activate_resource(adapter->pdev, SYS_RES_IRQ,
	+ irq->vector, irq->res);
	+ if (rc != 0) {
	device_printf(adapter->pdev, "could not activate "
	"irq vector: %d\n", irq->vector);
	goto err_res_free;
	}

	- if ((rc = bus_setup_intr(adapter->pdev, irq->res,
	- INTR_TYPE_NET \| INTR_MPSAFE, NULL,
	- ena_intr_msix_mgmnt, irq->data, &irq->cookie)) != 0) {
	+ rc = bus_setup_intr(adapter->pdev, irq->res,
	+ INTR_TYPE_NET \| INTR_MPSAFE, NULL, ena_intr_msix_mgmnt,
	+ irq->data, &irq->cookie);
	+ if (rc != 0) {
	device_printf(adapter->pdev, "failed to register "
	"interrupt handler for irq %ju: %d\n",
	rman_get_start(irq->res), rc);
	@@ -1966,7 +1944,7 @@
	irq->vector);
	rcc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
	irq->vector, irq->res);
	- if (rcc)
	+ if (rcc != 0)
	device_printf(adapter->pdev, "dev has no parent while "
	"releasing res for irq: %d\n", irq->vector);
	irq->res = NULL;
	@@ -1981,7 +1959,7 @@
	unsigned long flags = 0;
	int rc = 0, i, rcc;

	- if (!adapter->msix_enabled) {
	+ if (adapter->msix_enabled == 0) {
	device_printf(adapter->pdev, "failed to request irq\n");
	return (EINVAL);
	} else {
	@@ -2002,9 +1980,10 @@
	goto err;
	}

	- if ((rc = bus_setup_intr(adapter->pdev, irq->res,
	- INTR_TYPE_NET \| INTR_MPSAFE, NULL, irq->handler,
	- irq->data, &irq->cookie)) != 0) {
	+ rc = bus_setup_intr(adapter->pdev, irq->res,
	+ INTR_TYPE_NET \| INTR_MPSAFE, NULL,
	+ irq->handler, irq->data, &irq->cookie);
	+ if (rc != 0) {
	device_printf(adapter->pdev, "failed to register "
	"interrupt handler for irq %ju: %d\n",
	rman_get_start(irq->res), rc);
	@@ -2031,9 +2010,9 @@

	/* Once we entered err: section and irq->requested is true we
	free both intr and resources */
	- if (irq->requested == true)
	+ if (irq->requested)
	rcc = bus_teardown_intr(adapter->pdev, irq->res, irq->cookie);
	- if (rcc)
	+ if (rcc != 0)
	device_printf(adapter->pdev, "could not release"
	" irq: %d, error: %d\n", irq->vector, rcc);

	@@ -2046,7 +2025,7 @@
	rcc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
	irq->vector, irq->res);
	}
	- if (rcc)
	+ if (rcc != 0)
	device_printf(adapter->pdev, "dev has no parent while "
	"releasing res for irq: %d\n", irq->vector);
	irq->requested = false;
	@@ -2067,7 +2046,7 @@
	ena_trace(ENA_INFO \| ENA_ADMQ, "tear down irq: %d\n",
	irq->vector);
	rc = bus_teardown_intr(adapter->pdev, irq->res, irq->cookie);
	- if (rc)
	+ if (rc != 0)
	device_printf(adapter->pdev, "failed to tear "
	"down irq: %d\n", irq->vector);
	irq->requested = 0;
	@@ -2079,12 +2058,10 @@
	rc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
	irq->vector, irq->res);
	irq->res = NULL;
	- if (rc)
	+ if (rc != 0)
	device_printf(adapter->pdev, "dev has no parent while "
	"releasing res for irq: %d\n", irq->vector);
	}
	-
	- return;
	}

	static void
	@@ -2100,7 +2077,7 @@
	irq->vector);
	rc = bus_teardown_intr(adapter->pdev, irq->res,
	irq->cookie);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev, "failed to tear "
	"down irq: %d\n", irq->vector);
	}
	@@ -2113,15 +2090,13 @@
	rc = bus_release_resource(adapter->pdev, SYS_RES_IRQ,
	irq->vector, irq->res);
	irq->res = NULL;
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev, "dev has no parent"
	" while releasing res for irq: %d\n",
	irq->vector);
	}
	}
	}
	-
	- return;
	}

	static void
	@@ -2162,27 +2137,28 @@
	}

	/* Configure the Rx forwarding */
	-static int ena_rss_configure(struct ena_adapter *adapter)
	+static int
	+ena_rss_configure(struct ena_adapter *adapter)
	{
	struct ena_com_dev *ena_dev = adapter->ena_dev;
	int rc;

	/* Set indirect table */
	rc = ena_com_indirect_table_set(ena_dev);
	- if (unlikely(rc && rc != EOPNOTSUPP))
	- return rc;
	+ if (unlikely((rc != 0) && (rc != EOPNOTSUPP)))
	+ return (rc);

	/* Configure hash function (if supported) */
	rc = ena_com_set_hash_function(ena_dev);
	- if (unlikely(rc && (rc != EOPNOTSUPP)))
	- return rc;
	+ if (unlikely((rc != 0) && (rc != EOPNOTSUPP)))
	+ return (rc);

	/* Configure hash inputs (if supported) */
	rc = ena_com_set_hash_ctrl(ena_dev);
	- if (unlikely(rc && (rc != EOPNOTSUPP)))
	- return rc;
	+ if (unlikely((rc != 0) && (rc != EOPNOTSUPP)))
	+ return (rc);

	- return 0;
	+ return (0);
	}

	static int
	@@ -2192,7 +2168,7 @@

	if (adapter->rss_support) {
	rc = ena_rss_configure(adapter);
	- if (rc)
	+ if (rc != 0)
	return (rc);
	}

	@@ -2212,12 +2188,12 @@
	{
	int rc = 0;

	- if (!device_is_attached(adapter->pdev)) {
	+ if (device_is_attached(adapter->pdev) == 0) {
	device_printf(adapter->pdev, "device is not attached!\n");
	return (ENXIO);
	}

	- if (!adapter->running) {
	+ if (!adapter->running == false) {
	device_printf(adapter->pdev, "device is not running!\n");
	return (ENXIO);
	}
	@@ -2228,28 +2204,28 @@
	/* setup interrupts for IO queues */
	ena_setup_io_intr(adapter);
	rc = ena_request_io_irq(adapter);
	- if (rc) {
	+ if (rc != 0) {
	ena_trace(ENA_ALERT, "err_req_irq");
	goto err_req_irq;
	}

	/* allocate transmit descriptors */
	rc = ena_setup_all_tx_resources(adapter);
	- if (rc) {
	+ if (rc != 0) {
	ena_trace(ENA_ALERT, "err_setup_tx");
	goto err_setup_tx;
	}

	/* allocate receive descriptors */
	rc = ena_setup_all_rx_resources(adapter);
	- if (rc) {
	+ if (rc != 0) {
	ena_trace(ENA_ALERT, "err_setup_rx");
	goto err_setup_rx;
	}

	/* create IO queues for Rx & Tx */
	rc = ena_create_io_queues(adapter);
	- if (rc) {
	+ if (rc != 0) {
	ena_trace(ENA_ALERT,
	"create IO queues failed");
	goto err_io_que;
	@@ -2259,7 +2235,7 @@
	if_link_state_change(adapter->ifp, LINK_STATE_UP);

	rc = ena_up_complete(adapter);
	- if (rc)
	+ if (rc != 0)
	goto err_up_complete;

	counter_u64_add(adapter->dev_stats.interface_up, 1);
	@@ -2344,8 +2320,6 @@
	ifmr->ifm_active \|= IFM_10G_T \| IFM_FDX;

	ENA_DEV_UNLOCK;
	-
	- return;
	}

	static void
	@@ -2353,13 +2327,11 @@
	{
	struct ena_adapter adapter = (struct ena_adapter )arg;

	- if (adapter->up == false) {
	+ if (!adapter->up) {
	sx_xlock(&adapter->ioctl_sx);
	ena_up(adapter);
	sx_unlock(&adapter->ioctl_sx);
	}
	-
	- return;
	}

	static int
	@@ -2388,10 +2360,10 @@
	break;

	case SIOCSIFFLAGS:
	- if (ifp->if_flags & IFF_UP) {
	- if ((ifp->if_drv_flags & IFF_DRV_RUNNING)) {
	- if (ifp->if_flags & (IFF_PROMISC \|
	- IFF_ALLMULTI)) {
	+ if ((ifp->if_flags & IFF_UP) != 0) {
	+ if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) {
	+ if ((ifp->if_flags & (IFF_PROMISC \|
	+ IFF_ALLMULTI)) != 0) {
	device_printf(adapter->pdev,
	"ioctl promisc/allmulti\n");
	}
	@@ -2401,7 +2373,7 @@
	sx_unlock(&adapter->ioctl_sx);
	}
	} else {
	- if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
	+ if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) {
	sx_xlock(&adapter->ioctl_sx);
	ena_down(adapter);
	sx_unlock(&adapter->ioctl_sx);
	@@ -2427,7 +2399,8 @@
	reinit = 1;
	}

	- if (reinit && (ifp->if_drv_flags & IFF_DRV_RUNNING)) {
	+ if ((reinit != 0) &&
	+ ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0)) {
	sx_xlock(&adapter->ioctl_sx);
	ena_down(adapter);
	rc = ena_up(adapter);
	@@ -2449,30 +2422,32 @@
	{
	int caps = 0;

	- if (feat->offload.tx &
	+ if ((feat->offload.tx &
	(ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_FULL_MASK \|
	ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_PART_MASK \|
	- ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L3_CSUM_IPV4_MASK))
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L3_CSUM_IPV4_MASK)) != 0)
	caps \|= IFCAP_TXCSUM;

	- if (feat->offload.tx &
	+ if ((feat->offload.tx &
	(ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV6_CSUM_FULL_MASK \|
	- ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV6_CSUM_PART_MASK))
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV6_CSUM_PART_MASK)) != 0)
	caps \|= IFCAP_TXCSUM_IPV6;

	- if (feat->offload.tx & ENA_ADMIN_FEATURE_OFFLOAD_DESC_TSO_IPV4_MASK)
	+ if ((feat->offload.tx &
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_TSO_IPV4_MASK) != 0)
	caps \|= IFCAP_TSO4;

	- if (feat->offload.tx & ENA_ADMIN_FEATURE_OFFLOAD_DESC_TSO_IPV6_MASK)
	+ if ((feat->offload.tx &
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_TSO_IPV6_MASK) != 0)
	caps \|= IFCAP_TSO6;

	- if (feat->offload.rx_supported &
	+ if ((feat->offload.rx_supported &
	(ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L4_IPV4_CSUM_MASK \|
	- ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L3_CSUM_IPV4_MASK))
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L3_CSUM_IPV4_MASK)) != 0)
	caps \|= IFCAP_RXCSUM;

	- if (feat->offload.rx_supported &
	- ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L4_IPV6_CSUM_MASK)
	+ if ((feat->offload.rx_supported &
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_RX_L4_IPV6_CSUM_MASK) != 0)
	caps \|= IFCAP_RXCSUM_IPV6;

	caps \|= IFCAP_LRO \| IFCAP_JUMBO_MTU;
	@@ -2498,22 +2473,23 @@

	if_clearhwassist(ifp);

	- if (cap & IFCAP_TXCSUM) {
	- if (feat & ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L3_CSUM_IPV4_MASK)
	+ if ((cap & IFCAP_TXCSUM) != 0) {
	+ if ((feat &
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L3_CSUM_IPV4_MASK) != 0)
	flags \|= CSUM_IP;
	- if (feat &
	+ if ((feat &
	(ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_FULL_MASK \|
	- ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_PART_MASK))
	+ ENA_ADMIN_FEATURE_OFFLOAD_DESC_TX_L4_IPV4_CSUM_PART_MASK)) != 0)
	flags \|= CSUM_IP_UDP \| CSUM_IP_TCP;
	}

	- if (cap & IFCAP_TXCSUM_IPV6)
	+ if ((cap & IFCAP_TXCSUM_IPV6) != 0)
	flags \|= CSUM_IP6_UDP \| CSUM_IP6_TCP;

	- if (cap & IFCAP_TSO4)
	+ if ((cap & IFCAP_TSO4) != 0)
	flags \|= CSUM_IP_TSO;

	- if (cap & IFCAP_TSO6)
	+ if ((cap & IFCAP_TSO6) != 0)
	flags \|= CSUM_IP6_TSO;

	if_sethwassistbits(ifp, flags, 0);
	@@ -2529,7 +2505,7 @@
	ena_trace(ENA_DBG, "enter");

	ifp = adapter->ifp = if_gethandle(IFT_ETHER);
	- if (ifp == 0) {
	+ if (ifp == NULL) {
	device_printf(pdev, "can not allocate ifnet structure\n");
	return (ENXIO);
	}
	@@ -2598,7 +2574,7 @@
	if (adapter->trigger_reset) {
	rc = ena_com_dev_reset(adapter->ena_dev,
	adapter->reset_reason);
	- if (rc)
	+ if (rc != 0)
	device_printf(adapter->pdev,
	"Device reset failed\n");
	}
	@@ -2612,8 +2588,6 @@

	counter_u64_add(adapter->dev_stats.interface_down, 1);
	}
	-
	- return;
	}

	static void
	@@ -2642,7 +2616,7 @@
	if ((mbuf->m_pkthdr.csum_flags & CSUM_OFFLOAD) != 0)
	offload = true;

	- if (offload == false) {
	+ if (!offload) {
	ena_tx_ctx->meta_valid = 0;
	return;
	}
	@@ -2684,16 +2658,18 @@

	if (ip->ip_p == IPPROTO_TCP) {
	ena_tx_ctx->l4_proto = ENA_ETH_IO_L4_PROTO_TCP;
	- if (mbuf->m_pkthdr.csum_flags & (CSUM_IP_TCP \| CSUM_IP6_TCP))
	- ena_tx_ctx->l4_csum_enable = 1;
	+ if ((mbuf->m_pkthdr.csum_flags &
	+ (CSUM_IP_TCP \| CSUM_IP6_TCP)) != 0)
	+ ena_tx_ctx->l4_csum_enable = 1;
	else
	- ena_tx_ctx->l4_csum_enable = 0;
	+ ena_tx_ctx->l4_csum_enable = 0;
	} else if (ip->ip_p == IPPROTO_UDP) {
	ena_tx_ctx->l4_proto = ENA_ETH_IO_L4_PROTO_UDP;
	- if (mbuf->m_pkthdr.csum_flags & (CSUM_IP_UDP \| CSUM_IP6_UDP))
	- ena_tx_ctx->l4_csum_enable = 1;
	+ if ((mbuf->m_pkthdr.csum_flags &
	+ (CSUM_IP_UDP \| CSUM_IP6_UDP)) != 0)
	+ ena_tx_ctx->l4_csum_enable = 1;
	else
	- ena_tx_ctx->l4_csum_enable = 0;
	+ ena_tx_ctx->l4_csum_enable = 0;
	} else {
	ena_tx_ctx->l4_proto = ENA_ETH_IO_L4_PROTO_UNKNOWN;
	ena_tx_ctx->l4_csum_enable = 0;
	@@ -2757,10 +2733,8 @@
	ena_dev = adapter->ena_dev;
	io_sq = &adapter->ena_dev->io_sq_queues[ena_qid];

	- ENA_ASSERT(*mbuf, "mbuf is NULL\n");
	-
	rc = ena_check_and_collapse_mbuf(tx_ring, mbuf);
	- if (rc) {
	+ if (rc != 0) {
	ena_trace(ENA_WARNING,
	"Failed to collapse mbuf! err: %d", rc);
	return (rc);
	@@ -2785,7 +2759,7 @@
	rc = bus_dmamap_load_mbuf_sg(adapter->tx_buf_tag, tx_info->map,
	*mbuf, segs, &nsegs, BUS_DMA_NOWAIT);

	- if (rc \|\| (nsegs == 0)) {
	+ if ((rc != 0) \|\| (nsegs == 0)) {
	ena_trace(ENA_WARNING,
	"dmamap load failed! err: %d nsegs: %d", rc, nsegs);
	counter_u64_add(tx_ring->tx_stats.dma_mapping_err, 1);
	@@ -2825,7 +2799,8 @@

	counter_enter();
	counter_u64_add_protected(tx_ring->tx_stats.cnt, 1);
	- counter_u64_add_protected(tx_ring->tx_stats.bytes, (*mbuf)->m_pkthdr.len);
	+ counter_u64_add_protected(tx_ring->tx_stats.bytes,
	+ (*mbuf)->m_pkthdr.len);

	counter_u64_add_protected(adapter->hw_stats.tx_packets, 1);
	counter_u64_add_protected(adapter->hw_stats.tx_bytes,
	@@ -2839,7 +2814,8 @@
	tx_ring->next_to_use = ENA_TX_RING_IDX_NEXT(next_to_use,
	tx_ring->ring_size);

	- bus_dmamap_sync(adapter->tx_buf_tag, tx_info->map, BUS_DMASYNC_PREWRITE);
	+ bus_dmamap_sync(adapter->tx_buf_tag, tx_info->map,
	+ BUS_DMASYNC_PREWRITE);

	return (0);

	@@ -2860,7 +2836,7 @@
	int acum_pkts = 0;
	int ret = 0;

	- if ((adapter->ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
	+ if ((if_getdrvflags(adapter->ifp) & IFF_DRV_RUNNING) == 0)
	return;

	if (!adapter->link_status)
	@@ -2893,7 +2869,7 @@

	drbr_advance(adapter->ifp, tx_ring->br);

	- if ((adapter->ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
	+ if ((if_getdrvflags(adapter->ifp) & IFF_DRV_RUNNING) == 0)
	return;

	acum_pkts++;
	@@ -2910,15 +2886,14 @@

	}

	- if (acum_pkts) {
	+ if (acum_pkts != 0) {
	wmb();
	/* Trigger the dma engine */
	ena_com_write_sq_doorbell(io_sq);
	counter_u64_add(tx_ring->tx_stats.doorbells, 1);
	}

	- if (!ena_com_sq_have_enough_space(io_sq,
	- ENA_TX_CLEANUP_THRESHOLD))
	+ if (!ena_com_sq_have_enough_space(io_sq, ENA_TX_CLEANUP_THRESHOLD))
	ena_tx_cleanup(tx_ring);
	}

	@@ -2928,8 +2903,8 @@
	struct ena_ring tx_ring = (struct ena_ring )arg;
	struct ifnet *ifp = tx_ring->adapter->ifp;

	- while (drbr_empty(ifp, tx_ring->br) == FALSE &&
	- (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) {
	+ while (!drbr_empty(ifp, tx_ring->br) &&
	+ (if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) {
	ENA_RING_MTX_LOCK(tx_ring);
	ena_start_xmit(tx_ring);
	ENA_RING_MTX_UNLOCK(tx_ring);
	@@ -2944,7 +2919,7 @@
	int ret, is_drbr_empty;
	uint32_t i;

	- if ((adapter->ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
	+ if ((if_getdrvflags(adapter->ifp) & IFF_DRV_RUNNING) == 0)
	return (ENODEV);

	/* Which queue to use */
	@@ -2972,12 +2947,12 @@
	/* Check if drbr is empty before putting packet */
	is_drbr_empty = drbr_empty(ifp, tx_ring->br);
	ret = drbr_enqueue(ifp, tx_ring->br, m);
	- if (ret) {
	+ if (ret != 0) {
	taskqueue_enqueue(tx_ring->enqueue_tq, &tx_ring->enqueue_task);
	return (ret);
	}

	- if (is_drbr_empty && ENA_RING_MTX_TRYLOCK(tx_ring)) {
	+ if ((is_drbr_empty != 0) && (ENA_RING_MTX_TRYLOCK(tx_ring) != 0)) {
	ena_start_xmit(tx_ring);
	ENA_RING_MTX_UNLOCK(tx_ring);
	} else {
	@@ -2995,18 +2970,17 @@
	int i;

	for(i = 0; i < adapter->num_queues; ++i, ++tx_ring)
	- if (drbr_empty(ifp, tx_ring->br) == FALSE) {
	+ if (!drbr_empty(ifp, tx_ring->br)) {
	ENA_RING_MTX_LOCK(tx_ring);
	drbr_flush(ifp, tx_ring->br);
	ENA_RING_MTX_UNLOCK(tx_ring);
	}

	if_qflush(ifp);
	-
	- return;
	}

	-static int ena_calc_io_queue_num(struct ena_adapter *adapter,
	+static int
	+ena_calc_io_queue_num(struct ena_adapter *adapter,
	struct ena_com_dev_get_features_ctx *get_feat_ctx)
	{
	int io_sq_num, io_cq_num, io_queue_num;
	@@ -3024,12 +2998,12 @@
	io_queue_num = min_t(int, io_queue_num, rss_getnumbuckets());
	#endif

	- return io_queue_num;
	+ return (io_queue_num);
	}

	-static int ena_calc_queue_size(struct ena_adapter *adapter,
	- uint16_t max_tx_sgl_size, uint16_t max_rx_sgl_size,
	- struct ena_com_dev_get_features_ctx *feat)
	+static int
	+ena_calc_queue_size(struct ena_adapter adapter, uint16_t max_tx_sgl_size,
	+ uint16_t max_rx_sgl_size, struct ena_com_dev_get_features_ctx feat)
	{
	uint32_t queue_size = ENA_DEFAULT_RING_SIZE;
	uint32_t v;
	@@ -3043,7 +3017,7 @@
	/* round down to the nearest power of 2 */
	v = queue_size;
	while (v != 0) {
	- if (powerof2(queue_size))
	+ if (powerof2(queue_size) != 0)
	break;
	v /= 2;
	q = rounddown2(queue_size, v);
	@@ -3053,9 +3027,9 @@
	}
	}

	- if (unlikely(!queue_size)) {
	+ if (unlikely(queue_size == 0)) {
	device_printf(adapter->pdev, "Invalid queue size\n");
	- return ENA_COM_FAULT;
	+ return (ENA_COM_FAULT);
	}

	*max_tx_sgl_size = min_t(uint16_t, ENA_PKT_MAX_BUFS,
	@@ -3063,17 +3037,18 @@
	*max_rx_sgl_size = min_t(uint16_t, ENA_PKT_MAX_BUFS,
	feat->max_queues.max_packet_rx_descs);

	- return queue_size;
	+ return (queue_size);
	}

	-static int ena_rss_init_default(struct ena_adapter *adapter)
	+static int
	+ena_rss_init_default(struct ena_adapter *adapter)
	{
	struct ena_com_dev *ena_dev = adapter->ena_dev;
	device_t dev = adapter->pdev;
	int qid, rc, i;

	rc = ena_com_rss_init(ena_dev, ENA_RX_RSS_TABLE_LOG_SIZE);
	- if (unlikely(rc)) {
	+ if (unlikely(rc != 0)) {
	device_printf(dev, "Cannot init RSS\n");
	return (rc);
	}
	@@ -3086,22 +3061,22 @@
	qid = i % adapter->num_queues;
	#endif
	rc = ena_com_indirect_table_fill_entry(ena_dev, i,
	- ENA_IO_RXQ_IDX(qid));
	- if (unlikely(rc && (rc != EOPNOTSUPP))) {
	+ ENA_IO_RXQ_IDX(qid));
	+ if (unlikely((rc != 0) && (rc != EOPNOTSUPP))) {
	device_printf(dev, "Cannot fill indirect table\n");
	goto err_rss_destroy;
	}
	}

	rc = ena_com_fill_hash_function(ena_dev, ENA_ADMIN_CRC32, NULL,
	- ENA_HASH_KEY_SIZE, 0xFFFFFFFF);
	- if (unlikely(rc && (rc != EOPNOTSUPP))) {
	+ ENA_HASH_KEY_SIZE, 0xFFFFFFFF);
	+ if (unlikely((rc != 0) && (rc != EOPNOTSUPP))) {
	device_printf(dev, "Cannot fill hash function\n");
	goto err_rss_destroy;
	}

	rc = ena_com_set_default_hash_ctrl(ena_dev);
	- if (unlikely(rc && (rc != EOPNOTSUPP))) {
	+ if (unlikely((rc != 0) && (rc != EOPNOTSUPP))) {
	device_printf(dev, "Cannot fill hash control\n");
	goto err_rss_destroy;
	}
	@@ -3133,10 +3108,10 @@
	if (adapter != NULL) {
	rc = ena_rss_init_default(adapter);
	adapter->rss_support = true;
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"WARNING: RSS was not properly initialized,"
	- " it will affect bandwith\n");
	+ " it will affect bandwidth\n");
	adapter->rss_support = false;
	}
	}
	@@ -3144,14 +3119,15 @@
	}
	SYSINIT(ena_rss_init, SI_SUB_KICK_SCHEDULER, SI_ORDER_SECOND, ena_rss_init_default_deferred, NULL);

	-static void ena_config_host_info(struct ena_com_dev *ena_dev)
	+static void
	+ena_config_host_info(struct ena_com_dev *ena_dev)
	{
	struct ena_admin_host_info *host_info;
	int rc;

	/* Allocate only the host info */
	rc = ena_com_allocate_host_info(ena_dev);
	- if (rc) {
	+ if (rc != 0) {
	ena_trace(ENA_ALERT, "Cannot allocate host info\n");
	return;
	}
	@@ -3172,7 +3148,7 @@
	(DRV_MODULE_VER_SUBMINOR << ENA_ADMIN_HOST_INFO_SUB_MINOR_SHIFT);

	rc = ena_com_set_host_attributes(ena_dev);
	- if (rc) {
	+ if (rc != 0) {
	if (rc == EOPNOTSUPP)
	ena_trace(ENA_WARNING, "Cannot set host attributes\n");
	else
	@@ -3189,7 +3165,7 @@

	static int
	ena_device_init(struct ena_adapter *adapter, device_t pdev,
	- struct ena_com_dev_get_features_ctx get_feat_ctx, int wd_active)
	+ struct ena_com_dev_get_features_ctx get_feat_ctx, int wd_active)
	{
	struct ena_com_dev* ena_dev = adapter->ena_dev;
	bool readless_supported;
	@@ -3198,9 +3174,9 @@
	int rc;

	rc = ena_com_mmio_reg_read_request_init(ena_dev);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev, "failed to init mmio read less\n");
	- return rc;
	+ return (rc);
	}

	/*
	@@ -3211,13 +3187,13 @@
	ena_com_set_mmio_read_mode(ena_dev, readless_supported);

	rc = ena_com_dev_reset(ena_dev, ENA_REGS_RESET_NORMAL);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev, "Can not reset device\n");
	goto err_mmio_read_less;
	}

	rc = ena_com_validate_version(ena_dev);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev, "device version is too low\n");
	goto err_mmio_read_less;
	}
	@@ -3232,7 +3208,7 @@

	/* ENA admin level init */
	rc = ena_com_admin_init(ena_dev, &aenq_handlers, true);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev,
	"Can not initialize ena admin queue with device\n");
	goto err_mmio_read_less;
	@@ -3249,7 +3225,7 @@

	/* Get Device Attributes */
	rc = ena_com_get_dev_attr_feat(ena_dev, get_feat_ctx);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev,
	"Cannot get attribute for ena device rc: %d\n", rc);
	goto err_admin_init;
	@@ -3263,14 +3239,14 @@

	aenq_groups &= get_feat_ctx->aenq.supported_groups;
	rc = ena_com_set_aenq_config(ena_dev, aenq_groups);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev, "Cannot configure aenq groups rc: %d\n", rc);
	goto err_admin_init;
	}

	*wd_active = !!(aenq_groups & BIT(ENA_ADMIN_KEEP_ALIVE));

	- return 0;
	+ return (0);

	err_admin_init:
	ena_com_delete_host_info(ena_dev);
	@@ -3278,7 +3254,7 @@
	err_mmio_read_less:
	ena_com_mmio_reg_read_request_destroy(ena_dev);

	- return rc;
	+ return (rc);
	}

	static int ena_enable_msix_and_set_admin_interrupts(struct ena_adapter *adapter,
	@@ -3288,15 +3264,15 @@
	int rc;

	rc = ena_enable_msix(adapter);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev, "Error with MSI-X enablement\n");
	- return rc;
	+ return (rc);
	}

	ena_setup_mgmnt_intr(adapter);

	rc = ena_request_mgmnt_irq(adapter);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev, "Cannot setup mgmnt queue intr\n");
	goto err_disable_msix;
	}
	@@ -3305,12 +3281,12 @@

	ena_com_admin_aenq_enable(ena_dev);

	- return 0;
	+ return (0);

	err_disable_msix:
	ena_disable_msix(adapter);

	- return rc;
	+ return (rc);
	}

	/* Function called on ENA_ADMIN_KEEP_ALIVE event */
	@@ -3357,7 +3333,8 @@
	/* Check if admin queue is enabled */
	static void check_for_admin_com_state(struct ena_adapter *adapter)
	{
	- if (unlikely(!ena_com_get_admin_running_state(adapter->ena_dev))) {
	+ if (unlikely(ena_com_get_admin_running_state(adapter->ena_dev) ==
	+ false)) {
	device_printf(adapter->pdev,
	"ENA admin queue is not in running state!\n");
	counter_u64_add(adapter->dev_stats.admin_q_pause, 1);
	@@ -3380,7 +3357,7 @@
	for (i = 0; i < tx_ring->ring_size; i++) {
	tx_buf = &tx_ring->tx_buffer_info[i];

	- if (!bintime_isset(&tx_buf->timestamp))
	+ if (bintime_isset(&tx_buf->timestamp) == 0)
	continue;

	time = curtime;
	@@ -3422,7 +3399,8 @@
	* Reset will be performed if number of incompleted
	* transactions exceeds "missing_tx_threshold".
	*/
	-static void check_for_missing_tx_completions(struct ena_adapter *adapter)
	+static void
	+check_for_missing_tx_completions(struct ena_adapter *adapter)
	{
	struct ena_ring *tx_ring;
	int i, budget, rc;
	@@ -3445,7 +3423,7 @@
	tx_ring = &adapter->tx_ring[i];

	rc = check_missing_comp_in_queue(adapter, tx_ring);
	- if (unlikely(rc))
	+ if (unlikely(rc != 0))
	return;

	budget--;
	@@ -3521,7 +3499,7 @@

	check_for_empty_rx_ring(adapter);

	- if (host_info)
	+ if (host_info != NULL)
	ena_update_host_info(host_info, adapter->ifp);

	if (unlikely(adapter->trigger_reset)) {
	@@ -3572,7 +3550,7 @@
	/* Finished destroy part. Restart the device */
	rc = ena_device_init(adapter, adapter->pdev, &get_feat_ctx,
	&adapter->wd_active);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"ENA device init failed! (err: %d)\n", rc);
	goto err_dev_free;
	@@ -3580,7 +3558,7 @@

	rc = ena_enable_msix_and_set_admin_interrupts(adapter,
	adapter->num_queues);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev, "Enable MSI-X failed\n");
	goto err_com_free;
	}
	@@ -3588,7 +3566,7 @@
	/* If the interface was up before the reset bring it up */
	if (dev_up) {
	rc = ena_up(adapter);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(adapter->pdev,
	"Failed to create I/O queues\n");
	goto err_msix_free;
	@@ -3635,38 +3613,12 @@
	int io_queue_num;
	int queue_size;
	int rc;
	- struct sysctl_ctx_list *ctx;
	- struct sysctl_oid_list *children;
	-
	adapter = device_get_softc(pdev);
	adapter->pdev = pdev;
	- ctx = device_get_sysctl_ctx(pdev);
	- children = SYSCTL_CHILDREN(device_get_sysctl_tree(pdev));

	mtx_init(&adapter->global_mtx, "ENA global mtx", NULL, MTX_DEF);
	sx_init(&adapter->ioctl_sx, "ENA ioctl sx");

	- /* Sysctl calls for Watchdog service */
	- SYSCTL_ADD_INT(ctx, children, OID_AUTO, "wd_active",
	- CTLFLAG_RWTUN, &adapter->wd_active, 0,
	- "Watchdog is active");
	-
	- SYSCTL_ADD_QUAD(ctx, children, OID_AUTO, "keep_alive_timeout",
	- CTLFLAG_RWTUN, &adapter->keep_alive_timeout,
	- "Timeout for Keep Alive messages");
	-
	- SYSCTL_ADD_QUAD(ctx, children, OID_AUTO, "missing_tx_timeout",
	- CTLFLAG_RWTUN, &adapter->missing_tx_timeout,
	- "Timeout for TX completion");
	-
	- SYSCTL_ADD_U32(ctx, children, OID_AUTO, "missing_tx_max_queues",
	- CTLFLAG_RWTUN, &adapter->missing_tx_max_queues, 0,
	- "Number of TX queues to check per run");
	-
	- SYSCTL_ADD_U32(ctx, children, OID_AUTO, "missing_tx_threshold",
	- CTLFLAG_RWTUN, &adapter->missing_tx_threshold, 0,
	- "Max number of timeouted packets");
	-
	/* Set up the timer service */
	callout_init_mtx(&adapter->timer_service, &adapter->global_mtx, 0);
	adapter->keep_alive_timeout = DEFAULT_KEEP_ALIVE_TO;
	@@ -3678,7 +3630,7 @@
	device_printf(pdev, "%s\n", ena_version);

	rc = ena_allocate_pci_resources(adapter);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev, "PCI resource allocation failed!\n");
	ena_free_pci_resources(adapter);
	return (rc);
	@@ -3709,7 +3661,7 @@

	/* Device initialization */
	rc = ena_device_init(adapter, pdev, &get_feat_ctx, &adapter->wd_active);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev, "ENA device init failed! (err: %d)\n", rc);
	rc = ENXIO;
	goto err_bus_free;
	@@ -3753,11 +3705,11 @@

	/* set up dma tags for rx and tx buffers */
	rc = ena_setup_tx_dma_tag(adapter);
	- if (rc)
	+ if (rc != 0)
	goto err_com_free;

	rc = ena_setup_rx_dma_tag(adapter);
	- if (rc)
	+ if (rc != 0)
	goto err_tx_tag_free;

	/* initialize rings basic information */
	@@ -3766,13 +3718,13 @@

	/* setup network interface */
	rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev,"Error with network interface setup\n");
	goto err_io_free;
	}

	rc = ena_enable_msix_and_set_admin_interrupts(adapter, io_queue_num);
	- if (rc) {
	+ if (rc != 0) {
	device_printf(pdev,
	"Failed to enable and set the admin interrupts\n");
	goto err_ifp_free;
	@@ -3864,12 +3816,12 @@
	ena_com_rss_destroy(ena_dev);

	rc = ena_free_rx_dma_tag(adapter);
	- if (rc)
	+ if (rc != 0)
	device_printf(adapter->pdev,
	"Unmapped RX DMA tag associations\n");

	rc = ena_free_tx_dma_tag(adapter);
	- if (rc)
	+ if (rc != 0)
	device_printf(adapter->pdev,
	"Unmapped TX DMA tag associations\n");

	@@ -3936,8 +3888,6 @@
	}

	adapter->link_status = status;
	-
	- return;
	}

	/**
	Index: sys/dev/ena/ena_sysctl.c
	===================================================================
	--- sys/dev/ena/ena_sysctl.c
	+++ sys/dev/ena/ena_sysctl.c
	@@ -32,14 +32,53 @@

	#include "ena_sysctl.h"

	+static void ena_sysctl_add_wd(struct ena_adapter *);
	static void ena_sysctl_add_stats(struct ena_adapter *);

	void
	ena_sysctl_add_nodes(struct ena_adapter *adapter)
	{
	+ ena_sysctl_add_wd(adapter);
	ena_sysctl_add_stats(adapter);
	}

	+static void
	+ena_sysctl_add_wd(struct ena_adapter *adapter)
	+{
	+ device_t dev;
	+
	+ struct sysctl_ctx_list *ctx;
	+ struct sysctl_oid *tree;
	+ struct sysctl_oid_list *child;
	+
	+ dev = adapter->pdev;
	+
	+ ctx = device_get_sysctl_ctx(dev);
	+ tree = device_get_sysctl_tree(dev);
	+ child = SYSCTL_CHILDREN(tree);
	+
	+ /* Sysctl calls for Watchdog service */
	+ SYSCTL_ADD_INT(ctx, child, OID_AUTO, "wd_active",
	+ CTLFLAG_RWTUN, &adapter->wd_active, 0,
	+ "Watchdog is active");
	+
	+ SYSCTL_ADD_QUAD(ctx, child, OID_AUTO, "keep_alive_timeout",
	+ CTLFLAG_RWTUN, &adapter->keep_alive_timeout,
	+ "Timeout for Keep Alive messages");
	+
	+ SYSCTL_ADD_QUAD(ctx, child, OID_AUTO, "missing_tx_timeout",
	+ CTLFLAG_RWTUN, &adapter->missing_tx_timeout,
	+ "Timeout for TX completion");
	+
	+ SYSCTL_ADD_U32(ctx, child, OID_AUTO, "missing_tx_max_queues",
	+ CTLFLAG_RWTUN, &adapter->missing_tx_max_queues, 0,
	+ "Number of TX queues to check per run");
	+
	+ SYSCTL_ADD_U32(ctx, child, OID_AUTO, "missing_tx_threshold",
	+ CTLFLAG_RWTUN, &adapter->missing_tx_threshold, 0,
	+ "Max number of timeouted packets");
	+}
	+
	static void
	ena_sysctl_add_stats(struct ena_adapter *adapter)
	{

File Metadata

Mime Type: text/plain
Expires: Tue, Mar 10, 9:16 PM (10 h, 17 s)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 29512872
Default Alt Text: D12860.id34672.diff (40 KB)

D12860.id34672.diffNo OneTemporaryActions

D12860.id34672.diffView Options

File Metadata

Event Timeline

D12860.id34672.diff
No OneTemporary
Actions

D12860.id34672.diff
View Options