Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1190609/?format=api
{ "id": 1190609, "url": "http://patchwork.ozlabs.org/api/patches/1190609/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20191106100541.48639-6-anthony.l.nguyen@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": "<20191106100541.48639-6-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2019-11-06T10:05:32", "name": "[S32,v3,06/15] ice: configure software LLDP in ice_init_pf_dcb", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "55e00472711a5d1b99da21ed9c6e77195d336b26", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@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/20191106100541.48639-6-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 141151, "url": "http://patchwork.ozlabs.org/api/series/141151/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=141151", "date": "2019-11-06T10:05:27", "name": "[S32,v3,01/15] ice: Use ice_ena_vsi and ice_dis_vsi in DCB configuration flow", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/141151/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1190609/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1190609/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; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.138;\n\thelo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 477Zxd4Tmdz9sPT\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 7 Nov 2019 05:36:37 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E29D889FC7;\n\tWed, 6 Nov 2019 18:36: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 txyoAHCAHb1u; Wed, 6 Nov 2019 18:36:34 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id E176089F77;\n\tWed, 6 Nov 2019 18:36:33 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0750E1BF3FB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Nov 2019 18:36:31 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 043D18A870\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Nov 2019 18:36:31 +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 ncg94IRk1hkO for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Nov 2019 18:36:29 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 6C1028A854\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 6 Nov 2019 18:36:29 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t06 Nov 2019 10:36:28 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby orsmga006.jf.intel.com with ESMTP; 06 Nov 2019 10:36:27 -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.68,275,1569308400\"; d=\"scan'208\";a=\"205918155\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 6 Nov 2019 02:05:32 -0800", "Message-Id": "<20191106100541.48639-6-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20191106100541.48639-1-anthony.l.nguyen@intel.com>", "References": "<20191106100541.48639-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S32 v3 06/15] ice: configure software LLDP\n\tin ice_init_pf_dcb", "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>", "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: Paul Greenwalt <paul.greenwalt@intel.com>\n\nMove software LLDP configuration when FW DCBX is disabled to\nice_init_pf_dcb, since that is where the FW DCBX state is determined.\nRemove this software LLDP configuration from ice_vsi_setup and\nice_set_priv_flags. Software configuration includes redirecting Rx LLDP\npackets up the stack, when FW DCBX is not running.\n\nSigned-off-by: Paul Greenwalt <paul.greenwalt@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 15 +++++++++++++++\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 5 -----\n drivers/net/ethernet/intel/ice/ice_lib.c | 14 ++++----------\n 3 files changed, 19 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex 9448a289363d..1150dbd98d0b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -594,6 +594,8 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \t\t \"DCB is enabled in the hardware, max number of TCs supported on this port are %d\\n\",\n \t\t pf->hw.func_caps.common_cap.maxtc);\n \tif (err) {\n+\t\tstruct ice_vsi *pf_vsi;\n+\n \t\t/* FW LLDP is disabled, activate SW DCBX/LLDP mode */\n \t\tdev_info(&pf->pdev->dev,\n \t\t\t \"FW LLDP is disabled, DCBx/LLDP in SW mode.\\n\");\n@@ -606,6 +608,19 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \t\t\tgoto dcb_init_err;\n \t\t}\n \n+\t\t/* If the FW DCBX engine is not running then Rx LLDP packets\n+\t\t * need to be redirected up the stack.\n+\t\t */\n+\t\tpf_vsi = ice_get_main_vsi(pf);\n+\t\tif (!pf_vsi) {\n+\t\t\tdev_err(&pf->pdev->dev,\n+\t\t\t\t\"Failed to set local DCB config\\n\");\n+\t\t\terr = -EIO;\n+\t\t\tgoto dcb_init_err;\n+\t\t}\n+\n+\t\tice_cfg_sw_lldp(pf_vsi, false, true);\n+\n \t\tpf->dcbx_cap = DCB_CAP_DCBX_HOST | DCB_CAP_DCBX_VER_IEEE;\n \t\treturn 0;\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 3b9d33ad23d8..9c2045056d59 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -1295,11 +1295,6 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags)\n \t\t\tstatus = ice_init_pf_dcb(pf, true);\n \t\t\tif (status)\n \t\t\t\tdev_warn(&pf->pdev->dev, \"Fail to init DCB\\n\");\n-\n-\t\t\t/* Forward LLDP packets to default VSI so that they\n-\t\t\t * are passed up the stack\n-\t\t\t */\n-\t\t\tice_cfg_sw_lldp(vsi, false, true);\n \t\t} else {\n \t\t\tenum ice_status status;\n \t\t\tbool dcbx_agent_status;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex d4e3df6544f5..c9e0b533da47 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -1881,23 +1881,17 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n \t * out PAUSE or PFC frames. If enabled, FW can still send FC frames.\n \t * The rule is added once for PF VSI in order to create appropriate\n \t * recipe, since VSI/VSI list is ignored with drop action...\n-\t * Also add rules to handle LLDP Tx and Rx packets. Tx LLDP packets\n-\t * need to be dropped so that VFs cannot send LLDP packets to reconfig\n-\t * DCB settings in the HW. Also, if the FW DCBX engine is not running\n-\t * then Rx LLDP packets need to be redirected up the stack.\n+\t * Also add rules to handle LLDP Tx packets. Tx LLDP packets need to\n+\t * be dropped so that VFs cannot send LLDP packets to reconfig DCB\n+\t * settings in the HW.\n \t */\n-\tif (!ice_is_safe_mode(pf)) {\n+\tif (!ice_is_safe_mode(pf))\n \t\tif (vsi->type == ICE_VSI_PF) {\n \t\t\tice_vsi_add_rem_eth_mac(vsi, true);\n \n \t\t\t/* Tx LLDP packets */\n \t\t\tice_cfg_sw_lldp(vsi, true, true);\n-\n-\t\t\t/* Rx LLDP packets */\n-\t\t\tif (!test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags))\n-\t\t\t\tice_cfg_sw_lldp(vsi, false, true);\n \t\t}\n-\t}\n \n \treturn vsi;\n \n", "prefixes": [ "S32", "v3", "06/15" ] }