Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512635/?format=api
{ "id": 512635, "url": "http://patchwork.ozlabs.org/api/patches/512635/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1441065295-234333-6-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": "<1441065295-234333-6-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-31T23:54:45", "name": "[next,S14,05/15] i40e/i40evf: Add info to nvm info struct for OEM version data", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3f34c859fbc98d00a775bec11d3179f237d7f4ef", "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/1441065295-234333-6-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512635/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512635/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 6640514076B\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 1 Sep 2015 09:54:09 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B447BA36E1;\n\tMon, 31 Aug 2015 23:54:08 +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 pfatk0XYEYLw; Mon, 31 Aug 2015 23:54:08 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id CE55CA36F8;\n\tMon, 31 Aug 2015 23:54:07 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id D936B1C1009\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:06 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id D12E63315B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:06 +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 Rr+NHCooYDeG for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:06 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby silver.osuosl.org (Postfix) with ESMTP id E67B733D14\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:05 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga102.fm.intel.com with ESMTP; 31 Aug 2015 16:54:05 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga003.jf.intel.com with ESMTP; 31 Aug 2015 16:54:05 -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,445,1437462000\"; d=\"scan'208\";a=\"635798417\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 31 Aug 2015 19:54:45 -0400", "Message-Id": "<1441065295-234333-6-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1441065295-234333-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1441065295-234333-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S14 05/15] i40e/i40evf: Add info to\n\tnvm info struct for OEM version data", "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: Carolyn Wyborny <carolyn.wyborny@intel.com>\n\nThis patch adds a member to the nvm_info struct for oem_ver info to be\noutput either by OID or ethtool.\n\nSigned-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>\nChange-ID: I1e5d513ae67622e2af17042924fdb4b5d6d85366\n---\n drivers/net/ethernet/intel/i40e/i40e_adminq.c | 9 ++++++++-\n drivers/net/ethernet/intel/i40e/i40e_type.h | 3 +++\n drivers/net/ethernet/intel/i40evf/i40e_type.h | 2 ++\n 3 files changed, 13 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_adminq.c b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\nindex bfe8979..a41945a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_adminq.c\n@@ -551,8 +551,9 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)\n **/\n i40e_status i40e_init_adminq(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code;\n+\tu16 cfg_ptr, oem_hi, oem_lo;\n \tu16 eetrack_lo, eetrack_hi;\n+\ti40e_status ret_code;\n \tint retry = 0;\n \n \t/* verify input for valid configuration */\n@@ -611,6 +612,12 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw)\n \ti40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_LO, &eetrack_lo);\n \ti40e_read_nvm_word(hw, I40E_SR_NVM_EETRACK_HI, &eetrack_hi);\n \thw->nvm.eetrack = (eetrack_hi << 16) | eetrack_lo;\n+\ti40e_read_nvm_word(hw, I40E_SR_BOOT_CONFIG_PTR, &cfg_ptr);\n+\ti40e_read_nvm_word(hw, (cfg_ptr + I40E_NVM_OEM_VER_OFF),\n+\t\t\t &oem_hi);\n+\ti40e_read_nvm_word(hw, (cfg_ptr + (I40E_NVM_OEM_VER_OFF + 1)),\n+\t\t\t &oem_lo);\n+\thw->nvm.oem_ver = ((u32)oem_hi << 16) | oem_lo;\n \n \tif (hw->aq.api_maj_ver > I40E_FW_API_VERSION_MAJOR) {\n \t\tret_code = I40E_ERR_FIRMWARE_API_VERSION;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h\nindex d1ec5a4..c8f7a52 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_type.h\n@@ -289,6 +289,7 @@ struct i40e_nvm_info {\n \tbool blank_nvm_mode; /* is NVM empty (no FW present)*/\n \tu16 version; /* NVM package version */\n \tu32 eetrack; /* NVM data version */\n+\tu32 oem_ver; /* OEM version info */\n };\n \n /* definitions used in NVM update support */\n@@ -1204,6 +1205,8 @@ struct i40e_hw_port_stats {\n #define I40E_SR_EMP_MODULE_PTR\t\t\t0x0F\n #define I40E_SR_PBA_FLAGS\t\t\t0x15\n #define I40E_SR_PBA_BLOCK_PTR\t\t\t0x16\n+#define I40E_SR_BOOT_CONFIG_PTR\t\t\t0x17\n+#define I40E_NVM_OEM_VER_OFF\t\t\t0x83\n #define I40E_SR_NVM_DEV_STARTER_VERSION\t\t0x18\n #define I40E_SR_NVM_WAKE_ON_LAN\t\t\t0x19\n #define I40E_SR_ALTERNATE_SAN_MAC_ADDRESS_PTR\t0x27\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_type.h b/drivers/net/ethernet/intel/i40evf/i40e_type.h\nindex a59b60f..b3c65dd 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_type.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_type.h\n@@ -288,6 +288,7 @@ struct i40e_nvm_info {\n \tbool blank_nvm_mode; /* is NVM empty (no FW present)*/\n \tu16 version; /* NVM package version */\n \tu32 eetrack; /* NVM data version */\n+\tu32 oem_ver; /* OEM version info */\n };\n \n /* definitions used in NVM update support */\n@@ -1173,6 +1174,7 @@ struct i40e_hw_port_stats {\n /* Checksum and Shadow RAM pointers */\n #define I40E_SR_NVM_CONTROL_WORD\t\t0x00\n #define I40E_SR_EMP_MODULE_PTR\t\t\t0x0F\n+#define I40E_NVM_OEM_VER_OFF\t\t\t0x83\n #define I40E_SR_NVM_DEV_STARTER_VERSION\t\t0x18\n #define I40E_SR_NVM_WAKE_ON_LAN\t\t\t0x19\n #define I40E_SR_ALTERNATE_SAN_MAC_ADDRESS_PTR\t0x27\n", "prefixes": [ "next", "S14", "05/15" ] }