Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54595/?format=api
{ "id": 54595, "url": "http://patches.dpdk.org/api/patches/54595/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1560152324-20538-21-git-send-email-arybchenko@solarflare.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": "<1560152324-20538-21-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1560152324-20538-21-git-send-email-arybchenko@solarflare.com", "date": "2019-06-10T07:38:35", "name": "[20/29] net/sfc/base: add EVB module vSwitch/vPort/vAdaptor ops", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "bebf239eafeea60a7151318fdd9508687cfe67a8", "submitter": { "id": 607, "url": "http://patches.dpdk.org/api/people/607/?format=api", "name": "Andrew Rybchenko", "email": "arybchenko@solarflare.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/1560152324-20538-21-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 4965, "url": "http://patches.dpdk.org/api/series/4965/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4965", "date": "2019-06-10T07:38:19", "name": "net/sfc/base: update base driver", "version": 1, "mbox": "http://patches.dpdk.org/series/4965/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/54595/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54595/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id B83721BEED;\n\tMon, 10 Jun 2019 09:39:21 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 450D81BE93\n\tfor <dev@dpdk.org>; Mon, 10 Jun 2019 09:38:56 +0200 (CEST)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us5.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n\t7D4E64C0058\n\tfor <dev@dpdk.org>; Mon, 10 Jun 2019 07:38:55 +0000 (UTC)", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1395.4; Mon, 10 Jun 2019 00:38:51 -0700", "from opal.uk.solarflarecom.com (10.17.10.1) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id\n\t15.0.1395.4 via Frontend Transport; Mon, 10 Jun 2019 00:38:51 -0700", "from ukv-loginhost.uk.solarflarecom.com\n\t(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tx5A7coHo008836; Mon, 10 Jun 2019 08:38:50 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\tF31E91616E0; Mon, 10 Jun 2019 08:38:49 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Gautam Dawar <gdawar@solarflare.com>", "Date": "Mon, 10 Jun 2019 08:38:35 +0100", "Message-ID": "<1560152324-20538-21-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1560152324-20538-1-git-send-email-arybchenko@solarflare.com>", "References": "<1560152324-20538-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.5.1010-24664.003", "X-TM-AS-Result": "No-2.590700-4.000000-10", "X-TMASE-MatchedRID": "NcDh5W22M00JBlgGfL+ic3F+T3jMctr+3FYvKmZiVnN0FoS1aixTNUJN\n\tUlrUTWTS5sErdUkMbqZTvVffeIwvQ8HVNeDWrWSGnFVnNmvv47tLXPA26IG0hN9RlPzeVuQQEZc\n\t2cPY2ad00qDWAe/Ti9gu7NCQvxalU7O9PFKJckb+2HyJ7/YtUleqhuTPUDQDtGlfXMQvierf6Yq\n\tifGBM/xTGijGKO0ukQYmWRWj5+JHRCXIPbCpslEAfC4JY9IggAfS0Ip2eEHnz3IzXlXlpamPoLR\n\t4+zsDTtvG0VHndRxgK61w9PXO9o7R1bCq3seGYIJyrpUWMy+4VgQL833wv+tgirZQdzMpDMhm2W\n\t1tvymR5bbfwZVlP0FOOlsk1jia08/eezb2n5HYjaQLtLC8aUqEPBvsmCWGHWUWQ7Bol0IqAY5tv\n\tH9Ry2Nw==", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--2.590700-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24664.003", "X-MDID": "1560152336-Mxl3ft4JpL3x", "Subject": "[dpdk-dev] [PATCH 20/29] net/sfc/base: add EVB module\n\tvSwitch/vPort/vAdaptor ops", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Gautam Dawar <gdawar@solarflare.com>\n\nImplement functions to allocate and free vSwitch, vPort and vAdaptor.\nAlso, implement functions to add and delete vPort MAC address and EVB\nport assign.\n\nMost of the efx_evb_ops_t functions take vSwitch ID as a parameter for\nfuture enhancements. Currently, firmware doesn't implement vSwitch\nidentifier and hence this paramter is unused for EF10 architecture\nimplementation.\n\nSigned-off-by: Gautam Dawar <gdawar@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_evb.c | 147 +++++++++++++++++++++++++++++++++++----\n drivers/net/sfc/base/ef10_impl.h | 73 ++++++++++++++++++-\n drivers/net/sfc/base/ef10_nic.c | 4 +-\n drivers/net/sfc/base/efx.h | 6 +-\n drivers/net/sfc/base/efx_evb.c | 24 ++++++-\n drivers/net/sfc/base/efx_impl.h | 17 +++++\n 6 files changed, 251 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_evb.c b/drivers/net/sfc/base/ef10_evb.c\nindex 18cecc2..aaa97f6 100644\n--- a/drivers/net/sfc/base/ef10_evb.c\n+++ b/drivers/net/sfc/base/ef10_evb.c\n@@ -163,12 +163,12 @@\n \t\t(vid != EFX_FILTER_VID_UNSPEC));\n \n \tMCDI_IN_POPULATE_DWORD_2(req, VPORT_ALLOC_IN_FLAGS,\n-\t\t VPORT_ALLOC_IN_FLAG_AUTO_PORT, 0,\n-\t\t VPORT_ALLOC_IN_FLAG_VLAN_RESTRICT, vlan_restrict);\n+\t\tVPORT_ALLOC_IN_FLAG_AUTO_PORT, 0,\n+\t\tVPORT_ALLOC_IN_FLAG_VLAN_RESTRICT, vlan_restrict);\n \n \tif (vid != EFX_FILTER_VID_UNSPEC)\n \t\tMCDI_IN_POPULATE_DWORD_1(req, VPORT_ALLOC_IN_VLAN_TAGS,\n-\t\t\t VPORT_ALLOC_IN_VLAN_TAG_0, vid);\n+\t\t\tVPORT_ALLOC_IN_VLAN_TAG_0, vid);\n \n \tefx_mcdi_execute(enp, &req);\n \n@@ -223,11 +223,11 @@\n \treturn (rc);\n }\n \n-\t__checkReturn\tefx_rc_t\n+\t__checkReturn\t\t\tefx_rc_t\n efx_mcdi_vport_mac_addr_add(\n-\t__in\t\tefx_nic_t *enp,\n-\t__in\t\tefx_vport_id_t vport_id,\n-\t__in_ecount(6)\tuint8_t *addrp)\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tefx_vport_id_t vport_id,\n+\t__in_bcount(EFX_MAC_ADDR_LEN)\tuint8_t *addrp)\n {\n \tEFX_MCDI_DECLARE_BUF(payload, MC_CMD_VPORT_ADD_MAC_ADDRESS_IN_LEN,\n \t\tMC_CMD_VPORT_ADD_MAC_ADDRESS_OUT_LEN);\n@@ -258,11 +258,11 @@\n \treturn (rc);\n }\n \n-\t__checkReturn\tefx_rc_t\n+\t__checkReturn\t\t\tefx_rc_t\n efx_mcdi_vport_mac_addr_del(\n-\t__in\t\tefx_nic_t *enp,\n-\t__in\t\tefx_vport_id_t vport_id,\n-\t__in_ecount(6)\tuint8_t *addrp)\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tefx_vport_id_t vport_id,\n+\t__in_bcount(EFX_MAC_ADDR_LEN)\tuint8_t *addrp)\n {\n \tEFX_MCDI_DECLARE_BUF(payload, MC_CMD_VPORT_DEL_MAC_ADDRESS_IN_LEN,\n \t\tMC_CMD_VPORT_DEL_MAC_ADDRESS_OUT_LEN);\n@@ -323,12 +323,135 @@\n \t\tgoto fail1;\n \t}\n \n-\treturn 0;\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+ef10_evb_vswitch_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__out\t\tefx_vswitch_id_t *vswitch_idp)\n+{\n+\tefx_rc_t rc;\n+\tif (vswitch_idp == NULL) {\n+\t\trc = EINVAL;\n+\t\tgoto fail1;\n+\t}\n+\n+\tif ((rc = efx_mcdi_vswitch_alloc(enp, EVB_PORT_ID_ASSIGNED,\n+\t\t\tEFX_VSWITCH_TYPE_VEB)) != 0) {\n+\t\tgoto fail2;\n+\t}\n+\n+\t*vswitch_idp = EFX_DEFAULT_VSWITCH_ID;\n+\treturn (0);\n+\n+fail2:\n+\tEFSYS_PROBE(fail2);\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_evb_vswitch_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\n+\treturn (efx_mcdi_vswitch_free(enp));\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_type_t vport_type,\n+\t__in\t\tuint16_t vid,\n+\t__in\t\tboolean_t vlan_restrict,\n+\t__out\t\tefx_vport_id_t *vport_idp)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\n+\treturn (efx_mcdi_vport_alloc(enp,\n+\t\t\tvport_type, vid,\n+\t\t\tvlan_restrict, vport_idp));\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\n+\treturn (efx_mcdi_vport_free(enp, vport_id));\n+}\n+\n+\t__checkReturn\t\t\tefx_rc_t\n+ef10_evb_vport_mac_addr_add(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\t\t\tefx_vport_id_t vport_id,\n+\t__in_bcount(EFX_MAC_ADDR_LEN)\tuint8_t *addrp)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\tEFSYS_ASSERT(addrp != NULL);\n+\n+\treturn (efx_mcdi_vport_mac_addr_add(enp, vport_id, addrp));\n+}\n+\n+\t__checkReturn\t\t\tefx_rc_t\n+ef10_evb_vport_mac_addr_del(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\t\t\tefx_vport_id_t vport_id,\n+\t__in_bcount(EFX_MAC_ADDR_LEN)\tuint8_t *addrp)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\tEFSYS_ASSERT(addrp != NULL);\n+\n+\treturn (efx_mcdi_vport_mac_addr_del(enp, vport_id, addrp));\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_evb_vadaptor_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\n+\treturn (efx_mcdi_vadaptor_alloc(enp, vport_id));\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_evb_vadaptor_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\n+\treturn (efx_mcdi_vadaptor_free(enp, vport_id));\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_assign(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id,\n+\t__in\tuint32_t vf_index)\n+{\n+\t_NOTE(ARGUNUSED(vswitch_id))\n+\n+\treturn (efx_mcdi_port_assign(enp, vport_id, vf_index));\n+}\n+\n #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n #endif /* EFSYS_OPT_EVB */\ndiff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h\nindex 26242a1..e261487 100644\n--- a/drivers/net/sfc/base/ef10_impl.h\n+++ b/drivers/net/sfc/base/ef10_impl.h\n@@ -195,6 +195,16 @@\n /* NIC */\n \n extern\t__checkReturn\tefx_rc_t\n+efx_mcdi_vadaptor_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t port_id);\n+\n+extern\t__checkReturn\tefx_rc_t\n+efx_mcdi_vadaptor_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t port_id);\n+\n+extern\t__checkReturn\tefx_rc_t\n ef10_nic_probe(\n \t__in\t\tefx_nic_t *enp);\n \n@@ -1267,10 +1277,71 @@ extern\t__checkReturn\t__success(return != B_FALSE)\tboolean_t\n ef10_evb_init(\n \t__in\t\tefx_nic_t *enp);\n \n-extern void\n+extern\t\t\tvoid\n ef10_evb_fini(\n \t__in\t\tefx_nic_t *enp);\n \n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vswitch_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__out\t\tefx_vswitch_id_t *vswitch_idp);\n+\n+\n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vswitch_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id);\n+\n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_type_t vport_type,\n+\t__in\t\tuint16_t vid,\n+\t__in\t\tboolean_t vlan_restrict,\n+\t__out\t\tefx_vport_id_t *vport_idp);\n+\n+\n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id);\n+\n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_mac_addr_add(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id,\n+\t__in_ecount(6)\tuint8_t *addrp);\n+\n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_mac_addr_del(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id,\n+\t__in_ecount(6)\tuint8_t *addrp);\n+\n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vadaptor_alloc(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id);\n+\n+\n+extern __checkReturn\tefx_rc_t\n+ef10_evb_vadaptor_free(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id);\n+\n+extern\t__checkReturn\tefx_rc_t\n+ef10_evb_vport_assign(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tefx_vswitch_id_t vswitch_id,\n+\t__in\t\tefx_vport_id_t vport_id,\n+\t__in\t\tuint32_t vf_index);\n+\n #endif /* EFSYS_OPT_EVB */\n \n #if EFSYS_OPT_RX_PACKED_STREAM\ndiff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c\nindex 8ee8047..7eada57 100644\n--- a/drivers/net/sfc/base/ef10_nic.c\n+++ b/drivers/net/sfc/base/ef10_nic.c\n@@ -223,7 +223,7 @@\n \treturn (rc);\n }\n \n-static\t__checkReturn\t\tefx_rc_t\n+\t__checkReturn\t\tefx_rc_t\n efx_mcdi_vadaptor_alloc(\n \t__in\t\t\tefx_nic_t *enp,\n \t__in\t\t\tuint32_t port_id)\n@@ -261,7 +261,7 @@\n \treturn (rc);\n }\n \n-static\t__checkReturn\t\tefx_rc_t\n+\t__checkReturn\t\tefx_rc_t\n efx_mcdi_vadaptor_free(\n \t__in\t\t\tefx_nic_t *enp,\n \t__in\t\t\tuint32_t port_id)\ndiff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h\nindex 1287505..664efc8 100644\n--- a/drivers/net/sfc/base/efx.h\n+++ b/drivers/net/sfc/base/efx.h\n@@ -3349,6 +3349,7 @@ extern\t__checkReturn\t__success(return != B_FALSE)\tboolean_t\n \n #if EFSYS_OPT_EVB\n \n+typedef uint32_t efx_vswitch_id_t;\n typedef uint32_t efx_vport_id_t;\n \n typedef enum efx_vswitch_type_e {\n@@ -3366,12 +3367,13 @@ extern\t__checkReturn\t__success(return != B_FALSE)\tboolean_t\n \n /* Unspecified VLAN ID to support disabling of VLAN filtering */\n #define\tEFX_FILTER_VID_UNSPEC\t0xffff\n+#define\tEFX_DEFAULT_VSWITCH_ID\t1\n \n-extern __checkReturn efx_rc_t\n+extern\t__checkReturn\tefx_rc_t\n efx_evb_init(\n \t__in\t\tefx_nic_t *enp);\n \n-extern\tvoid\n+extern\t\t\tvoid\n efx_evb_fini(\n \t__in\t\tefx_nic_t *enp);\n \ndiff --git a/drivers/net/sfc/base/efx_evb.c b/drivers/net/sfc/base/efx_evb.c\nindex f235252..ff240f9 100644\n--- a/drivers/net/sfc/base/efx_evb.c\n+++ b/drivers/net/sfc/base/efx_evb.c\n@@ -14,13 +14,31 @@\n static const efx_evb_ops_t\t__efx_evb_dummy_ops = {\n \tNULL,\t\t/* eeo_init */\n \tNULL,\t\t/* eeo_fini */\n+\tNULL,\t\t/* eeo_vswitch_alloc */\n+\tNULL,\t\t/* eeo_vswitch_free */\n+\tNULL,\t\t/* eeo_vport_alloc */\n+\tNULL,\t\t/* eeo_vport_free */\n+\tNULL,\t\t/* eeo_vport_mac_addr_add */\n+\tNULL,\t\t/* eeo_vport_mac_addr_del */\n+\tNULL,\t\t/* eeo_vadaptor_alloc */\n+\tNULL,\t\t/* eeo_vadaptor_free */\n+\tNULL,\t\t/* eeo_vport_assign */\n };\n #endif /* EFSYS_OPT_SIENA */\n \n #if EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2\n static const efx_evb_ops_t\t__efx_evb_ef10_ops = {\n-\tef10_evb_init,\t\t/* eeo_init */\n-\tef10_evb_fini,\t\t/* eeo_fini */\n+\tef10_evb_init,\t\t\t/* eeo_init */\n+\tef10_evb_fini,\t\t\t/* eeo_fini */\n+\tef10_evb_vswitch_alloc,\t\t/* eeo_vswitch_alloc */\n+\tef10_evb_vswitch_free,\t\t/* eeo_vswitch_free */\n+\tef10_evb_vport_alloc,\t\t/* eeo_vport_alloc */\n+\tef10_evb_vport_free,\t\t/* eeo_vport_free */\n+\tef10_evb_vport_mac_addr_add,\t/* eeo_vport_mac_addr_add */\n+\tef10_evb_vport_mac_addr_del,\t/* eeo_vport_mac_addr_del */\n+\tef10_evb_vadaptor_alloc,\t/* eeo_vadaptor_alloc */\n+\tef10_evb_vadaptor_free,\t\t/* eeo_vadaptor_free */\n+\tef10_evb_vport_assign,\t\t/* eeo_vport_assign */\n };\n #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n \n@@ -89,7 +107,7 @@\n \treturn (rc);\n }\n \n-\t\t\tvoid\n+\tvoid\n efx_evb_fini(\n \t__in\t\tefx_nic_t *enp)\n {\ndiff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h\nindex 00f88c8..ef6a97a 100644\n--- a/drivers/net/sfc/base/efx_impl.h\n+++ b/drivers/net/sfc/base/efx_impl.h\n@@ -655,6 +655,23 @@\n typedef struct efx_evb_ops_s {\n \tefx_rc_t\t(*eeo_init)(efx_nic_t *);\n \tvoid\t\t(*eeo_fini)(efx_nic_t *);\n+\tefx_rc_t\t(*eeo_vswitch_alloc)(efx_nic_t *, efx_vswitch_id_t *);\n+\tefx_rc_t\t(*eeo_vswitch_free)(efx_nic_t *, efx_vswitch_id_t);\n+\tefx_rc_t\t(*eeo_vport_alloc)(efx_nic_t *, efx_vswitch_id_t,\n+\t\t\t\t\t\tefx_vport_type_t, uint16_t,\n+\t\t\t\t\t\tboolean_t, efx_vport_id_t *);\n+\tefx_rc_t\t(*eeo_vport_free)(efx_nic_t *, efx_vswitch_id_t,\n+\t\t\t\t\t\tefx_vport_id_t);\n+\tefx_rc_t\t(*eeo_vport_mac_addr_add)(efx_nic_t *, efx_vswitch_id_t,\n+\t\t\t\t\t\tefx_vport_id_t, uint8_t *);\n+\tefx_rc_t\t(*eeo_vport_mac_addr_del)(efx_nic_t *, efx_vswitch_id_t,\n+\t\t\t\t\t\tefx_vport_id_t, uint8_t *);\n+\tefx_rc_t\t(*eeo_vadaptor_alloc)(efx_nic_t *, efx_vswitch_id_t,\n+\t\t\t\t\t\tefx_vport_id_t);\n+\tefx_rc_t\t(*eeo_vadaptor_free)(efx_nic_t *, efx_vswitch_id_t,\n+\t\t\t\t\t\tefx_vport_id_t);\n+\tefx_rc_t\t(*eeo_vport_assign)(efx_nic_t *, efx_vswitch_id_t,\n+\t\t\t\t\t\tefx_vport_id_t, uint32_t);\n } efx_evb_ops_t;\n \n #endif /* EFSYS_OPT_EVB */\n", "prefixes": [ "20/29" ] }