net/bnxt: support port representor data path

[dpdk.git] / drivers / net / octeontx2 / otx2_rx.c

diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
index dbf6ea6..ac40704 100644 (file)
--- a/drivers/net/octeontx2/otx2_rx.c
+++ b/drivers/net/octeontx2/otx2_rx.c
@@ -330,15 +330,15 @@ nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
 
 #endif
 
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-static uint16_t __rte_noinline __hot                                          \
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                            \
+static uint16_t __rte_noinline __rte_hot                                              \
 otx2_nix_recv_pkts_ ## name(void *rx_queue,                                   \
                        struct rte_mbuf **rx_pkts, uint16_t pkts)              \
 {                                                                             \
        return nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));                \
 }                                                                             \
                                                                               \
-static uint16_t __rte_noinline __hot                                          \
+static uint16_t __rte_noinline __rte_hot                                              \
 otx2_nix_recv_pkts_mseg_ ## name(void *rx_queue,                              \
                        struct rte_mbuf **rx_pkts, uint16_t pkts)              \
 {                                                                             \
@@ -346,7 +346,7 @@ otx2_nix_recv_pkts_mseg_ ## name(void *rx_queue,                           \
                             (flags) | NIX_RX_MULTI_SEG_F);                    \
 }                                                                             \
                                                                               \
-static uint16_t __rte_noinline __hot                                          \
+static uint16_t __rte_noinline __rte_hot                                              \
 otx2_nix_recv_pkts_vec_ ## name(void *rx_queue,                                       \
                        struct rte_mbuf **rx_pkts, uint16_t pkts)              \
 {                                                                             \
@@ -361,12 +361,13 @@ NIX_RX_FASTPATH_MODES
 
 static inline void
 pick_rx_func(struct rte_eth_dev *eth_dev,
-            const eth_rx_burst_t rx_burst[2][2][2][2][2][2])
+            const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2])
 {
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 
-       /* [TSTMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
+       /* [SEC] [TSTMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
        eth_dev->rx_pkt_burst = rx_burst
+               [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -380,25 +381,25 @@ otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)
 {
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 
-       const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_ ## name,
+       const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_ ## name,
 
 NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_mseg_ ## name,
+       const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_mseg_ ## name,
 
 NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_vec_ ## name,
+       const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_vec_ ## name,
 
 NIX_RX_FASTPATH_MODES
 #undef R
@@ -418,6 +419,6 @@ NIX_RX_FASTPATH_MODES
        /* Copy multi seg version with no offload for tear down sequence */
        if (rte_eal_process_type() == RTE_PROC_PRIMARY)
                dev->rx_pkt_burst_no_offload =
-                       nix_eth_rx_burst_mseg[0][0][0][0][0][0];
+                       nix_eth_rx_burst_mseg[0][0][0][0][0][0][0];
        rte_mb();
 }