Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80516/?format=api
{ "id": 80516, "url": "http://patches.dpdk.org/api/patches/80516/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1602596753-32282-4-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": "<1602596753-32282-4-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1602596753-32282-4-git-send-email-arybchenko@solarflare.com", "date": "2020-10-13T13:45:20", "name": "[03/36] common/sfc_efx/base: factor out wrapper to set PHY link", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "0c7dbfde69129f7a5fd88420c96909b3f7e7576f", "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/1602596753-32282-4-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 12916, "url": "http://patches.dpdk.org/api/series/12916/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12916", "date": "2020-10-13T13:45:18", "name": "net/sfc: add EF100 support", "version": 1, "mbox": "http://patches.dpdk.org/series/12916/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/80516/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/80516/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 111C0A04B7;\n\tTue, 13 Oct 2020 15:48:21 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 8A1961DBB1;\n\tTue, 13 Oct 2020 15:46:16 +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 B9C681DB86\n for <dev@dpdk.org>; Tue, 13 Oct 2020 15:46:02 +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 453CB200CD for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:01 +0000 (UTC)", "from us4-mdac16-47.at1.mdlocal (unknown [10.110.50.130])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 42CC4800A3\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:01 +0000 (UTC)", "from mx1-us1.ppe-hosted.com (unknown [10.110.49.106])\n by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id\n B4D7E100079\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:00 +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\n 7C7C9B40072\n for <dev@dpdk.org>; Tue, 13 Oct 2020 13:46:00 +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, 13 Oct 2020 14:45:55 +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, 13 Oct 2020 14:45:55 +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 09DDjtiC005991\n for <dev@dpdk.org>; Tue, 13 Oct 2020 14:45:55 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 697CE1613A9\n for <dev@dpdk.org>; Tue, 13 Oct 2020 14:45:55 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "Date": "Tue, 13 Oct 2020 14:45:20 +0100", "Message-ID": "<1602596753-32282-4-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1602596753-32282-1-git-send-email-arybchenko@solarflare.com>", "References": "<1602596753-32282-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-25722.003", "X-TM-AS-Result": "No-3.421100-8.000000-10", "X-TMASE-MatchedRID": "Zf1grNPx/ZPDJQPapbvuAkV3YrpGUAoBH5AzpU0IM2EELMPQNzyJS/Vl\n 5vsoSSsohQdQxfxoNSQWsp6eJb7A2xt/FEV6QNBCPwKTD1v8YV5MkOX0UoduuVVkJxysad/IQmZ\n 9+1UBYL1ceDaTz6MyF7hBG67QbFtPYb+I87JW1OJbUzvsaHW6BuqhuTPUDQDtZU0FQc0VYSSjxY\n yRBa/qJcFwgTvxipFajoczmuoPCq1r2KfXCTV5nRNUgJRzK6LAT5DtY0K1OrNjz3g6RmfPNoaEL\n bS7zXrdWYSjrzyREe0Xzee4TbVh1Mf2ZoKEWWqf/jKrVdKN0M03I8DUyOoaeU+wJNKvG6HQ1PNk\n ozhRY3HUNR3AhwxI7HVCg90b4a/8", "X-TM-AS-User-Approved-Sender": "Yes", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--3.421100-8.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.6.1012-25722.003", "X-MDID": "1602596761-noFp5e0CGGUt", "X-PPE-DISP": "1602596761;noFp5e0CGGUt", "Subject": "[dpdk-dev] [PATCH 03/36] common/sfc_efx/base: factor out wrapper to\n\tset PHY link", "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": "Make ef10_phy_reconfigure() simpler to read and less error-prone.\nAvoid confusing case when two MCDI's are called from one function.\n\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/common/sfc_efx/base/ef10_phy.c | 90 +++++++++++++++++---------\n 1 file changed, 61 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/common/sfc_efx/base/ef10_phy.c b/drivers/common/sfc_efx/base/ef10_phy.c\nindex b9822e4d42..0005870736 100644\n--- a/drivers/common/sfc_efx/base/ef10_phy.c\n+++ b/drivers/common/sfc_efx/base/ef10_phy.c\n@@ -329,34 +329,26 @@ ef10_phy_get_link(\n \treturn (rc);\n }\n \n-\t__checkReturn\tefx_rc_t\n-ef10_phy_reconfigure(\n-\t__in\t\tefx_nic_t *enp)\n+static\t__checkReturn\tefx_rc_t\n+efx_mcdi_phy_set_link(\n+\t__in\t\tefx_nic_t *enp,\n+\t__in\t\tuint32_t cap_mask,\n+\t__in\t\tefx_loopback_type_t loopback_type,\n+\t__in\t\tefx_link_mode_t loopback_link_mode,\n+\t__in\t\tuint32_t phy_flags)\n {\n-\tefx_port_t *epp = &(enp->en_port);\n \tefx_mcdi_req_t req;\n \tEFX_MCDI_DECLARE_BUF(payload, MC_CMD_SET_LINK_IN_LEN,\n \t\tMC_CMD_SET_LINK_OUT_LEN);\n-\tuint32_t cap_mask;\n-#if EFSYS_OPT_PHY_LED_CONTROL\n-\tunsigned int led_mode;\n-#endif\n \tunsigned int speed;\n-\tboolean_t supported;\n \tefx_rc_t rc;\n \n-\tif ((rc = efx_mcdi_link_control_supported(enp, &supported)) != 0)\n-\t\tgoto fail1;\n-\tif (supported == B_FALSE)\n-\t\tgoto out;\n-\n \treq.emr_cmd = MC_CMD_SET_LINK;\n \treq.emr_in_buf = payload;\n \treq.emr_in_length = MC_CMD_SET_LINK_IN_LEN;\n \treq.emr_out_buf = payload;\n \treq.emr_out_length = MC_CMD_SET_LINK_OUT_LEN;\n \n-\tcap_mask = epp->ep_adv_cap_mask;\n \tMCDI_IN_POPULATE_DWORD_10(req, SET_LINK_IN_CAP,\n \t\tPHY_CAP_10HDX, (cap_mask >> EFX_PHY_CAP_10HDX) & 0x1,\n \t\tPHY_CAP_10FDX, (cap_mask >> EFX_PHY_CAP_10FDX) & 0x1,\n@@ -397,10 +389,9 @@ ef10_phy_reconfigure(\n \t PHY_CAP_25G_BASER_FEC_REQUESTED,\n \t (cap_mask >> EFX_PHY_CAP_25G_BASER_FEC_REQUESTED) & 0x1);\n \n-#if EFSYS_OPT_LOOPBACK\n-\tMCDI_IN_SET_DWORD(req, SET_LINK_IN_LOOPBACK_MODE,\n-\t\t epp->ep_loopback_type);\n-\tswitch (epp->ep_loopback_link_mode) {\n+\tMCDI_IN_SET_DWORD(req, SET_LINK_IN_LOOPBACK_MODE, loopback_type);\n+\n+\tswitch (loopback_link_mode) {\n \tcase EFX_LINK_100FDX:\n \t\tspeed = 100;\n \t\tbreak;\n@@ -424,26 +415,67 @@ ef10_phy_reconfigure(\n \t\tbreak;\n \tdefault:\n \t\tspeed = 0;\n+\t\tbreak;\n \t}\n-#else\n-\tMCDI_IN_SET_DWORD(req, SET_LINK_IN_LOOPBACK_MODE, MC_CMD_LOOPBACK_NONE);\n-\tspeed = 0;\n-#endif\t/* EFSYS_OPT_LOOPBACK */\n \tMCDI_IN_SET_DWORD(req, SET_LINK_IN_LOOPBACK_SPEED, speed);\n \n-#if EFSYS_OPT_PHY_FLAGS\n-\tMCDI_IN_SET_DWORD(req, SET_LINK_IN_FLAGS, epp->ep_phy_flags);\n-#else\n-\tMCDI_IN_SET_DWORD(req, SET_LINK_IN_FLAGS, 0);\n-#endif\t/* EFSYS_OPT_PHY_FLAGS */\n+\tMCDI_IN_SET_DWORD(req, SET_LINK_IN_FLAGS, phy_flags);\n \n \tefx_mcdi_execute(enp, &req);\n \n \tif (req.emr_rc != 0) {\n \t\trc = req.emr_rc;\n-\t\tgoto fail2;\n+\t\tgoto fail1;\n \t}\n \n+\treturn (0);\n+\n+fail1:\n+\tEFSYS_PROBE1(fail1, efx_rc_t, rc);\n+\n+\treturn (rc);\n+}\n+\n+\t__checkReturn\tefx_rc_t\n+ef10_phy_reconfigure(\n+\t__in\t\tefx_nic_t *enp)\n+{\n+\tefx_port_t *epp = &(enp->en_port);\n+\tefx_mcdi_req_t req;\n+\tEFX_MCDI_DECLARE_BUF(payload, MC_CMD_SET_ID_LED_IN_LEN,\n+\t\tMC_CMD_SET_ID_LED_OUT_LEN);\n+\tefx_loopback_type_t loopback_type;\n+\tefx_link_mode_t loopback_link_mode;\n+\tuint32_t phy_flags;\n+#if EFSYS_OPT_PHY_LED_CONTROL\n+\tunsigned int led_mode;\n+#endif\n+\tboolean_t supported;\n+\tefx_rc_t rc;\n+\n+\tif ((rc = efx_mcdi_link_control_supported(enp, &supported)) != 0)\n+\t\tgoto fail1;\n+\tif (supported == B_FALSE)\n+\t\tgoto out;\n+\n+#if EFSYS_OPT_LOOPBACK\n+\tloopback_type = epp->ep_loopback_type;\n+\tloopback_link_mode = epp->ep_loopback_link_mode;\n+#else\n+\tloopback_type = EFX_LOOPBACK_OFF;\n+\tloopback_link_mode = EFX_LINK_UNKNOWN;\n+#endif\n+#if EFSYS_OPT_PHY_FLAGS\n+\tphy_flags = epp->ep_phy_flags;\n+#else\n+\tphy_flags = 0;\n+#endif\n+\n+\trc = efx_mcdi_phy_set_link(enp, epp->ep_adv_cap_mask,\n+\t loopback_type, loopback_link_mode, phy_flags);\n+\tif (rc != 0)\n+\t\tgoto fail2;\n+\n \t/* And set the blink mode */\n \t(void) memset(payload, 0, sizeof (payload));\n \treq.emr_cmd = MC_CMD_SET_ID_LED;\n", "prefixes": [ "03/36" ] }