Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/991017/?format=api
{ "id": 991017, "url": "http://patchwork.ozlabs.org/api/patches/991017/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20181030175047.18874-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": "<20181030175047.18874-6-jeffrey.t.kirsher@intel.com>", "list_archive_url": null, "date": "2018-10-30T17:50:47", "name": "[next,S97,v2,6/6] i40e: Allow disabling FW LLDP on X722 devices", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "df17f81298ae8bacdd513a43762e4ee7df124725", "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/20181030175047.18874-6-jeffrey.t.kirsher@intel.com/mbox/", "series": [ { "id": 73269, "url": "http://patchwork.ozlabs.org/api/series/73269/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=73269", "date": "2018-10-30T17:50:43", "name": "[next,S97,v2,1/6] i40e: Use a local variable for readability", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/73269/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/991017/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/991017/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.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 42kzXd50pMz9s9G\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 31 Oct 2018 04:50:57 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 18BBB86BBB;\n\tTue, 30 Oct 2018 17:50: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 W_5emRY9oZts; Tue, 30 Oct 2018 17:50:55 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 19C9286BAD;\n\tTue, 30 Oct 2018 17:50:55 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2EFA01BF29A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 30 Oct 2018 17:50:51 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 2B85E879F3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 30 Oct 2018 17:50:51 +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 a+2tOBXkeGrG for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 30 Oct 2018 17:50:50 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 1990187A15\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 30 Oct 2018 17:50:50 +0000 (UTC)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t30 Oct 2018 10:50:50 -0700", "from jtkirshe-desk1.jf.intel.com ([134.134.177.96])\n\tby fmsmga008.fm.intel.com with ESMTP; 30 Oct 2018 10:50:49 -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-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.54,445,1534834800\"; d=\"scan'208\";a=\"82759449\"", "From": "Jeff Kirsher <jeffrey.t.kirsher@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 30 Oct 2018 10:50:47 -0700", "Message-Id": "<20181030175047.18874-6-jeffrey.t.kirsher@intel.com>", "X-Mailer": "git-send-email 2.17.2", "In-Reply-To": "<20181030175047.18874-1-jeffrey.t.kirsher@intel.com>", "References": "<20181030175047.18874-1-jeffrey.t.kirsher@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next S97 v2 6/6] i40e: Allow disabling FW LLDP\n\ton X722 devices", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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>", "Cc": "=?utf-8?q?Patryk_Ma=C5=82ek?= <patryk.malek@intel.com>", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Patryk Małek <patryk.malek@intel.com>\n\nThis patch allows disabling FW LLDP agent on X722 devices.\nIt also changes a source of information for this feature from\npf->hw_features to pf->hw.flags which are set in i40e_init_adminq.\n\nSigned-off-by: Patryk Małek <patryk.malek@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e.h | 1 -\n drivers/net/ethernet/intel/i40e/i40e_common.c | 3 +++\n drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 13 +++++++------\n drivers/net/ethernet/intel/i40e/i40e_main.c | 15 +++++++--------\n 4 files changed, 17 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e.h b/drivers/net/ethernet/intel/i40e/i40e.h\nindex f575b03bc3ed..382b39e326ce 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e.h\n@@ -496,7 +496,6 @@ 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 \tu32 flags;\n #define I40E_FLAG_RX_CSUM_ENABLED\t\tBIT(0)\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_common.c b/drivers/net/ethernet/intel/i40e/i40e_common.c\nindex 85f75b5978fc..97a9b1fb4763 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_common.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_common.c\n@@ -3723,6 +3723,9 @@ i40e_aq_set_dcb_parameters(struct i40e_hw *hw, bool dcb_enable,\n \t\t(struct i40e_aqc_set_dcb_parameters *)&desc.params.raw;\n \ti40e_status status;\n \n+\tif (!(hw->flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE))\n+\t\treturn I40E_ERR_DEVICE_NOT_SUPPORTED;\n+\n \ti40e_fill_default_direct_cmd_desc(&desc,\n \t\t\t\t\t i40e_aqc_opc_set_dcb_parameters);\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\nindex 2bb116fe1515..213e412eb7d7 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c\n@@ -4659,14 +4659,15 @@ static int i40e_set_priv_flags(struct net_device *dev, u32 flags)\n \t\treturn -EOPNOTSUPP;\n \n \t/* If the driver detected FW LLDP was disabled on init, this flag could\n-\t * be set, however we do not support _changing_ the flag if NPAR is\n-\t * enabled or FW API version < 1.7. There are situations where older\n-\t * FW versions/NPAR enabled PFs could disable LLDP, however we _must_\n-\t * not allow the user to enable/disable LLDP with this flag on\n-\t * unsupported FW versions.\n+\t * be set, however we do not support _changing_ the flag:\n+\t * - on XL710 if NPAR is enabled or FW API version < 1.7\n+\t * - on X722 with FW API version < 1.6\n+\t * There are situations where older FW versions/NPAR enabled PFs could\n+\t * disable LLDP, however we _must_ not allow the user to enable/disable\n+\t * LLDP with this flag on unsupported FW versions.\n \t */\n \tif (changed_flags & I40E_FLAG_DISABLE_FW_LLDP) {\n-\t\tif (!(pf->hw_features & I40E_HW_STOPPABLE_FW_LLDP)) {\n+\t\tif (!(pf->hw.flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE)) {\n \t\t\tdev_warn(&pf->pdev->dev,\n \t\t\t\t \"Device does not support changing FW LLDP\\n\");\n \t\t\treturn -EOPNOTSUPP;\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 61a99a8e9566..7963ec46ab59 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -11431,16 +11431,15 @@ 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/* Stopping FW LLDP engine is supported on XL710 and X722\n+\t * starting from FW versions determined in i40e_init_adminq.\n+\t * Stopping the FW LLDP engine is not supported on XL710\n+\t * if NPAR is functioning so unset this hw flag in this case.\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+\t pf->hw.func_caps.npar_enable &&\n+\t (pf->hw.flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE))\n+\t\tpf->hw.flags &= ~I40E_HW_FLAG_FW_LLDP_STOPPABLE;\n \n #ifdef CONFIG_PCI_IOV\n \tif (pf->hw.func_caps.num_vfs && pf->hw.partition_id == 1) {\n", "prefixes": [ "next", "S97", "v2", "6/6" ] }