Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/54607/?format=api
{ "id": 54607, "url": "http://patches.dpdk.org/api/patches/54607/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1560152324-20538-27-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-27-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1560152324-20538-27-git-send-email-arybchenko@solarflare.com", "date": "2019-06-10T07:38:41", "name": "[26/29] net/sfc/base: provide proxy APIs to client drivers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "5fe641ef31d6e172fbf48fee4ac1a537e671923c", "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-27-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/54607/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/54607/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 5DF041BF39;\n\tMon, 10 Jun 2019 09:39:38 +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 8D3D41BE9C\n\tfor <dev@dpdk.org>; Mon, 10 Jun 2019 09:38:59 +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-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n\t857BD140058\n\tfor <dev@dpdk.org>; Mon, 10 Jun 2019 07:38:58 +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\tx5A7coBL008866; 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\t4C1541616E0; Mon, 10 Jun 2019 08:38:50 +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:41 +0100", "Message-ID": "<1560152324-20538-27-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-7.366700-4.000000-10", "X-TMASE-MatchedRID": "qYdBQr1QwYAIHyE1IfGi6Ydlc1JaOB1TXs5nqGvDCfNjLp8Cm8vwF6pD\n\tJ3T7GsWZ+xHfx8k2JFSlskwMhnibrwihmwiXCMoGPwKTD1v8YV5MkOX0Uoduuey9vsxhLmzevQS\n\t/jzORDUHWOjFTe37S5GmK1BXz5NhErRll5FNO+m1H+PTjR9EWkp4oEP/S42Q2jEoCiXjMvE0S99\n\tdUV0LYkvnCSbx7AyEmKQZUP+tGhCh78ZKYQ4N2csnUT+eskUQPVCGp3g4/hjvxVrC9HCwRJzK2i\n\teu8M5yxZ3LwX2AqIR0XDKoC5H4ejY1pcgBT/7Ns4jRkIImnX0Mr9gVlOIN/6tNXOy0pXgUhltea\n\ti6D7W37NcUlS6Hr2U4msf/IiAf1B3bq08eBVhehhXXywTJLpfNyyh6r/9tsYSrBbamk8Kaoh6QO\n\tHM6EIp/muR0hyvRqJoFW8SPM0GkIfE8yM4pjsDwtuKBGekqUpI/NGWt0UYPDYHjDOorHJjI6hWi\n\tQKexgHlKVxZ6ITjJjYA+vquSfYTNfOOh2Ygt5I", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--7.366700-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24664.003", "X-MDID": "1560152339-C3XZLslxrY_l", "Subject": "[dpdk-dev] [PATCH 26/29] net/sfc/base: provide proxy APIs to client\n\tdrivers", "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 the APIs for PROXY_CMD, PROXY_COMPLETE and PRIVILEGE_MASK\nmessages to allow client drivers authorize VF operations like set MAC,\nset MTU etc. with firmware.\n\nSigned-off-by: Gautam Dawar <gdawar@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_impl.h | 19 ++++\n drivers/net/sfc/base/ef10_proxy.c | 208 ++++++++++++++++++++++++++++++++++++++\n drivers/net/sfc/base/efx.h | 29 ++++++\n drivers/net/sfc/base/efx_impl.h | 5 +\n drivers/net/sfc/base/efx_mcdi.c | 34 ++++++-\n drivers/net/sfc/base/efx_mcdi.h | 2 +-\n drivers/net/sfc/base/efx_proxy.c | 100 ++++++++++++++++++\n 7 files changed, 394 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h\nindex 4b719c9..e9ce31a 100644\n--- a/drivers/net/sfc/base/ef10_impl.h\n+++ b/drivers/net/sfc/base/ef10_impl.h\n@@ -1376,6 +1376,25 @@ extern\t__checkReturn\t__success(return != B_FALSE)\tboolean_t\n \t__in\t\tuint32_t add_privileges_mask,\n \t__in\t\tuint32_t remove_privileges_mask);\n \n+\t__checkReturn\tefx_rc_t\n+ef10_proxy_auth_set_privilege_mask(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t vf_index,\n+\t__in\t\tuint32_t mask,\n+\t__in\t\tuint32_t value);\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_proxy_auth_complete_request(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t fn_index,\n+\t__in\t\tuint32_t proxy_result,\n+\t__in\t\tuint32_t handle);\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_proxy_auth_exec_cmd(\n+\t__in\t\tefx_nic_t *enp,\n+\t__inout\t\tefx_proxy_cmd_params_t *paramsp);\n+\n #endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */\n \n #if EFSYS_OPT_RX_PACKED_STREAM\ndiff --git a/drivers/net/sfc/base/ef10_proxy.c b/drivers/net/sfc/base/ef10_proxy.c\nindex 6b1afcc..a3b73f4 100644\n--- a/drivers/net/sfc/base/ef10_proxy.c\n+++ b/drivers/net/sfc/base/ef10_proxy.c\n@@ -252,4 +252,212 @@\n \treturn (efx_mcdi_privilege_modify(enp, fn_group, pf_index, vf_index,\n \t\t\tadd_privileges_mask, remove_privileges_mask));\n }\n+\n+static\t__checkReturn\tefx_rc_t\n+efx_mcdi_privilege_mask_set(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t vf_index,\n+\t__in\t\tuint32_t mask,\n+\t__in\t\tuint32_t value)\n+{\n+\tEFX_MCDI_DECLARE_BUF(payload, MC_CMD_PRIVILEGE_MASK_IN_LEN,\n+\t\tMC_CMD_PRIVILEGE_MASK_OUT_LEN);\n+\tefx_nic_cfg_t *encp = &(enp->en_nic_cfg);\n+\tefx_mcdi_req_t req;\n+\tefx_rc_t rc;\n+\tuint32_t old_mask = 0;\n+\tuint32_t new_mask = 0;\n+\n+\tEFSYS_ASSERT((value & ~mask) == 0);\n+\n+\treq.emr_cmd = MC_CMD_PRIVILEGE_MASK;\n+\treq.emr_in_buf = payload;\n+\treq.emr_in_length = MC_CMD_PRIVILEGE_MASK_IN_LEN;\n+\treq.emr_out_buf = payload;\n+\treq.emr_out_length = MC_CMD_PRIVILEGE_MASK_OUT_LEN;\n+\n+\t/* Get privilege mask */\n+\tMCDI_IN_POPULATE_DWORD_2(req, PRIVILEGE_MASK_IN_FUNCTION,\n+\t\tPRIVILEGE_MASK_IN_FUNCTION_PF, encp->enc_pf,\n+\t\tPRIVILEGE_MASK_IN_FUNCTION_VF, vf_index);\n+\n+\tefx_mcdi_execute(enp, &req);\n+\n+\tif (req.emr_rc != 0) {\n+\t\trc = req.emr_rc;\n+\t\tgoto fail1;\n+\t}\n+\n+\tif (req.emr_out_length_used != MC_CMD_PRIVILEGE_MASK_OUT_LEN) {\n+\t\trc = EMSGSIZE;\n+\t\tgoto fail2;\n+\t}\n+\n+\told_mask = *MCDI_OUT2(req, uint32_t, PRIVILEGE_MASK_OUT_OLD_MASK);\n+\tnew_mask = old_mask & ~mask;\n+\tnew_mask |= (value & mask);\n+\n+\tif (new_mask == old_mask)\n+\t\treturn (0);\n+\n+\tnew_mask |= MC_CMD_PRIVILEGE_MASK_IN_DO_CHANGE;\n+\tmemset(payload, 0, sizeof (payload));\n+\n+\treq.emr_cmd = MC_CMD_PRIVILEGE_MASK;\n+\treq.emr_in_buf = payload;\n+\treq.emr_in_length = MC_CMD_PRIVILEGE_MASK_IN_LEN;\n+\treq.emr_out_buf = payload;\n+\treq.emr_out_length = MC_CMD_PRIVILEGE_MASK_OUT_LEN;\n+\n+\t/* Set privilege mask */\n+\tMCDI_IN_SET_DWORD(req, PRIVILEGE_MASK_IN_NEW_MASK, new_mask);\n+\n+\tefx_mcdi_execute(enp, &req);\n+\tif (req.emr_rc != 0) {\n+\t\trc = req.emr_rc;\n+\t\tgoto fail3;\n+\t}\n+\n+\tif (req.emr_out_length_used != MC_CMD_PRIVILEGE_MASK_OUT_LEN) {\n+\t\trc = EMSGSIZE;\n+\t\tgoto fail4;\n+\t}\n+\n+\treturn (0);\n+\n+fail4:\n+\tEFSYS_PROBE(fail4);\n+fail3:\n+\tEFSYS_PROBE(fail3);\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_proxy_auth_set_privilege_mask(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t vf_index,\n+\t__in\t\tuint32_t mask,\n+\t__in\t\tuint32_t value)\n+{\n+\treturn (efx_mcdi_privilege_mask_set(enp, vf_index,\n+\t\t\tmask, value));\n+}\n+\n+static\t__checkReturn\tefx_rc_t\n+efx_mcdi_proxy_complete(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t fn_index,\n+\t__in\t\tuint32_t proxy_result,\n+\t__in\t\tuint32_t handle)\n+{\n+\tEFX_MCDI_DECLARE_BUF(payload, MC_CMD_PROXY_COMPLETE_IN_LEN,\n+\t\tMC_CMD_PROXY_COMPLETE_OUT_LEN);\n+\tefx_mcdi_req_t req;\n+\tefx_rc_t rc;\n+\n+\treq.emr_cmd = MC_CMD_PROXY_COMPLETE;\n+\treq.emr_in_buf = payload;\n+\treq.emr_in_length = MC_CMD_PROXY_COMPLETE_IN_LEN;\n+\treq.emr_out_buf = payload;\n+\treq.emr_out_length = MC_CMD_PROXY_COMPLETE_OUT_LEN;\n+\n+\tMCDI_IN_SET_DWORD(req, PROXY_COMPLETE_IN_BLOCK_INDEX, fn_index);\n+\tMCDI_IN_SET_DWORD(req, PROXY_COMPLETE_IN_STATUS, proxy_result);\n+\tMCDI_IN_SET_DWORD(req, PROXY_COMPLETE_IN_HANDLE, handle);\n+\n+\tefx_mcdi_execute(enp, &req);\n+\n+\tif (req.emr_rc != 0) {\n+\t\trc = req.emr_rc;\n+\t\tgoto fail1;\n+\t}\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+ef10_proxy_auth_complete_request(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t fn_index,\n+\t__in\t\tuint32_t proxy_result,\n+\t__in\t\tuint32_t handle)\n+{\n+\treturn (efx_mcdi_proxy_complete(enp, fn_index,\n+\t\t\tproxy_result, handle));\n+}\n+\n+static\t__checkReturn\t\t\tefx_rc_t\n+efx_mcdi_proxy_cmd(\n+\t__in\t\t\t\tefx_nic_t *enp,\n+\t__in\t\t\t\tuint32_t pf_index,\n+\t__in\t\t\t\tuint32_t vf_index,\n+\t__in_bcount(request_size)\tuint8_t *request_bufferp,\n+\t__in\t\t\t\tsize_t request_size,\n+\t__out_bcount(response_size)\tuint8_t *response_bufferp,\n+\t__in\t\t\t\tsize_t response_size,\n+\t__out_opt\t\t\tsize_t *response_size_actualp)\n+{\n+\tefx_dword_t *inbufp;\n+\tefx_mcdi_req_t req;\n+\tefx_rc_t rc;\n+\n+\tif (request_size % sizeof (*inbufp) != 0) {\n+\t\trc = EINVAL;\n+\t\tgoto fail1;\n+\t}\n+\n+\tEFSYS_KMEM_ALLOC(enp, (MC_CMD_PROXY_CMD_IN_LEN + request_size), inbufp);\n+\n+\treq.emr_cmd = MC_CMD_PROXY_CMD;\n+\treq.emr_in_buf = (uint8_t *) inbufp;\n+\treq.emr_in_length = MC_CMD_PROXY_CMD_IN_LEN + request_size;\n+\treq.emr_out_buf = response_bufferp;\n+\treq.emr_out_length = response_size;\n+\n+\tMCDI_IN_POPULATE_DWORD_2(req, PROXY_CMD_IN_TARGET,\n+\t\t PROXY_CMD_IN_TARGET_PF, pf_index,\n+\t\t PROXY_CMD_IN_TARGET_VF, vf_index);\n+\n+\t/* Proxied command should be located just after PROXY_CMD */\n+\tmemcpy(&inbufp[MC_CMD_PROXY_CMD_IN_LEN / sizeof (*inbufp)],\n+\t\trequest_bufferp, request_size);\n+\n+\tefx_mcdi_execute(enp, &req);\n+\n+\tEFSYS_KMEM_FREE(enp, (MC_CMD_PROXY_CMD_IN_LEN + request_size), inbufp);\n+\tif (req.emr_rc != 0) {\n+\t\trc = req.emr_rc;\n+\t\tgoto fail2;\n+\t}\n+\n+\tif (response_size_actualp != NULL)\n+\t\t*response_size_actualp = req.emr_out_length_used;\n+\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_proxy_auth_exec_cmd(\n+\t__in\t\tefx_nic_t *enp,\n+\t__inout\t\tefx_proxy_cmd_params_t *paramsp)\n+{\n+\treturn (efx_mcdi_proxy_cmd(enp, paramsp->pf_index, paramsp->vf_index,\n+\t\t\tparamsp->request_bufferp, paramsp->request_size,\n+\t\t\tparamsp->response_bufferp, paramsp->response_size,\n+\t\t\tparamsp->response_size_actualp));\n+}\n #endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */\ndiff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h\nindex 97c4e62..e43302a 100644\n--- a/drivers/net/sfc/base/efx.h\n+++ b/drivers/net/sfc/base/efx.h\n@@ -3434,6 +3434,16 @@ extern\t__checkReturn\t__success(return != B_FALSE)\tboolean_t\n \tuint32_t\thandled_privileges;\n } efx_proxy_auth_config_t;\n \n+typedef struct efx_proxy_cmd_params_s {\n+\tuint32_t\tpf_index;\n+\tuint32_t\tvf_index;\n+\tuint8_t\t\t*request_bufferp;\n+\tsize_t\t\trequest_size;\n+\tuint8_t\t\t*response_bufferp;\n+\tsize_t\t\tresponse_size;\n+\tsize_t\t\t*response_size_actualp;\n+} efx_proxy_cmd_params_t;\n+\n extern\t__checkReturn\tefx_rc_t\n efx_proxy_auth_init(\n \t__in\t\tefx_nic_t *enp);\n@@ -3452,6 +3462,25 @@ extern\t__checkReturn\t__success(return != B_FALSE)\tboolean_t\n \t__in\t\tefx_nic_t *enp,\n \t__in\t\tuint32_t handled_privileges);\n \n+\t__checkReturn\tefx_rc_t\n+efx_proxy_auth_complete_request(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t fn_index,\n+\t__in\t\tuint32_t proxy_result,\n+\t__in\t\tuint32_t handle);\n+\n+\t__checkReturn\tefx_rc_t\n+efx_proxy_auth_exec_cmd(\n+\t__in\t\tefx_nic_t *enp,\n+\t__inout\t\tefx_proxy_cmd_params_t *paramsp);\n+\n+\t__checkReturn\tefx_rc_t\n+efx_proxy_auth_set_privilege_mask(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t vf_index,\n+\t__in\t\tuint32_t mask,\n+\t__in\t\tuint32_t value);\n+\n #endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */\n \n #ifdef\t__cplusplus\ndiff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h\nindex 6a8fee8..6c72166 100644\n--- a/drivers/net/sfc/base/efx_impl.h\n+++ b/drivers/net/sfc/base/efx_impl.h\n@@ -706,6 +706,11 @@ struct efx_vswitch_s {\n \tefx_rc_t\t(*epo_disable)(efx_nic_t *);\n \tefx_rc_t\t(*epo_privilege_modify)(efx_nic_t *, uint32_t, uint32_t,\n \t\t\t\t\tuint32_t, uint32_t, uint32_t);\n+\tefx_rc_t\t(*epo_set_privilege_mask)(efx_nic_t *, uint32_t,\n+\t\t\t\t\tuint32_t, uint32_t);\n+\tefx_rc_t\t(*epo_complete_request)(efx_nic_t *, uint32_t,\n+\t\t\t\t\tuint32_t, uint32_t);\n+\tefx_rc_t\t(*epo_exec_cmd)(efx_nic_t *, efx_proxy_cmd_params_t *);\n } efx_proxy_ops_t;\n \n #endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */\ndiff --git a/drivers/net/sfc/base/efx_mcdi.c b/drivers/net/sfc/base/efx_mcdi.c\nindex 325c2e4..e840401 100644\n--- a/drivers/net/sfc/base/efx_mcdi.c\n+++ b/drivers/net/sfc/base/efx_mcdi.c\n@@ -360,7 +360,11 @@\n \t\trc = EIO;\n \t\tgoto fail1;\n \t}\n+#if EFSYS_OPT_MCDI_PROXY_AUTH_SERVER\n+\tif (((cmd != emrp->emr_cmd) && (emrp->emr_cmd != MC_CMD_PROXY_CMD)) ||\n+#else\n \tif ((cmd != emrp->emr_cmd) ||\n+#endif\n \t (seq != ((emip->emi_seq - 1) & EFX_MASK32(MCDI_HEADER_SEQ)))) {\n \t\t/* Response is for a different request */\n \t\trc = EIO;\n@@ -442,6 +446,11 @@\n \tefx_dword_t hdr[2];\n \tunsigned int hdr_len;\n \tsize_t bytes;\n+\tunsigned int resp_off;\n+#if EFSYS_OPT_MCDI_PROXY_AUTH_SERVER\n+\tunsigned int resp_cmd;\n+\tboolean_t proxied_cmd_resp = B_FALSE;\n+#endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */\n \n \tif (emrp->emr_out_buf == NULL)\n \t\treturn;\n@@ -456,14 +465,35 @@\n \t\t */\n \t\tefx_mcdi_read_response(enp, &hdr[1], hdr_len, sizeof (hdr[1]));\n \t\thdr_len += sizeof (hdr[1]);\n+\t\tresp_off = hdr_len;\n \n \t\temrp->emr_out_length_used = EFX_DWORD_FIELD(hdr[1],\n-\t\t\t\t\t MC_CMD_V2_EXTN_IN_ACTUAL_LEN);\n+\t\t\t\t\t\tMC_CMD_V2_EXTN_IN_ACTUAL_LEN);\n+#if EFSYS_OPT_MCDI_PROXY_AUTH_SERVER\n+\t\t/*\n+\t\t * A proxy MCDI command is executed by PF on behalf of\n+\t\t * one of its VFs. The command to be proxied follows\n+\t\t * immediately afterward in the host buffer.\n+\t\t * PROXY_CMD inner call complete response should be copied to\n+\t\t * output buffer so that it can be returned to the requesting\n+\t\t * function in MC_CMD_PROXY_COMPLETE payload.\n+\t\t */\n+\t\tresp_cmd =\n+\t\t\tEFX_DWORD_FIELD(hdr[1], MC_CMD_V2_EXTN_IN_EXTENDED_CMD);\n+\t\tproxied_cmd_resp = ((emrp->emr_cmd == MC_CMD_PROXY_CMD) &&\n+\t\t\t\t\t(resp_cmd != MC_CMD_PROXY_CMD));\n+\t\tif (proxied_cmd_resp) {\n+\t\t\tresp_off = 0;\n+\t\t\temrp->emr_out_length_used += hdr_len;\n+\t\t}\n+#endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */\n+\t} else {\n+\t\tresp_off = hdr_len;\n \t}\n \n \t/* Copy payload out into caller supplied buffer */\n \tbytes = MIN(emrp->emr_out_length_used, emrp->emr_out_length);\n-\tefx_mcdi_read_response(enp, emrp->emr_out_buf, hdr_len, bytes);\n+\tefx_mcdi_read_response(enp, emrp->emr_out_buf, resp_off, bytes);\n \n #if EFSYS_OPT_MCDI_LOGGING\n \tif (emtp->emt_logger != NULL) {\ndiff --git a/drivers/net/sfc/base/efx_mcdi.h b/drivers/net/sfc/base/efx_mcdi.h\nindex 56c0ab1..74cde50 100644\n--- a/drivers/net/sfc/base/efx_mcdi.h\n+++ b/drivers/net/sfc/base/efx_mcdi.h\n@@ -31,7 +31,7 @@ struct efx_mcdi_req_s {\n \tunsigned int\temr_cmd;\n \tuint8_t\t\t*emr_in_buf;\n \tsize_t\t\temr_in_length;\n-\t/* Outputs: retcode, buffer, length, and length used */\n+\t/* Outputs: retcode, buffer, length and length used */\n \tefx_rc_t\temr_rc;\n \tuint8_t\t\t*emr_out_buf;\n \tsize_t\t\temr_out_length;\ndiff --git a/drivers/net/sfc/base/efx_proxy.c b/drivers/net/sfc/base/efx_proxy.c\nindex 6aadf07..b04e7dd 100644\n--- a/drivers/net/sfc/base/efx_proxy.c\n+++ b/drivers/net/sfc/base/efx_proxy.c\n@@ -16,6 +16,9 @@\n \tNULL,\t\t\t/* epo_mc_config */\n \tNULL,\t\t\t/* epo_disable */\n \tNULL,\t\t\t/* epo_privilege_modify */\n+\tNULL,\t\t\t/* epo_set_privilege_mask */\n+\tNULL,\t\t\t/* epo_complete_request */\n+\tNULL,\t\t\t/* epo_exec_cmd */\n };\n #endif /* EFSYS_OPT_SIENA */\n \n@@ -26,6 +29,9 @@\n \tef10_proxy_auth_mc_config,\t\t/* epo_mc_config */\n \tef10_proxy_auth_disable,\t\t/* epo_disable */\n \tef10_proxy_auth_privilege_modify,\t/* epo_privilege_modify */\n+\tef10_proxy_auth_set_privilege_mask,\t/* epo_set_privilege_mask */\n+\tef10_proxy_auth_complete_request,\t/* epo_complete_request */\n+\tef10_proxy_auth_exec_cmd,\t\t/* epo_exec_cmd */\n };\n #endif /* EFSYS_OPT_HUNTINGTON || EFSYS_OPT_MEDFORD || EFSYS_OPT_MEDFORD2 */\n \n@@ -197,4 +203,98 @@\n \treturn (rc);\n }\n \n+\t__checkReturn\tefx_rc_t\n+efx_proxy_auth_complete_request(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t fn_index,\n+\t__in\t\tuint32_t proxy_result,\n+\t__in\t\tuint32_t handle)\n+{\n+\tconst efx_proxy_ops_t *epop = enp->en_epop;\n+\tefx_rc_t rc;\n+\n+\tEFSYS_ASSERT(enp->en_mod_flags & EFX_MOD_PROXY);\n+\n+\tif (epop->epo_complete_request == NULL) {\n+\t\trc = ENOTSUP;\n+\t\tgoto fail1;\n+\t}\n+\n+\trc = epop->epo_complete_request(enp, fn_index, proxy_result, handle);\n+\tif (rc != 0)\n+\t\tgoto fail2;\n+\n+\treturn (0);\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+efx_proxy_auth_exec_cmd(\n+\t__in\t\tefx_nic_t *enp,\n+\t__inout\t\tefx_proxy_cmd_params_t *paramsp)\n+{\n+\tconst efx_proxy_ops_t *epop = enp->en_epop;\n+\tefx_rc_t rc;\n+\n+\tEFSYS_ASSERT(enp->en_mod_flags & EFX_MOD_PROXY);\n+\n+\tif (paramsp == NULL) {\n+\t\trc = EINVAL;\n+\t\tgoto fail1;\n+\t}\n+\n+\tif (epop->epo_exec_cmd == NULL) {\n+\t\trc = ENOTSUP;\n+\t\tgoto fail2;\n+\t}\n+\n+\trc = epop->epo_exec_cmd(enp, paramsp);\n+\tif (rc != 0)\n+\t\tgoto fail3;\n+\n+\treturn (0);\n+fail3:\n+\tEFSYS_PROBE(fail3);\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+efx_proxy_auth_set_privilege_mask(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t vf_index,\n+\t__in\t\tuint32_t mask,\n+\t__in\t\tuint32_t value)\n+{\n+\tconst efx_proxy_ops_t *epop = enp->en_epop;\n+\tefx_rc_t rc;\n+\n+\tEFSYS_ASSERT(enp->en_mod_flags & EFX_MOD_PROXY);\n+\n+\tif (epop->epo_set_privilege_mask == NULL) {\n+\t\trc = ENOTSUP;\n+\t\tgoto fail1;\n+\t}\n+\n+\trc = epop->epo_set_privilege_mask(enp, vf_index, mask, value);\n+\tif (rc != 0)\n+\t\tgoto fail2;\n+\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+\n #endif /* EFSYS_OPT_MCDI_PROXY_AUTH_SERVER */\n", "prefixes": [ "26/29" ] }