Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/35281/?format=api
{ "id": 35281, "url": "http://patches.dpdk.org/api/patches/35281/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1519112078-20113-49-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": "<1519112078-20113-49-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1519112078-20113-49-git-send-email-arybchenko@solarflare.com", "date": "2018-02-20T07:34:06", "name": "[dpdk-dev,48/80] net/sfc/base: move port config to ef10 NIC board config", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "0cee31b500d3232ecf6d25afb3f91aae6e5695f5", "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/1519112078-20113-49-git-send-email-arybchenko@solarflare.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/35281/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/35281/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 B4BB61B40E;\n\tTue, 20 Feb 2018 08:36:12 +0100 (CET)", "from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com\n\t[67.231.154.164]) by dpdk.org (Postfix) with ESMTP id C46E61B305\n\tfor <dev@dpdk.org>; Tue, 20 Feb 2018 08:35:42 +0100 (CET)", "from webmail.solarflare.com (webmail.solarflare.com\n\t[12.187.104.26])\n\t(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1-us1.ppe-hosted.com (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id\n\tB3BF5780055 for <dev@dpdk.org>; Tue, 20 Feb 2018 07:35:41 +0000 (UTC)", "from sfocexch01r.SolarFlarecom.com (10.20.40.34) by\n\tocex03.SolarFlarecom.com (10.20.40.36) with Microsoft SMTP Server\n\t(TLS) id 15.0.1044.25; Mon, 19 Feb 2018 23:35:39 -0800", "from ocex03.SolarFlarecom.com (10.20.40.36) by\n\tsfocexch01r.SolarFlarecom.com (10.20.40.34) with Microsoft SMTP\n\tServer (TLS) id 15.0.1044.25; Mon, 19 Feb 2018 23:35:15 -0800", "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.1044.25 via Frontend Transport; Mon, 19 Feb 2018 23:35:15 -0800", "from uklogin.uk.solarflarecom.com (uklogin.uk.solarflarecom.com\n\t[10.17.10.10])\n\tby opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tw1K7ZEZD025131; Tue, 20 Feb 2018 07:35:14 GMT", "from uklogin.uk.solarflarecom.com (localhost.localdomain\n\t[127.0.0.1])\n\tby uklogin.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id\n\tw1K7ZBu0020529; Tue, 20 Feb 2018 07:35:14 GMT" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Andy Moreton <amoreton@solarflare.com>", "Date": "Tue, 20 Feb 2018 07:34:06 +0000", "Message-ID": "<1519112078-20113-49-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.2.3", "In-Reply-To": "<1519112078-20113-1-git-send-email-arybchenko@solarflare.com>", "References": "<1519112078-20113-1-git-send-email-arybchenko@solarflare.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-MDID": "1519112142-JjBsWZWGHYeT", "Subject": "[dpdk-dev] [PATCH 48/80] net/sfc/base: move port config to ef10 NIC\n\tboard config", "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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/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: Andy Moreton <amoreton@solarflare.com>\n\nSigned-off-by: Andy Moreton <amoreton@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_impl.h | 5 ----\n drivers/net/sfc/base/ef10_nic.c | 23 +++++++++++++++++--\n drivers/net/sfc/base/hunt_nic.c | 46 +++++++++++--------------------------\n drivers/net/sfc/base/medford2_nic.c | 41 ++++++++++-----------------------\n drivers/net/sfc/base/medford_nic.c | 44 ++++++++++-------------------------\n 5 files changed, 58 insertions(+), 101 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h\nindex e598a9a..4a50955 100644\n--- a/drivers/net/sfc/base/ef10_impl.h\n+++ b/drivers/net/sfc/base/ef10_impl.h\n@@ -1175,11 +1175,6 @@ ef10_get_privilege_mask(\n \t__in\t\t\tefx_nic_t *enp,\n \t__out\t\t\tuint32_t *maskp);\n \n-extern\t__checkReturn\tefx_rc_t\n-ef10_external_port_mapping(\n-\t__in\t\tefx_nic_t *enp,\n-\t__in\t\tuint32_t port,\n-\t__out\t\tuint8_t *external_portp);\n \n #if EFSYS_OPT_RX_PACKED_STREAM\n \ndiff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c\nindex b315e9f..c63aad8 100644\n--- a/drivers/net/sfc/base/ef10_nic.c\n+++ b/drivers/net/sfc/base/ef10_nic.c\n@@ -1467,7 +1467,7 @@ static struct ef10_external_port_map_s {\n \t},\n };\n \n-\t__checkReturn\tefx_rc_t\n+static\t__checkReturn\tefx_rc_t\n ef10_external_port_mapping(\n \t__in\t\tefx_nic_t *enp,\n \t__in\t\tuint32_t port,\n@@ -1546,14 +1546,33 @@ ef10_nic_board_cfg(\n \t__in\t\tefx_nic_t *enp)\n {\n \tconst efx_nic_ops_t *enop = enp->en_enop;\n+\tefx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);\n+\tefx_nic_cfg_t *encp = &(enp->en_nic_cfg);\n+\tuint32_t port;\n \tefx_rc_t rc;\n \n+\t/* Get the (zero-based) MCDI port number */\n+\tif ((rc = efx_mcdi_get_port_assignment(enp, &port)) != 0)\n+\t\tgoto fail1;\n+\n+\t/* EFX MCDI interface uses one-based port numbers */\n+\temip->emi_port = port + 1;\n+\n+\tif ((rc = ef10_external_port_mapping(enp, port,\n+\t\t &encp->enc_external_port)) != 0)\n+\t\tgoto fail2;\n+\n+\t/* Get remaining controller-specific board config */\n \tif ((rc = enop->eno_board_cfg(enp)) != 0)\n \t\tif (rc != EACCES)\n-\t\t\tgoto fail1;\n+\t\t\tgoto fail3;\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 \ndiff --git a/drivers/net/sfc/base/hunt_nic.c b/drivers/net/sfc/base/hunt_nic.c\nindex 903c669..0b311b6 100644\n--- a/drivers/net/sfc/base/hunt_nic.c\n+++ b/drivers/net/sfc/base/hunt_nic.c\n@@ -76,13 +76,11 @@ hunt_nic_get_required_pcie_bandwidth(\n hunt_board_cfg(\n \t__in\t\tefx_nic_t *enp)\n {\n-\tefx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);\n \tefx_nic_cfg_t *encp = &(enp->en_nic_cfg);\n \tuint8_t mac_addr[6] = { 0 };\n \tuint32_t board_type = 0;\n \tef10_link_state_t els;\n \tefx_port_t *epp = &(enp->en_port);\n-\tuint32_t port;\n \tuint32_t pf;\n \tuint32_t vf;\n \tuint32_t mask;\n@@ -102,20 +100,6 @@ hunt_board_cfg(\n \tEFX_STATIC_ASSERT(1U << EFX_VI_WINDOW_SHIFT_8K\t== 8192);\n \tencp->enc_vi_window_shift = EFX_VI_WINDOW_SHIFT_8K;\n \n-\n-\tif ((rc = efx_mcdi_get_port_assignment(enp, &port)) != 0)\n-\t\tgoto fail1;\n-\n-\t/*\n-\t * NOTE: The MCDI protocol numbers ports from zero.\n-\t * The common code MCDI interface numbers ports from one.\n-\t */\n-\temip->emi_port = port + 1;\n-\n-\tif ((rc = ef10_external_port_mapping(enp, port,\n-\t\t &encp->enc_external_port)) != 0)\n-\t\tgoto fail2;\n-\n \t/*\n \t * Get PCIe function number from firmware (used for\n \t * per-function privilege and dynamic config info).\n@@ -123,7 +107,7 @@ hunt_board_cfg(\n \t * - PCIe VF: pf = parent PF, vf = VF number.\n \t */\n \tif ((rc = efx_mcdi_get_function_info(enp, &pf, &vf)) != 0)\n-\t\tgoto fail3;\n+\t\tgoto fail1;\n \n \tencp->enc_pf = pf;\n \tencp->enc_vf = vf;\n@@ -144,7 +128,7 @@ hunt_board_cfg(\n \t\trc = efx_mcdi_get_mac_address_vf(enp, mac_addr);\n \t}\n \tif (rc != 0)\n-\t\tgoto fail4;\n+\t\tgoto fail2;\n \n \tEFX_MAC_ADDR_COPY(encp->enc_mac_addr, mac_addr);\n \n@@ -155,7 +139,7 @@ hunt_board_cfg(\n \t\tif (rc == EACCES)\n \t\t\tboard_type = 0;\n \t\telse\n-\t\t\tgoto fail5;\n+\t\t\tgoto fail3;\n \t}\n \n \tencp->enc_board_type = board_type;\n@@ -163,11 +147,11 @@ hunt_board_cfg(\n \n \t/* Fill out fields in enp->en_port and enp->en_nic_cfg from MCDI */\n \tif ((rc = efx_mcdi_get_phy_cfg(enp)) != 0)\n-\t\tgoto fail6;\n+\t\tgoto fail4;\n \n \t/* Obtain the default PHY advertised capabilities */\n \tif ((rc = ef10_phy_get_link(enp, &els)) != 0)\n-\t\tgoto fail7;\n+\t\tgoto fail5;\n \tepp->ep_default_adv_cap_mask = els.els_adv_cap_mask;\n \tepp->ep_adv_cap_mask = els.els_adv_cap_mask;\n \n@@ -198,7 +182,7 @@ hunt_board_cfg(\n \telse if ((rc == ENOTSUP) || (rc == ENOENT))\n \t\tencp->enc_bug35388_workaround = B_FALSE;\n \telse\n-\t\tgoto fail8;\n+\t\tgoto fail6;\n \n \t/*\n \t * If the bug41750 workaround is enabled, then do not test interrupts,\n@@ -217,7 +201,7 @@ hunt_board_cfg(\n \t} else if ((rc == ENOTSUP) || (rc == ENOENT)) {\n \t\tencp->enc_bug41750_workaround = B_FALSE;\n \t} else {\n-\t\tgoto fail9;\n+\t\tgoto fail7;\n \t}\n \tif (EFX_PCI_FUNCTION_IS_VF(encp)) {\n \t\t/* Interrupt testing does not work for VFs. See bug50084. */\n@@ -255,12 +239,12 @@ hunt_board_cfg(\n \t} else if ((rc == ENOTSUP) || (rc == ENOENT)) {\n \t\tencp->enc_bug26807_workaround = B_FALSE;\n \t} else {\n-\t\tgoto fail10;\n+\t\tgoto fail8;\n \t}\n \n \t/* Get clock frequencies (in MHz). */\n \tif ((rc = efx_mcdi_get_clock(enp, &sysclk, &dpcpu_clk)) != 0)\n-\t\tgoto fail11;\n+\t\tgoto fail9;\n \n \t/*\n \t * The Huntington timer quantum is 1536 sysclk cycles, documented for\n@@ -279,7 +263,7 @@ hunt_board_cfg(\n \n \t/* Check capabilities of running datapath firmware */\n \tif ((rc = ef10_get_datapath_caps(enp)) != 0)\n-\t\tgoto fail12;\n+\t\tgoto fail10;\n \n \t/* Alignment for receive packet DMA buffers */\n \tencp->enc_rx_buf_align_start = 1;\n@@ -329,13 +313,13 @@ hunt_board_cfg(\n \t * can result in time-of-check/time-of-use bugs.\n \t */\n \tif ((rc = ef10_get_privilege_mask(enp, &mask)) != 0)\n-\t\tgoto fail13;\n+\t\tgoto fail11;\n \tencp->enc_privilege_mask = mask;\n \n \t/* Get interrupt vector limits */\n \tif ((rc = efx_mcdi_get_vector_cfg(enp, &base, &nvec, NULL)) != 0) {\n \t\tif (EFX_PCI_FUNCTION_IS_PF(encp))\n-\t\t\tgoto fail14;\n+\t\t\tgoto fail12;\n \n \t\t/* Ignore error (cannot query vector limits from a VF). */\n \t\tbase = 0;\n@@ -351,7 +335,7 @@ hunt_board_cfg(\n \tencp->enc_tx_tso_tcp_header_offset_limit = EF10_TCP_HEADER_OFFSET_LIMIT;\n \n \tif ((rc = hunt_nic_get_required_pcie_bandwidth(enp, &bandwidth)) != 0)\n-\t\tgoto fail15;\n+\t\tgoto fail13;\n \tencp->enc_required_pcie_bandwidth_mbps = bandwidth;\n \n \t/* All Huntington devices have a PCIe Gen3, 8 lane connector */\n@@ -359,10 +343,6 @@ hunt_board_cfg(\n \n \treturn (0);\n \n-fail15:\n-\tEFSYS_PROBE(fail15);\n-fail14:\n-\tEFSYS_PROBE(fail14);\n fail13:\n \tEFSYS_PROBE(fail13);\n fail12:\ndiff --git a/drivers/net/sfc/base/medford2_nic.c b/drivers/net/sfc/base/medford2_nic.c\nindex 3bca504..0b0f775 100644\n--- a/drivers/net/sfc/base/medford2_nic.c\n+++ b/drivers/net/sfc/base/medford2_nic.c\n@@ -48,13 +48,11 @@ medford2_nic_get_required_pcie_bandwidth(\n medford2_board_cfg(\n \t__in\t\tefx_nic_t *enp)\n {\n-\tefx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);\n \tefx_nic_cfg_t *encp = &(enp->en_nic_cfg);\n \tuint8_t mac_addr[6] = { 0 };\n \tuint32_t board_type = 0;\n \tef10_link_state_t els;\n \tefx_port_t *epp = &(enp->en_port);\n-\tuint32_t port;\n \tuint32_t pf;\n \tuint32_t vf;\n \tuint32_t mask;\n@@ -78,19 +76,6 @@ medford2_board_cfg(\n \tencp->enc_vi_window_shift = vi_window_shift;\n \n \n-\tif ((rc = efx_mcdi_get_port_assignment(enp, &port)) != 0)\n-\t\tgoto fail1;\n-\n-\t/*\n-\t * NOTE: The MCDI protocol numbers ports from zero.\n-\t * The common code MCDI interface numbers ports from one.\n-\t */\n-\temip->emi_port = port + 1;\n-\n-\tif ((rc = ef10_external_port_mapping(enp, port,\n-\t\t &encp->enc_external_port)) != 0)\n-\t\tgoto fail2;\n-\n \t/*\n \t * Get PCIe function number from firmware (used for\n \t * per-function privilege and dynamic config info).\n@@ -98,7 +83,7 @@ medford2_board_cfg(\n \t * - PCIe VF: pf = parent PF, vf = VF number.\n \t */\n \tif ((rc = efx_mcdi_get_function_info(enp, &pf, &vf)) != 0)\n-\t\tgoto fail3;\n+\t\tgoto fail2;\n \n \tencp->enc_pf = pf;\n \tencp->enc_vf = vf;\n@@ -127,7 +112,7 @@ medford2_board_cfg(\n \t\trc = efx_mcdi_get_mac_address_vf(enp, mac_addr);\n \t}\n \tif (rc != 0)\n-\t\tgoto fail4;\n+\t\tgoto fail3;\n \n \tEFX_MAC_ADDR_COPY(encp->enc_mac_addr, mac_addr);\n \n@@ -138,7 +123,7 @@ medford2_board_cfg(\n \t\tif (rc == EACCES)\n \t\t\tboard_type = 0;\n \t\telse\n-\t\t\tgoto fail5;\n+\t\t\tgoto fail4;\n \t}\n \n \tencp->enc_board_type = board_type;\n@@ -146,11 +131,11 @@ medford2_board_cfg(\n \n \t/* Fill out fields in enp->en_port and enp->en_nic_cfg from MCDI */\n \tif ((rc = efx_mcdi_get_phy_cfg(enp)) != 0)\n-\t\tgoto fail6;\n+\t\tgoto fail5;\n \n \t/* Obtain the default PHY advertised capabilities */\n \tif ((rc = ef10_phy_get_link(enp, &els)) != 0)\n-\t\tgoto fail7;\n+\t\tgoto fail6;\n \tepp->ep_default_adv_cap_mask = els.els_adv_cap_mask;\n \tepp->ep_adv_cap_mask = els.els_adv_cap_mask;\n \n@@ -194,11 +179,11 @@ medford2_board_cfg(\n \telse if ((rc == ENOTSUP) || (rc == ENOENT))\n \t\tencp->enc_bug61265_workaround = B_FALSE;\n \telse\n-\t\tgoto fail8;\n+\t\tgoto fail7;\n \n \t/* Get clock frequencies (in MHz). */\n \tif ((rc = efx_mcdi_get_clock(enp, &sysclk, &dpcpu_clk)) != 0)\n-\t\tgoto fail9;\n+\t\tgoto fail8;\n \n \t/*\n \t * The Medford2 timer quantum is 1536 dpcpu_clk cycles, documented for\n@@ -210,7 +195,7 @@ medford2_board_cfg(\n \n \t/* Check capabilities of running datapath firmware */\n \tif ((rc = ef10_get_datapath_caps(enp)) != 0)\n-\t\tgoto fail10;\n+\t\tgoto fail9;\n \n \t/* Alignment for receive packet DMA buffers */\n \tencp->enc_rx_buf_align_start = 1;\n@@ -218,7 +203,7 @@ medford2_board_cfg(\n \t/* Get the RX DMA end padding alignment configuration */\n \tif ((rc = efx_mcdi_get_rxdp_config(enp, &end_padding)) != 0) {\n \t\tif (rc != EACCES)\n-\t\t\tgoto fail11;\n+\t\t\tgoto fail10;\n \n \t\t/* Assume largest tail padding size supported by hardware */\n \t\tend_padding = 256;\n@@ -270,13 +255,13 @@ medford2_board_cfg(\n \t * can result in time-of-check/time-of-use bugs.\n \t */\n \tif ((rc = ef10_get_privilege_mask(enp, &mask)) != 0)\n-\t\tgoto fail12;\n+\t\tgoto fail11;\n \tencp->enc_privilege_mask = mask;\n \n \t/* Get interrupt vector limits */\n \tif ((rc = efx_mcdi_get_vector_cfg(enp, &base, &nvec, NULL)) != 0) {\n \t\tif (EFX_PCI_FUNCTION_IS_PF(encp))\n-\t\t\tgoto fail13;\n+\t\t\tgoto fail12;\n \n \t\t/* Ignore error (cannot query vector limits from a VF). */\n \t\tbase = 0;\n@@ -299,14 +284,12 @@ medford2_board_cfg(\n \n \trc = medford2_nic_get_required_pcie_bandwidth(enp, &bandwidth);\n \tif (rc != 0)\n-\t\tgoto fail14;\n+\t\tgoto fail13;\n \tencp->enc_required_pcie_bandwidth_mbps = bandwidth;\n \tencp->enc_max_pcie_link_gen = EFX_PCIE_LINK_SPEED_GEN3;\n \n \treturn (0);\n \n-fail14:\n-\tEFSYS_PROBE(fail14);\n fail13:\n \tEFSYS_PROBE(fail13);\n fail12:\ndiff --git a/drivers/net/sfc/base/medford_nic.c b/drivers/net/sfc/base/medford_nic.c\nindex 352ae50..cac5d29 100644\n--- a/drivers/net/sfc/base/medford_nic.c\n+++ b/drivers/net/sfc/base/medford_nic.c\n@@ -46,13 +46,11 @@ medford_nic_get_required_pcie_bandwidth(\n medford_board_cfg(\n \t__in\t\tefx_nic_t *enp)\n {\n-\tefx_mcdi_iface_t *emip = &(enp->en_mcdi.em_emip);\n \tefx_nic_cfg_t *encp = &(enp->en_nic_cfg);\n \tuint8_t mac_addr[6] = { 0 };\n \tuint32_t board_type = 0;\n \tef10_link_state_t els;\n \tefx_port_t *epp = &(enp->en_port);\n-\tuint32_t port;\n \tuint32_t pf;\n \tuint32_t vf;\n \tuint32_t mask;\n@@ -77,20 +75,6 @@ medford_board_cfg(\n \tEFX_STATIC_ASSERT(1U << EFX_VI_WINDOW_SHIFT_8K\t== 8192);\n \tencp->enc_vi_window_shift = EFX_VI_WINDOW_SHIFT_8K;\n \n-\n-\tif ((rc = efx_mcdi_get_port_assignment(enp, &port)) != 0)\n-\t\tgoto fail1;\n-\n-\t/*\n-\t * NOTE: The MCDI protocol numbers ports from zero.\n-\t * The common code MCDI interface numbers ports from one.\n-\t */\n-\temip->emi_port = port + 1;\n-\n-\tif ((rc = ef10_external_port_mapping(enp, port,\n-\t\t &encp->enc_external_port)) != 0)\n-\t\tgoto fail2;\n-\n \t/*\n \t * Get PCIe function number from firmware (used for\n \t * per-function privilege and dynamic config info).\n@@ -98,7 +82,7 @@ medford_board_cfg(\n \t * - PCIe VF: pf = parent PF, vf = VF number.\n \t */\n \tif ((rc = efx_mcdi_get_function_info(enp, &pf, &vf)) != 0)\n-\t\tgoto fail3;\n+\t\tgoto fail1;\n \n \tencp->enc_pf = pf;\n \tencp->enc_vf = vf;\n@@ -127,7 +111,7 @@ medford_board_cfg(\n \t\trc = efx_mcdi_get_mac_address_vf(enp, mac_addr);\n \t}\n \tif (rc != 0)\n-\t\tgoto fail4;\n+\t\tgoto fail2;\n \n \tEFX_MAC_ADDR_COPY(encp->enc_mac_addr, mac_addr);\n \n@@ -138,7 +122,7 @@ medford_board_cfg(\n \t\tif (rc == EACCES)\n \t\t\tboard_type = 0;\n \t\telse\n-\t\t\tgoto fail5;\n+\t\t\tgoto fail3;\n \t}\n \n \tencp->enc_board_type = board_type;\n@@ -146,11 +130,11 @@ medford_board_cfg(\n \n \t/* Fill out fields in enp->en_port and enp->en_nic_cfg from MCDI */\n \tif ((rc = efx_mcdi_get_phy_cfg(enp)) != 0)\n-\t\tgoto fail6;\n+\t\tgoto fail4;\n \n \t/* Obtain the default PHY advertised capabilities */\n \tif ((rc = ef10_phy_get_link(enp, &els)) != 0)\n-\t\tgoto fail7;\n+\t\tgoto fail5;\n \tepp->ep_default_adv_cap_mask = els.els_adv_cap_mask;\n \tepp->ep_adv_cap_mask = els.els_adv_cap_mask;\n \n@@ -194,11 +178,11 @@ medford_board_cfg(\n \telse if ((rc == ENOTSUP) || (rc == ENOENT))\n \t\tencp->enc_bug61265_workaround = B_FALSE;\n \telse\n-\t\tgoto fail8;\n+\t\tgoto fail6;\n \n \t/* Get clock frequencies (in MHz). */\n \tif ((rc = efx_mcdi_get_clock(enp, &sysclk, &dpcpu_clk)) != 0)\n-\t\tgoto fail9;\n+\t\tgoto fail7;\n \n \t/*\n \t * The Medford timer quantum is 1536 dpcpu_clk cycles, documented for\n@@ -210,7 +194,7 @@ medford_board_cfg(\n \n \t/* Check capabilities of running datapath firmware */\n \tif ((rc = ef10_get_datapath_caps(enp)) != 0)\n-\t\tgoto fail10;\n+\t\tgoto fail8;\n \n \t/* Alignment for receive packet DMA buffers */\n \tencp->enc_rx_buf_align_start = 1;\n@@ -218,7 +202,7 @@ medford_board_cfg(\n \t/* Get the RX DMA end padding alignment configuration */\n \tif ((rc = efx_mcdi_get_rxdp_config(enp, &end_padding)) != 0) {\n \t\tif (rc != EACCES)\n-\t\t\tgoto fail11;\n+\t\t\tgoto fail9;\n \n \t\t/* Assume largest tail padding size supported by hardware */\n \t\tend_padding = 256;\n@@ -270,13 +254,13 @@ medford_board_cfg(\n \t * can result in time-of-check/time-of-use bugs.\n \t */\n \tif ((rc = ef10_get_privilege_mask(enp, &mask)) != 0)\n-\t\tgoto fail12;\n+\t\tgoto fail10;\n \tencp->enc_privilege_mask = mask;\n \n \t/* Get interrupt vector limits */\n \tif ((rc = efx_mcdi_get_vector_cfg(enp, &base, &nvec, NULL)) != 0) {\n \t\tif (EFX_PCI_FUNCTION_IS_PF(encp))\n-\t\t\tgoto fail13;\n+\t\t\tgoto fail11;\n \n \t\t/* Ignore error (cannot query vector limits from a VF). */\n \t\tbase = 0;\n@@ -299,16 +283,12 @@ medford_board_cfg(\n \n \trc = medford_nic_get_required_pcie_bandwidth(enp, &bandwidth);\n \tif (rc != 0)\n-\t\tgoto fail14;\n+\t\tgoto fail12;\n \tencp->enc_required_pcie_bandwidth_mbps = bandwidth;\n \tencp->enc_max_pcie_link_gen = EFX_PCIE_LINK_SPEED_GEN3;\n \n \treturn (0);\n \n-fail14:\n-\tEFSYS_PROBE(fail14);\n-fail13:\n-\tEFSYS_PROBE(fail13);\n fail12:\n \tEFSYS_PROBE(fail12);\n fail11:\n", "prefixes": [ "dpdk-dev", "48/80" ] }