git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/cnxk: support CPT CTX write through microcode op
[dpdk.git]
/
drivers
/
net
/
enic
/
enic_main.c
diff --git
a/drivers/net/enic/enic_main.c
b/drivers/net/enic/enic_main.c
index
21b1fff
..
5cc6d9f
100644
(file)
--- a/
drivers/net/enic/enic_main.c
+++ b/
drivers/net/enic/enic_main.c
@@
-250,7
+250,7
@@
void enic_init_vnic_resources(struct enic *enic)
error_interrupt_offset);
/* Compute unsupported ol flags for enic_prep_pkts() */
enic->wq[index].tx_offload_notsup_mask =
error_interrupt_offset);
/* Compute unsupported ol flags for enic_prep_pkts() */
enic->wq[index].tx_offload_notsup_mask =
-
PKT
_TX_OFFLOAD_MASK ^ enic->tx_offload_mask;
+
RTE_MBUF_F
_TX_OFFLOAD_MASK ^ enic->tx_offload_mask;
cq_idx = enic_cq_wq(enic, index);
vnic_cq_init(&enic->cq[cq_idx],
cq_idx = enic_cq_wq(enic, index);
vnic_cq_init(&enic->cq[cq_idx],
@@
-448,7
+448,7
@@
enic_intr_handler(void *arg)
rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
enic_log_q_error(enic);
/* Re-enable irq in case of INTx */
rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
enic_log_q_error(enic);
/* Re-enable irq in case of INTx */
- rte_intr_ack(
&
enic->pdev->intr_handle);
+ rte_intr_ack(enic->pdev->intr_handle);
}
static int enic_rxq_intr_init(struct enic *enic)
}
static int enic_rxq_intr_init(struct enic *enic)
@@
-477,14
+477,16
@@
static int enic_rxq_intr_init(struct enic *enic)
" interrupts\n");
return err;
}
" interrupts\n");
return err;
}
- intr_handle->intr_vec = rte_zmalloc("enic_intr_vec",
- rxq_intr_count * sizeof(int), 0);
-
if (intr_handle->intr_vec == NULL
) {
+
+ if (rte_intr_vec_list_alloc(intr_handle, "enic_intr_vec",
+
rxq_intr_count)
) {
dev_err(enic, "Failed to allocate intr_vec\n");
return -ENOMEM;
}
for (i = 0; i < rxq_intr_count; i++)
dev_err(enic, "Failed to allocate intr_vec\n");
return -ENOMEM;
}
for (i = 0; i < rxq_intr_count; i++)
- intr_handle->intr_vec[i] = i + ENICPMD_RXQ_INTR_OFFSET;
+ if (rte_intr_vec_list_index_set(intr_handle, i,
+ i + ENICPMD_RXQ_INTR_OFFSET))
+ return -rte_errno;
return 0;
}
return 0;
}
@@
-494,10
+496,8
@@
static void enic_rxq_intr_deinit(struct enic *enic)
intr_handle = enic->rte_dev->intr_handle;
rte_intr_efd_disable(intr_handle);
intr_handle = enic->rte_dev->intr_handle;
rte_intr_efd_disable(intr_handle);
- if (intr_handle->intr_vec != NULL) {
- rte_free(intr_handle->intr_vec);
- intr_handle->intr_vec = NULL;
- }
+
+ rte_intr_vec_list_free(intr_handle);
}
static void enic_prep_wq_for_simple_tx(struct enic *enic, uint16_t queue_idx)
}
static void enic_prep_wq_for_simple_tx(struct enic *enic, uint16_t queue_idx)
@@
-667,10
+667,10
@@
int enic_enable(struct enic *enic)
vnic_dev_enable_wait(enic->vdev);
/* Register and enable error interrupt */
vnic_dev_enable_wait(enic->vdev);
/* Register and enable error interrupt */
- rte_intr_callback_register(
&(enic->pdev->intr_handle)
,
+ rte_intr_callback_register(
enic->pdev->intr_handle
,
enic_intr_handler, (void *)enic->rte_dev);
enic_intr_handler, (void *)enic->rte_dev);
- rte_intr_enable(
&(enic->pdev->intr_handle)
);
+ rte_intr_enable(
enic->pdev->intr_handle
);
/* Unmask LSC interrupt */
vnic_intr_unmask(&enic->intr[ENICPMD_LSC_INTR_OFFSET]);
/* Unmask LSC interrupt */
vnic_intr_unmask(&enic->intr[ENICPMD_LSC_INTR_OFFSET]);
@@
-1111,8
+1111,8
@@
int enic_disable(struct enic *enic)
(void)vnic_intr_masked(&enic->intr[i]); /* flush write */
}
enic_rxq_intr_deinit(enic);
(void)vnic_intr_masked(&enic->intr[i]); /* flush write */
}
enic_rxq_intr_deinit(enic);
- rte_intr_disable(
&
enic->pdev->intr_handle);
- rte_intr_callback_unregister(
&
enic->pdev->intr_handle,
+ rte_intr_disable(enic->pdev->intr_handle);
+ rte_intr_callback_unregister(enic->pdev->intr_handle,
enic_intr_handler,
(void *)enic->rte_dev);
enic_intr_handler,
(void *)enic->rte_dev);
@@
-1749,10
+1749,10
@@
enic_enable_overlay_offload(struct enic *enic)
(enic->geneve ? RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO : 0) |
(enic->vxlan ? RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO : 0);
enic->tx_offload_mask |=
(enic->geneve ? RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO : 0) |
(enic->vxlan ? RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO : 0);
enic->tx_offload_mask |=
-
PKT
_TX_OUTER_IPV6 |
-
PKT
_TX_OUTER_IPV4 |
-
PKT
_TX_OUTER_IP_CKSUM |
-
PKT
_TX_TUNNEL_MASK;
+
RTE_MBUF_F
_TX_OUTER_IPV6 |
+
RTE_MBUF_F
_TX_OUTER_IPV4 |
+
RTE_MBUF_F
_TX_OUTER_IP_CKSUM |
+
RTE_MBUF_F
_TX_TUNNEL_MASK;
enic->overlay_offload = true;
if (enic->vxlan && enic->geneve)
enic->overlay_offload = true;
if (enic->vxlan && enic->geneve)