Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/512638/?format=api
{ "id": 512638, "url": "http://patchwork.ozlabs.org/api/patches/512638/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1441065295-234333-10-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-10-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-08-31T23:54:49", "name": "[next,S14,09/15] i40e: update fw version text string per previous product formats", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b0e054693995eeabe85461c40f60977e1bb7ecb9", "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-10-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/512638/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/512638/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 D17481401CB\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 1 Sep 2015 09:54:13 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 10A16A3744;\n\tMon, 31 Aug 2015 23:54: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 wg3jt7jqjPMn; Mon, 31 Aug 2015 23:54:12 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 5E9DDA3713;\n\tMon, 31 Aug 2015 23:54:10 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2845F1C1009\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:09 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 21FAE33D1E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:09 +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 KAvWxc7ruGVD for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:08 +0000 (UTC)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4919633CFD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 31 Aug 2015 23:54:08 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby fmsmga102.fm.intel.com with ESMTP; 31 Aug 2015 16:54:08 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga003.jf.intel.com with ESMTP; 31 Aug 2015 16:54:08 -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=\"635798446\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 31 Aug 2015 19:54:49 -0400", "Message-Id": "<1441065295-234333-10-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 09/15] i40e: update fw version\n\ttext string per previous product formats", "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 moves the internal fw version and fw api version info to be\noutput in probe. The nvm version, etrack and oem version info are now\nconfigured for output via ethtool -i.\n\nSigned-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>\nChange-ID: I05d490093a7137dbefcdef263d014d1e5c9e83d0\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 10 ++++++----\n drivers/net/ethernet/intel/i40e/i40e_main.c | 7 +++++++\n 2 files changed, 13 insertions(+), 4 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 9c9601c..031a93a 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -107,6 +107,8 @@\n #define I40E_NVM_VERSION_LO_MASK (0xff << I40E_NVM_VERSION_LO_SHIFT)\n #define I40E_NVM_VERSION_HI_SHIFT 12\n #define I40E_NVM_VERSION_HI_MASK (0xf << I40E_NVM_VERSION_HI_SHIFT)\n+#define I40E_OEM_VER_BUILD_MASK 0xff00\n+#define I40E_OEM_VER_PATCH_MASK 0xff\n \n /* The values in here are decimal coded as hex as is the case in the NVM map*/\n #define I40E_CURRENT_NVM_VERSION_HI 0x2\n@@ -589,14 +591,14 @@ static inline char *i40e_fw_version_str(struct i40e_hw *hw)\n \tstatic char buf[32];\n \n \tsnprintf(buf, sizeof(buf),\n-\t\t \"f%d.%d.%05d a%d.%d n%x.%02x e%x\",\n-\t\t hw->aq.fw_maj_ver, hw->aq.fw_min_ver, hw->aq.fw_build,\n-\t\t hw->aq.api_maj_ver, hw->aq.api_min_ver,\n+\t\t \"%x.%02x 0x%x %d.%d.%d\",\n \t\t (hw->nvm.version & I40E_NVM_VERSION_HI_MASK) >>\n \t\t\tI40E_NVM_VERSION_HI_SHIFT,\n \t\t (hw->nvm.version & I40E_NVM_VERSION_LO_MASK) >>\n \t\t\tI40E_NVM_VERSION_LO_SHIFT,\n-\t\t (hw->nvm.eetrack & 0xffffff));\n+\t\t hw->nvm.eetrack, (hw->nvm.oem_ver >> 24),\n+\t\t (hw->nvm.oem_ver & I40E_OEM_VER_BUILD_MASK) >> 8,\n+\t\t hw->nvm.oem_ver & I40E_OEM_VER_PATCH_MASK);\n \n \treturn buf;\n }\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 7dfe0db..ae2d630 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -10100,6 +10100,13 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \n \terr = i40e_init_adminq(hw);\n \tdev_info(&pdev->dev, \"%s\\n\", i40e_fw_version_str(hw));\n+\n+\t/* provide additional fw info, like api and ver */\n+\tdev_info(&pdev->dev, \"fw_version:%d.%d.%05d\\n\",\n+\t\t hw->aq.fw_maj_ver, hw->aq.fw_min_ver, hw->aq.fw_build);\n+\tdev_info(&pdev->dev, \"fw api version:%d.%d\\n\",\n+\t\t hw->aq.api_maj_ver, hw->aq.api_min_ver);\n+\n \tif (err) {\n \t\tdev_info(&pdev->dev,\n \t\t\t \"The driver for the device stopped because the NVM image is newer than expected. You must install the most recent version of the network driver.\\n\");\n", "prefixes": [ "next", "S14", "09/15" ] }