net/mlx5: fix errno typos in comments

[dpdk.git] / drivers / net / sfc / sfc_rx.c

diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c
index cd8abc8..4b1d01e 100644 (file)
--- a/drivers/net/sfc/sfc_rx.c
+++ b/drivers/net/sfc/sfc_rx.c
@@ -402,7 +402,7 @@ sfc_rxq_by_dp_rxq(const struct sfc_dp_rxq *dp_rxq)
        SFC_ASSERT(rte_eth_dev_is_valid_port(dpq->port_id));
        eth_dev = &rte_eth_devices[dpq->port_id];
 
-       sa = eth_dev->data->dev_private;
+       sa = sfc_adapter_by_eth_dev(eth_dev);
 
        SFC_ASSERT(dpq->queue_id < sfc_sa2shared(sa)->rxq_count);
        return &sa->rxq_ctrl[dpq->queue_id];
@@ -411,6 +411,7 @@ sfc_rxq_by_dp_rxq(const struct sfc_dp_rxq *dp_rxq)
 static sfc_dp_rx_qsize_up_rings_t sfc_efx_rx_qsize_up_rings;
 static int
 sfc_efx_rx_qsize_up_rings(uint16_t nb_rx_desc,
+                         __rte_unused struct sfc_dp_rx_hw_limits *limits,
                          __rte_unused struct rte_mempool *mb_pool,
                          unsigned int *rxq_entries,
                          unsigned int *evq_entries,
@@ -691,6 +692,7 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
        switch (rxq_info->type) {
        case EFX_RXQ_TYPE_DEFAULT:
                rc = efx_rx_qcreate(sa->nic, rxq->hw_index, 0, rxq_info->type,
+                       rxq->buf_size,
                        &rxq->mem, rxq_info->entries, 0 /* not used on EF10 */,
                        rxq_info->type_flags, evq->common, &rxq->common);
                break;
@@ -971,13 +973,21 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
        struct sfc_evq *evq;
        struct sfc_rxq *rxq;
        struct sfc_dp_rx_qcreate_info info;
+       struct sfc_dp_rx_hw_limits hw_limits;
 
-       rc = sa->priv.dp_rx->qsize_up_rings(nb_rx_desc, mb_pool, &rxq_entries,
-                                           &evq_entries, &rxq_max_fill_level);
+       memset(&hw_limits, 0, sizeof(hw_limits));
+       hw_limits.rxq_max_entries = sa->rxq_max_entries;
+       hw_limits.rxq_min_entries = sa->rxq_min_entries;
+       hw_limits.evq_max_entries = sa->evq_max_entries;
+       hw_limits.evq_min_entries = sa->evq_min_entries;
+
+       rc = sa->priv.dp_rx->qsize_up_rings(nb_rx_desc, &hw_limits, mb_pool,
+                                           &rxq_entries, &evq_entries,
+                                           &rxq_max_fill_level);
        if (rc != 0)
                goto fail_size_up_rings;
-       SFC_ASSERT(rxq_entries >= EFX_RXQ_MINNDESCS);
-       SFC_ASSERT(rxq_entries <= EFX_RXQ_MAXNDESCS);
+       SFC_ASSERT(rxq_entries >= sa->rxq_min_entries);
+       SFC_ASSERT(rxq_entries <= sa->rxq_max_entries);
        SFC_ASSERT(rxq_max_fill_level <= nb_rx_desc);
 
        offloads = rx_conf->offloads |
@@ -1038,7 +1048,8 @@ sfc_rx_qinit(struct sfc_adapter *sa, unsigned int sw_index,
        rxq_info->refill_mb_pool = mb_pool;
        rxq->buf_size = buf_size;
 
-       rc = sfc_dma_alloc(sa, "rxq", sw_index, EFX_RXQ_SIZE(rxq_info->entries),
+       rc = sfc_dma_alloc(sa, "rxq", sw_index,
+                          efx_rxq_size(sa->nic, rxq_info->entries),
                           socket_id, &rxq->mem);
        if (rc != 0)
                goto fail_dma_alloc;
@@ -1403,9 +1414,10 @@ sfc_rx_qinit_info(struct sfc_adapter *sa, unsigned int sw_index)
 {
        struct sfc_adapter_shared * const sas = sfc_sa2shared(sa);
        struct sfc_rxq_info *rxq_info = &sas->rxq_info[sw_index];
+       const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic);
        unsigned int max_entries;
 
-       max_entries = EFX_RXQ_MAXNDESCS;
+       max_entries = encp->enc_rxq_max_ndescs;
        SFC_ASSERT(rte_is_power_of_2(max_entries));
 
        rxq_info->max_entries = max_entries;