New upstream version 17.11.5

[deb_dpdk.git] / drivers / net / qede / qede_fdir.c

diff --git a/drivers/net/qede/qede_fdir.c b/drivers/net/qede/qede_fdir.c
index 7bd5c5d..050b737 100644 (file)
--- a/drivers/net/qede/qede_fdir.c
+++ b/drivers/net/qede/qede_fdir.c
@@ -18,6 +18,7 @@
 #define QEDE_FDIR_IP_DEFAULT_VERSION_IHL       (IP_VERSION | IP_HDRLEN)
 #define QEDE_FDIR_TCP_DEFAULT_DATAOFF          (0x50)
 #define QEDE_FDIR_IPV4_DEF_TTL                 (64)
+#define QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW                (0x60000000)
 
 /* Sum of length of header types of L2, L3, L4.
  * L2 : ether_hdr + vlan_hdr + vxlan_hdr
@@ -53,7 +54,7 @@ int qede_check_fdir_support(struct rte_eth_dev *eth_dev)
                DP_INFO(edev, "flowdir is disabled\n");
        break;
        case RTE_FDIR_MODE_PERFECT:
-               if (edev->num_hwfns > 1) {
+               if (ECORE_IS_CMT(edev)) {
                        DP_ERR(edev, "flowdir is not supported in 100G mode\n");
                        qdev->fdir_info.arfs.arfs_enable = false;
                        return -ENOTSUP;
@@ -141,8 +142,8 @@ qede_config_cmn_fdir_filter(struct rte_eth_dev *eth_dev,
        if (add) {
                SLIST_FOREACH(tmp, &qdev->fdir_info.fdir_list_head, list) {
                        if (memcmp(tmp->mz->addr, pkt, pkt_len) == 0) {
-                               DP_ERR(edev, "flowdir filter exist\n");
-                               rc = -EEXIST;
+                               DP_INFO(edev, "flowdir filter exist\n");
+                               rc = 0;
                                goto err2;
                        }
                }
@@ -171,8 +172,8 @@ qede_config_cmn_fdir_filter(struct rte_eth_dev *eth_dev,
                                          &qdev->fdir_info.arfs);
        }
        /* configure filter with ECORE_SPQ_MODE_EBLOCK */
-       rc = ecore_configure_rfs_ntuple_filter(p_hwfn, p_hwfn->p_arfs_ptt, NULL,
-                                              (dma_addr_t)mz->phys_addr,
+       rc = ecore_configure_rfs_ntuple_filter(p_hwfn, NULL,
+                                              (dma_addr_t)mz->iova,
                                               pkt_len,
                                               fdir_filter->action.rx_queue,
                                               0, add);
@@ -340,18 +341,21 @@ qede_fdir_construct_pkt(struct rte_eth_dev *eth_dev,
                ip6->proto = input->flow.ipv6_flow.proto ?
                                        input->flow.ipv6_flow.proto :
                                        next_proto[input->flow_type];
-               rte_memcpy(&ip6->src_addr, &input->flow.ipv6_flow.dst_ip,
+               ip6->vtc_flow =
+                       rte_cpu_to_be_32(QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW);
+               rte_memcpy(&ip6->src_addr, &input->flow.ipv6_flow.src_ip,
                           IPV6_ADDR_LEN);
-               rte_memcpy(&ip6->dst_addr, &input->flow.ipv6_flow.src_ip,
+               rte_memcpy(&ip6->dst_addr, &input->flow.ipv6_flow.dst_ip,
                           IPV6_ADDR_LEN);
                len += sizeof(struct ipv6_hdr);
+               params->ipv6 = true;
 
                raw_pkt = (uint8_t *)buff;
                /* UDP */
                if (input->flow_type == RTE_ETH_FLOW_NONFRAG_IPV6_UDP) {
                        udp = (struct udp_hdr *)(raw_pkt + len);
-                       udp->src_port = input->flow.udp6_flow.dst_port;
-                       udp->dst_port = input->flow.udp6_flow.src_port;
+                       udp->src_port = input->flow.udp6_flow.src_port;
+                       udp->dst_port = input->flow.udp6_flow.dst_port;
                        len += sizeof(struct udp_hdr);
                        params->udp = true;
                } else { /* TCP */
@@ -386,7 +390,7 @@ qede_fdir_filter_conf(struct rte_eth_dev *eth_dev,
        switch (filter_op) {
        case RTE_ETH_FILTER_NOP:
                /* Typically used to query flowdir support */
-               if (edev->num_hwfns > 1) {
+               if (ECORE_IS_CMT(edev)) {
                        DP_ERR(edev, "flowdir is not supported in 100G mode\n");
                        return -ENOTSUP;
                }
@@ -425,7 +429,7 @@ int qede_ntuple_filter_conf(struct rte_eth_dev *eth_dev,
        switch (filter_op) {
        case RTE_ETH_FILTER_NOP:
                /* Typically used to query fdir support */
-               if (edev->num_hwfns > 1) {
+               if (ECORE_IS_CMT(edev)) {
                        DP_ERR(edev, "flowdir is not supported in 100G mode\n");
                        return -ENOTSUP;
                }
@@ -465,5 +469,8 @@ int qede_ntuple_filter_conf(struct rte_eth_dev *eth_dev,
                udpv4_flow->src_port = ntuple->src_port;
                udpv4_flow->dst_port = ntuple->dst_port;
        }
+
+       fdir_entry.action.rx_queue = ntuple->queue;
+
        return qede_config_cmn_fdir_filter(eth_dev, &fdir_entry, add);
 }