Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104101/?format=api
{ "id": 104101, "url": "http://patches.dpdk.org/api/patches/104101/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211110074829.16654-6-apeksha.gupta@nxp.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20211110074829.16654-6-apeksha.gupta@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211110074829.16654-6-apeksha.gupta@nxp.com", "date": "2021-11-10T07:48:29", "name": "[v9,5/5] net/enetfec: add features", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "7a41ae2d4142026ad60b78f710d625e5b3b4a772", "submitter": { "id": 1570, "url": "http://patches.dpdk.org/api/people/1570/?format=api", "name": "Apeksha Gupta", "email": "apeksha.gupta@nxp.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20211110074829.16654-6-apeksha.gupta@nxp.com/mbox/", "series": [ { "id": 20445, "url": "http://patches.dpdk.org/api/series/20445/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20445", "date": "2021-11-10T07:48:24", "name": "drivers/net: add NXP ENETFEC driver", "version": 9, "mbox": "http://patches.dpdk.org/series/20445/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/104101/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/104101/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 30D29A034F;\n\tWed, 10 Nov 2021 08:49:01 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AF8214113A;\n\tWed, 10 Nov 2021 08:48:41 +0100 (CET)", "from inva020.nxp.com (inva020.nxp.com [92.121.34.13])\n by mails.dpdk.org (Postfix) with ESMTP id 2BCC9410F2\n for <dev@dpdk.org>; Wed, 10 Nov 2021 08:48:36 +0100 (CET)", "from inva020.nxp.com (localhost [127.0.0.1])\n by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 0CF441A0E94;\n Wed, 10 Nov 2021 08:48:36 +0100 (CET)", "from aprdc01srsp001v.ap-rdc01.nxp.com\n (aprdc01srsp001v.ap-rdc01.nxp.com [165.114.16.16])\n by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id A05B61A0E81;\n Wed, 10 Nov 2021 08:48:35 +0100 (CET)", "from lsv03186.swis.in-blr01.nxp.com (lsv03186.swis.in-blr01.nxp.com\n [92.120.146.182])\n by aprdc01srsp001v.ap-rdc01.nxp.com (Postfix) with ESMTP id 0133E183ACDD;\n Wed, 10 Nov 2021 15:48:34 +0800 (+08)" ], "From": "Apeksha Gupta <apeksha.gupta@nxp.com>", "To": "ferruh.yigit@intel.com, david.marchand@redhat.com,\n andrew.rybchenko@oktetlabs.ru", "Cc": "dev@dpdk.org, sachin.saxena@nxp.com, hemant.agrawal@nxp.com,\n Apeksha Gupta <apeksha.gupta@nxp.com>", "Date": "Wed, 10 Nov 2021 13:18:29 +0530", "Message-Id": "<20211110074829.16654-6-apeksha.gupta@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20211110074829.16654-1-apeksha.gupta@nxp.com>", "References": "<20211109113432.11876-6-apeksha.gupta@nxp.com>\n <20211110074829.16654-1-apeksha.gupta@nxp.com>", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH v9 5/5] net/enetfec: add features", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch adds checksum and VLAN offloads in enetfec network\npoll mode driver.\n\nSigned-off-by: Sachin Saxena <sachin.saxena@nxp.com>\nSigned-off-by: Apeksha Gupta <apeksha.gupta@nxp.com>\n---\n doc/guides/nics/enetfec.rst | 2 +\n doc/guides/nics/features/enetfec.ini | 3 ++\n drivers/net/enetfec/enet_ethdev.c | 14 ++++++-\n drivers/net/enetfec/enet_ethdev.h | 1 +\n drivers/net/enetfec/enet_regs.h | 10 +++++\n drivers/net/enetfec/enet_rxtx.c | 55 +++++++++++++++++++++++++++-\n 6 files changed, 82 insertions(+), 3 deletions(-)", "diff": "diff --git a/doc/guides/nics/enetfec.rst b/doc/guides/nics/enetfec.rst\nindex 63d6fb81ee..6734986c6d 100644\n--- a/doc/guides/nics/enetfec.rst\n+++ b/doc/guides/nics/enetfec.rst\n@@ -86,6 +86,8 @@ ENETFEC Features\n \n - Basic stats\n - Promiscuous\n+- VLAN offload\n+- L3/L4 checksum offload\n - Linux\n - ARMv8\n \ndiff --git a/doc/guides/nics/features/enetfec.ini b/doc/guides/nics/features/enetfec.ini\nindex 3d8aa5b627..2a34351b43 100644\n--- a/doc/guides/nics/features/enetfec.ini\n+++ b/doc/guides/nics/features/enetfec.ini\n@@ -5,6 +5,9 @@\n ;\n [Features]\n Promiscuous mode = Y\n+VLAN offload\t = Y\n+L3 checksum offload = Y\n+L4 checksum offload = Y\n Basic stats\t = Y\n Linux\t\t = Y\n ARMv8\t\t = Y\ndiff --git a/drivers/net/enetfec/enet_ethdev.c b/drivers/net/enetfec/enet_ethdev.c\nindex 8c8788ad8f..80ee452a19 100644\n--- a/drivers/net/enetfec/enet_ethdev.c\n+++ b/drivers/net/enetfec/enet_ethdev.c\n@@ -79,7 +79,11 @@ enetfec_restart(struct rte_eth_dev *dev)\n \t\tval = rte_read32((uint8_t *)fep->hw_baseaddr_v + ENETFEC_RACC);\n \t\t/* align IP header */\n \t\tval |= ENETFEC_RACC_SHIFT16;\n-\t\tval &= ~ENETFEC_RACC_OPTIONS;\n+\t\tif (fep->flag_csum & RX_FLAG_CSUM_EN)\n+\t\t\t/* set RX checksum */\n+\t\t\tval |= ENETFEC_RACC_OPTIONS;\n+\t\telse\n+\t\t\tval &= ~ENETFEC_RACC_OPTIONS;\n \t\trte_write32(rte_cpu_to_le_32(val),\n \t\t\t(uint8_t *)fep->hw_baseaddr_v + ENETFEC_RACC);\n \t\trte_write32(rte_cpu_to_le_32(PKT_MAX_BUF_SIZE),\n@@ -191,7 +195,12 @@ enet_free_buffers(struct rte_eth_dev *dev)\n static int\n enetfec_eth_configure(struct rte_eth_dev *dev)\n {\n-\tif (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_KEEP_CRC)\n+\tstruct enetfec_private *fep = dev->data->dev_private;\n+\n+\tif (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_CHECKSUM)\n+\t\tfep->flag_csum |= RX_FLAG_CSUM_EN;\n+\n+\tif (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC)\n \t\tENETFEC_PMD_ERR(\"PMD does not support KEEP_CRC offload\");\n \n \treturn 0;\n@@ -570,6 +579,7 @@ enetfec_eth_init(struct rte_eth_dev *dev)\n \tfep->full_duplex = FULL_DUPLEX;\n \tdev->dev_ops = &enetfec_ops;\n \trte_eth_dev_probing_finish(dev);\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/enetfec/enet_ethdev.h b/drivers/net/enetfec/enet_ethdev.h\nindex c6f8cf7f03..60b920d414 100644\n--- a/drivers/net/enetfec/enet_ethdev.h\n+++ b/drivers/net/enetfec/enet_ethdev.h\n@@ -10,6 +10,7 @@\n #define BD_LEN\t\t\t49152\n #define ENETFEC_TX_FR_SIZE\t2048\n #define ETH_HLEN\t\tRTE_ETHER_HDR_LEN\n+#define VLAN_HLEN\t\t4\n \n /* full duplex */\n #define FULL_DUPLEX 0x00\ndiff --git a/drivers/net/enetfec/enet_regs.h b/drivers/net/enetfec/enet_regs.h\nindex 5415ed77ea..a300c6f8bc 100644\n--- a/drivers/net/enetfec/enet_regs.h\n+++ b/drivers/net/enetfec/enet_regs.h\n@@ -27,6 +27,12 @@\n #define RX_BD_EMPTY\t((ushort)0x8000) /* BD is empty */\n #define RX_BD_STATS\t((ushort)0x013f) /* All buffer descriptor status bits */\n \n+/* Ethernet receive use control and status of enhanced buffer descriptor */\n+#define BD_ENETFEC_RX_VLAN\t0x00000004\n+\n+#define RX_FLAG_CSUM_EN\t\t(RX_BD_ICE | RX_BD_PCR)\n+#define RX_FLAG_CSUM_ERR\t(RX_BD_ICE | RX_BD_PCR)\n+\n /* Ethernet transmit use control and status of buffer descriptor */\n #define TX_BD_TC\t((ushort)0x0400) /* Transmit CRC */\n #define TX_BD_LAST\t((ushort)0x0800) /* Last in frame */\n@@ -56,6 +62,10 @@\n #define QUIRK_HAS_ENETFEC_MAC\t(1 << 0)\n /* GBIT supported in controller */\n #define QUIRK_GBIT\t\t(1 << 3)\n+/* Controller support hardware checksum */\n+#define QUIRK_CSUM\t\t(1 << 5)\n+/* Controller support hardware vlan */\n+#define QUIRK_VLAN\t\t(1 << 6)\n /* RACC register supported by controller */\n #define QUIRK_RACC\t\t(1 << 12)\n /* i.MX8 ENETFEC IP version added the feature to generate the delayed TXC or\ndiff --git a/drivers/net/enetfec/enet_rxtx.c b/drivers/net/enetfec/enet_rxtx.c\nindex 4e6a263e67..005c1d1135 100644\n--- a/drivers/net/enetfec/enet_rxtx.c\n+++ b/drivers/net/enetfec/enet_rxtx.c\n@@ -5,6 +5,7 @@\n #include <signal.h>\n #include <rte_mbuf.h>\n #include <rte_io.h>\n+#include <ethdev_driver.h>\n #include \"enet_regs.h\"\n #include \"enet_ethdev.h\"\n #include \"enet_pmd_logs.h\"\n@@ -22,9 +23,14 @@ enetfec_recv_pkts(void *rxq1, __rte_unused struct rte_mbuf **rx_pkts,\n \tunsigned short status;\n \tunsigned short pkt_len;\n \tint pkt_received = 0, index = 0;\n-\tvoid *data;\n+\tvoid *data, *mbuf_data;\n+\tuint16_t vlan_tag;\n+\tstruct bufdesc_ex *ebdp = NULL;\n+\tbool vlan_packet_rcvd = false;\n \tstruct enetfec_priv_rx_q *rxq = (struct enetfec_priv_rx_q *)rxq1;\n \tstruct rte_eth_stats *stats = &rxq->fep->stats;\n+\tstruct rte_eth_conf *eth_conf = &rxq->fep->dev->data->dev_conf;\n+\tuint64_t rx_offloads = eth_conf->rxmode.offloads;\n \tpool = rxq->pool;\n \tbdp = rxq->bd.cur;\n \n@@ -77,6 +83,7 @@ enetfec_recv_pkts(void *rxq1, __rte_unused struct rte_mbuf **rx_pkts,\n \t\tmbuf = rxq->rx_mbuf[index];\n \n \t\tdata = rte_pktmbuf_mtod(mbuf, uint8_t *);\n+\t\tmbuf_data = data;\n \t\trte_prefetch0(data);\n \t\trte_pktmbuf_append((struct rte_mbuf *)mbuf,\n \t\t\t\tpkt_len - 4);\n@@ -86,6 +93,48 @@ enetfec_recv_pkts(void *rxq1, __rte_unused struct rte_mbuf **rx_pkts,\n \n \t\trx_pkts[pkt_received] = mbuf;\n \t\tpkt_received++;\n+\n+\t\t/* Extract the enhanced buffer descriptor */\n+\t\tebdp = NULL;\n+\t\tif (rxq->fep->bufdesc_ex)\n+\t\t\tebdp = (struct bufdesc_ex *)bdp;\n+\n+\t\t/* If this is a VLAN packet remove the VLAN Tag */\n+\t\tvlan_packet_rcvd = false;\n+\t\tif ((rx_offloads & DEV_RX_OFFLOAD_VLAN) &&\n+\t\t\t\trxq->fep->bufdesc_ex &&\n+\t\t\t\t(rte_read32(&ebdp->bd_esc) &\n+\t\t\t\trte_cpu_to_le_32(BD_ENETFEC_RX_VLAN))) {\n+\t\t\t/* Push and remove the vlan tag */\n+\t\t\tstruct rte_vlan_hdr *vlan_header =\n+\t\t\t\t(struct rte_vlan_hdr *)\n+\t\t\t\t((uint8_t *)data + ETH_HLEN);\n+\t\t\tvlan_tag = rte_be_to_cpu_16(vlan_header->vlan_tci);\n+\n+\t\t\tvlan_packet_rcvd = true;\n+\t\t\tmemmove((uint8_t *)mbuf_data + VLAN_HLEN,\n+\t\t\t\tdata, RTE_ETHER_ADDR_LEN * 2);\n+\t\t\trte_pktmbuf_adj(mbuf, VLAN_HLEN);\n+\t\t}\n+\n+\t\tif (rxq->fep->bufdesc_ex &&\n+\t\t\t(rxq->fep->flag_csum & RX_FLAG_CSUM_EN)) {\n+\t\t\tif ((rte_read32(&ebdp->bd_esc) &\n+\t\t\t\trte_cpu_to_le_32(RX_FLAG_CSUM_ERR)) == 0) {\n+\t\t\t\t/* don't check it */\n+\t\t\t\tmbuf->ol_flags = RTE_MBUF_F_RX_IP_CKSUM_BAD;\n+\t\t\t} else {\n+\t\t\t\tmbuf->ol_flags = RTE_MBUF_F_RX_IP_CKSUM_GOOD;\n+\t\t\t}\n+\t\t}\n+\n+\t\t/* Handle received VLAN packets */\n+\t\tif (vlan_packet_rcvd) {\n+\t\t\tmbuf->vlan_tci = vlan_tag;\n+\t\t\tmbuf->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED\n+\t\t\t\t\t\t| RTE_MBUF_F_RX_VLAN;\n+\t\t}\n+\n \t\trxq->rx_mbuf[index] = new_mbuf;\n \t\trte_write32(rte_cpu_to_le_32(rte_pktmbuf_iova(new_mbuf)),\n \t\t\t\t&bdp->bd_bufaddr);\n@@ -186,6 +235,10 @@ enetfec_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n \n \t\tif (txq->fep->bufdesc_ex) {\n \t\t\tstruct bufdesc_ex *ebdp = (struct bufdesc_ex *)bdp;\n+\n+\t\t\tif (mbuf->ol_flags == RTE_MBUF_F_RX_IP_CKSUM_GOOD)\n+\t\t\t\testatus |= TX_BD_PINS | TX_BD_IINS;\n+\n \t\t\trte_write32(0, &ebdp->bd_bdu);\n \t\t\trte_write32(rte_cpu_to_le_32(estatus),\n \t\t\t\t &ebdp->bd_esc);\n", "prefixes": [ "v9", "5/5" ] }