Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/602595/?format=api
{ "id": 602595, "url": "http://patchwork.ozlabs.org/api/patches/602595/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1459163845-28035-12-git-send-email-harshitha.ramamurthy@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": "<1459163845-28035-12-git-send-email-harshitha.ramamurthy@intel.com>", "list_archive_url": null, "date": "2016-03-28T11:17:22", "name": "[next,S32,11/14] i40e: Move NVM event wait check to NVM code", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "a70041233927cf83229475ab512851a30a768445", "submitter": { "id": 68642, "url": "http://patchwork.ozlabs.org/api/people/68642/?format=api", "name": "Harshitha Ramamurthy", "email": "harshitha.ramamurthy@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/1459163845-28035-12-git-send-email-harshitha.ramamurthy@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/602595/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/602595/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 3qYkMT0ktxz9sBc\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Mar 2016 06:23:01 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id C3C4488908;\n\tMon, 28 Mar 2016 19:23:00 +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 Hu69QQdo6v-D; Mon, 28 Mar 2016 19:22:58 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 3887D888F7;\n\tMon, 28 Mar 2016 19:22:56 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 7D7911C15FF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Mar 2016 19:22:53 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 7BBB68B749\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Mar 2016 19:22:53 +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 96b60auDHXD1 for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Mar 2016 19:22:52 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id B84BC8B772\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 28 Mar 2016 19:22:51 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby fmsmga101.fm.intel.com with ESMTP; 28 Mar 2016 12:22:51 -0700", "from harshitha-linux1.jf.intel.com ([10.166.45.81])\n\tby orsmga002.jf.intel.com with ESMTP; 28 Mar 2016 12:22:51 -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.24,408,1455004800\"; d=\"scan'208\";a=\"943132230\"", "From": "Harshitha Ramamurthy <harshitha.ramamurthy@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 28 Mar 2016 04:17:22 -0700", "Message-Id": "<1459163845-28035-12-git-send-email-harshitha.ramamurthy@intel.com>", "X-Mailer": "git-send-email 2.4.3", "In-Reply-To": "<1459163845-28035-1-git-send-email-harshitha.ramamurthy@intel.com>", "References": "<1459163845-28035-1-git-send-email-harshitha.ramamurthy@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S32 11/14] i40e: Move NVM event wait\n\tcheck to NVM code", "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\nThe logic that checks AQ events for NVM done events is better kept\nin nvm.c with the rest of the nvmupdate handling code.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: I2ea58980df8ecaa3726b28a37bff3dfcb8df03dc\n---\nTesting Hints:\n\tCompile code and run nvmupdate\n\n drivers/net/ethernet/intel/i40e/i40e_adminq.c | 31 +-----------------------\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 31 ++++++++++++++++++++++++\n drivers/net/ethernet/intel/i40e/i40e_prototype.h | 1 +\n 3 files changed, 33 insertions(+), 30 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\nindex e8278e1..43bb413 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n@@ -33,16 +33,6 @@\n static void i40e_resume_aq(struct i40e_hw *hw);\n \n /**\n- * i40e_is_nvm_update_op - return true if this is an NVM update operation\n- * @desc: API request descriptor\n- **/\n-static inline bool i40e_is_nvm_update_op(struct i40e_aq_desc *desc)\n-{\n-\treturn (desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_erase)) ||\n-\t\t(desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_update));\n-}\n-\n-/**\n * i40e_adminq_init_regs - Initialize AdminQ registers\n * @hw: pointer to the hardware structure\n *\n@@ -1023,26 +1013,7 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw,\n \thw->aq.arq.next_to_clean = ntc;\n \thw->aq.arq.next_to_use = ntu;\n \n-\tif (i40e_is_nvm_update_op(&e->desc)) {\n-\t\tif (hw->nvm_release_on_done) {\n-\t\t\ti40e_release_nvm(hw);\n-\t\t\thw->nvm_release_on_done = false;\n-\t\t}\n-\n-\t\tswitch (hw->nvmupd_state) {\n-\t\tcase I40E_NVMUPD_STATE_INIT_WAIT:\n-\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT;\n-\t\t\tbreak;\n-\n-\t\tcase I40E_NVMUPD_STATE_WRITE_WAIT:\n-\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;\n-\t\t\tbreak;\n-\n-\t\tdefault:\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\n+\ti40e_nvmupd_check_wait_event(hw, le16_to_cpu(e->desc.opcode));\n clean_arq_element_out:\n \t/* Set pending if needed, unlock and return */\n \tif (pending)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex 1ae29ac..f2cea3d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -1030,6 +1030,37 @@ retry:\n }\n \n /**\n+ * i40e_nvmupd_check_wait_event - handle NVM update operation events\n+ * @hw: pointer to the hardware structure\n+ * @opcode: the event that just happened\n+ **/\n+void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, u16 opcode)\n+{\n+\tif (opcode == i40e_aqc_opc_nvm_erase ||\n+\t opcode == i40e_aqc_opc_nvm_update) {\n+\t\ti40e_debug(hw, I40E_DEBUG_NVM,\n+\t\t\t \"NVMUPD: clearing wait on opcode 0x%04x\\n\", opcode);\n+\t\tif (hw->nvm_release_on_done) {\n+\t\t\ti40e_release_nvm(hw);\n+\t\t\thw->nvm_release_on_done = false;\n+\t\t}\n+\n+\t\tswitch (hw->nvmupd_state) {\n+\t\tcase I40E_NVMUPD_STATE_INIT_WAIT:\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT;\n+\t\t\tbreak;\n+\n+\t\tcase I40E_NVMUPD_STATE_WRITE_WAIT:\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;\n+\t\t\tbreak;\n+\n+\t\tdefault:\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+}\n+\n+/**\n * i40e_nvmupd_validate_command - Validate given command\n * @hw: pointer to hardware structure\n * @cmd: pointer to nvm update command buffer\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\nindex d51eee5..134035f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n@@ -308,6 +308,7 @@ i40e_status i40e_validate_nvm_checksum(struct i40e_hw *hw,\n i40e_status i40e_nvmupd_command(struct i40e_hw *hw,\n \t\t\t\tstruct i40e_nvm_access *cmd,\n \t\t\t\tu8 *bytes, int *);\n+void i40e_nvmupd_check_wait_event(struct i40e_hw *hw, u16 opcode);\n void i40e_set_pci_config_data(struct i40e_hw *hw, u16 link_status);\n \n extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];\n", "prefixes": [ "next", "S32", "11/14" ] }