Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1135868/?format=api
{ "id": 1135868, "url": "http://patchwork.ozlabs.org/api/patches/1135868/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190723100144.57435-11-alice.michael@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": "<20190723100144.57435-11-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-07-23T10:01:43", "name": "[next,S8,11/12] i40e: Persistent lldp support", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c0c9d4e3450f52983ac13bd009f00ace9c77caa1", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20190723100144.57435-11-alice.michael@intel.com/mbox/", "series": [ { "id": 121043, "url": "http://patchwork.ozlabs.org/api/series/121043/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=121043", "date": "2019-07-23T10:01:38", "name": "[next,S8,01/12] i40e: fix shifts of signed values", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/121043/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1135868/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1135868/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@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" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.136; helo=silver.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 45tRfl6mdxz9s7T\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 24 Jul 2019 04:22:55 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 0A2802035E;\n\tTue, 23 Jul 2019 18:22:54 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id V2huq0V8LA19; Tue, 23 Jul 2019 18:22:45 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id B7158204F2;\n\tTue, 23 Jul 2019 18:22:45 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 12C991BF2A5\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:42 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 0FD56857E2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:42 +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 Tqq3_dSjUkWT for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:40 +0000 (UTC)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 1DDE7857D8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 23 Jul 2019 18:22:40 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t23 Jul 2019 11:22:37 -0700", "from alicemic-1.jf.intel.com ([10.166.17.62])\n\tby orsmga003.jf.intel.com with ESMTP; 23 Jul 2019 11:22:35 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,299,1559545200\"; d=\"scan'208\";a=\"172037679\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 23 Jul 2019 06:01:43 -0400", "Message-Id": "<20190723100144.57435-11-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190723100144.57435-1-alice.michael@intel.com>", "References": "<20190723100144.57435-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S8 11/12] i40e: Persistent lldp\n\tsupport", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "Sylwia Wnuczko <sylwia.wnuczko@intel.com>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Sylwia Wnuczko <sylwia.wnuczko@intel.com>\n\nThis patch adds a function to read nvm module data and uses it to\nread current lldp agent configuration from nvm api version 1.8.\n\nTitle: i40e-shared: Persistent lldp support\nChange-type: FeatureImplementation\n\nSigned-off-by: Sylwia Wnuczko <sylwia.wnuczko@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_dcb.c | 18 +++-\n drivers/net/ethernet/intel/i40e/i40e_dcb.h | 2 +\n drivers/net/ethernet/intel/i40e/i40e_nvm.c | 101 ++++++++++++++++++\n .../net/ethernet/intel/i40e/i40e_prototype.h | 6 ++\n drivers/net/ethernet/intel/i40e/i40e_type.h | 1 +\n 5 files changed, 127 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\nindex 292eeb3def10..200a1cb3b536 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c\n@@ -877,7 +877,23 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw, bool enable_mib_change)\n \t\treturn I40E_NOT_SUPPORTED;\n \n \t/* Read LLDP NVM area */\n-\tret = i40e_read_lldp_cfg(hw, &lldp_cfg);\n+\tif (hw->flags & I40E_HW_FLAG_FW_LLDP_PERSISTENT) {\n+\t\tu8 offset = 0;\n+\n+\t\tif (hw->mac.type == I40E_MAC_XL710)\n+\t\t\toffset = I40E_LLDP_CURRENT_STATUS_XL710_OFFSET;\n+\t\telse if (hw->mac.type == I40E_MAC_X722)\n+\t\t\toffset = I40E_LLDP_CURRENT_STATUS_X722_OFFSET;\n+\t\telse\n+\t\t\treturn I40E_NOT_SUPPORTED;\n+\n+\t\tret = i40e_read_nvm_module_data(hw,\n+\t\t\t\t\t\tI40E_SR_EMP_SR_SETTINGS_PTR,\n+\t\t\t\t\t\toffset, 1,\n+\t\t\t\t\t\t&lldp_cfg.adminstatus);\n+\t} else {\n+\t\tret = i40e_read_lldp_cfg(hw, &lldp_cfg);\n+\t}\n \tif (ret)\n \t\treturn I40E_ERR_NOT_READY;\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.h b/drivers/net/ethernet/intel/i40e/i40e_dcb.h\nindex ddb48ae7cce4..2a80c5daa376 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_dcb.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.h\n@@ -30,6 +30,8 @@\n #define I40E_CEE_SUBTYPE_APP_PRI\t4\n \n #define I40E_CEE_MAX_FEAT_TYPE\t\t3\n+#define I40E_LLDP_CURRENT_STATUS_XL710_OFFSET\t0x2B\n+#define I40E_LLDP_CURRENT_STATUS_X722_OFFSET\t0x31\n /* Defines for LLDP TLV header */\n #define I40E_LLDP_TLV_LEN_SHIFT\t\t0\n #define I40E_LLDP_TLV_LEN_MASK\t\t(0x01FF << I40E_LLDP_TLV_LEN_SHIFT)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\nindex a60ab9d48065..28ea53d910ad 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c\n@@ -321,6 +321,77 @@ i40e_status i40e_read_nvm_word(struct i40e_hw *hw, u16 offset,\n \treturn ret_code;\n }\n \n+/**\n+ * i40e_read_nvm_module_data - Reads NVM Buffer to specified memory location\n+ * @hw: pointer to the HW structure\n+ * @module_ptr: Pointer to module in words with respect to NVM beginning\n+ * @offset: offset in words from module start\n+ * @words_data_size: Words to read from NVM\n+ * @data_ptr: Pointer to memory location where resulting buffer will be stored\n+ **/\n+i40e_status i40e_read_nvm_module_data(struct i40e_hw *hw,\n+\t\t\t\t\t\tu8 module_ptr, u16 offset,\n+\t\t\t\t\t\tu16 words_data_size,\n+\t\t\t\t\t\tu16 *data_ptr)\n+{\n+\ti40e_status status;\n+\tu16 ptr_value = 0;\n+\tu32 flat_offset;\n+\n+\tif (module_ptr != 0) {\n+\t\tstatus = i40e_read_nvm_word(hw, module_ptr, &ptr_value);\n+\t\tif (status) {\n+\t\t\ti40e_debug(hw, I40E_DEBUG_ALL,\n+\t\t\t\t \"Reading nvm word failed.Error code: %d.\\n\",\n+\t\t\t\t status);\n+\t\t\treturn I40E_ERR_NVM;\n+\t\t}\n+\t}\n+#define I40E_NVM_INVALID_PTR_VAL 0x7FFF\n+#define I40E_NVM_INVALID_VAL 0xFFFF\n+\n+\t/* Pointer not initialized */\n+\tif (ptr_value == I40E_NVM_INVALID_PTR_VAL ||\n+\t ptr_value == I40E_NVM_INVALID_VAL)\n+\t\treturn I40E_ERR_BAD_PTR;\n+\n+\t/* Check whether the module is in SR mapped area or outside */\n+\tif (ptr_value & I40E_PTR_TYPE) {\n+\t\t/* Pointer points outside of the Shared RAM mapped area */\n+\t\tptr_value &= ~I40E_PTR_TYPE;\n+\n+\t\t/* PtrValue in 4kB units, need to convert to words */\n+\t\tptr_value /= 2;\n+\t\tflat_offset = ((u32)ptr_value * 0x1000) + (u32)offset;\n+\t\tstatus = i40e_acquire_nvm(hw, I40E_RESOURCE_READ);\n+\t\tif (!status) {\n+\t\t\tstatus = i40e_aq_read_nvm(hw, 0, 2 * flat_offset,\n+\t\t\t\t\t\t 2 * words_data_size,\n+\t\t\t\t\t\t data_ptr, true, NULL);\n+\t\t\ti40e_release_nvm(hw);\n+\t\t\tif (status) {\n+\t\t\t\ti40e_debug(hw, I40E_DEBUG_ALL,\n+\t\t\t\t\t \"Reading nvm aq failed.Error code: %d.\\n\",\n+\t\t\t\t\t status);\n+\t\t\t\treturn I40E_ERR_NVM;\n+\t\t\t}\n+\t\t} else {\n+\t\t\treturn I40E_ERR_NVM;\n+\t\t}\n+\t} else {\n+\t\t/* Read from the Shadow RAM */\n+\t\tstatus = i40e_read_nvm_buffer(hw, ptr_value + offset,\n+\t\t\t\t\t &words_data_size, data_ptr);\n+\t\tif (status) {\n+\t\t\ti40e_debug(hw, I40E_DEBUG_ALL,\n+\t\t\t\t \"Reading nvm buffer failed.Error code: %d.\\n\",\n+\t\t\t\t status);\n+\t\t}\n+\t}\n+\n+\treturn status;\n+}\n+\n /**\n * i40e_read_nvm_buffer_srctl - Reads Shadow RAM buffer via SRCTL register\n * @hw: pointer to the HW structure\n@@ -429,6 +500,36 @@ static i40e_status __i40e_read_nvm_buffer(struct i40e_hw *hw,\n \treturn i40e_read_nvm_buffer_srctl(hw, offset, words, data);\n }\n \n+/**\n+ * i40e_read_nvm_buffer - Reads Shadow RAM buffer 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+ * @words: (in) number of words to read; (out) number of words actually read\n+ * @data: words read from the Shadow RAM\n+ *\n+ * Reads 16 bit words (data buffer) from the SR using the i40e_read_nvm_srrd()\n+ * method. The buffer read is preceded by the NVM ownership take\n+ * and followed by the release.\n+ **/\n+i40e_status i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset,\n+\t\t\t\t\t u16 *words, u16 *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_buffer_aq(hw, offset, words,\n+\t\t\t\t\t\t\t data);\n+\t\t\ti40e_release_nvm(hw);\n+\t\t}\n+\t} else {\n+\t\tret_code = i40e_read_nvm_buffer_srctl(hw, offset, words, data);\n+\t}\n+\n+\treturn ret_code;\n+}\n+\n /**\n * i40e_write_nvm_aq - Writes Shadow RAM.\n * @hw: pointer to the HW structure.\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\nindex 9c810d54df1c..33945fb2dd2d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h\n@@ -315,6 +315,12 @@ i40e_status i40e_acquire_nvm(struct i40e_hw *hw,\n void i40e_release_nvm(struct i40e_hw *hw);\n i40e_status i40e_read_nvm_word(struct i40e_hw *hw, u16 offset,\n \t\t\t\t\t u16 *data);\n+i40e_status i40e_read_nvm_module_data(struct i40e_hw *hw,\n+\t\t\t\t\t\tu8 module_ptr, u16 offset,\n+\t\t\t\t\t\tu16 words_data_size,\n+\t\t\t\t\t\tu16 *data_ptr);\n+i40e_status i40e_read_nvm_buffer(struct i40e_hw *hw, u16 offset,\n+\t\t\t\t\t u16 *words, u16 *data);\n i40e_status i40e_update_nvm_checksum(struct i40e_hw *hw);\n i40e_status i40e_validate_nvm_checksum(struct i40e_hw *hw,\n \t\t\t\t\t\t u16 *checksum);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex 06e2499de363..0f4994bd089a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -1318,6 +1318,7 @@ struct i40e_hw_port_stats {\n #define I40E_SR_VPD_PTR\t\t\t\t0x2F\n #define I40E_SR_PCIE_ALT_AUTO_LOAD_PTR\t\t0x3E\n #define I40E_SR_SW_CHECKSUM_WORD\t\t0x3F\n+#define I40E_SR_EMP_SR_SETTINGS_PTR\t\t0x48\n \n /* Auxiliary field, mask and shift definition for Shadow RAM and NVM Flash */\n #define I40E_SR_VPD_MODULE_MAX_SIZE\t\t1024\n", "prefixes": [ "next", "S8", "11/12" ] }