Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/567210/?format=api
{ "id": 567210, "url": "http://patchwork.ozlabs.org/api/patches/567210/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1452732712-12248-3-git-send-email-joshua.a.hay@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": "<1452732712-12248-3-git-send-email-joshua.a.hay@intel.com>", "list_archive_url": null, "date": "2016-01-14T00:51:39", "name": "[v2,next,S27,02/15] i40e: Make the DCB firmware checks for X710/XL710 only", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "df05da1744bec23cb0df69c266823c04f6c24163", "submitter": { "id": 19461, "url": "http://patchwork.ozlabs.org/api/people/19461/?format=api", "name": "Joshua Hay", "email": "joshua.a.hay@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/1452732712-12248-3-git-send-email-joshua.a.hay@intel.com/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/567210/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/567210/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 ED9FC140662\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Jan 2016 11:51:57 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id DF102A5946;\n\tThu, 14 Jan 2016 00:51:56 +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 ozA9FZxTvZsV; Thu, 14 Jan 2016 00:51:56 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 703FCA593F;\n\tThu, 14 Jan 2016 00:51:55 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0DB811C0F4A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Jan 2016 00:51:54 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 09BA98B18D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Jan 2016 00:51:54 +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 mT3TjsEsaqjq for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Jan 2016 00:51:52 +0000 (UTC)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id E03628A7BC\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Jan 2016 00:51:52 +0000 (UTC)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga103.jf.intel.com with ESMTP; 13 Jan 2016 16:51:52 -0800", "from jahay1-mobl2.amr.corp.intel.com (HELO\n\tlocalhost.localdomain.localdomain) ([134.134.176.160])\n\tby orsmga002.jf.intel.com with ESMTP; 13 Jan 2016 16:51:52 -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.22,291,1449561600\"; d=\"scan'208\";a=\"890056917\"", "From": "Joshua Hay <joshua.a.hay@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 13 Jan 2016 16:51:39 -0800", "Message-Id": "<1452732712-12248-3-git-send-email-joshua.a.hay@intel.com>", "X-Mailer": "git-send-email 2.1.0", "In-Reply-To": "<1452732712-12248-1-git-send-email-joshua.a.hay@intel.com>", "References": "<1452732712-12248-1-git-send-email-joshua.a.hay@intel.com>", "Subject": "[Intel-wired-lan] [v2 next PATCH S27 02/15] i40e: Make the DCB\n\tfirmware checks for X710/XL710 only", "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: Neerav Parikh <neerav.parikh@intel.com>\n\nMake the DCB firmware version related checks specific to\nX710 and XL710 only. These checks are not required for\nX722 family of devices.\n\nIntroduced an inline routine to help determine if the\nMAC type is X710/XL710 or not.\n\nMoved the firmware version related checks in i40e_sw_init()\nand defined flags for different cases\n\nFix the version check to allow using \"Set LLDP MIB\" AQ\nfor beyond FVL4 FW releases.\n\nSigned-off-by: Neerav Parikh <neerav.parikh@intel.com>\nChange-ID: Ib78288343de983aa0354fc28aa36e99b073662c0\n---\nTesting Hints:\n- LLDP should get disabled on FVL with FVLSW1/2 NVM\nand no DCB/DCBX functionality should be available\n- DCB capability should be enabled for FVL3/4 NVM images\n- Once DCB is enabled for FPK builds SW functionally should\nbe same as FVL DCB\n\n drivers/net/ethernet/intel/i40e/i40e.h | 16 ++++++++++++++++\n drivers/net/ethernet/intel/i40e/i40e_main.c | 27 ++++++++++++++++++++-------\n 2 files changed, 36 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex cb550bf..bb07e05 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -138,6 +138,19 @@\n /* default to trying for four seconds */\n #define I40E_TRY_LINK_TIMEOUT (4 * HZ)\n \n+/**\n+ * i40e_is_mac_710 - Return true if MAC is X710/XL710\n+ * @hw: ptr to the hardware info\n+ **/\n+static inline bool i40e_is_mac_710(struct i40e_hw *hw)\n+{\n+\tif ((hw->mac.type == I40E_MAC_X710) ||\n+\t (hw->mac.type == I40E_MAC_XL710))\n+\t\treturn true;\n+\n+\treturn false;\n+}\n+\n /* driver state flags */\n enum i40e_state_t {\n \t__I40E_TESTING,\n@@ -342,6 +355,9 @@ struct i40e_pf {\n #define I40E_FLAG_NO_PCI_LINK_CHECK\t\tBIT_ULL(42)\n #define I40E_FLAG_100M_SGMII_CAPABLE\t\tBIT_ULL(43)\n #define I40E_FLAG_RESTART_AUTONEG\t\tBIT_ULL(44)\n+#define I40E_FLAG_NO_DCB_SUPPORT\t\tBIT_ULL(45)\n+#define I40E_FLAG_USE_SET_LLDP_MIB\t\tBIT_ULL(46)\n+#define I40E_FLAG_STOP_FW_LLDP\t\t\tBIT_ULL(47)\n #define I40E_FLAG_PF_MAC\t\t\tBIT_ULL(50)\n \n \t/* tracks features that get auto disabled by errors */\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 2838ae0..f29c3bc 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -5012,8 +5012,7 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf)\n \tint err = 0;\n \n \t/* Do not enable DCB for SW1 and SW2 images even if the FW is capable */\n-\tif (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||\n-\t (pf->hw.aq.fw_maj_ver < 4))\n+\tif (pf->flags & I40E_FLAG_NO_DCB_SUPPORT)\n \t\tgoto out;\n \n \t/* Get the initial DCB configuration */\n@@ -8418,11 +8417,25 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t\t\t\t pf->hw.func_caps.fd_filters_best_effort;\n \t}\n \n-\tif (((pf->hw.mac.type == I40E_MAC_X710) ||\n-\t (pf->hw.mac.type == I40E_MAC_XL710)) &&\n+\tif (i40e_is_mac_710(&pf->hw) &&\n \t (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 33)) ||\n-\t (pf->hw.aq.fw_maj_ver < 4)))\n+\t (pf->hw.aq.fw_maj_ver < 4))) {\n \t\tpf->flags |= I40E_FLAG_RESTART_AUTONEG;\n+\t\t/* No DCB support for FW < v4.33 */\n+\t\tpf->flags |= I40E_FLAG_NO_DCB_SUPPORT;\n+\t}\n+\n+\t/* Disable FW LLDP if FW < v4.3 */\n+\tif (i40e_is_mac_710(&pf->hw) &&\n+\t (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 3)) ||\n+\t (pf->hw.aq.fw_maj_ver < 4)))\n+\t\tpf->flags |= I40E_FLAG_STOP_FW_LLDP;\n+\n+\t/* Use the FW Set LLDP MIB API if FW > v4.40 */\n+\tif (i40e_is_mac_710(&pf->hw) &&\n+\t (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver >= 40)) ||\n+\t (pf->hw.aq.fw_maj_ver >= 5)))\n+\t\tpf->flags |= I40E_FLAG_USE_SET_LLDP_MIB;\n \n \tif (pf->hw.func_caps.vmdq) {\n \t\tpf->num_vmdq_vsis = I40E_DEFAULT_NUM_VMDQ_VSI;\n@@ -8451,6 +8464,7 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t\t\t I40E_FLAG_WB_ON_ITR_CAPABLE |\n \t\t\t I40E_FLAG_MULTIPLE_TCP_UDP_RSS_PCTYPE |\n \t\t\t I40E_FLAG_100M_SGMII_CAPABLE |\n+\t\t\t I40E_FLAG_USE_SET_LLDP_MIB |\n \t\t\t I40E_FLAG_GENEVE_OFFLOAD_CAPABLE;\n \t} else if ((pf->hw.aq.api_maj_ver > 1) ||\n \t\t ((pf->hw.aq.api_maj_ver == 1) &&\n@@ -10823,8 +10837,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)\n \t * Ignore error return codes because if it was already disabled via\n \t * hardware settings this will fail\n \t */\n-\tif (((pf->hw.aq.fw_maj_ver == 4) && (pf->hw.aq.fw_min_ver < 3)) ||\n-\t (pf->hw.aq.fw_maj_ver < 4)) {\n+\tif (pf->flags & I40E_FLAG_STOP_FW_LLDP) {\n \t\tdev_info(&pdev->dev, \"Stopping firmware LLDP agent.\\n\");\n \t\ti40e_aq_stop_lldp(hw, true, NULL);\n \t}\n", "prefixes": [ "v2", "next", "S27", "02/15" ] }