Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512055/?format=api
{ "id": 512055, "url": "http://patchwork.ozlabs.org/api/patches/512055/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1440798961-17326-6-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-6-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-28T21:55:51", "name": "[next,S13,05/15] i40e/i40evf: add get AQ result command to nvmupdate utility", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "5955ca21bb6577d225e643647bbfec732708cc17", "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-6-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512055/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512055/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 CA77914031D\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 29 Aug 2015 07:55:21 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2BAFE8B952;\n\tFri, 28 Aug 2015 21:55:21 +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 askN21_hk3As; Fri, 28 Aug 2015 21:55:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8BEC38B992;\n\tFri, 28 Aug 2015 21:55:18 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 5E1AE1CEB0B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:12 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5ACDB95EBB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:12 +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 k22XJEMHr1sA 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 3932C95ED1\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:04 -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=\"634260284\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 28 Aug 2015 17:55:51 -0400", "Message-Id": "<1440798961-17326-6-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 05/15] i40e/i40evf: add get AQ\n\tresult command to nvmupdate utility", "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\nAdd a facility to recover the result of a previously run AQ command.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: I21afec2c20c1a5e6ba60c7fbfcbedfff78c10e45\n---\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 79 +++++++++++++++++++++++++++\n drivers/net/ethernet/intel/i40e/i40e_type.h | 1 +\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 +\n 3 files changed, 81 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex f91294de..2142e10 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -620,6 +620,9 @@ static i40e_status i40e_nvmupd_nvm_read(struct i40e_hw *hw,\n static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw,\n \t\t\t\t struct i40e_nvm_access *cmd,\n \t\t\t\t u8 *bytes, int *perrno);\n+static i40e_status i40e_nvmupd_get_aq_result(struct i40e_hw *hw,\n+\t\t\t\t\t struct i40e_nvm_access *cmd,\n+\t\t\t\t\t u8 *bytes, int *perrno);\n static inline u8 i40e_nvmupd_get_module(u32 val)\n {\n \treturn (u8)(val & I40E_NVM_MOD_PNT_MASK);\n@@ -645,6 +648,7 @@ static char *i40e_nvm_update_state_str[] = {\n \t\"I40E_NVMUPD_CSUM_LCB\",\n \t\"I40E_NVMUPD_STATUS\",\n \t\"I40E_NVMUPD_EXEC_AQ\",\n+\t\"I40E_NVMUPD_GET_AQ_RESULT\",\n };\n \n /**\n@@ -834,6 +838,10 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,\n \t\tstatus = i40e_nvmupd_exec_aq(hw, cmd, bytes, perrno);\n \t\tbreak;\n \n+\tcase I40E_NVMUPD_GET_AQ_RESULT:\n+\t\tstatus = i40e_nvmupd_get_aq_result(hw, cmd, bytes, perrno);\n+\t\tbreak;\n+\n \tdefault:\n \t\ti40e_debug(hw, I40E_DEBUG_NVM,\n \t\t\t \"NVMUPD: bad cmd %s in init state\\n\",\n@@ -1049,6 +1057,8 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw,\n \t\tcase I40E_NVM_EXEC:\n \t\t\tif (module == 0xf)\n \t\t\t\tupd_cmd = I40E_NVMUPD_STATUS;\n+\t\t\telse if (module == 0)\n+\t\t\t\tupd_cmd = I40E_NVMUPD_GET_AQ_RESULT;\n \t\t\tbreak;\n \t\t}\n \t\tbreak;\n@@ -1162,6 +1172,75 @@ static i40e_status i40e_nvmupd_exec_aq(struct i40e_hw *hw,\n }\n \n /**\n+ * i40e_nvmupd_get_aq_result - Get the results from the previous exec_aq\n+ * @hw: pointer to hardware structure\n+ * @cmd: pointer to nvm update command buffer\n+ * @bytes: pointer to the data buffer\n+ * @perrno: pointer to return error code\n+ *\n+ * cmd structure contains identifiers and data buffer\n+ **/\n+static i40e_status i40e_nvmupd_get_aq_result(struct i40e_hw *hw,\n+\t\t\t\t\t struct i40e_nvm_access *cmd,\n+\t\t\t\t\t u8 *bytes, int *perrno)\n+{\n+\tu32 aq_total_len;\n+\tu32 aq_desc_len;\n+\tint remainder;\n+\tu8 *buff;\n+\n+\ti40e_debug(hw, I40E_DEBUG_NVM, \"NVMUPD: %s\\n\", __func__);\n+\n+\taq_desc_len = sizeof(struct i40e_aq_desc);\n+\taq_total_len = aq_desc_len + le16_to_cpu(hw->nvm_wb_desc.datalen);\n+\n+\t/* check offset range */\n+\tif (cmd->offset > aq_total_len) {\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM, \"%s: offset too big %d > %d\\n\",\n+\t\t\t __func__, cmd->offset, aq_total_len);\n+\t\t*perrno = -EINVAL;\n+\t\treturn I40E_ERR_PARAM;\n+\t}\n+\n+\t/* check copylength range */\n+\tif (cmd->data_size > (aq_total_len - cmd->offset)) {\n+\t\tint new_len = aq_total_len - cmd->offset;\n+\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM, \"%s: copy length %d too big, trimming to %d\\n\",\n+\t\t\t __func__, cmd->data_size, new_len);\n+\t\tcmd->data_size = new_len;\n+\t}\n+\n+\tremainder = cmd->data_size;\n+\tif (cmd->offset < aq_desc_len) {\n+\t\tu32 len = aq_desc_len - cmd->offset;\n+\n+\t\tlen = min(len, cmd->data_size);\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM, \"%s: aq_desc bytes %d to %d\\n\",\n+\t\t\t __func__, cmd->offset, cmd->offset + len);\n+\n+\t\tbuff = ((u8 *)&hw->nvm_wb_desc) + cmd->offset;\n+\t\tmemcpy(bytes, buff, len);\n+\n+\t\tbytes += len;\n+\t\tremainder -= len;\n+\t\tbuff = hw->nvm_buff.va;\n+\t} else {\n+\t\tbuff = hw->nvm_buff.va + (cmd->offset - aq_desc_len);\n+\t}\n+\n+\tif (remainder > 0) {\n+\t\tint start_byte = buff - (u8 *)hw->nvm_buff.va;\n+\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM, \"%s: databuf bytes %d to %d\\n\",\n+\t\t\t __func__, start_byte, start_byte + remainder);\n+\t\tmemcpy(bytes, buff, remainder);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+/**\n * i40e_nvmupd_nvm_read - Read NVM\n * @hw: pointer to hardware structure\n * @cmd: pointer to nvm update command buffer\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex cb36b2a..d1ec5a4 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -309,6 +309,7 @@ enum i40e_nvmupd_cmd {\n \tI40E_NVMUPD_CSUM_LCB,\n \tI40E_NVMUPD_STATUS,\n \tI40E_NVMUPD_EXEC_AQ,\n+\tI40E_NVMUPD_GET_AQ_RESULT,\n };\n \n enum i40e_nvmupd_state {\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex 5510220..a59b60f 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -308,6 +308,7 @@ enum i40e_nvmupd_cmd {\n \tI40E_NVMUPD_CSUM_LCB,\n \tI40E_NVMUPD_STATUS,\n \tI40E_NVMUPD_EXEC_AQ,\n+\tI40E_NVMUPD_GET_AQ_RESULT,\n };\n \n enum i40e_nvmupd_state {\n", "prefixes": [ "next", "S13", "05/15" ] }