Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512046/?format=api
{ "id": 512046, "url": "http://patchwork.ozlabs.org/api/patches/512046/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1440798961-17326-4-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-4-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-28T21:55:49", "name": "[next,S13,03/15] i40e/i40evf: add wait states to NVM state machine", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "255740d14f6c96a17d2d50dc52c7c07f63f3e2f0", "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-4-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512046/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512046/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 43F7114031B\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 948EA8B978;\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 Ksng8aDKU8uK; Fri, 28 Aug 2015 21:55:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F184D8B97C;\n\tFri, 28 Aug 2015 21:55:11 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 995B71CEB0B\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 9504395ECE\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 qo7rc8fwJVPR 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 0194F95ECA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 28 Aug 2015 21:55:06 +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=\"634260269\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Fri, 28 Aug 2015 17:55:49 -0400", "Message-Id": "<1440798961-17326-4-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 03/15] i40e/i40evf: add wait\n\tstates to NVM state machine", "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 wait states to the NVM update state machine to signify when\nwaiting for an update operation to finish, whether we're in the middle\nof a set of Write operations, or we're now idle but waiting.\n\nSigned-off-by: Shannon Nelson <shannon.nelson@intel.com>\nChange-ID: Iabe91d6579ef6a2ea560647e374035656211ab43\n---\n drivers/net/ethernet/intel/i40e/i40e_adminq.c | 13 ++++++++\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 48 ++++++++++++++++++++-------\n drivers/net/ethernet/intel/i40e/i40e_type.h | 4 ++-\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 4 ++-\n 4 files changed, 55 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\nindex 00404fe..8ba4b60 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n@@ -1020,6 +1020,19 @@ clean_arq_element_out:\n \t\t\ti40e_release_nvm(hw);\n \t\t\thw->aq.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 \treturn ret_code;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex 034e27a..d21c652 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -698,6 +698,12 @@ i40e_status i40e_nvmupd_command(struct i40e_hw *hw,\n \t\tstatus = i40e_nvmupd_state_writing(hw, cmd, bytes, perrno);\n \t\tbreak;\n \n+\tcase I40E_NVMUPD_STATE_INIT_WAIT:\n+\tcase I40E_NVMUPD_STATE_WRITE_WAIT:\n+\t\tstatus = I40E_ERR_NOT_READY;\n+\t\t*perrno = -EBUSY;\n+\t\tbreak;\n+\n \tdefault:\n \t\t/* invalid state, should never happen */\n \t\ti40e_debug(hw, I40E_DEBUG_NVM,\n@@ -761,10 +767,12 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,\n \t\t\t\t\t\t hw->aq.asq_last_status);\n \t\t} else {\n \t\t\tstatus = i40e_nvmupd_nvm_erase(hw, cmd, perrno);\n-\t\t\tif (status)\n+\t\t\tif (status) {\n \t\t\t\ti40e_release_nvm(hw);\n-\t\t\telse\n+\t\t\t} else {\n \t\t\t\thw->aq.nvm_release_on_done = true;\n+\t\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;\n+\t\t\t}\n \t\t}\n \t\tbreak;\n \n@@ -775,10 +783,12 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,\n \t\t\t\t\t\t hw->aq.asq_last_status);\n \t\t} else {\n \t\t\tstatus = i40e_nvmupd_nvm_write(hw, cmd, bytes, perrno);\n-\t\t\tif (status)\n+\t\t\tif (status) {\n \t\t\t\ti40e_release_nvm(hw);\n-\t\t\telse\n+\t\t\t} else {\n \t\t\t\thw->aq.nvm_release_on_done = true;\n+\t\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;\n+\t\t\t}\n \t\t}\n \t\tbreak;\n \n@@ -792,7 +802,7 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,\n \t\t\tif (status)\n \t\t\t\ti40e_release_nvm(hw);\n \t\t\telse\n-\t\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;\n+\t\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_WRITE_WAIT;\n \t\t}\n \t\tbreak;\n \n@@ -811,6 +821,7 @@ static i40e_status i40e_nvmupd_state_init(struct i40e_hw *hw,\n \t\t\t\ti40e_release_nvm(hw);\n \t\t\t} else {\n \t\t\t\thw->aq.nvm_release_on_done = true;\n+\t\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;\n \t\t\t}\n \t\t}\n \t\tbreak;\n@@ -840,7 +851,7 @@ static i40e_status i40e_nvmupd_state_reading(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-\ti40e_status status;\n+\ti40e_status status = 0;\n \tenum i40e_nvmupd_cmd upd_cmd;\n \n \tupd_cmd = i40e_nvmupd_validate_command(hw, cmd, perrno);\n@@ -882,7 +893,7 @@ static i40e_status i40e_nvmupd_state_writing(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-\ti40e_status status;\n+\ti40e_status status = 0;\n \tenum i40e_nvmupd_cmd upd_cmd;\n \tbool retry_attempt = false;\n \n@@ -892,13 +903,22 @@ retry:\n \tswitch (upd_cmd) {\n \tcase I40E_NVMUPD_WRITE_CON:\n \t\tstatus = i40e_nvmupd_nvm_write(hw, cmd, bytes, perrno);\n+\t\tif (!status)\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_WRITE_WAIT;\n \t\tbreak;\n \n \tcase I40E_NVMUPD_WRITE_LCB:\n \t\tstatus = i40e_nvmupd_nvm_write(hw, cmd, bytes, perrno);\n-\t\tif (!status)\n+\t\tif (status) {\n+\t\t\t*perrno = hw->aq.asq_last_status ?\n+\t\t\t\t i40e_aq_rc_to_posix(status,\n+\t\t\t\t\t\t hw->aq.asq_last_status) :\n+\t\t\t\t -EIO;\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT;\n+\t\t} else {\n \t\t\thw->aq.nvm_release_on_done = true;\n-\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT;\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;\n+\t\t}\n \t\tbreak;\n \n \tcase I40E_NVMUPD_CSUM_CON:\n@@ -909,19 +929,23 @@ retry:\n \t\t\t\t\t\t hw->aq.asq_last_status) :\n \t\t\t\t -EIO;\n \t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT;\n+\t\t} else {\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_WRITE_WAIT;\n \t\t}\n \t\tbreak;\n \n \tcase I40E_NVMUPD_CSUM_LCB:\n \t\tstatus = i40e_update_nvm_checksum(hw);\n-\t\tif (status)\n+\t\tif (status) {\n \t\t\t*perrno = hw->aq.asq_last_status ?\n \t\t\t\t i40e_aq_rc_to_posix(status,\n \t\t\t\t\t\t hw->aq.asq_last_status) :\n \t\t\t\t -EIO;\n-\t\telse\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT;\n+\t\t} else {\n \t\t\thw->aq.nvm_release_on_done = true;\n-\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT;\n+\t\t\thw->nvmupd_state = I40E_NVMUPD_STATE_INIT_WAIT;\n+\t\t}\n \t\tbreak;\n \n \tdefault:\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex 20e16ed..dd0f709 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -313,7 +313,9 @@ enum i40e_nvmupd_cmd {\n enum i40e_nvmupd_state {\n \tI40E_NVMUPD_STATE_INIT,\n \tI40E_NVMUPD_STATE_READING,\n-\tI40E_NVMUPD_STATE_WRITING\n+\tI40E_NVMUPD_STATE_WRITING,\n+\tI40E_NVMUPD_STATE_INIT_WAIT,\n+\tI40E_NVMUPD_STATE_WRITE_WAIT,\n };\n \n /* nvm_access definition and its masks/shifts need to be accessible to\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex ee02e25..00f4956 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -312,7 +312,9 @@ enum i40e_nvmupd_cmd {\n enum i40e_nvmupd_state {\n \tI40E_NVMUPD_STATE_INIT,\n \tI40E_NVMUPD_STATE_READING,\n-\tI40E_NVMUPD_STATE_WRITING\n+\tI40E_NVMUPD_STATE_WRITING,\n+\tI40E_NVMUPD_STATE_INIT_WAIT,\n+\tI40E_NVMUPD_STATE_WRITE_WAIT,\n };\n \n /* nvm_access definition and its masks/shifts need to be accessible to\n", "prefixes": [ "next", "S13", "03/15" ] }