net/enetfec: add features

This patch adds checksum and VLAN offloads in enetfec network
poll mode driver.

Signed-off-by: Sachin Saxena <sachin.saxena@nxp.com>
Signed-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

diff --git a/doc/guides/nics/enetfec.rst b/doc/guides/nics/enetfec.rst
index 09d0b88..a64e72f 100644 (file)
--- a/doc/guides/nics/enetfec.rst
+++ b/doc/guides/nics/enetfec.rst
@@ -86,6 +86,8 @@ ENETFEC Features
 
 - Basic stats
 - Promiscuous
+- VLAN offload
+- L3/L4 checksum offload
 - Linux
 - ARMv8
 

diff --git a/doc/guides/nics/features/enetfec.ini b/doc/guides/nics/features/enetfec.ini
index 3d8aa5b..2a34351 100644 (file)
--- a/doc/guides/nics/features/enetfec.ini
+++ b/doc/guides/nics/features/enetfec.ini
@@ -5,6 +5,9 @@
 ;
 [Features]
 Promiscuous mode     = Y
+VLAN offload        = Y
+L3 checksum offload  = Y
+L4 checksum offload  = Y
 Basic stats         = Y
 Linux               = Y
 ARMv8               = Y

diff --git a/drivers/net/enetfec/enet_ethdev.c b/drivers/net/enetfec/enet_ethdev.c
index ea77a96..714f8ac 100644 (file)
--- a/drivers/net/enetfec/enet_ethdev.c
+++ b/drivers/net/enetfec/enet_ethdev.c
@@ -70,7 +70,11 @@ enetfec_restart(struct rte_eth_dev *dev)
                val = rte_read32((uint8_t *)fep->hw_baseaddr_v + ENETFEC_RACC);
                /* align IP header */
                val |= ENETFEC_RACC_SHIFT16;
-               val &= ~ENETFEC_RACC_OPTIONS;
+               if (fep->flag_csum & RX_FLAG_CSUM_EN)
+                       /* set RX checksum */
+                       val |= ENETFEC_RACC_OPTIONS;
+               else
+                       val &= ~ENETFEC_RACC_OPTIONS;
                rte_write32(rte_cpu_to_le_32(val),
                        (uint8_t *)fep->hw_baseaddr_v + ENETFEC_RACC);
                rte_write32(rte_cpu_to_le_32(PKT_MAX_BUF_SIZE),
@@ -180,6 +184,11 @@ enet_free_buffers(struct rte_eth_dev *dev)
 static int
 enetfec_eth_configure(struct rte_eth_dev *dev)
 {
+       struct enetfec_private *fep = dev->data->dev_private;
+
+       if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_CHECKSUM)
+               fep->flag_csum |= RX_FLAG_CSUM_EN;
+
        if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)
                ENETFEC_PMD_ERR("PMD does not support KEEP_CRC offload");
 
@@ -558,6 +567,7 @@ enetfec_eth_init(struct rte_eth_dev *dev)
        fep->full_duplex = FULL_DUPLEX;
        dev->dev_ops = &enetfec_ops;
        rte_eth_dev_probing_finish(dev);
+
        return 0;
 }
 

diff --git a/drivers/net/enetfec/enet_ethdev.h b/drivers/net/enetfec/enet_ethdev.h
index 06a6c10..798b6ee 100644 (file)
--- a/drivers/net/enetfec/enet_ethdev.h
+++ b/drivers/net/enetfec/enet_ethdev.h
@@ -10,6 +10,7 @@
 #define BD_LEN                 49152
 #define ENETFEC_TX_FR_SIZE     2048
 #define ETH_HLEN               RTE_ETHER_HDR_LEN
+#define VLAN_HLEN              4
 
 /* full duplex */
 #define FULL_DUPLEX            0x00
@@ -93,6 +94,7 @@ struct enetfec_private {
        struct rte_eth_stats    stats;
        int                     full_duplex;
        int                     flag_pause;
+       int                     flag_csum;
        uint32_t                quirks;
        uint32_t                cbus_size;
        uint32_t                enetfec_e_cntl;

diff --git a/drivers/net/enetfec/enet_regs.h b/drivers/net/enetfec/enet_regs.h
index 5415ed7..a300c6f 100644 (file)
--- a/drivers/net/enetfec/enet_regs.h
+++ b/drivers/net/enetfec/enet_regs.h
@@ -27,6 +27,12 @@
 #define RX_BD_EMPTY    ((ushort)0x8000) /* BD is empty */
 #define RX_BD_STATS    ((ushort)0x013f) /* All buffer descriptor status bits */
 
+/* Ethernet receive use control and status of enhanced buffer descriptor */
+#define BD_ENETFEC_RX_VLAN     0x00000004
+
+#define RX_FLAG_CSUM_EN                (RX_BD_ICE | RX_BD_PCR)
+#define RX_FLAG_CSUM_ERR       (RX_BD_ICE | RX_BD_PCR)
+
 /* Ethernet transmit use control and status of buffer descriptor */
 #define TX_BD_TC       ((ushort)0x0400) /* Transmit CRC */
 #define TX_BD_LAST     ((ushort)0x0800) /* Last in frame */
@@ -56,6 +62,10 @@
 #define QUIRK_HAS_ENETFEC_MAC  (1 << 0)
 /* GBIT supported in controller */
 #define QUIRK_GBIT             (1 << 3)
+/* Controller support hardware checksum */
+#define QUIRK_CSUM             (1 << 5)
+/* Controller support hardware vlan */
+#define QUIRK_VLAN             (1 << 6)
 /* RACC register supported by controller */
 #define QUIRK_RACC             (1 << 12)
 /* i.MX8 ENETFEC IP version added the feature to generate the delayed TXC or

diff --git a/drivers/net/enetfec/enet_rxtx.c b/drivers/net/enetfec/enet_rxtx.c
index d7ec139..eac5ccf 100644 (file)
--- a/drivers/net/enetfec/enet_rxtx.c
+++ b/drivers/net/enetfec/enet_rxtx.c
@@ -4,6 +4,7 @@
 
 #include <rte_mbuf.h>
 #include <rte_io.h>
+#include <ethdev_driver.h>
 #include "enet_regs.h"
 #include "enet_ethdev.h"
 #include "enet_pmd_logs.h"
@@ -21,9 +22,14 @@ enetfec_recv_pkts(void *rxq1, struct rte_mbuf **rx_pkts,
        unsigned short status;
        unsigned short pkt_len;
        int pkt_received = 0, index = 0;
-       void *data;
+       void *data, *mbuf_data;
+       uint16_t vlan_tag;
+       struct  bufdesc_ex *ebdp = NULL;
+       bool    vlan_packet_rcvd = false;
        struct enetfec_priv_rx_q *rxq  = (struct enetfec_priv_rx_q *)rxq1;
        struct rte_eth_stats *stats = &rxq->fep->stats;
+       struct rte_eth_conf *eth_conf = &rxq->fep->dev->data->dev_conf;
+       uint64_t rx_offloads = eth_conf->rxmode.offloads;
        pool = rxq->pool;
        bdp = rxq->bd.cur;
 
@@ -76,6 +82,7 @@ enetfec_recv_pkts(void *rxq1, struct rte_mbuf **rx_pkts,
                mbuf = rxq->rx_mbuf[index];
 
                data = rte_pktmbuf_mtod(mbuf, uint8_t *);
+               mbuf_data = data;
                rte_prefetch0(data);
                rte_pktmbuf_append((struct rte_mbuf *)mbuf,
                                pkt_len - 4);
@@ -85,6 +92,48 @@ enetfec_recv_pkts(void *rxq1, struct rte_mbuf **rx_pkts,
 
                rx_pkts[pkt_received] = mbuf;
                pkt_received++;
+
+               /* Extract the enhanced buffer descriptor */
+               ebdp = NULL;
+               if (rxq->fep->bufdesc_ex)
+                       ebdp = (struct bufdesc_ex *)bdp;
+
+               /* If this is a VLAN packet remove the VLAN Tag */
+               vlan_packet_rcvd = false;
+               if ((rx_offloads & RTE_ETH_RX_OFFLOAD_VLAN) &&
+                               rxq->fep->bufdesc_ex &&
+                               (rte_read32(&ebdp->bd_esc) &
+                               rte_cpu_to_le_32(BD_ENETFEC_RX_VLAN))) {
+                       /* Push and remove the vlan tag */
+                       struct rte_vlan_hdr *vlan_header =
+                               (struct rte_vlan_hdr *)
+                               ((uint8_t *)data + ETH_HLEN);
+                       vlan_tag = rte_be_to_cpu_16(vlan_header->vlan_tci);
+
+                       vlan_packet_rcvd = true;
+                       memmove((uint8_t *)mbuf_data + VLAN_HLEN,
+                               data, RTE_ETHER_ADDR_LEN * 2);
+                       rte_pktmbuf_adj(mbuf, VLAN_HLEN);
+               }
+
+               if (rxq->fep->bufdesc_ex &&
+                       (rxq->fep->flag_csum & RX_FLAG_CSUM_EN)) {
+                       if ((rte_read32(&ebdp->bd_esc) &
+                               rte_cpu_to_le_32(RX_FLAG_CSUM_ERR)) == 0) {
+                               /* don't check it */
+                               mbuf->ol_flags = RTE_MBUF_F_RX_IP_CKSUM_BAD;
+                       } else {
+                               mbuf->ol_flags = RTE_MBUF_F_RX_IP_CKSUM_GOOD;
+                       }
+               }
+
+               /* Handle received VLAN packets */
+               if (vlan_packet_rcvd) {
+                       mbuf->vlan_tci = vlan_tag;
+                       mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED
+                                               | RTE_MBUF_F_RX_VLAN;
+               }
+
                rxq->rx_mbuf[index] = new_mbuf;
                rte_write32(rte_cpu_to_le_32(rte_pktmbuf_iova(new_mbuf)),
                                &bdp->bd_bufaddr);
@@ -185,6 +234,10 @@ enetfec_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
                if (txq->fep->bufdesc_ex) {
                        struct bufdesc_ex *ebdp = (struct bufdesc_ex *)bdp;
+
+                       if (mbuf->ol_flags == RTE_MBUF_F_RX_IP_CKSUM_GOOD)
+                               estatus |= TX_BD_PINS | TX_BD_IINS;
+
                        rte_write32(0, &ebdp->bd_bdu);
                        rte_write32(rte_cpu_to_le_32(estatus),
                                    &ebdp->bd_esc);