net/hns3: remove unused macro
[dpdk.git] / drivers / net / hns3 / hns3_rxtx.h
index cfe6cad..703c4b7 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-2019 HiSilicon Limited.
+ * Copyright(c) 2018-2021 HiSilicon Limited.
  */
 
 #ifndef _HNS3_RXTX_H_
 #define HNS3_RXD_LUM_B                         9
 #define HNS3_RXD_CRCP_B                                10
 #define HNS3_RXD_L3L4P_B                       11
-#define HNS3_RXD_TSIND_S                       12
-#define HNS3_RXD_TSIND_M                       (0x7 << HNS3_RXD_TSIND_S)
 
 #define HNS3_RXD_TS_VLD_B                      14
-#define HNS3_RXD_LKBK_B                                15
 #define HNS3_RXD_GRO_SIZE_S                    16
 #define HNS3_RXD_GRO_SIZE_M                    (0x3fff << HNS3_RXD_GRO_SIZE_S)
 
@@ -541,19 +538,50 @@ enum hns3_cksum_status {
 extern uint64_t hns3_timestamp_rx_dynflag;
 extern int hns3_timestamp_dynfield_offset;
 
-static inline int
-hns3_handle_bdinfo(struct hns3_rx_queue *rxq, struct rte_mbuf *rxm,
-                  uint32_t bd_base_info, uint32_t l234_info,
-                  uint32_t *cksum_err)
+static inline void
+hns3_rx_set_cksum_flag(struct hns3_rx_queue *rxq,
+                      struct rte_mbuf *rxm,
+                      uint32_t l234_info)
 {
-#define L2E_TRUNC_ERR_FLAG     (BIT(HNS3_RXD_L2E_B) | \
-                                BIT(HNS3_RXD_TRUNCATE_B))
-#define CHECKSUM_ERR_FLAG      (BIT(HNS3_RXD_L3E_B) | \
+#define HNS3_RXD_CKSUM_ERR_MASK        (BIT(HNS3_RXD_L3E_B) | \
                                 BIT(HNS3_RXD_L4E_B) | \
                                 BIT(HNS3_RXD_OL3E_B) | \
                                 BIT(HNS3_RXD_OL4E_B))
 
-       uint32_t tmp = 0;
+       if (likely((l234_info & HNS3_RXD_CKSUM_ERR_MASK) == 0)) {
+               rxm->ol_flags |= (PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD);
+               return;
+       }
+
+       if (unlikely(l234_info & BIT(HNS3_RXD_L3E_B))) {
+               rxm->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+               rxq->dfx_stats.l3_csum_errors++;
+       } else {
+               rxm->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+       }
+
+       if (unlikely(l234_info & BIT(HNS3_RXD_L4E_B))) {
+               rxm->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+               rxq->dfx_stats.l4_csum_errors++;
+       } else {
+               rxm->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+       }
+
+       if (unlikely(l234_info & BIT(HNS3_RXD_OL3E_B)))
+               rxq->dfx_stats.ol3_csum_errors++;
+
+       if (unlikely(l234_info & BIT(HNS3_RXD_OL4E_B))) {
+               rxm->ol_flags |= PKT_RX_OUTER_L4_CKSUM_BAD;
+               rxq->dfx_stats.ol4_csum_errors++;
+       }
+}
+
+static inline int
+hns3_handle_bdinfo(struct hns3_rx_queue *rxq, struct rte_mbuf *rxm,
+                  uint32_t bd_base_info, uint32_t l234_info)
+{
+#define L2E_TRUNC_ERR_FLAG     (BIT(HNS3_RXD_L2E_B) | \
+                                BIT(HNS3_RXD_TRUNCATE_B))
 
        /*
         * If packet len bigger than mtu when recv with no-scattered algorithm,
@@ -572,71 +600,19 @@ hns3_handle_bdinfo(struct hns3_rx_queue *rxq, struct rte_mbuf *rxm,
                return -EINVAL;
        }
 
-       if (bd_base_info & BIT(HNS3_RXD_L3L4P_B)) {
-               if (likely((l234_info & CHECKSUM_ERR_FLAG) == 0)) {
-                       *cksum_err = 0;
-                       return 0;
-               }
-
-               if (unlikely(l234_info & BIT(HNS3_RXD_L3E_B))) {
-                       rxm->ol_flags |= PKT_RX_IP_CKSUM_BAD;
-                       rxq->dfx_stats.l3_csum_errors++;
-                       tmp |= HNS3_L3_CKSUM_ERR;
-               }
-
-               if (unlikely(l234_info & BIT(HNS3_RXD_L4E_B))) {
-                       rxm->ol_flags |= PKT_RX_L4_CKSUM_BAD;
-                       rxq->dfx_stats.l4_csum_errors++;
-                       tmp |= HNS3_L4_CKSUM_ERR;
-               }
-
-               if (unlikely(l234_info & BIT(HNS3_RXD_OL3E_B))) {
-                       rxq->dfx_stats.ol3_csum_errors++;
-                       tmp |= HNS3_OUTER_L3_CKSUM_ERR;
-               }
-
-               if (unlikely(l234_info & BIT(HNS3_RXD_OL4E_B))) {
-                       rxm->ol_flags |= PKT_RX_OUTER_L4_CKSUM_BAD;
-                       rxq->dfx_stats.ol4_csum_errors++;
-                       tmp |= HNS3_OUTER_L4_CKSUM_ERR;
-               }
-       }
-       *cksum_err = tmp;
+       if (bd_base_info & BIT(HNS3_RXD_L3L4P_B))
+               hns3_rx_set_cksum_flag(rxq, rxm, l234_info);
 
        return 0;
 }
 
-static inline void
-hns3_rx_set_cksum_flag(struct rte_mbuf *rxm, const uint64_t packet_type,
-                      const uint32_t cksum_err)
-{
-       if (unlikely((packet_type & RTE_PTYPE_TUNNEL_MASK))) {
-               if (likely(packet_type & RTE_PTYPE_INNER_L3_MASK) &&
-                   (cksum_err & HNS3_L3_CKSUM_ERR) == 0)
-                       rxm->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
-               if (likely(packet_type & RTE_PTYPE_INNER_L4_MASK) &&
-                   (cksum_err & HNS3_L4_CKSUM_ERR) == 0)
-                       rxm->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
-               if (likely(packet_type & RTE_PTYPE_L4_MASK) &&
-                   (cksum_err & HNS3_OUTER_L4_CKSUM_ERR) == 0)
-                       rxm->ol_flags |= PKT_RX_OUTER_L4_CKSUM_GOOD;
-       } else {
-               if (likely(packet_type & RTE_PTYPE_L3_MASK) &&
-                   (cksum_err & HNS3_L3_CKSUM_ERR) == 0)
-                       rxm->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
-               if (likely(packet_type & RTE_PTYPE_L4_MASK) &&
-                   (cksum_err & HNS3_L4_CKSUM_ERR) == 0)
-                       rxm->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
-       }
-}
-
 static inline uint32_t
 hns3_rx_calc_ptype(struct hns3_rx_queue *rxq, const uint32_t l234_info,
                   const uint32_t ol_info)
 {
        const struct hns3_ptype_table * const ptype_tbl = rxq->ptype_tbl;
-       uint32_t l2id, l3id, l4id;
-       uint32_t ol3id, ol4id, ol2id;
+       uint32_t ol3id, ol4id;
+       uint32_t l3id, l4id;
        uint32_t ptype;
 
        if (rxq->ptype_en) {
@@ -647,20 +623,16 @@ hns3_rx_calc_ptype(struct hns3_rx_queue *rxq, const uint32_t l234_info,
 
        ol4id = hns3_get_field(ol_info, HNS3_RXD_OL4ID_M, HNS3_RXD_OL4ID_S);
        ol3id = hns3_get_field(ol_info, HNS3_RXD_OL3ID_M, HNS3_RXD_OL3ID_S);
-       ol2id = hns3_get_field(ol_info, HNS3_RXD_OVLAN_M, HNS3_RXD_OVLAN_S);
-       l2id = hns3_get_field(l234_info, HNS3_RXD_VLAN_M, HNS3_RXD_VLAN_S);
        l3id = hns3_get_field(l234_info, HNS3_RXD_L3ID_M, HNS3_RXD_L3ID_S);
        l4id = hns3_get_field(l234_info, HNS3_RXD_L4ID_M, HNS3_RXD_L4ID_S);
 
        if (unlikely(ptype_tbl->ol4table[ol4id]))
-               return ptype_tbl->inner_l2table[l2id] |
-                       ptype_tbl->inner_l3table[l3id] |
+               return ptype_tbl->inner_l3table[l3id] |
                        ptype_tbl->inner_l4table[l4id] |
                        ptype_tbl->ol3table[ol3id] |
-                       ptype_tbl->ol4table[ol4id] | ptype_tbl->ol2table[ol2id];
+                       ptype_tbl->ol4table[ol4id];
        else
-               return ptype_tbl->l2l3table[l2id][l3id] |
-                       ptype_tbl->l4table[l4id];
+               return ptype_tbl->l3table[l3id] | ptype_tbl->l4table[l4id];
 }
 
 void hns3_dev_rx_queue_release(void *queue);
@@ -687,8 +659,8 @@ int hns3_dev_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id);
 int hns3_dev_rx_queue_stop(struct rte_eth_dev *dev, uint16_t rx_queue_id);
 int hns3_dev_tx_queue_start(struct rte_eth_dev *dev, uint16_t tx_queue_id);
 int hns3_dev_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id);
-uint16_t hns3_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
-                       uint16_t nb_pkts);
+uint16_t hns3_recv_pkts_simple(void *rx_queue, struct rte_mbuf **rx_pkts,
+                               uint16_t nb_pkts);
 uint16_t hns3_recv_scattered_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                                  uint16_t nb_pkts);
 uint16_t hns3_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,