Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/525265/?format=api
{ "id": 525265, "url": "http://patchwork.ozlabs.org/api/patches/525265/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1443724661-92168-7-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": "<1443724661-92168-7-git-send-email-catherine.sullivan@intel.com>", "list_archive_url": null, "date": "2015-10-01T18:37:39", "name": "[next,S18,6/8] i40e: Fix an incorrect OEM version string", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d0765d22cc6ab308708c8b054a766bd89a5b07e6", "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/1443724661-92168-7-git-send-email-catherine.sullivan@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/525265/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/525265/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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 25F9C140D78\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 2 Oct 2015 04:38:22 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 74CC6922E5;\n\tThu, 1 Oct 2015 18:38:21 +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 VU+QigBStxPB; Thu, 1 Oct 2015 18:38:20 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 1ED9B91DF5;\n\tThu, 1 Oct 2015 18:38:20 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id D1BFD1CE788\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Oct 2015 18:38:16 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id CA7DC88058\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Oct 2015 18:38: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 HkHqiF4edF76 for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Oct 2015 18:38:14 +0000 (UTC)", "from mga09.intel.com (mga09.intel.com [134.134.136.24])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 7BA4A894C3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 1 Oct 2015 18:38:14 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga102.jf.intel.com with ESMTP; 01 Oct 2015 11:37:49 -0700", "from catheri1-tigger.jf.intel.com ([134.134.176.92])\n\tby orsmga002.jf.intel.com with ESMTP; 01 Oct 2015 11:37:48 -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,619,1437462000\"; d=\"scan'208\";a=\"817391693\"", "From": "Catherine Sullivan <catherine.sullivan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 1 Oct 2015 14:37:39 -0400", "Message-Id": "<1443724661-92168-7-git-send-email-catherine.sullivan@intel.com>", "X-Mailer": "git-send-email 1.9.3", "In-Reply-To": "<1443724661-92168-1-git-send-email-catherine.sullivan@intel.com>", "References": "<1443724661-92168-1-git-send-email-catherine.sullivan@intel.com>", "Subject": "[Intel-wired-lan] [next PATCH S18 6/8] i40e: Fix an incorrect OEM\n\tversion string", "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 fixes a problem where the driver output of the oem\nversion string varied from the other tools. The mask value\nand the order of operations were incorrect, per the DCR.\nWithout this patch, the version string will appear incorrect\nfrom the driver.\n\nSigned-off-by: Carolyn Wyborny <carolyn.wyborny@intel.com>\nChange-ID: Ie1ca6485284b4ce3b57e5a99b18b7641617c7ef7\n\n---\nTesting-hints: 5646237\n drivers/net/ethernet/intel/i40e/i40e.h | 17 +++++++++++++----\n 1 file 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 7c2b2e8..4dd3e26 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -109,8 +109,10 @@\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_BUILD_MASK 0xffff\n #define I40E_OEM_VER_PATCH_MASK 0xff\n+#define I40E_OEM_VER_BUILD_SHIFT 8\n+#define I40E_OEM_VER_SHIFT 24\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@@ -594,6 +596,15 @@ struct i40e_device {\n static inline char *i40e_nvm_version_str(struct i40e_hw *hw)\n {\n \tstatic char buf[32];\n+\tu32 full_ver;\n+\tu8 ver, patch;\n+\tu16 build;\n+\n+\tfull_ver = hw->nvm.oem_ver;\n+\tver = (u8)(full_ver >> I40E_OEM_VER_SHIFT);\n+\tbuild = (u16)((full_ver >> I40E_OEM_VER_BUILD_SHIFT)\n+\t\t & I40E_OEM_VER_BUILD_MASK);\n+\tpatch = (u8)(full_ver & I40E_OEM_VER_PATCH_MASK);\n \n \tsnprintf(buf, sizeof(buf),\n \t\t \"%x.%02x 0x%x %d.%d.%d\",\n@@ -601,9 +612,7 @@ static inline char *i40e_nvm_version_str(struct i40e_hw *hw)\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, (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+\t\t hw->nvm.eetrack, ver, build, patch);\n \n \treturn buf;\n }\n", "prefixes": [ "next", "S18", "6/8" ] }