Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/76888/?format=api
{ "id": 76888, "url": "http://patches.dpdk.org/api/patches/76888/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1599556475-27820-6-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": "<1599556475-27820-6-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1599556475-27820-6-git-send-email-arybchenko@solarflare.com", "date": "2020-09-08T09:14:25", "name": "[04/14] net/sfc: move MCDI helper interface to dedicated namespace", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b77e148e38e3576d9c6deb9ab6e2155bfc7dc8a0", "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/1599556475-27820-6-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 12014, "url": "http://patches.dpdk.org/api/series/12014/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12014", "date": "2020-09-08T09:14:20", "name": "net/sfc: factor out common driver library", "version": 1, "mbox": "http://patches.dpdk.org/series/12014/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/76888/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/76888/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 180ADA04AA;\n\tTue, 8 Sep 2020 11:16:22 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 10BD31C116;\n\tTue, 8 Sep 2020 11:15:50 +0200 (CEST)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id C810D1C10A\n for <dev@dpdk.org>; Tue, 8 Sep 2020 11:15:48 +0200 (CEST)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.150])\n by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id\n C77D1200B7 for <dev@dpdk.org>; Tue, 8 Sep 2020 09:15:47 +0000 (UTC)", "from us4-mdac16-63.at1.mdlocal (unknown [10.110.50.156])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 6BC31800B7\n for <dev@dpdk.org>; Tue, 8 Sep 2020 09:15:47 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.110.50.12])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n CB590100109\n for <dev@dpdk.org>; Tue, 8 Sep 2020 09:14:54 +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 7F6784005E\n for <dev@dpdk.org>; Tue, 8 Sep 2020 09:14:54 +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; Tue, 8 Sep 2020 10:14:49 +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; Tue, 8 Sep 2020 10:14:49 +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 0889EnRC032413\n for <dev@dpdk.org>; Tue, 8 Sep 2020 10:14:49 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 5B3541613AB\n for <dev@dpdk.org>; Tue, 8 Sep 2020 10:14:49 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Tue, 8 Sep 2020 10:14:25 +0100", "Message-ID": "<1599556475-27820-6-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1599556475-27820-1-git-send-email-arybchenko@solarflare.com>", "References": "<1599556475-27820-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-25652.003", "X-TM-AS-Result": "No-7.242100-8.000000-10", "X-TMASE-MatchedRID": "j2pOm8rChFuy9Uh/U28aL8mR5yDJkPg4SWg+u4ir2NOx6d2WO4Kt3eZ5\n Gn23AeDZ8XVI39JCRnRuL3ESIrARlyHhSBQfglfsA9lly13c/gGVKmGUZ/Wnkf3ZlZEIBuK0ZSg\n PkksZfMCp5lIcUsiQ21CTGkEP+yMkT7Z+FYI5UyHknMSTG9lH+J7B58V0nMeKqPGqHIPGZiPSJJ\n cbp1Y+Wyv4WWlvjvWfYVCjcmRetW6Zka9ZOnvpYBcr91Fo5aW9GKyJtpoUCGYcCkgotCl7hM1qk\n z3j5LNsoPnutf4cqxVm1hdnVK4ua+BheOk5tfVp2Hlwa3CYC+T54F/2i/DwjQpCjqVELlwVgNs3\n amZ3AUPVy1G1jO4I4qVV+UYNOXSTQ9tg+p38ZomeAiCmPx4NwBnUJ0Ek6yhjxEHRux+uk8jHUU+\n U0ACZwDE63HM+4BUVvn9bsecRAaJAgzJhU+Pa36MxiyOOeSw4nqg/VrSZEiM=", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--7.242100-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25652.003", "X-MDID": "1599556547-l3Ic-bv_L6L4", "Subject": "[dpdk-dev] [PATCH 04/14] net/sfc: move MCDI helper interface to\n\tdedicated namespace", "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": "MCDI helpers will be moved to common/sfc_efx and it is better\nto do dummy renamings first before non-trivial changes.\n\nExisting functionality should be split into common and network\ndriver specific parts. Prepare to do it.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/net/sfc/sfc.h | 5 +-\n drivers/net/sfc/sfc_mcdi.c | 108 +++++++++++++++++++++----------------\n drivers/net/sfc/sfc_mcdi.h | 22 +++-----\n 3 files changed, 73 insertions(+), 62 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex a530b12a8e..b3ac752334 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -220,7 +220,7 @@ struct sfc_adapter {\n \trte_spinlock_t\t\t\tnic_lock;\n \trte_atomic32_t\t\t\trestart_required;\n \n-\tstruct sfc_mcdi\t\t\tmcdi;\n+\tstruct sfc_efx_mcdi\t\tmcdi;\n \tstruct sfc_intr\t\t\tintr;\n \tstruct sfc_port\t\t\tport;\n \tstruct sfc_filter\t\tfilter;\n@@ -366,6 +366,9 @@ void sfc_stop(struct sfc_adapter *sa);\n \n void sfc_schedule_restart(struct sfc_adapter *sa);\n \n+int sfc_mcdi_init(struct sfc_adapter *sa);\n+void sfc_mcdi_fini(struct sfc_adapter *sa);\n+\n int sfc_configure(struct sfc_adapter *sa);\n void sfc_close(struct sfc_adapter *sa);\n \ndiff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c\nindex 9a51b3e030..c97a33d558 100644\n--- a/drivers/net/sfc/sfc_mcdi.c\n+++ b/drivers/net/sfc/sfc_mcdi.c\n@@ -19,12 +19,12 @@\n #include \"sfc_log.h\"\n #include \"sfc_ev.h\"\n \n-#define SFC_MCDI_POLL_INTERVAL_MIN_US\t10\t\t/* 10us in 1us units */\n-#define SFC_MCDI_POLL_INTERVAL_MAX_US\t(US_PER_S / 10)\t/* 100ms in 1us units */\n-#define SFC_MCDI_WATCHDOG_INTERVAL_US\t(10 * US_PER_S)\t/* 10s in 1us units */\n+#define SFC_EFX_MCDI_POLL_INTERVAL_MIN_US\t10\t\t/* 10us */\n+#define SFC_EFX_MCDI_POLL_INTERVAL_MAX_US\t(US_PER_S / 10)\t/* 100ms */\n+#define SFC_EFX_MCDI_WATCHDOG_INTERVAL_US\t(10 * US_PER_S)\t/* 10s */\n \n static void\n-sfc_mcdi_timeout(struct sfc_adapter *sa)\n+sfc_efx_mcdi_timeout(struct sfc_adapter *sa)\n {\n \tsfc_warn(sa, \"MC TIMEOUT\");\n \n@@ -32,9 +32,9 @@ sfc_mcdi_timeout(struct sfc_adapter *sa)\n }\n \n static inline boolean_t\n-sfc_mcdi_proxy_event_available(struct sfc_adapter *sa)\n+sfc_efx_mcdi_proxy_event_available(struct sfc_adapter *sa)\n {\n-\tstruct sfc_mcdi *mcdi = &sa->mcdi;\n+\tstruct sfc_efx_mcdi *mcdi = &sa->mcdi;\n \n \tmcdi->proxy_handle = 0;\n \tmcdi->proxy_result = ETIMEDOUT;\n@@ -46,7 +46,7 @@ sfc_mcdi_proxy_event_available(struct sfc_adapter *sa)\n }\n \n static void\n-sfc_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)\n+sfc_efx_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)\n {\n \tefx_nic_t *enp;\n \tunsigned int delay_total;\n@@ -54,22 +54,22 @@ sfc_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)\n \tboolean_t aborted __rte_unused;\n \n \tdelay_total = 0;\n-\tdelay_us = SFC_MCDI_POLL_INTERVAL_MIN_US;\n+\tdelay_us = SFC_EFX_MCDI_POLL_INTERVAL_MIN_US;\n \tenp = sa->nic;\n \n \tdo {\n \t\tboolean_t poll_completed;\n \n-\t\tpoll_completed = (proxy) ? sfc_mcdi_proxy_event_available(sa) :\n+\t\tpoll_completed = (proxy) ? sfc_efx_mcdi_proxy_event_available(sa) :\n \t\t\t\t\t efx_mcdi_request_poll(enp);\n \t\tif (poll_completed)\n \t\t\treturn;\n \n-\t\tif (delay_total > SFC_MCDI_WATCHDOG_INTERVAL_US) {\n+\t\tif (delay_total > SFC_EFX_MCDI_WATCHDOG_INTERVAL_US) {\n \t\t\tif (!proxy) {\n \t\t\t\taborted = efx_mcdi_request_abort(enp);\n \t\t\t\tSFC_ASSERT(aborted);\n-\t\t\t\tsfc_mcdi_timeout(sa);\n+\t\t\t\tsfc_efx_mcdi_timeout(sa);\n \t\t\t}\n \n \t\t\treturn;\n@@ -80,27 +80,28 @@ sfc_mcdi_poll(struct sfc_adapter *sa, boolean_t proxy)\n \t\tdelay_total += delay_us;\n \n \t\t/* Exponentially back off the poll frequency */\n-\t\tRTE_BUILD_BUG_ON(SFC_MCDI_POLL_INTERVAL_MAX_US > UINT_MAX / 2);\n+\t\tRTE_BUILD_BUG_ON(SFC_EFX_MCDI_POLL_INTERVAL_MAX_US >\n+\t\t\t\t UINT_MAX / 2);\n \t\tdelay_us *= 2;\n-\t\tif (delay_us > SFC_MCDI_POLL_INTERVAL_MAX_US)\n-\t\t\tdelay_us = SFC_MCDI_POLL_INTERVAL_MAX_US;\n+\t\tif (delay_us > SFC_EFX_MCDI_POLL_INTERVAL_MAX_US)\n+\t\t\tdelay_us = SFC_EFX_MCDI_POLL_INTERVAL_MAX_US;\n \n \t} while (1);\n }\n \n static void\n-sfc_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)\n+sfc_efx_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)\n {\n \tstruct sfc_adapter *sa = (struct sfc_adapter *)arg;\n-\tstruct sfc_mcdi *mcdi = &sa->mcdi;\n+\tstruct sfc_efx_mcdi *mcdi = &sa->mcdi;\n \tuint32_t proxy_handle;\n \n \trte_spinlock_lock(&mcdi->lock);\n \n-\tSFC_ASSERT(mcdi->state == SFC_MCDI_INITIALIZED);\n+\tSFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);\n \n \tefx_mcdi_request_start(sa->nic, emrp, B_FALSE);\n-\tsfc_mcdi_poll(sa, B_FALSE);\n+\tsfc_efx_mcdi_poll(sa, B_FALSE);\n \n \tif (efx_mcdi_get_proxy_handle(sa->nic, emrp, &proxy_handle) == 0) {\n \t\t/*\n@@ -109,7 +110,7 @@ sfc_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)\n \t\t * a non-zero proxy handle (should be the same as\n \t\t * the value obtained above) and operation status\n \t\t */\n-\t\tsfc_mcdi_poll(sa, B_TRUE);\n+\t\tsfc_efx_mcdi_poll(sa, B_TRUE);\n \n \t\tif ((mcdi->proxy_handle != 0) &&\n \t\t (mcdi->proxy_handle != proxy_handle)) {\n@@ -121,7 +122,7 @@ sfc_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)\n \t\t\t * request and poll for an ordinary MCDI response\n \t\t\t */\n \t\t\tefx_mcdi_request_start(sa->nic, emrp, B_FALSE);\n-\t\t\tsfc_mcdi_poll(sa, B_FALSE);\n+\t\t\tsfc_efx_mcdi_poll(sa, B_FALSE);\n \t\t} else {\n \t\t\temrp->emr_rc = mcdi->proxy_result;\n \t\t\tsfc_err(sa, \"MCDI proxy authorization failed \"\n@@ -134,20 +135,20 @@ sfc_mcdi_execute(void *arg, efx_mcdi_req_t *emrp)\n }\n \n static void\n-sfc_mcdi_ev_cpl(void *arg)\n+sfc_efx_mcdi_ev_cpl(void *arg)\n {\n \tstruct sfc_adapter *sa = (struct sfc_adapter *)arg;\n-\tstruct sfc_mcdi *mcdi __rte_unused;\n+\tstruct sfc_efx_mcdi *mcdi __rte_unused;\n \n \tmcdi = &sa->mcdi;\n-\tSFC_ASSERT(mcdi->state == SFC_MCDI_INITIALIZED);\n+\tSFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);\n \n \t/* MCDI is polled, completions are not expected */\n \tSFC_ASSERT(0);\n }\n \n static void\n-sfc_mcdi_exception(void *arg, efx_mcdi_exception_t eme)\n+sfc_efx_mcdi_exception(void *arg, efx_mcdi_exception_t eme)\n {\n \tstruct sfc_adapter *sa = (struct sfc_adapter *)arg;\n \n@@ -161,7 +162,7 @@ sfc_mcdi_exception(void *arg, efx_mcdi_exception_t eme)\n #define SFC_MCDI_LOG_BUF_SIZE\t128\n \n static size_t\n-sfc_mcdi_do_log(const struct sfc_adapter *sa,\n+sfc_efx_mcdi_do_log(const struct sfc_adapter *sa,\n \t\tchar *buffer, void *data, size_t data_size,\n \t\tsize_t pfxsize, size_t position)\n {\n@@ -190,7 +191,7 @@ sfc_mcdi_do_log(const struct sfc_adapter *sa,\n }\n \n static void\n-sfc_mcdi_logger(void *arg, efx_log_msg_t type,\n+sfc_efx_mcdi_logger(void *arg, efx_log_msg_t type,\n \t\tvoid *header, size_t header_size,\n \t\tvoid *data, size_t data_size)\n {\n@@ -215,9 +216,10 @@ sfc_mcdi_logger(void *arg, efx_log_msg_t type,\n \tpfxsize = snprintf(buffer, sizeof(buffer), \"MCDI RPC %s:\",\n \t\t\t type == EFX_LOG_MCDI_REQUEST ? \"REQ\" :\n \t\t\t type == EFX_LOG_MCDI_RESPONSE ? \"RESP\" : \"???\");\n-\tstart = sfc_mcdi_do_log(sa, buffer, header, header_size,\n-\t\t\t\tpfxsize, pfxsize);\n-\tstart = sfc_mcdi_do_log(sa, buffer, data, data_size, pfxsize, start);\n+\tstart = sfc_efx_mcdi_do_log(sa, buffer, header, header_size,\n+\t\t\t\t pfxsize, pfxsize);\n+\tstart = sfc_efx_mcdi_do_log(sa, buffer, data, data_size,\n+\t\t\t\t pfxsize, start);\n \tif (start != pfxsize) {\n \t\tbuffer[start] = '\\0';\n \t\tsfc_log_mcdi(sa, \"%s\", buffer);\n@@ -225,19 +227,19 @@ sfc_mcdi_logger(void *arg, efx_log_msg_t type,\n }\n \n static void\n-sfc_mcdi_ev_proxy_response(void *arg, uint32_t handle, efx_rc_t result)\n+sfc_efx_mcdi_ev_proxy_response(void *arg, uint32_t handle, efx_rc_t result)\n {\n \tstruct sfc_adapter *sa = (struct sfc_adapter *)arg;\n-\tstruct sfc_mcdi *mcdi = &sa->mcdi;\n+\tstruct sfc_efx_mcdi *mcdi = &sa->mcdi;\n \n \tmcdi->proxy_handle = handle;\n \tmcdi->proxy_result = result;\n }\n \n-int\n-sfc_mcdi_init(struct sfc_adapter *sa)\n+static int\n+sfc_efx_mcdi_init(struct sfc_adapter *sa)\n {\n-\tstruct sfc_mcdi *mcdi;\n+\tstruct sfc_efx_mcdi *mcdi;\n \tsize_t max_msg_size;\n \tefx_mcdi_transport_t *emtp;\n \tint rc;\n@@ -246,11 +248,11 @@ sfc_mcdi_init(struct sfc_adapter *sa)\n \n \tmcdi = &sa->mcdi;\n \n-\tSFC_ASSERT(mcdi->state == SFC_MCDI_UNINITIALIZED);\n+\tSFC_ASSERT(mcdi->state == SFC_EFX_MCDI_UNINITIALIZED);\n \n \trte_spinlock_init(&mcdi->lock);\n \n-\tmcdi->state = SFC_MCDI_INITIALIZED;\n+\tmcdi->state = SFC_EFX_MCDI_INITIALIZED;\n \n \tmax_msg_size = sizeof(uint32_t) + MCDI_CTL_SDU_LEN_MAX_V2;\n \trc = sfc_dma_alloc(sa, \"mcdi\", 0, max_msg_size, sa->socket_id,\n@@ -265,11 +267,11 @@ sfc_mcdi_init(struct sfc_adapter *sa)\n \temtp = &mcdi->transport;\n \temtp->emt_context = sa;\n \temtp->emt_dma_mem = &mcdi->mem;\n-\temtp->emt_execute = sfc_mcdi_execute;\n-\temtp->emt_ev_cpl = sfc_mcdi_ev_cpl;\n-\temtp->emt_exception = sfc_mcdi_exception;\n-\temtp->emt_logger = sfc_mcdi_logger;\n-\temtp->emt_ev_proxy_response = sfc_mcdi_ev_proxy_response;\n+\temtp->emt_execute = sfc_efx_mcdi_execute;\n+\temtp->emt_ev_cpl = sfc_efx_mcdi_ev_cpl;\n+\temtp->emt_exception = sfc_efx_mcdi_exception;\n+\temtp->emt_logger = sfc_efx_mcdi_logger;\n+\temtp->emt_ev_proxy_response = sfc_efx_mcdi_ev_proxy_response;\n \n \tsfc_log_init(sa, \"init MCDI\");\n \trc = efx_mcdi_init(sa->nic, emtp);\n@@ -283,14 +285,14 @@ sfc_mcdi_init(struct sfc_adapter *sa)\n \tsfc_dma_free(sa, &mcdi->mem);\n \n fail_dma_alloc:\n-\tmcdi->state = SFC_MCDI_UNINITIALIZED;\n+\tmcdi->state = SFC_EFX_MCDI_UNINITIALIZED;\n \treturn rc;\n }\n \n-void\n-sfc_mcdi_fini(struct sfc_adapter *sa)\n+static void\n+sfc_efx_mcdi_fini(struct sfc_adapter *sa)\n {\n-\tstruct sfc_mcdi *mcdi;\n+\tstruct sfc_efx_mcdi *mcdi;\n \tefx_mcdi_transport_t *emtp;\n \n \tsfc_log_init(sa, \"entry\");\n@@ -300,8 +302,8 @@ sfc_mcdi_fini(struct sfc_adapter *sa)\n \n \trte_spinlock_lock(&mcdi->lock);\n \n-\tSFC_ASSERT(mcdi->state == SFC_MCDI_INITIALIZED);\n-\tmcdi->state = SFC_MCDI_UNINITIALIZED;\n+\tSFC_ASSERT(mcdi->state == SFC_EFX_MCDI_INITIALIZED);\n+\tmcdi->state = SFC_EFX_MCDI_UNINITIALIZED;\n \n \tsfc_log_init(sa, \"fini MCDI\");\n \tefx_mcdi_fini(sa->nic);\n@@ -311,3 +313,15 @@ sfc_mcdi_fini(struct sfc_adapter *sa)\n \n \tsfc_dma_free(sa, &mcdi->mem);\n }\n+\n+int\n+sfc_mcdi_init(struct sfc_adapter *sa)\n+{\n+\treturn sfc_efx_mcdi_init(sa);\n+}\n+\n+void\n+sfc_mcdi_fini(struct sfc_adapter *sa)\n+{\n+\tsfc_efx_mcdi_fini(sa);\n+}\ndiff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h\nindex 789a16d8bb..10f5bab666 100644\n--- a/drivers/net/sfc/sfc_mcdi.h\n+++ b/drivers/net/sfc/sfc_mcdi.h\n@@ -22,31 +22,25 @@\n extern \"C\" {\n #endif\n \n-enum sfc_mcdi_state {\n-\tSFC_MCDI_UNINITIALIZED = 0,\n-\tSFC_MCDI_INITIALIZED,\n-\tSFC_MCDI_BUSY,\n-\tSFC_MCDI_COMPLETED,\n+enum sfc_efx_mcdi_state {\n+\tSFC_EFX_MCDI_UNINITIALIZED = 0,\n+\tSFC_EFX_MCDI_INITIALIZED,\n+\tSFC_EFX_MCDI_BUSY,\n+\tSFC_EFX_MCDI_COMPLETED,\n \n-\tSFC_MCDI_NSTATES\n+\tSFC_EFX_MCDI_NSTATES\n };\n \n-struct sfc_mcdi {\n+struct sfc_efx_mcdi {\n \trte_spinlock_t\t\t\tlock;\n \tefsys_mem_t\t\t\tmem;\n-\tenum sfc_mcdi_state\t\tstate;\n+\tenum sfc_efx_mcdi_state\t\tstate;\n \tefx_mcdi_transport_t\t\ttransport;\n \tuint32_t\t\t\tlogtype;\n \tuint32_t\t\t\tproxy_handle;\n \tefx_rc_t\t\t\tproxy_result;\n };\n \n-\n-struct sfc_adapter;\n-\n-int sfc_mcdi_init(struct sfc_adapter *sa);\n-void sfc_mcdi_fini(struct sfc_adapter *sa);\n-\n #ifdef __cplusplus\n }\n #endif\n", "prefixes": [ "04/14" ] }