Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/560298/?format=api
{ "id": 560298, "url": "http://patchwork.ozlabs.org/api/patches/560298/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1450823114-29514-5-git-send-email-deepthi.kavalur@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": "<1450823114-29514-5-git-send-email-deepthi.kavalur@intel.com>", "list_archive_url": null, "date": "2015-12-22T22:25:06", "name": "[next,S24,04/12] i40e: X722 changes to access nvm", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": false, "hash": "de4645f30e0286fccc6fb3e97503ea5821b434b2", "submitter": { "id": 67654, "url": "http://patchwork.ozlabs.org/api/people/67654/?format=api", "name": "Deepthi Kavalur", "email": "deepthi.kavalur@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/1450823114-29514-5-git-send-email-deepthi.kavalur@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/560298/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/560298/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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ozlabs.org (Postfix) with ESMTP id 519DA14030F\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 23 Dec 2015 09:25:17 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A50749590D;\n\tTue, 22 Dec 2015 22:25:16 +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 J5IVKVW9fD0A; Tue, 22 Dec 2015 22:25:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id D7E9E958F8;\n\tTue, 22 Dec 2015 22:25:15 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 726681C161D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:14 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 702C7925B5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:14 +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 QZ9FKWftZXMV for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:13 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 95142922F1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 22 Dec 2015 22:25:13 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP; 22 Dec 2015 14:25:13 -0800", "from dkavalur-mobl.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.61])\n\tby orsmga002.jf.intel.com with ESMTP; 22 Dec 2015 14:25:13 -0800" ], "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.20,466,1444719600\"; d=\"scan'208\";a=\"877072052\"", "From": "Deepthi Kavalur <deepthi.kavalur@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 22 Dec 2015 14:25:06 -0800", "Message-Id": "<1450823114-29514-5-git-send-email-deepthi.kavalur@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1450823114-29514-1-git-send-email-deepthi.kavalur@intel.com>", "References": "<1450823114-29514-1-git-send-email-deepthi.kavalur@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S24 04/12] i40e: X722 changes to\n\taccess nvm", "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: Anjali Singhai Jain <anjali.singhai@intel.com>\n\nX722 does not have access to SRCTL registers, it has to do this through\nthe AQ.\n\nSigned-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 49 ++++++++++++++++++------------\n 1 file changed, 30 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex 79c0053..59edd33 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -212,24 +212,6 @@ read_nvm_exit:\n }\n \n /**\n- * __i40e_read_nvm_word - Reads nvm word, assumes caller does the locking\n- * @hw: pointer to the HW structure\n- * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF)\n- * @data: word read from the Shadow RAM\n- *\n- * Reads one 16 bit word from the Shadow RAM using the GLNVM_SRCTL register.\n- **/\n-static i40e_status __i40e_read_nvm_word(struct i40e_hw *hw,\n-\t\t\t\t\tu16 offset,\n-\t\t\t\t\tu16 *data)\n-{\n-\ti40e_status ret_code = 0;\n-\n-\tret_code = i40e_read_nvm_word_srctl(hw, offset, data);\n-\treturn ret_code;\n-}\n-\n-/**\n * i40e_read_nvm_aq - Read Shadow RAM.\n * @hw: pointer to the HW structure.\n * @module_pointer: module pointer location in words from the NVM beginning\n@@ -298,6 +280,32 @@ static i40e_status i40e_read_nvm_word_aq(struct i40e_hw *hw, u16 offset,\n }\n \n /**\n+ * __i40e_read_nvm_word - Reads nvm word, assumes caller does the locking\n+ * @hw: pointer to the HW structure\n+ * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF)\n+ * @data: word read from the Shadow RAM\n+ *\n+ * Reads one 16 bit word from the Shadow RAM using the GLNVM_SRCTL register.\n+ **/\n+static i40e_status __i40e_read_nvm_word(struct i40e_hw *hw,\n+\t\t\t\t\tu16 offset,\n+\t\t\t\t\tu16 *data)\n+{\n+\ti40e_status ret_code = 0;\n+\n+\tif (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE) {\n+\t\tret_code = i40e_acquire_nvm(hw, I40E_RESOURCE_READ);\n+\t\tif (!ret_code) {\n+\t\t\tret_code = i40e_read_nvm_word_aq(hw, offset, data);\n+\t\t\ti40e_release_nvm(hw);\n+\t\t}\n+\t} else {\n+\t\t\tret_code = i40e_read_nvm_word_srctl(hw, offset, data);\n+\t}\n+\treturn ret_code;\n+}\n+\n+/**\n * i40e_read_nvm_word - Reads nvm word and acquire lock if necessary\n * @hw: pointer to the HW structure\n * @offset: offset of the Shadow RAM word to read (0x000000 - 0x001FFF)\n@@ -427,7 +435,10 @@ static i40e_status __i40e_read_nvm_buffer(struct i40e_hw *hw,\n {\n \ti40e_status ret_code = 0;\n \n-\tret_code = i40e_read_nvm_buffer_srctl(hw, offset, words, data);\n+\tif (hw->flags & I40E_HW_FLAG_AQ_SRCTL_ACCESS_ENABLE)\n+\t\tret_code = i40e_read_nvm_buffer_aq(hw, offset, words, data);\n+\telse\n+\t\tret_code = i40e_read_nvm_buffer_srctl(hw, offset, words, data);\n \treturn ret_code;\n }\n \n", "prefixes": [ "next", "S24", "04/12" ] }