net/bnxt: fix Rx configuration

[dpdk.git] / drivers / net / bnxt / bnxt_rxq.c

diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c
index cd3bb14..8977138 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxq.c
+++ b/drivers/net/bnxt/bnxt_rxq.c
@@ -20,6 +20,31 @@
  * RX Queues
  */
 
+uint64_t bnxt_get_rx_port_offloads(struct bnxt *bp)
+{
+       uint64_t rx_offload_capa;
+
+       rx_offload_capa = RTE_ETH_RX_OFFLOAD_IPV4_CKSUM  |
+                         RTE_ETH_RX_OFFLOAD_UDP_CKSUM   |
+                         RTE_ETH_RX_OFFLOAD_TCP_CKSUM   |
+                         RTE_ETH_RX_OFFLOAD_KEEP_CRC    |
+                         RTE_ETH_RX_OFFLOAD_VLAN_FILTER |
+                         RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
+                         RTE_ETH_RX_OFFLOAD_TCP_LRO |
+                         RTE_ETH_RX_OFFLOAD_SCATTER |
+                         RTE_ETH_RX_OFFLOAD_RSS_HASH;
+
+       rx_offload_capa |= RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+                          RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM;
+
+       if (bp->flags & BNXT_FLAG_PTP_SUPPORTED)
+               rx_offload_capa |= RTE_ETH_RX_OFFLOAD_TIMESTAMP;
+       if (bp->vnic_cap_flags & BNXT_VNIC_CAP_VLAN_RX_STRIP)
+               rx_offload_capa |= RTE_ETH_RX_OFFLOAD_VLAN_STRIP;
+
+       return rx_offload_capa;
+}
+
 /* Determine whether the current configuration needs aggregation ring in HW. */
 int bnxt_need_agg_ring(struct rte_eth_dev *eth_dev)
 {
@@ -40,6 +65,7 @@ void bnxt_free_rxq_stats(struct bnxt_rx_queue *rxq)
 int bnxt_mq_rx_configure(struct bnxt *bp)
 {
        struct rte_eth_conf *dev_conf = &bp->eth_dev->data->dev_conf;
+       struct rte_eth_rss_conf *rss = &bp->rss_conf;
        const struct rte_eth_vmdq_rx_conf *conf =
                    &dev_conf->rx_adv_conf.vmdq_rx_conf;
        unsigned int i, j, nb_q_per_grp = 1, ring_idx = 0;
@@ -147,32 +173,19 @@ skip_filter_allocation:
 
        bp->rx_num_qs_per_vnic = nb_q_per_grp;
 
-       if (dev_conf->rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
-               struct rte_eth_rss_conf *rss = &bp->rss_conf;
-
-               if (bp->flags & BNXT_FLAG_UPDATE_HASH)
-                       bp->flags &= ~BNXT_FLAG_UPDATE_HASH;
-
-               for (i = 0; i < bp->nr_vnics; i++) {
-                       uint32_t lvl = RTE_ETH_RSS_LEVEL(rss->rss_hf);
-
-                       vnic = &bp->vnic_info[i];
-                       vnic->hash_type =
-                               bnxt_rte_to_hwrm_hash_types(rss->rss_hf);
-                       vnic->hash_mode =
-                               bnxt_rte_to_hwrm_hash_level(bp,
-                                                           rss->rss_hf,
-                                                           lvl);
-
-                       /*
-                        * Use the supplied key if the key length is
-                        * acceptable and the rss_key is not NULL
-                        */
-                       if (rss->rss_key &&
-                           rss->rss_key_len <= HW_HASH_KEY_SIZE)
-                               memcpy(vnic->rss_hash_key,
-                                      rss->rss_key, rss->rss_key_len);
-               }
+       for (i = 0; i < bp->nr_vnics; i++) {
+               uint32_t lvl = RTE_ETH_RSS_LEVEL(rss->rss_hf);
+
+               vnic = &bp->vnic_info[i];
+               vnic->hash_type = bnxt_rte_to_hwrm_hash_types(rss->rss_hf);
+               vnic->hash_mode = bnxt_rte_to_hwrm_hash_level(bp, rss->rss_hf, lvl);
+
+               /*
+                * Use the supplied key if the key length is
+                * acceptable and the rss_key is not NULL
+                */
+               if (rss->rss_key && rss->rss_key_len <= HW_HASH_KEY_SIZE)
+                       memcpy(vnic->rss_hash_key, rss->rss_key, rss->rss_key_len);
        }
 
        return rc;