Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/568517/?format=api
{ "id": 568517, "url": "http://patchwork.ozlabs.org/api/patches/568517/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1452897202-15204-12-git-send-email-joshua.a.hay@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1452897202-15204-12-git-send-email-joshua.a.hay@intel.com>", "list_archive_url": null, "date": "2016-01-15T22:33:18", "name": "[next,S28,11/15] i40e: better error reporting for nvmupdate", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ab3ef17a37f8377c09d31429565275adf789efcb", "submitter": { "id": 19461, "url": "http://patchwork.ozlabs.org/api/people/19461/?format=api", "name": "Joshua Hay", "email": "joshua.a.hay@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1452897202-15204-12-git-send-email-joshua.a.hay@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/568517/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/568517/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id A2344140BA4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 16 Jan 2016 09:33:43 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id EE8D691A73;\n\tFri, 15 Jan 2016 22:33:41 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id a2fpgSjFIa-0; Fri, 15 Jan 2016 22:33:38 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E3C1491A3B;\n\tFri, 15 Jan 2016 22:33:30 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 8C7FC1C2189\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Jan 2016 22:33:26 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 88F0A8A047\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Jan 2016 22:33:26 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 9-f96EMuVxK9 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Jan 2016 22:33:24 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 1E7BFA5942\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 15 Jan 2016 22:33:24 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby fmsmga103.fm.intel.com with ESMTP; 15 Jan 2016 14:33:23 -0800", "from jahay1-mobl2.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.81])\n\tby fmsmga002.fm.intel.com with ESMTP; 15 Jan 2016 14:33:23 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.22,302,1449561600\"; d=\"scan'208\";a=\"894132187\"", "From": "Joshua Hay <joshua.a.hay@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 15 Jan 2016 14:33:18 -0800", "Message-Id": "<1452897202-15204-12-git-send-email-joshua.a.hay@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1452897202-15204-1-git-send-email-joshua.a.hay@intel.com>", "References": "<1452897202-15204-1-git-send-email-joshua.a.hay@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S28 11/15] i40e: better error\n\treporting for nvmupdate", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "From: Shannon Nelson <shannon.nelson@intel.com>\n\nMake sure we return EBUSY while finishing up a reset, and add a few bits\nfor better debug messages.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: I23f6c28a8d96d7aa171abcc265737cec7826c292\n---\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 39 +++++++++++++-------------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 5 +++-\n 2 files changed, 24 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex d2010290..54d63a6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -1005,16 +1005,19 @@ static int i40e_get_eeprom(struct net_device *netdev,\n \t/* check for NVMUpdate access method */\n \tmagic = hw->vendor_id | (hw->device_id << 16);\n \tif (eeprom->magic && eeprom->magic != magic) {\n-\t\tstruct i40e_nvm_access *cmd;\n-\t\tint errno;\n+\t\tstruct i40e_nvm_access *cmd = (struct i40e_nvm_access *)eeprom;\n+\t\tint errno = 0;\n \n \t\t/* make sure it is the right magic for NVMUpdate */\n \t\tif ((eeprom->magic >> 16) != hw->device_id)\n-\t\t\treturn -EINVAL;\n+\t\t\terrno = -EINVAL;\n+\t\telse if (test_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state) ||\n+\t\t\t test_bit(__I40E_RESET_INTR_RECEIVED, &pf->state))\n+\t\t\terrno = -EBUSY;\n+\t\telse\n+\t\t\tret_val = i40e_nvmupd_command(hw, cmd, bytes, &errno);\n \n-\t\tcmd = (struct i40e_nvm_access *)eeprom;\n-\t\tret_val = i40e_nvmupd_command(hw, cmd, bytes, &errno);\n-\t\tif (ret_val && (hw->debug_mask & I40E_DEBUG_NVM))\n+\t\tif ((errno || ret_val) && (hw->debug_mask & I40E_DEBUG_NVM))\n \t\t\tdev_info(&pf->pdev->dev,\n \t\t\t\t \"NVMUpdate read failed err=%d status=0x%x errno=%d module=%d offset=0x%x size=%d\\n\",\n \t\t\t\t ret_val, hw->aq.asq_last_status, errno,\n@@ -1098,27 +1101,25 @@ static int i40e_set_eeprom(struct net_device *netdev,\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n \tstruct i40e_hw *hw = &np->vsi->back->hw;\n \tstruct i40e_pf *pf = np->vsi->back;\n-\tstruct i40e_nvm_access *cmd;\n+\tstruct i40e_nvm_access *cmd = (struct i40e_nvm_access *)eeprom;\n \tint ret_val = 0;\n-\tint errno;\n+\tint errno = 0;\n \tu32 magic;\n \n \t/* normal ethtool set_eeprom is not supported */\n \tmagic = hw->vendor_id | (hw->device_id << 16);\n \tif (eeprom->magic == magic)\n-\t\treturn -EOPNOTSUPP;\n-\n+\t\terrno = -EOPNOTSUPP;\n \t/* check for NVMUpdate access method */\n-\tif (!eeprom->magic || (eeprom->magic >> 16) != hw->device_id)\n-\t\treturn -EINVAL;\n-\n-\tif (test_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state) ||\n-\t test_bit(__I40E_RESET_INTR_RECEIVED, &pf->state))\n-\t\treturn -EBUSY;\n+\telse if (!eeprom->magic || (eeprom->magic >> 16) != hw->device_id)\n+\t\terrno = -EINVAL;\n+\telse if (test_bit(__I40E_RESET_RECOVERY_PENDING, &pf->state) ||\n+\t\t test_bit(__I40E_RESET_INTR_RECEIVED, &pf->state))\n+\t\terrno = -EBUSY;\n+\telse\n+\t\tret_val = i40e_nvmupd_command(hw, cmd, bytes, &errno);\n \n-\tcmd = (struct i40e_nvm_access *)eeprom;\n-\tret_val = i40e_nvmupd_command(hw, cmd, bytes, &errno);\n-\tif (ret_val && (hw->debug_mask & I40E_DEBUG_NVM))\n+\tif ((errno || ret_val) && (hw->debug_mask & I40E_DEBUG_NVM))\n \t\tdev_info(&pf->pdev->dev,\n \t\t\t \"NVMUpdate write failed err=%d status=0x%x errno=%d module=%d offset=0x%x size=%d\\n\",\n \t\t\t ret_val, hw->aq.asq_last_status, errno,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 5e7a7a1..98cbc90 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3475,6 +3475,7 @@ static irqreturn_t i40e_intr(int irq, void *data)\n \tif (icr0 & I40E_PFINT_ICR0_ADMINQ_MASK) {\n \t\tena_mask &= ~I40E_PFINT_ICR0_ENA_ADMINQ_MASK;\n \t\tset_bit(__I40E_ADMINQ_EVENT_PENDING, &pf->state);\n+\t\ti40e_debug(&pf->hw, I40E_DEBUG_NVM, \"AdminQ event\\n\");\n \t}\n \n \tif (icr0 & I40E_PFINT_ICR0_MAL_DETECT_MASK) {\n@@ -6323,7 +6324,9 @@ static void i40e_clean_adminq_subtask(struct i40e_pf *pf)\n \t\tcase i40e_aqc_opc_nvm_erase:\n \t\tcase i40e_aqc_opc_nvm_update:\n \t\tcase i40e_aqc_opc_oem_post_update:\n-\t\t\ti40e_debug(&pf->hw, I40E_DEBUG_NVM, \"ARQ NVM operation completed\\n\");\n+\t\t\ti40e_debug(&pf->hw, I40E_DEBUG_NVM,\n+\t\t\t\t \"ARQ NVM operation 0x%04x completed\\n\",\n+\t\t\t\t opcode);\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tdev_info(&pf->pdev->dev,\n", "prefixes": [ "next", "S28", "11/15" ] }