Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512043/?format=api
{ "id": 512043, "url": "http://patchwork.ozlabs.org/api/patches/512043/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1440798961-17326-5-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-5-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-28T21:55:50", "name": "[next,S13,04/15] i40e/i40evf: add exec_aq command to nvmupdate utility", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d0dab2bfc2b33f5a67db75fca0f6068fa50ba76b", "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-5-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512043/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512043/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 0CC5214031B\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 29 Aug 2015 07:55:10 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9EFDE84662;\n\tFri, 28 Aug 2015 21:55:09 +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 2L8OSauVkRcz; Fri, 28 Aug 2015 21:55:08 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 8D6318B969;\n\tFri, 28 Aug 2015 21:55:08 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id C7E1F1CEB0B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:07 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id C310395EBB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:07 +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 o-KeM47MLWtr 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 1D3C195ECE\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:03 -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=\"634260273\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 28 Aug 2015 17:55:50 -0400", "Message-Id": "<1440798961-17326-5-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 04/15] i40e/i40evf: add exec_aq\n\tcommand 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 run AQ commands through the nvmupdate utility in order\nto allow the update tools to interact with the FW and do special\ncommands needed for updates and configuration changes.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: I5c41523e4055b37f8e4ee479f7a0574368f4a588\n---\n drivers/net/ethernet/intel/i40e/i40e_adminq.c | 3 +\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 83 +++++++++++++++++++++++++\n drivers/net/ethernet/intel/i40e/i40e_type.h | 2 +\n drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 3 +\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 2 +\n 5 files changed, 93 insertions(+)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\nindex 8ba4b60..3e1f0b2 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n@@ -657,6 +657,9 @@ i40e_status i40e_shutdown_adminq(struct i40e_hw *hw)\n \n \t/* destroy the locks */\n \n+\tif (hw->nvm_buff.va)\n+\t\ti40e_free_virt_mem(hw, &hw->nvm_buff);\n+\n \treturn ret_code;\n }\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex d21c652..f91294de 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -617,6 +617,9 @@ static i40e_status i40e_nvmupd_nvm_write(struct i40e_hw *hw,\n static i40e_status i40e_nvmupd_nvm_read(struct i40e_hw *hw,\n \t\t\t\t\tstruct i40e_nvm_access *cmd,\n \t\t\t\t\tu8 *bytes, int *perrno);\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 inline u8 i40e_nvmupd_get_module(u32 val)\n {\n \treturn (u8)(val & I40E_NVM_MOD_PNT_MASK);\n@@ -641,6 +644,7 @@ static char *i40e_nvm_update_state_str[] = {\n \t\"I40E_NVMUPD_CSUM_SA\",\n \t\"I40E_NVMUPD_CSUM_LCB\",\n \t\"I40E_NVMUPD_STATUS\",\n+\t\"I40E_NVMUPD_EXEC_AQ\",\n };\n \n /**\n@@ -826,6 +830,10 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,\n \t\t}\n \t\tbreak;\n \n+\tcase I40E_NVMUPD_EXEC_AQ:\n+\t\tstatus = i40e_nvmupd_exec_aq(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@@ -1071,6 +1079,10 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw,\n \t\tcase (I40E_NVM_CSUM|I40E_NVM_LCB):\n \t\t\tupd_cmd = I40E_NVMUPD_CSUM_LCB;\n \t\t\tbreak;\n+\t\tcase I40E_NVM_EXEC:\n+\t\t\tif (module == 0)\n+\t\t\t\tupd_cmd = I40E_NVMUPD_EXEC_AQ;\n+\t\t\tbreak;\n \t\t}\n \t\tbreak;\n \t}\n@@ -1079,6 +1091,77 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw,\n }\n \n /**\n+ * i40e_nvmupd_exec_aq - Run an AQ command\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_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+{\n+\tstruct i40e_asq_cmd_details cmd_details;\n+\ti40e_status status;\n+\tstruct i40e_aq_desc *aq_desc;\n+\tu32 buff_size = 0;\n+\tu8 *buff = NULL;\n+\tu32 aq_desc_len;\n+\tu32 aq_data_len;\n+\n+\ti40e_debug(hw, I40E_DEBUG_NVM, \"NVMUPD: %s\\n\", __func__);\n+\tmemset(&cmd_details, 0, sizeof(cmd_details));\n+\tcmd_details.wb_desc = &hw->nvm_wb_desc;\n+\n+\taq_desc_len = sizeof(struct i40e_aq_desc);\n+\tmemset(&hw->nvm_wb_desc, 0, aq_desc_len);\n+\n+\t/* get the aq descriptor */\n+\tif (cmd->data_size < aq_desc_len) {\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM,\n+\t\t\t \"NVMUPD: not enough aq desc bytes for exec, size %d < %d\\n\",\n+\t\t\t cmd->data_size, aq_desc_len);\n+\t\t*perrno = -EINVAL;\n+\t\treturn I40E_ERR_PARAM;\n+\t}\n+\taq_desc = (struct i40e_aq_desc *)bytes;\n+\n+\t/* if data buffer needed, make sure it's ready */\n+\taq_data_len = cmd->data_size - aq_desc_len;\n+\tbuff_size = max_t(u32, aq_data_len, le16_to_cpu(aq_desc->datalen));\n+\tif (buff_size) {\n+\t\tif (!hw->nvm_buff.va) {\n+\t\t\tstatus = i40e_allocate_virt_mem(hw, &hw->nvm_buff,\n+\t\t\t\t\t\t\thw->aq.asq_buf_size);\n+\t\t\tif (status)\n+\t\t\t\ti40e_debug(hw, I40E_DEBUG_NVM,\n+\t\t\t\t\t \"NVMUPD: i40e_allocate_virt_mem for exec buff failed, %d\\n\",\n+\t\t\t\t\t status);\n+\t\t}\n+\n+\t\tif (hw->nvm_buff.va) {\n+\t\t\tbuff = hw->nvm_buff.va;\n+\t\t\tmemcpy(buff, &bytes[aq_desc_len], aq_data_len);\n+\t\t}\n+\t}\n+\n+\t/* and away we go! */\n+\tstatus = i40e_asq_send_command(hw, aq_desc, buff,\n+\t\t\t\t buff_size, &cmd_details);\n+\tif (status) {\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM,\n+\t\t\t \"i40e_nvmupd_exec_aq err %s aq_err %s\\n\",\n+\t\t\t i40e_stat_str(hw, status),\n+\t\t\t i40e_aq_str(hw, hw->aq.asq_last_status));\n+\t\t*perrno = i40e_aq_rc_to_posix(status, hw->aq.asq_last_status);\n+\t}\n+\n+\treturn status;\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 dd0f709..cb36b2a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -308,6 +308,7 @@ enum i40e_nvmupd_cmd {\n \tI40E_NVMUPD_CSUM_SA,\n \tI40E_NVMUPD_CSUM_LCB,\n \tI40E_NVMUPD_STATUS,\n+\tI40E_NVMUPD_EXEC_AQ,\n };\n \n enum i40e_nvmupd_state {\n@@ -499,6 +500,7 @@ struct i40e_hw {\n \t/* state of nvm update process */\n \tenum i40e_nvmupd_state nvmupd_state;\n \tstruct i40e_aq_desc nvm_wb_desc;\n+\tstruct i40e_virt_mem nvm_buff;\n \n \t/* HMC info */\n \tstruct i40e_hmc_info hmc; /* HMC info struct */\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c\nindex 48cce43f..cb21e01 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_adminq.c\n@@ -596,6 +596,9 @@ i40e_status i40evf_shutdown_adminq(struct i40e_hw *hw)\n \n \t/* destroy the locks */\n \n+\tif (hw->nvm_buff.va)\n+\t\ti40e_free_virt_mem(hw, &hw->nvm_buff);\n+\n \treturn ret_code;\n }\n \ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex 00f4956..5510220 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -307,6 +307,7 @@ enum i40e_nvmupd_cmd {\n \tI40E_NVMUPD_CSUM_SA,\n \tI40E_NVMUPD_CSUM_LCB,\n \tI40E_NVMUPD_STATUS,\n+\tI40E_NVMUPD_EXEC_AQ,\n };\n \n enum i40e_nvmupd_state {\n@@ -493,6 +494,7 @@ struct i40e_hw {\n \t/* state of nvm update process */\n \tenum i40e_nvmupd_state nvmupd_state;\n \tstruct i40e_aq_desc nvm_wb_desc;\n+\tstruct i40e_virt_mem nvm_buff;\n \n \t/* HMC info */\n \tstruct i40e_hmc_info hmc; /* HMC info struct */\n", "prefixes": [ "next", "S13", "04/15" ] }