Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/869562/?format=api
{ "id": 869562, "url": "http://patchwork.ozlabs.org/api/patches/869562/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180205210337.22102-6-jeffrey.t.kirsher@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": "<20180205210337.22102-6-jeffrey.t.kirsher@intel.com>", "list_archive_url": null, "date": "2018-02-05T21:03:35", "name": "[S86,v3,6/8] i40e: i40e: Change ethtool check from MAC to HW flag", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "c90d278eadc19f68ec024c9c5fc5b74a5f38400b", "submitter": { "id": 473, "url": "http://patchwork.ozlabs.org/api/people/473/?format=api", "name": "Kirsher, Jeffrey T", "email": "jeffrey.t.kirsher@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/20180205210337.22102-6-jeffrey.t.kirsher@intel.com/mbox/", "series": [ { "id": 27070, "url": "http://patchwork.ozlabs.org/api/series/27070/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=27070", "date": "2018-02-05T21:03:31", "name": "[S86,v3,1/8] i40e: don't leak memory addresses", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/27070/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/869562/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/869562/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.138; helo=whitealder.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3zb0SK5DBtz9sR8\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 6 Feb 2018 08:03:45 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 39A91881AF;\n\tMon, 5 Feb 2018 21:03:44 +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 vvalN78A2SKL; Mon, 5 Feb 2018 21:03:42 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id AB10E88162;\n\tMon, 5 Feb 2018 21:03:39 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id B8A961C0A7F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 5 Feb 2018 21:03:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id B07CA88113\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 5 Feb 2018 21:03:35 +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 hiu9H-OFzPsS for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 5 Feb 2018 21:03:34 +0000 (UTC)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 998C28814A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 5 Feb 2018 21:03:34 +0000 (UTC)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Feb 2018 13:03:34 -0800", "from jtkirshe-nuc.jf.intel.com ([134.134.177.59])\n\tby fmsmga008.fm.intel.com with ESMTP; 05 Feb 2018 13:03:34 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.46,466,1511856000\"; d=\"scan'208\";a=\"15608864\"", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Mon, 5 Feb 2018 13:03:35 -0800", "Message-Id": "<20180205210337.22102-6-jeffrey.t.kirsher@intel.com>", "X-Mailer": "git-send-email 2.14.3", "In-Reply-To": "<20180205210337.22102-1-jeffrey.t.kirsher@intel.com>", "References": "<20180205210337.22102-1-jeffrey.t.kirsher@intel.com>", "Subject": "[Intel-wired-lan] [S86 v3 6/8] i40e: i40e: Change ethtool check\n\tfrom MAC to HW flag", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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>", "MIME-Version": "1.0", "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: Dave Ertman <david.m.ertman@intel.com>\n\nThe MAC, FW Version and NPAR check used to determine\nif shutting off the FW LLDP engine is supported is not\nusing the usual feature check mechanism.\n\nThis patch fixes the problem by moving the feature check\nto i40e_sw_init in order to set a flag in pf->hw_features\nthat ethtool will use for priv_flags disable operation.\n\nSigned-off-by: Dave Ertman <david.m.ertman@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 +\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 12 ++----------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++++++++++\n 3 files changed, 13 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex 4b81a18972e0..36d9401a6258 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -507,6 +507,7 @@ struct i40e_pf {\n #define I40E_HW_STOP_FW_LLDP\t\t\tBIT(16)\n #define I40E_HW_PORT_ID_VALID\t\t\tBIT(17)\n #define I40E_HW_RESTART_AUTONEG\t\t\tBIT(18)\n+#define I40E_HW_STOPPABLE_FW_LLDP\t\tBIT(19)\n \n \tu64 flags;\n #define I40E_FLAG_RX_CSUM_ENABLED\t\tBIT_ULL(0)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex abc057c6275e..c3e4767ad78f 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -4428,17 +4428,9 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t * unsupported FW verions.\n \t */\n \tif (changed_flags & I40E_FLAG_DISABLE_FW_LLDP) {\n-\t\tif (pf->hw.func_caps.npar_enable) {\n+\t\tif (!(pf->hw_features & I40E_HW_STOPPABLE_FW_LLDP)) {\n \t\t\tdev_warn(&pf->pdev->dev,\n-\t\t\t\t \"Unable to change FW LLDP if NPAR active\\n\");\n-\t\t\treturn -EOPNOTSUPP;\n-\t\t}\n-\n-\t\tif (pf->hw.aq.api_maj_ver < 1 ||\n-\t\t (pf->hw.aq.api_maj_ver == 1 &&\n-\t\t pf->hw.aq.api_min_ver < 7)) {\n-\t\t\tdev_warn(&pf->pdev->dev,\n-\t\t\t\t \"FW ver does not support changing FW LLDP\\n\");\n+\t\t\t\t \"Device does not support changing FW LLDP\\n\");\n \t\t\treturn -EOPNOTSUPP;\n \t\t}\n \t}\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex bbbadcc1400f..fd90ae5039e3 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -11154,6 +11154,16 @@ static int i40e_sw_init(struct i40e_pf *pf)\n \t\t/* IWARP needs one extra vector for CQP just like MISC.*/\n \t\tpf->num_iwarp_msix = (int)num_online_cpus() + 1;\n \t}\n+\t/* Stopping the FW LLDP engine is only supported on the\n+\t * XL710 with a FW ver >= 1.7. Also, stopping FW LLDP\n+\t * engine is not supported if NPAR is functioning on this\n+\t * part\n+\t */\n+\tif (pf->hw.mac.type == I40E_MAC_XL710 &&\n+\t !pf->hw.func_caps.npar_enable &&\n+\t (pf->hw.aq.api_maj_ver > 1 ||\n+\t (pf->hw.aq.api_maj_ver == 1 && pf->hw.aq.api_min_ver > 6)))\n+\t\tpf->hw_features |= I40E_HW_STOPPABLE_FW_LLDP;\n \n #ifdef CONFIG_PCI_IOV\n \tif (pf->hw.func_caps.num_vfs && pf->hw.partition_id == 1) {\n", "prefixes": [ "S86", "v3", "6/8" ] }