net/i40e: fix getting EEPROM information

[dpdk.git] / drivers / net / i40e / i40e_flow.c

diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c
index 72f3527..8f8df6f 100644 (file)
--- a/drivers/net/i40e/i40e_flow.c
+++ b/drivers/net/i40e/i40e_flow.c
@@ -3462,6 +3462,10 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
                }
        }
 
+       /* If create the first fdir rule, enable fdir check for rx queues */
+       if (TAILQ_EMPTY(&pf->fdir.fdir_list))
+               i40e_fdir_rx_proc_enable(dev, 1);
+
        return 0;
 err:
        i40e_fdir_teardown(pf);
@@ -4622,6 +4626,34 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
        uint32_t index = 0;
        uint64_t hf_bit = 1;
 
+       static const struct {
+               uint64_t rss_type;
+               enum i40e_filter_pctype pctype;
+       } pctype_match_table[] = {
+               {ETH_RSS_FRAG_IPV4,
+                       I40E_FILTER_PCTYPE_FRAG_IPV4},
+               {ETH_RSS_NONFRAG_IPV4_TCP,
+                       I40E_FILTER_PCTYPE_NONF_IPV4_TCP},
+               {ETH_RSS_NONFRAG_IPV4_UDP,
+                       I40E_FILTER_PCTYPE_NONF_IPV4_UDP},
+               {ETH_RSS_NONFRAG_IPV4_SCTP,
+                       I40E_FILTER_PCTYPE_NONF_IPV4_SCTP},
+               {ETH_RSS_NONFRAG_IPV4_OTHER,
+                       I40E_FILTER_PCTYPE_NONF_IPV4_OTHER},
+               {ETH_RSS_FRAG_IPV6,
+                       I40E_FILTER_PCTYPE_FRAG_IPV6},
+               {ETH_RSS_NONFRAG_IPV6_TCP,
+                       I40E_FILTER_PCTYPE_NONF_IPV6_TCP},
+               {ETH_RSS_NONFRAG_IPV6_UDP,
+                       I40E_FILTER_PCTYPE_NONF_IPV6_UDP},
+               {ETH_RSS_NONFRAG_IPV6_SCTP,
+                       I40E_FILTER_PCTYPE_NONF_IPV6_SCTP},
+               {ETH_RSS_NONFRAG_IPV6_OTHER,
+                       I40E_FILTER_PCTYPE_NONF_IPV6_OTHER},
+               {ETH_RSS_L2_PAYLOAD,
+                       I40E_FILTER_PCTYPE_L2_PAYLOAD},
+       };
+
        NEXT_ITEM_OF_ACTION(act, actions, index);
        rss = act->conf;
 
@@ -4638,9 +4670,10 @@ i40e_flow_parse_rss_action(struct rte_eth_dev *dev,
        }
 
        if (p_info.action_flag && rss->queue_num) {
-               for (n = 0; n < 64; n++) {
-                       if (rss->types & (hf_bit << n)) {
-                               conf_info->region[0].hw_flowtype[0] = n;
+               for (j = 0; j < RTE_DIM(pctype_match_table); j++) {
+                       if (rss->types & pctype_match_table[j].rss_type) {
+                               conf_info->region[0].hw_flowtype[0] =
+                                       (uint8_t)pctype_match_table[j].pctype;
                                conf_info->region[0].flowtype_num = 1;
                                conf_info->queue_region_number = 1;
                                break;
@@ -5301,9 +5334,6 @@ i40e_flow_flush(struct rte_eth_dev *dev, struct rte_flow_error *error)
                return -rte_errno;
        }
 
-       /* Disable FDIR processing as all FDIR rules are now flushed */
-       i40e_fdir_rx_proc_enable(dev, 0);
-
        return ret;
 }
 
@@ -5339,6 +5369,9 @@ i40e_flow_flush_fdir_filter(struct i40e_pf *pf)
                for (pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;
                     pctype <= I40E_FILTER_PCTYPE_L2_PAYLOAD; pctype++)
                        pf->fdir.inset_flag[pctype] = 0;
+
+               /* Disable FDIR processing as all FDIR rules are now flushed */
+               i40e_fdir_rx_proc_enable(dev, 0);
        }
 
        return ret;