examples/ipsec-secgw: fix session mempool initialisation
[dpdk.git] / drivers / net / sfc / sfc_ef100_rx.c
index 5d46d5b..5e76160 100644 (file)
@@ -56,17 +56,24 @@ struct sfc_ef100_rxq {
 #define SFC_EF100_RXQ_STARTED          0x1
 #define SFC_EF100_RXQ_NOT_RUNNING      0x2
 #define SFC_EF100_RXQ_EXCEPTION                0x4
+#define SFC_EF100_RXQ_RSS_HASH         0x10
+#define SFC_EF100_RXQ_USER_MARK                0x20
+#define SFC_EF100_RXQ_FLAG_INTR_EN     0x40
        unsigned int                    ptr_mask;
        unsigned int                    evq_phase_bit_shift;
        unsigned int                    ready_pkts;
        unsigned int                    completed;
        unsigned int                    evq_read_ptr;
+       unsigned int                    evq_read_ptr_primed;
        volatile efx_qword_t            *evq_hw_ring;
        struct sfc_ef100_rx_sw_desc     *sw_ring;
        uint64_t                        rearm_data;
        uint16_t                        buf_size;
        uint16_t                        prefix_size;
 
+       unsigned int                    evq_hw_index;
+       volatile void                   *evq_prime;
+
        /* Used on refill */
        unsigned int                    added;
        unsigned int                    max_fill_level;
@@ -85,6 +92,14 @@ sfc_ef100_rxq_by_dp_rxq(struct sfc_dp_rxq *dp_rxq)
        return container_of(dp_rxq, struct sfc_ef100_rxq, dp);
 }
 
+static void
+sfc_ef100_rx_qprime(struct sfc_ef100_rxq *rxq)
+{
+       sfc_ef100_evq_prime(rxq->evq_prime, rxq->evq_hw_index,
+                           rxq->evq_read_ptr & rxq->ptr_mask);
+       rxq->evq_read_ptr_primed = rxq->evq_read_ptr;
+}
+
 static inline void
 sfc_ef100_rx_qpush(struct sfc_ef100_rxq *rxq, unsigned int added)
 {
@@ -349,14 +364,19 @@ static const efx_rx_prefix_layout_t sfc_ef100_rx_prefix_layout = {
        EFX_RX_PREFIX_FIELD(_name, ESF_GZ_RX_PREFIX_ ## _name, _big_endian)
 
                SFC_EF100_RX_PREFIX_FIELD(LENGTH, B_FALSE),
+               SFC_EF100_RX_PREFIX_FIELD(RSS_HASH_VALID, B_FALSE),
+               SFC_EF100_RX_PREFIX_FIELD(USER_FLAG, B_FALSE),
                SFC_EF100_RX_PREFIX_FIELD(CLASS, B_FALSE),
+               SFC_EF100_RX_PREFIX_FIELD(RSS_HASH, B_FALSE),
+               SFC_EF100_RX_PREFIX_FIELD(USER_MARK, B_FALSE),
 
 #undef SFC_EF100_RX_PREFIX_FIELD
        }
 };
 
 static bool
-sfc_ef100_rx_prefix_to_offloads(const efx_oword_t *rx_prefix,
+sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
+                               const efx_oword_t *rx_prefix,
                                struct rte_mbuf *m)
 {
        const efx_word_t *class;
@@ -375,6 +395,23 @@ sfc_ef100_rx_prefix_to_offloads(const efx_oword_t *rx_prefix,
 
        m->packet_type = sfc_ef100_rx_class_decode(*class, &ol_flags);
 
+       if ((rxq->flags & SFC_EF100_RXQ_RSS_HASH) &&
+           EFX_TEST_OWORD_BIT(rx_prefix[0],
+                              ESF_GZ_RX_PREFIX_RSS_HASH_VALID_LBN)) {
+               ol_flags |= PKT_RX_RSS_HASH;
+               /* EFX_OWORD_FIELD converts little-endian to CPU */
+               m->hash.rss = EFX_OWORD_FIELD(rx_prefix[0],
+                                             ESF_GZ_RX_PREFIX_RSS_HASH);
+       }
+
+       if ((rxq->flags & SFC_EF100_RXQ_USER_MARK) &&
+           EFX_TEST_OWORD_BIT(rx_prefix[0], ESF_GZ_RX_PREFIX_USER_FLAG_LBN)) {
+               ol_flags |= PKT_RX_FDIR_ID;
+               /* EFX_OWORD_FIELD converts little-endian to CPU */
+               m->hash.fdir.hi = EFX_OWORD_FIELD(rx_prefix[0],
+                                                 ESF_GZ_RX_PREFIX_USER_MARK);
+       }
+
        m->ol_flags = ol_flags;
        return true;
 }
@@ -461,7 +498,7 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq,
                seg_len = RTE_MIN(pkt_len, rxq->buf_size - rxq->prefix_size);
                rte_pktmbuf_data_len(pkt) = seg_len;
 
-               deliver = sfc_ef100_rx_prefix_to_offloads(rx_prefix, pkt);
+               deliver = sfc_ef100_rx_prefix_to_offloads(rxq, rx_prefix, pkt);
 
                lastseg = pkt;
                while ((pkt_len -= seg_len) > 0) {
@@ -546,6 +583,10 @@ sfc_ef100_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
        /* It is not a problem if we refill in the case of exception */
        sfc_ef100_rx_qrefill(rxq);
 
+       if ((rxq->flags & SFC_EF100_RXQ_FLAG_INTR_EN) &&
+           rxq->evq_read_ptr_primed != rxq->evq_read_ptr)
+               sfc_ef100_rx_qprime(rxq);
+
 done:
        return nb_pkts - (rx_pkts_end - rx_pkts);
 }
@@ -693,6 +734,11 @@ sfc_ef100_rx_qcreate(uint16_t port_id, uint16_t queue_id,
                        ER_GZ_RX_RING_DOORBELL_OFST +
                        (info->hw_index << info->vi_window_shift);
 
+       rxq->evq_hw_index = info->evq_hw_index;
+       rxq->evq_prime = (volatile uint8_t *)info->mem_bar +
+                        info->fcw_offset +
+                        ER_GZ_EVQ_INT_PRIME_OFST;
+
        sfc_ef100_rx_debug(rxq, "RxQ doorbell is %p", rxq->doorbell);
 
        *dp_rxqp = &rxq->dp;
@@ -740,6 +786,20 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr,
              (1U << EFX_RX_PREFIX_FIELD_CLASS))) != 0)
                return ENOTSUP;
 
+       if ((unsup_rx_prefix_fields &
+            ((1U << EFX_RX_PREFIX_FIELD_RSS_HASH_VALID) |
+             (1U << EFX_RX_PREFIX_FIELD_RSS_HASH))) == 0)
+               rxq->flags |= SFC_EF100_RXQ_RSS_HASH;
+       else
+               rxq->flags &= ~SFC_EF100_RXQ_RSS_HASH;
+
+       if ((unsup_rx_prefix_fields &
+            ((1U << EFX_RX_PREFIX_FIELD_USER_FLAG) |
+             (1U << EFX_RX_PREFIX_FIELD_USER_MARK))) == 0)
+               rxq->flags |= SFC_EF100_RXQ_USER_MARK;
+       else
+               rxq->flags &= ~SFC_EF100_RXQ_USER_MARK;
+
        rxq->prefix_size = pinfo->erpl_length;
        rxq->rearm_data = sfc_ef100_mk_mbuf_rearm_data(rxq->dp.dpq.port_id,
                                                       rxq->prefix_size);
@@ -751,6 +811,9 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr,
        rxq->flags |= SFC_EF100_RXQ_STARTED;
        rxq->flags &= ~(SFC_EF100_RXQ_NOT_RUNNING | SFC_EF100_RXQ_EXCEPTION);
 
+       if (rxq->flags & SFC_EF100_RXQ_FLAG_INTR_EN)
+               sfc_ef100_rx_qprime(rxq);
+
        return 0;
 }
 
@@ -801,18 +864,43 @@ sfc_ef100_rx_qpurge(struct sfc_dp_rxq *dp_rxq)
        rxq->flags &= ~SFC_EF100_RXQ_STARTED;
 }
 
+static sfc_dp_rx_intr_enable_t sfc_ef100_rx_intr_enable;
+static int
+sfc_ef100_rx_intr_enable(struct sfc_dp_rxq *dp_rxq)
+{
+       struct sfc_ef100_rxq *rxq = sfc_ef100_rxq_by_dp_rxq(dp_rxq);
+
+       rxq->flags |= SFC_EF100_RXQ_FLAG_INTR_EN;
+       if (rxq->flags & SFC_EF100_RXQ_STARTED)
+               sfc_ef100_rx_qprime(rxq);
+       return 0;
+}
+
+static sfc_dp_rx_intr_disable_t sfc_ef100_rx_intr_disable;
+static int
+sfc_ef100_rx_intr_disable(struct sfc_dp_rxq *dp_rxq)
+{
+       struct sfc_ef100_rxq *rxq = sfc_ef100_rxq_by_dp_rxq(dp_rxq);
+
+       /* Cannot disarm, just disable rearm */
+       rxq->flags &= ~SFC_EF100_RXQ_FLAG_INTR_EN;
+       return 0;
+}
+
 struct sfc_dp_rx sfc_ef100_rx = {
        .dp = {
                .name           = SFC_KVARG_DATAPATH_EF100,
                .type           = SFC_DP_RX,
                .hw_fw_caps     = SFC_DP_HW_FW_CAP_EF100,
        },
-       .features               = SFC_DP_RX_FEAT_MULTI_PROCESS,
+       .features               = SFC_DP_RX_FEAT_MULTI_PROCESS |
+                                 SFC_DP_RX_FEAT_INTR,
        .dev_offload_capa       = 0,
        .queue_offload_capa     = DEV_RX_OFFLOAD_CHECKSUM |
                                  DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
                                  DEV_RX_OFFLOAD_OUTER_UDP_CKSUM |
-                                 DEV_RX_OFFLOAD_SCATTER,
+                                 DEV_RX_OFFLOAD_SCATTER |
+                                 DEV_RX_OFFLOAD_RSS_HASH,
        .get_dev_info           = sfc_ef100_rx_get_dev_info,
        .qsize_up_rings         = sfc_ef100_rx_qsize_up_rings,
        .qcreate                = sfc_ef100_rx_qcreate,
@@ -824,5 +912,7 @@ struct sfc_dp_rx sfc_ef100_rx = {
        .supported_ptypes_get   = sfc_ef100_supported_ptypes_get,
        .qdesc_npending         = sfc_ef100_rx_qdesc_npending,
        .qdesc_status           = sfc_ef100_rx_qdesc_status,
+       .intr_enable            = sfc_ef100_rx_intr_enable,
+       .intr_disable           = sfc_ef100_rx_intr_disable,
        .pkt_burst              = sfc_ef100_recv_pkts,
 };