net/mlx4: revert flow API RSS support

[dpdk.git] / drivers / net / mlx4 / mlx4.h

diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 256e644..b76bf48 100644 (file)
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -35,7 +35,6 @@
 #define RTE_PMD_MLX4_H_
 
 #include <stdint.h>
-#include <limits.h>
 
 /*
  * Runtime logging through RTE_LOG() is enabled when not in debugging mode.
@@ -64,19 +63,6 @@
 #pragma GCC diagnostic error "-Wpedantic"
 #endif
 
-/*
- * Maximum number of simultaneous MAC addresses supported.
- *
- * According to ConnectX's Programmer Reference Manual:
- *   The L2 Address Match is implemented by comparing a MAC/VLAN combination
- *   of 128 MAC addresses and 127 VLAN values, comprising 128x127 possible
- *   L2 addresses.
- */
-#define MLX4_MAX_MAC_ADDRESSES 128
-
-/* Maximum number of simultaneous VLAN filters supported. See above. */
-#define MLX4_MAX_VLAN_IDS 127
-
 /* Request send completion once in every 64 sends, might be less. */
 #define MLX4_PMD_TX_PER_COMP_REQ 64
 
@@ -115,25 +101,6 @@ enum {
 
 #define MLX4_DRIVER_NAME "net_mlx4"
 
-/* Bit-field manipulation. */
-#define BITFIELD_DECLARE(bf, type, size)                               \
-       type bf[(((size_t)(size) / (sizeof(type) * CHAR_BIT)) +         \
-                !!((size_t)(size) % (sizeof(type) * CHAR_BIT)))]
-#define BITFIELD_DEFINE(bf, type, size)                                        \
-       BITFIELD_DECLARE((bf), type, (size)) = { 0 }
-#define BITFIELD_SET(bf, b)                                            \
-       (assert((size_t)(b) < (sizeof(bf) * CHAR_BIT)),                 \
-        (void)((bf)[((b) / (sizeof((bf)[0]) * CHAR_BIT))] |=           \
-               ((size_t)1 << ((b) % (sizeof((bf)[0]) * CHAR_BIT)))))
-#define BITFIELD_RESET(bf, b)                                          \
-       (assert((size_t)(b) < (sizeof(bf) * CHAR_BIT)),                 \
-        (void)((bf)[((b) / (sizeof((bf)[0]) * CHAR_BIT))] &=           \
-               ~((size_t)1 << ((b) % (sizeof((bf)[0]) * CHAR_BIT)))))
-#define BITFIELD_ISSET(bf, b)                                          \
-       (assert((size_t)(b) < (sizeof(bf) * CHAR_BIT)),                 \
-        !!(((bf)[((b) / (sizeof((bf)[0]) * CHAR_BIT))] &               \
-            ((size_t)1 << ((b) % (sizeof((bf)[0]) * CHAR_BIT))))))
-
 /* Number of elements in array. */
 #define elemof(a) (sizeof(a) / sizeof((a)[0]))
 
@@ -205,13 +172,6 @@ struct rxq {
        struct ibv_exp_qp_burst_family *if_qp; /* QP burst interface. */
        struct ibv_exp_cq_family *if_cq; /* CQ interface. */
        struct ibv_comp_channel *channel;
-       /*
-        * Each VLAN ID requires a separate flow steering rule.
-        */
-       BITFIELD_DECLARE(mac_configured, uint32_t, MLX4_MAX_MAC_ADDRESSES);
-       struct ibv_flow *mac_flow[MLX4_MAX_MAC_ADDRESSES][MLX4_MAX_VLAN_IDS];
-       struct ibv_flow *promisc_flow; /* Promiscuous flow. */
-       struct ibv_flow *allmulti_flow; /* Multicast flow. */
        unsigned int port_id; /* Port ID for incoming packets. */
        unsigned int elts_n; /* (*elts)[] length. */
        unsigned int elts_head; /* Current index in (*elts)[]. */
@@ -287,24 +247,12 @@ struct priv {
        struct ibv_context *ctx; /* Verbs context. */
        struct ibv_device_attr device_attr; /* Device properties. */
        struct ibv_pd *pd; /* Protection Domain. */
-       /*
-        * MAC addresses array and configuration bit-field.
-        * An extra entry that cannot be modified by the DPDK is reserved
-        * for broadcast frames (destination MAC address ff:ff:ff:ff:ff:ff).
-        */
-       struct ether_addr mac[MLX4_MAX_MAC_ADDRESSES];
-       BITFIELD_DECLARE(mac_configured, uint32_t, MLX4_MAX_MAC_ADDRESSES);
-       /* VLAN filters. */
-       struct {
-               unsigned int enabled:1; /* If enabled. */
-               unsigned int id:12; /* VLAN ID (0-4095). */
-       } vlan_filter[MLX4_MAX_VLAN_IDS]; /* VLAN filters table. */
+       struct ether_addr mac; /* MAC address. */
+       struct ibv_flow *mac_flow; /* Flow associated with MAC address. */
        /* Device properties. */
        uint16_t mtu; /* Configured MTU. */
        uint8_t port; /* Physical port number. */
        unsigned int started:1; /* Device started, flows enabled. */
-       unsigned int promisc:1; /* Device in promiscuous mode. */
-       unsigned int allmulti:1; /* Device receives all multicast packets. */
        unsigned int hw_qpg:1; /* QP groups are supported. */
        unsigned int hw_tss:1; /* TSS is supported. */
        unsigned int hw_rss:1; /* RSS is supported. */
@@ -343,9 +291,4 @@ rxq_create_qp(struct rxq *rxq,
 void
 rxq_parent_cleanup(struct rxq *parent);
 
-struct rxq *
-priv_parent_create(struct priv *priv,
-                  uint16_t queues[],
-                  uint16_t children_n);
-
 #endif /* RTE_PMD_MLX4_H_ */