Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/44487/?format=api
{ "id": 44487, "url": "http://patches.dpdk.org/api/patches/44487/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1536572016-18134-25-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": "<1536572016-18134-25-git-send-email-arybchenko@solarflare.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1536572016-18134-25-git-send-email-arybchenko@solarflare.com", "date": "2018-09-10T09:33:23", "name": "[24/37] net/sfc/base: add routine to check for hardware presence", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "4a0abad580f169c090b9e23c8d7c3eaf151e71b1", "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/1536572016-18134-25-git-send-email-arybchenko@solarflare.com/mbox/", "series": [ { "id": 1244, "url": "http://patches.dpdk.org/api/series/1244/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1244", "date": "2018-09-10T09:33:01", "name": "net/sfc: update base driver", "version": 1, "mbox": "http://patches.dpdk.org/series/1244/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/44487/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/44487/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 AA9DD6904;\n\tMon, 10 Sep 2018 11:34:28 +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 31CC54CA2\n\tfor <dev@dpdk.org>; Mon, 10 Sep 2018 11:33:53 +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 (Proofpoint Essentials ESMTP Server) with\n\tESMTPS id\n\t4C997780069 for <dev@dpdk.org>; Mon, 10 Sep 2018 09:33:52 +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 Sep 2018 02:33:48 -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 Sep 2018 02:33:48 -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\tw8A9XkOL023841; Mon, 10 Sep 2018 10:33:46 +0100", "from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])\n\tby ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id\n\t77BFF1626D1; Mon, 10 Sep 2018 10:33:46 +0100 (BST)" ], "X-Virus-Scanned": "Proofpoint Essentials engine", "From": "Andrew Rybchenko <arybchenko@solarflare.com>", "To": "<dev@dpdk.org>", "CC": "Andy Moreton <amoreton@solarflare.com>", "Date": "Mon, 10 Sep 2018 10:33:23 +0100", "Message-ID": "<1536572016-18134-25-git-send-email-arybchenko@solarflare.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1536572016-18134-1-git-send-email-arybchenko@solarflare.com>", "References": "<1536572016-18134-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-24084.005", "X-TM-AS-Result": "No-7.927000-4.000000-10", "X-TMASE-MatchedRID": "OXh+vcntO3ADFgoHQs6fmh+WEMjoO9WWVBDQSDMig9HRLEyE6G4DRAB1\n\tu2PQ49s1XHINoCoM0DE/LE8UgsqDG7v4tMvEPWT6GuE3UyUHG1eH7D1bP/FcOqWNiVXB3zWgX0n\n\tpGlgCa7qlL6ml/horebbS7h/dNTlHkKjL2IOi2LAHwuCWPSIIAOWNJG9IamrcHY64nxYpfpU3Aw\n\tihR7/Pv+LzNWBegCW2wgn7iDBesS15zdAzex5xZvnk/12dWAfpsV0FhKNPW6S16eP6hQTujPm+w\n\te+pYvv7I+wyfQkq2uSUTGVAhB5EbQ==", "X-TM-AS-User-Approved-Sender": "No", "X-TM-AS-User-Blocked-Sender": "No", "X-TMASE-Result": "10--7.927000-4.000000", "X-TMASE-Version": "SMEX-12.5.0.1300-8.5.1010-24084.005", "X-MDID": "1536572032-WRE_I3bzcGjC", "Subject": "[dpdk-dev] [PATCH 24/37] net/sfc/base: add routine to check for\n\thardware presence", "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: Andy Moreton <amoreton@solarflare.com>\n\nAdd efx_nic_hw_unavailable() routine to check for hardware presence\nbefore continuing with NIC operations.\n\nSigned-off-by: Andy Moreton <amoreton@solarflare.com>\nSigned-off-by: Andrew Rybchenko <arybchenko@solarflare.com>\n---\n drivers/net/sfc/base/ef10_ev.c | 10 ++++++----\n drivers/net/sfc/base/ef10_impl.h | 4 ++++\n drivers/net/sfc/base/ef10_nic.c | 22 ++++++++++++++++++++++\n drivers/net/sfc/base/efx.h | 4 ++++\n drivers/net/sfc/base/efx_impl.h | 2 ++\n drivers/net/sfc/base/efx_mcdi.c | 6 ++++++\n drivers/net/sfc/base/efx_nic.c | 27 +++++++++++++++++++++++++++\n 7 files changed, 71 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/sfc/base/ef10_ev.c b/drivers/net/sfc/base/ef10_ev.c\nindex 287550605..cdf835f03 100644\n--- a/drivers/net/sfc/base/ef10_ev.c\n+++ b/drivers/net/sfc/base/ef10_ev.c\n@@ -863,8 +863,9 @@ ef10_ev_rx(\n \n \tEFX_EV_QSTAT_INCR(eep, EV_RX);\n \n-\t/* Discard events after RXQ/TXQ errors */\n-\tif (enp->en_reset_flags & (EFX_RESET_RXQ_ERR | EFX_RESET_TXQ_ERR))\n+\t/* Discard events after RXQ/TXQ errors, or hardware not available */\n+\tif (enp->en_reset_flags &\n+\t (EFX_RESET_RXQ_ERR | EFX_RESET_TXQ_ERR | EFX_RESET_HW_UNAVAIL))\n \t\treturn (B_FALSE);\n \n \t/* Basic packet information */\n@@ -1064,8 +1065,9 @@ ef10_ev_tx(\n \n \tEFX_EV_QSTAT_INCR(eep, EV_TX);\n \n-\t/* Discard events after RXQ/TXQ errors */\n-\tif (enp->en_reset_flags & (EFX_RESET_RXQ_ERR | EFX_RESET_TXQ_ERR))\n+\t/* Discard events after RXQ/TXQ errors, or hardware not available */\n+\tif (enp->en_reset_flags &\n+\t (EFX_RESET_RXQ_ERR | EFX_RESET_TXQ_ERR | EFX_RESET_HW_UNAVAIL))\n \t\treturn (B_FALSE);\n \n \tif (EFX_QWORD_FIELD(*eqp, ESF_DZ_TX_DROP_EVENT) != 0) {\ndiff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h\nindex 503f02362..0214a75ef 100644\n--- a/drivers/net/sfc/base/ef10_impl.h\n+++ b/drivers/net/sfc/base/ef10_impl.h\n@@ -190,6 +190,10 @@ extern\t__checkReturn\tefx_rc_t\n ef10_nic_init(\n \t__in\t\tefx_nic_t *enp);\n \n+extern\t__checkReturn\tboolean_t\n+ef10_nic_hw_unavailable(\n+\t__in\t\tefx_nic_t *enp);\n+\n #if EFSYS_OPT_DIAG\n \n extern\t__checkReturn\tefx_rc_t\ndiff --git a/drivers/net/sfc/base/ef10_nic.c b/drivers/net/sfc/base/ef10_nic.c\nindex 332f6ef81..ff96a7ff2 100644\n--- a/drivers/net/sfc/base/ef10_nic.c\n+++ b/drivers/net/sfc/base/ef10_nic.c\n@@ -2304,6 +2304,28 @@ ef10_nic_get_bar_region(\n \treturn (rc);\n }\n \n+\t__checkReturn\tboolean_t\n+ef10_nic_hw_unavailable(\n+\t__in\t\tefx_nic_t *enp)\n+{\n+\tefx_dword_t dword;\n+\n+\tif (enp->en_reset_flags & EFX_RESET_HW_UNAVAIL)\n+\t\treturn (B_TRUE);\n+\n+\tEFX_BAR_READD(enp, ER_DZ_BIU_MC_SFT_STATUS_REG, &dword, B_FALSE);\n+\tif (EFX_DWORD_FIELD(dword, EFX_DWORD_0) == 0xffffffff)\n+\t\tgoto unavail;\n+\n+\treturn (B_FALSE);\n+\n+unavail:\n+\tEFSYS_PROBE(hw_unavail);\n+\tenp->en_reset_flags |= EFX_RESET_HW_UNAVAIL;\n+\n+\treturn (B_TRUE);\n+}\n+\n \t\t\tvoid\n ef10_nic_fini(\n \t__in\t\tefx_nic_t *enp)\ndiff --git a/drivers/net/sfc/base/efx.h b/drivers/net/sfc/base/efx.h\nindex 2356a9294..fce519037 100644\n--- a/drivers/net/sfc/base/efx.h\n+++ b/drivers/net/sfc/base/efx.h\n@@ -155,6 +155,10 @@ extern\t__checkReturn\tefx_rc_t\n efx_nic_reset(\n \t__in\t\tefx_nic_t *enp);\n \n+extern\t__checkReturn\tboolean_t\n+efx_nic_hw_unavailable(\n+\t__in\t\tefx_nic_t *enp);\n+\n #if EFSYS_OPT_DIAG\n \n extern\t__checkReturn\tefx_rc_t\ndiff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h\nindex 78df43018..8a7dc8cf6 100644\n--- a/drivers/net/sfc/base/efx_impl.h\n+++ b/drivers/net/sfc/base/efx_impl.h\n@@ -59,6 +59,7 @@ extern \"C\" {\n #define\tEFX_RESET_PHY\t\t0x00000001\n #define\tEFX_RESET_RXQ_ERR\t0x00000002\n #define\tEFX_RESET_TXQ_ERR\t0x00000004\n+#define\tEFX_RESET_HW_UNAVAIL\t0x00000008\n \n typedef enum efx_mac_type_e {\n \tEFX_MAC_INVALID = 0,\n@@ -356,6 +357,7 @@ typedef struct efx_nic_ops_s {\n \tefx_rc_t\t(*eno_get_vi_pool)(efx_nic_t *, uint32_t *);\n \tefx_rc_t\t(*eno_get_bar_region)(efx_nic_t *, efx_nic_region_t,\n \t\t\t\t\tuint32_t *, size_t *);\n+\tboolean_t\t(*eno_hw_unavailable)(efx_nic_t *);\n #if EFSYS_OPT_DIAG\n \tefx_rc_t\t(*eno_register_test)(efx_nic_t *);\n #endif\t/* EFSYS_OPT_DIAG */\ndiff --git a/drivers/net/sfc/base/efx_mcdi.c b/drivers/net/sfc/base/efx_mcdi.c\nindex 84d8452e4..c8d670c23 100644\n--- a/drivers/net/sfc/base/efx_mcdi.c\n+++ b/drivers/net/sfc/base/efx_mcdi.c\n@@ -496,6 +496,12 @@ efx_mcdi_request_poll(\n \tEFSYS_ASSERT(!emip->emi_ev_cpl);\n \temrp = emip->emi_pending_req;\n \n+\t/* Check if hardware is unavailable */\n+\tif (efx_nic_hw_unavailable(enp)) {\n+\t\tEFSYS_UNLOCK(enp->en_eslp, state);\n+\t\treturn (B_FALSE);\n+\t}\n+\n \t/* Check for reboot atomically w.r.t efx_mcdi_request_start */\n \tif (emip->emi_poll_cnt++ == 0) {\n \t\tif ((rc = efx_mcdi_poll_reboot(enp)) != 0) {\ndiff --git a/drivers/net/sfc/base/efx_nic.c b/drivers/net/sfc/base/efx_nic.c\nindex c364bffba..22e464a4e 100644\n--- a/drivers/net/sfc/base/efx_nic.c\n+++ b/drivers/net/sfc/base/efx_nic.c\n@@ -100,6 +100,7 @@ static const efx_nic_ops_t\t__efx_nic_siena_ops = {\n \tsiena_nic_init,\t\t\t/* eno_init */\n \tNULL,\t\t\t\t/* eno_get_vi_pool */\n \tNULL,\t\t\t\t/* eno_get_bar_region */\n+\tNULL,\t\t\t\t/* eno_hw_unavailable */\n #if EFSYS_OPT_DIAG\n \tsiena_nic_register_test,\t/* eno_register_test */\n #endif\t/* EFSYS_OPT_DIAG */\n@@ -119,6 +120,7 @@ static const efx_nic_ops_t\t__efx_nic_hunt_ops = {\n \tef10_nic_init,\t\t\t/* eno_init */\n \tef10_nic_get_vi_pool,\t\t/* eno_get_vi_pool */\n \tef10_nic_get_bar_region,\t/* eno_get_bar_region */\n+\tef10_nic_hw_unavailable,\t/* eno_hw_unavailable */\n #if EFSYS_OPT_DIAG\n \tef10_nic_register_test,\t\t/* eno_register_test */\n #endif\t/* EFSYS_OPT_DIAG */\n@@ -138,6 +140,7 @@ static const efx_nic_ops_t\t__efx_nic_medford_ops = {\n \tef10_nic_init,\t\t\t/* eno_init */\n \tef10_nic_get_vi_pool,\t\t/* eno_get_vi_pool */\n \tef10_nic_get_bar_region,\t/* eno_get_bar_region */\n+\tef10_nic_hw_unavailable,\t/* eno_hw_unavailable */\n #if EFSYS_OPT_DIAG\n \tef10_nic_register_test,\t\t/* eno_register_test */\n #endif\t/* EFSYS_OPT_DIAG */\n@@ -157,6 +160,7 @@ static const efx_nic_ops_t\t__efx_nic_medford2_ops = {\n \tef10_nic_init,\t\t\t/* eno_init */\n \tef10_nic_get_vi_pool,\t\t/* eno_get_vi_pool */\n \tef10_nic_get_bar_region,\t/* eno_get_bar_region */\n+\tef10_nic_hw_unavailable,\t/* eno_hw_unavailable */\n #if EFSYS_OPT_DIAG\n \tef10_nic_register_test,\t\t/* eno_register_test */\n #endif\t/* EFSYS_OPT_DIAG */\n@@ -652,6 +656,29 @@ efx_nic_get_fw_version(\n \treturn (rc);\n }\n \n+\t__checkReturn\tboolean_t\n+efx_nic_hw_unavailable(\n+\t__in\t\tefx_nic_t *enp)\n+{\n+\tconst efx_nic_ops_t *enop = enp->en_enop;\n+\n+\tEFSYS_ASSERT3U(enp->en_magic, ==, EFX_NIC_MAGIC);\n+\t/* NOTE: can be used by MCDI before NIC probe */\n+\n+\tif (enop->eno_hw_unavailable != NULL) {\n+\t\tif ((enop->eno_hw_unavailable)(enp) != B_FALSE)\n+\t\t\tgoto unavail;\n+\t}\n+\n+\treturn (B_FALSE);\n+\n+unavail:\n+\tEFSYS_PROBE(hw_unavail);\n+\n+\treturn (B_TRUE);\n+}\n+\n+\n #if EFSYS_OPT_DIAG\n \n \t__checkReturn\tefx_rc_t\n", "prefixes": [ "24/37" ] }