Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512047/?format=api
{ "id": 512047, "url": "http://patchwork.ozlabs.org/api/patches/512047/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1440798961-17326-3-git-send-email-catherine.sullivan@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": "<1440798961-17326-3-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-28T21:55:48", "name": "[next,S13,02/15] i40e/i40evf: add GetStatus command for nvmupdate", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "02e87e7e633682a1fc99c0d80499f49b3e6bda02", "submitter": { "id": 13931, "url": "http://patchwork.ozlabs.org/api/people/13931/?format=api", "name": "Catherine Sullivan", "email": "catherine.sullivan@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/1440798961-17326-3-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512047/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512047/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ozlabs.org (Postfix) with ESMTP id 85C3114031D\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 29 Aug 2015 07:55:14 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id D5F5D8B97C;\n\tFri, 28 Aug 2015 21:55:13 +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 bFgImV0EbPI5; Fri, 28 Aug 2015 21:55:13 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 18C688B980;\n\tFri, 28 Aug 2015 21:55:12 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id AE3B61CECF8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:08 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id AAA3C95ECE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:08 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id LD7fhBI4kPEx for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:07 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0FE9895ECC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:07 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga101.jf.intel.com with ESMTP; 28 Aug 2015 14:55:07 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga003.jf.intel.com with ESMTP; 28 Aug 2015 14:55:02 -0700" ], "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.17,427,1437462000\"; d=\"scan'208\";a=\"634260203\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 28 Aug 2015 17:55:48 -0400", "Message-Id": "<1440798961-17326-3-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1440798961-17326-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1440798961-17326-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S13 02/15] i40e/i40evf: add GetStatus\n\tcommand 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\nThis adds a new GetStatus command so that the NVM update tool can query\nthe current status instead of doing fake write requests to probe for\nreadiness.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: I671ec6ccd4dfc9dbac3a03b964589d693fda5cd8\n---\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 42 ++++++++++++++++++++-------\n drivers/net/ethernet/intel/i40e/i40e_type.h | 2 ++\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 2 ++\n 3 files changed, 35 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex 13534b3..034e27a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -640,6 +640,7 @@ static char *i40e_nvm_update_state_str[] = {\n \t\"I40E_NVMUPD_CSUM_CON\",\n \t\"I40E_NVMUPD_CSUM_SA\",\n \t\"I40E_NVMUPD_CSUM_LCB\",\n+\t\"I40E_NVMUPD_STATUS\",\n };\n \n /**\n@@ -656,10 +657,34 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,\n \t\t\t\tu8 *bytes, int *perrno)\n {\n \ti40e_status status;\n+\tenum i40e_nvmupd_cmd upd_cmd;\n \n \t/* assume success */\n \t*perrno = 0;\n \n+\t/* early check for status command and debug msgs */\n+\tupd_cmd = i40e_nvmupd_validate_command(hw, cmd, perrno);\n+\n+\ti40e_debug(hw, I40E_DEBUG_NVM, \"%s state %d nvm_release_on_hold %d\\n\",\n+\t\t i40e_nvm_update_state_str[upd_cmd],\n+\t\t hw->nvmupd_state,\n+\t\t hw->aq.nvm_release_on_done);\n+\n+\tif (upd_cmd == I40E_NVMUPD_INVALID) {\n+\t\t*perrno = -EFAULT;\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM,\n+\t\t\t \"i40e_nvmupd_validate_command returns %d errno %d\\n\",\n+\t\t\t upd_cmd, *perrno);\n+\t}\n+\n+\t/* a status request returns immediately rather than\n+\t * going into the state machine\n+\t */\n+\tif (upd_cmd == I40E_NVMUPD_STATUS) {\n+\t\tbytes[0] = hw->nvmupd_state;\n+\t\treturn 0;\n+\t}\n+\n \tswitch (hw->nvmupd_state) {\n \tcase I40E_NVMUPD_STATE_INIT:\n \t\tstatus = i40e_nvmupd_state_init(hw, cmd, bytes, perrno);\n@@ -956,12 +981,13 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw,\n \t\t\t\t\t\t int *perrno)\n {\n \tenum i40e_nvmupd_cmd upd_cmd;\n-\tu8 transaction;\n+\tu8 module, transaction;\n \n \t/* anything that doesn't match a recognized case is an error */\n \tupd_cmd = I40E_NVMUPD_INVALID;\n \n \ttransaction = i40e_nvmupd_get_transaction(cmd->config);\n+\tmodule = i40e_nvmupd_get_module(cmd->config);\n \n \t/* limits on data size */\n \tif ((cmd->data_size < 1) ||\n@@ -988,6 +1014,10 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw,\n \t\tcase I40E_NVM_SA:\n \t\t\tupd_cmd = I40E_NVMUPD_READ_SA;\n \t\t\tbreak;\n+\t\tcase I40E_NVM_EXEC:\n+\t\t\tif (module == 0xf)\n+\t\t\t\tupd_cmd = I40E_NVMUPD_STATUS;\n+\t\t\tbreak;\n \t\t}\n \t\tbreak;\n \n@@ -1020,17 +1050,7 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw,\n \t\t}\n \t\tbreak;\n \t}\n-\ti40e_debug(hw, I40E_DEBUG_NVM, \"%s state %d nvm_release_on_hold %d\\n\",\n-\t\t i40e_nvm_update_state_str[upd_cmd],\n-\t\t hw->nvmupd_state,\n-\t\t hw->aq.nvm_release_on_done);\n \n-\tif (upd_cmd == I40E_NVMUPD_INVALID) {\n-\t\t*perrno = -EFAULT;\n-\t\ti40e_debug(hw, I40E_DEBUG_NVM,\n-\t\t\t \"i40e_nvmupd_validate_command returns %d errno %d\\n\",\n-\t\t\t upd_cmd, *perrno);\n-\t}\n \treturn upd_cmd;\n }\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex d3558e1..20e16ed 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -307,6 +307,7 @@ enum i40e_nvmupd_cmd {\n \tI40E_NVMUPD_CSUM_CON,\n \tI40E_NVMUPD_CSUM_SA,\n \tI40E_NVMUPD_CSUM_LCB,\n+\tI40E_NVMUPD_STATUS,\n };\n \n enum i40e_nvmupd_state {\n@@ -331,6 +332,7 @@ enum i40e_nvmupd_state {\n #define I40E_NVM_SA\t\t(I40E_NVM_SNT | I40E_NVM_LCB)\n #define I40E_NVM_ERA\t\t0x4\n #define I40E_NVM_CSUM\t\t0x8\n+#define I40E_NVM_EXEC\t\t0xf\n \n #define I40E_NVM_ADAPT_SHIFT\t16\n #define I40E_NVM_ADAPT_MASK\t(0xffff << I40E_NVM_ADAPT_SHIFT)\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex c811081..ee02e25 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -306,6 +306,7 @@ enum i40e_nvmupd_cmd {\n \tI40E_NVMUPD_CSUM_CON,\n \tI40E_NVMUPD_CSUM_SA,\n \tI40E_NVMUPD_CSUM_LCB,\n+\tI40E_NVMUPD_STATUS,\n };\n \n enum i40e_nvmupd_state {\n@@ -330,6 +331,7 @@ enum i40e_nvmupd_state {\n #define I40E_NVM_SA\t\t(I40E_NVM_SNT | I40E_NVM_LCB)\n #define I40E_NVM_ERA\t\t0x4\n #define I40E_NVM_CSUM\t\t0x8\n+#define I40E_NVM_EXEC\t\t0xf\n \n #define I40E_NVM_ADAPT_SHIFT\t16\n #define I40E_NVM_ADAPT_MASK\t(0xffff << I40E_NVM_ADAPT_SHIFT)\n", "prefixes": [ "next", "S13", "02/15" ] }