net/sfc: use NIC Rx descs limits instead of defines

[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 3b4b65f..c8dec8d 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,
@@ -669,7 +670,6 @@ retry:
 int
 sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 {
-       struct sfc_port *port = &sa->port;
        struct sfc_rxq_info *rxq_info;
        struct sfc_rxq *rxq;
        struct sfc_evq *evq;
@@ -731,7 +731,7 @@ sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
 
        rxq_info->state |= SFC_RXQ_STARTED;
 
-       if ((sw_index == 0) && !port->isolated) {
+       if (sw_index == 0 && !sfc_sa2shared(sa)->isolated) {
                rc = sfc_rx_default_rxq_set_filter(sa, rxq);
                if (rc != 0)
                        goto fail_mac_filter_default_rxq_set;
@@ -972,13 +972,19 @@ 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;
+
+       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;
 
-       rc = sa->priv.dp_rx->qsize_up_rings(nb_rx_desc, mb_pool, &rxq_entries,
-                                           &evq_entries, &rxq_max_fill_level);
+       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 |
@@ -1404,9 +1410,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;