common/cnxk: enable backpressure on CPT with inline inbound

[dpdk.git] / drivers / event / cnxk / cn10k_eventdev.c

diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/cn10k_eventdev.c
index 9c0d84b..e287448 100644 (file)
--- a/drivers/event/cnxk/cn10k_eventdev.c
+++ b/drivers/event/cnxk/cn10k_eventdev.c
@@ -17,7 +17,8 @@
 
 #define CN10K_SET_EVDEV_ENQ_OP(dev, enq_op, enq_ops)                           \
        (enq_op =                                                              \
-                enq_ops[!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]       \
+                enq_ops[!!(dev->tx_offloads & NIX_TX_OFFLOAD_SECURITY_F)]     \
+                       [!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSTAMP_F)]       \
                        [!!(dev->tx_offloads & NIX_TX_OFFLOAD_TSO_F)]          \
                        [!!(dev->tx_offloads & NIX_TX_OFFLOAD_MBUF_NOFF_F)]    \
                        [!!(dev->tx_offloads & NIX_TX_OFFLOAD_VLAN_QINQ_F)]    \
@@ -379,18 +380,18 @@ cn10k_sso_fp_fns_set(struct rte_eventdev *event_dev)
        };
 
        /* Tx modes */
-       const event_tx_adapter_enqueue
-               sso_hws_tx_adptr_enq[2][2][2][2][2][2] = {
-#define T(name, f5, f4, f3, f2, f1, f0, sz, flags)                             \
-       [f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_##name,
+       const event_tx_adapter_enqueue_t
+               sso_hws_tx_adptr_enq[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_##name,
                        NIX_TX_FASTPATH_MODES
 #undef T
                };
 
-       const event_tx_adapter_enqueue
-               sso_hws_tx_adptr_enq_seg[2][2][2][2][2][2] = {
-#define T(name, f5, f4, f3, f2, f1, f0, sz, flags)                            \
-       [f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_seg_##name,
+       const event_tx_adapter_enqueue_t
+               sso_hws_tx_adptr_enq_seg[2][2][2][2][2][2][2] = {
+#define T(name, f6, f5, f4, f3, f2, f1, f0, sz, flags)                         \
+       [f6][f5][f4][f3][f2][f1][f0] = cn10k_sso_hws_tx_adptr_enq_seg_##name,
                        NIX_TX_FASTPATH_MODES
 #undef T
                };
@@ -694,81 +695,6 @@ cn10k_sso_rx_adapter_vector_limits(
        return 0;
 }
 
-static int
-cnxk_sso_rx_adapter_vwqe_enable(struct cnxk_eth_dev *cnxk_eth_dev,
-                               uint16_t port_id, uint16_t rq_id, uint16_t sz,
-                               uint64_t tmo_ns, struct rte_mempool *vmp)
-{
-       struct roc_nix_rq *rq;
-
-       rq = &cnxk_eth_dev->rqs[rq_id];
-
-       if (!rq->sso_ena)
-               return -EINVAL;
-       if (rq->flow_tag_width == 0)
-               return -EINVAL;
-
-       rq->vwqe_ena = 1;
-       rq->vwqe_first_skip = 0;
-       rq->vwqe_aura_handle = roc_npa_aura_handle_to_aura(vmp->pool_id);
-       rq->vwqe_max_sz_exp = rte_log2_u32(sz);
-       rq->vwqe_wait_tmo =
-               tmo_ns /
-               ((roc_nix_get_vwqe_interval(&cnxk_eth_dev->nix) + 1) * 100);
-       rq->tag_mask = (port_id & 0xF) << 20;
-       rq->tag_mask |=
-               (((port_id >> 4) & 0xF) | (RTE_EVENT_TYPE_ETHDEV_VECTOR << 4))
-               << 24;
-
-       return roc_nix_rq_modify(&cnxk_eth_dev->nix, rq, 0);
-}
-
-static int
-cn10k_sso_rx_adapter_vector_config(
-       const struct rte_eventdev *event_dev, const struct rte_eth_dev *eth_dev,
-       int32_t rx_queue_id,
-       const struct rte_event_eth_rx_adapter_event_vector_config *config)
-{
-       struct cnxk_eth_dev *cnxk_eth_dev;
-       struct cnxk_sso_evdev *dev;
-       int i, rc;
-
-       rc = strncmp(eth_dev->device->driver->name, "net_cn10k", 8);
-       if (rc)
-               return -EINVAL;
-
-       dev = cnxk_sso_pmd_priv(event_dev);
-       cnxk_eth_dev = cnxk_eth_pmd_priv(eth_dev);
-       if (rx_queue_id < 0) {
-               for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
-                       cnxk_sso_updt_xae_cnt(dev, config->vector_mp,
-                                             RTE_EVENT_TYPE_ETHDEV_VECTOR);
-                       rc = cnxk_sso_xae_reconfigure(
-                               (struct rte_eventdev *)(uintptr_t)event_dev);
-                       rc = cnxk_sso_rx_adapter_vwqe_enable(
-                               cnxk_eth_dev, eth_dev->data->port_id, i,
-                               config->vector_sz, config->vector_timeout_ns,
-                               config->vector_mp);
-                       if (rc)
-                               return -EINVAL;
-               }
-       } else {
-
-               cnxk_sso_updt_xae_cnt(dev, config->vector_mp,
-                                     RTE_EVENT_TYPE_ETHDEV_VECTOR);
-               rc = cnxk_sso_xae_reconfigure(
-                       (struct rte_eventdev *)(uintptr_t)event_dev);
-               rc = cnxk_sso_rx_adapter_vwqe_enable(
-                       cnxk_eth_dev, eth_dev->data->port_id, rx_queue_id,
-                       config->vector_sz, config->vector_timeout_ns,
-                       config->vector_mp);
-               if (rc)
-                       return -EINVAL;
-       }
-
-       return 0;
-}
-
 static int
 cn10k_sso_tx_adapter_caps_get(const struct rte_eventdev *dev,
                              const struct rte_eth_dev *eth_dev, uint32_t *caps)
@@ -862,7 +788,7 @@ cn10k_crypto_adapter_qp_del(const struct rte_eventdev *event_dev,
        return cnxk_crypto_adapter_qp_del(cdev, queue_pair_id);
 }
 
-static struct rte_eventdev_ops cn10k_sso_dev_ops = {
+static struct eventdev_ops cn10k_sso_dev_ops = {
        .dev_infos_get = cn10k_sso_info_get,
        .dev_configure = cn10k_sso_dev_configure,
        .queue_def_conf = cnxk_sso_queue_def_conf,
@@ -882,8 +808,6 @@ static struct rte_eventdev_ops cn10k_sso_dev_ops = {
        .eth_rx_adapter_stop = cnxk_sso_rx_adapter_stop,
 
        .eth_rx_adapter_vector_limits_get = cn10k_sso_rx_adapter_vector_limits,
-       .eth_rx_adapter_event_vector_config =
-               cn10k_sso_rx_adapter_vector_config,
 
        .eth_tx_adapter_caps_get = cn10k_sso_tx_adapter_caps_get,
        .eth_tx_adapter_queue_add = cn10k_sso_tx_adapter_queue_add,
@@ -956,8 +880,10 @@ cn10k_sso_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 static const struct rte_pci_id cn10k_pci_sso_map[] = {
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_PF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
        CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CN10KAS, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
+       CNXK_PCI_ID(PCI_SUBSYSTEM_DEVID_CNF10KA, PCI_DEVID_CNXK_RVU_SSO_TIM_VF),
        {
                .vendor_id = 0,
        },