Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/78709/?format=api
{ "id": 78709, "url": "https://patches.dpdk.org/api/patches/78709/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1600949555-28043-33-git-send-email-arybchenko@solarflare.com/", "project": { "id": 1, "url": "https://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": "<1600949555-28043-33-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1600949555-28043-33-git-send-email-arybchenko@solarflare.com", "date": "2020-09-24T12:12:07", "name": "[v3,32/60] common/sfc_efx/base: implement Rx control path for Riverhead", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "ac0f4890282fd6e3962da580184b03b8ed888517", "submitter": { "id": 607, "url": "https://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1600949555-28043-33-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 12473, "url": "https://patches.dpdk.org/api/series/12473/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=12473", "date": "2020-09-24T12:11:40", "name": "common/sfc_efx: support Riverhead NIC family", "version": 3, "mbox": "https://patches.dpdk.org/series/12473/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/78709/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/78709/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id EA3A9A04B1;\n\tThu, 24 Sep 2020 14:18:42 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 957E71DED3;\n\tThu, 24 Sep 2020 14:13:51 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 15B221DE20\n for <dev@dpdk.org>; Thu, 24 Sep 2020 14:13:01 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.62])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n 97BD860088 for <dev@dpdk.org>; Thu, 24 Sep 2020 12:13:00 +0000 (UTC)", "from us4-mdac16-30.ut7.mdlocal (unknown [10.7.66.140])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 95DB38009B\n for <dev@dpdk.org>; Thu, 24 Sep 2020 12:13:00 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.7.65.200])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n 03F71280052\n for <dev@dpdk.org>; Thu, 24 Sep 2020 12:13:00 +0000 (UTC)", "from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n (No client certificate requested)\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n AF92D80005E\n for <dev@dpdk.org>; Thu, 24 Sep 2020 12:12:59 +0000 (UTC)", "from ukex01.SolarFlarecom.com (10.17.10.4) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2; Thu, 24 Sep 2020 13:12:47 +0100", "from opal.uk.solarflarecom.com (10.17.10.1) by\n ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id\n 15.0.1497.2 via Frontend Transport; Thu, 24 Sep 2020 13:12:47 +0100", "from ukv-loginhost.uk.solarflarecom.com\n (ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 08OCCl6p026001\n for <dev@dpdk.org>; Thu, 24 Sep 2020 13:12:47 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 5B0D01613AB\n for <dev@dpdk.org>; Thu, 24 Sep 2020 13:12:47 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Thu, 24 Sep 2020 13:12:07 +0100", "Message-ID": "<1600949555-28043-33-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1600949555-28043-1-git-send-email-arybchenko@solarflare.com>", "References": "<1600764594-14752-1-git-send-email-arybchenko@solarflare.com>\n <1600949555-28043-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-TM-AS-Product-Ver": "SMEX-12.5.0.1300-8.6.1012-25674.003", "X-TM-AS-Result": "No-2.729600-8.000000-10", "X-TMASE-MatchedRID": "pPa6SVZ3sfx/aFyHeBluckf49ONH0RaSAKbvziCwm7iPiMW+3YzkguZ5\n Gn23AeDZuA9fFHhyLzywgcHDNo5AtPI1YbpS1+avPwKTD1v8YV5MkOX0UoduufdG7cmuMnEoccc\n lw3oEpsIe27BljbjQO0MgT+IqZGUs3BjZIeDyjPT/V0SDC1Do0LqGBW9J0YqjCuSPuSVW5+6Sj6\n 7on+lofFlrZBoUhgzehXUSvJEqVTtqEf6Xr7r2WCH9ExNVXbjb6qG5M9QNAO08WRRd/XXhh1JdN\n 0iGOn3tTvEVolhVmZkNyoaA9NlxWWdUXh8Z6ySmnMQdNQ64xfdx7+KjXMomVWukPpgdThA6q3IT\n +LN3NLos+2tB3Xi0e9h1BEeVnzee86K5oiU6lAkHz0YoejTedt1hWsVVuzNokr7lCAjrQRrE41B\n h6hF6cR4nTCYnG9XjyQA7dQEiQ1LT7e6GLrnB8TCMW7zNwFaINW8jQhzoALVMkPIcxd5z9tVx9Y\n 8yEsP34vM1YF6AJbbCCfuIMF6xLSdET58jp62S94TUMgyyx6bwh1ymReZLW7Im2cKQsRmJ93fEx\n pDyA1yMgxh1xuxOrIEtX6v6YNsNouBVKAnMym6qTKiVlYY0knBg/rBUH2Fiqha7fcVIKfrqvk9C\n HHb0NQbT7eVkE2ZC2rhEGiFuOiuny9fy0ieryw==", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--2.729600-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25674.003", "X-MDID": "1600949580-rPaTSfHvZyA2", "Subject": "[dpdk-dev] [PATCH v3 32/60] common/sfc_efx/base: implement Rx\n\tcontrol path for Riverhead", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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": "Reuse EF10 RSS-related functions since current version of the RSS\ninterface is compatible with EF10.\n\nImplement own functions to create and destroy Rx queues which reuse\nMCDI wrappers which are shared with EF10.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/common/sfc_efx/base/ef10_rx.c | 11 +-\n drivers/common/sfc_efx/base/efx_impl.h | 8 +-\n drivers/common/sfc_efx/base/efx_mcdi.c | 8 +-\n drivers/common/sfc_efx/base/efx_rx.c | 35 +++\n drivers/common/sfc_efx/base/meson.build | 1 +\n drivers/common/sfc_efx/base/rhead_impl.h | 129 +++++++++\n drivers/common/sfc_efx/base/rhead_rx.c | 316 +++++++++++++++++++++++\n 7 files changed, 498 insertions(+), 10 deletions(-)\n create mode 100644 drivers/common/sfc_efx/base/rhead_rx.c", "diff": "diff --git a/drivers/common/sfc_efx/base/ef10_rx.c b/drivers/common/sfc_efx/base/ef10_rx.c\nindex 48666be5b5..61e0dab5b9 100644\n--- a/drivers/common/sfc_efx/base/ef10_rx.c\n+++ b/drivers/common/sfc_efx/base/ef10_rx.c\n@@ -8,7 +8,7 @@\n #include \"efx_impl.h\"\n \n \n-#if EFX_OPTS_EF10()\n+#if EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10()\n \n #if EFSYS_OPT_RX_SCALE\n static\t__checkReturn\tefx_rc_t\n@@ -375,6 +375,8 @@ ef10_rx_init(\n \treturn (0);\n }\n \n+#if EFX_OPTS_EF10()\n+\n #if EFSYS_OPT_RX_SCATTER\n \t__checkReturn\tefx_rc_t\n ef10_rx_scatter_enable(\n@@ -386,6 +388,8 @@ ef10_rx_scatter_enable(\n }\n #endif\t/* EFSYS_OPT_RX_SCATTER */\n \n+#endif\t/* EFX_OPTS_EF10() */\n+\n #if EFSYS_OPT_RX_SCALE\n \t__checkReturn\tefx_rc_t\n ef10_rx_scale_context_alloc(\n@@ -542,6 +546,7 @@ ef10_rx_scale_tbl_set(\n }\n #endif /* EFSYS_OPT_RX_SCALE */\n \n+#if EFX_OPTS_EF10()\n \n /*\n * EF10 RX pseudo-header\n@@ -1014,6 +1019,8 @@ ef10_rx_qdestroy(\n \tef10_ev_rxlabel_fini(eep, label);\n }\n \n+#endif /* EFX_OPTS_EF10() */\n+\n \t\tvoid\n ef10_rx_fini(\n \t__in\tefx_nic_t *enp)\n@@ -1028,4 +1035,4 @@ ef10_rx_fini(\n #endif /* EFSYS_OPT_RX_SCALE */\n }\n \n-#endif /* EFX_OPTS_EF10() */\n+#endif /* EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() */\ndiff --git a/drivers/common/sfc_efx/base/efx_impl.h b/drivers/common/sfc_efx/base/efx_impl.h\nindex 7d470619e1..fac2815f25 100644\n--- a/drivers/common/sfc_efx/base/efx_impl.h\n+++ b/drivers/common/sfc_efx/base/efx_impl.h\n@@ -1428,10 +1428,6 @@ efx_mcdi_fini_evq(\n \t__in\t\tefx_nic_t *enp,\n \t__in\t\tuint32_t instance);\n \n-#endif\t/* EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() */\n-\n-#if EFX_OPTS_EF10()\n-\n LIBEFX_INTERNAL\n extern\t__checkReturn\tefx_rc_t\n efx_mcdi_init_rxq(\n@@ -1456,6 +1452,10 @@ efx_mcdi_fini_rxq(\n \t__in\t\tefx_nic_t *enp,\n \t__in\t\tuint32_t instance);\n \n+#endif\t/* EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() */\n+\n+#if EFX_OPTS_EF10()\n+\n LIBEFX_INTERNAL\n extern\t__checkReturn\tefx_rc_t\n efx_mcdi_init_txq(\ndiff --git a/drivers/common/sfc_efx/base/efx_mcdi.c b/drivers/common/sfc_efx/base/efx_mcdi.c\nindex 8db52acd66..6a227858e6 100644\n--- a/drivers/common/sfc_efx/base/efx_mcdi.c\n+++ b/drivers/common/sfc_efx/base/efx_mcdi.c\n@@ -2680,10 +2680,6 @@ efx_mcdi_fini_evq(\n \treturn (rc);\n }\n \n-#endif\t/* EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() */\n-\n-#if EFX_OPTS_EF10()\n-\n \t__checkReturn\tefx_rc_t\n efx_mcdi_init_rxq(\n \t__in\t\tefx_nic_t *enp,\n@@ -2867,6 +2863,10 @@ efx_mcdi_fini_rxq(\n \treturn (rc);\n }\n \n+#endif\t/* EFSYS_OPT_RIVERHEAD || EFX_OPTS_EF10() */\n+\n+#if EFX_OPTS_EF10()\n+\n \t__checkReturn\tefx_rc_t\n efx_mcdi_init_txq(\n \t__in\t\tefx_nic_t *enp,\ndiff --git a/drivers/common/sfc_efx/base/efx_rx.c b/drivers/common/sfc_efx/base/efx_rx.c\nindex bacab5ec67..5f17bf3afe 100644\n--- a/drivers/common/sfc_efx/base/efx_rx.c\n+++ b/drivers/common/sfc_efx/base/efx_rx.c\n@@ -180,6 +180,35 @@ static const efx_rx_ops_t __efx_rx_ef10_ops = {\n };\n #endif\t/* EFX_OPTS_EF10() */\n \n+#if EFSYS_OPT_RIVERHEAD\n+static const efx_rx_ops_t __efx_rx_rhead_ops = {\n+\trhead_rx_init,\t\t\t\t/* erxo_init */\n+\trhead_rx_fini,\t\t\t\t/* erxo_fini */\n+#if EFSYS_OPT_RX_SCATTER\n+\trhead_rx_scatter_enable,\t\t/* erxo_scatter_enable */\n+#endif\n+#if EFSYS_OPT_RX_SCALE\n+\trhead_rx_scale_context_alloc,\t\t/* erxo_scale_context_alloc */\n+\trhead_rx_scale_context_free,\t\t/* erxo_scale_context_free */\n+\trhead_rx_scale_mode_set,\t\t/* erxo_scale_mode_set */\n+\trhead_rx_scale_key_set,\t\t\t/* erxo_scale_key_set */\n+\trhead_rx_scale_tbl_set,\t\t\t/* erxo_scale_tbl_set */\n+\trhead_rx_prefix_hash,\t\t\t/* erxo_prefix_hash */\n+#endif\n+\trhead_rx_prefix_pktlen,\t\t\t/* erxo_prefix_pktlen */\n+\trhead_rx_qpost,\t\t\t\t/* erxo_qpost */\n+\trhead_rx_qpush,\t\t\t\t/* erxo_qpush */\n+#if EFSYS_OPT_RX_PACKED_STREAM\n+\tNULL,\t\t\t\t\t/* erxo_qpush_ps_credits */\n+\tNULL,\t\t\t\t\t/* erxo_qps_packet_info */\n+#endif\n+\trhead_rx_qflush,\t\t\t/* erxo_qflush */\n+\trhead_rx_qenable,\t\t\t/* erxo_qenable */\n+\trhead_rx_qcreate,\t\t\t/* erxo_qcreate */\n+\trhead_rx_qdestroy,\t\t\t/* erxo_qdestroy */\n+};\n+#endif\t/* EFSYS_OPT_RIVERHEAD */\n+\n \n \t__checkReturn\tefx_rc_t\n efx_rx_init(\n@@ -226,6 +255,12 @@ efx_rx_init(\n \t\tbreak;\n #endif /* EFSYS_OPT_MEDFORD2 */\n \n+#if EFSYS_OPT_RIVERHEAD\n+\tcase EFX_FAMILY_RIVERHEAD:\n+\t\terxop = &__efx_rx_rhead_ops;\n+\t\tbreak;\n+#endif /* EFSYS_OPT_RIVERHEAD */\n+\n \tdefault:\n \t\tEFSYS_ASSERT(0);\n \t\trc = ENOTSUP;\ndiff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build\nindex 8e50f82154..aff5017cff 100644\n--- a/drivers/common/sfc_efx/base/meson.build\n+++ b/drivers/common/sfc_efx/base/meson.build\n@@ -55,6 +55,7 @@ sources = [\n \t'rhead_ev.c',\n \t'rhead_intr.c',\n \t'rhead_nic.c',\n+\t'rhead_rx.c',\n ]\n \n extra_flags = [\ndiff --git a/drivers/common/sfc_efx/base/rhead_impl.h b/drivers/common/sfc_efx/base/rhead_impl.h\nindex 47885b28dc..0ba663653b 100644\n--- a/drivers/common/sfc_efx/base/rhead_impl.h\n+++ b/drivers/common/sfc_efx/base/rhead_impl.h\n@@ -226,6 +226,135 @@ rhead_intr_fini(\n \t__in\t\tefx_nic_t *enp);\n \n \n+/* RX */\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_init(\n+\t__in\t\tefx_nic_t *enp);\n+\n+LIBEFX_INTERNAL\n+extern\t\t\tvoid\n+rhead_rx_fini(\n+\t__in\t\tefx_nic_t *enp);\n+\n+#if EFSYS_OPT_RX_SCATTER\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_scatter_enable(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tunsigned int buf_size);\n+\n+#endif\t/* EFSYS_OPT_RX_SCATTER */\n+\n+#if EFSYS_OPT_RX_SCALE\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_context_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_rx_scale_context_type_t type,\n+\t__in\t\tuint32_t num_queues,\n+\t__out\t\tuint32_t *rss_contextp);\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_context_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context);\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_mode_set(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context,\n+\t__in\t\tefx_rx_hash_alg_t alg,\n+\t__in\t\tefx_rx_hash_type_t type,\n+\t__in\t\tboolean_t insert);\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_key_set(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context,\n+\t__in_ecount(n)\tuint8_t *key,\n+\t__in\t\tsize_t n);\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_tbl_set(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context,\n+\t__in_ecount(n)\tunsigned int *table,\n+\t__in\t\tsize_t n);\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tuint32_t\n+rhead_rx_prefix_hash(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_rx_hash_alg_t func,\n+\t__in\t\tuint8_t *buffer);\n+\n+#endif /* EFSYS_OPT_RX_SCALE */\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_prefix_pktlen(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint8_t *buffer,\n+\t__out\t\tuint16_t *lengthp);\n+\n+LIBEFX_INTERNAL\n+extern\t\t\t\tvoid\n+rhead_rx_qpost(\n+\t__in\t\t\tefx_rxq_t *erp,\n+\t__in_ecount(ndescs)\tefsys_dma_addr_t *addrp,\n+\t__in\t\t\tsize_t size,\n+\t__in\t\t\tunsigned int ndescs,\n+\t__in\t\t\tunsigned int completed,\n+\t__in\t\t\tunsigned int added);\n+\n+LIBEFX_INTERNAL\n+extern\t\t\tvoid\n+rhead_rx_qpush(\n+\t__in\t\tefx_rxq_t *erp,\n+\t__in\t\tunsigned int added,\n+\t__inout\t\tunsigned int *pushedp);\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_qflush(\n+\t__in\t\tefx_rxq_t *erp);\n+\n+LIBEFX_INTERNAL\n+extern\t\tvoid\n+rhead_rx_qenable(\n+\t__in\t\tefx_rxq_t *erp);\n+\n+union efx_rxq_type_data_u;\n+\n+LIBEFX_INTERNAL\n+extern\t__checkReturn\tefx_rc_t\n+rhead_rx_qcreate(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tunsigned int index,\n+\t__in\t\tunsigned int label,\n+\t__in\t\tefx_rxq_type_t type,\n+\t__in\t\tconst union efx_rxq_type_data_u *type_data,\n+\t__in\t\tefsys_mem_t *esmp,\n+\t__in\t\tsize_t ndescs,\n+\t__in\t\tuint32_t id,\n+\t__in\t\tunsigned int flags,\n+\t__in\t\tefx_evq_t *eep,\n+\t__in\t\tefx_rxq_t *erp);\n+\n+LIBEFX_INTERNAL\n+extern\t\t\tvoid\n+rhead_rx_qdestroy(\n+\t__in\t\tefx_rxq_t *erp);\n+\n+\n #ifdef\t__cplusplus\n }\n #endif\ndiff --git a/drivers/common/sfc_efx/base/rhead_rx.c b/drivers/common/sfc_efx/base/rhead_rx.c\nnew file mode 100644\nindex 0000000000..0081b3ea53\n--- /dev/null\n+++ b/drivers/common/sfc_efx/base/rhead_rx.c\n@@ -0,0 +1,316 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ *\n+ * Copyright(c) 2019-2020 Xilinx, Inc.\n+ * Copyright(c) 2018-2019 Solarflare Communications Inc.\n+ */\n+\n+#include \"efx.h\"\n+#include \"efx_impl.h\"\n+\n+\n+#if EFSYS_OPT_RIVERHEAD\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_init(\n+\t__in\t\tefx_nic_t *enp)\n+{\n+\tefx_rc_t rc;\n+\n+\trc = ef10_rx_init(enp);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\treturn (0);\n+\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t\tvoid\n+rhead_rx_fini(\n+\t__in\tefx_nic_t *enp)\n+{\n+\tef10_rx_fini(enp);\n+}\n+\n+#if EFSYS_OPT_RX_SCATTER\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_scatter_enable(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tunsigned int buf_size)\n+{\n+\t_NOTE(ARGUNUSED(enp, buf_size))\n+\t/* Nothing to do here */\n+\treturn (0);\n+}\n+#endif\t/* EFSYS_OPT_RX_SCATTER */\n+\n+#if EFSYS_OPT_RX_SCALE\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_context_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_rx_scale_context_type_t type,\n+\t__in\t\tuint32_t num_queues,\n+\t__out\t\tuint32_t *rss_contextp)\n+{\n+\tefx_rc_t rc;\n+\n+\trc = ef10_rx_scale_context_alloc(enp, type, num_queues, rss_contextp);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\treturn (0);\n+\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_context_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context)\n+{\n+\tefx_rc_t rc;\n+\n+\trc = ef10_rx_scale_context_free(enp, rss_context);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\treturn (0);\n+\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_mode_set(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context,\n+\t__in\t\tefx_rx_hash_alg_t alg,\n+\t__in\t\tefx_rx_hash_type_t type,\n+\t__in\t\tboolean_t insert)\n+{\n+\tefx_rc_t rc;\n+\n+\trc = ef10_rx_scale_mode_set(enp, rss_context, alg, type, insert);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\treturn (0);\n+\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_key_set(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context,\n+\t__in_ecount(n)\tuint8_t *key,\n+\t__in\t\tsize_t n)\n+{\n+\tefx_rc_t rc;\n+\n+\trc = ef10_rx_scale_key_set(enp, rss_context, key, n);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\treturn (0);\n+\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_scale_tbl_set(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t rss_context,\n+\t__in_ecount(n)\tunsigned int *table,\n+\t__in\t\tsize_t n)\n+{\n+\tefx_rc_t rc;\n+\n+\trc = ef10_rx_scale_tbl_set(enp, rss_context, table, n);\n+\tif (rc != 0)\n+\t\tgoto fail1;\n+\n+\treturn (0);\n+\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\tuint32_t\n+rhead_rx_prefix_hash(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_rx_hash_alg_t func,\n+\t__in\t\tuint8_t *buffer)\n+{\n+\t_NOTE(ARGUNUSED(enp, func, buffer))\n+\n+\t/* FIXME implement the method for Riverhead */\n+\n+\treturn (ENOTSUP);\n+}\n+\n+#endif /* EFSYS_OPT_RX_SCALE */\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_prefix_pktlen(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint8_t *buffer,\n+\t__out\t\tuint16_t *lengthp)\n+{\n+\t_NOTE(ARGUNUSED(enp, buffer, lengthp))\n+\n+\t/* FIXME implement the method for Riverhead */\n+\n+\treturn (ENOTSUP);\n+}\n+\n+\t\t\t\tvoid\n+rhead_rx_qpost(\n+\t__in\t\t\tefx_rxq_t *erp,\n+\t__in_ecount(ndescs)\tefsys_dma_addr_t *addrp,\n+\t__in\t\t\tsize_t size,\n+\t__in\t\t\tunsigned int ndescs,\n+\t__in\t\t\tunsigned int completed,\n+\t__in\t\t\tunsigned int added)\n+{\n+\t_NOTE(ARGUNUSED(erp, addrp, size, ndescs, completed, added))\n+\n+\t/* FIXME implement the method for Riverhead */\n+\n+\tEFSYS_ASSERT(B_FALSE);\n+}\n+\n+\t\t\tvoid\n+rhead_rx_qpush(\n+\t__in\tefx_rxq_t *erp,\n+\t__in\tunsigned int added,\n+\t__inout\tunsigned int *pushedp)\n+{\n+\t_NOTE(ARGUNUSED(erp, added, pushedp))\n+\n+\t/* FIXME implement the method for Riverhead */\n+\n+\tEFSYS_ASSERT(B_FALSE);\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_qflush(\n+\t__in\tefx_rxq_t *erp)\n+{\n+\tefx_nic_t *enp = erp->er_enp;\n+\tefx_rc_t rc;\n+\n+\tif ((rc = efx_mcdi_fini_rxq(enp, erp->er_index)) != 0)\n+\t\tgoto fail1;\n+\n+\treturn (0);\n+\n+fail1:\n+\t/*\n+\t * EALREADY is not an error, but indicates that the MC has rebooted and\n+\t * that the RXQ has already been destroyed. Callers need to know that\n+\t * the RXQ flush has completed to avoid waiting until timeout for a\n+\t * flush done event that will not be delivered.\n+\t */\n+\tif (rc != EALREADY)\n+\t\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\n+\treturn (rc);\n+}\n+\n+\t\tvoid\n+rhead_rx_qenable(\n+\t__in\tefx_rxq_t *erp)\n+{\n+\t_NOTE(ARGUNUSED(erp))\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+rhead_rx_qcreate(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tunsigned int index,\n+\t__in\t\tunsigned int label,\n+\t__in\t\tefx_rxq_type_t type,\n+\t__in\t\tconst efx_rxq_type_data_t *type_data,\n+\t__in\t\tefsys_mem_t *esmp,\n+\t__in\t\tsize_t ndescs,\n+\t__in\t\tuint32_t id,\n+\t__in\t\tunsigned int flags,\n+\t__in\t\tefx_evq_t *eep,\n+\t__in\t\tefx_rxq_t *erp)\n+{\n+\tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(enp);\n+\tefx_rc_t rc;\n+\tboolean_t disable_scatter;\n+\n+\t_NOTE(ARGUNUSED(id))\n+\n+\tEFX_STATIC_ASSERT(EFX_EV_RX_NLABELS <=\n+\t (1 << ESF_GZ_EV_RXPKTS_Q_LABEL_WIDTH));\n+\tEFSYS_ASSERT3U(label, <, EFX_EV_RX_NLABELS);\n+\n+\tswitch (type) {\n+\tcase EFX_RXQ_TYPE_DEFAULT:\n+\t\tif (type_data == NULL) {\n+\t\t\trc = EINVAL;\n+\t\t\tgoto fail1;\n+\t\t}\n+\t\terp->er_buf_size = type_data->ertd_default.ed_buf_size;\n+\t\tbreak;\n+\tdefault:\n+\t\trc = ENOTSUP;\n+\t\tgoto fail2;\n+\t}\n+\n+\t/* Scatter can only be disabled if the firmware supports doing so */\n+\tif (flags & EFX_RXQ_FLAG_SCATTER)\n+\t\tdisable_scatter = B_FALSE;\n+\telse\n+\t\tdisable_scatter = encp->enc_rx_disable_scatter_supported;\n+\n+\t/*\n+\t * Ignore EFX_RXQ_FLAG_INNER_CLASSES since in accordance with\n+\t * EF100 host interface both inner and outer classes are provided\n+\t * by HW if applicable.\n+\t */\n+\n+\tif ((rc = efx_mcdi_init_rxq(enp, ndescs, eep, label, index,\n+\t\t esmp, disable_scatter, B_FALSE, erp->er_buf_size,\n+\t\t 0, 0, 0, 0, 0)) != 0)\n+\t\tgoto fail3;\n+\n+\terp->er_eep = eep;\n+\terp->er_label = label;\n+\n+\treturn (0);\n+\n+fail3:\n+\tEFSYS_PROBE(fail3);\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\n+\treturn (rc);\n+}\n+\n+\t\tvoid\n+rhead_rx_qdestroy(\n+\t__in\tefx_rxq_t *erp)\n+{\n+\t_NOTE(ARGUNUSED(erp))\n+\t/* Nothing to do here */\n+}\n+\n+#endif /* EFSYS_OPT_RIVERHEAD */\n", "prefixes": [ "v3", "32/60" ] }