Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/97456/?format=api
{ "id": 97456, "url": "http://patches.dpdk.org/api/patches/97456/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210827065717.1838258-38-andrew.rybchenko@oktetlabs.ru/", "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": "<20210827065717.1838258-38-andrew.rybchenko@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210827065717.1838258-38-andrew.rybchenko@oktetlabs.ru", "date": "2021-08-27T06:57:16", "name": "[37/38] net/sfc: implement the representor info API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "5e946f4c18de8bd20ef23e3953650978c06607cc", "submitter": { "id": 2013, "url": "http://patches.dpdk.org/api/people/2013/?format=api", "name": "Andrew Rybchenko", "email": "Andrew.Rybchenko@oktetlabs.ru" }, "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/20210827065717.1838258-38-andrew.rybchenko@oktetlabs.ru/mbox/", "series": [ { "id": 18492, "url": "http://patches.dpdk.org/api/series/18492/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=18492", "date": "2021-08-27T06:56:39", "name": "net/sfc: support port representors", "version": 1, "mbox": "http://patches.dpdk.org/series/18492/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/97456/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/97456/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 767AFA0C41;\n\tFri, 27 Aug 2021 09:01:49 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id E7D02412B1;\n\tFri, 27 Aug 2021 08:59:48 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 99FD04125D\n for <dev@dpdk.org>; Fri, 27 Aug 2021 08:59:46 +0200 (CEST)", "by shelob.oktetlabs.ru (Postfix, from userid 122)\n id 66C347F6ED; Fri, 27 Aug 2021 09:59:46 +0300 (MSK)", "from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17])\n by shelob.oktetlabs.ru (Postfix) with ESMTP id E1E4D7F6FA;\n Fri, 27 Aug 2021 09:57:36 +0300 (MSK)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru", "X-Spam-Level": "", "X-Spam-Status": "No, score=0.8 required=5.0 tests=ALL_TRUSTED,\n DKIM_ADSP_DISCARD,\n URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2", "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru E1E4D7F6FA", "Authentication-Results": "shelob.oktetlabs.ru/E1E4D7F6FA; dkim=none;\n dkim-atps=neutral", "From": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Viacheslav Galaktionov <viacheslav.galaktionov@oktetlabs.ru>,\n Andy Moreton <amoreton@xilinx.com>", "Date": "Fri, 27 Aug 2021 09:57:16 +0300", "Message-Id": "<20210827065717.1838258-38-andrew.rybchenko@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20210827065717.1838258-1-andrew.rybchenko@oktetlabs.ru>", "References": "<20210827065717.1838258-1-andrew.rybchenko@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 37/38] net/sfc: implement the representor info API", "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": "From: Viacheslav Galaktionov <viacheslav.galaktionov@oktetlabs.ru>\n\nLet the driver provide the user with information about available\nrepresentors by implementing the representor_info_get operation.\n\nDue to the lack of any structure to representor IDs, every ID range\ndescribes exactly one representor.\n\nSigned-off-by: Viacheslav Galaktionov <viacheslav.galaktionov@oktetlabs.ru>\nSigned-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n doc/guides/rel_notes/release_21_11.rst | 6 +\n drivers/net/sfc/sfc_ethdev.c | 229 +++++++++++++++++++++++++\n drivers/net/sfc/sfc_switch.c | 104 +++++++++--\n drivers/net/sfc/sfc_switch.h | 24 +++\n 4 files changed, 352 insertions(+), 11 deletions(-)", "diff": "diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst\nindex d707a554ef..911e500ce5 100644\n--- a/doc/guides/rel_notes/release_21_11.rst\n+++ b/doc/guides/rel_notes/release_21_11.rst\n@@ -55,6 +55,12 @@ New Features\n Also, make sure to start the actual text at the margin.\n =======================================================\n \n+* **Updated Solarflare network PMD.**\n+\n+ Updated the Solarflare ``sfc_efx`` driver with changes including:\n+\n+ * Added port representors support on SN1000 SmartNICs\n+\n \n Removed Items\n -------------\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 29c8d220a2..62b81ed61a 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -1922,7 +1922,11 @@ static efx_rc_t\n sfc_process_mport_journal_entry(struct sfc_mport_journal_ctx *ctx,\n \t\t\t\tefx_mport_desc_t *mport)\n {\n+\tstruct sfc_mae_switch_port_request req;\n+\tefx_mport_sel_t entity_selector;\n \tefx_mport_sel_t ethdev_mport;\n+\tuint16_t switch_port_id;\n+\tefx_rc_t efx_rc;\n \tint rc;\n \n \tsfc_dbg(ctx->sa,\n@@ -1938,6 +1942,63 @@ sfc_process_mport_journal_entry(struct sfc_mport_journal_ctx *ctx,\n \t\t\treturn rc;\n \t}\n \n+\t/* Build Mport selector */\n+\tefx_rc = efx_mae_mport_by_pcie_mh_function(mport->emd_vnic.ev_intf,\n+\t\t\t\t\t\tmport->emd_vnic.ev_pf,\n+\t\t\t\t\t\tmport->emd_vnic.ev_vf,\n+\t\t\t\t\t\t&entity_selector);\n+\tif (efx_rc != 0) {\n+\t\tsfc_err(ctx->sa, \"failed to build entity mport selector for c%upf%uvf%u\",\n+\t\t\tmport->emd_vnic.ev_intf,\n+\t\t\tmport->emd_vnic.ev_pf,\n+\t\t\tmport->emd_vnic.ev_vf);\n+\t\treturn efx_rc;\n+\t}\n+\n+\trc = sfc_mae_switch_port_id_by_entity(ctx->switch_domain_id,\n+\t\t\t\t\t &entity_selector,\n+\t\t\t\t\t SFC_MAE_SWITCH_PORT_REPRESENTOR,\n+\t\t\t\t\t &switch_port_id);\n+\tswitch (rc) {\n+\tcase 0:\n+\t\t/* Already registered */\n+\t\tbreak;\n+\tcase ENOENT:\n+\t\t/*\n+\t\t * No representor has been created for this entity.\n+\t\t * Create a dummy switch registry entry with an invalid ethdev\n+\t\t * mport selector. When a corresponding representor is created,\n+\t\t * this entry will be updated.\n+\t\t */\n+\t\treq.type = SFC_MAE_SWITCH_PORT_REPRESENTOR;\n+\t\treq.entity_mportp = &entity_selector;\n+\t\treq.ethdev_mportp = ðdev_mport;\n+\t\treq.ethdev_port_id = RTE_MAX_ETHPORTS;\n+\t\treq.port_data.repr.intf = mport->emd_vnic.ev_intf;\n+\t\treq.port_data.repr.pf = mport->emd_vnic.ev_pf;\n+\t\treq.port_data.repr.vf = mport->emd_vnic.ev_vf;\n+\n+\t\trc = sfc_mae_assign_switch_port(ctx->switch_domain_id,\n+\t\t\t\t\t\t&req, &switch_port_id);\n+\t\tif (rc != 0) {\n+\t\t\tsfc_err(ctx->sa,\n+\t\t\t\t\"failed to assign MAE switch port for c%upf%uvf%u: %s\",\n+\t\t\t\tmport->emd_vnic.ev_intf,\n+\t\t\t\tmport->emd_vnic.ev_pf,\n+\t\t\t\tmport->emd_vnic.ev_vf,\n+\t\t\t\trte_strerror(rc));\n+\t\t\treturn rc;\n+\t\t}\n+\t\tbreak;\n+\tdefault:\n+\t\tsfc_err(ctx->sa, \"failed to find MAE switch port for c%upf%uvf%u: %s\",\n+\t\t\tmport->emd_vnic.ev_intf,\n+\t\t\tmport->emd_vnic.ev_pf,\n+\t\t\tmport->emd_vnic.ev_vf,\n+\t\t\trte_strerror(rc));\n+\t\treturn rc;\n+\t}\n+\n \treturn 0;\n }\n \n@@ -2034,6 +2095,173 @@ sfc_process_mport_journal(struct sfc_adapter *sa)\n \treturn 0;\n }\n \n+static void\n+sfc_count_representors_cb(enum sfc_mae_switch_port_type type,\n+\t\t\t const efx_mport_sel_t *ethdev_mportp __rte_unused,\n+\t\t\t uint16_t ethdev_port_id __rte_unused,\n+\t\t\t const efx_mport_sel_t *entity_mportp __rte_unused,\n+\t\t\t uint16_t switch_port_id __rte_unused,\n+\t\t\t union sfc_mae_switch_port_data *port_datap\n+\t\t\t\t__rte_unused,\n+\t\t\t void *user_datap)\n+{\n+\tint *counter = user_datap;\n+\n+\tSFC_ASSERT(counter != NULL);\n+\n+\tif (type == SFC_MAE_SWITCH_PORT_REPRESENTOR)\n+\t\t(*counter)++;\n+}\n+\n+struct sfc_get_representors_ctx {\n+\tstruct rte_eth_representor_info\t*info;\n+\tstruct sfc_adapter\t\t*sa;\n+\tuint16_t\t\t\tswitch_domain_id;\n+\tconst efx_pcie_interface_t\t*controllers;\n+\tsize_t\t\t\t\tnb_controllers;\n+};\n+\n+static void\n+sfc_get_representors_cb(enum sfc_mae_switch_port_type type,\n+\t\t\tconst efx_mport_sel_t *ethdev_mportp __rte_unused,\n+\t\t\tuint16_t ethdev_port_id __rte_unused,\n+\t\t\tconst efx_mport_sel_t *entity_mportp __rte_unused,\n+\t\t\tuint16_t switch_port_id,\n+\t\t\tunion sfc_mae_switch_port_data *port_datap,\n+\t\t\tvoid *user_datap)\n+{\n+\tstruct sfc_get_representors_ctx *ctx = user_datap;\n+\tstruct rte_eth_representor_range *range;\n+\tint ret;\n+\tint rc;\n+\n+\tSFC_ASSERT(ctx != NULL);\n+\tSFC_ASSERT(ctx->info != NULL);\n+\tSFC_ASSERT(ctx->sa != NULL);\n+\n+\tif (type != SFC_MAE_SWITCH_PORT_REPRESENTOR) {\n+\t\tsfc_dbg(ctx->sa, \"not a representor, skipping\");\n+\t\treturn;\n+\t}\n+\tif (ctx->info->nb_ranges >= ctx->info->nb_ranges_alloc) {\n+\t\tsfc_dbg(ctx->sa, \"info structure is full already\");\n+\t\treturn;\n+\t}\n+\n+\trange = &ctx->info->ranges[ctx->info->nb_ranges];\n+\trc = sfc_mae_switch_controller_from_mapping(ctx->controllers,\n+\t\t\t\t\t\t ctx->nb_controllers,\n+\t\t\t\t\t\t port_datap->repr.intf,\n+\t\t\t\t\t\t &range->controller);\n+\tif (rc != 0) {\n+\t\tsfc_err(ctx->sa, \"invalid representor controller: %d\",\n+\t\t\tport_datap->repr.intf);\n+\t\trange->controller = -1;\n+\t}\n+\trange->pf = port_datap->repr.pf;\n+\trange->id_base = switch_port_id;\n+\trange->id_end = switch_port_id;\n+\n+\tif (port_datap->repr.vf != EFX_PCI_VF_INVALID) {\n+\t\trange->type = RTE_ETH_REPRESENTOR_VF;\n+\t\trange->vf = port_datap->repr.vf;\n+\t\tret = snprintf(range->name, RTE_DEV_NAME_MAX_LEN,\n+\t\t\t \"c%dpf%dvf%d\", range->controller, range->pf,\n+\t\t\t range->vf);\n+\t} else {\n+\t\trange->type = RTE_ETH_REPRESENTOR_PF;\n+\t\tret = snprintf(range->name, RTE_DEV_NAME_MAX_LEN,\n+\t\t\t \"c%dpf%d\", range->controller, range->pf);\n+\t}\n+\tif (ret >= RTE_DEV_NAME_MAX_LEN) {\n+\t\tsfc_err(ctx->sa, \"representor name has been truncated: %s\",\n+\t\t\trange->name);\n+\t}\n+\n+\tctx->info->nb_ranges++;\n+}\n+\n+static int\n+sfc_representor_info_get(struct rte_eth_dev *dev,\n+\t\t\t struct rte_eth_representor_info *info)\n+{\n+\tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n+\tstruct sfc_get_representors_ctx get_repr_ctx;\n+\tconst efx_nic_cfg_t *nic_cfg;\n+\tuint16_t switch_domain_id;\n+\tuint32_t nb_repr;\n+\tint controller;\n+\tint rc;\n+\n+\tsfc_adapter_lock(sa);\n+\n+\tif (sa->mae.status != SFC_MAE_STATUS_SUPPORTED) {\n+\t\tsfc_adapter_unlock(sa);\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\trc = sfc_process_mport_journal(sa);\n+\tif (rc != 0) {\n+\t\tsfc_adapter_unlock(sa);\n+\t\tSFC_ASSERT(rc > 0);\n+\t\treturn -rc;\n+\t}\n+\n+\tswitch_domain_id = sa->mae.switch_domain_id;\n+\n+\tnb_repr = 0;\n+\trc = sfc_mae_switch_ports_iterate(switch_domain_id,\n+\t\t\t\t\t sfc_count_representors_cb,\n+\t\t\t\t\t &nb_repr);\n+\tif (rc != 0) {\n+\t\tsfc_adapter_unlock(sa);\n+\t\tSFC_ASSERT(rc > 0);\n+\t\treturn -rc;\n+\t}\n+\n+\tif (info == NULL) {\n+\t\tsfc_adapter_unlock(sa);\n+\t\treturn nb_repr;\n+\t}\n+\n+\trc = sfc_mae_switch_domain_controllers(switch_domain_id,\n+\t\t\t\t\t &get_repr_ctx.controllers,\n+\t\t\t\t\t &get_repr_ctx.nb_controllers);\n+\tif (rc != 0) {\n+\t\tsfc_adapter_unlock(sa);\n+\t\tSFC_ASSERT(rc > 0);\n+\t\treturn -rc;\n+\t}\n+\n+\tnic_cfg = efx_nic_cfg_get(sa->nic);\n+\n+\trc = sfc_mae_switch_domain_get_controller(switch_domain_id,\n+\t\t\t\t\t\t nic_cfg->enc_intf,\n+\t\t\t\t\t\t &controller);\n+\tif (rc != 0) {\n+\t\tsfc_err(sa, \"invalid controller: %d\", nic_cfg->enc_intf);\n+\t\tcontroller = -1;\n+\t}\n+\n+\tinfo->controller = controller;\n+\tinfo->pf = nic_cfg->enc_pf;\n+\n+\tget_repr_ctx.info = info;\n+\tget_repr_ctx.sa = sa;\n+\tget_repr_ctx.switch_domain_id = switch_domain_id;\n+\trc = sfc_mae_switch_ports_iterate(switch_domain_id,\n+\t\t\t\t\t sfc_get_representors_cb,\n+\t\t\t\t\t &get_repr_ctx);\n+\tif (rc != 0) {\n+\t\tsfc_adapter_unlock(sa);\n+\t\tSFC_ASSERT(rc > 0);\n+\t\treturn -rc;\n+\t}\n+\n+\tsfc_adapter_unlock(sa);\n+\treturn nb_repr;\n+}\n+\n static const struct eth_dev_ops sfc_eth_dev_ops = {\n \t.dev_configure\t\t\t= sfc_dev_configure,\n \t.dev_start\t\t\t= sfc_dev_start,\n@@ -2081,6 +2309,7 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {\n \t.xstats_get_by_id\t\t= sfc_xstats_get_by_id,\n \t.xstats_get_names_by_id\t\t= sfc_xstats_get_names_by_id,\n \t.pool_ops_supported\t\t= sfc_pool_ops_supported,\n+\t.representor_info_get\t\t= sfc_representor_info_get,\n };\n \n struct sfc_ethdev_init_data {\ndiff --git a/drivers/net/sfc/sfc_switch.c b/drivers/net/sfc/sfc_switch.c\nindex 5cd9b46d26..dc5b9a676c 100644\n--- a/drivers/net/sfc/sfc_switch.c\n+++ b/drivers/net/sfc/sfc_switch.c\n@@ -151,6 +151,34 @@ sfc_mae_find_switch_domain_by_id(uint16_t switch_domain_id)\n \treturn NULL;\n }\n \n+int\n+sfc_mae_switch_ports_iterate(uint16_t switch_domain_id,\n+\t\t\t sfc_mae_switch_port_iterator_cb *cb,\n+\t\t\t void *data)\n+{\n+\tstruct sfc_mae_switch_domain *domain;\n+\tstruct sfc_mae_switch_port *port;\n+\n+\tif (cb == NULL)\n+\t\treturn EINVAL;\n+\n+\trte_spinlock_lock(&sfc_mae_switch.lock);\n+\n+\tdomain = sfc_mae_find_switch_domain_by_id(switch_domain_id);\n+\tif (domain == NULL) {\n+\t\trte_spinlock_unlock(&sfc_mae_switch.lock);\n+\t\treturn EINVAL;\n+\t}\n+\n+\tTAILQ_FOREACH(port, &domain->ports, switch_domain_ports) {\n+\t\tcb(port->type, &port->ethdev_mport, port->ethdev_port_id,\n+\t\t &port->entity_mport, port->id, &port->data, data);\n+\t}\n+\n+\trte_spinlock_unlock(&sfc_mae_switch.lock);\n+\treturn 0;\n+}\n+\n /* This function expects to be called only when the lock is held */\n static struct sfc_mae_switch_domain *\n sfc_mae_find_switch_domain_by_hw_switch_id(const struct sfc_hw_switch_id *id)\n@@ -280,19 +308,12 @@ sfc_mae_switch_domain_map_controllers(uint16_t switch_domain_id,\n }\n \n int\n-sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id,\n-\t\t\t\t efx_pcie_interface_t intf,\n-\t\t\t\t int *controller)\n+sfc_mae_switch_controller_from_mapping(const efx_pcie_interface_t *controllers,\n+\t\t\t\t size_t nb_controllers,\n+\t\t\t\t efx_pcie_interface_t intf,\n+\t\t\t\t int *controller)\n {\n-\tconst efx_pcie_interface_t *controllers;\n-\tsize_t nb_controllers;\n \tsize_t i;\n-\tint rc;\n-\n-\trc = sfc_mae_switch_domain_controllers(switch_domain_id, &controllers,\n-\t\t\t\t\t &nb_controllers);\n-\tif (rc != 0)\n-\t\treturn rc;\n \n \tif (controllers == NULL)\n \t\treturn ENOENT;\n@@ -307,6 +328,26 @@ sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id,\n \treturn ENOENT;\n }\n \n+int\n+sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id,\n+\t\t\t\t efx_pcie_interface_t intf,\n+\t\t\t\t int *controller)\n+{\n+\tconst efx_pcie_interface_t *controllers;\n+\tsize_t nb_controllers;\n+\tint rc;\n+\n+\trc = sfc_mae_switch_domain_controllers(switch_domain_id, &controllers,\n+\t\t\t\t\t &nb_controllers);\n+\tif (rc != 0)\n+\t\treturn rc;\n+\n+\treturn sfc_mae_switch_controller_from_mapping(controllers,\n+\t\t\t\t\t\t nb_controllers,\n+\t\t\t\t\t\t intf,\n+\t\t\t\t\t\t controller);\n+}\n+\n int sfc_mae_switch_domain_get_intf(uint16_t switch_domain_id,\n \t\t\t\t int controller,\n \t\t\t\t efx_pcie_interface_t *intf)\n@@ -350,6 +391,30 @@ sfc_mae_find_switch_port_by_entity(const struct sfc_mae_switch_domain *domain,\n \treturn NULL;\n }\n \n+/* This function expects to be called only when the lock is held */\n+static int\n+sfc_mae_find_switch_port_id_by_entity(uint16_t switch_domain_id,\n+\t\t\t\t const efx_mport_sel_t *entity_mportp,\n+\t\t\t\t enum sfc_mae_switch_port_type type,\n+\t\t\t\t uint16_t *switch_port_id)\n+{\n+\tstruct sfc_mae_switch_domain *domain;\n+\tstruct sfc_mae_switch_port *port;\n+\n+\tSFC_ASSERT(rte_spinlock_is_locked(&sfc_mae_switch.lock));\n+\n+\tdomain = sfc_mae_find_switch_domain_by_id(switch_domain_id);\n+\tif (domain == NULL)\n+\t\treturn EINVAL;\n+\n+\tport = sfc_mae_find_switch_port_by_entity(domain, entity_mportp, type);\n+\tif (port == NULL)\n+\t\treturn ENOENT;\n+\n+\t*switch_port_id = port->id;\n+\treturn 0;\n+}\n+\n int\n sfc_mae_assign_switch_port(uint16_t switch_domain_id,\n \t\t\t const struct sfc_mae_switch_port_request *req,\n@@ -455,3 +520,20 @@ sfc_mae_switch_port_by_ethdev(uint16_t switch_domain_id,\n \n \treturn rc;\n }\n+\n+int\n+sfc_mae_switch_port_id_by_entity(uint16_t switch_domain_id,\n+\t\t\t\t const efx_mport_sel_t *entity_mportp,\n+\t\t\t\t enum sfc_mae_switch_port_type type,\n+\t\t\t\t uint16_t *switch_port_id)\n+{\n+\tint rc;\n+\n+\trte_spinlock_lock(&sfc_mae_switch.lock);\n+\trc = sfc_mae_find_switch_port_id_by_entity(switch_domain_id,\n+\t\t\t\t\t\t entity_mportp, type,\n+\t\t\t\t\t\t switch_port_id);\n+\trte_spinlock_unlock(&sfc_mae_switch.lock);\n+\n+\treturn rc;\n+}\ndiff --git a/drivers/net/sfc/sfc_switch.h b/drivers/net/sfc/sfc_switch.h\nindex d187c6dbbb..a77d2e6f28 100644\n--- a/drivers/net/sfc/sfc_switch.h\n+++ b/drivers/net/sfc/sfc_switch.h\n@@ -52,6 +52,19 @@ struct sfc_mae_switch_port_request {\n \tunion sfc_mae_switch_port_data\t\tport_data;\n };\n \n+typedef void (sfc_mae_switch_port_iterator_cb)(\n+\t\tenum sfc_mae_switch_port_type type,\n+\t\tconst efx_mport_sel_t *ethdev_mportp,\n+\t\tuint16_t ethdev_port_id,\n+\t\tconst efx_mport_sel_t *entity_mportp,\n+\t\tuint16_t switch_port_id,\n+\t\tunion sfc_mae_switch_port_data *port_datap,\n+\t\tvoid *user_datap);\n+\n+int sfc_mae_switch_ports_iterate(uint16_t switch_domain_id,\n+\t\t\t\t sfc_mae_switch_port_iterator_cb *cb,\n+\t\t\t\t void *data);\n+\n int sfc_mae_assign_switch_domain(struct sfc_adapter *sa,\n \t\t\t\t uint16_t *switch_domain_id);\n \n@@ -63,6 +76,12 @@ int sfc_mae_switch_domain_map_controllers(uint16_t switch_domain_id,\n \t\t\t\t\t efx_pcie_interface_t *controllers,\n \t\t\t\t\t size_t nb_controllers);\n \n+int sfc_mae_switch_controller_from_mapping(\n+\t\tconst efx_pcie_interface_t *controllers,\n+\t\tsize_t nb_controllers,\n+\t\tefx_pcie_interface_t intf,\n+\t\tint *controller);\n+\n int sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id,\n \t\t\t\t efx_pcie_interface_t intf,\n \t\t\t\t int *controller);\n@@ -79,6 +98,11 @@ int sfc_mae_switch_port_by_ethdev(uint16_t switch_domain_id,\n \t\t\t\t uint16_t ethdev_port_id,\n \t\t\t\t efx_mport_sel_t *mport_sel);\n \n+int sfc_mae_switch_port_id_by_entity(uint16_t switch_domain_id,\n+\t\t\t\t const efx_mport_sel_t *entity_mportp,\n+\t\t\t\t enum sfc_mae_switch_port_type type,\n+\t\t\t\t uint16_t *switch_port_id);\n+\n #ifdef __cplusplus\n }\n #endif\n", "prefixes": [ "37/38" ] }